Merge branch 'GTNewHorizons:master' into master

4 files changed, 125 insertions, 0 deletions

diff --git a/src/main/java/gtPlusPlus/api/objects/minecraft/multi/NoEUBonusMultiBehaviour.java b/src/main/java/gtPlusPlus/api/objects/minecraft/multi/NoEUBonusMultiBehaviour.java
new file mode 100644
index 0000000000..78341db7a1
--- /dev/null
+++ b/src/main/java/gtPlusPlus/api/objects/minecraft/multi/NoEUBonusMultiBehaviour.java
@@ -0,0 +1,27 @@
+package gtPlusPlus.api.objects.minecraft.multi;
+
+import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
+import net.minecraft.item.ItemStack;
+
+public class NoEUBonusMultiBehaviour extends SpecialMultiBehaviour {
+
+	public NoEUBonusMultiBehaviour() {
+		// Used by other mods which may wish to not obtain bonus outputs on their Sifting or Maceration recipes.
+	}
+	
+	@Override
+	public ItemStack getTriggerItem() {
+		return GregtechItemList.Chip_MultiNerf_NoEuBonus.get(1);
+	}
+
+	@Override
+	public String getTriggerItemTooltip() {
+		return "Prevents EU discounts on GT++ multiblocks when used";
+	}
+
+	@Override
+	public int getEUPercent() {
+		return 0;
+	}
+
+}
diff --git a/src/main/java/gtPlusPlus/api/objects/minecraft/multi/NoOutputBonusMultiBehaviour.java b/src/main/java/gtPlusPlus/api/objects/minecraft/multi/NoOutputBonusMultiBehaviour.java
new file mode 100644
index 0000000000..8137f2573d
--- /dev/null
+++ b/src/main/java/gtPlusPlus/api/objects/minecraft/multi/NoOutputBonusMultiBehaviour.java
@@ -0,0 +1,27 @@
+package gtPlusPlus.api.objects.minecraft.multi;
+
+import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
+import net.minecraft.item.ItemStack;
+
+public class NoOutputBonusMultiBehaviour extends SpecialMultiBehaviour {
+
+	public NoOutputBonusMultiBehaviour() {
+		// Used by other mods which may wish to not obtain bonus outputs on their Sifting or Maceration recipes.
+	}
+	
+	@Override
+	public ItemStack getTriggerItem() {
+		return GregtechItemList.Chip_MultiNerf_NoOutputBonus.get(1);
+	}
+
+	@Override
+	public String getTriggerItemTooltip() {
+		return "Prevents bonus output % on GT++ multiblocks when used";
+	}
+
+	@Override
+	public int getOutputChanceRoll() {
+		return 10000;
+	}
+
+}
diff --git a/src/main/java/gtPlusPlus/api/objects/minecraft/multi/NoSpeedBonusMultiBehaviour.java b/src/main/java/gtPlusPlus/api/objects/minecraft/multi/NoSpeedBonusMultiBehaviour.java
new file mode 100644
index 0000000000..fe7a90960d
--- /dev/null
+++ b/src/main/java/gtPlusPlus/api/objects/minecraft/multi/NoSpeedBonusMultiBehaviour.java
@@ -0,0 +1,27 @@
+package gtPlusPlus.api.objects.minecraft.multi;
+
+import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
+import net.minecraft.item.ItemStack;
+
+public class NoSpeedBonusMultiBehaviour extends SpecialMultiBehaviour {
+
+	public NoSpeedBonusMultiBehaviour() {
+		// Used by other mods which may wish to not obtain bonus outputs on their Sifting or Maceration recipes.
+	}
+	
+	@Override
+	public ItemStack getTriggerItem() {
+		return GregtechItemList.Chip_MultiNerf_NoSpeedBonus.get(1);
+	}
+
+	@Override
+	public String getTriggerItemTooltip() {
+		return "Prevents speed bonuses on GT++ multiblocks when used";
+	}
+
+	@Override
+	public int getSpeedBonusPercent() {
+		return 0;
+	}
+
+}
diff --git a/src/main/java/gtPlusPlus/api/objects/minecraft/multi/SpecialMultiBehaviour.java b/src/main/java/gtPlusPlus/api/objects/minecraft/multi/SpecialMultiBehaviour.java
new file mode 100644
index 0000000000..e562ccc40b
--- /dev/null
+++ b/src/main/java/gtPlusPlus/api/objects/minecraft/multi/SpecialMultiBehaviour.java
@@ -0,0 +1,44 @@
+package gtPlusPlus.api.objects.minecraft.multi;
+
+import gregtech.api.util.GT_Utility;
+import net.minecraft.item.ItemStack;
+
+/**
+ * Extend this class to implement custom behaviour for multiblocks.
+ * The Trigger item when in a special slot or input bus, will cause the multiblock to behave as specified.
+ * Not overriding a method here will cause the default values to be used.
+ * @author Alkalus
+ *
+ */
+public abstract class SpecialMultiBehaviour {
+
+	private final int mMaxParallelRecipes = Short.MIN_VALUE;
+	private final int mEUPercent = Short.MIN_VALUE;
+	private final int mSpeedBonusPercent = Short.MIN_VALUE;
+	private final int mOutputChanceRoll = Short.MIN_VALUE;	
+	
+	public abstract ItemStack getTriggerItem();
+	
+	public abstract String getTriggerItemTooltip();
+
+	public int getMaxParallelRecipes() {
+		return this.mMaxParallelRecipes;
+	}
+
+	public int getEUPercent() {
+		return this.mEUPercent;
+	}
+
+	public int getSpeedBonusPercent() {
+		return this.mSpeedBonusPercent;
+	}
+
+	public int getOutputChanceRoll() {
+		return this.mOutputChanceRoll;
+	}	
+	
+	public final boolean isTriggerItem(ItemStack aToMatch) {
+		return GT_Utility.areStacksEqual(getTriggerItem(), aToMatch, false);
+	}
+	
+}