From cf777126ba9662a235621f953e378892d7883c1d Mon Sep 17 00:00:00 2001 From: TheBusyBiscuit Date: Sat, 9 May 2020 10:48:02 +0200 Subject: [PATCH 1/4] [CI skip] Deprecated two methods because the Research class will move --- src/main/java/me/mrCookieSlime/Slimefun/api/Slimefun.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/me/mrCookieSlime/Slimefun/api/Slimefun.java b/src/main/java/me/mrCookieSlime/Slimefun/api/Slimefun.java index 2215c18ba..b232a611f 100644 --- a/src/main/java/me/mrCookieSlime/Slimefun/api/Slimefun.java +++ b/src/main/java/me/mrCookieSlime/Slimefun/api/Slimefun.java @@ -49,6 +49,7 @@ public final class Slimefun { * @param items * the items to bind, not null */ + @Deprecated public static void registerResearch(Research research, ItemStack... items) { for (ItemStack item : items) { research.addItems(SlimefunItem.getByItem(item)); @@ -57,6 +58,7 @@ public final class Slimefun { research.register(); } + @Deprecated public static void registerResearch(NamespacedKey key, int id, String name, int cost, ItemStack... items) { registerResearch(new Research(key, id, name, cost), items); } From cd0baa307ef99565f0673ae7cdc02e944630c572 Mon Sep 17 00:00:00 2001 From: jacky Date: Sat, 9 May 2020 21:22:25 +0800 Subject: [PATCH 2/4] Fixes Prismarine Brick duplication bug with Grind Stone #1829 --- .../slimefun4/implementation/items/multiblocks/GrindStone.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/GrindStone.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/GrindStone.java index 971659036..d3a716871 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/GrindStone.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/GrindStone.java @@ -37,7 +37,7 @@ public class GrindStone extends MultiBlockMachine { new ItemStack(Material.DIRT), SlimefunItems.STONE_CHUNK, new ItemStack(Material.SANDSTONE), new ItemStack(Material.SAND, 4), new ItemStack(Material.RED_SANDSTONE), new ItemStack(Material.RED_SAND, 4), - new ItemStack(Material.PRISMARINE_BRICKS), new ItemStack(Material.PRISMARINE, 4), + new ItemStack(Material.PRISMARINE_BRICKS), new ItemStack(Material.PRISMARINE, 2), new ItemStack(Material.PRISMARINE), new ItemStack(Material.PRISMARINE_SHARD, 4) }, BlockFace.SELF From e329560d6d335f82a5096d6180559a707c75150b Mon Sep 17 00:00:00 2001 From: jacky Date: Sat, 9 May 2020 22:04:07 +0800 Subject: [PATCH 3/4] Revert "Fixes Prismarine Brick duplication bug with Grind Stone #1829" This reverts commit cd0baa30 --- .../slimefun4/implementation/items/multiblocks/GrindStone.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/GrindStone.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/GrindStone.java index d3a716871..971659036 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/GrindStone.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/GrindStone.java @@ -37,7 +37,7 @@ public class GrindStone extends MultiBlockMachine { new ItemStack(Material.DIRT), SlimefunItems.STONE_CHUNK, new ItemStack(Material.SANDSTONE), new ItemStack(Material.SAND, 4), new ItemStack(Material.RED_SANDSTONE), new ItemStack(Material.RED_SAND, 4), - new ItemStack(Material.PRISMARINE_BRICKS), new ItemStack(Material.PRISMARINE, 2), + new ItemStack(Material.PRISMARINE_BRICKS), new ItemStack(Material.PRISMARINE, 4), new ItemStack(Material.PRISMARINE), new ItemStack(Material.PRISMARINE_SHARD, 4) }, BlockFace.SELF From d806837000dd91b704d2ca41ddab55818ddff409 Mon Sep 17 00:00:00 2001 From: jacky Date: Sat, 9 May 2020 22:04:27 +0800 Subject: [PATCH 4/4] Fixes Prismarine Brick duplication bug with Grind Stone #1851 --- .../slimefun4/implementation/items/multiblocks/GrindStone.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/GrindStone.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/GrindStone.java index 971659036..d3a716871 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/GrindStone.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/GrindStone.java @@ -37,7 +37,7 @@ public class GrindStone extends MultiBlockMachine { new ItemStack(Material.DIRT), SlimefunItems.STONE_CHUNK, new ItemStack(Material.SANDSTONE), new ItemStack(Material.SAND, 4), new ItemStack(Material.RED_SANDSTONE), new ItemStack(Material.RED_SAND, 4), - new ItemStack(Material.PRISMARINE_BRICKS), new ItemStack(Material.PRISMARINE, 4), + new ItemStack(Material.PRISMARINE_BRICKS), new ItemStack(Material.PRISMARINE, 2), new ItemStack(Material.PRISMARINE), new ItemStack(Material.PRISMARINE_SHARD, 4) }, BlockFace.SELF