From 229b0f8e8784cca81c2cf6e05df2400873cce007 Mon Sep 17 00:00:00 2001 From: TheBusyBiscuit Date: Thu, 26 Sep 2019 20:32:59 +0200 Subject: [PATCH] Fixed double-registration of basic machine recipes --- .../Objects/SlimefunItem/multiblocks/Compressor.java | 5 +++++ .../Slimefun/Objects/SlimefunItem/multiblocks/Juicer.java | 5 +++++ .../Objects/SlimefunItem/multiblocks/OreCrusher.java | 5 +++++ .../Objects/SlimefunItem/multiblocks/PressureChamber.java | 5 +++++ 4 files changed, 20 insertions(+) diff --git a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/multiblocks/Compressor.java b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/multiblocks/Compressor.java index b0432a403..21e4f96d5 100644 --- a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/multiblocks/Compressor.java +++ b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/multiblocks/Compressor.java @@ -44,6 +44,11 @@ public class Compressor extends MultiBlockMachine { return recipes.stream().map(items -> items[0]).collect(Collectors.toList()); } + @Override + public void install() { + // Do nothing to prevent double-registration of recipes + } + @Override public void onInteract(Player p, Block b) { Block dispBlock = b.getRelative(BlockFace.DOWN); diff --git a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/multiblocks/Juicer.java b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/multiblocks/Juicer.java index a575d7db4..842517423 100644 --- a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/multiblocks/Juicer.java +++ b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/multiblocks/Juicer.java @@ -44,6 +44,11 @@ public class Juicer extends MultiBlockMachine { return recipes.stream().map(items -> items[0]).collect(Collectors.toList()); } + @Override + public void install() { + // Do nothing to prevent double-registration of recipes + } + @Override public void onInteract(Player p, Block b) { Block dispBlock = b.getRelative(BlockFace.DOWN); diff --git a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/multiblocks/OreCrusher.java b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/multiblocks/OreCrusher.java index 0a6c5e9ca..5c1b63412 100644 --- a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/multiblocks/OreCrusher.java +++ b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/multiblocks/OreCrusher.java @@ -48,6 +48,11 @@ public class OreCrusher extends MultiBlockMachine { return recipes.stream().map(items -> items[0]).collect(Collectors.toList()); } + @Override + public void install() { + // Do nothing to prevent double-registration of recipes + } + @Override public void onInteract(Player p, Block b) { Block dispBlock = b.getRelative(BlockFace.DOWN); diff --git a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/multiblocks/PressureChamber.java b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/multiblocks/PressureChamber.java index 15ffc7dee..93e079c6f 100644 --- a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/multiblocks/PressureChamber.java +++ b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/multiblocks/PressureChamber.java @@ -42,6 +42,11 @@ public class PressureChamber extends MultiBlockMachine { return recipes.stream().map(items -> items[0]).collect(Collectors.toList()); } + @Override + public void install() { + // Do nothing to prevent double-registration of recipes + } + @Override public void onInteract(Player p, Block b) { Block dispBlock = b.getRelative(BlockFace.UP).getRelative(BlockFace.UP);