diff options
Diffstat (limited to 'src/main/java/gregtech')
31 files changed, 248 insertions, 1881 deletions
diff --git a/src/main/java/gregtech/api/gui/GT_Container_BasicMachine.java b/src/main/java/gregtech/api/gui/GT_Container_BasicMachine.java deleted file mode 100644 index 5d6c1c4126..0000000000 --- a/src/main/java/gregtech/api/gui/GT_Container_BasicMachine.java +++ /dev/null @@ -1,300 +0,0 @@ -package gregtech.api.gui; - -import static gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine.OTHER_SLOT_COUNT; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.ICrafting; -import net.minecraft.inventory.Slot; -import net.minecraft.item.ItemStack; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import gregtech.api.interfaces.IFluidAccess; -import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicTank; -import gregtech.api.util.GT_Recipe.GT_Recipe_Map; -import gregtech.api.util.GT_Utility; - -/** - * NEVER INCLUDE THIS FILE IN YOUR MOD!!! - * <p/> - * The Container I use for all my Basic Machines - */ -public class GT_Container_BasicMachine extends GT_Container_BasicTank { - - public boolean mFluidTransfer = false, mItemTransfer = false, mStuttering = false; - - GT_Slot_Holo slotFluidTransferToggle; - GT_Slot_Holo slotItemTransferToggle; - GT_Slot_Holo slotFluidOutput; - GT_Slot_Holo slotFluidInput; - Slot slotBattery; - Slot slotSpecial; - - public GT_Container_BasicMachine(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity) { - super(aInventoryPlayer, aTileEntity); - } - - @Override - public void addSlots(InventoryPlayer aInventoryPlayer) { - GT_MetaTileEntity_BasicMachine machine = getMachine(); - GT_Recipe_Map recipes = machine.getRecipeList(); - - addSlotToContainer(slotFluidTransferToggle = new GT_Slot_Holo(mTileEntity, 0, 8, 63, false, true, 1)); - slotFluidTransferToggle.setEnabled(!machine.isSteampowered()); - addSlotToContainer(slotItemTransferToggle = new GT_Slot_Holo(mTileEntity, 0, 26, 63, false, true, 1)); - slotItemTransferToggle.setEnabled(!machine.isSteampowered()); - addSlotToContainer(slotFluidOutput = new GT_Slot_Render(mTileEntity, 2, 107, 63)); - slotFluidOutput.setEnabled(recipes != null && recipes.hasFluidOutputs()); - // add circuit slot here to have it in fixed position - addCircuitSlot(); - - int tStartIndex = machine.getInputSlot(); - - switch (machine.mInputSlotCount) { - case 0: - break; - case 1: - addSlotToContainer(new Slot(mTileEntity, tStartIndex++, 53, 25)); - break; - case 2: - addSlotToContainer(new Slot(mTileEntity, tStartIndex++, 35, 25)); - addSlotToContainer(new Slot(mTileEntity, tStartIndex++, 53, 25)); - break; - case 3: - addSlotToContainer(new Slot(mTileEntity, tStartIndex++, 17, 25)); - addSlotToContainer(new Slot(mTileEntity, tStartIndex++, 35, 25)); - addSlotToContainer(new Slot(mTileEntity, tStartIndex++, 53, 25)); - break; - case 4: - addSlotToContainer(new Slot(mTileEntity, tStartIndex++, 35, 16)); - addSlotToContainer(new Slot(mTileEntity, tStartIndex++, 53, 16)); - addSlotToContainer(new Slot(mTileEntity, tStartIndex++, 35, 34)); - addSlotToContainer(new Slot(mTileEntity, tStartIndex++, 53, 34)); - break; - case 5: - addSlotToContainer(new Slot(mTileEntity, tStartIndex++, 17, 16)); - addSlotToContainer(new Slot(mTileEntity, tStartIndex++, 35, 16)); - addSlotToContainer(new Slot(mTileEntity, tStartIndex++, 53, 16)); - addSlotToContainer(new Slot(mTileEntity, tStartIndex++, 35, 34)); - addSlotToContainer(new Slot(mTileEntity, tStartIndex++, 53, 34)); - break; - case 6: - addSlotToContainer(new Slot(mTileEntity, tStartIndex++, 17, 16)); - addSlotToContainer(new Slot(mTileEntity, tStartIndex++, 35, 16)); - addSlotToContainer(new Slot(mTileEntity, tStartIndex++, 53, 16)); - addSlotToContainer(new Slot(mTileEntity, tStartIndex++, 17, 34)); - addSlotToContainer(new Slot(mTileEntity, tStartIndex++, 35, 34)); - addSlotToContainer(new Slot(mTileEntity, tStartIndex++, 53, 34)); - break; - case 7: - addSlotToContainer(new Slot(mTileEntity, tStartIndex++, 17, 7)); - addSlotToContainer(new Slot(mTileEntity, tStartIndex++, 35, 7)); - addSlotToContainer(new Slot(mTileEntity, tStartIndex++, 53, 7)); - addSlotToContainer(new Slot(mTileEntity, tStartIndex++, 17, 25)); - addSlotToContainer(new Slot(mTileEntity, tStartIndex++, 35, 25)); - addSlotToContainer(new Slot(mTileEntity, tStartIndex++, 53, 25)); - addSlotToContainer(new Slot(mTileEntity, tStartIndex++, 17, 43)); - break; - case 8: - addSlotToContainer(new Slot(mTileEntity, tStartIndex++, 17, 7)); - addSlotToContainer(new Slot(mTileEntity, tStartIndex++, 35, 7)); - addSlotToContainer(new Slot(mTileEntity, tStartIndex++, 53, 7)); - addSlotToContainer(new Slot(mTileEntity, tStartIndex++, 17, 25)); - addSlotToContainer(new Slot(mTileEntity, tStartIndex++, 35, 25)); - addSlotToContainer(new Slot(mTileEntity, tStartIndex++, 53, 25)); - addSlotToContainer(new Slot(mTileEntity, tStartIndex++, 17, 43)); - addSlotToContainer(new Slot(mTileEntity, tStartIndex++, 35, 43)); - break; - default: - addSlotToContainer(new Slot(mTileEntity, tStartIndex++, 17, 7)); - addSlotToContainer(new Slot(mTileEntity, tStartIndex++, 35, 7)); - addSlotToContainer(new Slot(mTileEntity, tStartIndex++, 53, 7)); - addSlotToContainer(new Slot(mTileEntity, tStartIndex++, 17, 25)); - addSlotToContainer(new Slot(mTileEntity, tStartIndex++, 35, 25)); - addSlotToContainer(new Slot(mTileEntity, tStartIndex++, 53, 25)); - addSlotToContainer(new Slot(mTileEntity, tStartIndex++, 17, 43)); - addSlotToContainer(new Slot(mTileEntity, tStartIndex++, 35, 43)); - addSlotToContainer(new Slot(mTileEntity, tStartIndex++, 53, 43)); - break; - } - - tStartIndex = machine.getOutputSlot(); - - switch (machine.mOutputItems.length) { - case 0: - break; - case 1: - addSlotToContainer(new GT_Slot_Output(mTileEntity, tStartIndex++, 107, 25)); - break; - case 2: - addSlotToContainer(new GT_Slot_Output(mTileEntity, tStartIndex++, 107, 25)); - addSlotToContainer(new GT_Slot_Output(mTileEntity, tStartIndex++, 125, 25)); - break; - case 3: - addSlotToContainer(new GT_Slot_Output(mTileEntity, tStartIndex++, 107, 25)); - addSlotToContainer(new GT_Slot_Output(mTileEntity, tStartIndex++, 125, 25)); - addSlotToContainer(new GT_Slot_Output(mTileEntity, tStartIndex++, 143, 25)); - break; - case 4: - addSlotToContainer(new GT_Slot_Output(mTileEntity, tStartIndex++, 107, 16)); - addSlotToContainer(new GT_Slot_Output(mTileEntity, tStartIndex++, 125, 16)); - addSlotToContainer(new GT_Slot_Output(mTileEntity, tStartIndex++, 107, 34)); - addSlotToContainer(new GT_Slot_Output(mTileEntity, tStartIndex++, 125, 34)); - break; - case 5: - addSlotToContainer(new GT_Slot_Output(mTileEntity, tStartIndex++, 107, 16)); - addSlotToContainer(new GT_Slot_Output(mTileEntity, tStartIndex++, 125, 16)); - addSlotToContainer(new GT_Slot_Output(mTileEntity, tStartIndex++, 143, 16)); - addSlotToContainer(new GT_Slot_Output(mTileEntity, tStartIndex++, 107, 34)); - addSlotToContainer(new GT_Slot_Output(mTileEntity, tStartIndex++, 125, 34)); - break; - case 6: - addSlotToContainer(new GT_Slot_Output(mTileEntity, tStartIndex++, 107, 16)); - addSlotToContainer(new GT_Slot_Output(mTileEntity, tStartIndex++, 125, 16)); - addSlotToContainer(new GT_Slot_Output(mTileEntity, tStartIndex++, 143, 16)); - addSlotToContainer(new GT_Slot_Output(mTileEntity, tStartIndex++, 107, 34)); - addSlotToContainer(new GT_Slot_Output(mTileEntity, tStartIndex++, 125, 34)); - addSlotToContainer(new GT_Slot_Output(mTileEntity, tStartIndex++, 143, 34)); - break; - case 7: - addSlotToContainer(new GT_Slot_Output(mTileEntity, tStartIndex++, 107, 7)); - addSlotToContainer(new GT_Slot_Output(mTileEntity, tStartIndex++, 125, 7)); - addSlotToContainer(new GT_Slot_Output(mTileEntity, tStartIndex++, 143, 7)); - addSlotToContainer(new GT_Slot_Output(mTileEntity, tStartIndex++, 107, 25)); - addSlotToContainer(new GT_Slot_Output(mTileEntity, tStartIndex++, 125, 25)); - addSlotToContainer(new GT_Slot_Output(mTileEntity, tStartIndex++, 143, 25)); - addSlotToContainer(new GT_Slot_Output(mTileEntity, tStartIndex++, 107, 43)); - break; - case 8: - addSlotToContainer(new GT_Slot_Output(mTileEntity, tStartIndex++, 107, 7)); - addSlotToContainer(new GT_Slot_Output(mTileEntity, tStartIndex++, 125, 7)); - addSlotToContainer(new GT_Slot_Output(mTileEntity, tStartIndex++, 143, 7)); - addSlotToContainer(new GT_Slot_Output(mTileEntity, tStartIndex++, 107, 25)); - addSlotToContainer(new GT_Slot_Output(mTileEntity, tStartIndex++, 125, 25)); - addSlotToContainer(new GT_Slot_Output(mTileEntity, tStartIndex++, 143, 25)); - addSlotToContainer(new GT_Slot_Output(mTileEntity, tStartIndex++, 107, 43)); - addSlotToContainer(new GT_Slot_Output(mTileEntity, tStartIndex++, 125, 43)); - break; - default: - addSlotToContainer(new GT_Slot_Output(mTileEntity, tStartIndex++, 107, 7)); - addSlotToContainer(new GT_Slot_Output(mTileEntity, tStartIndex++, 125, 7)); - addSlotToContainer(new GT_Slot_Output(mTileEntity, tStartIndex++, 143, 7)); - addSlotToContainer(new GT_Slot_Output(mTileEntity, tStartIndex++, 107, 25)); - addSlotToContainer(new GT_Slot_Output(mTileEntity, tStartIndex++, 125, 25)); - addSlotToContainer(new GT_Slot_Output(mTileEntity, tStartIndex++, 143, 25)); - addSlotToContainer(new GT_Slot_Output(mTileEntity, tStartIndex++, 107, 43)); - addSlotToContainer(new GT_Slot_Output(mTileEntity, tStartIndex++, 125, 43)); - addSlotToContainer(new GT_Slot_Output(mTileEntity, tStartIndex++, 143, 43)); - break; - } - - addSlotToContainer(slotBattery = new Slot(mTileEntity, 1, 80, 63)); - addSlotToContainer(slotSpecial = new Slot(mTileEntity, 3, 125, 63)); - addSlotToContainer(slotFluidInput = new GT_Slot_Render(mTileEntity, tStartIndex++, 53, 63)); - slotFluidInput.setEnabled(recipes != null ? (recipes.hasFluidInputs()) : (machine.getCapacity() != 0)); - } - - @Override - public ItemStack slotClick(int aSlotNumber, int aMouseclick, int aShifthold, EntityPlayer aPlayer) { - if (mTileEntity.getMetaTileEntity() == null) return null; - GT_MetaTileEntity_BasicMachine machine = getMachine(); - if (machine == null) return null; - switch (aSlotNumber) { - case 0 -> { - if (slotFluidTransferToggle.isEnabled()) { - machine.mFluidTransfer = !machine.mFluidTransfer; - } - return null; - } - case 1 -> { - if (slotItemTransferToggle.isEnabled()) { - machine.mItemTransfer = !machine.mItemTransfer; - } - return null; - } - default -> { - if (aSlotNumber == OTHER_SLOT_COUNT + 1 + machine.mInputSlotCount + machine.mOutputItems.length - && aMouseclick < 2) { - GT_MetaTileEntity_BasicTank tTank = (GT_MetaTileEntity_BasicTank) mTileEntity.getMetaTileEntity(); - if (mTileEntity.isClientSide()) { - // see parent class slotClick for an explanation on why doing this - Slot slot = inventorySlots.get(aSlotNumber); - tTank.setFillableStack(GT_Utility.getFluidFromDisplayStack(slot.getStack())); - } - IFluidAccess tFillableAccess = constructFluidAccess(tTank, true); - GT_Recipe_Map recipes = machine.getRecipeList(); - // If the machine has recipes but no fluid inputs, disallow filling this slot with fluids. - ItemStack tToken = handleFluidSlotClick( - tFillableAccess, - aPlayer, - aMouseclick == 0, - true, - (recipes == null || recipes.hasFluidInputs())); - if (mTileEntity.isServerSide() && tToken != null) mTileEntity.markInventoryBeenModified(); - return tToken; - } else { - return super.slotClick(aSlotNumber, aMouseclick, aShifthold, aPlayer); - } - } - } - } - - @Override - public void detectAndSendChanges() { - super.detectAndSendChanges(); - if (mTileEntity.isClientSide() || mTileEntity.getMetaTileEntity() == null) return; - - mFluidTransfer = getMachine().mFluidTransfer; - mItemTransfer = getMachine().mItemTransfer; - mStuttering = getMachine().mStuttering; - - for (ICrafting player : this.crafters) { - player.sendProgressBarUpdate(this, 102, mFluidTransfer ? 1 : 0); - player.sendProgressBarUpdate(this, 103, mItemTransfer ? 1 : 0); - player.sendProgressBarUpdate(this, 104, mStuttering ? 1 : 0); - } - } - - @Override - public void addCraftingToCrafters(ICrafting player) { - super.addCraftingToCrafters(player); - } - - @Override - @SideOnly(Side.CLIENT) - public void updateProgressBar(int id, int value) { - super.updateProgressBar(id, value); - switch (id) { - case 102 -> mFluidTransfer = (value != 0); - case 103 -> mItemTransfer = (value != 0); - case 104 -> mStuttering = (value != 0); - } - } - - @Override - public int getSlotStartIndex() { - return 4; - } - - @Override - public int getShiftClickStartIndex() { - return 4; - } - - @Override - public int getSlotCount() { - return getShiftClickSlotCount() + getMachine().mOutputItems.length + 2; - } - - @Override - public int getShiftClickSlotCount() { - return getMachine().mInputSlotCount; - } - - public GT_MetaTileEntity_BasicMachine getMachine() { - return (GT_MetaTileEntity_BasicMachine) mTileEntity.getMetaTileEntity(); - } -} diff --git a/src/main/java/gregtech/api/gui/GT_GUIContainer_BasicMachine.java b/src/main/java/gregtech/api/gui/GT_GUIContainer_BasicMachine.java deleted file mode 100644 index 8873152137..0000000000 --- a/src/main/java/gregtech/api/gui/GT_GUIContainer_BasicMachine.java +++ /dev/null @@ -1,262 +0,0 @@ -package gregtech.api.gui; - -import static gregtech.api.enums.Mods.GregTech; - -import java.awt.Rectangle; - -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.util.StatCollector; - -import gregtech.api.enums.GT_Values; -import gregtech.api.gui.widgets.GT_GuiIcon; -import gregtech.api.gui.widgets.GT_GuiSlotTooltip; -import gregtech.api.gui.widgets.GT_GuiSmartTooltip; -import gregtech.api.gui.widgets.GT_GuiTabLine.GT_GuiTabIconSet; -import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine_Steel; -import gregtech.api.util.GT_Recipe.GT_Recipe_Map; -import gregtech.common.power.Power; -import gregtech.nei.NEI_TransferRectHost; - -/** - * NEVER INCLUDE THIS FILE IN YOUR MOD!!! - * <p/> - * The GUI-Container I use for all my Basic Machines - */ -public class GT_GUIContainer_BasicMachine extends GT_GUIContainerMetaTile_Machine implements NEI_TransferRectHost { - - private static final int NEEDS_STEAM_VENTING = 64; - private static final GT_GuiTabIconSet TAB_ICONSET_BRONZE = new GT_GuiTabIconSet( - GT_GuiIcon.TAB_NORMAL_BRONZE, - GT_GuiIcon.TAB_HIGHLIGHT_BRONZE, - GT_GuiIcon.TAB_DISABLED_BRONZE); - private static final GT_GuiTabIconSet TAB_ICONSET_STEEL = new GT_GuiTabIconSet( - GT_GuiIcon.TAB_NORMAL_STEEL, - GT_GuiIcon.TAB_HIGHLIGHT_STEEL, - GT_GuiIcon.TAB_DISABLED_STEEL); - private final int textColor = this.getTextColorOrDefault("title", 0x404040); - public final String mName, mNEI; - public final byte mProgressBarDirection, mProgressBarAmount; - - // Tooltip localization keys - private static final String BATTERY_SLOT_TOOLTIP = "GT5U.machines.battery_slot.tooltip", - BATTERY_SLOT_TOOLTIP_ALT = "GT5U.machines.battery_slot.tooltip.alternative", - UNUSED_SLOT_TOOLTIP = "GT5U.machines.unused_slot.tooltip", - SPECIAL_SLOT_TOOLTIP = "GT5U.machines.special_slot.tooltip", - FLUID_INPUT_TOOLTIP = "GT5U.machines.fluid_input_slot.tooltip", - FLUID_OUTPUT_TOOLTIP = "GT5U.machines.fluid_output_slot.tooltip", - STALLED_STUTTERING_TOOLTIP = "GT5U.machines.stalled_stuttering.tooltip", - STALLED_VENT_TOOLTIP = "GT5U.machines.stalled_vent.tooltip", - FLUID_TRANSFER_TOOLTIP = "GT5U.machines.fluid_transfer.tooltip", - ITEM_TRANSFER_TOOLTIP = "GT5U.machines.item_transfer.tooltip", POWER_SOURCE_KEY = "GT5U.machines.powersource."; - - public GT_GUIContainer_BasicMachine(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity, String aName, - String aTextureFile, String aNEI) { - this(aInventoryPlayer, aTileEntity, aName, aTextureFile, aNEI, (byte) 0, (byte) 1); - } - - public GT_GUIContainer_BasicMachine(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity, String aName, - String aTextureFile, String aNEI, byte aProgressBarDirection, byte aProgressBarAmount) { - super( - new GT_Container_BasicMachine(aInventoryPlayer, aTileEntity), - GregTech.getResourcePath("textures", "gui", "basicmachines", aTextureFile)); - mProgressBarDirection = aProgressBarDirection; - mProgressBarAmount = (byte) Math.max(1, aProgressBarAmount); - mName = aName; - mNEI = aNEI; - } - - /** - * Load data for and create appropriate tooltips for this machine - */ - @Override - protected void setupTooltips() { - super.setupTooltips(); - GT_MetaTileEntity_BasicMachine machine = getMachine(); - GT_Recipe_Map recipes = machine.getRecipeList(); - GT_Container_BasicMachine container = getContainer(); - Rectangle tProblemArea = new Rectangle(this.guiLeft + 79, this.guiTop + 44, 18, 18); - String batterySlotTooltipKey; - Object[] batterySlotTooltipArgs; - if (machine.isSteampowered()) { - batterySlotTooltipKey = UNUSED_SLOT_TOOLTIP; - batterySlotTooltipArgs = new String[0]; - addToolTip( - new GT_GuiSmartTooltip( - tProblemArea, - () -> hasErrorCode(NEEDS_STEAM_VENTING), - mTooltipCache.getData(STALLED_VENT_TOOLTIP))); - } else { - String pTier1 = powerTierName(machine.mTier); - if (machine.mTier == GT_Values.VN.length - 1) { - batterySlotTooltipKey = BATTERY_SLOT_TOOLTIP_ALT; - batterySlotTooltipArgs = new String[] { pTier1 }; - } else { - batterySlotTooltipKey = BATTERY_SLOT_TOOLTIP; - batterySlotTooltipArgs = new String[] { pTier1, powerTierName((byte) (machine.mTier + 1)) }; - } - addToolTip( - new GT_GuiSlotTooltip( - container.slotFluidTransferToggle, - mTooltipCache.getData(FLUID_TRANSFER_TOOLTIP))); - addToolTip( - new GT_GuiSlotTooltip(container.slotItemTransferToggle, mTooltipCache.getData(ITEM_TRANSFER_TOOLTIP))); - } - if (recipes != null && recipes.hasFluidInputs()) { - addToolTip( - new GT_GuiSlotTooltip( - container.slotFluidInput, - mTooltipCache.getData(FLUID_INPUT_TOOLTIP, machine.getCapacity()))); - } - if (recipes != null && recipes.hasFluidOutputs()) { - addToolTip( - new GT_GuiSlotTooltip( - container.slotFluidOutput, - mTooltipCache.getData(FLUID_OUTPUT_TOOLTIP, machine.getCapacity()))); - } - addToolTip( - new GT_GuiSlotTooltip( - getContainer().slotBattery, - mTooltipCache.getData(batterySlotTooltipKey, batterySlotTooltipArgs))); - addToolTip( - new GT_GuiSlotTooltip( - container.slotSpecial, - mTooltipCache.getData( - recipes != null && recipes.usesSpecialSlot() ? SPECIAL_SLOT_TOOLTIP : UNUSED_SLOT_TOOLTIP))); - addToolTip( - new GT_GuiSmartTooltip( - tProblemArea, - () -> container.mStuttering && !hasErrorCode(NEEDS_STEAM_VENTING), - mTooltipCache.getData( - STALLED_STUTTERING_TOOLTIP, - StatCollector - .translateToLocal(POWER_SOURCE_KEY + (machine.isSteampowered() ? "steam" : "power"))))); - } - - /** - * Apply proper coloration to a machine's power tier short name - * - * @param machineTier machine tier - * @return colored power tier short name - */ - private String powerTierName(byte machineTier) { - return GT_Values.TIER_COLORS[machineTier] + GT_Values.VN[machineTier]; - } - - private GT_MetaTileEntity_BasicMachine getMachine() { - return (GT_MetaTileEntity_BasicMachine) mContainer.mTileEntity.getMetaTileEntity(); - } - - @Override - protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) { - super.drawGuiContainerForegroundLayer(mouseX, mouseY); - fontRendererObj.drawString(mName, 8, 4, textColor); - } - - @Override - protected void drawGuiContainerBackgroundLayer(float parTicks, int mouseX, int mouseY) { - super.drawGuiContainerBackgroundLayer(parTicks, mouseX, mouseY); - int x = (width - xSize) / 2; - int y = (height - ySize) / 2; - drawTexturedModalRect(x, y, 0, 0, xSize, ySize); - if (mContainer != null) { - if (!getMachine().isSteampowered()) { - if (getContainer().mFluidTransfer) drawTexturedModalRect(x + 7, y + 62, 176, 18, 18, 18); - if (getContainer().mItemTransfer) drawTexturedModalRect(x + 25, y + 62, 176, 36, 18, 18); - } - if (getContainer().mStuttering) drawTexturedModalRect(x + 79, y + 44, 176, 54, 18, 18); - - if (mContainer.mMaxProgressTime > 0) { - int tSize = mProgressBarDirection < 2 ? 20 : 18; - int tProgress = Math.max( - 1, - Math.min( - tSize * mProgressBarAmount, - (mContainer.mProgressTime > 0 ? 1 : 0) - + mContainer.mProgressTime * tSize * mProgressBarAmount / mContainer.mMaxProgressTime)) - % (tSize + 1); - - switch (mProgressBarDirection) { // yes, my OCD was mad at me before I did the Tabs. - case 0 -> drawTexturedModalRect(x + 78, y + 24, 176, 0, tProgress, 18); - case 1 -> drawTexturedModalRect( - x + 78 + 20 - tProgress, - y + 24, - 176 + 20 - tProgress, - 0, - tProgress, - 18); - case 2 -> drawTexturedModalRect(x + 78, y + 24, 176, 0, 20, tProgress); - case 3 -> drawTexturedModalRect( - x + 78, - y + 24 + 18 - tProgress, - 176, - 18 - tProgress, - 20, - tProgress); - case 4 -> { - tProgress = 20 - tProgress; - drawTexturedModalRect(x + 78, y + 24, 176, 0, tProgress, 18); - } - case 5 -> { - tProgress = 20 - tProgress; - drawTexturedModalRect(x + 78 + 20 - tProgress, y + 24, 176 + 20 - tProgress, 0, tProgress, 18); - } - case 6 -> { - tProgress = 18 - tProgress; - drawTexturedModalRect(x + 78, y + 24, 176, 0, 20, tProgress); - } - case 7 -> { - tProgress = 18 - tProgress; - drawTexturedModalRect(x + 78, y + 24 + 18 - tProgress, 176, 18 - tProgress, 20, tProgress); - } - } - } - } - } - - @Override - protected GT_GuiTabIconSet getTabBackground() { - if (getMachine().isSteampowered()) { - return getMachine() instanceof GT_MetaTileEntity_BasicMachine_Steel ? TAB_ICONSET_STEEL - : TAB_ICONSET_BRONZE; - } - return super.getTabBackground(); - } - - /** - * Whether the machine currently has this error code - */ - private boolean hasErrorCode(int errorCode) { - return (getContainer().mDisplayErrorCode & errorCode) != 0; - } - - private GT_Container_BasicMachine getContainer() { - return (GT_Container_BasicMachine) mContainer; - } - - @Override - public String getNeiTransferRectString() { - return mNEI; - } - - @Override - public String getNeiTransferRectTooltip() { - Power powerInfo = getMachine().getPower(); - if (getMachine().isSteampowered()) { - return powerInfo.getTierString() + " Steam recipes"; - } else { - return "Recipes available in " + powerInfo.getTierString(); - } - } - - @Override - public Object[] getNeiTransferRectArgs() { - return new Object[] { getMachine().getPower() }; - } - - @Override - public Rectangle getNeiTransferRect() { - return new Rectangle(65, 13, 36, 18); - } -} diff --git a/src/main/java/gregtech/api/metatileentity/examples/GT_MetaTileEntity_E_Furnace.java b/src/main/java/gregtech/api/metatileentity/examples/GT_MetaTileEntity_E_Furnace.java deleted file mode 100644 index 811a30d341..0000000000 --- a/src/main/java/gregtech/api/metatileentity/examples/GT_MetaTileEntity_E_Furnace.java +++ /dev/null @@ -1,143 +0,0 @@ -package gregtech.api.metatileentity.examples; - -import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_BOTTOM_STEAM_FURNACE; -import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_BOTTOM_STEAM_FURNACE_ACTIVE; -import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_BOTTOM_STEAM_FURNACE_ACTIVE_GLOW; -import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_BOTTOM_STEAM_FURNACE_GLOW; -import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_STEAM_FURNACE; -import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_STEAM_FURNACE_ACTIVE; -import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_STEAM_FURNACE_ACTIVE_GLOW; -import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_STEAM_FURNACE_GLOW; -import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_SIDE_STEAM_FURNACE; -import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_SIDE_STEAM_FURNACE_ACTIVE; -import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_SIDE_STEAM_FURNACE_ACTIVE_GLOW; -import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_SIDE_STEAM_FURNACE_GLOW; -import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_TOP_STEAM_FURNACE; -import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_TOP_STEAM_FURNACE_ACTIVE; -import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_TOP_STEAM_FURNACE_ACTIVE_GLOW; -import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_TOP_STEAM_FURNACE_GLOW; - -import net.minecraft.item.ItemStack; -import net.minecraftforge.common.util.ForgeDirection; - -import gregtech.api.enums.SoundResource; -import gregtech.api.interfaces.ITexture; -import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gregtech.api.metatileentity.MetaTileEntity; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine; -import gregtech.api.render.TextureFactory; -import gregtech.api.util.GT_ModHandler; -import gregtech.api.util.GT_Utility; - -/** - * This Example Implementation still works, however I use something completely different in my own Code. - */ -public class GT_MetaTileEntity_E_Furnace extends GT_MetaTileEntity_BasicMachine { - - public GT_MetaTileEntity_E_Furnace(int aID, String aName, String aNameRegional, int aTier) { - super( - aID, - aName, - aNameRegional, - aTier, - 1, - "Not like using a Commodore 64", - 1, - 1, - "E_Furnace.png", - "smelting", - TextureFactory.of( - TextureFactory.of(OVERLAY_SIDE_STEAM_FURNACE_ACTIVE), - TextureFactory.builder() - .addIcon(OVERLAY_SIDE_STEAM_FURNACE_ACTIVE_GLOW) - .glow() - .build()), - TextureFactory.of( - TextureFactory.of(OVERLAY_SIDE_STEAM_FURNACE), - TextureFactory.builder() - .addIcon(OVERLAY_SIDE_STEAM_FURNACE_GLOW) - .glow() - .build()), - TextureFactory.of( - TextureFactory.of(OVERLAY_FRONT_STEAM_FURNACE_ACTIVE), - TextureFactory.builder() - .addIcon(OVERLAY_FRONT_STEAM_FURNACE_ACTIVE_GLOW) - .glow() - .build()), - TextureFactory.of( - TextureFactory.of(OVERLAY_FRONT_STEAM_FURNACE), - TextureFactory.builder() - .addIcon(OVERLAY_FRONT_STEAM_FURNACE_GLOW) - .glow() - .build()), - TextureFactory.of( - TextureFactory.of(OVERLAY_TOP_STEAM_FURNACE_ACTIVE), - TextureFactory.builder() - .addIcon(OVERLAY_TOP_STEAM_FURNACE_ACTIVE_GLOW) - .glow() - .build()), - TextureFactory.of( - TextureFactory.of(OVERLAY_TOP_STEAM_FURNACE), - TextureFactory.builder() - .addIcon(OVERLAY_TOP_STEAM_FURNACE_GLOW) - .glow() - .build()), - TextureFactory.of( - TextureFactory.of(OVERLAY_BOTTOM_STEAM_FURNACE_ACTIVE), - TextureFactory.builder() - .addIcon(OVERLAY_BOTTOM_STEAM_FURNACE_ACTIVE_GLOW) - .glow() - .build()), - TextureFactory.of( - TextureFactory.of(OVERLAY_BOTTOM_STEAM_FURNACE), - TextureFactory.builder() - .addIcon(OVERLAY_BOTTOM_STEAM_FURNACE_GLOW) - .glow() - .build())); - } - - public GT_MetaTileEntity_E_Furnace(String aName, int aTier, String aDescription, ITexture[][][] aTextures, - String aGUIName, String aNEIName) { - super(aName, aTier, 1, aDescription, aTextures, 1, 1, aGUIName, aNEIName); - } - - public GT_MetaTileEntity_E_Furnace(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures, - String aGUIName, String aNEIName) { - super(aName, aTier, 1, aDescription, aTextures, 1, 1, aGUIName, aNEIName); - } - - @Override - public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_E_Furnace(mName, mTier, mDescriptionArray, mTextures, mGUIName, mNEIName); - } - - @Override - public int checkRecipe() { - if (null != (mOutputItems[0] = GT_ModHandler.getSmeltingOutput(getInputAt(0), true, getOutputAt(0)))) { - calculateOverclockedNess(4, 128); - if (mMaxProgresstime == Integer.MAX_VALUE - 1 && mEUt == Integer.MAX_VALUE - 1) - return FOUND_RECIPE_BUT_DID_NOT_MEET_REQUIREMENTS; - return FOUND_AND_SUCCESSFULLY_USED_RECIPE; - } - return DID_NOT_FIND_RECIPE; - } - - @Override - protected boolean allowPutStackValidated(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, ForgeDirection side, - ItemStack aStack) { - return super.allowPutStackValidated(aBaseMetaTileEntity, aIndex, side, aStack) - && GT_ModHandler.getSmeltingOutput(GT_Utility.copyAmount(64, aStack), false, null) != null; - } - - @Override - public void startSoundLoop(byte aIndex, double aX, double aY, double aZ) { - super.startSoundLoop(aIndex, aX, aY, aZ); - if (aIndex == 1) - GT_Utility.doSoundAtClient(SoundResource.IC2_MACHINES_ELECTROFURNACE_LOOP, 10, 1.0F, aX, aY, aZ); - } - - @Override - public void startProcess() { - sendLoopStart((byte) 1); - } -} diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine.java index ac037b7919..0e86829027 100644 --- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine.java +++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine.java @@ -25,7 +25,6 @@ import java.util.List; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; @@ -57,8 +56,6 @@ import com.gtnewhorizons.modularui.common.widget.SlotWidget; import gregtech.GT_Mod; import gregtech.api.GregTech_API; import gregtech.api.enums.SoundResource; -import gregtech.api.gui.GT_Container_BasicMachine; -import gregtech.api.gui.GT_GUIContainer_BasicMachine; import gregtech.api.gui.modularui.GT_UIInfos; import gregtech.api.gui.modularui.GT_UITextures; import gregtech.api.gui.modularui.SteamTexture; @@ -111,7 +108,8 @@ public abstract class GT_MetaTileEntity_BasicMachine extends GT_MetaTileEntity_B public int mProgresstime = 0, mMaxProgresstime = 0, mEUt = 0, mOutputBlocked = 0; public ForgeDirection mMainFacing = ForgeDirection.WEST; public FluidStack mOutputFluid; - public String mGUIName, mNEIName; + @Deprecated + public String mGUIName = "", mNEIName = ""; protected final Power mPower; /** @@ -127,6 +125,8 @@ public abstract class GT_MetaTileEntity_BasicMachine extends GT_MetaTileEntity_B this::getCapacity); /** + * Registers machine with single-line description. + * * @param aOverlays 0 = SideFacingActive 1 = SideFacingInactive 2 = FrontFacingActive 3 = FrontFacingInactive 4 = * TopFacingActive 5 = TopFacingInactive 6 = BottomFacingActive 7 = BottomFacingInactive ----- Not * all Array Elements have to be initialised, you can also just use 8 Parameters for the Default @@ -135,6 +135,27 @@ public abstract class GT_MetaTileEntity_BasicMachine extends GT_MetaTileEntity_B * SideFacingPipeInactive */ public GT_MetaTileEntity_BasicMachine(int aID, String aName, String aNameRegional, int aTier, int aAmperage, + String aDescription, int aInputSlotCount, int aOutputSlotCount, ITexture... aOverlays) { + super( + aID, + aName, + aNameRegional, + aTier, + OTHER_SLOT_COUNT + aInputSlotCount + aOutputSlotCount + 1, + aDescription, + aOverlays); + mInputSlotCount = Math.max(0, aInputSlotCount); + mOutputItems = new ItemStack[Math.max(0, aOutputSlotCount)]; + mAmperage = aAmperage; + mPower = buildPower(); + } + + /** + * @deprecated Use {@link #GT_MetaTileEntity_BasicMachine(int, String, String, int, int, String, int, int, + * ITexture...)} + */ + @Deprecated + public GT_MetaTileEntity_BasicMachine(int aID, String aName, String aNameRegional, int aTier, int aAmperage, String aDescription, int aInputSlotCount, int aOutputSlotCount, String aGUIName, String aNEIName, ITexture... aOverlays) { super( @@ -148,11 +169,33 @@ public abstract class GT_MetaTileEntity_BasicMachine extends GT_MetaTileEntity_B mInputSlotCount = Math.max(0, aInputSlotCount); mOutputItems = new ItemStack[Math.max(0, aOutputSlotCount)]; mAmperage = aAmperage; - mGUIName = aGUIName; - mNEIName = aNEIName; mPower = buildPower(); } + /** + * Registers machine with multi-line descriptions. + */ + public GT_MetaTileEntity_BasicMachine(int aID, String aName, String aNameRegional, int aTier, int aAmperage, + String[] aDescription, int aInputSlotCount, int aOutputSlotCount, ITexture... aOverlays) { + super( + aID, + aName, + aNameRegional, + aTier, + OTHER_SLOT_COUNT + aInputSlotCount + aOutputSlotCount + 1, + aDescription, + aOverlays); + mInputSlotCount = Math.max(0, aInputSlotCount); + mOutputItems = new ItemStack[Math.max(0, aOutputSlotCount)]; + mAmperage = aAmperage; + mPower = buildPower(); + } + + /** + * @deprecated Use {@link #GT_MetaTileEntity_BasicMachine(int, String, String, int, int, String[], int, int, + * ITexture...)} + */ + @Deprecated public GT_MetaTileEntity_BasicMachine(int aID, String aName, String aNameRegional, int aTier, int aAmperage, String[] aDescription, int aInputSlotCount, int aOutputSlotCount, String aGUIName, String aNEIName, ITexture... aOverlays) { @@ -167,30 +210,44 @@ public abstract class GT_MetaTileEntity_BasicMachine extends GT_MetaTileEntity_B mInputSlotCount = Math.max(0, aInputSlotCount); mOutputItems = new ItemStack[Math.max(0, aOutputSlotCount)]; mAmperage = aAmperage; - mGUIName = aGUIName; - mNEIName = aNEIName; mPower = buildPower(); } + /** + * @deprecated Use {@link #GT_MetaTileEntity_BasicMachine(String, int, int, String[], ITexture[][][], int, int)} + */ + @Deprecated public GT_MetaTileEntity_BasicMachine(String aName, int aTier, int aAmperage, String aDescription, ITexture[][][] aTextures, int aInputSlotCount, int aOutputSlotCount, String aGUIName, String aNEIName) { super(aName, aTier, OTHER_SLOT_COUNT + aInputSlotCount + aOutputSlotCount + 1, aDescription, aTextures); mInputSlotCount = Math.max(0, aInputSlotCount); mOutputItems = new ItemStack[Math.max(0, aOutputSlotCount)]; mAmperage = aAmperage; - mGUIName = aGUIName; - mNEIName = aNEIName; mPower = buildPower(); } + /** + * For {@link #newMetaEntity}. + */ + public GT_MetaTileEntity_BasicMachine(String aName, int aTier, int aAmperage, String[] aDescription, + ITexture[][][] aTextures, int aInputSlotCount, int aOutputSlotCount) { + super(aName, aTier, OTHER_SLOT_COUNT + aInputSlotCount + aOutputSlotCount + 1, aDescription, aTextures); + mInputSlotCount = Math.max(0, aInputSlotCount); + mOutputItems = new ItemStack[Math.max(0, aOutputSlotCount)]; + mAmperage = aAmperage; + mPower = buildPower(); + } + + /** + * @deprecated Use {@link #GT_MetaTileEntity_BasicMachine(String, int, int, String[], ITexture[][][], int, int)} + */ + @Deprecated public GT_MetaTileEntity_BasicMachine(String aName, int aTier, int aAmperage, String[] aDescription, ITexture[][][] aTextures, int aInputSlotCount, int aOutputSlotCount, String aGUIName, String aNEIName) { super(aName, aTier, OTHER_SLOT_COUNT + aInputSlotCount + aOutputSlotCount + 1, aDescription, aTextures); mInputSlotCount = Math.max(0, aInputSlotCount); mOutputItems = new ItemStack[Math.max(0, aOutputSlotCount)]; mAmperage = aAmperage; - mGUIName = aGUIName; - mNEIName = aNEIName; mPower = buildPower(); } @@ -504,20 +561,12 @@ public abstract class GT_MetaTileEntity_BasicMachine extends GT_MetaTileEntity_B public boolean onRightclick(IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer) { if (aBaseMetaTileEntity.isClientSide()) return true; if (!GT_Mod.gregtechproxy.mForceFreeFace) { - if (useModularUI()) { - GT_UIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer); - } else { - aBaseMetaTileEntity.openGUI(aPlayer); - } + GT_UIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer); return true; } for (final ForgeDirection side : ForgeDirection.VALID_DIRECTIONS) { if (aBaseMetaTileEntity.getAirAtSide(side)) { - if (useModularUI()) { - GT_UIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer); - } else { - aBaseMetaTileEntity.openGUI(aPlayer); - } + GT_UIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer); return true; } } @@ -525,24 +574,6 @@ public abstract class GT_MetaTileEntity_BasicMachine extends GT_MetaTileEntity_B return true; } - @Deprecated - @Override - public Object getServerGUI(int aID, InventoryPlayer aPlayerInventory, IGregTechTileEntity aBaseMetaTileEntity) { - return new GT_Container_BasicMachine(aPlayerInventory, aBaseMetaTileEntity); - } - - @Deprecated - @Override - public Object getClientGUI(int aID, InventoryPlayer aPlayerInventory, IGregTechTileEntity aBaseMetaTileEntity) { - return new GT_GUIContainer_BasicMachine( - aPlayerInventory, - aBaseMetaTileEntity, - getLocalName(), - mGUIName, - GT_Utility.isStringValid(mNEIName) ? mNEIName - : getRecipeList() != null ? getRecipeList().mUnlocalizedName : ""); - } - @Override public void initDefaultModes(NBTTagCompound aNBT) { mMainFacing = ForgeDirection.UNKNOWN; @@ -898,7 +929,7 @@ public abstract class GT_MetaTileEntity_BasicMachine extends GT_MetaTileEntity_B @Override public String[] getInfoData() { - return new String[] { EnumChatFormatting.BLUE + mNEIName + EnumChatFormatting.RESET, "Progress:", + return new String[] { "Progress:", EnumChatFormatting.GREEN + GT_Utility.formatNumbers((mProgresstime / 20)) + EnumChatFormatting.RESET + " s / " diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine_Bronze.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine_Bronze.java index 2ba0ba94f2..e1321c144f 100644 --- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine_Bronze.java +++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine_Bronze.java @@ -57,27 +57,12 @@ public abstract class GT_MetaTileEntity_BasicMachine_Bronze extends GT_MetaTileE public GT_MetaTileEntity_BasicMachine_Bronze(int aID, String aName, String aNameRegional, String aDescription, int aInputSlotCount, int aOutputSlotCount, boolean aHighPressure) { - super( - aID, - aName, - aNameRegional, - aHighPressure ? 2 : 1, - 0, - aDescription, - aInputSlotCount, - aOutputSlotCount, - "", - ""); - } - - public GT_MetaTileEntity_BasicMachine_Bronze(String aName, String aDescription, ITexture[][][] aTextures, - int aInputSlotCount, int aOutputSlotCount, boolean aHighPressure) { - super(aName, aHighPressure ? 2 : 1, 0, aDescription, aTextures, aInputSlotCount, aOutputSlotCount, "", ""); + super(aID, aName, aNameRegional, aHighPressure ? 2 : 1, 0, aDescription, aInputSlotCount, aOutputSlotCount); } public GT_MetaTileEntity_BasicMachine_Bronze(String aName, String[] aDescription, ITexture[][][] aTextures, int aInputSlotCount, int aOutputSlotCount, boolean aHighPressure) { - super(aName, aHighPressure ? 2 : 1, 0, aDescription, aTextures, aInputSlotCount, aOutputSlotCount, "", ""); + super(aName, aHighPressure ? 2 : 1, 0, aDescription, aTextures, aInputSlotCount, aOutputSlotCount); } protected boolean isBricked() { diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine_GT_Recipe.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine_GT_Recipe.java index 2a11a890bd..3297490b51 100644 --- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine_GT_Recipe.java +++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine_GT_Recipe.java @@ -12,7 +12,6 @@ import static net.minecraftforge.common.util.ForgeDirection.UP; import java.util.Locale; import net.minecraft.block.Block; -import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; @@ -35,8 +34,6 @@ import gregtech.api.enums.ParticleFX; import gregtech.api.enums.SoundResource; import gregtech.api.enums.Textures.BlockIcons.CustomIcon; import gregtech.api.enums.Tier; -import gregtech.api.gui.GT_Container_BasicMachine; -import gregtech.api.gui.GT_GUIContainer_BasicMachine; import gregtech.api.gui.modularui.GT_UITextures; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; @@ -63,13 +60,15 @@ public class GT_MetaTileEntity_BasicMachine_GT_Recipe extends GT_MetaTileEntity_ private final SpecialEffects mSpecialEffect; private final ResourceLocation mSoundResourceLocation; private final boolean mSharedTank, mRequiresFluidForFiltering; - private final byte mGUIParameterA, mGUIParameterB; private FallbackableUITexture progressBarTexture; + /** + * Registers machine with single-line description, specific tank capacity, and sound specified by ResourceLocation. + */ public GT_MetaTileEntity_BasicMachine_GT_Recipe(int aID, String aName, String aNameRegional, int aTier, String aDescription, GT_Recipe.GT_Recipe_Map aRecipes, int aInputSlots, int aOutputSlots, int aTankCapacity, - int aGUIParameterA, int aGUIParameterB, String aGUIName, ResourceLocation aSound, boolean aSharedTank, - boolean aRequiresFluidForFiltering, SpecialEffects aSpecialEffect, String aOverlays, Object[] aRecipe) { + ResourceLocation aSound, boolean aSharedTank, boolean aRequiresFluidForFiltering, SpecialEffects aSpecialEffect, + String aOverlays, Object[] aRecipe) { this( aID, aName, @@ -80,9 +79,6 @@ public class GT_MetaTileEntity_BasicMachine_GT_Recipe extends GT_MetaTileEntity_ aInputSlots, aOutputSlots, aTankCapacity, - aGUIParameterA, - aGUIParameterB, - aGUIName, aSound, aSharedTank, aRequiresFluidForFiltering, @@ -91,10 +87,13 @@ public class GT_MetaTileEntity_BasicMachine_GT_Recipe extends GT_MetaTileEntity_ aRecipe); } + /** + * Registers machine with multi-line descriptions, specific tank capacity, and sound specified by ResourceLocation. + */ public GT_MetaTileEntity_BasicMachine_GT_Recipe(int aID, String aName, String aNameRegional, int aTier, String[] aDescription, GT_Recipe.GT_Recipe_Map aRecipes, int aInputSlots, int aOutputSlots, int aTankCapacity, - int aGUIParameterA, int aGUIParameterB, String aGUIName, ResourceLocation aSound, boolean aSharedTank, - boolean aRequiresFluidForFiltering, SpecialEffects aSpecialEffect, String aOverlays, Object[] aRecipe) { + ResourceLocation aSound, boolean aSharedTank, boolean aRequiresFluidForFiltering, SpecialEffects aSpecialEffect, + String aOverlays, Object[] aRecipe) { super( aID, aName, @@ -104,8 +103,6 @@ public class GT_MetaTileEntity_BasicMachine_GT_Recipe extends GT_MetaTileEntity_ aDescription, aInputSlots, aOutputSlots, - aGUIName, - aRecipes.mNEIName, TextureFactory.of( TextureFactory.of( new CustomIcon("basicmachines/" + aOverlays.toLowerCase(Locale.ENGLISH) + "/OVERLAY_SIDE_ACTIVE")), @@ -185,8 +182,6 @@ public class GT_MetaTileEntity_BasicMachine_GT_Recipe extends GT_MetaTileEntity_ this.mRequiresFluidForFiltering = aRequiresFluidForFiltering; this.mRecipes = aRecipes; this.mSoundResourceLocation = aSound; - this.mGUIParameterA = (byte) aGUIParameterA; - this.mGUIParameterB = (byte) aGUIParameterB; this.progressBarTexture = mRecipes.getProgressBarTextureRaw(); // TODO: CHECK @@ -448,6 +443,36 @@ public class GT_MetaTileEntity_BasicMachine_GT_Recipe extends GT_MetaTileEntity_ } } + /** + * Registers machine with single-line description, auto-scaled fluid tank, and sound specified by SoundResource. + */ + public GT_MetaTileEntity_BasicMachine_GT_Recipe(int aID, String aName, String aNameRegional, int aTier, + String aDescription, GT_Recipe.GT_Recipe_Map aRecipes, int aInputSlots, int aOutputSlots, boolean usesFluids, + SoundResource aSound, boolean aSharedTank, boolean aRequiresFluidForFiltering, SpecialEffects aSpecialEffect, + String aOverlays, Object[] aRecipe) { + this( + aID, + aName, + aNameRegional, + aTier, + aDescription, + aRecipes, + aInputSlots, + aOutputSlots, + usesFluids ? getCapacityForTier(aTier) : 0, + aSound.resourceLocation, + aSharedTank, + aRequiresFluidForFiltering, + aSpecialEffect, + aOverlays, + aRecipe); + } + + /** + * @deprecated Use {@link #GT_MetaTileEntity_BasicMachine_GT_Recipe(int, String, String, int, String, + * GT_Recipe.GT_Recipe_Map, int, int, boolean, SoundResource, boolean, boolean, SpecialEffects, String, Object[])} + */ + @Deprecated public GT_MetaTileEntity_BasicMachine_GT_Recipe(int aID, String aName, String aNameRegional, int aTier, String aDescription, GT_Recipe.GT_Recipe_Map aRecipes, int aInputSlots, int aOutputSlots, boolean usesFluids, int aGUIParameterA, int aGUIParameterB, String aGUIName, SoundResource aSound, boolean aSharedTank, @@ -462,9 +487,6 @@ public class GT_MetaTileEntity_BasicMachine_GT_Recipe extends GT_MetaTileEntity_ aInputSlots, aOutputSlots, usesFluids ? getCapacityForTier(aTier) : 0, - aGUIParameterA, - aGUIParameterB, - aGUIName, aSound.resourceLocation, aSharedTank, aRequiresFluidForFiltering, @@ -473,6 +495,36 @@ public class GT_MetaTileEntity_BasicMachine_GT_Recipe extends GT_MetaTileEntity_ aRecipe); } + /** + * Registers machine with multi-line descriptions, auto-scaled fluid tank, and sound specified by SoundResource. + */ + public GT_MetaTileEntity_BasicMachine_GT_Recipe(int aID, String aName, String aNameRegional, int aTier, + String[] aDescription, GT_Recipe.GT_Recipe_Map aRecipes, int aInputSlots, int aOutputSlots, boolean usesFluids, + SoundResource aSound, boolean aSharedTank, boolean aRequiresFluidForFiltering, SpecialEffects aSpecialEffect, + String aOverlays, Object[] aRecipe) { + this( + aID, + aName, + aNameRegional, + aTier, + aDescription, + aRecipes, + aInputSlots, + aOutputSlots, + usesFluids ? getCapacityForTier(aTier) : 0, + aSound.resourceLocation, + aSharedTank, + aRequiresFluidForFiltering, + aSpecialEffect, + aOverlays, + aRecipe); + } + + /** + * @deprecated Use {@link #GT_MetaTileEntity_BasicMachine_GT_Recipe(int, String, String, int, String[], + * GT_Recipe.GT_Recipe_Map, int, int, boolean, SoundResource, boolean, boolean, SpecialEffects, String, Object[])} + */ + @Deprecated public GT_MetaTileEntity_BasicMachine_GT_Recipe(int aID, String aName, String aNameRegional, int aTier, String[] aDescription, GT_Recipe.GT_Recipe_Map aRecipes, int aInputSlots, int aOutputSlots, boolean usesFluids, int aGUIParameterA, int aGUIParameterB, String aGUIName, SoundResource aSound, boolean aSharedTank, @@ -487,9 +539,6 @@ public class GT_MetaTileEntity_BasicMachine_GT_Recipe extends GT_MetaTileEntity_ aInputSlots, aOutputSlots, usesFluids ? getCapacityForTier(aTier) : 0, - aGUIParameterA, - aGUIParameterB, - aGUIName, aSound.resourceLocation, aSharedTank, aRequiresFluidForFiltering, @@ -498,6 +547,36 @@ public class GT_MetaTileEntity_BasicMachine_GT_Recipe extends GT_MetaTileEntity_ aRecipe); } + /** + * Registers machine with single-line description, specific tank capacity, and sound specified by SoundResource. + */ + public GT_MetaTileEntity_BasicMachine_GT_Recipe(int aID, String aName, String aNameRegional, int aTier, + String aDescription, GT_Recipe.GT_Recipe_Map aRecipes, int aInputSlots, int aOutputSlots, int aTankCapacity, + SoundResource aSound, boolean aSharedTank, boolean aRequiresFluidForFiltering, SpecialEffects aSpecialEffect, + String aOverlays, Object[] aRecipe) { + this( + aID, + aName, + aNameRegional, + aTier, + aDescription, + aRecipes, + aInputSlots, + aOutputSlots, + aTankCapacity, + aSound.resourceLocation, + aSharedTank, + aRequiresFluidForFiltering, + aSpecialEffect, + aOverlays, + aRecipe); + } + + /** + * @deprecated Use {@link #GT_MetaTileEntity_BasicMachine_GT_Recipe(int, String, String, int, String, + * GT_Recipe.GT_Recipe_Map, int, int, int, SoundResource, boolean, boolean, SpecialEffects, String, Object[])} + */ + @Deprecated public GT_MetaTileEntity_BasicMachine_GT_Recipe(int aID, String aName, String aNameRegional, int aTier, String aDescription, GT_Recipe.GT_Recipe_Map aRecipes, int aInputSlots, int aOutputSlots, int aTankCapacity, int aGUIParameterA, int aGUIParameterB, String aGUIName, SoundResource aSound, boolean aSharedTank, @@ -512,9 +591,6 @@ public class GT_MetaTileEntity_BasicMachine_GT_Recipe extends GT_MetaTileEntity_ aInputSlots, aOutputSlots, aTankCapacity, - aGUIParameterA, - aGUIParameterB, - aGUIName, aSound.resourceLocation, aSharedTank, aRequiresFluidForFiltering, @@ -523,6 +599,36 @@ public class GT_MetaTileEntity_BasicMachine_GT_Recipe extends GT_MetaTileEntity_ aRecipe); } + /** + * Registers machine with multi-line descriptions, specific tank capacity, and sound specified by SoundResource. + */ + public GT_MetaTileEntity_BasicMachine_GT_Recipe(int aID, String aName, String aNameRegional, int aTier, + String[] aDescription, GT_Recipe.GT_Recipe_Map aRecipes, int aInputSlots, int aOutputSlots, int aTankCapacity, + SoundResource aSound, boolean aSharedTank, boolean aRequiresFluidForFiltering, SpecialEffects aSpecialEffect, + String aOverlays, Object[] aRecipe) { + this( + aID, + aName, + aNameRegional, + aTier, + aDescription, + aRecipes, + aInputSlots, + aOutputSlots, + aTankCapacity, + aSound.resourceLocation, + aSharedTank, + aRequiresFluidForFiltering, + aSpecialEffect, + aOverlays, + aRecipe); + } + + /** + * @deprecated Use {@link #GT_MetaTileEntity_BasicMachine_GT_Recipe(int, String, String, int, String[], + * GT_Recipe.GT_Recipe_Map, int, int, int, SoundResource, boolean, boolean, SpecialEffects, String, Object[])} + */ + @Deprecated public GT_MetaTileEntity_BasicMachine_GT_Recipe(int aID, String aName, String aNameRegional, int aTier, String[] aDescription, GT_Recipe.GT_Recipe_Map aRecipes, int aInputSlots, int aOutputSlots, int aTankCapacity, int aGUIParameterA, int aGUIParameterB, String aGUIName, SoundResource aSound, boolean aSharedTank, @@ -537,9 +643,6 @@ public class GT_MetaTileEntity_BasicMachine_GT_Recipe extends GT_MetaTileEntity_ aInputSlots, aOutputSlots, aTankCapacity, - aGUIParameterA, - aGUIParameterB, - aGUIName, aSound.resourceLocation, aSharedTank, aRequiresFluidForFiltering, @@ -549,10 +652,8 @@ public class GT_MetaTileEntity_BasicMachine_GT_Recipe extends GT_MetaTileEntity_ } /** - * @inheritDoc - * @deprecated Use {@link #GT_MetaTileEntity_BasicMachine_GT_Recipe( int aID, String, String, int, String, - * GT_Recipe.GT_Recipe_Map, int, int, int, int, int, String, ResourceLocation, boolean, boolean, - * SpecialEffects, String , Object[])} + * @deprecated Use {@link #GT_MetaTileEntity_BasicMachine_GT_Recipe(int, String, String, int, String, + * GT_Recipe.GT_Recipe_Map, int, int, int, ResourceLocation, boolean, boolean, SpecialEffects, String, Object[])} */ @Deprecated public GT_MetaTileEntity_BasicMachine_GT_Recipe(int aID, String aName, String aNameRegional, int aTier, @@ -569,9 +670,6 @@ public class GT_MetaTileEntity_BasicMachine_GT_Recipe extends GT_MetaTileEntity_ aInputSlots, aOutputSlots, aTankCapacity, - aGUIParameterA, - aGUIParameterB, - aGUIName, new ResourceLocation(aSound), aSharedTank, aRequiresFluidForFiltering, @@ -580,34 +678,20 @@ public class GT_MetaTileEntity_BasicMachine_GT_Recipe extends GT_MetaTileEntity_ aRecipe); } - public GT_MetaTileEntity_BasicMachine_GT_Recipe(String aName, int aTier, String aDescription, - GT_Recipe.GT_Recipe_Map aRecipes, int aInputSlots, int aOutputSlots, int aTankCapacity, int aAmperage, - int aGUIParameterA, int aGUIParameterB, ITexture[][][] aTextures, String aGUIName, String aNEIName, - String aSound, boolean aSharedTank, boolean aRequiresFluidForFiltering, int aSpecialEffect) { - super(aName, aTier, aAmperage, aDescription, aTextures, aInputSlots, aOutputSlots, aGUIName, aNEIName); - this.mSharedTank = aSharedTank; - this.mTankCapacity = aTankCapacity; - this.mSpecialEffect = SpecialEffects.fromId(aSpecialEffect); - this.mRequiresFluidForFiltering = aRequiresFluidForFiltering; - this.mRecipes = aRecipes; - this.mSoundResourceLocation = new ResourceLocation(aSound); - this.mGUIParameterA = (byte) aGUIParameterA; - this.mGUIParameterB = (byte) aGUIParameterB; - } - + /** + * For {@link #newMetaEntity}. + */ public GT_MetaTileEntity_BasicMachine_GT_Recipe(String aName, int aTier, String[] aDescription, GT_Recipe.GT_Recipe_Map aRecipes, int aInputSlots, int aOutputSlots, int aTankCapacity, int aAmperage, - int aGUIParameterA, int aGUIParameterB, ITexture[][][] aTextures, String aGUIName, String aNEIName, - String aSound, boolean aSharedTank, boolean aRequiresFluidForFiltering, int aSpecialEffect) { - super(aName, aTier, aAmperage, aDescription, aTextures, aInputSlots, aOutputSlots, aGUIName, aNEIName); + ITexture[][][] aTextures, ResourceLocation aSound, boolean aSharedTank, boolean aRequiresFluidForFiltering, + SpecialEffects aSpecialEffect) { + super(aName, aTier, aAmperage, aDescription, aTextures, aInputSlots, aOutputSlots); this.mSharedTank = aSharedTank; this.mTankCapacity = aTankCapacity; - this.mSpecialEffect = SpecialEffects.fromId(aSpecialEffect); + this.mSpecialEffect = aSpecialEffect; this.mRequiresFluidForFiltering = aRequiresFluidForFiltering; this.mRecipes = aRecipes; - this.mSoundResourceLocation = new ResourceLocation(aSound); - this.mGUIParameterA = (byte) aGUIParameterA; - this.mGUIParameterB = (byte) aGUIParameterB; + this.mSoundResourceLocation = aSound; } @Override @@ -621,15 +705,11 @@ public class GT_MetaTileEntity_BasicMachine_GT_Recipe extends GT_MetaTileEntity_ this.mOutputItems == null ? 0 : this.mOutputItems.length, this.mTankCapacity, this.mAmperage, - this.mGUIParameterA, - this.mGUIParameterB, this.mTextures, - this.mGUIName, - this.mNEIName, - this.mSoundResourceLocation.toString(), + this.mSoundResourceLocation, this.mSharedTank, this.mRequiresFluidForFiltering, - this.mSpecialEffect.ordinal()).setProgressBarTexture(this.progressBarTexture); + this.mSpecialEffect).setProgressBarTexture(this.progressBarTexture); } public GT_MetaTileEntity_BasicMachine_GT_Recipe setProgressBarTexture(FallbackableUITexture progressBarTexture) { @@ -647,24 +727,6 @@ public class GT_MetaTileEntity_BasicMachine_GT_Recipe extends GT_MetaTileEntity_ } @Override - public Object getServerGUI(int aID, InventoryPlayer aPlayerInventory, IGregTechTileEntity aBaseMetaTileEntity) { - return new GT_Container_BasicMachine(aPlayerInventory, aBaseMetaTileEntity); - } - - @Override - public Object getClientGUI(int aID, InventoryPlayer aPlayerInventory, IGregTechTileEntity aBaseMetaTileEntity) { - return new GT_GUIContainer_BasicMachine( - aPlayerInventory, - aBaseMetaTileEntity, - this.getLocalName(), - this.mGUIName, - GT_Utility.isStringValid(this.mNEIName) ? this.mNEIName - : this.getRecipeList() != null ? this.getRecipeList().mUnlocalizedName : "", - this.mGUIParameterA, - this.mGUIParameterB); - } - - @Override protected boolean allowPutStackValidated(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, ForgeDirection side, ItemStack aStack) { if (!super.allowPutStackValidated(aBaseMetaTileEntity, aIndex, side, aStack)) return false; diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine_Steel.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine_Steel.java index 8a8f63cdb9..eae713d28a 100644 --- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine_Steel.java +++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine_Steel.java @@ -30,11 +30,6 @@ public abstract class GT_MetaTileEntity_BasicMachine_Steel extends GT_MetaTileEn super(aID, aName, aNameRegional, aDescription, aInputSlotCount, aOutputSlotCount, aHighPressure); } - public GT_MetaTileEntity_BasicMachine_Steel(String aName, String aDescription, ITexture[][][] aTextures, - int aInputSlotCount, int aOutputSlotCount, boolean aHighPressure) { - super(aName, aDescription, aTextures, aInputSlotCount, aOutputSlotCount, aHighPressure); - } - public GT_MetaTileEntity_BasicMachine_Steel(String aName, String[] aDescription, ITexture[][][] aTextures, int aInputSlotCount, int aOutputSlotCount, boolean aHighPressure) { super(aName, aDescription, aTextures, aInputSlotCount, aOutputSlotCount, aHighPressure); diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_AdvSeismicProspector.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_AdvSeismicProspector.java index e5948fdae8..78ed9982fc 100644 --- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_AdvSeismicProspector.java +++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_AdvSeismicProspector.java @@ -67,8 +67,6 @@ public class GT_MetaTileEntity_AdvSeismicProspector extends GT_MetaTileEntity_Ba "", 1, // input slot count 1, // output slot count - "Default.png", // GUI name - "", // NEI name TextureFactory.of( TextureFactory.of(OVERLAY_SIDE_ROCK_BREAKER_ACTIVE), TextureFactory.builder() @@ -131,8 +129,8 @@ public class GT_MetaTileEntity_AdvSeismicProspector extends GT_MetaTileEntity_Ba } protected GT_MetaTileEntity_AdvSeismicProspector(String aName, int aTier, String[] aDescription, - ITexture[][][] aTextures, String aGUIName, String aNEIName, int aRadius, int aStep) { - super(aName, aTier, 1, aDescription, aTextures, 1, 1, aGUIName, aNEIName); + ITexture[][][] aTextures, int aRadius, int aStep) { + super(aName, aTier, 1, aDescription, aTextures, 1, 1); radius = aRadius; step = aStep; } @@ -144,8 +142,6 @@ public class GT_MetaTileEntity_AdvSeismicProspector extends GT_MetaTileEntity_Ba this.mTier, this.mDescriptionArray, this.mTextures, - this.mGUIName, - this.mNEIName, this.radius, this.step); } diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Boxinator.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Boxinator.java index 14002597df..4c38b01279 100644 --- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Boxinator.java +++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Boxinator.java @@ -47,8 +47,6 @@ public class GT_MetaTileEntity_Boxinator extends GT_MetaTileEntity_BasicMachine MachineType.PACKAGER.tooltipDescription(), 2, 1, - "Packager.png", - "", TextureFactory.of( TextureFactory.of(OVERLAY_SIDE_BOXINATOR_ACTIVE), TextureFactory.builder() @@ -99,25 +97,13 @@ public class GT_MetaTileEntity_Boxinator extends GT_MetaTileEntity_BasicMachine .build())); } - public GT_MetaTileEntity_Boxinator(String aName, int aTier, String aDescription, ITexture[][][] aTextures, - String aGUIName, String aNEIName) { - super(aName, aTier, 1, aDescription, aTextures, 2, 1, aGUIName, aNEIName); - } - - public GT_MetaTileEntity_Boxinator(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures, - String aGUIName, String aNEIName) { - super(aName, aTier, 1, aDescription, aTextures, 2, 1, aGUIName, aNEIName); + public GT_MetaTileEntity_Boxinator(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { + super(aName, aTier, 1, aDescription, aTextures, 2, 1); } @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_Boxinator( - this.mName, - this.mTier, - this.mDescriptionArray, - this.mTextures, - this.mGUIName, - this.mNEIName); + return new GT_MetaTileEntity_Boxinator(this.mName, this.mTier, this.mDescriptionArray, this.mTextures); } @Override diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_CuringOven.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_CuringOven.java deleted file mode 100644 index 5408beca32..0000000000 --- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_CuringOven.java +++ /dev/null @@ -1,122 +0,0 @@ -package gregtech.common.tileentities.machines.basic; - -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.fluids.FluidStack; - -import com.gtnewhorizons.modularui.api.screen.ModularWindow; -import com.gtnewhorizons.modularui.api.screen.UIBuildContext; - -import gregtech.api.enums.ItemList; -import gregtech.api.enums.Textures; -import gregtech.api.interfaces.ITexture; -import gregtech.api.interfaces.modularui.IAddUIWidgets; -import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gregtech.api.items.GT_MetaGenerated_Tool; -import gregtech.api.metatileentity.MetaTileEntity; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine; -import gregtech.api.render.TextureFactory; - -public class GT_MetaTileEntity_CuringOven extends GT_MetaTileEntity_BasicMachine implements IAddUIWidgets { - - public GT_MetaTileEntity_CuringOven(int aID, String aName, String aNameRegional, int aTier) { - super( - aID, - aName, - aNameRegional, - aTier, - 1, - "Heats tools for hardening", - 1, - 1, - "E_Oven.png", - "", - TextureFactory.of(new Textures.BlockIcons.CustomIcon("basicmachines/ELECTRIC_OVEN/OVERLAY_SIDE_ACTIVE")), - TextureFactory.of(new Textures.BlockIcons.CustomIcon("basicmachines/ELECTRIC_OVEN/OVERLAY_SIDE")), - TextureFactory.of(new Textures.BlockIcons.CustomIcon("basicmachines/ELECTRIC_OVEN/OVERLAY_FRONT_ACTIVE")), - TextureFactory.of(new Textures.BlockIcons.CustomIcon("basicmachines/ELECTRIC_OVEN/OVERLAY_FRONT")), - TextureFactory.of(new Textures.BlockIcons.CustomIcon("basicmachines/ELECTRIC_OVEN/OVERLAY_TOP_ACTIVE")), - TextureFactory.of(new Textures.BlockIcons.CustomIcon("basicmachines/ELECTRIC_OVEN/OVERLAY_TOP")), - TextureFactory.of(new Textures.BlockIcons.CustomIcon("basicmachines/ELECTRIC_OVEN/OVERLAY_BOTTOM_ACTIVE")), - TextureFactory.of(new Textures.BlockIcons.CustomIcon("basicmachines/ELECTRIC_OVEN/OVERLAY_BOTTOM"))); - } - - public GT_MetaTileEntity_CuringOven(String aName, int aTier, String aDescription, ITexture[][][] aTextures, - String aGUIName, String aNEIName) { - super(aName, aTier, 1, aDescription, aTextures, 1, 1, aGUIName, aNEIName); - } - - public GT_MetaTileEntity_CuringOven(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures, - String aGUIName, String aNEIName) { - super(aName, aTier, 1, aDescription, aTextures, 1, 1, aGUIName, aNEIName); - } - - @Override - public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_CuringOven( - this.mName, - this.mTier, - this.mDescriptionArray, - this.mTextures, - this.mGUIName, - this.mNEIName); - } - - @Override - protected boolean allowPutStackValidated(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, ForgeDirection side, - ItemStack aStack) { - return (super.allowPutStackValidated(aBaseMetaTileEntity, aIndex, side, aStack)) - && ItemList.Cell_Empty.isStackEqual(aStack); - } - - @Override - public boolean isFluidInputAllowed(FluidStack aFluid) { - return false; - } - - @Override - public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) { - if (aBaseMetaTileEntity.isServerSide()) { - for (ItemStack tStack : mInventory) if (tStack != null && tStack.getItem() instanceof GT_MetaGenerated_Tool - && getBaseMetaTileEntity().getStoredEU() > 0) { - getBaseMetaTileEntity().decreaseStoredEnergyUnits(24, true); - NBTTagCompound aNBT = tStack.getTagCompound(); - if (aNBT != null) { - int tHeat = 300; - long tWorldTime = getBaseMetaTileEntity().getWorld() - .getTotalWorldTime(); - aNBT = aNBT.getCompoundTag("GT.ToolStats"); - if (aNBT != null && aNBT.hasKey("Heat")) { - tHeat = aNBT.getInteger("Heat"); - if (aNBT.hasKey("HeatTime")) { - long tHeatTime = aNBT.getLong("HeatTime"); - if (tWorldTime > (tHeatTime + 10)) { - tHeat = (int) (tHeat - ((tWorldTime - tHeatTime) / 10)); - if (tHeat < 300) tHeat = 300; - } - } - } - tHeat++; - if (aNBT != null) { - aNBT.setInteger("Heat", tHeat); - aNBT.setLong("HeatTime", tWorldTime); - } - if (tHeat > GT_MetaGenerated_Tool.getPrimaryMaterial(tStack).mMeltingPoint) { - mInventory[0] = null; - } - } - } - } - } - - @Override - public boolean useModularUI() { - return true; - } - - @Override - public void addUIWidgets(ModularWindow.Builder builder, UIBuildContext buildContext) { - getBaseMetaTileEntity().add1by1Slot(builder); - } -} diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_IndustrialApiary.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_IndustrialApiary.java index e43b1a305c..e85ada67e6 100644 --- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_IndustrialApiary.java +++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_IndustrialApiary.java @@ -153,8 +153,6 @@ public class GT_MetaTileEntity_IndustrialApiary extends GT_MetaTileEntity_BasicM "Primary outputs are rolled once with base chance, once with half base" }, 6, 9, - "IndustrialApiary.png", - "", TextureFactory.of( TextureFactory.of(OVERLAY_SIDE_INDUSTRIAL_APIARY_ACTIVE), TextureFactory.builder() @@ -205,25 +203,14 @@ public class GT_MetaTileEntity_IndustrialApiary extends GT_MetaTileEntity_BasicM .build())); } - public GT_MetaTileEntity_IndustrialApiary(String aName, int aTier, String aDescription, ITexture[][][] aTextures, - String aGUIName, String aNEIName) { - super(aName, aTier, 4, aDescription, aTextures, 6, 9, aGUIName, aNEIName); - } - - public GT_MetaTileEntity_IndustrialApiary(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures, - String aGUIName, String aNEIName) { - super(aName, aTier, 4, aDescription, aTextures, 6, 9, aGUIName, aNEIName); + public GT_MetaTileEntity_IndustrialApiary(String aName, int aTier, String[] aDescription, + ITexture[][][] aTextures) { + super(aName, aTier, 4, aDescription, aTextures, 6, 9); } @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_IndustrialApiary( - this.mName, - this.mTier, - this.mDescriptionArray, - this.mTextures, - this.mGUIName, - this.mNEIName); + return new GT_MetaTileEntity_IndustrialApiary(this.mName, this.mTier, this.mDescriptionArray, this.mTextures); } @Override diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Massfabricator.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Massfabricator.java index 5de32bd649..ca3707abc9 100644 --- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Massfabricator.java +++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Massfabricator.java @@ -55,8 +55,6 @@ public class GT_MetaTileEntity_Massfabricator extends GT_MetaTileEntity_BasicMac MachineType.MATTER_FABRICATOR.tooltipDescription(), 1, 1, - "Massfabricator.png", - "", TextureFactory.of( TextureFactory.of(OVERLAY_SIDE_MASSFAB_ACTIVE), TextureFactory.builder() @@ -108,27 +106,14 @@ public class GT_MetaTileEntity_Massfabricator extends GT_MetaTileEntity_BasicMac EUt = V[1] * (long) Math.pow(2, mTier + 2); } - public GT_MetaTileEntity_Massfabricator(String aName, int aTier, String aDescription, ITexture[][][] aTextures, - String aGUIName, String aNEIName) { - super(aName, aTier, 1, aDescription, aTextures, 1, 1, aGUIName, aNEIName); - EUt = V[1] * (long) Math.pow(2, mTier + 2); - } - - public GT_MetaTileEntity_Massfabricator(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures, - String aGUIName, String aNEIName) { - super(aName, aTier, 1, aDescription, aTextures, 1, 1, aGUIName, aNEIName); + public GT_MetaTileEntity_Massfabricator(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { + super(aName, aTier, 1, aDescription, aTextures, 1, 1); EUt = V[1] * (long) Math.pow(2, mTier + 2); } @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_Massfabricator( - this.mName, - this.mTier, - this.mDescriptionArray, - this.mTextures, - this.mGUIName, - this.mNEIName); + return new GT_MetaTileEntity_Massfabricator(this.mName, this.mTier, this.mDescriptionArray, this.mTextures); } @Override diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Miner.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Miner.java index 314ffd8d1d..3e5445a659 100644 --- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Miner.java +++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Miner.java @@ -41,7 +41,6 @@ import gregtech.common.blocks.GT_TileEntity_Ores; import gregtech.common.misc.GT_DrillingLogicDelegate; import gregtech.common.misc.GT_IDrillingLogicDelegateOwner; -@SuppressWarnings("ObjectEquality") public class GT_MetaTileEntity_Miner extends GT_MetaTileEntity_BasicMachine implements GT_IDrillingLogicDelegateOwner, IAddUIWidgets { @@ -73,8 +72,6 @@ public class GT_MetaTileEntity_Miner extends GT_MetaTileEntity_BasicMachine String.format("Fortune bonus of %d", aTier) }, 2, 2, - "Miner.png", - "", TextureFactory.of( TextureFactory.of(new Textures.BlockIcons.CustomIcon("basicmachines/miner/OVERLAY_SIDE_ACTIVE")), TextureFactory.builder() @@ -127,23 +124,15 @@ public class GT_MetaTileEntity_Miner extends GT_MetaTileEntity_BasicMachine radiusConfig = RADIUS[mTier]; } - public GT_MetaTileEntity_Miner(String aName, int aTier, String aDescription, ITexture[][][] aTextures, - String aGUIName, String aNEIName) { - super(aName, aTier, 1, aDescription, aTextures, 1, 1, aGUIName, aNEIName); - mSpeed = SPEED[aTier]; - radiusConfig = RADIUS[mTier]; - } - - public GT_MetaTileEntity_Miner(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures, - String aGUIName, String aNEIName) { - super(aName, aTier, 1, aDescription, aTextures, 2, 2, aGUIName, aNEIName); + public GT_MetaTileEntity_Miner(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { + super(aName, aTier, 1, aDescription, aTextures, 2, 2); mSpeed = SPEED[aTier]; radiusConfig = RADIUS[mTier]; } @Override public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_Miner(mName, mTier, mDescriptionArray, mTextures, mGUIName, mNEIName); + return new GT_MetaTileEntity_Miner(mName, mTier, mDescriptionArray, mTextures); } @Override diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_PotionBrewer.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_PotionBrewer.java index f1990d959c..7b333208e0 100644 --- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_PotionBrewer.java +++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_PotionBrewer.java @@ -47,8 +47,6 @@ public class GT_MetaTileEntity_PotionBrewer extends GT_MetaTileEntity_BasicMachi MachineType.BREWERY.tooltipDescription(), 1, 0, - "PotionBrewer.png", - "", TextureFactory.of( TextureFactory.of(OVERLAY_SIDE_POTIONBREWER_ACTIVE), TextureFactory.builder() @@ -99,25 +97,13 @@ public class GT_MetaTileEntity_PotionBrewer extends GT_MetaTileEntity_BasicMachi .build())); } - public GT_MetaTileEntity_PotionBrewer(String aName, int aTier, String aDescription, ITexture[][][] aTextures, - String aGUIName, String aNEIName) { - super(aName, aTier, 1, aDescription, aTextures, 1, 0, aGUIName, aNEIName); - } - - public GT_MetaTileEntity_PotionBrewer(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures, - String aGUIName, String aNEIName) { - super(aName, aTier, 1, aDescription, aTextures, 1, 0, aGUIName, aNEIName); + public GT_MetaTileEntity_PotionBrewer(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { + super(aName, aTier, 1, aDescription, aTextures, 1, 0); } @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_PotionBrewer( - this.mName, - this.mTier, - this.mDescriptionArray, - this.mTextures, - this.mGUIName, - this.mNEIName); + return new GT_MetaTileEntity_PotionBrewer(this.mName, this.mTier, this.mDescriptionArray, this.mTextures); } @Override diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Printer.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Printer.java deleted file mode 100644 index b0ffcaedcc..0000000000 --- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Printer.java +++ /dev/null @@ -1,70 +0,0 @@ -package gregtech.common.tileentities.machines.basic; - -import java.util.ArrayList; - -import net.minecraft.item.ItemStack; - -import gregtech.api.enums.OrePrefixes; -import gregtech.api.interfaces.ITexture; -import gregtech.api.interfaces.metatileentity.IMetaTileEntity; -import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine; -import gregtech.api.util.GT_OreDictUnificator; -import gregtech.api.util.GT_Recipe; -import gregtech.api.util.GT_Utility; - -public class GT_MetaTileEntity_Printer extends GT_MetaTileEntity_BasicMachine { - - public GT_MetaTileEntity_Printer(int aID, String aName, String aNameRegional, int aTier) { - super( - aID, - aName, - aNameRegional, - aTier, - 1, - "It can copy Books and paint Stuff", - 1, - 1, - "Printer.png", - GT_Recipe.GT_Recipe_Map.sPrinterRecipes.mNEIName); - } - - public GT_MetaTileEntity_Printer(String aName, int aTier, String aDescription, ITexture[][][] aTextures, - String aGUIName, String aNEIName) { - super(aName, aTier, 1, aDescription, aTextures, 2, 2, aGUIName, aNEIName); - } - - @Override - public int checkRecipe() { - if (getOutputAt(0) != null) { - this.mOutputBlocked += 1; - } else if ((GT_Utility.isStackValid(getInputAt(0))) && (getInputAt(0).stackSize > 0) - && (GT_Utility.isStackInvalid(getSpecialSlot())) - && (OrePrefixes.block.contains(getInputAt(0)))) { - ArrayList<ItemStack> tList = GT_OreDictUnificator - .getOres(GT_OreDictUnificator.getAssociation(getInputAt(0))); - if (tList.size() > 1) { - tList.add(tList.get(0)); - int i = 0; - for (int j = tList.size() - 1; i < j; i++) { - if (GT_Utility.areStacksEqual(getInputAt(0), tList.get(i))) { - this.mOutputItems[0] = GT_Utility.copyAmount(1L, tList.get(i + 1)); - calculateOverclockedNess(1, 32); - // In case recipe is too OP for that machine - if (mMaxProgresstime == Integer.MAX_VALUE - 1 && mEUt == Integer.MAX_VALUE - 1) - return FOUND_RECIPE_BUT_DID_NOT_MEET_REQUIREMENTS; - getInputAt(0).stackSize -= 1; - return 2; - } - } - } - } - this.mMaxProgresstime = 0; - return 0; - } - - @Override - public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return null; - } -} diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Replicator.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Replicator.java index c6e45fca19..92327984e7 100644 --- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Replicator.java +++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Replicator.java @@ -66,8 +66,6 @@ public class GT_MetaTileEntity_Replicator extends GT_MetaTileEntity_BasicMachine MachineType.REPLICATOR.tooltipDescription(), 1, 1, - "Replicator.png", - "", TextureFactory.of( TextureFactory.of(OVERLAY_SIDE_REPLICATOR_ACTIVE), TextureFactory.builder() @@ -118,25 +116,13 @@ public class GT_MetaTileEntity_Replicator extends GT_MetaTileEntity_BasicMachine .build())); } - public GT_MetaTileEntity_Replicator(String aName, int aTier, String aDescription, ITexture[][][] aTextures, - String aGUIName, String aNEIName) { - super(aName, aTier, 1, aDescription, aTextures, 1, 1, aGUIName, aNEIName); - } - - public GT_MetaTileEntity_Replicator(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures, - String aGUIName, String aNEIName) { - super(aName, aTier, 1, aDescription, aTextures, 1, 1, aGUIName, aNEIName); + public GT_MetaTileEntity_Replicator(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { + super(aName, aTier, 1, aDescription, aTextures, 1, 1); } @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_Replicator( - this.mName, - this.mTier, - this.mDescriptionArray, - this.mTextures, - this.mGUIName, - this.mNEIName); + return new GT_MetaTileEntity_Replicator(this.mName, this.mTier, this.mDescriptionArray, this.mTextures); } public static long cubicFluidMultiplier(long amount) { diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_RockBreaker.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_RockBreaker.java index 91382cafaf..c6d554b2eb 100644 --- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_RockBreaker.java +++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_RockBreaker.java @@ -45,8 +45,6 @@ public class GT_MetaTileEntity_RockBreaker extends GT_MetaTileEntity_BasicMachin MachineType.ROCKBREAKER.tooltipDescription(), 1, 1, - "RockBreaker.png", - "", TextureFactory.of( TextureFactory.of(OVERLAY_SIDE_ROCK_BREAKER_ACTIVE), TextureFactory.builder() @@ -97,25 +95,13 @@ public class GT_MetaTileEntity_RockBreaker extends GT_MetaTileEntity_BasicMachin .build())); } - public GT_MetaTileEntity_RockBreaker(String aName, int aTier, String aDescription, ITexture[][][] aTextures, - String aGUIName, String aNEIName) { - super(aName, aTier, 1, aDescription, aTextures, 1, 1, aGUIName, aNEIName); - } - - public GT_MetaTileEntity_RockBreaker(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures, - String aGUIName, String aNEIName) { - super(aName, aTier, 1, aDescription, aTextures, 1, 1, aGUIName, aNEIName); + public GT_MetaTileEntity_RockBreaker(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { + super(aName, aTier, 1, aDescription, aTextures, 1, 1); } @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_RockBreaker( - this.mName, - this.mTier, - this.mDescriptionArray, - this.mTextures, - this.mGUIName, - this.mNEIName); + return new GT_MetaTileEntity_RockBreaker(this.mName, this.mTier, this.mDescriptionArray, this.mTextures); } @Override diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Scanner.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Scanner.java index ba9483647c..c764c72941 100644 --- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Scanner.java +++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Scanner.java @@ -63,8 +63,6 @@ public class GT_MetaTileEntity_Scanner extends GT_MetaTileEntity_BasicMachine { MachineType.SCANNER.tooltipDescription(), 1, 1, - "Scanner.png", - "", TextureFactory.of( TextureFactory.of(OVERLAY_SIDE_SCANNER_ACTIVE), TextureFactory.builder() @@ -115,25 +113,22 @@ public class GT_MetaTileEntity_Scanner extends GT_MetaTileEntity_BasicMachine { .build())); } - public GT_MetaTileEntity_Scanner(String aName, int aTier, String aDescription, ITexture[][][] aTextures, - String aGUIName, String aNEIName) { - super(aName, aTier, 1, aDescription, aTextures, 1, 1, aGUIName, aNEIName); + public GT_MetaTileEntity_Scanner(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { + super(aName, aTier, 1, aDescription, aTextures, 1, 1); } + /** + * @deprecated Use {@link #GT_MetaTileEntity_Scanner(String, int, String[], ITexture[][][])} + */ + @Deprecated public GT_MetaTileEntity_Scanner(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures, String aGUIName, String aNEIName) { - super(aName, aTier, 1, aDescription, aTextures, 1, 1, aGUIName, aNEIName); + super(aName, aTier, 1, aDescription, aTextures, 1, 1); } @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_Scanner( - this.mName, - this.mTier, - this.mDescriptionArray, - this.mTextures, - this.mGUIName, - this.mNEIName); + return new GT_MetaTileEntity_Scanner(this.mName, this.mTier, this.mDescriptionArray, this.mTextures); } @Override diff --git a/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_AlloySmelter_Bronze.java b/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_AlloySmelter_Bronze.java index 4e2de30c82..4aae38530d 100644 --- a/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_AlloySmelter_Bronze.java +++ b/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_AlloySmelter_Bronze.java @@ -32,10 +32,6 @@ public class GT_MetaTileEntity_AlloySmelter_Bronze extends GT_MetaTileEntity_Bas super(aID, aName, aNameRegional, "Combination Smelter", 2, 1, false); } - public GT_MetaTileEntity_AlloySmelter_Bronze(String aName, String aDescription, ITexture[][][] aTextures) { - super(aName, aDescription, aTextures, 2, 1, false); - } - public GT_MetaTileEntity_AlloySmelter_Bronze(String aName, String[] aDescription, ITexture[][][] aTextures) { super(aName, aDescription, aTextures, 2, 1, false); } diff --git a/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_AlloySmelter_Steel.java b/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_AlloySmelter_Steel.java index 754c6fe773..cc4f8d66b0 100644 --- a/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_AlloySmelter_Steel.java +++ b/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_AlloySmelter_Steel.java @@ -32,10 +32,6 @@ public class GT_MetaTileEntity_AlloySmelter_Steel extends GT_MetaTileEntity_Basi super(aID, aName, aNameRegional, "Combination Smelter", 2, 1, true); } - public GT_MetaTileEntity_AlloySmelter_Steel(String aName, String aDescription, ITexture[][][] aTextures) { - super(aName, aDescription, aTextures, 2, 1, true); - } - public GT_MetaTileEntity_AlloySmelter_Steel(String aName, String[] aDescription, ITexture[][][] aTextures) { super(aName, aDescription, aTextures, 2, 1, true); } diff --git a/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Compressor_Bronze.java b/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Compressor_Bronze.java index b6bba6e153..cc5fad4db5 100644 --- a/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Compressor_Bronze.java +++ b/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Compressor_Bronze.java @@ -32,10 +32,6 @@ public class GT_MetaTileEntity_Compressor_Bronze extends GT_MetaTileEntity_Basic super(aID, aName, aNameRegional, "Compressing Items", 1, 1, false); } - public GT_MetaTileEntity_Compressor_Bronze(String aName, String aDescription, ITexture[][][] aTextures) { - super(aName, aDescription, aTextures, 1, 1, false); - } - public GT_MetaTileEntity_Compressor_Bronze(String aName, String[] aDescription, ITexture[][][] aTextures) { super(aName, aDescription, aTextures, 1, 1, false); } diff --git a/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Compressor_Steel.java b/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Compressor_Steel.java index 7b0e725bb1..e1485d1a07 100644 --- a/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Compressor_Steel.java +++ b/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Compressor_Steel.java @@ -32,10 +32,6 @@ public class GT_MetaTileEntity_Compressor_Steel extends GT_MetaTileEntity_BasicM super(aID, aName, aNameRegional, "Compressing Items", 1, 1, true); } - public GT_MetaTileEntity_Compressor_Steel(String aName, String aDescription, ITexture[][][] aTextures) { - super(aName, aDescription, aTextures, 1, 1, true); - } - public GT_MetaTileEntity_Compressor_Steel(String aName, String[] aDescription, ITexture[][][] aTextures) { super(aName, aDescription, aTextures, 1, 1, true); } diff --git a/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Extractor_Bronze.java b/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Extractor_Bronze.java index 4a4a9d5a0a..fd40b61201 100644 --- a/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Extractor_Bronze.java +++ b/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Extractor_Bronze.java @@ -32,10 +32,6 @@ public class GT_MetaTileEntity_Extractor_Bronze extends GT_MetaTileEntity_BasicM super(aID, aName, aNameRegional, "Extracting your first Rubber", 1, 1, false); } - public GT_MetaTileEntity_Extractor_Bronze(String aName, String aDescription, ITexture[][][] aTextures) { - super(aName, aDescription, aTextures, 1, 1, false); - } - public GT_MetaTileEntity_Extractor_Bronze(String aName, String[] aDescription, ITexture[][][] aTextures) { super(aName, aDescription, aTextures, 1, 1, false); } diff --git a/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Extractor_Steel.java b/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Extractor_Steel.java index b877491f24..e40086515c 100644 --- a/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Extractor_Steel.java +++ b/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Extractor_Steel.java @@ -32,10 +32,6 @@ public class GT_MetaTileEntity_Extractor_Steel extends GT_MetaTileEntity_BasicMa super(aID, aName, aNameRegional, "Extracting your first Rubber", 1, 1, true); } - public GT_MetaTileEntity_Extractor_Steel(String aName, String aDescription, ITexture[][][] aTextures) { - super(aName, aDescription, aTextures, 1, 1, true); - } - public GT_MetaTileEntity_Extractor_Steel(String aName, String[] aDescription, ITexture[][][] aTextures) { super(aName, aDescription, aTextures, 1, 1, true); } diff --git a/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_ForgeHammer_Bronze.java b/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_ForgeHammer_Bronze.java index c7f47f92c4..e4eeb0533f 100644 --- a/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_ForgeHammer_Bronze.java +++ b/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_ForgeHammer_Bronze.java @@ -40,10 +40,6 @@ public class GT_MetaTileEntity_ForgeHammer_Bronze extends GT_MetaTileEntity_Basi super(aID, aName, aNameRegional, "Forge Hammer", 1, 1, false); } - public GT_MetaTileEntity_ForgeHammer_Bronze(String aName, String aDescription, ITexture[][][] aTextures) { - super(aName, aDescription, aTextures, 1, 1, false); - } - public GT_MetaTileEntity_ForgeHammer_Bronze(String aName, String[] aDescription, ITexture[][][] aTextures) { super(aName, aDescription, aTextures, 1, 1, false); } diff --git a/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_ForgeHammer_Steel.java b/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_ForgeHammer_Steel.java index 4ab1e517cb..704d5e26a7 100644 --- a/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_ForgeHammer_Steel.java +++ b/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_ForgeHammer_Steel.java @@ -40,10 +40,6 @@ public class GT_MetaTileEntity_ForgeHammer_Steel extends GT_MetaTileEntity_Basic super(aID, aName, aNameRegional, "Forge Hammer", 1, 1, true); } - public GT_MetaTileEntity_ForgeHammer_Steel(String aName, String aDescription, ITexture[][][] aTextures) { - super(aName, aDescription, aTextures, 1, 1, true); - } - public GT_MetaTileEntity_ForgeHammer_Steel(String aName, String[] aDescription, ITexture[][][] aTextures) { super(aName, aDescription, aTextures, 1, 1, true); } diff --git a/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Furnace_Bronze.java b/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Furnace_Bronze.java index a5328a5e85..6453922931 100644 --- a/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Furnace_Bronze.java +++ b/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Furnace_Bronze.java @@ -35,10 +35,6 @@ public class GT_MetaTileEntity_Furnace_Bronze extends GT_MetaTileEntity_BasicMac super(aID, aName, aNameRegional, "Smelting things with compressed Steam", 1, 1, false); } - public GT_MetaTileEntity_Furnace_Bronze(String aName, String aDescription, ITexture[][][] aTextures) { - super(aName, aDescription, aTextures, 1, 1, false); - } - public GT_MetaTileEntity_Furnace_Bronze(String aName, String[] aDescription, ITexture[][][] aTextures) { super(aName, aDescription, aTextures, 1, 1, false); } diff --git a/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Furnace_Steel.java b/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Furnace_Steel.java index ddde300d99..da52351fb7 100644 --- a/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Furnace_Steel.java +++ b/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Furnace_Steel.java @@ -35,10 +35,6 @@ public class GT_MetaTileEntity_Furnace_Steel extends GT_MetaTileEntity_BasicMach super(aID, aName, aNameRegional, "Smelting things with compressed Steam", 1, 1, true); } - public GT_MetaTileEntity_Furnace_Steel(String aName, String aDescription, ITexture[][][] aTextures) { - super(aName, aDescription, aTextures, 1, 1, true); - } - public GT_MetaTileEntity_Furnace_Steel(String aName, String[] aDescription, ITexture[][][] aTextures) { super(aName, aDescription, aTextures, 1, 1, true); } diff --git a/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Macerator_Bronze.java b/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Macerator_Bronze.java index cd70e0cbd9..c12f213322 100644 --- a/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Macerator_Bronze.java +++ b/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Macerator_Bronze.java @@ -41,10 +41,6 @@ public class GT_MetaTileEntity_Macerator_Bronze extends GT_MetaTileEntity_BasicM super(aID, aName, aNameRegional, "Macerating your Ores", 1, 1, false); } - public GT_MetaTileEntity_Macerator_Bronze(String aName, String aDescription, ITexture[][][] aTextures) { - super(aName, aDescription, aTextures, 1, 1, false); - } - public GT_MetaTileEntity_Macerator_Bronze(String aName, String[] aDescription, ITexture[][][] aTextures) { super(aName, aDescription, aTextures, 1, 1, false); } diff --git a/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Macerator_Steel.java b/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Macerator_Steel.java index a2fe809077..0d38a8ca8f 100644 --- a/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Macerator_Steel.java +++ b/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Macerator_Steel.java @@ -41,10 +41,6 @@ public class GT_MetaTileEntity_Macerator_Steel extends GT_MetaTileEntity_BasicMa super(aID, aName, aNameRegional, "Macerating your Ores", 1, 1, true); } - public GT_MetaTileEntity_Macerator_Steel(String aName, String aDescription, ITexture[][][] aTextures) { - super(aName, aDescription, aTextures, 1, 1, true); - } - public GT_MetaTileEntity_Macerator_Steel(String aName, String[] aDescription, ITexture[][][] aTextures) { super(aName, aDescription, aTextures, 1, 1, true); } diff --git a/src/main/java/gregtech/loaders/load/GT_Loader_MetaTileEntities_Recipes.java b/src/main/java/gregtech/loaders/load/GT_Loader_MetaTileEntities_Recipes.java index 4164ab289a..71ca165a2f 100644 --- a/src/main/java/gregtech/loaders/load/GT_Loader_MetaTileEntities_Recipes.java +++ b/src/main/java/gregtech/loaders/load/GT_Loader_MetaTileEntities_Recipes.java @@ -112,9 +112,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 2, 1, false, - 0, - 1, - "AlloySmelter.png", SoundResource.IC2_MACHINES_INDUCTION_LOOP, false, false, @@ -136,9 +133,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 2, 1, false, - 0, - 1, - "AlloySmelter.png", SoundResource.IC2_MACHINES_INDUCTION_LOOP, false, false, @@ -160,9 +154,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 2, 1, false, - 0, - 1, - "AlloySmelter.png", SoundResource.IC2_MACHINES_INDUCTION_LOOP, false, false, @@ -184,9 +175,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 2, 1, false, - 0, - 1, - "AlloySmelter.png", SoundResource.IC2_MACHINES_INDUCTION_LOOP, false, false, @@ -208,9 +196,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 2, 1, false, - 0, - 1, - "AlloySmelter.png", SoundResource.IC2_MACHINES_INDUCTION_LOOP, false, false, @@ -235,9 +220,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 1, 4, true, - 0, - 1, - "ArcFurnace.png", SoundResource.IC2_MACHINES_INDUCTION_LOOP, false, false, @@ -260,9 +242,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 1, 4, true, - 0, - 1, - "ArcFurnace.png", SoundResource.IC2_MACHINES_INDUCTION_LOOP, false, false, @@ -284,9 +263,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 1, 4, true, - 0, - 1, - "ArcFurnace.png", SoundResource.IC2_MACHINES_INDUCTION_LOOP, false, false, @@ -309,9 +285,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 1, 9, true, - 0, - 1, - "ArcFurnace.png", SoundResource.IC2_MACHINES_INDUCTION_LOOP, false, false, @@ -334,9 +307,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 1, 9, true, - 0, - 1, - "ArcFurnace.png", SoundResource.IC2_MACHINES_INDUCTION_LOOP, false, false, @@ -361,9 +331,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 6, 1, true, - 0, - 1, - "Assembler.png", SoundResource.NONE, false, false, @@ -385,9 +352,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 9, 1, true, - 0, - 1, - "Assembler2.png", SoundResource.NONE, false, false, @@ -409,9 +373,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 9, 1, true, - 0, - 1, - "Assembler2.png", SoundResource.NONE, false, false, @@ -433,9 +394,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 9, 1, true, - 0, - 1, - "Assembler2.png", SoundResource.NONE, false, false, @@ -457,9 +415,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 9, 1, true, - 0, - 1, - "Assembler2.png", SoundResource.NONE, false, false, @@ -484,9 +439,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 2, 2, true, - 0, - 1, - "Autoclave2.png", SoundResource.NONE, false, false, @@ -509,9 +461,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 2, 2, true, - 0, - 1, - "Autoclave2.png", SoundResource.NONE, false, false, @@ -534,9 +483,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 2, 3, true, - 0, - 1, - "Autoclave3.png", SoundResource.NONE, false, false, @@ -559,9 +505,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 2, 4, true, - 0, - 1, - "Autoclave4.png", SoundResource.NONE, false, false, @@ -584,9 +527,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 2, 4, true, - 0, - 1, - "Autoclave4.png", SoundResource.NONE, false, false, @@ -612,9 +552,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 2, 1, false, - 0, - 1, - "Bender.png", SoundResource.IC2_MACHINES_COMPRESSOR_OP, false, false, @@ -637,9 +574,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 2, 1, false, - 0, - 1, - "Bender.png", SoundResource.IC2_MACHINES_COMPRESSOR_OP, false, false, @@ -662,9 +596,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 2, 1, false, - 0, - 1, - "Bender.png", SoundResource.IC2_MACHINES_COMPRESSOR_OP, false, false, @@ -687,9 +618,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 2, 1, false, - 0, - 1, - "Bender.png", SoundResource.IC2_MACHINES_COMPRESSOR_OP, false, false, @@ -712,9 +640,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 2, 1, false, - 0, - 1, - "Bender.png", SoundResource.IC2_MACHINES_COMPRESSOR_OP, false, false, @@ -740,9 +665,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 2, 2, false, - 0, - 1, - "Canner.png", SoundResource.IC2_MACHINES_EXTRACTOR_OP, false, false, @@ -765,9 +687,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 2, 2, false, - 0, - 1, - "Canner.png", SoundResource.IC2_MACHINES_EXTRACTOR_OP, false, false, @@ -790,9 +709,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 2, 2, false, - 0, - 1, - "Canner.png", SoundResource.IC2_MACHINES_EXTRACTOR_OP, false, false, @@ -815,9 +731,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 2, 2, false, - 0, - 1, - "Canner.png", SoundResource.IC2_MACHINES_EXTRACTOR_OP, false, false, @@ -840,9 +753,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 2, 2, false, - 0, - 1, - "Canner.png", SoundResource.IC2_MACHINES_EXTRACTOR_OP, false, false, @@ -868,9 +778,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 2, 6, true, - 0, - 1, - "Centrifuge.png", SoundResource.NONE, false, false, @@ -891,9 +798,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 2, 6, true, - 0, - 1, - "Centrifuge.png", SoundResource.NONE, false, false, @@ -914,9 +818,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 2, 6, true, - 0, - 1, - "Centrifuge.png", SoundResource.NONE, false, false, @@ -937,9 +838,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 2, 6, true, - 0, - 1, - "Centrifuge.png", SoundResource.NONE, false, false, @@ -960,9 +858,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 2, 6, true, - 0, - 1, - "Centrifuge.png", SoundResource.NONE, false, false, @@ -986,9 +881,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 1, 3, true, - 0, - 1, - "ChemicalBath.png", SoundResource.NONE, false, true, @@ -1011,9 +903,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 1, 3, true, - 0, - 1, - "ChemicalBath.png", SoundResource.NONE, false, true, @@ -1036,9 +925,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 1, 3, true, - 0, - 1, - "ChemicalBath.png", SoundResource.NONE, false, true, @@ -1061,9 +947,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 1, 3, true, - 0, - 1, - "ChemicalBath.png", SoundResource.NONE, false, true, @@ -1086,9 +969,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 1, 3, true, - 0, - 1, - "ChemicalBath.png", SoundResource.NONE, false, true, @@ -1114,9 +994,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 2, 2, true, - 0, - 1, - "ChemicalReactor.png", SoundResource.IC2_MACHINES_EXTRACTOR_OP, false, false, @@ -1139,9 +1016,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 2, 2, true, - 0, - 1, - "ChemicalReactor.png", SoundResource.IC2_MACHINES_EXTRACTOR_OP, false, false, @@ -1164,9 +1038,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 2, 2, true, - 0, - 1, - "ChemicalReactor.png", SoundResource.IC2_MACHINES_EXTRACTOR_OP, false, false, @@ -1189,9 +1060,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 2, 2, true, - 0, - 1, - "ChemicalReactor.png", SoundResource.IC2_MACHINES_EXTRACTOR_OP, false, false, @@ -1214,9 +1082,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 2, 2, true, - 0, - 1, - "ChemicalReactor.png", SoundResource.IC2_MACHINES_EXTRACTOR_OP, false, false, @@ -1242,9 +1107,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 6, 1, true, - 0, - 1, - "CircuitAssembler.png", SoundResource.NONE, false, false, @@ -1267,9 +1129,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 6, 1, true, - 0, - 1, - "CircuitAssembler.png", SoundResource.NONE, false, false, @@ -1292,9 +1151,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 6, 1, true, - 0, - 1, - "CircuitAssembler.png", SoundResource.NONE, false, false, @@ -1317,9 +1173,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 6, 1, true, - 0, - 1, - "CircuitAssembler.png", SoundResource.NONE, false, false, @@ -1342,9 +1195,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 6, 1, true, - 0, - 1, - "CircuitAssembler.png", SoundResource.NONE, false, false, @@ -1367,9 +1217,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 6, 1, true, - 0, - 1, - "CircuitAssembler.png", SoundResource.NONE, false, false, @@ -1392,9 +1239,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 6, 1, true, - 0, - 1, - "CircuitAssembler.png", SoundResource.NONE, false, false, @@ -1417,9 +1261,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 6, 1, true, - 0, - 1, - "CircuitAssembler.png", SoundResource.NONE, false, false, @@ -1445,9 +1286,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 1, 1, false, - 0, - 1, - "Compressor.png", SoundResource.IC2_MACHINES_COMPRESSOR_OP, false, false, @@ -1469,9 +1307,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 1, 1, false, - 0, - 1, - "Compressor.png", SoundResource.IC2_MACHINES_COMPRESSOR_OP, false, false, @@ -1493,9 +1328,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 1, 1, false, - 0, - 1, - "Compressor.png", SoundResource.IC2_MACHINES_COMPRESSOR_OP, false, false, @@ -1517,9 +1349,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 1, 1, false, - 0, - 1, - "Compressor.png", SoundResource.IC2_MACHINES_COMPRESSOR_OP, false, false, @@ -1541,9 +1370,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 1, 1, false, - 0, - 1, - "Compressor.png", SoundResource.IC2_MACHINES_COMPRESSOR_OP, false, false, @@ -1568,9 +1394,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 1, 2, true, - 0, - 1, - "Cutter.png", SoundResource.NONE, false, false, @@ -1594,9 +1417,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 2, 2, true, - 0, - 1, - "Cutter2.png", SoundResource.NONE, false, false, @@ -1620,9 +1440,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 2, 4, true, - 0, - 1, - "Cutter4.png", SoundResource.NONE, false, false, @@ -1646,9 +1463,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 2, 4, true, - 0, - 1, - "Cutter4.png", SoundResource.NONE, false, false, @@ -1672,9 +1486,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 2, 4, true, - 0, - 1, - "Cutter4.png", SoundResource.NONE, false, false, @@ -1701,9 +1512,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 1, 1, true, - 0, - 1, - "Distillery.png", SoundResource.GT_MACHINES_DISTILLERY_LOOP, false, false, @@ -1727,9 +1535,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 1, 1, true, - 0, - 1, - "Distillery.png", SoundResource.GT_MACHINES_DISTILLERY_LOOP, false, false, @@ -1753,9 +1558,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 1, 1, true, - 0, - 1, - "Distillery.png", SoundResource.GT_MACHINES_DISTILLERY_LOOP, false, false, @@ -1779,9 +1581,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 1, 1, true, - 0, - 1, - "Distillery.png", SoundResource.GT_MACHINES_DISTILLERY_LOOP, false, false, @@ -1805,9 +1604,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 1, 1, true, - 0, - 1, - "Distillery.png", SoundResource.GT_MACHINES_DISTILLERY_LOOP, false, false, @@ -1834,9 +1630,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 1, 1, false, - 0, - 1, - "E_Furnace.png", SoundResource.IC2_MACHINES_ELECTROFURNACE_LOOP, false, false, @@ -1859,9 +1652,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 1, 1, false, - 0, - 1, - "E_Furnace.png", SoundResource.IC2_MACHINES_ELECTROFURNACE_LOOP, false, false, @@ -1884,9 +1674,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 1, 1, false, - 0, - 1, - "E_Furnace.png", SoundResource.IC2_MACHINES_ELECTROFURNACE_LOOP, false, false, @@ -1909,9 +1696,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 1, 1, false, - 0, - 1, - "E_Furnace.png", SoundResource.IC2_MACHINES_ELECTROFURNACE_LOOP, false, false, @@ -1934,9 +1718,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 1, 1, false, - 0, - 1, - "E_Furnace.png", SoundResource.IC2_MACHINES_ELECTROFURNACE_LOOP, false, false, @@ -1963,9 +1744,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 2, 6, true, - 0, - 1, - "Electrolyzer.png", SoundResource.NONE, false, false, @@ -1987,9 +1765,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 2, 6, true, - 0, - 1, - "Electrolyzer.png", SoundResource.NONE, false, false, @@ -2011,9 +1786,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 2, 6, true, - 0, - 1, - "Electrolyzer.png", SoundResource.NONE, false, false, @@ -2035,9 +1807,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 2, 6, true, - 0, - 1, - "Electrolyzer.png", SoundResource.NONE, false, false, @@ -2059,9 +1828,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 2, 6, true, - 0, - 1, - "Electrolyzer.png", SoundResource.NONE, false, false, @@ -2086,9 +1852,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 1, 3, false, - 0, - 1, - "ElectromagneticSeparator.png", SoundResource.IC2_MACHINES_MAGNETIZER_LOOP, false, false, @@ -2111,9 +1874,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 1, 3, false, - 0, - 1, - "ElectromagneticSeparator.png", SoundResource.IC2_MACHINES_MAGNETIZER_LOOP, false, false, @@ -2136,9 +1896,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 1, 3, false, - 0, - 1, - "ElectromagneticSeparator.png", SoundResource.IC2_MACHINES_MAGNETIZER_LOOP, false, false, @@ -2161,9 +1918,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 1, 3, false, - 0, - 1, - "ElectromagneticSeparator.png", SoundResource.IC2_MACHINES_MAGNETIZER_LOOP, false, false, @@ -2186,9 +1940,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 1, 3, false, - 0, - 1, - "ElectromagneticSeparator.png", SoundResource.IC2_MACHINES_MAGNETIZER_LOOP, false, false, @@ -2214,9 +1965,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 1, 1, false, - 0, - 1, - "Extractor.png", SoundResource.IC2_MACHINES_EXTRACTOR_OP, false, false, @@ -2239,9 +1987,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 1, 1, false, - 0, - 1, - "Extractor.png", SoundResource.IC2_MACHINES_EXTRACTOR_OP, false, false, @@ -2264,9 +2009,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 1, 1, false, - 0, - 1, - "Extractor.png", SoundResource.IC2_MACHINES_EXTRACTOR_OP, false, false, @@ -2289,9 +2031,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 1, 1, false, - 0, - 1, - "Extractor.png", SoundResource.IC2_MACHINES_EXTRACTOR_OP, false, false, @@ -2314,9 +2053,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 1, 1, false, - 0, - 1, - "Extractor.png", SoundResource.IC2_MACHINES_EXTRACTOR_OP, false, false, @@ -2342,9 +2078,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 2, 1, false, - 0, - 1, - "Extruder.png", SoundResource.IC2_MACHINES_INDUCTION_LOOP, false, false, @@ -2366,9 +2099,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 2, 1, false, - 0, - 1, - "Extruder.png", SoundResource.IC2_MACHINES_INDUCTION_LOOP, false, false, @@ -2390,9 +2120,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 2, 1, false, - 0, - 1, - "Extruder.png", SoundResource.IC2_MACHINES_INDUCTION_LOOP, false, false, @@ -2414,9 +2141,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 2, 1, false, - 0, - 1, - "Extruder.png", SoundResource.IC2_MACHINES_INDUCTION_LOOP, false, false, @@ -2438,9 +2162,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 2, 1, false, - 0, - 1, - "Extruder.png", SoundResource.IC2_MACHINES_INDUCTION_LOOP, false, false, @@ -2465,9 +2186,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 1, 1, true, - 0, - 1, - "Fermenter.png", SoundResource.NONE, false, false, @@ -2490,9 +2208,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 1, 1, true, - 0, - 1, - "Fermenter.png", SoundResource.NONE, false, false, @@ -2515,9 +2230,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 1, 1, true, - 0, - 1, - "Fermenter.png", SoundResource.NONE, false, false, @@ -2540,9 +2252,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 1, 1, true, - 0, - 1, - "Fermenter.png", SoundResource.NONE, false, false, @@ -2565,9 +2274,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 1, 1, true, - 0, - 1, - "Fermenter.png", SoundResource.NONE, false, false, @@ -2593,9 +2299,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 1, 1, true, - 0, - 1, - "FluidCanner.png", SoundResource.NONE, false, false, @@ -2617,9 +2320,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 1, 1, true, - 0, - 1, - "FluidCanner.png", SoundResource.NONE, false, false, @@ -2641,9 +2341,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 1, 1, true, - 0, - 1, - "FluidCanner.png", SoundResource.NONE, false, false, @@ -2665,9 +2362,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 1, 1, true, - 0, - 1, - "FluidCanner.png", SoundResource.NONE, false, false, @@ -2689,9 +2383,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 1, 1, true, - 0, - 1, - "FluidCanner.png", SoundResource.NONE, false, false, @@ -2716,9 +2407,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 1, 1, true, - 0, - 1, - "FluidExtractor.png", SoundResource.IC2_MACHINES_EXTRACTOR_OP, false, false, @@ -2741,9 +2429,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 1, 1, true, - 0, - 1, - "FluidExtractor.png", SoundResource.IC2_MACHINES_EXTRACTOR_OP, false, false, @@ -2766,9 +2451,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 1, 1, true, - 0, - 1, - "FluidExtractor.png", SoundResource.IC2_MACHINES_EXTRACTOR_OP, false, false, @@ -2791,9 +2473,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 1, 1, true, - 0, - 1, - "FluidExtractor.png", SoundResource.IC2_MACHINES_EXTRACTOR_OP, false, false, @@ -2816,9 +2495,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 1, 1, true, - 0, - 1, - "FluidExtractor.png", SoundResource.IC2_MACHINES_EXTRACTOR_OP, false, false, @@ -2845,9 +2521,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 1, 0, true, - 0, - 1, - "FluidHeater.png", SoundResource.NONE, false, false, @@ -2871,9 +2544,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 1, 0, true, - 0, - 1, - "FluidHeater.png", SoundResource.NONE, false, false, @@ -2897,9 +2567,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 1, 0, true, - 0, - 1, - "FluidHeater.png", SoundResource.NONE, false, false, @@ -2923,9 +2590,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 1, 0, true, - 0, - 1, - "FluidHeater.png", SoundResource.NONE, false, false, @@ -2949,9 +2613,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 1, 0, true, - 0, - 1, - "FluidHeater.png", SoundResource.NONE, false, false, @@ -2978,9 +2639,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 1, 1, true, - 0, - 1, - "FluidSolidifier.png", SoundResource.NONE, false, false, @@ -3003,9 +2661,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 1, 1, true, - 0, - 1, - "FluidSolidifier.png", SoundResource.NONE, false, false, @@ -3028,9 +2683,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 1, 1, true, - 0, - 1, - "FluidSolidifier.png", SoundResource.NONE, false, false, @@ -3053,9 +2705,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 1, 1, true, - 0, - 1, - "FluidSolidifier.png", SoundResource.NONE, false, false, @@ -3078,9 +2727,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 1, 1, true, - 0, - 1, - "FluidSolidifier.png", SoundResource.NONE, false, false, @@ -3106,9 +2752,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 1, 1, true, - 6, - 3, - "Hammer.png", SoundResource.RANDOM_ANVIL_USE, false, false, @@ -3132,9 +2775,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 1, 1, true, - 6, - 3, - "Hammer.png", SoundResource.RANDOM_ANVIL_USE, false, false, @@ -3158,9 +2798,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 1, 1, true, - 6, - 3, - "Hammer.png", SoundResource.RANDOM_ANVIL_USE, false, false, @@ -3184,9 +2821,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 1, 1, true, - 6, - 3, - "Hammer.png", SoundResource.RANDOM_ANVIL_USE, false, false, @@ -3210,9 +2844,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 1, 1, true, - 6, - 3, - "Hammer.png", SoundResource.RANDOM_ANVIL_USE, false, false, @@ -3239,9 +2870,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 2, 1, false, - 0, - 1, - "Press.png", SoundResource.IC2_MACHINES_COMPRESSOR_OP, false, false, @@ -3263,9 +2891,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 2, 1, false, - 0, - 1, - "Press.png", SoundResource.IC2_MACHINES_COMPRESSOR_OP, false, false, @@ -3287,9 +2912,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 4, 1, false, - 0, - 1, - "Press2.png", SoundResource.IC2_MACHINES_COMPRESSOR_OP, false, false, @@ -3311,9 +2933,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 4, 1, false, - 0, - 1, - "Press2.png", SoundResource.IC2_MACHINES_COMPRESSOR_OP, false, false, @@ -3335,9 +2954,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 6, 1, false, - 0, - 1, - "Press3.png", SoundResource.IC2_MACHINES_COMPRESSOR_OP, false, false, @@ -3362,9 +2978,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 2, 1, true, - 0, - 1, - "LaserEngraver.png", SoundResource.IC2_MACHINES_MAGNETIZER_LOOP, false, false, @@ -3387,9 +3000,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 2, 1, true, - 0, - 1, - "LaserEngraver.png", SoundResource.IC2_MACHINES_MAGNETIZER_LOOP, false, false, @@ -3412,9 +3022,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 2, 1, true, - 0, - 1, - "LaserEngraver.png", SoundResource.IC2_MACHINES_MAGNETIZER_LOOP, false, false, @@ -3437,9 +3044,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 4, 1, true, - 0, - 1, - "LaserEngraver2.png", SoundResource.IC2_MACHINES_MAGNETIZER_LOOP, false, false, @@ -3462,9 +3066,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 4, 1, true, - 0, - 1, - "LaserEngraver2.png", SoundResource.IC2_MACHINES_MAGNETIZER_LOOP, false, false, @@ -3490,9 +3091,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 1, 2, false, - 0, - 1, - "Lathe.png", SoundResource.NONE, false, false, @@ -3515,9 +3113,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 1, 2, false, - 0, - 1, - "Lathe.png", SoundResource.NONE, false, false, @@ -3540,9 +3135,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 1, 2, false, - 0, - 1, - "Lathe.png", SoundResource.NONE, false, false, @@ -3565,9 +3157,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 1, 2, false, - 0, - 1, - "Lathe.png", SoundResource.NONE, false, false, @@ -3590,9 +3179,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 1, 2, false, - 0, - 1, - "Lathe.png", SoundResource.NONE, false, false, @@ -3618,9 +3204,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 1, 1, false, - 0, - 1, - "Macerator1.png", SoundResource.IC2_MACHINES_MACERATOR_OP, false, false, @@ -3643,9 +3226,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 1, 1, false, - 0, - 1, - "Macerator1.png", SoundResource.IC2_MACHINES_MACERATOR_OP, false, false, @@ -3668,9 +3248,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 1, 2, false, - 0, - 1, - "Macerator2.png", SoundResource.IC2_MACHINES_MACERATOR_OP, false, false, @@ -3693,9 +3270,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 1, 3, false, - 0, - 1, - "Macerator3.png", SoundResource.IC2_MACHINES_MACERATOR_OP, false, false, @@ -3718,9 +3292,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 1, 4, false, - 0, - 1, - "Macerator4.png", SoundResource.IC2_MACHINES_MACERATOR_OP, false, false, @@ -3746,9 +3317,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 1, 1, 1000, - 0, - 1, - "Amplifabricator.png", SoundResource.IC2_MACHINES_EXTRACTOR_OP, false, false, @@ -3770,9 +3338,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 1, 1, 1000, - 0, - 1, - "Amplifabricator.png", SoundResource.IC2_MACHINES_EXTRACTOR_OP, false, false, @@ -3794,9 +3359,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 1, 1, 1000, - 0, - 1, - "Amplifabricator.png", SoundResource.IC2_MACHINES_EXTRACTOR_OP, false, false, @@ -3818,9 +3380,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 1, 1, 1000, - 0, - 1, - "Amplifabricator.png", SoundResource.IC2_MACHINES_EXTRACTOR_OP, false, false, @@ -3842,9 +3401,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 1, 1, 1000, - 0, - 1, - "Amplifabricator.png", SoundResource.IC2_MACHINES_EXTRACTOR_OP, false, false, @@ -3869,9 +3425,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 1, 1, false, - 0, - 1, - "E_Furnace.png", SoundResource.IC2_MACHINES_ELECTROFURNACE_LOOP, false, false, @@ -3894,9 +3447,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 1, 1, false, - 0, - 1, - "E_Furnace.png", SoundResource.IC2_MACHINES_ELECTROFURNACE_LOOP, false, false, @@ -3919,9 +3469,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 1, 1, false, - 0, - 1, - "E_Furnace.png", SoundResource.IC2_MACHINES_ELECTROFURNACE_LOOP, false, false, @@ -3944,9 +3491,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 1, 1, false, - 0, - 1, - "E_Furnace.png", SoundResource.IC2_MACHINES_ELECTROFURNACE_LOOP, false, false, @@ -3969,9 +3513,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 1, 1, false, - 0, - 1, - "E_Furnace.png", SoundResource.IC2_MACHINES_ELECTROFURNACE_LOOP, false, false, @@ -3997,9 +3538,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 6, 1, true, - 0, - 1, - "Mixer.png", SoundResource.NONE, false, false, @@ -4021,9 +3559,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 6, 1, true, - 0, - 1, - "Mixer.png", SoundResource.NONE, false, false, @@ -4045,9 +3580,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 6, 4, true, - 0, - 1, - "Mixer4.png", SoundResource.NONE, false, false, @@ -4069,9 +3601,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 9, 4, true, - 0, - 1, - "Mixer6.png", SoundResource.NONE, false, false, @@ -4093,9 +3622,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 9, 4, true, - 0, - 1, - "Mixer6.png", SoundResource.NONE, false, false, @@ -4120,9 +3646,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 1, 3, true, - 0, - 1, - "OreWasher.png", SoundResource.NONE, false, false, @@ -4145,9 +3668,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 1, 3, true, - 0, - 1, - "OreWasher.png", SoundResource.NONE, false, false, @@ -4170,9 +3690,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 1, 3, true, - 0, - 1, - "OreWasher.png", SoundResource.NONE, false, false, @@ -4195,9 +3712,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 1, 3, true, - 0, - 1, - "OreWasher.png", SoundResource.NONE, false, false, @@ -4220,9 +3734,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 1, 3, true, - 0, - 1, - "OreWasher.png", SoundResource.NONE, false, false, @@ -4248,9 +3759,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 1, 1, false, - 0, - 1, - "E_Oven.png", SoundResource.IC2_MACHINES_ELECTROFURNACE_LOOP, false, false, @@ -4272,9 +3780,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 1, 1, false, - 0, - 1, - "E_Oven.png", SoundResource.IC2_MACHINES_ELECTROFURNACE_LOOP, false, false, @@ -4296,9 +3801,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 1, 1, false, - 0, - 1, - "E_Oven.png", SoundResource.IC2_MACHINES_ELECTROFURNACE_LOOP, false, false, @@ -4320,9 +3822,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 1, 1, false, - 0, - 1, - "E_Oven.png", SoundResource.IC2_MACHINES_ELECTROFURNACE_LOOP, false, false, @@ -4344,9 +3843,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 1, 1, false, - 0, - 1, - "E_Oven.png", SoundResource.IC2_MACHINES_ELECTROFURNACE_LOOP, false, false, @@ -4371,9 +3867,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 1, 4, true, - 0, - 1, - "PlasmaArcFurnace.png", SoundResource.IC2_MACHINES_INDUCTION_LOOP, false, false, @@ -4396,9 +3889,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 1, 4, true, - 0, - 1, - "PlasmaArcFurnace.png", SoundResource.IC2_MACHINES_INDUCTION_LOOP, false, false, @@ -4421,9 +3911,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 1, 4, true, - 0, - 1, - "PlasmaArcFurnace.png", SoundResource.IC2_MACHINES_INDUCTION_LOOP, false, false, @@ -4446,9 +3933,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 1, 9, true, - 0, - 1, - "PlasmaArcFurnace.png", SoundResource.IC2_MACHINES_INDUCTION_LOOP, false, false, @@ -4471,9 +3955,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 1, 9, true, - 0, - 1, - "PlasmaArcFurnace.png", SoundResource.IC2_MACHINES_INDUCTION_LOOP, false, false, @@ -4499,9 +3980,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 1, 1, false, - 0, - 1, - "Polarizer.png", SoundResource.IC2_MACHINES_MAGNETIZER_LOOP, false, false, @@ -4522,9 +4000,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 1, 1, false, - 0, - 1, - "Polarizer.png", SoundResource.IC2_MACHINES_MAGNETIZER_LOOP, false, false, @@ -4545,9 +4020,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 1, 1, false, - 0, - 1, - "Polarizer.png", SoundResource.IC2_MACHINES_MAGNETIZER_LOOP, false, false, @@ -4568,9 +4040,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 1, 1, false, - 0, - 1, - "Polarizer.png", SoundResource.IC2_MACHINES_MAGNETIZER_LOOP, false, false, @@ -4591,9 +4060,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 1, 1, false, - 0, - 1, - "Polarizer.png", SoundResource.IC2_MACHINES_MAGNETIZER_LOOP, false, false, @@ -4618,9 +4084,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 1, 1, true, - 0, - 1, - "Printer.png", SoundResource.IC2_MACHINES_COMPRESSOR_OP, false, false, @@ -4642,9 +4105,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 1, 1, true, - 0, - 1, - "Printer.png", SoundResource.IC2_MACHINES_COMPRESSOR_OP, false, false, @@ -4666,9 +4126,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 1, 1, true, - 0, - 1, - "Printer.png", SoundResource.IC2_MACHINES_COMPRESSOR_OP, false, false, @@ -4690,9 +4147,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 1, 1, true, - 0, - 1, - "Printer.png", SoundResource.IC2_MACHINES_COMPRESSOR_OP, false, false, @@ -4714,9 +4168,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 1, 1, true, - 0, - 1, - "Printer.png", SoundResource.IC2_MACHINES_COMPRESSOR_OP, false, false, @@ -4738,9 +4189,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 1, 1, true, - 0, - 1, - "Printer.png", SoundResource.IC2_MACHINES_COMPRESSOR_OP, false, false, @@ -4762,9 +4210,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 1, 1, true, - 0, - 1, - "Printer.png", SoundResource.IC2_MACHINES_COMPRESSOR_OP, false, false, @@ -4786,9 +4231,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 1, 1, true, - 0, - 1, - "Printer.png", SoundResource.IC2_MACHINES_COMPRESSOR_OP, false, false, @@ -4813,9 +4255,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 1, 1, false, - 0, - 1, - "Recycler.png", SoundResource.IC2_MACHINES_RECYCLER_OP, false, false, @@ -4838,9 +4277,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 1, 1, false, - 0, - 1, - "Recycler.png", SoundResource.IC2_MACHINES_RECYCLER_OP, false, false, @@ -4863,9 +4299,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 1, 1, false, - 0, - 1, - "Recycler.png", SoundResource.IC2_MACHINES_RECYCLER_OP, false, false, @@ -4888,9 +4321,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 1, 1, false, - 0, - 1, - "Recycler.png", SoundResource.IC2_MACHINES_RECYCLER_OP, false, false, @@ -4913,9 +4343,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 1, 1, false, - 0, - 1, - "Recycler.png", SoundResource.IC2_MACHINES_RECYCLER_OP, false, false, @@ -4941,9 +4368,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 1, 9, true, - 2, - 5, - "Sifter.png", SoundResource.NONE, false, false, @@ -4964,9 +4388,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 1, 9, true, - 2, - 5, - "Sifter.png", SoundResource.NONE, false, false, @@ -4987,9 +4408,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 1, 9, true, - 2, - 5, - "Sifter.png", SoundResource.NONE, false, false, @@ -5010,9 +4428,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 1, 9, true, - 2, - 5, - "Sifter.png", SoundResource.NONE, false, false, @@ -5033,9 +4448,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 1, 9, true, - 2, - 5, - "Sifter.png", SoundResource.NONE, false, false, @@ -5059,9 +4471,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 2, 1, false, - 0, - 1, - "Slicer.png", SoundResource.NONE, false, false, @@ -5084,9 +4493,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 2, 1, false, - 0, - 1, - "Slicer.png", SoundResource.NONE, false, false, @@ -5109,9 +4515,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 2, 1, false, - 0, - 1, - "Slicer.png", SoundResource.NONE, false, false, @@ -5134,9 +4537,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 2, 1, false, - 0, - 1, - "Slicer.png", SoundResource.NONE, false, false, @@ -5159,9 +4559,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 2, 1, false, - 0, - 1, - "Slicer.png", SoundResource.NONE, false, false, @@ -5187,9 +4584,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 1, 3, false, - 0, - 1, - "ThermalCentrifuge.png", SoundResource.NONE, false, false, @@ -5211,9 +4605,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 1, 3, false, - 0, - 1, - "ThermalCentrifuge.png", SoundResource.NONE, false, false, @@ -5235,9 +4626,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 1, 3, false, - 0, - 1, - "ThermalCentrifuge.png", SoundResource.NONE, false, false, @@ -5259,9 +4647,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 1, 3, false, - 0, - 1, - "ThermalCentrifuge.png", SoundResource.NONE, false, false, @@ -5283,9 +4668,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 1, 3, false, - 0, - 1, - "ThermalCentrifuge.png", SoundResource.NONE, false, false, @@ -5310,9 +4692,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 1, 2, false, - 0, - 1, - "Unpackager.png", SoundResource.NONE, false, false, @@ -5335,9 +4714,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 1, 2, false, - 0, - 1, - "Unpackager.png", SoundResource.NONE, false, false, @@ -5360,9 +4736,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 1, 2, false, - 0, - 1, - "Unpackager.png", SoundResource.NONE, false, false, @@ -5385,9 +4758,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 1, 2, false, - 0, - 1, - "Unpackager.png", SoundResource.NONE, false, false, @@ -5410,9 +4780,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 1, 2, false, - 0, - 1, - "Unpackager.png", SoundResource.NONE, false, false, @@ -5435,9 +4802,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 1, 2, false, - 0, - 1, - "Unpackager.png", SoundResource.NONE, false, false, @@ -5460,9 +4824,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 1, 2, false, - 0, - 1, - "Unpackager.png", SoundResource.NONE, false, false, @@ -5485,9 +4846,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 1, 2, false, - 0, - 1, - "Unpackager.png", SoundResource.NONE, false, false, @@ -5513,9 +4871,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 2, 1, false, - 0, - 1, - "Wiremill.png", SoundResource.IC2_MACHINES_RECYCLER_OP, false, false, @@ -5537,9 +4892,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 2, 1, false, - 0, - 1, - "Wiremill.png", SoundResource.IC2_MACHINES_RECYCLER_OP, false, false, @@ -5561,9 +4913,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 2, 1, false, - 0, - 1, - "Wiremill.png", SoundResource.IC2_MACHINES_RECYCLER_OP, false, false, @@ -5585,9 +4934,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 2, 1, false, - 0, - 1, - "Wiremill.png", SoundResource.IC2_MACHINES_RECYCLER_OP, false, false, @@ -5609,9 +4955,6 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { 2, 1, false, - 0, - 1, - "Wiremill.png", SoundResource.IC2_MACHINES_RECYCLER_OP, false, false, |