From 435f09b6b13dfcbc1bfcc3102333479ab3715bd5 Mon Sep 17 00:00:00 2001 From: ybw0014 Date: Sun, 7 Aug 2022 17:46:28 -0400 Subject: [PATCH] Remove more version specific stuff --- .../slimefun4/api/recipes/RecipeType.java | 4 +- .../core/multiblocks/MultiBlock.java | 6 +- .../items/androids/WoodcutterAndroid.java | 97 +++++++++---------- .../implementation/items/blocks/Crucible.java | 10 +- .../electric/machines/ElectricPress.java | 4 +- .../machines/ElectrifiedCrucible.java | 6 +- .../items/magical/MagicalZombiePills.java | 2 +- .../items/multiblocks/OreCrusher.java | 10 +- .../multiblocks/miner/IndustrialMiner.java | 2 +- .../multiblocks/miner/OreDictionary.java | 5 +- .../multiblocks/miner/OreDictionary14.java | 35 ------- .../multiblocks/miner/OreDictionary16.java | 13 ++- .../resources/NetherIceResource.java | 7 +- .../resources/UraniumResource.java | 5 +- .../slimefun4/utils/SlimefunUtils.java | 11 +-- .../slimefun4/utils/WorldUtils.java | 7 +- 16 files changed, 75 insertions(+), 149 deletions(-) delete mode 100644 src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/miner/OreDictionary14.java diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/api/recipes/RecipeType.java b/src/main/java/io/github/thebusybiscuit/slimefun4/api/recipes/RecipeType.java index 4cbefc2d9..0fc2ac4a1 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/api/recipes/RecipeType.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/api/recipes/RecipeType.java @@ -163,9 +163,7 @@ public class RecipeType implements Keyed { @ParametersAreNonnullByDefault private static void registerBarterDrop(ItemStack[] recipe, ItemStack output) { - if (Slimefun.getMinecraftVersion().isAtLeast(MinecraftVersion.MINECRAFT_1_16)) { - Slimefun.getRegistry().getBarteringDrops().add(output); - } + Slimefun.getRegistry().getBarteringDrops().add(output); } @ParametersAreNonnullByDefault diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/multiblocks/MultiBlock.java b/src/main/java/io/github/thebusybiscuit/slimefun4/core/multiblocks/MultiBlock.java index d69e86214..411d160c1 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/multiblocks/MultiBlock.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/core/multiblocks/MultiBlock.java @@ -43,11 +43,7 @@ public class MultiBlock { SUPPORTED_TAGS.add(Tag.WOODEN_TRAPDOORS); SUPPORTED_TAGS.add(Tag.WOODEN_SLABS); SUPPORTED_TAGS.add(Tag.WOODEN_FENCES); - - // Add Soul Fire support on 1.16 - if (Slimefun.getMinecraftVersion().isAtLeast(MinecraftVersion.MINECRAFT_1_16)) { - SUPPORTED_TAGS.add(Tag.FIRE); - } + SUPPORTED_TAGS.add(Tag.FIRE); } @Nonnull diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/androids/WoodcutterAndroid.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/androids/WoodcutterAndroid.java index 55f29b6c3..ea4a5ddaf 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/androids/WoodcutterAndroid.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/androids/WoodcutterAndroid.java @@ -92,70 +92,63 @@ public class WoodcutterAndroid extends ProgrammableAndroid { Predicate soilRequirement = null; switch (logType) { - case OAK_LOG: - case OAK_WOOD: - case STRIPPED_OAK_LOG: - case STRIPPED_OAK_WOOD: + case OAK_LOG, + OAK_WOOD, + STRIPPED_OAK_LOG, + STRIPPED_OAK_WOOD -> { saplingType = Material.OAK_SAPLING; soilRequirement = SlimefunTag.DIRT_VARIANTS::isTagged; - break; - case BIRCH_LOG: - case BIRCH_WOOD: - case STRIPPED_BIRCH_LOG: - case STRIPPED_BIRCH_WOOD: + } + case BIRCH_LOG, + BIRCH_WOOD, + STRIPPED_BIRCH_LOG, + STRIPPED_BIRCH_WOOD -> { saplingType = Material.BIRCH_SAPLING; soilRequirement = SlimefunTag.DIRT_VARIANTS::isTagged; - break; - case JUNGLE_LOG: - case JUNGLE_WOOD: - case STRIPPED_JUNGLE_LOG: - case STRIPPED_JUNGLE_WOOD: + } + case JUNGLE_LOG, + JUNGLE_WOOD, + STRIPPED_JUNGLE_LOG, + STRIPPED_JUNGLE_WOOD -> { saplingType = Material.JUNGLE_SAPLING; soilRequirement = SlimefunTag.DIRT_VARIANTS::isTagged; - break; - case SPRUCE_LOG: - case SPRUCE_WOOD: - case STRIPPED_SPRUCE_LOG: - case STRIPPED_SPRUCE_WOOD: + } + case SPRUCE_LOG, + SPRUCE_WOOD, + STRIPPED_SPRUCE_LOG, + STRIPPED_SPRUCE_WOOD -> { saplingType = Material.SPRUCE_SAPLING; soilRequirement = SlimefunTag.DIRT_VARIANTS::isTagged; - break; - case ACACIA_LOG: - case ACACIA_WOOD: - case STRIPPED_ACACIA_LOG: - case STRIPPED_ACACIA_WOOD: + } + case ACACIA_LOG, + ACACIA_WOOD, + STRIPPED_ACACIA_LOG, + STRIPPED_ACACIA_WOOD -> { saplingType = Material.ACACIA_SAPLING; soilRequirement = SlimefunTag.DIRT_VARIANTS::isTagged; - break; - case DARK_OAK_LOG: - case DARK_OAK_WOOD: - case STRIPPED_DARK_OAK_LOG: - case STRIPPED_DARK_OAK_WOOD: + } + case DARK_OAK_LOG, + DARK_OAK_WOOD, + STRIPPED_DARK_OAK_LOG, + STRIPPED_DARK_OAK_WOOD -> { saplingType = Material.DARK_OAK_SAPLING; soilRequirement = SlimefunTag.DIRT_VARIANTS::isTagged; - break; - default: - break; - } - - if (Slimefun.getMinecraftVersion().isAtLeast(MinecraftVersion.MINECRAFT_1_16)) { - switch (logType) { - case CRIMSON_STEM: - case CRIMSON_HYPHAE: - case STRIPPED_CRIMSON_STEM: - case STRIPPED_CRIMSON_HYPHAE: - saplingType = Material.CRIMSON_FUNGUS; - soilRequirement = SlimefunTag.FUNGUS_SOIL::isTagged; - break; - case WARPED_STEM: - case WARPED_HYPHAE: - case STRIPPED_WARPED_STEM: - case STRIPPED_WARPED_HYPHAE: - saplingType = Material.WARPED_FUNGUS; - soilRequirement = SlimefunTag.FUNGUS_SOIL::isTagged; - break; - default: - break; + } + case CRIMSON_STEM, + CRIMSON_HYPHAE, + STRIPPED_CRIMSON_STEM, + STRIPPED_CRIMSON_HYPHAE -> { + saplingType = Material.CRIMSON_FUNGUS; + soilRequirement = SlimefunTag.FUNGUS_SOIL::isTagged; + } + case WARPED_STEM, + WARPED_HYPHAE, + STRIPPED_WARPED_STEM, + STRIPPED_WARPED_HYPHAE -> { + saplingType = Material.WARPED_FUNGUS; + soilRequirement = SlimefunTag.FUNGUS_SOIL::isTagged; + } + default -> { } } diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/blocks/Crucible.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/blocks/Crucible.java index 575177c71..1c7c05c7e 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/blocks/Crucible.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/blocks/Crucible.java @@ -90,13 +90,11 @@ public class Crucible extends SimpleSlimefunItem implements Rec items.add(new ItemStack(Material.LAVA_BUCKET)); } - if (Slimefun.getMinecraftVersion().isAtLeast(MinecraftVersion.MINECRAFT_1_16)) { - items.add(new ItemStack(Material.BLACKSTONE, 8)); - items.add(new ItemStack(Material.LAVA_BUCKET)); + items.add(new ItemStack(Material.BLACKSTONE, 8)); + items.add(new ItemStack(Material.LAVA_BUCKET)); - items.add(new ItemStack(Material.BASALT, 12)); - items.add(new ItemStack(Material.LAVA_BUCKET)); - } + items.add(new ItemStack(Material.BASALT, 12)); + items.add(new ItemStack(Material.LAVA_BUCKET)); if (Slimefun.getMinecraftVersion().isAtLeast(MinecraftVersion.MINECRAFT_1_17)) { items.add(new ItemStack(Material.COBBLED_DEEPSLATE, 12)); diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/ElectricPress.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/ElectricPress.java index 5cea6710d..b5cb6f2f4 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/ElectricPress.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/ElectricPress.java @@ -75,9 +75,7 @@ public class ElectricPress extends AContainer implements RecipeDisplayItem { addRecipe(8, new ItemStack(Material.EMERALD, 9), new ItemStack(Material.EMERALD_BLOCK)); addRecipe(8, new ItemStack(Material.DIAMOND, 9), new ItemStack(Material.DIAMOND_BLOCK)); - if (Slimefun.getMinecraftVersion().isAtLeast(MinecraftVersion.MINECRAFT_1_16)) { - addRecipe(16, new ItemStack(Material.NETHERITE_INGOT, 9), new ItemStack(Material.NETHERITE_BLOCK)); - } + addRecipe(16, new ItemStack(Material.NETHERITE_INGOT, 9), new ItemStack(Material.NETHERITE_BLOCK)); if (Slimefun.getMinecraftVersion().isAtLeast(MinecraftVersion.MINECRAFT_1_17)) { addRecipe(4, new ItemStack(Material.AMETHYST_SHARD, 4), new ItemStack(Material.AMETHYST_BLOCK)); diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/ElectrifiedCrucible.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/ElectrifiedCrucible.java index e7be0631b..ff5a33474 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/ElectrifiedCrucible.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/ElectrifiedCrucible.java @@ -35,10 +35,8 @@ public class ElectrifiedCrucible extends AContainer { registerRecipe(10, new ItemStack[] { new ItemStack(Material.BUCKET), new ItemStack(leaves, 16) }, new ItemStack[] { new ItemStack(Material.WATER_BUCKET) }); } - if (Slimefun.getMinecraftVersion().isAtLeast(MinecraftVersion.MINECRAFT_1_16)) { - registerRecipe(10, new ItemStack[] { new ItemStack(Material.BUCKET), new ItemStack(Material.BLACKSTONE, 8) }, new ItemStack[] { new ItemStack(Material.LAVA_BUCKET) }); - registerRecipe(10, new ItemStack[] { new ItemStack(Material.BUCKET), new ItemStack(Material.BASALT, 12) }, new ItemStack[] { new ItemStack(Material.LAVA_BUCKET) }); - } + registerRecipe(10, new ItemStack[] { new ItemStack(Material.BUCKET), new ItemStack(Material.BLACKSTONE, 8) }, new ItemStack[] { new ItemStack(Material.LAVA_BUCKET) }); + registerRecipe(10, new ItemStack[] { new ItemStack(Material.BUCKET), new ItemStack(Material.BASALT, 12) }, new ItemStack[] { new ItemStack(Material.LAVA_BUCKET) }); if (Slimefun.getMinecraftVersion().isAtLeast(MinecraftVersion.MINECRAFT_1_17)) { registerRecipe(10, new ItemStack[] { new ItemStack(Material.BUCKET), new ItemStack(Material.COBBLED_DEEPSLATE, 12) }, new ItemStack[] { new ItemStack(Material.LAVA_BUCKET) }); diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/magical/MagicalZombiePills.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/magical/MagicalZombiePills.java index dfb328cb1..2c14589c2 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/magical/MagicalZombiePills.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/magical/MagicalZombiePills.java @@ -64,7 +64,7 @@ public class MagicalZombiePills extends SimpleSlimefunItem new ItemStack(Material.COAL); - case DIAMOND_ORE -> new ItemStack(Material.DIAMOND); - case EMERALD_ORE -> new ItemStack(Material.EMERALD); - case REDSTONE_ORE -> new ItemStack(Material.REDSTONE, 4 + random.nextInt(2)); - case LAPIS_ORE -> new ItemStack(Material.LAPIS_LAZULI, 4 + random.nextInt(4)); - case NETHER_QUARTZ_ORE -> new ItemStack(Material.QUARTZ); - case IRON_ORE -> new ItemStack(Material.IRON_ORE); - case GOLD_ORE -> new ItemStack(Material.GOLD_ORE); - default -> new ItemStack(material); - }; - } - -} diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/miner/OreDictionary16.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/miner/OreDictionary16.java index 8a78b5195..f69ebc46d 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/miner/OreDictionary16.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/miner/OreDictionary16.java @@ -14,16 +14,23 @@ import org.bukkit.inventory.ItemStack; * @author TheBusyBiscuit * */ -class OreDictionary16 extends OreDictionary14 { +class OreDictionary16 implements OreDictionary { @Override @ParametersAreNonnullByDefault public @Nonnull ItemStack getDrops(Material material, Random random) { return switch (material) { - // In 1.16, breaking nether gold ores should get gold nuggets + case COAL_ORE -> new ItemStack(Material.COAL); + case DIAMOND_ORE -> new ItemStack(Material.DIAMOND); + case EMERALD_ORE -> new ItemStack(Material.EMERALD); + case REDSTONE_ORE -> new ItemStack(Material.REDSTONE, 4 + random.nextInt(2)); + case LAPIS_ORE -> new ItemStack(Material.LAPIS_LAZULI, 4 + random.nextInt(4)); + case NETHER_QUARTZ_ORE -> new ItemStack(Material.QUARTZ); + case IRON_ORE -> new ItemStack(Material.IRON_ORE); + case GOLD_ORE -> new ItemStack(Material.GOLD_ORE); case NETHER_GOLD_ORE -> new ItemStack(Material.GOLD_NUGGET, 2 + random.nextInt(4)); case ANCIENT_DEBRIS -> new ItemStack(Material.ANCIENT_DEBRIS); - default -> super.getDrops(material, random); + default -> new ItemStack(material); }; } diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/resources/NetherIceResource.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/resources/NetherIceResource.java index e7d6f06a2..28b6d612d 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/resources/NetherIceResource.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/resources/NetherIceResource.java @@ -25,12 +25,7 @@ class NetherIceResource extends AbstractResource { NetherIceResource() { super("nether_ice", "Nether Ice", SlimefunItems.NETHER_ICE, 6, true); - if (Slimefun.getMinecraftVersion().isAtLeast(MinecraftVersion.MINECRAFT_1_16)) { - // 1.16+ introduced Nether biomes - biomes = getBiomeMap(this, "/biome-maps/nether_ice_v1.16.json"); - } else { - biomes = getBiomeMap(this, "/biome-maps/nether_ice_v1.14.json"); - } + biomes = getBiomeMap(this, "/biome-maps/nether_ice_v1.16.json"); } @Override diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/resources/UraniumResource.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/resources/UraniumResource.java index 8eeca8dfa..ef4ffba76 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/resources/UraniumResource.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/resources/UraniumResource.java @@ -32,11 +32,8 @@ class UraniumResource extends AbstractResource { } else if (version.isAtLeast(MinecraftVersion.MINECRAFT_1_17)) { // 1.17+ introduced cave biomes biomes = getBiomeMap(this, "/biome-maps/uranium_v1.17.json"); - } else if (version.isAtLeast(MinecraftVersion.MINECRAFT_1_16)) { - // 1.16+ introduced Nether biomes - biomes = getBiomeMap(this, "/biome-maps/uranium_v1.16.json"); } else { - biomes = getBiomeMap(this, "/biome-maps/uranium_v1.14.json"); + biomes = getBiomeMap(this, "/biome-maps/uranium_v1.16.json"); } } diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/utils/SlimefunUtils.java b/src/main/java/io/github/thebusybiscuit/slimefun4/utils/SlimefunUtils.java index 429ba8232..bac16f352 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/utils/SlimefunUtils.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/utils/SlimefunUtils.java @@ -531,15 +531,6 @@ public final class SlimefunUtils { * @return True if the inventory is empty and false otherwise */ public static boolean isInventoryEmpty(@Nonnull Inventory inventory) { - if (Slimefun.getMinecraftVersion().isAtLeast(MinecraftVersion.MINECRAFT_1_16)) { - return inventory.isEmpty(); - } else { - for (ItemStack is : inventory.getStorageContents()) { - if (is != null && !is.getType().isAir()) { - return false; - } - } - return true; - } + return inventory.isEmpty(); } } diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/utils/WorldUtils.java b/src/main/java/io/github/thebusybiscuit/slimefun4/utils/WorldUtils.java index 094600bd4..8de891611 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/utils/WorldUtils.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/utils/WorldUtils.java @@ -30,11 +30,6 @@ public final class WorldUtils { public static int getMinHeight(@Nonnull World world) { Validate.notNull(world, "World cannot be null!"); - if (Slimefun.getMinecraftVersion().isAtLeast(MinecraftVersion.MINECRAFT_1_16)) { - return world.getMinHeight(); - } else { - // Default to zero for pre-1.16 worlds - return 0; - } + return world.getMinHeight(); } }