diff --git a/src/main/java/net/momirealms/customcrops/CustomCrops.java b/src/main/java/net/momirealms/customcrops/CustomCrops.java index efd8fe6..051ffbf 100644 --- a/src/main/java/net/momirealms/customcrops/CustomCrops.java +++ b/src/main/java/net/momirealms/customcrops/CustomCrops.java @@ -54,6 +54,7 @@ public final class CustomCrops extends JavaPlugin { List components = packet.getChatComponents().getValues(); for (WrappedChatComponent component : components) { if(component.toString().contains("Ender Chest")){ + //component.setJson("{\"text\":\"收纳袋\"}"); component.setJson("{\"translate\":\"container.enderchest\"}"); packet.getChatComponents().write(components.indexOf(component), component); } diff --git a/src/main/java/net/momirealms/customcrops/DataManager/BackUp.java b/src/main/java/net/momirealms/customcrops/DataManager/BackUp.java index 80a5f84..3ed8120 100644 --- a/src/main/java/net/momirealms/customcrops/DataManager/BackUp.java +++ b/src/main/java/net/momirealms/customcrops/DataManager/BackUp.java @@ -10,6 +10,7 @@ import java.text.SimpleDateFormat; import java.util.Date; public class BackUp { + public static void backUpData(){ Date date = new Date(); @@ -22,13 +23,11 @@ public class BackUp { try { BackUp.backUp(crop_data,cropBackUp); - } catch (IOException e) { e.printStackTrace(); } try { BackUp.backUp(sprinkler_data,sprinklerBackUp); - } catch (IOException e) { e.printStackTrace(); } diff --git a/src/main/java/net/momirealms/customcrops/DataManager/MaxCropsPerChunk.java b/src/main/java/net/momirealms/customcrops/DataManager/MaxCropsPerChunk.java index a29e2ad..0b7167a 100644 --- a/src/main/java/net/momirealms/customcrops/DataManager/MaxCropsPerChunk.java +++ b/src/main/java/net/momirealms/customcrops/DataManager/MaxCropsPerChunk.java @@ -3,13 +3,15 @@ package net.momirealms.customcrops.DataManager; import dev.lone.itemsadder.api.CustomBlock; import net.momirealms.customcrops.CustomCrops; import org.bukkit.Location; +import org.bukkit.block.Block; import org.bukkit.configuration.file.FileConfiguration; public class MaxCropsPerChunk { + static FileConfiguration config = CustomCrops.instance.getConfig(); + public static boolean maxCropsPerChunk(Location location){ - FileConfiguration config = CustomCrops.instance.getConfig(); if(!config.getBoolean("config.enable-limit")){ return false; } @@ -24,10 +26,10 @@ public class MaxCropsPerChunk { Label_out: for (int i = 0; i < 16; ++i) { for (int j = 0; j < 16; ++j) { - final Location square = chunkLocation.clone().add((double)i, 0.0, (double)j); + Location square = chunkLocation.clone().add(i, 0.0, j); for (int k = minY; k <= maxY; ++k) { square.add(0.0, 1.0, 0.0); - Blcok b = location.getWorld().getBlcokAt(square); + Block b = location.getWorld().getBlockAt(square); if(CustomBlock.byAlreadyPlaced(b)!= null){ if (CustomBlock.byAlreadyPlaced(b).getNamespacedID().contains("stage")) { if (n++ > maxAmount) { diff --git a/src/main/java/net/momirealms/customcrops/DataManager/MaxSprinklersPerChunk.java b/src/main/java/net/momirealms/customcrops/DataManager/MaxSprinklersPerChunk.java index 191d18c..b7a3228 100644 --- a/src/main/java/net/momirealms/customcrops/DataManager/MaxSprinklersPerChunk.java +++ b/src/main/java/net/momirealms/customcrops/DataManager/MaxSprinklersPerChunk.java @@ -7,8 +7,11 @@ import org.bukkit.World; import org.bukkit.configuration.file.FileConfiguration; public class MaxSprinklersPerChunk { + + static FileConfiguration config = CustomCrops.instance.getConfig(); + public static boolean maxSprinklersPerChunk(Location location){ - FileConfiguration config = CustomCrops.instance.getConfig(); + if(!config.getBoolean("config.enable-limit")){ return false; } @@ -24,7 +27,7 @@ public class MaxSprinklersPerChunk { Label_out: for (int i = 0; i < 16; ++i) { for (int j = 0; j < 16; ++j) { - final Location square = chunkLocation.clone().add((double)(i+0.5), 0.5, (double)(j+0.5)); + Location square = chunkLocation.clone().add(i+0.5, 0.5, j+0.5); for (int k = minY; k <= maxY; ++k) { square.add(0.0, 1.0, 0.0); if(IAFurniture.getFromLocation(square, world)){ @@ -37,4 +40,7 @@ public class MaxSprinklersPerChunk { } return n > maxAmount; } + public static boolean alreadyPlaced(Location location){ + return IAFurniture.getFromLocation(location.clone().add(0.5, 1.5, 0.5), location.getWorld()); + } }