diff options
36 files changed, 122 insertions, 84 deletions
diff --git a/main/java/gregtech/api/gui/GT_GUIContainer_MultiMachine.java b/main/java/gregtech/api/gui/GT_GUIContainer_MultiMachine.java index 572fea0e67..b71b328293 100644 --- a/main/java/gregtech/api/gui/GT_GUIContainer_MultiMachine.java +++ b/main/java/gregtech/api/gui/GT_GUIContainer_MultiMachine.java @@ -35,7 +35,7 @@ public class GT_GUIContainer_MultiMachine extends GT_GUIContainerMetaTile_Machin if (((GT_Container_MultiMachine)mContainer).mDisplayErrorCode == 0) { if (((GT_Container_MultiMachine)mContainer).mActive == 0) { - fontRendererObj.drawString("Hit with Rubber Hammer", 10, 16, 16448255); + fontRendererObj.drawString("Hit with Soft Hammer", 10, 16, 16448255); fontRendererObj.drawString("to (re-)start the Machine", 10, 24, 16448255); fontRendererObj.drawString("if it doesn't start.", 10, 32, 16448255); } else { diff --git a/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Cable.java b/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Cable.java index aada4db823..c859f5345f 100644 --- a/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Cable.java +++ b/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Cable.java @@ -193,7 +193,7 @@ public class GT_MetaPipeEntity_Cable extends MetaPipeEntity implements IMetaTile mConnections |= (1<<i); continue; } - if(GregTech_API.mOutputRF && tTileEntity instanceof IEnergyReceiver){ + if(GregTech_API.mOutputRF && tTileEntity instanceof IEnergyReceiver && ((IEnergyReceiver)tTileEntity).canConnectEnergy(ForgeDirection.getOrientation(j))){ mConnections |= (1<<i); continue; } diff --git a/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java b/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java index a89db1ceda..45b9205d9f 100644 --- a/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java +++ b/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java @@ -425,8 +425,8 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity { public boolean addOutput(ItemStack aStack) { if (GT_Utility.isStackInvalid(aStack)) return false; aStack = GT_Utility.copy(aStack); - FluidStack aLiquid = GT_Utility.getFluidForFilledItem(aStack, true); - if (aLiquid == null) { +// FluidStack aLiquid = GT_Utility.getFluidForFilledItem(aStack, true); +// if (aLiquid == null) { for (GT_MetaTileEntity_Hatch_OutputBus tHatch : mOutputBusses) { if (isValidMetaTileEntity(tHatch)) { for (int i = tHatch.getSizeInventory() - 1; i >= 0; i--) { @@ -439,16 +439,16 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity { if (tHatch.getBaseMetaTileEntity().addStackToSlot(1, aStack)) return true; } } - } else { - for (GT_MetaTileEntity_Hatch_Output tHatch : mOutputHatches) { - if (isValidMetaTileEntity(tHatch) && GT_ModHandler.isSteam(aLiquid)?tHatch.outputsSteam():tHatch.outputsLiquids()) { - int tAmount = tHatch.fill(aLiquid, false); - if (tAmount >= aLiquid.amount) { - return tHatch.fill(aLiquid, true) >= aLiquid.amount; - } - } - } - } +// }else { +// for (GT_MetaTileEntity_Hatch_Output tHatch : mOutputHatches) { +// if (isValidMetaTileEntity(tHatch) && GT_ModHandler.isSteam(aLiquid)?tHatch.outputsSteam():tHatch.outputsLiquids()) { +// int tAmount = tHatch.fill(aLiquid, false); +// if (tAmount >= aLiquid.amount) { +// return tHatch.fill(aLiquid, true) >= aLiquid.amount; +// } +// } +// } +// } return false; } diff --git a/main/java/gregtech/common/GT_Proxy.java b/main/java/gregtech/common/GT_Proxy.java index feddd5be46..8bae83ffa3 100644 --- a/main/java/gregtech/common/GT_Proxy.java +++ b/main/java/gregtech/common/GT_Proxy.java @@ -1006,7 +1006,7 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler { } try { aEvent.Ore.stackSize = 1; - if(this.mIgnoreTcon){ + if(this.mIgnoreTcon||aEvent.Ore.getUnlocalizedName().startsWith("item.oreberry")){ if ((aOriginalMod.toLowerCase().contains("xycraft")) || (aOriginalMod.toLowerCase().contains("tconstruct")) || ((aOriginalMod.toLowerCase().contains("natura")) && (!aOriginalMod.toLowerCase().contains("natural")))) { if (GT_Values.D1) { @@ -1340,8 +1340,8 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler { return; } } - System.out.println("Material Name: "+aEvent.Name+ " !!!Unknown Material detected!!! Please report to GregTech Intergalactical for additional compatiblity. This is not an Error, an Issue nor a Lag Source, it is just an Information, which you should pass to me."); - GT_Log.ore.println(tModToName + " uses an unknown Material. Report this to GregTech."); +// System.out.println("Material Name: "+aEvent.Name+ " !!!Unknown Material detected!!! Please report to GregTech Intergalactical for additional compatiblity. This is not an Error, an Issue nor a Lag Source, it is just an Information, which you should pass to me."); +// GT_Log.ore.println(tModToName + " uses an unknown Material. Report this to GregTech."); return; } } else { @@ -1795,7 +1795,34 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler { for (OreDictEventContainer tOre : this.mEvents) { if ((!(tOre.mEvent.Ore.getItem() instanceof GT_MetaGenerated_Item)) && (tOre.mPrefix != null) && (tOre.mPrefix.mIsUnificatable) && (tOre.mMaterial != null)) { - if (GT_OreDictUnificator.isBlacklisted(tOre.mEvent.Ore)) { + if(tOre.mModID!=null&&tOre.mModID.toLowerCase().equals("enderio")&&tOre.mPrefix==OrePrefixes.ingot&&tOre.mMaterial==Materials.DarkSteel){ + GT_OreDictUnificator.addAssociation(tOre.mPrefix, tOre.mMaterial, tOre.mEvent.Ore, false); + GT_OreDictUnificator.set(tOre.mPrefix,tOre.mMaterial,tOre.mEvent.Ore,(tOre.mModID != null) && (GregTech_API.sUnification.get(ConfigCategories.specialunificationtargets + "." + tOre.mModID, tOre.mEvent.Name, true)), true); + }else if(tOre.mModID!=null&&tOre.mModID.toLowerCase().equals("thermalfoundation")&&tOre.mPrefix==OrePrefixes.dust&&tOre.mMaterial==Materials.Blizz){ + GT_OreDictUnificator.addAssociation(tOre.mPrefix, tOre.mMaterial, tOre.mEvent.Ore, false); + GT_OreDictUnificator.set(tOre.mPrefix,tOre.mMaterial,tOre.mEvent.Ore,(tOre.mModID != null) && (GregTech_API.sUnification.get(ConfigCategories.specialunificationtargets + "." + tOre.mModID, tOre.mEvent.Name, true)), true); + }else if(tOre.mModID!=null&&tOre.mModID.toLowerCase().equals("thermalfoundation")&&tOre.mPrefix==OrePrefixes.dust&&tOre.mMaterial==Materials.Pyrotheum){ + GT_OreDictUnificator.addAssociation(tOre.mPrefix, tOre.mMaterial, tOre.mEvent.Ore, false); + GT_OreDictUnificator.set(tOre.mPrefix,tOre.mMaterial,tOre.mEvent.Ore,(tOre.mModID != null) && (GregTech_API.sUnification.get(ConfigCategories.specialunificationtargets + "." + tOre.mModID, tOre.mEvent.Name, true)), true); + }else if(tOre.mModID!=null&&tOre.mModID.toLowerCase().equals("arsmagica2")&&tOre.mPrefix==OrePrefixes.dust&&tOre.mMaterial==Materials.Vinteum){ + GT_OreDictUnificator.addAssociation(tOre.mPrefix, tOre.mMaterial, tOre.mEvent.Ore, false); + GT_OreDictUnificator.set(tOre.mPrefix,tOre.mMaterial,tOre.mEvent.Ore,(tOre.mModID != null) && (GregTech_API.sUnification.get(ConfigCategories.specialunificationtargets + "." + tOre.mModID, tOre.mEvent.Name, true)), true); + }else if(tOre.mModID!=null&&tOre.mModID.toLowerCase().equals("arsmagica2")&&tOre.mPrefix==OrePrefixes.gem&&tOre.mMaterial==Materials.BlueTopaz){ + GT_OreDictUnificator.addAssociation(tOre.mPrefix, tOre.mMaterial, tOre.mEvent.Ore, false); + GT_OreDictUnificator.set(tOre.mPrefix,tOre.mMaterial,tOre.mEvent.Ore,(tOre.mModID != null) && (GregTech_API.sUnification.get(ConfigCategories.specialunificationtargets + "." + tOre.mModID, tOre.mEvent.Name, true)), true); + }else if(tOre.mModID!=null&&tOre.mModID.toLowerCase().equals("arsmagica2")&&tOre.mPrefix==OrePrefixes.gem&&tOre.mMaterial==Materials.Chimerite){ + GT_OreDictUnificator.addAssociation(tOre.mPrefix, tOre.mMaterial, tOre.mEvent.Ore, false); + GT_OreDictUnificator.set(tOre.mPrefix,tOre.mMaterial,tOre.mEvent.Ore,(tOre.mModID != null) && (GregTech_API.sUnification.get(ConfigCategories.specialunificationtargets + "." + tOre.mModID, tOre.mEvent.Name, true)), true); + }else if(tOre.mModID!=null&&tOre.mModID.toLowerCase().equals("arsmagica2")&&tOre.mPrefix==OrePrefixes.gem&&tOre.mMaterial==Materials.Moonstone){ + GT_OreDictUnificator.addAssociation(tOre.mPrefix, tOre.mMaterial, tOre.mEvent.Ore, false); + GT_OreDictUnificator.set(tOre.mPrefix,tOre.mMaterial,tOre.mEvent.Ore,(tOre.mModID != null) && (GregTech_API.sUnification.get(ConfigCategories.specialunificationtargets + "." + tOre.mModID, tOre.mEvent.Name, true)), true); + }else if(tOre.mModID!=null&&tOre.mModID.toLowerCase().equals("arsmagica2")&&tOre.mPrefix==OrePrefixes.gem&&tOre.mMaterial==Materials.Sunstone){ + GT_OreDictUnificator.addAssociation(tOre.mPrefix, tOre.mMaterial, tOre.mEvent.Ore, false); + GT_OreDictUnificator.set(tOre.mPrefix,tOre.mMaterial,tOre.mEvent.Ore,(tOre.mModID != null) && (GregTech_API.sUnification.get(ConfigCategories.specialunificationtargets + "." + tOre.mModID, tOre.mEvent.Name, true)), true); + }else if(tOre.mModID!=null&&tOre.mModID.toLowerCase().equals("rotarycraft")&&tOre.mPrefix==OrePrefixes.ingot&&tOre.mMaterial==Materials.HSLA){ + GT_OreDictUnificator.addAssociation(tOre.mPrefix, tOre.mMaterial, tOre.mEvent.Ore, false); + GT_OreDictUnificator.set(tOre.mPrefix,tOre.mMaterial,tOre.mEvent.Ore,(tOre.mModID != null) && (GregTech_API.sUnification.get(ConfigCategories.specialunificationtargets + "." + tOre.mModID, tOre.mEvent.Name, true)), true); + }else if(GT_OreDictUnificator.isBlacklisted(tOre.mEvent.Ore)) { GT_OreDictUnificator.addAssociation(tOre.mPrefix, tOre.mMaterial, tOre.mEvent.Ore, true); } else { GT_OreDictUnificator.addAssociation(tOre.mPrefix, tOre.mMaterial, tOre.mEvent.Ore, false); @@ -1810,13 +1837,8 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler { GT_OreDictUnificator.addAssociation(tOre.mPrefix, tOre.mMaterial, tOre.mEvent.Ore, true); } else { GT_OreDictUnificator.addAssociation(tOre.mPrefix, tOre.mMaterial, tOre.mEvent.Ore, false); - GT_OreDictUnificator - .set(tOre.mPrefix, - tOre.mMaterial, - tOre.mEvent.Ore, - (tOre.mModID != null) - && (GregTech_API.sUnification.get(ConfigCategories.specialunificationtargets + "." + tOre.mModID, tOre.mEvent.Name, - false)), true); + GT_OreDictUnificator.set(tOre.mPrefix,tOre.mMaterial,tOre.mEvent.Ore,(tOre.mModID != null)&& + (GregTech_API.sUnification.get(ConfigCategories.specialunificationtargets + "." + tOre.mModID, tOre.mEvent.Name,false)), true); } } } diff --git a/main/java/gregtech/common/gui/GT_GUIContainer_FusionReactor.java b/main/java/gregtech/common/gui/GT_GUIContainer_FusionReactor.java index 83e25cfe42..3550fffd4b 100644 --- a/main/java/gregtech/common/gui/GT_GUIContainer_FusionReactor.java +++ b/main/java/gregtech/common/gui/GT_GUIContainer_FusionReactor.java @@ -25,7 +25,7 @@ public class GT_GUIContainer_FusionReactor extends GT_GUIContainerMetaTile_Machi if (((GT_Container_MultiMachine)mContainer).mDisplayErrorCode == 0) { if (((GT_Container_MultiMachine)mContainer).mActive == 0) { - fontRendererObj.drawString("Hit with Rubber Hammer to (re-)start the Machine if it doesn't start.", -70, 170, 16448255); + fontRendererObj.drawString("Hit with Soft Hammer to (re-)start the Machine if it doesn't start.", -70, 170, 16448255); } else { fontRendererObj.drawString("Running perfectly.", 10, 170, 16448255); } diff --git a/main/java/gregtech/common/items/GT_MetaGenerated_Tool_01.java b/main/java/gregtech/common/items/GT_MetaGenerated_Tool_01.java index f6ed7f412c..7a593de334 100644 --- a/main/java/gregtech/common/items/GT_MetaGenerated_Tool_01.java +++ b/main/java/gregtech/common/items/GT_MetaGenerated_Tool_01.java @@ -169,13 +169,15 @@ import gregtech.common.tools.GT_Tool_Turbine_Small; /* ?0:73 */ GT_ModHandler.addCraftingRecipe(INSTANCE.getToolWithStats(46, 1, Materials.Aluminium, Materials.Aluminium, null), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[] { " S", " I ", "S f", Character.valueOf('I'), OrePrefixes.ingot.get(Materials.Aluminium), Character.valueOf('S'), OrePrefixes.stick.get(Materials.Aluminium) });
/* ?1:74 */ GT_ModHandler.addCraftingRecipe(INSTANCE.getToolWithStats(46, 1, Materials.StainlessSteel, Materials.StainlessSteel, null), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[] { " S", " I ", "S f", Character.valueOf('I'), OrePrefixes.ingot.get(Materials.StainlessSteel), Character.valueOf('S'), OrePrefixes.stick.get(Materials.StainlessSteel) });
/* ?2: */
+
+ if(!GregTech_API.sSpecialFile.get(ConfigCategories.general, "DisableFlintTools", false)){
/* ?3:76 */ GT_ModHandler.addCraftingRecipe(INSTANCE.getToolWithStats(0, 1, Materials.Flint, Materials.Wood, null), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[] { "F", "F", "S", Character.valueOf('S'), OrePrefixes.stick.get(Materials.Wood), Character.valueOf('F'), new ItemStack(Items.flint, 1) });
/* ?4:77 */ GT_ModHandler.addCraftingRecipe(INSTANCE.getToolWithStats(2, 1, Materials.Flint, Materials.Wood, null), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[] { "FFF", " S ", " S ", Character.valueOf('S'), OrePrefixes.stick.get(Materials.Wood), Character.valueOf('F'), new ItemStack(Items.flint, 1) });
/* ?5:78 */ GT_ModHandler.addCraftingRecipe(INSTANCE.getToolWithStats(4, 1, Materials.Flint, Materials.Wood, null), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[] { "F", "S", "S", Character.valueOf('S'), OrePrefixes.stick.get(Materials.Wood), Character.valueOf('F'), new ItemStack(Items.flint, 1) });
/* ?6:79 */ GT_ModHandler.addCraftingRecipe(INSTANCE.getToolWithStats(6, 1, Materials.Flint, Materials.Wood, null), GT_ModHandler.RecipeBits.MIRRORED | GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[] { "FF", "FS", " S", Character.valueOf('S'), OrePrefixes.stick.get(Materials.Wood), Character.valueOf('F'), new ItemStack(Items.flint, 1) });
/* ?7:80 */ GT_ModHandler.addCraftingRecipe(INSTANCE.getToolWithStats(8, 1, Materials.Flint, Materials.Wood, null), GT_ModHandler.RecipeBits.MIRRORED | GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[] { "FF", " S", " S", Character.valueOf('S'), OrePrefixes.stick.get(Materials.Wood), Character.valueOf('F'), new ItemStack(Items.flint, 1) });
/* ?8:81 */ GT_ModHandler.addCraftingRecipe(INSTANCE.getToolWithStats(34, 1, Materials.Flint, Materials.Wood, null), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[] { "F", "S", Character.valueOf('S'), OrePrefixes.stick.get(Materials.Wood), Character.valueOf('F'), new ItemStack(Items.flint, 1) });
-/* ?9:83 */ if (GregTech_API.sRecipeFile.get(ConfigCategories.Tools.mortar, "Coal", true)) {
+/* ?9:83 */ }if (GregTech_API.sRecipeFile.get(ConfigCategories.Tools.mortar, "Coal", true)) {
/* @0:83 */ GT_ModHandler.addShapelessCraftingRecipe(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Coal, 1L), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[] { ToolDictNames.craftingToolMortar, new ItemStack(Items.coal, 1) });
/* @1: */ }
/* @2:84 */ if (GregTech_API.sRecipeFile.get(ConfigCategories.Tools.mortar, "Clay", true)) {
diff --git a/main/java/gregtech/common/items/GT_NeutronReflector_Item.java b/main/java/gregtech/common/items/GT_NeutronReflector_Item.java index 1430dcda8f..a9556cc486 100644 --- a/main/java/gregtech/common/items/GT_NeutronReflector_Item.java +++ b/main/java/gregtech/common/items/GT_NeutronReflector_Item.java @@ -1,6 +1,7 @@ package gregtech.common.items; import gregtech.api.items.GT_Generic_Item; +import gregtech.api.items.GT_RadioactiveCellIC_Item; import ic2.api.reactor.IReactor; import ic2.api.reactor.IReactorComponent; import ic2.core.item.reactor.ItemReactorMOX; @@ -28,7 +29,11 @@ public class GT_NeutronReflector_Item } else { - reactor.addOutput(1.0F); + float tEnergy=1.0f; + if(pulsingStack.getItem() instanceof GT_RadioactiveCellIC_Item){ + tEnergy = (float) ((GT_RadioactiveCellIC_Item)pulsingStack.getItem()).sEnergy; + } + reactor.addOutput(tEnergy); } } return true; diff --git a/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_TypeFilter.java b/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_TypeFilter.java index ae576638a5..f3a87282be 100644 --- a/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_TypeFilter.java +++ b/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_TypeFilter.java @@ -83,9 +83,8 @@ import gregtech.api.enums.Textures; /* 81: 62 */ i = 0;
/* 82: */ }
/* 83: */ }
-/* 84: 64 */ if ((OrePrefixes.values()[i].mPrefixedItems.isEmpty()) || (OrePrefixes.values()[i].mPrefixInto != OrePrefixes.values()[i])) {
-/* 85: */
-/* 86: */ }
+/* 84: 64 */ if(!OrePrefixes.values()[i].mPrefixedItems.isEmpty() && OrePrefixes.values()[i].mPrefixInto == OrePrefixes.values()[i])
+ mPrefix = OrePrefixes.values()[i];
/* 87: */ }
/* 88: */ }
/* 89: */ }
diff --git a/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine.java b/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine.java index dc9c9a7615..674919761d 100644 --- a/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine.java +++ b/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine.java @@ -71,20 +71,20 @@ public abstract class GT_MetaTileEntity_LargeTurbine extends GT_MetaTileEntity_M for (byte k = 0; k < 4; k = (byte)(k + 1)) { if (((i == 0) || (j == 0)) && ((k == 1) || (k == 2))) { - if (getBaseMetaTileEntity().getBlock(tX + (tSide == 5 ? k : tSide < 4 ? i : -k), tY + j, tZ + (tSide < 4 ? -k : tSide == 3 ? k : i)) == getCasingBlock()) + if (getBaseMetaTileEntity().getBlock(tX + (tSide == 5 ? k : tSide < 4 ? i : -k), tY + j, tZ + (tSide > 4 ? -k : tSide == 3 ? k : i)) == getCasingBlock()) { - if (getBaseMetaTileEntity().getMetaID(tX + (tSide == 5 ? k : tSide < 4 ? i : -k), tY + j, tZ + (tSide < 4 ? -k : tSide == 3 ? k : i)) == getCasingMeta()) {} + if (getBaseMetaTileEntity().getMetaID(tX + (tSide == 5 ? k : tSide < 4 ? i : -k), tY + j, tZ + (tSide > 4 ? -k : tSide == 3 ? k : i)) == getCasingMeta()) {} } - else if (!addToMachineList(getBaseMetaTileEntity().getIGregTechTileEntity(tX + (tSide == 5 ? k : tSide < 4 ? i : -k), tY + j, tZ + (tSide < 4 ? -k : tSide == 3 ? k : i)))) { + else if (!addToMachineList(getBaseMetaTileEntity().getIGregTechTileEntity(tX + (tSide == 5 ? k : tSide < 4 ? i : -k), tY + j, tZ + (tSide > 4 ? -k : tSide == 3 ? k : i)))) { return false; } } - else if (getBaseMetaTileEntity().getBlock(tX + (tSide == 5 ? k : tSide < 4 ? i : -k), tY + j, tZ + (tSide < 4 ? -k : tSide == 3 ? k : i)) == getCasingBlock()) + else if (getBaseMetaTileEntity().getBlock(tX + (tSide == 5 ? k : tSide < 4 ? i : -k), tY + j, tZ + (tSide > 4 ? -k : tSide == 3 ? k : i)) == getCasingBlock()) { - if (getBaseMetaTileEntity().getMetaID(tX + (tSide == 5 ? k : tSide < 4 ? i : -k), tY + j, tZ + (tSide < 4 ? -k : tSide == 3 ? k : i)) == getCasingMeta()) {} + if (getBaseMetaTileEntity().getMetaID(tX + (tSide == 5 ? k : tSide < 4 ? i : -k), tY + j, tZ + (tSide > 4 ? -k : tSide == 3 ? k : i)) == getCasingMeta()) {} } else { - return false; + return false; } } } diff --git a/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Plasma.java b/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Plasma.java index 5ddd0e9069..0c4b88b621 100644 --- a/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Plasma.java +++ b/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Plasma.java @@ -49,7 +49,7 @@ public class GT_MetaTileEntity_LargeTurbine_Plasma extends GT_MetaTileEntity_Lar counter = 0; baseEff = (int) ((50.0F+(10.0F*((GT_MetaGenerated_Tool)aStack.getItem()).getToolCombatDamage(aStack)))*100); optFlow = (int) Math.max(Float.MIN_NORMAL, ((GT_MetaGenerated_Tool)aStack.getItem()).getToolStats(aStack).getSpeedMultiplier() * ((GT_MetaGenerated_Tool)aStack.getItem()).getPrimaryMaterial(aStack).mToolSpeed*50); - optFlow *=10; + optFlow *=40; } int tEU=0; for(int i=0;i<steams.size();i++){ diff --git a/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ProcessingArray.java b/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ProcessingArray.java index 8056f094d4..4726181726 100644 --- a/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ProcessingArray.java +++ b/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ProcessingArray.java @@ -60,37 +60,37 @@ public class GT_MetaTileEntity_ProcessingArray extends GT_MetaTileEntity_MultiBl String tmp = mInventory[1].getUnlocalizedName().replaceAll("gt.blockmachines.basicmachine.", ""); if(tmp.startsWith("centrifuge")){ return GT_Recipe.GT_Recipe_Map.sCentrifugeRecipes; - }else if(tmp.equals("electrolyzer")){ + }else if(tmp.startsWith("electrolyzer")){ return GT_Recipe.GT_Recipe_Map.sElectrolyzerRecipes; - }else if(tmp.equals("alloysmelter")){ + }else if(tmp.startsWith("alloysmelter")){ return GT_Recipe.GT_Recipe_Map.sAlloySmelterRecipes; - }else if(tmp.equals("assembler")){ + }else if(tmp.startsWith("assembler")){ return GT_Recipe.GT_Recipe_Map.sAssemblerRecipes; - }else if(tmp.equals("compressor")){ + }else if(tmp.startsWith("compressor")){ return GT_Recipe.GT_Recipe_Map.sCompressorRecipes; - }else if(tmp.equals("extractor")){ + }else if(tmp.startsWith("extractor")){ return GT_Recipe.GT_Recipe_Map.sExtractorRecipes; - }else if(tmp.equals("macerator")){ + }else if(tmp.startsWith("macerator")){ return GT_Recipe.GT_Recipe_Map.sMaceratorRecipes; - }else if(tmp.equals("recycler")){ + }else if(tmp.startsWith("recycler")){ return GT_Recipe.GT_Recipe_Map.sRecyclerRecipes; - }else if(tmp.equals("thermalcentrifuge")){ + }else if(tmp.startsWith("thermalcentrifuge")){ return GT_Recipe.GT_Recipe_Map.sThermalCentrifugeRecipes; - }else if(tmp.equals("orewasher")){ + }else if(tmp.startsWith("orewasher")){ return GT_Recipe.GT_Recipe_Map.sOreWasherRecipes; - }else if(tmp.equals("chemicalreactor")){ + }else if(tmp.startsWith("chemicalreactor")){ return GT_Recipe.GT_Recipe_Map.sChemicalRecipes; - }else if(tmp.equals("chemicalbath")){ + }else if(tmp.startsWith("chemicalbath")){ return GT_Recipe.GT_Recipe_Map.sChemicalBathRecipes; - }else if(tmp.equals("electromagneticseparator")){ + }else if(tmp.startsWith("electromagneticseparator")){ return GT_Recipe.GT_Recipe_Map.sElectroMagneticSeparatorRecipes; - }else if(tmp.equals("autoclave")){ + }else if(tmp.startsWith("autoclave")){ return GT_Recipe.GT_Recipe_Map.sAutoclaveRecipes; - }else if(tmp.equals("mixer")){ + }else if(tmp.startsWith("mixer")){ return GT_Recipe.GT_Recipe_Map.sMixerRecipes; - }else if(tmp.equals("hammer")){ + }else if(tmp.startsWith("hammer")){ return GT_Recipe.GT_Recipe_Map.sHammerRecipes; - }else if(tmp.equals("sifter")){ + }else if(tmp.startsWith("sifter")){ return GT_Recipe.GT_Recipe_Map.sSifterRecipes; } /* 57: 54 */ return null; @@ -160,13 +160,20 @@ public class GT_MetaTileEntity_ProcessingArray extends GT_MetaTileEntity_MultiBl this.mOutputItems = null; this.mOutputFluids = null; this.mMaxProgresstime = tRecipe.mDuration; - int machines = Math.max(16,mInventory[1].stackSize); + int machines = Math.min(16,mInventory[1].stackSize); this.mEfficiency = (10000 - (getIdealStatus() - getRepairStatus()) * 1000); this.mEfficiencyIncrease = 10000; int i = 0; for(;i<machines;i++){ if(!tRecipe.isRecipeInputEqual(true, tFluids, tInputs))break; } +// System.out.println("recipe:"+i+" "+tRecipe.mDuration+" "+tRecipe.mEUt); +// if(tRecipe.mOutputs.length>0){ +// System.out.println(tRecipe.mOutputs[0].getUnlocalizedName()); +// } +// if(tRecipe.mFluidOutputs.length>0){ +// System.out.println(tRecipe.mFluidOutputs[0].getUnlocalizedName()); +// } if (tRecipe.mEUt <= 16) { this.mEUt = (tRecipe.mEUt * (1 << tTier - 1) * (1 << tTier - 1)); @@ -206,6 +213,7 @@ public class GT_MetaTileEntity_ProcessingArray extends GT_MetaTileEntity_MultiBl this.mMaxProgresstime = Math.max(1, this.mMaxProgresstime); this.mOutputItems = tOut; this.mOutputFluids = new FluidStack[]{tFOut}; +// System.out.println("ArrayOut"+mOutputItems.length+" "+mOutputFluids.length+" "+(mOutputItems.length>0?mOutputItems[0].getUnlocalizedName():"")+" "+(mOutputFluids.length>0?mOutputFluids[0].getUnlocalizedName():" ")); updateSlots(); /* 105: 93 */ return true; /* 107: */ } diff --git a/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java b/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java index 5b68849c0a..8ad3003e24 100644 --- a/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java +++ b/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java @@ -680,24 +680,27 @@ public class GT_MachineRecipeLoader GT_Values.RA.addBlastRecipe(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Copper, 1L), GT_Values.NI, Materials.Oxygen.getGas(1000L), GT_Values.NF, GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.AnnealedCopper, 1L), GT_Values.NI, 500, 120, 1200); GT_Values.RA.addBlastRecipe(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.ElectricalSteel, 1L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Obsidian, 1L), GT_Values.NF, GT_Values.NF, GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.DarkSteel, 1L), GT_Values.NI, 4000, 360, 2000); - GT_Values.RA.addFusionReactorRecipe(Materials.Lithium.getMolten(9), Materials.Tungsten.getMolten(9), Materials.Iridium.getMolten(9), 32, 32768, 150000000); + GT_Values.RA.addFusionReactorRecipe(Materials.Lithium.getMolten(16), Materials.Tungsten.getMolten(16), Materials.Iridium.getMolten(16), 32, 32768, 300000000); GT_Values.RA.addFusionReactorRecipe(Materials.Deuterium.getGas(125), Materials.Tritium.getGas(125), Materials.Helium.getPlasma(125), 16, 4096, 40000000); //Mark 1 Cheap // GT_Values.RA.addFusionReactorRecipe(Materials.Deuterium.getGas(125), Materials.Helium_3.getGas(125), Materials.Helium.getPlasma(125), 16, 2048, 60000000); //Mark 1 Expensive // GT_Values.RA.addCannerRecipe(GT_ModHandler.getIC2Item("fuelRod", 1), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Lithium, 1L), GT_ModHandler.getIC2Item("reactorLithiumCell", 1) , null, 16, 64); - GT_Values.RA.addFluidExtractionRecipe(GT_ModHandler.getIC2Item("TritiumCell", 1), GT_ModHandler.getIC2Item("fuelRod", 1), Materials.Tritium.getGas(9), 10000, 16, 64); - GT_Values.RA.addFusionReactorRecipe(Materials.Carbon.getMolten(144), Materials.Helium_3.getGas(144), Materials.Oxygen.getPlasma(144), 20, 4096, 80000000); //Mark 1 Expensive // - GT_Values.RA.addFusionReactorRecipe(Materials.Aluminium.getMolten(144), Materials.Lithium.getMolten(144), Materials.Sulfur.getPlasma(144), 20, 10240, 240000000); //Mark 2 Cheap - GT_Values.RA.addFusionReactorRecipe(Materials.Beryllium.getMolten(9), Materials.Deuterium.getGas(375), Materials.Nitrogen.getPlasma(125), 16, 16384, 180000000); //Mark 2 Expensive // - GT_Values.RA.addFusionReactorRecipe(Materials.Silicon.getMolten(9), Materials.Magnesium.getMolten(9), Materials.Iron.getPlasma(9), 20, 8192, 360000000); //Mark 3 Cheap // - GT_Values.RA.addFusionReactorRecipe(Materials.Potassium.getMolten(144), Materials.Fluorine.getGas(144), Materials.Nickel.getPlasma(144), 20, 32768, 480000000); //Mark 3 Expensive // - GT_Values.RA.addFusionReactorRecipe(Materials.Beryllium.getMolten(9), Materials.Tungsten.getMolten(9), Materials.Platinum.getMolten(9), 32, 32768, 300000000); // - GT_Values.RA.addFusionReactorRecipe(Materials.Neodymium.getMolten(9), Materials.Hydrogen.getGas(27), Materials.Europium.getMolten(9), 64, 24576, 150000000); // - GT_Values.RA.addFusionReactorRecipe(Materials.Lutetium.getMolten(9), Materials.Chrome.getMolten(9), Materials.Americium.getMolten(9), 96, 49152, 200000000); // - GT_Values.RA.addFusionReactorRecipe(Materials.Plutonium.getMolten(9), Materials.Thorium.getMolten(9), Materials.Naquadah.getMolten(9), 64, 32768, 300000000); // + GT_Values.RA.addFluidExtractionRecipe(GT_ModHandler.getIC2Item("TritiumCell", 1), GT_ModHandler.getIC2Item("fuelRod", 1), Materials.Tritium.getGas(32), 10000, 16, 64); + GT_Values.RA.addFusionReactorRecipe(Materials.Carbon.getMolten(125), Materials.Helium_3.getGas(125), Materials.Oxygen.getPlasma(125), 32, 4096, 80000000); //Mark 1 Expensive // + GT_Values.RA.addFusionReactorRecipe(Materials.Aluminium.getMolten(16), Materials.Lithium.getMolten(16), Materials.Sulfur.getPlasma(125), 32, 10240, 240000000); //Mark 2 Cheap + GT_Values.RA.addFusionReactorRecipe(Materials.Beryllium.getMolten(16), Materials.Deuterium.getGas(375), Materials.Nitrogen.getPlasma(175), 16, 16384, 180000000); //Mark 2 Expensive // + GT_Values.RA.addFusionReactorRecipe(Materials.Silicon.getMolten(16), Materials.Magnesium.getMolten(16), Materials.Iron.getPlasma(125), 32, 8192, 360000000); //Mark 3 Cheap // + GT_Values.RA.addFusionReactorRecipe(Materials.Potassium.getMolten(16), Materials.Fluorine.getGas(125), Materials.Nickel.getPlasma(125), 16, 32768, 480000000); //Mark 3 Expensive // + GT_Values.RA.addFusionReactorRecipe(Materials.Beryllium.getMolten(16), Materials.Tungsten.getMolten(16), Materials.Platinum.getMolten(16), 32, 32768, 150000000); // + GT_Values.RA.addFusionReactorRecipe(Materials.Neodymium.getMolten(16), Materials.Hydrogen.getGas(48), Materials.Europium.getMolten(16), 64, 24576, 150000000); // + GT_Values.RA.addFusionReactorRecipe(Materials.Lutetium.getMolten(16), Materials.Chrome.getMolten(16), Materials.Americium.getMolten(16), 96, 49152, 200000000); // + GT_Values.RA.addFusionReactorRecipe(Materials.Plutonium.getMolten(16), Materials.Thorium.getMolten(16), Materials.Naquadah.getMolten(16), 64, 32768, 300000000); // GT_Values.RA.addFusionReactorRecipe(Materials.Americium.getMolten(16), Materials.Naquadria.getMolten(16), Materials.Neutronium.getMolten(1), 1200, 98304, 600000000); // - - + GT_Values.RA.addFusionReactorRecipe(Materials.Tungsten.getMolten(16), Materials.Helium.getGas(16), Materials.Osmium.getMolten(16), 64, 24578, 150000000); // + GT_Values.RA.addFusionReactorRecipe(Materials.Manganese.getMolten(16), Materials.Hydrogen.getGas(16), Materials.Iron.getMolten(16), 64, 8192, 120000000); // + GT_Values.RA.addFusionReactorRecipe(Materials.Mercury.getFluid(16), Materials.Magnesium.getMolten(16), Materials.Uranium.getMolten(16), 64, 49152, 240000000); // + GT_Values.RA.addFusionReactorRecipe(Materials.Gold.getMolten(16), Materials.Aluminium.getMolten(16), Materials.Uranium.getMolten(16), 64, 49152, 240000000); // + GT_Values.RA.addFusionReactorRecipe(Materials.Uranium.getMolten(16), Materials.Helium.getGas(16), Materials.Plutonium.getMolten(16), 128, 49152, 480000000); // GT_ModHandler.removeRecipeByOutput(ItemList.IC2_Fertilizer.get(1L, new Object[0])); GT_Values.RA.addImplosionRecipe(ItemList.IC2_Compressed_Coal_Chunk.get(1L, new Object[0]), 8, ItemList.IC2_Industrial_Diamond.get(1L, new Object[0]), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 4L)); diff --git a/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java b/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java index fd66af590e..98f2723d6f 100644 --- a/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java +++ b/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java @@ -1,6 +1,7 @@ /* 1: */ package gregtech.loaders.preload;
/* 2: */
/* 3: */ import codechicken.nei.api.API;
+import cpw.mods.fml.common.Loader;
/* 4: */ import cpw.mods.fml.common.event.FMLInterModComms;
/* 5: */ import cpw.mods.fml.common.registry.GameRegistry;
/* 6: */ import gregtech.GT_Mod;
@@ -136,7 +137,7 @@ import ic2.core.item.ItemRadioactive; GT_ModHandler.addCraftingRecipe(ItemList.Reactor_Coolant_NaK_6.get(1L, new Object[0]), GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE , new Object[] { "PCP", "PDP", "PCP",'C', ItemList.Reactor_Coolant_NaK_3,'P', OrePrefixes.plate.get(Materials.Tin),'D',OrePrefixes.plateDense.get(Materials.Copper) });
ItemList.ThoriumCell_1.set(new GT_RadioactiveCellIC_Item("Thoriumcell", "Fuel Rod (Thorium)", 1, 50000, 0.2D,0));
- GT_ModHandler.addCraftingRecipe(ItemList.ThoriumCell_1.get(1L, new Object[0]), GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE , new Object[] { "DR ", " ", " ",'R', Ic2Items.fuelRod ,'D', OrePrefixes.dust.get(Materials.Thorium) });
+ GT_ModHandler.addShapelessCraftingRecipe(ItemList.ThoriumCell_1.get(1L, new Object[0]), GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE , new Object[] {Ic2Items.fuelRod , OrePrefixes.dust.get(Materials.Thorium) });
ItemList.ThoriumCell_2.set(new GT_RadioactiveCellIC_Item("Double_Thoriumcell", "Double Fuel Rod (Thorium)", 2, 50000, 0.2D,0));
GT_ModHandler.addCraftingRecipe(ItemList.ThoriumCell_2.get(1L, new Object[0]), GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE , new Object[] { "RPR", " ", " ",'R', ItemList.ThoriumCell_1 ,'P', OrePrefixes.plate.get(Materials.Iron) });
@@ -148,9 +149,9 @@ import ic2.core.item.ItemRadioactive; ItemList.Depleted_Thorium_2.set(new GT_DepletetCell_Item("Double_ThoriumcellDep","Dual Fuel Rod (Depleted Thorium)",2));
ItemList.Depleted_Thorium_4.set(new GT_DepletetCell_Item("Quad_ThoriumcellDep","Quad Fuel Rod (Depleted Thorium)",4));
- GT_ModHandler.addThermalCentrifugeRecipe(ItemList.Depleted_Thorium_1.get(1, new Object[0]), 5000, new Object[]{ GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Lutetium, 1L),GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Thorium, 2L),GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 1L)});
- GT_ModHandler.addThermalCentrifugeRecipe(ItemList.Depleted_Thorium_2.get(1, new Object[0]), 5000, new Object[]{ GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Lutetium, 2L),GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Thorium, 4L),GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 3L)});
- GT_ModHandler.addThermalCentrifugeRecipe(ItemList.Depleted_Thorium_4.get(1, new Object[0]), 5000, new Object[]{ GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Lutetium, 4L),GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Thorium, 8L),GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 6L)});
+ GT_ModHandler.addThermalCentrifugeRecipe(ItemList.Depleted_Thorium_1.get(1, new Object[0]), 5000, new Object[]{ GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Lutetium, 1L),GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Thorium, 2L),GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 1L)});
+ GT_ModHandler.addThermalCentrifugeRecipe(ItemList.Depleted_Thorium_2.get(1, new Object[0]), 5000, new Object[]{ GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Lutetium, 2L),GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Thorium, 4L),GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 3L)});
+ GT_ModHandler.addThermalCentrifugeRecipe(ItemList.Depleted_Thorium_4.get(1, new Object[0]), 5000, new Object[]{ GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Lutetium, 4L),GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Thorium, 8L),GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 6L)});
/* 108: */
@@ -476,9 +477,7 @@ import ic2.core.item.ItemRadioactive; if(GregTech_API.sUnification.get(ConfigCategories.specialunificationtargets + "." + "railcraft", "plateCopper", true)){
/* 412:425 */ GT_OreDictUnificator.set(OrePrefixes.plate, Materials.Copper, GT_ModHandler.getModItem("Railcraft", "part.plate", 1L, 3));}else{
GT_OreDictUnificator.set(OrePrefixes.plate, Materials.Copper, GT_ModHandler.getModItem("Railcraft", "part.plate", 1L, 3),false,false);}
-
-
-
+
/* 410:423 */
/* 411:424 */
/* 412:425 */
diff --git a/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java b/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java index dae44588dc..cfed8e47d9 100644 --- a/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java +++ b/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java @@ -193,15 +193,15 @@ import net.minecraftforge.oredict.OreDictionary; /* 257: 198 */ GT_ModHandler.addCraftingRecipe(ItemList.Hull_UV.get(1L, new Object[0]), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "CMC", Character.valueOf('M'), ItemList.Casing_UV, Character.valueOf('C'), OrePrefixes.wireGt16.get(Materials.Osmium) });
/* 258: 199 */ GT_ModHandler.addCraftingRecipe(ItemList.Hull_MAX.get(1L, new Object[0]), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "CMC", Character.valueOf('M'), ItemList.Casing_MAX, Character.valueOf('C'), OrePrefixes.wireGt01.get(Materials.Superconductor) });
/* 259: */
-/* 260: 201 */ ItemList.Transformer_LV_ULV.set(new GT_MetaTileEntity_Transformer(20, "transformer.tier.00", "Ultra Low Voltage Transformer", 0, "LV -> ULV (Use Rubber Hammer to invert)").getStackForm(1L));
-/* 261: 202 */ ItemList.Transformer_MV_LV.set(new GT_MetaTileEntity_Transformer(21, "transformer.tier.01", "Low Voltage Transformer", 1, "MV -> LV (Use Rubber Hammer to invert)").getStackForm(1L));
-/* 262: 203 */ ItemList.Transformer_HV_MV.set(new GT_MetaTileEntity_Transformer(22, "transformer.tier.02", "Medium Voltage Transformer", 2, "HV -> MV (Use Rubber Hammer to invert)").getStackForm(1L));
-/* 263: 204 */ ItemList.Transformer_EV_HV.set(new GT_MetaTileEntity_Transformer(23, "transformer.tier.03", "High Voltage Transformer", 3, "EV -> HV (Use Rubber Hammer to invert)").getStackForm(1L));
-/* 264: 205 */ ItemList.Transformer_IV_EV.set(new GT_MetaTileEntity_Transformer(24, "transformer.tier.04", "Extreme Transformer", 4, "IV -> EV (Use Rubber Hammer to invert)").getStackForm(1L));
-/* 265: 206 */ ItemList.Transformer_LuV_IV.set(new GT_MetaTileEntity_Transformer(25, "transformer.tier.05", "Insane Transformer", 5, "LuV -> IV (Use Rubber Hammer to invert)").getStackForm(1L));
-/* 266: 207 */ ItemList.Transformer_ZPM_LuV.set(new GT_MetaTileEntity_Transformer(26, "transformer.tier.06", "Ludicrous Transformer", 6, "ZPM -> LuV (Use Rubber Hammer to invert)").getStackForm(1L));
-/* 267: 208 */ ItemList.Transformer_UV_ZPM.set(new GT_MetaTileEntity_Transformer(27, "transformer.tier.07", "ZPM Voltage Transformer", 7, "UV -> ZPM (Use Rubber Hammer to invert)").getStackForm(1L));
-/* 268: 209 */ ItemList.Transformer_MAX_UV.set(new GT_MetaTileEntity_Transformer(28, "transformer.tier.08", "Ultimate Transformer", 8, "Any Voltage -> UV (Use Rubber Hammer to invert)").getStackForm(1L));
+/* 260: 201 */ ItemList.Transformer_LV_ULV.set(new GT_MetaTileEntity_Transformer(20, "transformer.tier.00", "Ultra Low Voltage Transformer", 0, "LV -> ULV (Use Soft Hammer to invert)").getStackForm(1L));
+/* 261: 202 */ ItemList.Transformer_MV_LV.set(new GT_MetaTileEntity_Transformer(21, "transformer.tier.01", "Low Voltage Transformer", 1, "MV -> LV (Use Soft Hammer to invert)").getStackForm(1L));
+/* 262: 203 */ ItemList.Transformer_HV_MV.set(new GT_MetaTileEntity_Transformer(22, "transformer.tier.02", "Medium Voltage Transformer", 2, "HV -> MV (Use Soft Hammer to invert)").getStackForm(1L));
+/* 263: 204 */ ItemList.Transformer_EV_HV.set(new GT_MetaTileEntity_Transformer(23, "transformer.tier.03", "High Voltage Transformer", 3, "EV -> HV (Use Soft Hammer to invert)").getStackForm(1L));
+/* 264: 205 */ ItemList.Transformer_IV_EV.set(new GT_MetaTileEntity_Transformer(24, "transformer.tier.04", "Extreme Transformer", 4, "IV -> EV (Use Soft Hammer to invert)").getStackForm(1L));
+/* 265: 206 */ ItemList.Transformer_LuV_IV.set(new GT_MetaTileEntity_Transformer(25, "transformer.tier.05", "Insane Transformer", 5, "LuV -> IV (Use Soft Hammer to invert)").getStackForm(1L));
+/* 266: 207 */ ItemList.Transformer_ZPM_LuV.set(new GT_MetaTileEntity_Transformer(26, "transformer.tier.06", "Ludicrous Transformer", 6, "ZPM -> LuV (Use Soft Hammer to invert)").getStackForm(1L));
+/* 267: 208 */ ItemList.Transformer_UV_ZPM.set(new GT_MetaTileEntity_Transformer(27, "transformer.tier.07", "ZPM Voltage Transformer", 7, "UV -> ZPM (Use Soft Hammer to invert)").getStackForm(1L));
+/* 268: 209 */ ItemList.Transformer_MAX_UV.set(new GT_MetaTileEntity_Transformer(28, "transformer.tier.08", "Ultimate Transformer", 8, "Any Voltage -> UV (Use Soft Hammer to invert)").getStackForm(1L));
/* 269: */
/* 270: */
/* 271: 212 */ GT_ModHandler.addCraftingRecipe(ItemList.Transformer_LV_ULV.get(1L, new Object[0]), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[] { " BB", "CM ", " BB", Character.valueOf('M'), ItemList.Hull_ULV, Character.valueOf('C'), OrePrefixes.cableGt01.get(Materials.Tin), Character.valueOf('B'), OrePrefixes.cableGt01.get(Materials.Lead) });
diff --git a/main/resources/assets/gregtech/textures/items/Thumbs.db b/main/resources/assets/gregtech/textures/items/Thumbs.db Binary files differindex 554552905b..297415ad51 100644 --- a/main/resources/assets/gregtech/textures/items/Thumbs.db +++ b/main/resources/assets/gregtech/textures/items/Thumbs.db diff --git a/main/resources/assets/gregtech/textures/items/gt.metaitem.01/510/Thumbs.db b/main/resources/assets/gregtech/textures/items/gt.metaitem.01/510/Thumbs.db Binary files differindex c309bea4bb..5b0dd7cd70 100644 --- a/main/resources/assets/gregtech/textures/items/gt.metaitem.01/510/Thumbs.db +++ b/main/resources/assets/gregtech/textures/items/gt.metaitem.01/510/Thumbs.db diff --git a/main/resources/assets/gregtech/textures/items/gt.metaitem.01/511/Thumbs.db b/main/resources/assets/gregtech/textures/items/gt.metaitem.01/511/Thumbs.db Binary files differindex f8c74cddb0..8646c5114e 100644 --- a/main/resources/assets/gregtech/textures/items/gt.metaitem.01/511/Thumbs.db +++ b/main/resources/assets/gregtech/textures/items/gt.metaitem.01/511/Thumbs.db diff --git a/main/resources/assets/gregtech/textures/items/gt.metaitem.01/517/Thumbs.db b/main/resources/assets/gregtech/textures/items/gt.metaitem.01/517/Thumbs.db Binary files differindex da3c835371..151006bef8 100644 --- a/main/resources/assets/gregtech/textures/items/gt.metaitem.01/517/Thumbs.db +++ b/main/resources/assets/gregtech/textures/items/gt.metaitem.01/517/Thumbs.db diff --git a/main/resources/assets/gregtech/textures/items/gt.metaitem.01/518/Thumbs.db b/main/resources/assets/gregtech/textures/items/gt.metaitem.01/518/Thumbs.db Binary files differindex d72734067f..02609a57de 100644 --- a/main/resources/assets/gregtech/textures/items/gt.metaitem.01/518/Thumbs.db +++ b/main/resources/assets/gregtech/textures/items/gt.metaitem.01/518/Thumbs.db diff --git a/main/resources/assets/gregtech/textures/items/gt.metaitem.01/519/Thumbs.db b/main/resources/assets/gregtech/textures/items/gt.metaitem.01/519/Thumbs.db Binary files differindex d56122b63c..9c2aaebafd 100644 --- a/main/resources/assets/gregtech/textures/items/gt.metaitem.01/519/Thumbs.db +++ b/main/resources/assets/gregtech/textures/items/gt.metaitem.01/519/Thumbs.db diff --git a/main/resources/assets/gregtech/textures/items/gt.metaitem.01/520/Thumbs.db b/main/resources/assets/gregtech/textures/items/gt.metaitem.01/520/Thumbs.db Binary files differindex 548c092e6e..a22fc2670c 100644 --- a/main/resources/assets/gregtech/textures/items/gt.metaitem.01/520/Thumbs.db +++ b/main/resources/assets/gregtech/textures/items/gt.metaitem.01/520/Thumbs.db diff --git a/main/resources/assets/gregtech/textures/items/gt.metaitem.01/521/Thumbs.db b/main/resources/assets/gregtech/textures/items/gt.metaitem.01/521/Thumbs.db Binary files differindex cf87ee6b50..6a1a7afc18 100644 --- a/main/resources/assets/gregtech/textures/items/gt.metaitem.01/521/Thumbs.db +++ b/main/resources/assets/gregtech/textures/items/gt.metaitem.01/521/Thumbs.db diff --git a/main/resources/assets/gregtech/textures/items/gt.metaitem.01/527/Thumbs.db b/main/resources/assets/gregtech/textures/items/gt.metaitem.01/527/Thumbs.db Binary files differindex d6e9f2bb38..ae0d8d4ceb 100644 --- a/main/resources/assets/gregtech/textures/items/gt.metaitem.01/527/Thumbs.db +++ b/main/resources/assets/gregtech/textures/items/gt.metaitem.01/527/Thumbs.db diff --git a/main/resources/assets/gregtech/textures/items/gt.metaitem.01/528/Thumbs.db b/main/resources/assets/gregtech/textures/items/gt.metaitem.01/528/Thumbs.db Binary files differindex 256ddfc3bf..8cb193fef8 100644 --- a/main/resources/assets/gregtech/textures/items/gt.metaitem.01/528/Thumbs.db +++ b/main/resources/assets/gregtech/textures/items/gt.metaitem.01/528/Thumbs.db diff --git a/main/resources/assets/gregtech/textures/items/gt.metaitem.01/529/Thumbs.db b/main/resources/assets/gregtech/textures/items/gt.metaitem.01/529/Thumbs.db Binary files differindex 987eac053b..a75152a9a7 100644 --- a/main/resources/assets/gregtech/textures/items/gt.metaitem.01/529/Thumbs.db +++ b/main/resources/assets/gregtech/textures/items/gt.metaitem.01/529/Thumbs.db diff --git a/main/resources/assets/gregtech/textures/items/gt.metaitem.01/530/Thumbs.db b/main/resources/assets/gregtech/textures/items/gt.metaitem.01/530/Thumbs.db Binary files differindex 4a87f53891..84629f51ec 100644 --- a/main/resources/assets/gregtech/textures/items/gt.metaitem.01/530/Thumbs.db +++ b/main/resources/assets/gregtech/textures/items/gt.metaitem.01/530/Thumbs.db diff --git a/main/resources/assets/gregtech/textures/items/gt.metaitem.01/537/Thumbs.db b/main/resources/assets/gregtech/textures/items/gt.metaitem.01/537/Thumbs.db Binary files differindex 9f5b2b76d3..6397f92ded 100644 --- a/main/resources/assets/gregtech/textures/items/gt.metaitem.01/537/Thumbs.db +++ b/main/resources/assets/gregtech/textures/items/gt.metaitem.01/537/Thumbs.db diff --git a/main/resources/assets/gregtech/textures/items/gt.metaitem.01/538/Thumbs.db b/main/resources/assets/gregtech/textures/items/gt.metaitem.01/538/Thumbs.db Binary files differindex 405ace2126..63e80cab23 100644 --- a/main/resources/assets/gregtech/textures/items/gt.metaitem.01/538/Thumbs.db +++ b/main/resources/assets/gregtech/textures/items/gt.metaitem.01/538/Thumbs.db diff --git a/main/resources/assets/gregtech/textures/items/gt.metaitem.01/539/Thumbs.db b/main/resources/assets/gregtech/textures/items/gt.metaitem.01/539/Thumbs.db Binary files differindex 2a5fe86d29..2e55ddf38e 100644 --- a/main/resources/assets/gregtech/textures/items/gt.metaitem.01/539/Thumbs.db +++ b/main/resources/assets/gregtech/textures/items/gt.metaitem.01/539/Thumbs.db diff --git a/main/resources/assets/gregtech/textures/items/gt.metaitem.01/597/Thumbs.db b/main/resources/assets/gregtech/textures/items/gt.metaitem.01/597/Thumbs.db Binary files differindex 35b14940e1..9cf6163043 100644 --- a/main/resources/assets/gregtech/textures/items/gt.metaitem.01/597/Thumbs.db +++ b/main/resources/assets/gregtech/textures/items/gt.metaitem.01/597/Thumbs.db diff --git a/main/resources/assets/gregtech/textures/items/gt.metaitem.01/598/Thumbs.db b/main/resources/assets/gregtech/textures/items/gt.metaitem.01/598/Thumbs.db Binary files differindex 29e0c53312..3bb6657ecb 100644 --- a/main/resources/assets/gregtech/textures/items/gt.metaitem.01/598/Thumbs.db +++ b/main/resources/assets/gregtech/textures/items/gt.metaitem.01/598/Thumbs.db diff --git a/main/resources/assets/gregtech/textures/items/gt.metaitem.01/599/Thumbs.db b/main/resources/assets/gregtech/textures/items/gt.metaitem.01/599/Thumbs.db Binary files differindex 000e8482e5..7564646145 100644 --- a/main/resources/assets/gregtech/textures/items/gt.metaitem.01/599/Thumbs.db +++ b/main/resources/assets/gregtech/textures/items/gt.metaitem.01/599/Thumbs.db diff --git a/main/resources/assets/gregtech/textures/items/gt.metaitem.01/605/Thumbs.db b/main/resources/assets/gregtech/textures/items/gt.metaitem.01/605/Thumbs.db Binary files differindex ee99aa9c64..3a726fca0a 100644 --- a/main/resources/assets/gregtech/textures/items/gt.metaitem.01/605/Thumbs.db +++ b/main/resources/assets/gregtech/textures/items/gt.metaitem.01/605/Thumbs.db diff --git a/main/resources/assets/gregtech/textures/items/gt.metaitem.01/Thumbs.db b/main/resources/assets/gregtech/textures/items/gt.metaitem.01/Thumbs.db Binary files differindex 1f4611d559..2da839bcaa 100644 --- a/main/resources/assets/gregtech/textures/items/gt.metaitem.01/Thumbs.db +++ b/main/resources/assets/gregtech/textures/items/gt.metaitem.01/Thumbs.db diff --git a/main/resources/assets/gregtech/textures/items/gt.metaitem.02/Thumbs.db b/main/resources/assets/gregtech/textures/items/gt.metaitem.02/Thumbs.db Binary files differindex cdc2a841f9..1af77b6637 100644 --- a/main/resources/assets/gregtech/textures/items/gt.metaitem.02/Thumbs.db +++ b/main/resources/assets/gregtech/textures/items/gt.metaitem.02/Thumbs.db diff --git a/main/resources/assets/gregtech/textures/items/iconsets/Thumbs.db b/main/resources/assets/gregtech/textures/items/iconsets/Thumbs.db Binary files differindex 734c40032f..7d2d69b3e0 100644 --- a/main/resources/assets/gregtech/textures/items/iconsets/Thumbs.db +++ b/main/resources/assets/gregtech/textures/items/iconsets/Thumbs.db |