From 3f58de3d7efac3982a3740ee1a10cfb451c5f1e8 Mon Sep 17 00:00:00 2001 From: Gabriele C Date: Sat, 5 Oct 2019 22:05:39 +0200 Subject: [PATCH] Fix 1.13.2 support --- .gitignore | 86 +++++++++++++++++++ pom.xml | 2 +- .../addon/limits/commands/LimitPanel.java | 11 ++- .../limits/listeners/BlockLimitsListener.java | 36 ++++---- 4 files changed, 113 insertions(+), 22 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..e817b41 --- /dev/null +++ b/.gitignore @@ -0,0 +1,86 @@ +# Git +*.orig +!.gitignore + +# Windows +Thumbs.db +ehthumbs.db +ehthumbs_vista.db +*.stackdump +[Dd]esktop.ini +$RECYCLE.BIN/ +*.lnk + +# Linux +*~ +.fuse_hidden* +.directory +.Trash-* +.nfs* + +# MacOS +.DS_Store +.AppleDouble +.LSOverride +._* + +# Java +*.class +*.log +*.ctxt +.mtj.tmp/ +*.jar +*.war +*.nar +*.ear +hs_err_pid* + +# Maven +target/ +pom.xml.tag +pom.xml.releaseBackup +pom.xml.versionsBackup +pom.xml.next +release.properties +dependency-reduced-pom.xml +buildNumber.properties + +# Intellij +*.iml +*.java___jb_tmp___ +.idea/* +*.ipr +*.iws +/out/ +.idea_modules/ + +# Eclipse +*.pydevproject +.metadata +.gradle +bin/ +tmp/ +*.tmp +*.bak +*.swp +*~.nib +local.properties +.settings/ +.loadpath +.project +.externalToolBuilders/ +*.launch +.cproject +.classpath +.buildpath +.target + +# NetBeans +nbproject/private/ +build/ +nbbuild/ +dist/ +nbdist/ +nbactions.xml +nb-configuration.xml +.nb-gradle/ diff --git a/pom.xml b/pom.xml index dc745a8..3ac0214 100644 --- a/pom.xml +++ b/pom.xml @@ -45,7 +45,7 @@ 2.0.2 - 1.14.4-R0.1-SNAPSHOT + 1.13.2-R0.1-SNAPSHOT 1.6.0 ${build.version}-SNAPSHOT diff --git a/src/main/java/bentobox/addon/limits/commands/LimitPanel.java b/src/main/java/bentobox/addon/limits/commands/LimitPanel.java index dff1647..6a0abbd 100644 --- a/src/main/java/bentobox/addon/limits/commands/LimitPanel.java +++ b/src/main/java/bentobox/addon/limits/commands/LimitPanel.java @@ -3,6 +3,7 @@ package bentobox.addon.limits.commands; import java.util.HashMap; import java.util.Map; import java.util.Map.Entry; +import java.util.Optional; import java.util.UUID; import org.bukkit.Material; @@ -50,7 +51,6 @@ public class LimitPanel { E2M.put(EntityType.MINECART_FURNACE, Material.FURNACE_MINECART); E2M.put(EntityType.MINECART_HOPPER, Material.HOPPER_MINECART); E2M.put(EntityType.MINECART_MOB_SPAWNER, Material.MINECART); - E2M.put(EntityType.MINECART_TNT, Material.TNT_MINECART); // Disallowed E2M.put(EntityType.PRIMED_TNT, null); E2M.put(EntityType.EVOKER_FANGS, null); @@ -59,7 +59,6 @@ public class LimitPanel { E2M.put(EntityType.AREA_EFFECT_CLOUD, null); E2M.put(EntityType.ENDER_SIGNAL, null); E2M.put(EntityType.SMALL_FIREBALL, null); - E2M.put(EntityType.DRAGON_FIREBALL, null); E2M.put(EntityType.FIREBALL, null); E2M.put(EntityType.THROWN_EXP_BOTTLE, null); E2M.put(EntityType.EXPERIENCE_ORB, null); @@ -76,11 +75,15 @@ public class LimitPanel { E2M.put(EntityType.ENDER_PEARL, null); E2M.put(EntityType.ENDER_DRAGON, null); // Block to Material icons - B2M.put(Material.SWEET_BERRY_BUSH, Material.SWEET_BERRIES); + Optional.ofNullable(Material.getMaterial("SWEET_BERRY_BUSH")).ifPresent(material -> { + B2M.put(material, Material.getMaterial("SWEET_BERRIES")); + }); B2M.put(Material.POTATOES, Material.POTATO); B2M.put(Material.CARROTS, Material.CARROT); B2M.put(Material.BEETROOTS, Material.BEETROOT); - B2M.put(Material.BAMBOO_SAPLING, Material.BAMBOO); + Optional.ofNullable(Material.getMaterial("BAMBOO_SAPLING")).ifPresent(material -> { + B2M.put(material, Material.getMaterial("BAMBOO")); + }); B2M.put(Material.REDSTONE_WIRE, Material.REDSTONE); } diff --git a/src/main/java/bentobox/addon/limits/listeners/BlockLimitsListener.java b/src/main/java/bentobox/addon/limits/listeners/BlockLimitsListener.java index e2b4401..f5185e0 100644 --- a/src/main/java/bentobox/addon/limits/listeners/BlockLimitsListener.java +++ b/src/main/java/bentobox/addon/limits/listeners/BlockLimitsListener.java @@ -1,10 +1,6 @@ package bentobox.addon.limits.listeners; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; import org.bukkit.Bukkit; import org.bukkit.Material; @@ -49,7 +45,15 @@ public class BlockLimitsListener implements Listener { * Blocks that are not counted */ private static final List DO_NOT_COUNT = Arrays.asList(Material.LAVA, Material.WATER, Material.AIR, Material.FIRE, Material.END_PORTAL, Material.NETHER_PORTAL); - private static final List STACKABLE = Arrays.asList(Material.SUGAR_CANE, Material.BAMBOO); + private static final List STACKABLE; + + static { + List stackable = new ArrayList<>(); + stackable.add(Material.SUGAR_CANE); + Optional.ofNullable(Material.getMaterial("BAMBOO")).ifPresent(stackable::add); + STACKABLE = Collections.unmodifiableList(stackable); + } + /** * Save every 10 blocks of change */ @@ -265,24 +269,22 @@ public class BlockLimitsListener implements Listener { // Return equivalents. public Material fixMaterial(Material b) { - switch (b) { - case REDSTONE_WALL_TORCH: + if (b == Material.REDSTONE_WALL_TORCH) { return Material.REDSTONE_TORCH; - case WALL_TORCH: + } else if (b == Material.WALL_TORCH) { return Material.TORCH; - case ZOMBIE_WALL_HEAD: + } else if (b == Material.ZOMBIE_WALL_HEAD) { return Material.ZOMBIE_HEAD; - case CREEPER_WALL_HEAD: + } else if (b == Material.CREEPER_WALL_HEAD) { return Material.CREEPER_HEAD; - case PLAYER_WALL_HEAD: + } else if (b == Material.PLAYER_WALL_HEAD) { return Material.PLAYER_HEAD; - case DRAGON_WALL_HEAD: + } else if (b == Material.DRAGON_WALL_HEAD) { return Material.DRAGON_HEAD; - case BAMBOO_SAPLING: - return Material.BAMBOO; - default: - return b; + } else if (b != null && b == Material.getMaterial("BAMBOO_SAPLING")) { + return Material.getMaterial("BAMBOO"); } + return b; } /**