$ Boosted Multi-block Bending Machine to be 50% faster.

+ Added Large Thermal Centrifuge.

2 files changed, 173 insertions, 1 deletions

diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialPlatePress.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialPlatePress.java
index d2fcbc050b..05454a37c7 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialPlatePress.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialPlatePress.java
@@ -41,6 +41,8 @@ extends GregtechMeta_MultiBlockBase {
 	@Override
 	public String[] getDescription() {
 		return new String[]{"Controller Block for the Material Press",
+				"50% faster than using single block machines of the same voltage",
+				"Circuit for recipe goes in the Input Bus",
 				"Size: 3x3x3 (Hollow)",
 				"Controller (front centered)",
 				"1x Input Bus (anywhere)",
@@ -113,7 +115,8 @@ extends GregtechMeta_MultiBlockBase {
 		if ((tInputList.size() > 0) && (tValidOutputSlots >= 1)) {
 			final long tVoltage = this.getMaxInputVoltage();
 			final byte tTier = (byte) Math.max(1, GT_Utility.getTier(tVoltage));
-			final GT_Recipe tRecipe = GT_Recipe.GT_Recipe_Map.sBenderRecipes.findRecipe(this.getBaseMetaTileEntity(), false, gregtech.api.enums.GT_Values.V[tTier], tFluids, tInputs);
+			GT_Recipe tRecipe = GT_Recipe.GT_Recipe_Map.sBenderRecipes.findRecipe(this.getBaseMetaTileEntity(), false, gregtech.api.enums.GT_Values.V[tTier], tFluids, tInputs);
+			tRecipe = this.reduceRecipeTimeByPercentage(tRecipe, 50F);
 			if ((tRecipe != null) && (2500 >= tRecipe.mSpecialValue) && (tRecipe.isRecipeInputEqual(true, tFluids, tInputs))) {
 				this.mEfficiency = (10000 - ((this.getIdealStatus() - this.getRepairStatus()) * 1000));
 				this.mEfficiencyIncrease = 10000;
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialThermalCentrifuge.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialThermalCentrifuge.java
new file mode 100644
index 0000000000..a61ae5da43
--- /dev/null
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialThermalCentrifuge.java
@@ -0,0 +1,169 @@
+package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi;
+
+import java.util.ArrayList;
+
+import gregtech.api.enums.TAE;
+import gregtech.api.enums.Textures;
+import gregtech.api.interfaces.ITexture;
+import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch;
+import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Maintenance;
+import gregtech.api.objects.GT_RenderedTexture;
+import gregtech.api.util.GT_Recipe;
+import gregtech.api.util.GT_Utility;
+import gtPlusPlus.core.block.ModBlocks;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.core.util.math.MathUtils;
+import gtPlusPlus.xmod.gregtech.api.gui.GUI_MultiMachine;
+import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase;
+import net.minecraft.block.Block;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.item.ItemStack;
+
+public class GregtechMetaTileEntity_IndustrialThermalCentrifuge
+extends GregtechMeta_MultiBlockBase {
+	public GregtechMetaTileEntity_IndustrialThermalCentrifuge(final int aID, final String aName, final String aNameRegional) {
+		super(aID, aName, aNameRegional);
+	}
+
+	public GregtechMetaTileEntity_IndustrialThermalCentrifuge(final String aName) {
+		super(aName);
+	}
+
+	@Override
+	public IMetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) {
+		return new GregtechMetaTileEntity_IndustrialThermalCentrifuge(this.mName);
+	}
+
+	@Override
+	public String[] getDescription() {
+		return new String[]{
+				"Controller Block for the Industrial Thermal Centrifuge",
+				"40% faster than using single block machines of the same voltage",
+				"Size: 3x5x3 [WxLxH] (Hollow)", "Controller (front centered)",
+				"1x Input Bus (side centered)",
+				"1x Output Bus (side centered)",
+				"1x Energy Hatch (top or bottom centered)",
+				"1x Maintenance Hatch (back centered)",
+				"Wire Factory Casings for the rest (32 at least!)",
+				CORE.GT_Tooltip
+		};
+	}
+
+	@Override
+	public ITexture[] getTexture(final IGregTechTileEntity aBaseMetaTileEntity, final byte aSide, final byte aFacing, final byte aColorIndex, final boolean aActive, final boolean aRedstone) {
+		if (aSide == aFacing) {
+			return new ITexture[]{Textures.BlockIcons.CASING_BLOCKS[TAE.GTPP_INDEX(6)], new GT_RenderedTexture(aActive ? Textures.BlockIcons.OVERLAY_FRONT_VACUUM_FREEZER_ACTIVE : Textures.BlockIcons.OVERLAY_FRONT_VACUUM_FREEZER)};
+		}
+		return new ITexture[]{Textures.BlockIcons.CASING_BLOCKS[TAE.GTPP_INDEX(6)]};
+	}
+
+	@Override
+	public Object getClientGUI(final int aID, final InventoryPlayer aPlayerInventory, final IGregTechTileEntity aBaseMetaTileEntity) {
+		return new GUI_MultiMachine(aPlayerInventory, aBaseMetaTileEntity, this.getLocalName(), "WireFactory.png");
+	}
+
+	@Override
+	public GT_Recipe.GT_Recipe_Map getRecipeMap() {
+		return GT_Recipe.GT_Recipe_Map.sThermalCentrifugeRecipes;
+	}
+
+	@Override
+	public boolean isFacingValid(final byte aFacing) {
+		return aFacing > 1;
+	}
+
+	@Override
+	public boolean checkRecipe(final ItemStack aStack) {
+		final ArrayList<ItemStack> tInputList = this.getStoredInputs();
+		for (final ItemStack tInput : tInputList) {
+			final long tVoltage = this.getMaxInputVoltage();
+			final byte tTier = (byte) Math.max(1, GT_Utility.getTier(tVoltage));
+
+			GT_Recipe tRecipe = GT_Recipe.GT_Recipe_Map.sThermalCentrifugeRecipes.findRecipe(this.getBaseMetaTileEntity(), false, gregtech.api.enums.GT_Values.V[tTier], null, new ItemStack[]{tInput});
+			tRecipe = this.reduceRecipeTimeByPercentage(tRecipe, 40F);
+			if (tRecipe != null) {
+
+				final int tValidOutputSlots = this.getValidOutputSlots(this.getBaseMetaTileEntity(), tRecipe, new ItemStack[]{tInput});
+				Utils.LOG_WARNING("Valid Output Slots: "+tValidOutputSlots);
+				//More than or one input
+				if ((tInputList.size() > 0) && (tValidOutputSlots >= 1)) {
+
+					if (tRecipe.isRecipeInputEqual(true, null, new ItemStack[]{tInput})) {
+						this.mEfficiency = (10000 - ((this.getIdealStatus() - this.getRepairStatus()) * 1000));
+						this.mEfficiencyIncrease = 10000;
+						if (tRecipe.mEUt <= 16) {
+							this.mEUt = (tRecipe.mEUt * (1 << (tTier - 1)) * (1 << (tTier - 1)));
+							this.mMaxProgresstime = (tRecipe.mDuration / (1 << (tTier - 1)));
+						} else {
+							this.mEUt = tRecipe.mEUt;
+							this.mMaxProgresstime = tRecipe.mDuration;
+							while (this.mEUt <= gregtech.api.enums.GT_Values.V[(tTier - 1)]) {
+								this.mEUt *= 4;
+								this.mMaxProgresstime /= 2;
+							}
+						}
+						if (this.mEUt > 0) {
+							this.mEUt = (-this.mEUt);
+						}
+						this.mMaxProgresstime = Math.max(1, this.mMaxProgresstime);
+						this.mOutputItems = new ItemStack[]{tRecipe.getOutput(0)};
+						this.updateSlots();
+						return true;
+					}
+				}
+			}
+		}
+		return false;
+	}
+
+	@Override
+	public boolean checkMachine(final IGregTechTileEntity aBaseMetaTileEntity, final ItemStack aStack) {
+		return false;
+	}
+
+	@Override
+	public int getMaxEfficiency(final ItemStack aStack) {
+		return 10000;
+	}
+
+	@Override
+	public int getPollutionPerTick(final ItemStack aStack) {
+		return 0;
+	}
+
+	@Override
+	public int getAmountOfOutputs() {
+		return 1;
+	}
+
+	@Override
+	public boolean explodesOnComponentBreak(final ItemStack aStack) {
+		return false;
+	}
+
+	public Block getCasingBlock() {
+		return ModBlocks.blockCasingsMisc;
+	}
+
+
+	public byte getCasingMeta() {
+		return 6;
+	}
+
+
+	public byte getCasingTextureIndex() {
+		return (byte) TAE.GTPP_INDEX(6);
+	}
+
+	private boolean addToMachineList(final IGregTechTileEntity tTileEntity) {
+		return ((this.addMaintenanceToMachineList(tTileEntity, this.getCasingTextureIndex())) 
+				|| (this.addInputToMachineList(tTileEntity, this.getCasingTextureIndex())) 
+				|| (this.addOutputToMachineList(tTileEntity, this.getCasingTextureIndex())) 
+				|| (this.addMufflerToMachineList(tTileEntity, this.getCasingTextureIndex()))
+				|| (this.addEnergyInputToMachineList(tTileEntity, this.getCasingTextureIndex()))
+				|| (this.addDynamoToMachineList(tTileEntity, this.getCasingTextureIndex())));
+	}
+}
\ No newline at end of file