From 2ad5109639247ed83380b0af99e02f75790013f3 Mon Sep 17 00:00:00 2001 From: NorbiPeti Date: Fri, 24 Apr 2020 01:10:48 +0200 Subject: [PATCH] Improve gitignore, save each block It's easier and may be better in the future --- .gitignore | 8 +++++++- .../io/github/norbipeti/gcmc/PluginMain.java | 19 +++++-------------- 2 files changed, 12 insertions(+), 15 deletions(-) diff --git a/.gitignore b/.gitignore index b230ab5..28cc57b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,9 @@ bin/ obj/ -/packages/ \ No newline at end of file +/packages/ +.idea +*.sln.DotSettings.user +target/ +ref +*.iml + diff --git a/GCMCPlugin/src/main/java/io/github/norbipeti/gcmc/PluginMain.java b/GCMCPlugin/src/main/java/io/github/norbipeti/gcmc/PluginMain.java index 04ac28a..70dee69 100644 --- a/GCMCPlugin/src/main/java/io/github/norbipeti/gcmc/PluginMain.java +++ b/GCMCPlugin/src/main/java/io/github/norbipeti/gcmc/PluginMain.java @@ -5,7 +5,6 @@ import com.google.gson.*; import lombok.val; import org.bukkit.Bukkit; import org.bukkit.Location; -import org.bukkit.Material; import org.bukkit.World; import org.bukkit.block.Block; import org.bukkit.command.Command; @@ -44,24 +43,16 @@ public class PluginMain extends JavaPlugin { World world = sender instanceof Player ? ((Player) sender).getWorld() : Bukkit.getWorlds().get(0); val list = new ArrayList(); for (int y = xyz[1]; y <= xyz[4]; y++) { - Blocks blocks = new Blocks(); for (int x = xyz[0]; x <= xyz[3]; x++) { for (int z = xyz[2]; z <= xyz[5]; z++) { + Blocks blocks = new Blocks(); + blocks.setStart(new Location(null, x, y, z)); + blocks.setEnd(blocks.getStart()); Block block = world.getBlockAt(x, y, z); - Material mat = block.getType(); - if (!mat.name().equals(blocks.getMaterial())) { - if (blocks.getStart() != null) { - list.add(blocks); - blocks = new Blocks(); - } - blocks.setMaterial(mat.name()); - blocks.setStart(new Location(null, x, y, z)); - blocks.setEnd(blocks.getStart()); - } else - blocks.setEnd(new Location(null, x, y, z)); + blocks.setMaterial(block.getType().name()); + list.add(blocks); } } - list.add(blocks); } Gson gson = new GsonBuilder().registerTypeAdapter(Location.class, new JsonSerializer() { @Override