From 323ddc949be7a22fa58077b30b56f4b1c40ff902 Mon Sep 17 00:00:00 2001 From: TheBusyBiscuit Date: Sat, 23 May 2020 20:34:37 +0200 Subject: [PATCH] Fixes #1926 --- CHANGELOG.md | 2 ++ .../implementation/items/blocks/Crucible.java | 3 +++ .../items/electric/machines/ElectrifiedCrucible.java | 11 +++++------ 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 709c92e61..6af6be8a6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -31,6 +31,7 @@ * Player Profiles (researches and stuff) are now loaded completely asynchronously * The Infused Magnet can no longer be placed down * AncientAltar speed can now be changed internally (not available for server owners yet) +* Finished Italian translations #### Fixes * Fixed #1824 @@ -53,6 +54,7 @@ * Fixed #1914 * Fixed file errors with PerWorldSettingsService * Fixed ChestTerminals deleting items from Cargo networks (TheBusyBiscuit/ChestTerminal#25) +* Fixed #1926 ## Release Candidate 11 (25 Apr 2020) 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 c508eb1dc..2e6de5d10 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 @@ -57,6 +57,9 @@ public class Crucible extends SimpleSlimefunItem implements Rec items.add(new ItemStack(Material.OBSIDIAN, 1)); items.add(new ItemStack(Material.LAVA_BUCKET)); + items.add(new ItemStack(Material.TERRACOTTA, 12)); + items.add(new ItemStack(Material.LAVA_BUCKET)); + for (Material leave : MaterialCollections.getAllLeaves()) { items.add(new ItemStack(leave, 16)); items.add(new ItemStack(Material.WATER_BUCKET)); 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 f60d434ad..0b199e18c 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 @@ -1,6 +1,7 @@ package io.github.thebusybiscuit.slimefun4.implementation.items.electric.machines; import org.bukkit.Material; +import org.bukkit.Tag; import org.bukkit.inventory.ItemStack; import io.github.thebusybiscuit.cscorelib2.materials.MaterialCollections; @@ -19,17 +20,15 @@ public abstract class ElectrifiedCrucible extends AContainer { protected void registerDefaultRecipes() { registerRecipe(10, new ItemStack[] { new ItemStack(Material.BUCKET), new ItemStack(Material.COBBLESTONE, 16) }, new ItemStack[] { new ItemStack(Material.LAVA_BUCKET) }); registerRecipe(8, new ItemStack[] { new ItemStack(Material.BUCKET), new ItemStack(Material.TERRACOTTA, 12) }, new ItemStack[] { new ItemStack(Material.LAVA_BUCKET) }); + registerRecipe(10, new ItemStack[] { new ItemStack(Material.BUCKET), new ItemStack(Material.OBSIDIAN) }, new ItemStack[] { new ItemStack(Material.LAVA_BUCKET) }); for (Material terracotta : MaterialCollections.getAllTerracottaColors().getAsArray()) { registerRecipe(8, new ItemStack[] { new ItemStack(Material.BUCKET), new ItemStack(terracotta, 12) }, new ItemStack[] { new ItemStack(Material.LAVA_BUCKET) }); } - registerRecipe(10, new ItemStack[] { new ItemStack(Material.BUCKET), new ItemStack(Material.OAK_LEAVES, 16) }, new ItemStack[] { new ItemStack(Material.WATER_BUCKET) }); - registerRecipe(10, new ItemStack[] { new ItemStack(Material.BUCKET), new ItemStack(Material.BIRCH_LEAVES, 16) }, new ItemStack[] { new ItemStack(Material.WATER_BUCKET) }); - registerRecipe(10, new ItemStack[] { new ItemStack(Material.BUCKET), new ItemStack(Material.SPRUCE_LEAVES, 16) }, new ItemStack[] { new ItemStack(Material.WATER_BUCKET) }); - registerRecipe(10, new ItemStack[] { new ItemStack(Material.BUCKET), new ItemStack(Material.JUNGLE_LEAVES, 16) }, new ItemStack[] { new ItemStack(Material.WATER_BUCKET) }); - registerRecipe(10, new ItemStack[] { new ItemStack(Material.BUCKET), new ItemStack(Material.ACACIA_LEAVES, 16) }, new ItemStack[] { new ItemStack(Material.WATER_BUCKET) }); - registerRecipe(10, new ItemStack[] { new ItemStack(Material.BUCKET), new ItemStack(Material.DARK_OAK_LEAVES, 16) }, new ItemStack[] { new ItemStack(Material.WATER_BUCKET) }); + for (Material leaves : Tag.LEAVES.getValues()) { + registerRecipe(10, new ItemStack[] { new ItemStack(Material.BUCKET), new ItemStack(leaves, 16) }, new ItemStack[] { new ItemStack(Material.WATER_BUCKET) }); + } } @Override