From f6fc2a6df60811b84bb929560921b02095cc035e Mon Sep 17 00:00:00 2001 From: Blood-Asp Date: Sun, 7 Jun 2015 21:25:40 +0200 Subject: [PATCH] Update 5.08.19 --- .../api/gui/GT_GUIContainer_MultiMachine.java | 2 +- .../GT_MetaPipeEntity_Cable.java | 2 +- .../GT_MetaTileEntity_MultiBlockBase.java | 24 +++++----- main/java/gregtech/common/GT_Proxy.java | 44 +++++++++++++----- .../gui/GT_GUIContainer_FusionReactor.java | 2 +- .../items/GT_MetaGenerated_Tool_01.java | 4 +- .../items/GT_NeutronReflector_Item.java | 7 ++- .../GT_MetaTileEntity_TypeFilter.java | 5 +- .../multi/GT_MetaTileEntity_LargeTurbine.java | 12 ++--- ...GT_MetaTileEntity_LargeTurbine_Plasma.java | 2 +- .../GT_MetaTileEntity_ProcessingArray.java | 42 ++++++++++------- .../postload/GT_MachineRecipeLoader.java | 29 ++++++------ .../GT_Loader_Item_Block_And_Fluid.java | 13 +++--- .../preload/GT_Loader_MetaTileEntities.java | 18 +++---- .../assets/gregtech/textures/items/Thumbs.db | Bin 13312 -> 13312 bytes .../items/gt.metaitem.01/510/Thumbs.db | Bin 6144 -> 6144 bytes .../items/gt.metaitem.01/511/Thumbs.db | Bin 6144 -> 6144 bytes .../items/gt.metaitem.01/517/Thumbs.db | Bin 3072 -> 3072 bytes .../items/gt.metaitem.01/518/Thumbs.db | Bin 3072 -> 3072 bytes .../items/gt.metaitem.01/519/Thumbs.db | Bin 3072 -> 3072 bytes .../items/gt.metaitem.01/520/Thumbs.db | Bin 3072 -> 3072 bytes .../items/gt.metaitem.01/521/Thumbs.db | Bin 3072 -> 3072 bytes .../items/gt.metaitem.01/527/Thumbs.db | Bin 3072 -> 3072 bytes .../items/gt.metaitem.01/528/Thumbs.db | Bin 3072 -> 3072 bytes .../items/gt.metaitem.01/529/Thumbs.db | Bin 3072 -> 3072 bytes .../items/gt.metaitem.01/530/Thumbs.db | Bin 3072 -> 3072 bytes .../items/gt.metaitem.01/537/Thumbs.db | Bin 3072 -> 3072 bytes .../items/gt.metaitem.01/538/Thumbs.db | Bin 3072 -> 3072 bytes .../items/gt.metaitem.01/539/Thumbs.db | Bin 3072 -> 3072 bytes .../items/gt.metaitem.01/597/Thumbs.db | Bin 6656 -> 6656 bytes .../items/gt.metaitem.01/598/Thumbs.db | Bin 18432 -> 18432 bytes .../items/gt.metaitem.01/599/Thumbs.db | Bin 6656 -> 6656 bytes .../items/gt.metaitem.01/605/Thumbs.db | Bin 6656 -> 6656 bytes .../textures/items/gt.metaitem.01/Thumbs.db | Bin 181248 -> 181248 bytes .../textures/items/gt.metaitem.02/Thumbs.db | Bin 118784 -> 118784 bytes .../textures/items/iconsets/Thumbs.db | Bin 36864 -> 36864 bytes 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 572fea0e..b71b3282 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 aada4db8..c859f534 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<= 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 feddd5be..8bae83ff 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 83e25cfe..3550fffd 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 f6ed7f41..7a593de3 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 1430dcda..a9556cc4 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 ae576638..f3a87282 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 dc9c9a76..67491976 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 5ddd0e90..0c4b88b6 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;i0){ +// 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 5b68849c..8ad3003e 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 fd66af59..98f2723d 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 dae44588..cfed8e47 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 index 554552905b494c7adb91ac378176dcf3ba95420d..297415ad51b249d401a9f5922e38f8221fa2405a 100644 GIT binary patch delta 212 zcmZq3Xvo;$!@|frS&>Dat-<#>+pB4li&z4A8Mzr47?^?hKM+g~6xEpggT;IDVOGP* zC9M9uj37}#nCwLsmCavRLpV5?kVGbz@CERIl)=Dcpt8wd_|Ah2+5Cn7JR8`wFJe#u w@$)>qjQl_Y7?BP6q7pFq2%o{`64fhg9IVJPB|1Q7umeRnkwiCt(cxhS0Hrxw4*&oF delta 226 zcmZq3Xvo;$!@|fkS&>DaZNqhsFYaBFi&z4A8U6zSCj$eRo*XEuG5H6JH!mYUP=p&M zdXYtCatW*dWM@{x&0knUI5kroFMQ{D8JU541d;S@{=$ErjhB%f tDg@W`MGUBz7bwbzqFDSq56G6uUsM8kSkd%sE>XS0hGw-6)KNM->;TA+Wq|+y 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 index c309bea4bb67083a804a1417d31632ce90edeaf0..5b0dd7cd7066b370f596e7d5ffea54d37bb15bc3 100644 GIT binary patch delta 19 acmZoLXfW82!@|a}+xGkKX`72!`h)>XH3!iE delta 19 acmZoLXfW82!@}m^bnAYR0rDt delta 19 acmZoLXfW82!@^dearcXR*XAOYK4Ab#n+J;k 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 index da3c835371a8bf39fc0a511b1421129df702a4b3..151006bef8b874dcd50c7f2d2d29767165a95b86 100644 GIT binary patch delta 19 bcmZpWXpq>D!@~ApzsvXE(>52e^sxf~QUC~m delta 19 acmZpWXpq>D!@{QE{_u-?*XAOYK6U^_Ne3bT 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 index d72734067fcbd6d0c6e14a4d99f941baf3cbbe7a..02609a57deb41ae09d83af8b44609c1826208ab7 100644 GIT binary patch delta 19 bcmZpWXpq>D!@_ppk=ys*(>52e^sxf~QVD!@}mk_T-Cu*XAOYK6U^^ItK&* 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 index d56122b63c09373d69762f569249164f0a38d4ce..9c2aaebafdb547fa2ffdab5c27bc60895dca9388 100644 GIT binary patch delta 19 acmZpWXpq>D!@{;f$MgH|X`72!`q%+VUkAbf delta 19 acmZpWXpq>D!@{PZ`Rt2(*XAOYK6U^^N(Tu5 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 index 548c092e6e9312e73e6c87cc1a4b11c041f3ca7e..a22fc2670c65760770f55548db857cfbe77119f4 100644 GIT binary patch delta 19 acmZpWXpq>D!@{D!@}n9;>8#DuFXX(ee3{DG6(7a 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 index cf87ee6b50e45c0906dd15ab91aff5e8bcf63b0e..6a1a7afc186640f4043a49b7533b66341fbd9445 100644 GIT binary patch delta 19 acmZpWXpq>D!@^cjD!@?%;D!@}l}=l}ipw9Q2D!@_o9$D1$iU7L$o`q%+crU*^| 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 index 256ddfc3bf6e31eda9f34fb7845905932c174c3d..8cb193fef83ab062000fcb226a55e7ec4de8b874 100644 GIT binary patch delta 19 acmZpWXpq>D!@{O8G4T8EX`72!`q%+TX$PMG delta 19 acmZpWXpq>D!@_oe>HQb?uFXX(ee3{9^#_Xp 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 index 987eac053b8b799facba7ec4104336be674d5513..a75152a9a7c33883426d6e3e99ae35bcb256f3ee 100644 GIT binary patch delta 19 acmZpWXpq>D!@~BVC;0pCX`72!`q%+cIS6b3 delta 19 acmZpWXpq>D!@@S<--j>mU7L$o`q%+c#t2vd 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 index 4a87f53891bd3930c0e15b70f2d6702b8c04e7a8..84629f51ec19e51feff58227ac77c82b8d2e567a 100644 GIT binary patch delta 19 bcmZpWXpq>D!@_o9edzb!(>52e^sxf~QAr4K delta 19 acmZpWXpq>D!@?GD`O_EouFXX(ee3{DY6tHC 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 index 9f5b2b76d3426068bdb14fc3c8e17386eb9862f4..6397f92ded1e70b723080bffb8e8ca12fb5abfdf 100644 GIT binary patch delta 19 acmZpWXpq>D!@|~ZF7o^DX`72!`q%+aGYCWg delta 19 acmZpWXpq>D!@{QE@coN>*XAOYK6U^_$pD!@`#EG5Y)OX`72!`q%+aLkLL# delta 19 acmZpWXpq>D!@?%e_4A8+*XAOYK6U^|4+m`k 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 index 2a5fe86d296b1feeb1e34f4bf969f6ecd8716503..2e55ddf38ee20c81ba5052797785aa4b56cd6d25 100644 GIT binary patch delta 19 acmZpWXpq>D!@}ku68HW0w9Q2D!@_nU?)Mk>uFXX(ee3{EsR#oA 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 index 35b14940e195489499fd3a236984737872126609..9cf6163043247bc5446cced98d6b6762e4191c20 100644 GIT binary patch delta 19 acmZoLX)xK4!@_0|m+<}fw9Q2aYGIZ+Xthh@4u&QE@J6(1^{8b2~Pk3 delta 21 ccmZpez}PT>aYGIZTSM*tFYaBNi&*-c0bmpf1ONa4 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 index 000e8482e530cff332f76c9b1434d6b11216e9ed..756464614567b3af064fef4445968a143939d1b1 100644 GIT binary patch delta 19 acmZoLX)xK4!@|aJI_3NCX`72!`a}Uuz6cTk delta 19 acmZoLX)xK4!@{P(!uZv_YjY7xpC|x6nFdAx 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 index ee99aa9c6452bc90a81b694505b03cad0ba32817..3a726fca0a08f913c797b019f7481118e70db347 100644 GIT binary patch delta 19 bcmZoLX)xK4!@_o8e%kln(>52e^oarhR9Fb8 delta 19 acmZoLX)xK4!@~ApX4vef-J6S8`a}UyFbFjO 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 index 1f4611d559e0f211d5246044547ee02f1fa8bda0..2da839bcaa5a25534285cf34eb048ee1dbcad497 100644 GIT binary patch delta 2718 zcmZ9OYiv|S6vubQ?e=baZ`q1q3-Li9QbG&cvVeS0+Z2UF-FuPM6dyn#LQU`yokmfN zghE0h!IA+75{%#n1@Qq~?L`x%*cuy&?o}6GQHXw^AAEp1L>lYkKf7B!*V)|U?(h81 z%$YN1X70wV)f=}~A6^%)NjtYCMxPDYB{4KxJ|54?q1r~7j>qN2_$~G<(9iMwjV71$ zPLra-RqZL(;$Nu9R;ht5-XgnGSvgSKEOjbpoh4dd)OtyKI>>B7rJj^Ga$iq&?V_J( za7+FTIm?V=T4}5qo^AeU;_mAiZk1}EZ^q4($IX;vaYo~u>pE-zj#k8Zu2&@oThmgs zx@urIYmpaPT{)OZ`=YIou#!Y8#bQqlF5+olFD_Wt-NfYUCHaJE_c`X=QLyZYX_;H; z#5M!1C0L5ioVAMpUw66*hnd+`M8fXM$)ScuUw7pzoLCMXKM^mfAMory0A3@|7Z2tw zhkXz91;J807TS*hTpfYybJnF~KwqzS;d~UD^AX*qu$cPM2<-9f4uBU3^mR|Z%3)i8 zzKY=OVNxz^OG~}mv-iUCE3rzk$Fna-7}pW#>pfn=PJ*Thm0}+XZoetGec3A6-q7re zLvFPb+Xm6YRH*wx8_uzv1o}G2S=L5Er0CB(>{XCwBJ@Pgnm~ZBPav2lK&~WIiXl|h z6p*h8_4SaOlmi(=_NmL9*aFxx5&LIhRWX~_5GwU)lpy2qI+I5!+y~oSY8PiiIhaCa z4u=VQ2P~gNtUrf#4Z!;mc&@mUe0|Qd>~pXzjaV;+c0E8{1dd=vlaM!4il&*J=j#zf zd?$44h&Ir1hRm~Gu#1E%kz&Phl}@pob&{9@QOm+gyB}zL1lO}d(z=WwC8jdZJ_y1I z4fIszCLLA__B-K9G(p`2A_xt16U$edvn0?9m{(=r1mjgipu|E}ux=(K5H~Wjd%gkN zO}G+SOywOy0-a?z&gzh=l@yB(W)}TLuyN%yniK|l8FOui^?=_>^h&HjX@PE^27Nvv?q;4j-U8jtOp)z_(VX=Exot2@ zmuU{fldMo_{YY(Mi-{=jVe-U^%2f z9LD0QfpNSgxNwAJYgGF~yhU~Qv*OL7bbqO^191XXQkukvW~2#-^nTK%(!eGA$+C;a zOWCDRwrRXL>=pP0#5WM9iZyO#{s!SnpJw?|F`r?%gt?ZLI9ozW437;nT&&-x;8-1T zK95R2MM$83L843jji4CJ+b+$^BQWkwv?pR#wTEuKs52tDz5Bz5j>BhF7pH_alMJbr0Y1r zfw+N}5+3M9++412m90i;wj}oS*vLnSqtaO(+TVg~B{a}(v6H_4brOg>csY$?IS-Te zJP1apqv+!9q+%`TO=IJ|7ZLRETy5k_C(t{QwBp)`y&T6$ady{IC;c49NwA$DrC&DP zw*mb?a3Btq`%?NS$Jay#W#b#A1J!b(RNCjqY8&x^)P!dip4oW*I?~zB`uh07(qdde z9mKnQ+w>M(Q}eLLSK*SIAGjiFL;2$SLu9**ZCsn2AnjGAzJs oxw3b1FnFAga@o4nN{vUknRd@h^Q%WU*Q}6V-rlB`b@1VT0D1F=9{>OV delta 2760 zcmZveYitx%6oB_$x7+D<23iCx5EVnCC24hOfJow_O;MYuJJYx^MGb-)s0nJKr%`-F zLM0)AV95n2%(@oxc7im*a3lU|G`ED zRjwnhAyUJrk5z8g5ytWrh85Jgs$*=C!n%TWgb948_iAjTejTF<=Z223iCoF3kMmqx zbqp<1(B!IO4|!`USPw7_1q(g$`nb@9)K6$B!wMEtNbTfgv1gwoL0U{@Ovx>A zoj8AsnfSQG%f`We%BX@ia@0nS+B|h^Am>ASDPx&ZnzX2Xha7ULe!8%v{0hf;Gs1kE`8`DyFGkJq6X--t1#fSmlTU z>HNa<6h7+NPZD^GK_4CqEhp7R=s|`RJQdkD5}2QW>kC#p13s>I$@n0lVTKiKjO=v; zE+k-|XKx_zDuX`ug;^)HiO`7z-WHXoLMQbmkrxy6 zXyKx!9;MI@kjfPawNaWwB=QZTK90IIrm;SJ?g~dNBiZ7F{EH}S-%8|aMiri-tuaQY z&6rJ)XbBg?nQ}URGw8!ul(F9?@)@HFel4p$pMc|)Dt^VNkK>+YZzggVqYBPP_D=*F z5^$m%A5Kv8AxY|(G{CfQYfbzb>O{P`8tX(n*8$Xvs5+&N49rIfzD!iEhi-;7EEgq<25ag%2;dfBcI#VW z1B`3Pi-PqIBLU_GU5}p-TE#JR3)6QK!E`pV0j>}(4SgT!-pTYetf4$+5;@K(t`XF+ zFDuA6Gq+0sYemUU%%%nquI^}*t@<2&vu!#v%{@Uc`M<0Z$&@4P6=8h;XndAVN_|Hr z4Ln?UPL!&x_Y$5qnV9l~rZXHMVY&~D>sbj8{lXJ*Q+s-*25biWboFX>FxP}o^k`_YGaEye_`zwH>W}3wN72#z0HGFL1Gd~|m*clv; z&RLG(gu(j=UCVHQge`N7hSH?n&rCrh;W%A5NjntpC!P|aBhFN`CgTb4v?ye($GI__ zF`Ai+21mo#yh4s(cY;T(2Lx=!Lzxt?=;S<+1) z8PfRrr2C=Rm&x?qgu+2n)9z*s{$zH(Japipf*2l_%Po7HlrQH7@PXW_k9%^N%B5@d fu_N*Z9eFaRzOS1Z(60+pd53c``o9mgs(=2!Dn#he 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 index cdc2a841f969cfd6ef9e71a5e2f5c73deecb83c3..1af77b66379e527b5ca44b2425f7a028569b009b 100644 GIT binary patch delta 177 zcmZozz}~QceM1fln}XggwpY_87qNs*_K?t-Y{0@Y`3H;lWM>J(%_Xc?PIF9VU|{$U z1d}gvs%$Q~7{JTJ2o$MC7X5NB#GGRhlF0TFF~;-qATzd?m@$Ufa)csFeko==&&kV} c0TqK8zWqxrqrWaMV+l~430Zx~YQ`QF02KL3XaE2J delta 182 zcmZozz}~QceM1flo56xYZk?XVMJ!<)p$rTR|AAogMNW;$KUlnZ88d()lM$jSn@d=) zoaSIc5xE$^%LCF?jV$`*UWhqI36jY65;4Z}^1O^7m5Wfs%@{*$IT(?Jz7#W_=bU_) T#c=zVT1J0eFso!WV~+{|lRr{H diff --git a/main/resources/assets/gregtech/textures/items/iconsets/Thumbs.db b/main/resources/assets/gregtech/textures/items/iconsets/Thumbs.db index 734c40032f0fc029da828e8144dcaf1fba614d99..7d2d69b3e03b4a5a65a525c5bbf0fc9c88e4e121 100644 GIT binary patch delta 1352 zcmZA0OHWfl6bJCzdRvOj^-(l}7LkX5N|mZmpA;tkZ#LjSjSOiy9cyih}JTAcyh zmB?-J?$jPe=e69fljy~i5sp_ y{ie1TGc&R~Z)>4>q9)T`&TW--g+Kq7g*80PVTjS8Xjs#cf)(0R{wGZi|DYS!6EOXgpuCrfV-p zzal`7RymZO7v;n~?peK3P49d$FTipyI_6I~I=CpA0j$0RofgH!P;U;RrJ6x^(x6bw zgK;kOAA$M>lPPI+6mU!;m*V6h)(q7Gbq~oinVMmoItJ;I%22-#(jwKA-9VM&Lg<}A zbUYJRFbHTrSG0P9;A|!w!8u6>o(r`+f}QGrI%h1?h~;YIV(39-c5;Q;om}VhhW2*!U)7SSXoSd+EF^rW^C3Zm9pC zZe*&K+~t-I#_P4akNcWsyy>M|a&QmJ%et6MA(<7#ml0RwuDp`&YTm^8(CuYN23`Lh1``$E)dzrO#09ZsWeC{w$p)ePXOL|((T$rbNPHS5q*kcUDo zucK#=Aq_&wY|hi~Xn=TAs}~6TOt__06F>>HyoH%f&b%X(_+$DMvz_*Vw^i^DQ;ZH*