From 642abb78c8a9189224baae0dd76cf7725586d07e Mon Sep 17 00:00:00 2001 From: Senne Van Rompaey Date: Fri, 2 Oct 2020 14:33:36 +0200 Subject: [PATCH 1/3] Add remaining carat golds to ore crusher --- .../items/multiblocks/OreCrusher.java | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/OreCrusher.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/OreCrusher.java index a1fd26c24..814ea561a 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/OreCrusher.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/OreCrusher.java @@ -53,6 +53,36 @@ public class OreCrusher extends MultiBlockMachine { recipes.add(SlimefunItems.GOLD_4K); recipes.add(SlimefunItems.GOLD_DUST); + recipes.add(SlimefunItems.GOLD_6K); + recipes.add(SlimefunItems.GOLD_DUST); + + recipes.add(SlimefunItems.GOLD_8K); + recipes.add(SlimefunItems.GOLD_DUST); + + recipes.add(SlimefunItems.GOLD_10K); + recipes.add(new SlimefunItemStack(SlimefunItems.GOLD_DUST, 2)); + + recipes.add(SlimefunItems.GOLD_12K); + recipes.add(new SlimefunItemStack(SlimefunItems.GOLD_DUST, 2)); + + recipes.add(SlimefunItems.GOLD_14K); + recipes.add(new SlimefunItemStack(SlimefunItems.GOLD_DUST, 2)); + + recipes.add(SlimefunItems.GOLD_16K); + recipes.add(new SlimefunItemStack(SlimefunItems.GOLD_DUST, 2)); + + recipes.add(SlimefunItems.GOLD_18K); + recipes.add(new SlimefunItemStack(SlimefunItems.GOLD_DUST, 3)); + + recipes.add(SlimefunItems.GOLD_20K); + recipes.add(new SlimefunItemStack(SlimefunItems.GOLD_DUST, 3)); + + recipes.add(SlimefunItems.GOLD_22K); + recipes.add(new SlimefunItemStack(SlimefunItems.GOLD_DUST, 3)); + + recipes.add(SlimefunItems.GOLD_24K); + recipes.add(new SlimefunItemStack(SlimefunItems.GOLD_DUST, 3)); + recipes.add(new ItemStack(Material.GRAVEL)); recipes.add(new ItemStack(Material.SAND)); From b9750917a697260631f461f7c6392432885a7cb1 Mon Sep 17 00:00:00 2001 From: Senne Van Rompaey Date: Sat, 3 Oct 2020 17:02:36 +0200 Subject: [PATCH 2/3] Rebalance yield results --- .../items/multiblocks/OreCrusher.java | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/OreCrusher.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/OreCrusher.java index 814ea561a..d0f93c00c 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/OreCrusher.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/OreCrusher.java @@ -54,34 +54,34 @@ public class OreCrusher extends MultiBlockMachine { recipes.add(SlimefunItems.GOLD_DUST); recipes.add(SlimefunItems.GOLD_6K); - recipes.add(SlimefunItems.GOLD_DUST); + recipes.add(new SlimefunItemStack(SlimefunItems.GOLD_DUST, 2)); recipes.add(SlimefunItems.GOLD_8K); - recipes.add(SlimefunItems.GOLD_DUST); + recipes.add(new SlimefunItemStack(SlimefunItems.GOLD_DUST, 2)); recipes.add(SlimefunItems.GOLD_10K); - recipes.add(new SlimefunItemStack(SlimefunItems.GOLD_DUST, 2)); + recipes.add(new SlimefunItemStack(SlimefunItems.GOLD_DUST, 3)); recipes.add(SlimefunItems.GOLD_12K); - recipes.add(new SlimefunItemStack(SlimefunItems.GOLD_DUST, 2)); + recipes.add(new SlimefunItemStack(SlimefunItems.GOLD_DUST, 3)); recipes.add(SlimefunItems.GOLD_14K); - recipes.add(new SlimefunItemStack(SlimefunItems.GOLD_DUST, 2)); + recipes.add(new SlimefunItemStack(SlimefunItems.GOLD_DUST, 4)); recipes.add(SlimefunItems.GOLD_16K); - recipes.add(new SlimefunItemStack(SlimefunItems.GOLD_DUST, 2)); + recipes.add(new SlimefunItemStack(SlimefunItems.GOLD_DUST, 4)); recipes.add(SlimefunItems.GOLD_18K); - recipes.add(new SlimefunItemStack(SlimefunItems.GOLD_DUST, 3)); + recipes.add(new SlimefunItemStack(SlimefunItems.GOLD_DUST, 5)); recipes.add(SlimefunItems.GOLD_20K); - recipes.add(new SlimefunItemStack(SlimefunItems.GOLD_DUST, 3)); + recipes.add(new SlimefunItemStack(SlimefunItems.GOLD_DUST, 5)); recipes.add(SlimefunItems.GOLD_22K); - recipes.add(new SlimefunItemStack(SlimefunItems.GOLD_DUST, 3)); + recipes.add(new SlimefunItemStack(SlimefunItems.GOLD_DUST, 6)); recipes.add(SlimefunItems.GOLD_24K); - recipes.add(new SlimefunItemStack(SlimefunItems.GOLD_DUST, 3)); + recipes.add(new SlimefunItemStack(SlimefunItems.GOLD_DUST, 6)); recipes.add(new ItemStack(Material.GRAVEL)); recipes.add(new ItemStack(Material.SAND)); From a2cb2eb32419fb9f63d7a39d8240936aadfc217e Mon Sep 17 00:00:00 2001 From: TheBusyBiscuit Date: Sat, 3 Oct 2020 22:03:30 +0200 Subject: [PATCH 3/3] [CI skip] Updated changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6eebdfaad..b4653ef0e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -30,6 +30,7 @@ * Added various new fuel types to the Coal Generator * Added a config option for Grappling Hooks to not be consumed on use * Added Talisman of the Caveman +* You can now convert any gold ingot into gold dust with slightly less returns #### Changes * Improved Auto-Updater (Multi-Threading and more)