Skip to content

Commit

Permalink
Bump version / misc
Browse files Browse the repository at this point in the history 
Fix regenallroads
Add schematic y_offset
Change visit/list for multi-owner plots
Fix updater (pre-1.7.10)
  • Loading branch information
@boy0001
boy0001 committed Mar 2, 2016
1 parent 109715e commit f00ac79
Show file tree
Hide file tree
Showing 14 changed files with 85 additions and 78 deletions.
11 changes: 8 additions & 3 deletions Bukkit/src/main/java/com/plotsquared/bukkit/util/block/GenChunk.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ public GenChunk(Chunk chunk, ChunkWrapper wrap) {
@Override
public Chunk getChunkAbs() {
ChunkWrapper wrap = getChunkWrapper();
if (wrap.x != chunk.getX() || wrap.z != chunk.getZ()) {
if (chunk == null || wrap.x != chunk.getX() || wrap.z != chunk.getZ()) {
chunk = BukkitUtil.getWorld(wrap.world).getChunkAt(wrap.x, wrap.z);
}
return chunk;
Expand Down Expand Up @@ -65,9 +65,14 @@ public void setBlock(int x, int y, int z, int id, byte data) {
modified = true;
result[i] = v = new short[4096];
}
v[MainUtil.CACHE_J[y][x][z]] = (short) id;
int j = MainUtil.CACHE_J[y][x][z];
v[j] = (short) id;
if (data != 0) {
getChunk().getBlock(x, y, z).setData(data);
byte[] vd = result_data[i];
if (vd == null) {
result_data[i] = vd = new byte[4096];
}
vd[j] = data;
}
}

Expand Down
17 changes: 17 additions & 0 deletions Core/src/main/java/com/intellectualcrafters/plot/PS.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1332,6 +1332,10 @@ public Set<Plot> getPlots(final PlotPlayer player) {
return getPlots(player.getUUID());
}

public Set<Plot> getBasePlots(final PlotPlayer player) {
return getBasePlots(player.getUUID());
}

/**
* Get the plots for a UUID
* @param uuid
Expand All @@ -1350,6 +1354,19 @@ public void run(Plot value) {
return new HashSet<>(myplots);
}

public Set<Plot> getBasePlots(final UUID uuid) {
final ArrayList<Plot> myplots = new ArrayList<>();
foreachBasePlot(new RunnableVal<Plot>() {
@Override
public void run(Plot value) {
if (value.isOwner(uuid)) {
myplots.add(value);
}
}
});
return new HashSet<>(myplots);
}

/**
* Get the plots for a UUID
* @param uuid
Expand Down
57 changes: 23 additions & 34 deletions Core/src/main/java/com/intellectualcrafters/plot/Updater.java
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
package com.intellectualcrafters.plot;

import static com.intellectualcrafters.plot.PS.log;

import com.google.gson.Gson;
import com.google.gson.annotations.SerializedName;
import com.intellectualcrafters.json.JSONArray;
import com.intellectualcrafters.json.JSONObject;

import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStreamReader;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.List;

import static com.intellectualcrafters.plot.PS.log;

public class Updater {

Expand Down Expand Up @@ -44,42 +43,32 @@ private static String readUrl(String urlString) {

public static URL getUpdate() {
String str = readUrl("https://api.github.com/repos/IntellectualSites/PlotSquared/releases/latest");
Gson gson = new Gson();

This comment has been minimized.

Sign in to view

Copy link
@MattBDev

MattBDev Mar 2, 2016

Contributor

I thought GSON was available in CraftBukkit for those earlier versions?
URL url = null;
Release release = gson.fromJson(str, Release.class);
JSONObject release = new JSONObject(str);
JSONArray assets = (JSONArray) release.get("assets");
String downloadURL = String.format("PlotSquared-%s%n.jar", PS.get().getPlatform());
List<Release.Asset> assets = release.assets;
for (Release.Asset asset : assets) {
if (asset.name.equals(downloadURL)) {
for (int i = 0; i < assets.length(); i++) {
JSONObject asset = assets.getJSONObject(i);
String name = asset.getString("name");
if (downloadURL.equals(name)) {
try {
url = new URL(asset.downloadUrl);
break;
String version = release.getString("name");
URL url = new URL(asset.getString("downloadUrl"));

This comment has been minimized.

Sign in to view

Copy link
@MattBDev

MattBDev Mar 2, 2016

Contributor

This doesn't work. The JSON value is "browser_download_url".
if (!PS.get().canUpdate(PS.get().config.getString("version"), version)) {
PS.debug("&7PlotSquared is already up to date!");
return null;
}
log("&6PlotSquared " + version + " is available:");
log("&8 - &3Use: &7/plot update");
log("&8 - &3Or: &7" + downloadURL);
return url;
} catch (MalformedURLException e) {
e.printStackTrace();
log("&dCould not check for updates (0)");
log("&dCould not check for updates (1)");
log("&7 - Manually check for updates: https://github.com/IntellectualSites/PlotSquared/releases");
}
}
}
if (!PS.get().canUpdate(PS.get().config.getString("version"), release.name)) {
PS.debug("&7PlotSquared is already up to date!");
return null;
}
log("&6PlotSquared " + release.tagName + " is available:");
log("&8 - &3Use: &7/plot update");
log("&8 - &3Or: &7" + downloadURL);
return url;
}


private static class Release {
public String name;
@SerializedName("tag_name") String tagName;
List<Asset> assets;
static class Asset {
public String name;
@SerializedName("browser_download_url") String downloadUrl;
}

log("You are running the latest version of PlotSquared");
return null;
}
}
2 changes: 1 addition & 1 deletion Core/src/main/java/com/intellectualcrafters/plot/commands/Claim.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ public static boolean claimPlot(final PlotPlayer player, final Plot plot, final
sch = SchematicHandler.manager.getSchematic(plotworld.SCHEMATIC_FILE);
}
}
SchematicHandler.manager.paste(sch, plot, 0, 0, new RunnableVal<Boolean>() {
SchematicHandler.manager.paste(sch, plot, 0, 0, 0, true, new RunnableVal<Boolean>() {
@Override
public void run(Boolean value) {
if (value) {
Expand Down
2 changes: 1 addition & 1 deletion Core/src/main/java/com/intellectualcrafters/plot/commands/Load.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ public void run() {
sendMessage(plr, C.SCHEMATIC_INVALID, "non-existent or not in gzip format");
return;
}
SchematicHandler.manager.paste(schematic, plot, 0, 0, new RunnableVal<Boolean>() {
SchematicHandler.manager.paste(schematic, plot, 0, 0, 0, true, new RunnableVal<Boolean>() {
@Override
public void run(Boolean value) {
plot.removeRunning();
Expand Down
2 changes: 1 addition & 1 deletion Core/src/main/java/com/intellectualcrafters/plot/commands/RegenAllRoads.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ public boolean onCommand(final PlotPlayer plr, final String[] args) {
return false;
}
PlotArea area = PS.get().getPlotAreaByString(args[0]);
if (area == null || WorldUtil.IMP.isWorld(area.worldname)) {
if (area == null || !WorldUtil.IMP.isWorld(area.worldname)) {
C.NOT_VALID_PLOT_WORLD.send(plr, args[0]);
return false;
}
Expand Down
19 changes: 7 additions & 12 deletions Core/src/main/java/com/intellectualcrafters/plot/commands/SchematicCmd.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,27 +20,22 @@
////////////////////////////////////////////////////////////////////////////////////////////////////
package com.intellectualcrafters.plot.commands;

import java.net.URL;
import java.util.ArrayList;
import java.util.Collection;
import java.util.UUID;

import com.intellectualcrafters.plot.PS;
import com.intellectualcrafters.plot.config.C;
import com.intellectualcrafters.plot.config.Settings;
import com.intellectualcrafters.plot.object.ConsolePlayer;
import com.intellectualcrafters.plot.object.Location;
import com.intellectualcrafters.plot.object.Plot;
import com.intellectualcrafters.plot.object.PlotArea;
import com.intellectualcrafters.plot.object.PlotPlayer;
import com.intellectualcrafters.plot.object.RunnableVal;
import com.intellectualcrafters.plot.object.*;
import com.intellectualcrafters.plot.util.MainUtil;
import com.intellectualcrafters.plot.util.Permissions;
import com.intellectualcrafters.plot.util.SchematicHandler;
import com.intellectualcrafters.plot.util.SchematicHandler.Schematic;
import com.intellectualcrafters.plot.util.TaskManager;
import com.plotsquared.general.commands.CommandDeclaration;

import java.net.URL;
import java.util.ArrayList;
import java.util.Collection;
import java.util.UUID;

@CommandDeclaration(
command = "schematic",
permission = "plots.schematic",
Expand Down Expand Up @@ -114,7 +109,7 @@ public void run() {
sendMessage(plr, C.SCHEMATIC_INVALID, "non-existent or not in gzip format");
return;
}
SchematicHandler.manager.paste(schematic, plot, 0, 0, new RunnableVal<Boolean>() {
SchematicHandler.manager.paste(schematic, plot, 0, 0, 0, true, new RunnableVal<Boolean>() {
@Override
public void run(Boolean value) {
running = false;
Expand Down
14 changes: 4 additions & 10 deletions Core/src/main/java/com/intellectualcrafters/plot/commands/Visit.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,6 @@
////////////////////////////////////////////////////////////////////////////////////////////////////
package com.intellectualcrafters.plot.commands;

import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.UUID;

import com.intellectualcrafters.plot.PS;
import com.intellectualcrafters.plot.config.C;
import com.intellectualcrafters.plot.object.Plot;
Expand All @@ -39,6 +31,8 @@
import com.plotsquared.general.commands.Argument;
import com.plotsquared.general.commands.CommandDeclaration;

import java.util.*;

@CommandDeclaration(
command = "visit",
permission = "plots.visit",
Expand Down Expand Up @@ -83,11 +77,11 @@ public boolean onCommand(final PlotPlayer player, String[] args) {
final UUID user = UUIDHandler.getCachedUUID(args[0], null);
if (page == Integer.MIN_VALUE && user == null && MathMan.isInteger(args[0])) {
page = Integer.parseInt(args[0]);
unsorted = PS.get().getPlots(player);
unsorted = PS.get().getBasePlots(player);
break;
}
if (user != null) {
unsorted = PS.get().getPlots(user);
unsorted = PS.get().getBasePlots(user);
} else if (PS.get().getPlotAreaByString(args[0]) != null) {
unsorted = PS.get().getPlotAreaByString(args[0]).getPlots();
} else {
Expand Down
2 changes: 1 addition & 1 deletion Core/src/main/java/com/intellectualcrafters/plot/commands/list.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ public boolean onCommand(final PlotPlayer plr, final String[] args) {
return false;
}
sort = false;
plots = PS.get().sortPlotsByTemp(PS.get().getPlots(plr));
plots = PS.get().sortPlotsByTemp(PS.get().getBasePlots(plr));
break;
}
case "shared": {
Expand Down
2 changes: 1 addition & 1 deletion Core/src/main/java/com/intellectualcrafters/plot/generator/HybridUtils.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -409,7 +409,7 @@ public boolean regenerateRoad(final PlotArea area, final ChunkLoc chunk, int ext
}
if (blocks != null) {
for (Entry<Integer, PlotBlock> entry : blocks.entrySet()) {
SetQueue.IMP.setBlock(area.worldname, x + X + plotworld.ROAD_OFFSET_X, sy + entry.getKey(), z + Z + plotworld.ROAD_OFFSET_Z, entry.getValue());
SetQueue.IMP.setBlock(area.worldname, x + X + plotworld.ROAD_OFFSET_X, entry.getKey(), z + Z + plotworld.ROAD_OFFSET_Z, entry.getValue());
}
}
}
Expand Down
29 changes: 18 additions & 11 deletions Core/src/main/java/com/intellectualcrafters/plot/util/SchematicHandler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,8 @@ public void run() {
});
return true;
}



/**
* Paste a schematic
Expand All @@ -107,7 +109,7 @@ public void run() {
*
* @return boolean true if succeeded
*/
public void paste(final Schematic schematic, final Plot plot, final int x_offset, final int z_offset, final RunnableVal<Boolean> whenDone) {
public void paste(final Schematic schematic, final Plot plot, final int x_offset, final int y_offset, final int z_offset, final boolean autoHeight, final RunnableVal<Boolean> whenDone) {
TaskManager.runTask(new Runnable() {
@Override
public void run() {
Expand Down Expand Up @@ -147,18 +149,23 @@ public void run() {
final short[] ids = schematic.ids;
final byte[] datas = schematic.datas;
// Calculate the optimal height to paste the schematic at
final int y_offset;
if (HEIGHT >= 256) {
y_offset = 0;
} else {
PlotArea pw = plot.getArea();
if (pw instanceof ClassicPlotWorld) {
y_offset = ((ClassicPlotWorld) pw).PLOT_HEIGHT;
final int y_offset_actual;
if (autoHeight) {
if (HEIGHT >= 256) {
y_offset_actual = y_offset;
} else {
y_offset = MainUtil.getHeighestBlock(plot.getArea().worldname, region.minX + 1, region.minZ + 1);
PlotArea pw = plot.getArea();
if (pw instanceof ClassicPlotWorld) {
y_offset_actual = y_offset + ((ClassicPlotWorld) pw).PLOT_HEIGHT;
} else {
y_offset_actual = y_offset + MainUtil.getHeighestBlock(plot.getArea().worldname, region.minX + 1, region.minZ + 1);
}
}
}
final Location pos1 = new Location(plot.getArea().worldname, region.minX + x_offset, y_offset, region.minZ + z_offset);
else {
y_offset_actual = y_offset;
}
final Location pos1 = new Location(plot.getArea().worldname, region.minX + x_offset, y_offset_actual, region.minZ + z_offset);
final Location pos2 = pos1.clone().add(WIDTH - 1, HEIGHT - 1, LENGTH - 1);
// TODO switch to ChunkManager.chunkTask(pos1, pos2, task, whenDone, allocate);
final int p1x = pos1.getX();
Expand Down Expand Up @@ -203,7 +210,7 @@ public void run() {
// Paste schematic here

for (int ry = 0; ry < Math.min(256, HEIGHT); ry++) {
final int yy = y_offset + ry;
final int yy = y_offset_actual + ry;
if (yy > 255) {
continue;
}
Expand Down
2 changes: 1 addition & 1 deletion Sponge/src/main/java/com/plotsquared/sponge/SpongeMain.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
* Created by robin on 01/11/2014
*/

@Plugin(id = "PlotSquared", name = "PlotSquared", version = "3.3.0", dependencies = "before:WorldEdit")
@Plugin(id = "PlotSquared", name = "PlotSquared", version = "3.3.1", dependencies = "before:WorldEdit")
public class SpongeMain implements IPlotMain {
public static SpongeMain THIS;

Expand Down
2 changes: 1 addition & 1 deletion build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ buildscript {
}

group = 'com.intellectualcrafters'
version = '3.3.0'
version = '3.3.1'
description = """PlotSquared"""

subprojects {
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<artifactId>PlotSquared</artifactId>
<version>3.3.0</version>
<version>3.3.1</version>
<name>PlotSquared</name>
<packaging>jar</packaging>
<build>
Expand Down

2 comments on commit f00ac79

@MattBDev
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If I didn't do so yet, I am adding JUnit to the project to test classes like Updater. This way we are sure it will work before we push and we don't need to run a server (in most cases).

@boy0001
Copy link
Contributor Author

@boy0001 boy0001 commented on f00ac79 Mar 2, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@MattBDev

If I didn't do so yet, I am adding JUnit to the project to test classes like Updater. This way we are sure it will work before we push and we don't need to run a server (in most cases).

Ok

I thought GSON was available in CraftBukkit for those earlier versions?

Nope, the updater/NBT classes that were changed to gson broke PlotSquared for someone using 1.7.9

This doesn't work. The JSON value is "browser_download_url".

Thanks, fixed: 0408e9a

Please sign in to comment.