From f1610b1721ed22fcbd4cafb61b0867d8611c00f6 Mon Sep 17 00:00:00 2001 From: Blood Asp Date: Sun, 26 Apr 2015 02:04:07 +0200 Subject: [PATCH] Fusion GUI and Distillation Tower --- main/java/gregtech/api/gui/GT_Container.java | 1 + .../api/gui/GT_ContainerMetaTile_Machine.java | 13 ++++ .../api/gui/GT_Container_MultiMachine.java | 4 ++ .../interfaces/internal/IGT_RecipeAdder.java | 19 +++++ .../GT_MetaTileEntity_MultiBlockBase.java | 16 ++++- main/java/gregtech/common/GT_RecipeAdder.java | 66 +++++++++++++++--- .../gui/GT_GUIContainer_FusionReactor.java | 51 ++++++++++++++ .../common/items/GT_DepletetCell_Item.java | 26 +++++++ .../items/GT_MetaGenerated_Item_01.java | 14 +--- .../GT_MetaTileEntity_DistillationTower.java | 29 +++++--- .../GT_MetaTileEntity_FusionComputer.java | 15 ++-- .../GT_MetaTileEntity_FusionComputer1.java | 2 +- .../GT_MetaTileEntity_FusionComputer2.java | 2 +- .../GT_MetaTileEntity_FusionComputer3.java | 2 +- .../GT_MetaTileEntity_ProcessingArray.java | 2 +- .../postload/GT_MachineRecipeLoader.java | 16 ++++- .../GT_Loader_Item_Block_And_Fluid.java | 11 +++ .../gregtech/nei/GT_NEI_DefaultHandler.java | 18 ++++- .../textures/blocks/iconsets/Thumbs.db | Bin 231424 -> 231424 bytes .../blocks/materialicons/DIAMOND/Thumbs.db | Bin 0 -> 11776 bytes .../blocks/materialicons/DULL/Thumbs.db | Bin 0 -> 11776 bytes .../blocks/materialicons/EMERALD/Thumbs.db | Bin 0 -> 12288 bytes .../materialicons/GEM_HORIZONTAL/Thumbs.db | Bin 0 -> 11776 bytes .../assets/gregtech/textures/entity/Thumbs.db | Bin 3072 -> 3072 bytes .../textures/gui/basicmachines/Thumbs.db | Bin 218112 -> 218112 bytes .../textures/gui/multimachines/Thumbs.db | Bin 20480 -> 20480 bytes .../assets/gregtech/textures/items/Thumbs.db | Bin 11264 -> 11264 bytes .../696.png => gt.Double_ThoriumcellDep.png} | Bin .../697.png => gt.Quad_ThoriumcellDep.png} | Bin .../695.png => gt.ThoriumcellDep.png} | Bin .../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/531/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 18432 -> 18432 bytes .../textures/items/gt.metaitem.01/Thumbs.db | Bin 173568 -> 175616 bytes .../textures/items/gt.metaitem.02/Thumbs.db | Bin 117760 -> 117760 bytes .../textures/items/iconsets/Thumbs.db | Bin 33792 -> 33792 bytes main/resources/mcmod.info | 6 +- 53 files changed, 264 insertions(+), 49 deletions(-) create mode 100644 main/java/gregtech/common/gui/GT_GUIContainer_FusionReactor.java create mode 100644 main/java/gregtech/common/items/GT_DepletetCell_Item.java create mode 100644 main/resources/assets/gregtech/textures/blocks/materialicons/DIAMOND/Thumbs.db create mode 100644 main/resources/assets/gregtech/textures/blocks/materialicons/DULL/Thumbs.db create mode 100644 main/resources/assets/gregtech/textures/blocks/materialicons/EMERALD/Thumbs.db create mode 100644 main/resources/assets/gregtech/textures/blocks/materialicons/GEM_HORIZONTAL/Thumbs.db rename main/resources/assets/gregtech/textures/items/{gt.metaitem.01/696.png => gt.Double_ThoriumcellDep.png} (100%) rename main/resources/assets/gregtech/textures/items/{gt.metaitem.01/697.png => gt.Quad_ThoriumcellDep.png} (100%) rename main/resources/assets/gregtech/textures/items/{gt.metaitem.01/695.png => gt.ThoriumcellDep.png} (100%) diff --git a/main/java/gregtech/api/gui/GT_Container.java b/main/java/gregtech/api/gui/GT_Container.java index 1e7a9a81..6585f79d 100644 --- a/main/java/gregtech/api/gui/GT_Container.java +++ b/main/java/gregtech/api/gui/GT_Container.java @@ -3,6 +3,7 @@ package gregtech.api.gui; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.util.GT_Log; import gregtech.api.util.GT_Utility; +import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_FusionComputer; import java.util.List; diff --git a/main/java/gregtech/api/gui/GT_ContainerMetaTile_Machine.java b/main/java/gregtech/api/gui/GT_ContainerMetaTile_Machine.java index a06cccbe..2c062c5d 100644 --- a/main/java/gregtech/api/gui/GT_ContainerMetaTile_Machine.java +++ b/main/java/gregtech/api/gui/GT_ContainerMetaTile_Machine.java @@ -29,6 +29,19 @@ public class GT_ContainerMetaTile_Machine extends GT_Container { aInventoryPlayer.player.openContainer = aInventoryPlayer.player.inventoryContainer; } } + public GT_ContainerMetaTile_Machine(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity, boolean doesBindInventory){ + super(aInventoryPlayer, aTileEntity); + mTileEntity = aTileEntity; + + if (mTileEntity != null && mTileEntity.getMetaTileEntity() != null) { + addSlots(aInventoryPlayer); + if (doesBindPlayerInventory()&&doesBindInventory) bindPlayerInventory(aInventoryPlayer); + detectAndSendChanges(); + } else { + aInventoryPlayer.player.openContainer = aInventoryPlayer.player.inventoryContainer; + } + } + public int mActive = 0, mMaxProgressTime = 0, mProgressTime = 0, mEnergy = 0, mSteam = 0, mSteamStorage = 0, mStorage = 0, mOutput = 0, mInput = 0, mID = 0, mDisplayErrorCode = 0; private int oActive = 0, oMaxProgressTime = 0, oProgressTime = 0, oEnergy = 0, oSteam = 0, oSteamStorage = 0, oStorage = 0, oOutput = 0, oInput = 0, oID = 0, oDisplayErrorCode = 0, mTimer = 0; diff --git a/main/java/gregtech/api/gui/GT_Container_MultiMachine.java b/main/java/gregtech/api/gui/GT_Container_MultiMachine.java index 3dbe24c8..289b783e 100644 --- a/main/java/gregtech/api/gui/GT_Container_MultiMachine.java +++ b/main/java/gregtech/api/gui/GT_Container_MultiMachine.java @@ -14,6 +14,10 @@ public class GT_Container_MultiMachine extends GT_ContainerMetaTile_Machine { super(aInventoryPlayer, aTileEntity); } + public GT_Container_MultiMachine(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity, boolean bindInventory) { + super(aInventoryPlayer, aTileEntity, bindInventory); + } + @Override public void addSlots(InventoryPlayer aInventoryPlayer) { addSlotToContainer(new Slot(mTileEntity, 1, 152, 5)); diff --git a/main/java/gregtech/api/interfaces/internal/IGT_RecipeAdder.java b/main/java/gregtech/api/interfaces/internal/IGT_RecipeAdder.java index b6268428..7c6e719c 100644 --- a/main/java/gregtech/api/interfaces/internal/IGT_RecipeAdder.java +++ b/main/java/gregtech/api/interfaces/internal/IGT_RecipeAdder.java @@ -239,6 +239,25 @@ public interface IGT_RecipeAdder { */ public boolean addGrinderRecipe(ItemStack aInput1, ItemStack aInput2, ItemStack aOutput1, ItemStack aOutput2, ItemStack aOutput3, ItemStack aOutput4); + /** + * Adds a Distillation Tower Recipe + * @param aInput1 must be != null + * @param aOutputs must be != null 1-5 Fluids + * @param aOutput2 can be null + */ + public boolean addDistillationTowerRecipe(FluidStack aInput, FluidStack[] aOutputs, ItemStack aOutput2, int aDuration, int aEUt); + + + public boolean addSimpleArcFurnaceRecipe(ItemStack aInput, FluidStack aFluidInput, ItemStack[] aOutputs, int[] aChances, int aDuration, int aEUt); + + public boolean addPlasmaArcFurnaceRecipe(ItemStack aInput, FluidStack aFluidInput, ItemStack[] aOutputs, int[] aChances, int aDuration, int aEUt); + + + + + + + /** * Adds a Distillation Tower Recipe */ 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 9d015cbf..058a3965 100644 --- a/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java +++ b/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java @@ -169,7 +169,10 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity { if (mMaxProgresstime > 0 && ++mProgresstime>=mMaxProgresstime) { if (mOutputItems != null) for (ItemStack tStack : mOutputItems) if (tStack != null) addOutput(tStack); - if (mOutputFluids != null) for (FluidStack tStack : mOutputFluids) if (tStack != null) addOutput(tStack); + if (mOutputFluids != null&&mOutputFluids.length==1) {for (FluidStack tStack : mOutputFluids) if (tStack != null) addOutput(tStack);} + else if(mOutputFluids!=null&&mOutputFluids.length>1){ + System.out.println("addfluids"); + addFluidOutputs(mOutputFluids);} mEfficiency = Math.max(0, Math.min(mEfficiency + mEfficiencyIncrease, getMaxEfficiency(mInventory[1]) - ((getIdealStatus() - getRepairStatus()) * 1000))); mOutputItems = null; mProgresstime = 0; @@ -197,7 +200,7 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity { aBaseMetaTileEntity.setActive(mMaxProgresstime>0); } } - + public boolean polluteEnvironment(int aPollutionLevel) { mPollution += aPollutionLevel; for (GT_MetaTileEntity_Hatch_Muffler tHatch : mMufflerHatches) { @@ -378,6 +381,15 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity { return false; } + private void addFluidOutputs(FluidStack[] mOutputFluids2) { + for(int i=0;i=i&&mOutputHatches.get(i)!=null&&mOutputFluids2[i]!=null&&isValidMetaTileEntity(mOutputHatches.get(i))){ + mOutputHatches.get(i).fill(mOutputFluids2[i], true); + } + } + + } + public boolean depleteInput(FluidStack aLiquid) { if (aLiquid == null) return false; for (GT_MetaTileEntity_Hatch_Input tHatch : mInputHatches) { diff --git a/main/java/gregtech/common/GT_RecipeAdder.java b/main/java/gregtech/common/GT_RecipeAdder.java index 05104415..7bcb3f16 100644 --- a/main/java/gregtech/common/GT_RecipeAdder.java +++ b/main/java/gregtech/common/GT_RecipeAdder.java @@ -280,18 +280,28 @@ /* 278:198 */ new GT_Recipe(aInput1, aInput2, aOutput1, aOutput2); /* 279:199 */ return true; /* 280: */ } -/* 281: */ +/* 281: */ @Deprecated /* 282: */ public boolean addDistillationRecipe(ItemStack aInput1, int aInput2, ItemStack aOutput1, ItemStack aOutput2, ItemStack aOutput3, ItemStack aOutput4, int aDuration, int aEUt) /* 283: */ { -/* 284:204 */ if ((aInput1 == null) || (aOutput1 == null)) { -/* 285:204 */ return false; -/* 286: */ } -/* 287:205 */ if ((aDuration = GregTech_API.sRecipeFile.get("distillation", aInput1, aDuration)) <= 0) { -/* 288:205 */ return false; -/* 289: */ } -/* 290:206 */ new GT_Recipe(aInput1, aInput2, aOutput1, aOutput2, aOutput3, aOutput4, aDuration, aEUt); -/* 291:207 */ return true; +///* 284:204 */ if ((aInput1 == null) || (aOutput1 == null)) { +///* 285:204 */ return false; +///* 286: */ } +///* 287:205 */ if ((aDuration = GregTech_API.sRecipeFile.get("distillation", aInput1, aDuration)) <= 0) { +///* 288:205 */ return false; +///* 289: */ } +///* 290:206 */ new GT_Recipe(aInput1, aInput2, aOutput1, aOutput2, aOutput3, aOutput4, aDuration, aEUt); +///* 291:207 */ return true; + return false; /* 292: */ } + + public boolean addDistillationTowerRecipe(FluidStack aInput, FluidStack[] aOutputs, ItemStack aOutput2, int aDuration, int aEUt){ + if(aInput==null||aOutputs==null||aOutputs.length<1||aOutputs.length>5){return false;} + if((aDuration = GregTech_API.sRecipeFile.get("distillation", aInput.getUnlocalizedName(), aDuration))<=0){ + return false; + } + GT_Recipe.GT_Recipe_Map.sDistillationRecipes.addRecipe(true, null,new ItemStack[]{ aOutput2}, null, new FluidStack[]{ aInput}, aOutputs, Math.min(aDuration,16), Math.max(1, aEUt), 0); + return false; + } /* 293: */ /* 294: */ public boolean addVacuumFreezerRecipe(ItemStack aInput1, ItemStack aOutput1, int aDuration) /* 295: */ { @@ -620,7 +630,43 @@ /* 618: */ } /* 619:423 */ return false; /* 620: */ } -/* 621: */ + +/* 621: */ public boolean addSimpleArcFurnaceRecipe(ItemStack aInput, FluidStack aFluidInput, ItemStack[] aOutputs, int[] aChances, int aDuration, int aEUt) +/* 598: */ { +/* 599:413 */ if ((aInput == null) || (aOutputs == null)||aFluidInput==null) { +/* 600:413 */ return false; +/* 601: */ } +/* 602:414 */ for (ItemStack tStack : aOutputs) { +/* 603:414 */ if (tStack != null) +/* 604: */ { +/* 605:415 */ if ((aDuration = GregTech_API.sRecipeFile.get("arcfurnace", aInput, aDuration)) <= 0) { +/* 606:415 */ return false; +/* 607: */ } +/* 608:416 */ GT_Recipe.GT_Recipe_Map.sArcFurnaceRecipes.addRecipe(true, new ItemStack[] { aInput }, aOutputs, null, aChances, new FluidStack[] { aFluidInput }, null, Math.max(1, aDuration), Math.max(1, aEUt), 0); +/* 609:417 */ return true; +/* 617: */ } +/* 618: */ } +/* 619:423 */ return false; +/* 620: */ } + +/* 621: */ public boolean addPlasmaArcFurnaceRecipe(ItemStack aInput, FluidStack aFluidInput, ItemStack[] aOutputs, int[] aChances, int aDuration, int aEUt) +/* 598: */ { +/* 599:413 */ if ((aInput == null) || (aOutputs == null)||aFluidInput==null) { +/* 600:413 */ return false; +/* 601: */ } +/* 602:414 */ for (ItemStack tStack : aOutputs) { +/* 603:414 */ if (tStack != null) +/* 604: */ { +/* 605:415 */ if ((aDuration = GregTech_API.sRecipeFile.get("arcfurnace", aInput, aDuration)) <= 0) { +/* 606:415 */ return false; +/* 607: */ } +/* 608:416 */ GT_Recipe.GT_Recipe_Map.sPlasmaArcFurnaceRecipes.addRecipe(true, new ItemStack[] { aInput }, aOutputs, null, aChances, new FluidStack[] { aFluidInput }, null, Math.max(1, aDuration), Math.max(1, aEUt), 0); +/* 609:417 */ return true; +/* 617: */ } +/* 618: */ } +/* 619:423 */ return false; +/* 620: */ } + /* 622: */ public boolean addPulveriserRecipe(ItemStack aInput, ItemStack[] aOutputs, int[] aChances, int aDuration, int aEUt) /* 623: */ { /* 624:428 */ if ((aInput == null) || (aOutputs == null)) { diff --git a/main/java/gregtech/common/gui/GT_GUIContainer_FusionReactor.java b/main/java/gregtech/common/gui/GT_GUIContainer_FusionReactor.java new file mode 100644 index 00000000..83e25cfe --- /dev/null +++ b/main/java/gregtech/common/gui/GT_GUIContainer_FusionReactor.java @@ -0,0 +1,51 @@ +package gregtech.common.gui; + +import static gregtech.api.enums.GT_Values.RES_PATH_GUI; +import net.minecraft.entity.player.InventoryPlayer; +import gregtech.api.gui.GT_Container_MultiMachine; +import gregtech.api.gui.GT_GUIContainerMetaTile_Machine; +import gregtech.api.interfaces.tileentity.IGregTechTileEntity; +import gregtech.api.util.GT_Utility; + +public class GT_GUIContainer_FusionReactor extends GT_GUIContainerMetaTile_Machine { + + String mName = ""; + + public GT_GUIContainer_FusionReactor(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity, String aName, String aTextureFile) { + super(new GT_Container_MultiMachine(aInventoryPlayer, aTileEntity, false), RES_PATH_GUI + "multimachines/" + (aTextureFile==null?"MultiblockDisplay":aTextureFile)); + mName = aName; + } + + @Override + protected void drawGuiContainerForegroundLayer(int par1, int par2) { + fontRendererObj.drawString(mName, 8, -10, 16448255); + + if (mContainer != null) { + if ((((GT_Container_MultiMachine)mContainer).mDisplayErrorCode & 64) != 0) fontRendererObj.drawString("Incomplete Structure.", 10, 8, 16448255); + + 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); + } else { + fontRendererObj.drawString("Running perfectly.", 10, 170, 16448255); + } + } + if(this.mContainer!=null){ + fontRendererObj.drawString(GT_Utility.formatNumbers(this.mContainer.mEnergy)+" EU", 50, 155, 0x00b0b000); + } + } + } + + @Override + protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) { + super.drawGuiContainerBackgroundLayer(par1, par2, par3); + int x = (width - xSize) / 2; + int y = (height - ySize) / 2; + drawTexturedModalRect(x, y, 0, 0, xSize, ySize); + if (this.mContainer != null) + { + double tScale = (double) this.mContainer.mEnergy / (double)this.mContainer.mStorage; + drawTexturedModalRect(x + 5, y + 156, 0, 251,Math.min(147, (int)(tScale*148)), 5); + } + } +} \ No newline at end of file diff --git a/main/java/gregtech/common/items/GT_DepletetCell_Item.java b/main/java/gregtech/common/items/GT_DepletetCell_Item.java new file mode 100644 index 00000000..dbc049f1 --- /dev/null +++ b/main/java/gregtech/common/items/GT_DepletetCell_Item.java @@ -0,0 +1,26 @@ +package gregtech.common.items; + +import net.minecraft.item.ItemStack; +import ic2.api.reactor.IReactor; +import gregtech.api.items.GT_RadioactiveCellIC_Item; + +public class GT_DepletetCell_Item extends GT_RadioactiveCellIC_Item{ + + public GT_DepletetCell_Item(String aUnlocalized, String aEnglish, int aRadiation) { + super(aUnlocalized, aEnglish, 1, 1, 0, aRadiation);} + + public void processChamber(IReactor paramIReactor, ItemStack paramItemStack, int paramInt1, int paramInt2, boolean paramBoolean){} + + public boolean acceptUraniumPulse(IReactor paramIReactor, ItemStack paramItemStack1, ItemStack paramItemStack2, int paramInt1, int paramInt2, int paramInt3, int paramInt4, boolean paramBoolean){ + return false;} + + public boolean canStoreHeat(IReactor paramIReactor, ItemStack paramItemStack, int paramInt1, int paramInt2){return false;} + + public int getMaxHeat(IReactor paramIReactor, ItemStack paramItemStack, int paramInt1, int paramInt2){return 0;} + + public int getCurrentHeat(IReactor paramIReactor, ItemStack paramItemStack, int paramInt1, int paramInt2){return 0;} + + public int alterHeat(IReactor paramIReactor, ItemStack paramItemStack, int paramInt1, int paramInt2, int paramInt3){return 0;} + + public float influenceExplosion(IReactor paramIReactor, ItemStack paramItemStack){return 0.0F;} +} diff --git a/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java b/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java index 5e2ef7b3..2fa6343d 100644 --- a/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java +++ b/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java @@ -486,7 +486,7 @@ import gregtech.api.util.GT_Utility; /* 474:442 */ setElectricStats(32000 + tLastID, 1000000000L, GT_Values.V[6], 6L, -3L, true); /* 475: */ /* 476:444 */ ItemList.ZPM2.set(addItem(tLastID = 605, "Ultimate Battery", "Fill this to win minecraft", new Object[] { new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 64L), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 16L), new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 64L) })); -/* 477:445 */ setElectricStats(32000 + tLastID, Long.MAX_VALUE, GT_Values.V[9], 9L, -3L, true); +/* 477:445 */ setElectricStats(32000 + tLastID, Long.MAX_VALUE, GT_Values.V[8], 8L, -3L, true); /* 478: */ /* 479:447 */ ItemList.Electric_Motor_LV.set(addItem(tLastID = 600, "Electric Motor (LV)", "", new Object[] { new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.MOTUS, 1L) })); /* 480:448 */ ItemList.Electric_Motor_MV.set(addItem(tLastID = 601, "Electric Motor (MV)", "", new Object[] { new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.MOTUS, 2L) })); @@ -636,18 +636,6 @@ import gregtech.api.util.GT_Utility; /* 624:592 */ GT_ModHandler.addCraftingRecipe(ItemList.Sensor_EV.get(1L, new Object[0]), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, new Object[] { "P Q", "PS ", "CPP", Character.valueOf('Q'), OrePrefixes.gem.get(Materials.EnderPearl), Character.valueOf('S'), OrePrefixes.stick.get(Materials.Platinum), Character.valueOf('P'), OrePrefixes.plate.get(Materials.Titanium), Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Elite) }); /* 625:593 */ GT_ModHandler.addCraftingRecipe(ItemList.Sensor_IV.get(1L, new Object[0]), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, new Object[] { "P Q", "PS ", "CPP", Character.valueOf('Q'), OrePrefixes.gem.get(Materials.EnderEye), Character.valueOf('S'), OrePrefixes.stick.get(Materials.Osmium), Character.valueOf('P'), OrePrefixes.plate.get(Materials.TungstenSteel), Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Master) }); /* 626: */ - -ItemList.Depleted_Thorium_1.set(addItem(tLastID = 695, "Fuel Rod (Depleted Thorium)", "Burned out", new Object[0])); -ItemList.Depleted_Thorium_2.set(addItem(tLastID = 696, "Dual Fuel Rod (Depleted Thorium)", "Burned out", new Object[0])); -ItemList.Depleted_Thorium_4.set(addItem(tLastID = 697, "Quad Fuel Rod (Depleted Thorium)", "Burned out", new Object[0])); - -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)}); - - - - /* 627:595 */ ItemList.Circuit_Primitive.set(addItem(tLastID = 700, "NAND Chip", "A very simple Circuit", new Object[] { OrePrefixes.circuit.get(Materials.Primitive) })); /* 628:596 */ ItemList.Circuit_Basic.set(addItem(tLastID = 701, "Basic Electronic Circuit", "A basic Circuit", new Object[] { OrePrefixes.circuit.get(Materials.Basic) })); /* 629:597 */ ItemList.Circuit_Good.set(addItem(tLastID = 702, "Good Electronic Circuit", "A good Circuit", new Object[] { OrePrefixes.circuit.get(Materials.Good) })); diff --git a/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DistillationTower.java b/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DistillationTower.java index 4ab5c7e5..c04a61d8 100644 --- a/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DistillationTower.java +++ b/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DistillationTower.java @@ -7,6 +7,7 @@ import gregtech.api.enums.Textures; /* 6: */ import gregtech.api.interfaces.ITexture; /* 7: */ import gregtech.api.interfaces.metatileentity.IMetaTileEntity; /* 8: */ import gregtech.api.interfaces.tileentity.IGregTechTileEntity; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Output; /* 9: */ import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_MultiBlockBase; /* 10: */ import gregtech.api.objects.GT_RenderedTexture; /* 11: */ import gregtech.api.util.GT_Recipe; @@ -19,6 +20,7 @@ import net.minecraft.block.Block; /* 15: */ import net.minecraft.entity.player.InventoryPlayer; /* 16: */ import net.minecraft.item.ItemStack; /* 17: */ import net.minecraftforge.common.util.ForgeDirection; +import net.minecraftforge.fluids.FluidStack; /* 18: */ /* 19: */ public class GT_MetaTileEntity_DistillationTower /* 20: */ extends GT_MetaTileEntity_MultiBlockBase @@ -40,7 +42,7 @@ import net.minecraft.block.Block; /* 36: */ /* 37: */ public String[] getDescription() /* 38: */ { -/* 39: 38 */ return new String[] { "Controller Block for the Distillation Tower", "Size: 3x6x3 (Hollow)", "Controller (front bottom)", "1x Input Hatch (anywhere)", "6x Output Hatch (anywhere)", "1x Energy Hatch (anywhere)", "1x Maintenance Hatch (anywhere)", "Clean Stainless Steel Casings for the rest (26 at least!)" }; +/* 39: 38 */ return new String[] { "Controller Block for the Distillation Tower", "Size: 3x6x3 (Hollow)", "Controller (front bottom)", "1x Input Hatch (bottom)", "5x Output Hatch (one each height level besides botton)","1x Output Bus (Botton)", "1x Energy Hatch (anywhere)", "1x Maintenance Hatch (anywhere)", "Clean Stainless Steel Casings for the rest (26 at least!)" }; /* 40: */ } /* 41: */ /* 42: */ public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone) @@ -73,15 +75,13 @@ import net.minecraft.block.Block; /* 69: */ /* 70: */ public boolean checkRecipe(ItemStack aStack) /* 71: */ { -/* 72: 66 */ ArrayList tInputList = getStoredInputs(); -/* 73: 68 */ for (ItemStack tInput : tInputList) -/* 74: */ { +/* 72: 66 */ /* 75: 69 */ long tVoltage = getMaxInputVoltage(); /* 76: 70 */ byte tTier = (byte)Math.max(1, GT_Utility.getTier(tVoltage)); -/* 77: */ -/* 78: 72 */ GT_Recipe tRecipe = GT_Recipe.GT_Recipe_Map.sDistillationRecipes.findRecipe(getBaseMetaTileEntity(), false, gregtech.api.enums.GT_Values.V[tTier], null, new ItemStack[] { tInput }); +/* 77: */ if(this.mInputHatches.size()>0&&this.mInputHatches.get(0)!=null&&this.mInputHatches.get(0).mFluid!=null&&this.mInputHatches.get(0).mFluid.amount>0){ +/* 78: 72 */ GT_Recipe tRecipe = GT_Recipe.GT_Recipe_Map.sDistillationRecipes.findRecipe(getBaseMetaTileEntity(), false, gregtech.api.enums.GT_Values.V[tTier], new FluidStack[]{this.mInputHatches.get(0).mFluid}, new ItemStack[] {}); /* 79: 73 */ if (tRecipe != null) { -/* 80: 73 */ if (tRecipe.isRecipeInputEqual(true, null, new ItemStack[] { tInput })) +/* 80: 73 */ if (tRecipe.isRecipeInputEqual(true, new FluidStack[]{this.mInputHatches.get(0).mFluid}, new ItemStack[] {})) /* 81: */ { /* 82: 74 */ this.mEfficiency = (10000 - (getIdealStatus() - getRepairStatus()) * 1000); /* 83: 75 */ this.mEfficiencyIncrease = 10000; @@ -105,11 +105,12 @@ import net.minecraft.block.Block; /* 101: */ } /* 102: 90 */ this.mMaxProgresstime = Math.max(1, this.mMaxProgresstime); /* 103: 91 */ this.mOutputItems = new ItemStack[] { tRecipe.getOutput(0) }; + this.mOutputFluids = tRecipe.mFluidOutputs; /* 104: 92 */ updateSlots(); /* 105: 93 */ return true; /* 106: */ } -/* 107: */ } -/* 108: */ } +/* 107: */ }} +/* 108: */ /* 109: 96 */ return false; /* 110: */ } /* 111: */ private static boolean controller; @@ -141,6 +142,16 @@ import net.minecraft.block.Block; /* 136: */ } /* 137: */ } /* 138: */ } + if(this.mInputHatches.size()!=1||this.mOutputBusses.size()!=1||this.mInputBusses.size()!=0||this.mOutputHatches.size()!=5){return false;} + int height = this.getBaseMetaTileEntity().getYCoord(); + if(this.mInputHatches.get(0).getBaseMetaTileEntity().getYCoord()!=height||this.mOutputBusses.get(0).getBaseMetaTileEntity().getYCoord()!=height){return false;} + GT_MetaTileEntity_Hatch_Output[] tmpHatches = new GT_MetaTileEntity_Hatch_Output[5]; + for(int i=0;i< this.mOutputHatches.size();i++){ + int hatchNumber = this.mOutputHatches.get(i).getBaseMetaTileEntity().getYCoord()-1-height; + if(tmpHatches[hatchNumber]==null){ + tmpHatches[hatchNumber]=this.mOutputHatches.get(i); + }else{return false;} + } /* 139:116 */ return tAmount >= 26; /* 140: */ } diff --git a/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer.java b/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer.java index 946cb788..bdfb51d5 100644 --- a/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer.java +++ b/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer.java @@ -20,6 +20,7 @@ import gregtech.api.objects.GT_RenderedTexture; import gregtech.api.util.GT_Recipe; import gregtech.api.util.GT_Utility; import gregtech.api.metatileentity.implementations.*; +import gregtech.common.gui.GT_GUIContainer_FusionReactor; import net.minecraft.block.Block; /* 8: */ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; @@ -47,11 +48,15 @@ import net.minecraftforge.fluids.FluidStack; /* 40: */ /* 41: */ public abstract long maxEUStore(); /* 50: */ -/* 51: */ public boolean onRightclick(IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer) -/* 52: */ { -/* 53: 31 */ getBaseMetaTileEntity().openGUI(aPlayer, 143); -/* 54: 32 */ return true; -/* 55: */ } + @Override + public Object getServerGUI(int aID, InventoryPlayer aPlayerInventory, IGregTechTileEntity aBaseMetaTileEntity) { + return new GT_Container_MultiMachine(aPlayerInventory, aBaseMetaTileEntity); + } + + @Override + public Object getClientGUI(int aID, InventoryPlayer aPlayerInventory, IGregTechTileEntity aBaseMetaTileEntity) { + return new GT_GUIContainer_FusionReactor(aPlayerInventory, aBaseMetaTileEntity, getLocalName(), "FusionComputer.png"); + } /* 56: */ /* 57: */ public abstract MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity); /* 61: */ diff --git a/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer1.java b/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer1.java index 28c74e7a..b99a6678 100644 --- a/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer1.java +++ b/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer1.java @@ -33,7 +33,7 @@ public class GT_MetaTileEntity_FusionComputer1 extends GT_MetaTileEntity_FusionC public int getFusionCoilMeta() {return 15;} public String[] getDescription() - {return new String[] { "It's over 9000!!!","LuV Casings around Superconducting Coils","2-16 Input Hatches","1-16 Output Hatches","1-16 Energy Hatches","All Hatches must be LuV or better" };} + {return new String[] { "It's over 9000!!!","LuV Casings around Superconducting Coils","2-16 Input Hatches","1-16 Output Hatches","1-16 Energy Hatches","All Hatches must be LuV or better","2048EU/t and 10mio EU Cap per Energy Hatch" };} @Override public int tierOverclock() {return 1;} diff --git a/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer2.java b/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer2.java index 80702a37..0f7fab7b 100644 --- a/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer2.java +++ b/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer2.java @@ -33,7 +33,7 @@ public class GT_MetaTileEntity_FusionComputer2 extends GT_MetaTileEntity_FusionC public int getFusionCoilMeta() {return 7;} public String[] getDescription() - {return new String[] { "It's over 9000!!!","Fusion Casings around Fusion Coils","2-16 Input Hatches","1-16 Output Hatches","1-16 Energy Hatches","All Hatches must be ZPMV or better" };} + {return new String[] { "It's over 9000!!!","Fusion Casings around Fusion Coils","2-16 Input Hatches","1-16 Output Hatches","1-16 Energy Hatches","All Hatches must be ZPMV or better","4096EU/t and 20mio EU Cap per Energy Hatch" };} @Override public int tierOverclock() {return 2;} diff --git a/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer3.java b/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer3.java index 25c05768..42371fbe 100644 --- a/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer3.java +++ b/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer3.java @@ -33,7 +33,7 @@ public class GT_MetaTileEntity_FusionComputer3 extends GT_MetaTileEntity_FusionC public int getFusionCoilMeta() {return 7;} public String[] getDescription() - {return new String[] { "A SUN DOWN ON EARTH","Fusion Casings MK II around Fusion Coils","2-16 Input Hatches","1-16 Output Hatches","1-16 Energy Hatches","All Hatches must be UV or better" };} + {return new String[] { "A SUN DOWN ON EARTH","Fusion Casings MK II around Fusion Coils","2-16 Input Hatches","1-16 Output Hatches","1-16 Energy Hatches","All Hatches must be UV or better","8192EU/t and 40mio EU Cap per Energy Hatch" };} @Override public int tierOverclock() {return 4;} 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 9d5d1691..886bfd8a 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 @@ -37,7 +37,7 @@ public class GT_MetaTileEntity_ProcessingArray extends GT_MetaTileEntity_MultiBl /* 36: */ /* 37: */ public String[] getDescription() /* 38: */ { - /* 39: 38 */ return new String[] { "Controller Block for the Processing Array", "Size: 3x3x3 (Hollow)", "Controller (front centered)", "1x Input (anywhere)", "1x Output (anywhere)", "1x Energy Hatch (anywhere)", "1x Maintenance Hatch (anywhere)", "Robust Tungstensteel Casings for the rest (16 at least!)","Put up to 16 Basic Machines into the GUI Inventory" }; + /* 39: 38 */ return new String[] { "Controller Block for the Processing Array", "Size: 3x3x3 (Hollow)", "Controller (front centered)", "1x Input (anywhere)", "1x Output (anywhere)", "1x Energy Hatch (anywhere)", "1x Maintenance Hatch (anywhere)", "Robust Tungstensteel Casings for the rest (16 at least!)","Put up to 16 Basic Machines into the GUI Inventory","Currently only fluid Centrifuge Recipes work correctly","Make Deuterium/Tritium with it." }; /* 40: */ } /* 41: */ /* 42: */ public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone) diff --git a/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java b/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java index 1ab75bec..4c13337d 100644 --- a/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java +++ b/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java @@ -681,8 +681,20 @@ public class GT_MachineRecipeLoader 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)); - GT_Values.RA.addDistillationRecipe(GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Oil, 16L), 32, GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Fuel, 16L), GT_OreDictUnificator.get(OrePrefixes.cell, Materials.SulfuricAcid, 16L), GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Glyceryl, 1L), GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Methane, 15L), 4000, 64); - GT_Values.RA.addDistillationRecipe(GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Biomass, 3L), 0, GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Ethanol, 1L), GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Water, 1L), ItemList.Cell_Empty.get(1L, new Object[0]), ItemList.IC2_Fertilizer.get(1L, new Object[0]), 500, 64); +// GT_Values.RA.addDistillationRecipe(GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Oil, 16L), 32, GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Fuel, 16L), GT_OreDictUnificator.get(OrePrefixes.cell, Materials.SulfuricAcid, 16L), GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Glyceryl, 1L), GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Methane, 15L), 4000, 64); +// GT_Values.RA.addDistillationRecipe(GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Biomass, 3L), 0, GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Ethanol, 1L), GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Water, 1L), ItemList.Cell_Empty.get(1L, new Object[0]), ItemList.IC2_Fertilizer.get(1L, new Object[0]), 500, 64); + GT_Values.RA.addDistillationTowerRecipe(Materials.Oil.getFluid(64L), new FluidStack[]{Materials.Lubricant.getFluid(16L) , Materials.Fuel.getFluid(64L), Materials.SulfuricAcid.getFluid(64L), Materials.Glyceryl.getFluid(4L), Materials.Methane.getGas(60L)},null, 16, 64); + GT_Values.RA.addDistillationTowerRecipe(new FluidStack(ItemList.sOilLight, 128), new FluidStack[]{Materials.Lubricant.getFluid(16L) , Materials.Fuel.getFluid(64L), Materials.SulfuricAcid.getFluid(64L), Materials.Glyceryl.getFluid(4L), Materials.Methane.getGas(60L)}, null, 16, 64); + GT_Values.RA.addDistillationTowerRecipe(new FluidStack(ItemList.sOilMedium, 64), new FluidStack[]{Materials.Lubricant.getFluid(16L) , Materials.Fuel.getFluid(64L), Materials.SulfuricAcid.getFluid(64L), Materials.Glyceryl.getFluid(4L), Materials.Methane.getGas(60L)}, null, 16, 64); + GT_Values.RA.addDistillationTowerRecipe(new FluidStack(ItemList.sOilHeavy, 32), new FluidStack[]{Materials.Lubricant.getFluid(16L) , Materials.Fuel.getFluid(64L), Materials.SulfuricAcid.getFluid(64L), Materials.Glyceryl.getFluid(4L), Materials.Methane.getGas(60L)}, GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.HydratedCoal, 1L), 24, 64); + GT_Values.RA.addDistillationTowerRecipe(new FluidStack(ItemList.sOilExtraHeavy, 16), new FluidStack[]{Materials.Lubricant.getFluid(16L) , Materials.Fuel.getFluid(64L), Materials.SulfuricAcid.getFluid(64L), Materials.Glyceryl.getFluid(4L), Materials.Methane.getGas(60L)}, GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.HydratedCoal, 1L), 24, 64); + GT_Values.RA.addDistillationTowerRecipe(new FluidStack(ItemList.sNaturalGas, 64), new FluidStack[]{Materials.Methane.getGas(120L)}, null, 16, 64); + GT_Values.RA.addDistillationTowerRecipe(Materials.Creosote.getFluid(24L), new FluidStack[]{Materials.Lubricant.getFluid(12L)}, null, 16, 96); + GT_Values.RA.addDistillationTowerRecipe(Materials.SeedOil.getFluid(32L), new FluidStack[]{Materials.Lubricant.getFluid(12L)}, null, 16, 96); + GT_Values.RA.addDistillationTowerRecipe(Materials.FishOil.getFluid(24L), new FluidStack[]{Materials.Lubricant.getFluid(12L)}, null, 16, 96); + GT_Values.RA.addDistillationTowerRecipe(Materials.Biomass.getFluid(150L), new FluidStack[]{Materials.Ethanol.getFluid(60L),Materials.Water.getFluid(60L)}, GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Wood, 1L), 25, 64); + GT_Values.RA.addDistillationTowerRecipe(Materials.Water.getFluid(288L), new FluidStack[]{GT_ModHandler.getDistilledWater(260L)}, null, 16, 64); + GT_Values.RA.addElectrolyzerRecipe(GT_Values.NI, ItemList.Cell_Empty.get(1L, new Object[0]), Materials.Water.getFluid(3000L), Materials.Hydrogen.getGas(2000L), GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Oxygen, 1L), GT_Values.NI, GT_Values.NI, GT_Values.NI, GT_Values.NI, GT_Values.NI, null, 1500, 30); GT_Values.RA.addElectrolyzerRecipe(GT_Values.NI, ItemList.Cell_Empty.get(1L, new Object[0]), GT_ModHandler.getDistilledWater(3000L), Materials.Hydrogen.getGas(2000L), GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Oxygen, 1L), GT_Values.NI, GT_Values.NI, GT_Values.NI, GT_Values.NI, GT_Values.NI, null, 1500, 30); 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 18649b94..d8acefd4 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 @@ -29,6 +29,7 @@ import gregtech.api.items.GT_RadioactiveCellIC_Item; /* 28: */ import gregtech.common.blocks.GT_Block_Machines; /* 29: */ import gregtech.common.blocks.GT_Block_Ores; /* 30: */ import gregtech.common.blocks.GT_TileEntity_Ores; +import gregtech.common.items.GT_DepletetCell_Item; /* 31: */ import gregtech.common.items.GT_FluidDisplayItem; /* 32: */ import gregtech.common.items.GT_IntegratedCircuit_Item; /* 33: */ import gregtech.common.items.GT_MetaGenerated_Item_01; @@ -37,6 +38,7 @@ import gregtech.api.items.GT_RadioactiveCellIC_Item; /* 36: */ import gregtech.common.items.GT_MetaGenerated_Tool_01; import gregtech.common.items.GT_NeutronReflector_Item; import ic2.core.Ic2Items; +import ic2.core.item.ItemRadioactive; /* 37: */ import java.io.PrintStream; @@ -141,6 +143,15 @@ import ic2.core.Ic2Items; ItemList.ThoriumCell_4.set(new GT_RadioactiveCellIC_Item("Quad_Thoriumcell", "Quad Fuel Rod (Thorium)", 4, 50000, 0.2D,0)); GT_ModHandler.addCraftingRecipe(ItemList.ThoriumCell_4.get(1L, new Object[0]), GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE , new Object[] { "RPR", "CPC", "RPR",'R', ItemList.ThoriumCell_1 ,'P', OrePrefixes.plate.get(Materials.Iron),'C', OrePrefixes.plate.get(Materials.Copper) }); + ItemList.Depleted_Thorium_1.set(new GT_DepletetCell_Item("ThoriumcellDep","Fuel Rod (Depleted Thorium)",1)); + 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)}); + + /* 108: */ /* 109:110 */ GT_Log.out.println("GT_Mod: Adding Blocks."); /* 110:111 */ GregTech_API.sBlockMachines = new GT_Block_Machines(); diff --git a/main/java/gregtech/nei/GT_NEI_DefaultHandler.java b/main/java/gregtech/nei/GT_NEI_DefaultHandler.java index f85ee4da..54d831e1 100644 --- a/main/java/gregtech/nei/GT_NEI_DefaultHandler.java +++ b/main/java/gregtech/nei/GT_NEI_DefaultHandler.java @@ -563,7 +563,23 @@ this.mInputs.add(new FixedPositionedStack( GT_Utility.getFluidDisplayStack(aRecipe.mFluidInputs[1], true), 30, 52)); } /* 562: */ } -/* 563:265 */ if ((aRecipe.mFluidOutputs.length > 0) && (aRecipe.mFluidOutputs[0] != null) && (aRecipe.mFluidOutputs[0].getFluid() != null)) { + if(aRecipe.mFluidOutputs.length>1){ + if(aRecipe.mFluidOutputs[0]!=null && (aRecipe.mFluidOutputs[0].getFluid() != null)){ + this.mOutputs.add(new FixedPositionedStack( GT_Utility.getFluidDisplayStack(aRecipe.mFluidOutputs[0], true), 120, 5)); + } + if(aRecipe.mFluidOutputs[1]!=null && (aRecipe.mFluidOutputs[1].getFluid() != null)){ + this.mOutputs.add(new FixedPositionedStack( GT_Utility.getFluidDisplayStack(aRecipe.mFluidOutputs[1], true), 138, 5)); + } + if(aRecipe.mFluidOutputs.length>2&&aRecipe.mFluidOutputs[2]!=null && (aRecipe.mFluidOutputs[2].getFluid() != null)){ + this.mOutputs.add(new FixedPositionedStack( GT_Utility.getFluidDisplayStack(aRecipe.mFluidOutputs[2], true), 102, 23)); + } + if(aRecipe.mFluidOutputs.length>3&&aRecipe.mFluidOutputs[3]!=null && (aRecipe.mFluidOutputs[3].getFluid() != null)){ + this.mOutputs.add(new FixedPositionedStack( GT_Utility.getFluidDisplayStack(aRecipe.mFluidOutputs[3], true), 120, 23)); + } + if(aRecipe.mFluidOutputs.length>4&&aRecipe.mFluidOutputs[4]!=null && (aRecipe.mFluidOutputs[4].getFluid() != null)){ + this.mOutputs.add(new FixedPositionedStack( GT_Utility.getFluidDisplayStack(aRecipe.mFluidOutputs[4], true), 138, 23)); + } + }else if ((aRecipe.mFluidOutputs.length > 0) && (aRecipe.mFluidOutputs[0] != null) && (aRecipe.mFluidOutputs[0].getFluid() != null)) { /* 564:265 */ this.mOutputs.add(new FixedPositionedStack( GT_Utility.getFluidDisplayStack(aRecipe.mFluidOutputs[0], true), 102, 52)); /* 565: */ } /* 566: */ } diff --git a/main/resources/assets/gregtech/textures/blocks/iconsets/Thumbs.db b/main/resources/assets/gregtech/textures/blocks/iconsets/Thumbs.db index ea3a5bbae69b3e4a4c8c9a80554d0e26c4274f1e..83c612784fa81e6e649676fecf816be3e197254e 100644 GIT binary patch delta 2942 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 literal 0 HcmV?d00001 diff --git a/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_HORIZONTAL/Thumbs.db b/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_HORIZONTAL/Thumbs.db new file mode 100644 index 0000000000000000000000000000000000000000..1d543273e6dc776b80a206139592c4bfcee01433 GIT binary patch literal 11776 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 literal 0 HcmV?d00001 diff --git a/main/resources/assets/gregtech/textures/entity/Thumbs.db b/main/resources/assets/gregtech/textures/entity/Thumbs.db index e19c875ae86d3df8b4fbbbc04e2084bb587924d9..87a14aa9b2b75e0f33e3335eb2867cf67af60a1e 100644 GIT binary patch delta 19 acmZpWXpq>D!@?G@hBvRgesd8^A3Fd*wFZI! delta 19 acmZpWXpq>D!@{=U^s8I3)tif0`q%+avIrai diff --git a/main/resources/assets/gregtech/textures/gui/basicmachines/Thumbs.db b/main/resources/assets/gregtech/textures/gui/basicmachines/Thumbs.db index a657b37582de18f22de43ae8ab95489a5fb9efa5..d131a4f23bd3c5b08f6edd3c778ebbffeee5b943 100644 GIT binary patch delta 101 zcmZoz!P~HccY_ZLBj0327I`)W_L%bW`pHEsfs>u}4JRA0uuT5J;tgVNE@8dUI@yKQ tU~@@#fEkY{0|SFJ5dQ~)$ro8vn!g;}{^cO!m2DhMNTS=nR50<}1_0KyCkOxl delta 105 zcmZoz!P~HccY_ZLBhzF>7I`*STD5l y{09P21_lNYJ^3Pw%I1>p05cvwpolb*X!DnY+rJ!Sys~Zb2|bt$}IW- diff --git a/main/resources/assets/gregtech/textures/gui/multimachines/Thumbs.db b/main/resources/assets/gregtech/textures/gui/multimachines/Thumbs.db index e2bb6d7b10d3144a8f2088c26b5a69978a68b7bd..6854de72e7db6079103018b3a42507aed3604e4e 100644 GIT binary patch delta 106 zcmZozz}T>WaYGIZ8$;xyit_r&MJ!>HJ(P7O8?dlU{=wqI!_L6KzzoFyfnf4Q7M0B< ntmkET89`h&B;m;=O6MmZRx+Giq8z}(2$Wz!lHB}7nMVfzPOT|K delta 98 zcmZozz}T>WaYGIZo58M6;&IiJi&(-q*cliY{sY0}K!1(NKUjQtSbze|Fu{u~Dw|7K l&&%*KFam|xkc20fD4m~tn8k2%iE_Z?BT5FFzbNzQ0000eB+CE* diff --git a/main/resources/assets/gregtech/textures/items/Thumbs.db b/main/resources/assets/gregtech/textures/items/Thumbs.db index 7068aa882ab1c833f86318ea7d384945a0a3dfe9..b7645dc3d037da2358ad89363c94f2072487b7da 100644 GIT binary patch delta 240 zcmZpOXo%S0!@|fjS&>Dat-(IGx2%405laxye;{CIU|;~zlLJLHCjVgZ;b8#^aKi*I zvZ!n>VZFdH`3RrE$P1KX zM3(;|K8Kq_c?a9-H@<9@lV>Qe;b8?zGa)INT%zI+GGX!;6@Okvkn8x7WH*Da?ZNG|DD<}c!NxH(*f4`qLvXQ428hVmL7eyBQ_5tB<){COFffTG+;CQSYU6lGuqitr$b nZZ1)kVd8l5a&Mn^?alw2XQ)>&ax74)-M=kRGGnuZ<_jhO8vbBr diff --git a/main/resources/assets/gregtech/textures/items/gt.metaitem.01/696.png b/main/resources/assets/gregtech/textures/items/gt.Double_ThoriumcellDep.png similarity index 100% rename from main/resources/assets/gregtech/textures/items/gt.metaitem.01/696.png rename to main/resources/assets/gregtech/textures/items/gt.Double_ThoriumcellDep.png diff --git a/main/resources/assets/gregtech/textures/items/gt.metaitem.01/697.png b/main/resources/assets/gregtech/textures/items/gt.Quad_ThoriumcellDep.png similarity index 100% rename from main/resources/assets/gregtech/textures/items/gt.metaitem.01/697.png rename to main/resources/assets/gregtech/textures/items/gt.Quad_ThoriumcellDep.png diff --git a/main/resources/assets/gregtech/textures/items/gt.metaitem.01/695.png b/main/resources/assets/gregtech/textures/items/gt.ThoriumcellDep.png similarity index 100% rename from main/resources/assets/gregtech/textures/items/gt.metaitem.01/695.png rename to main/resources/assets/gregtech/textures/items/gt.ThoriumcellDep.png 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 731c19966c2fc3b1f1b41a4c292601080da310f9..e026fac783215b58b7430bd32fcac2992889b483 100644 GIT binary patch delta 87 zcmZoLXfW82!@{=U<%xM^^^=QOf+oAL8ca4|VVV4c6B)&LG3 VHmC?pbaDyb6%IyZWhMMQ8~|ESCT;)# delta 96 zcmZoLXfW82!@{Pp{dGV}<>VrkARaab1_l-&{tpC`135J&|6sYm!3Yz$$fC0O3u^!e Y4@epYCIdw$m+)QTKo;0s!r#LI0QpTYw*UYD 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 index 147a7debc79c8cb82c2b8d4863dd3f0d1a1cade6..12900e86dbf0dc55edf3eefccbb295ae9f691b44 100644 GIT binary patch delta 87 zcmZoLXfW82!@_2;>&(2e`pHEsL6cor4JI3~uuT5Ja)E<|fq~&a5KO+vqO$o5YXAoi V8&m`)I=O`J3I`*yvJ(Ct4ge~mCDQ-^ delta 96 zcmZoLXfW82!@~BUZ&6T6<>VrkARaab1_l-&{tpC`135J&|6sYm!3Yz$$fC0O3u^!e Y4@epYCIdw$m+)QTKo;0s!r#LI02Prj2LJ#7 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 6c86cbf735540c31f663f69e41b0e3e3903b45a3..4342ef09a1294437a6f67538c2cd64e9e473dfba 100644 GIT binary patch delta 19 acmZpWXpq>D!@?$T_uRa)`prcwee3{8AqQgs delta 19 acmZpWXpq>D!@{=Va@(dU<(rFG`q%+YR|new 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 5a06e9b54dd5e8656ab6dd0c972a63811a0810bd..690fc13736eac8d8488b4cae7ebbb4bd40e03bfe 100644 GIT binary patch delta 19 acmZpWXpq>D!@|a(esNw|{pKQ;K6U^=a0Z|N delta 19 acmZpWXpq>D!@{<~rE}Ai^36poee3{7+y_qp 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 ee81fe010992fcd78506856d1976eac6bdc11572..3daf3a88218bf317b24646e06c378df44043a0a9 100644 GIT binary patch delta 19 acmZpWXpq>D!@_n!>GHg?`prcwee3{9KnHCA delta 19 acmZpWXpq>D!@{D!@{;e?&`d<`prcwee3{78V5T7 delta 19 acmZpWXpq>D!@}0Ev3Jvy^36poee3{AG6#?V 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 d581d402124a0b7c6208db548c620ee3b67a93bb..f82cf8e5ce0d29e583638ca836b62c0582b5ac97 100644 GIT binary patch delta 19 acmZpWXpq>D!@^b|b$wo0{pKQ;K6U^^^alw5 delta 19 acmZpWXpq>D!@?G@wtv%<^36poee3{83D!@}kuc5_}?{pKQ;K6U^?&IZ>2 delta 19 acmZpWXpq>D!@{Ppa^j{b<(rFG`q%+Q<_9bQ 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 37e20073dfeea57be56e2c99df4e39e8531c2f87..21df6697eccc555da1a53b7f94723ec04888a061 100644 GIT binary patch delta 19 acmZpWXpq>D!@?#YbbDS|{pKQ;K6U^=s0O6~ delta 19 acmZpWXpq>D!@|aJX7Z*f<(rFG`q%+Q_6IQl 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 9a80a711d33bbe35ca692918721ea8020868b3fa..0be796fda8deb040b93bf778a832cff0605b3e11 100644 GIT binary patch delta 19 acmZpWXpq>D!@~B#D!@~C9-PBD}$~PCW^sxf~Q2Yor 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 89bfc8340f71e0de0340d79763ba03d4a2c08304..c9b7a25c586f001920ed7de8a3f6a84c1454d156 100644 GIT binary patch delta 18 ZcmZpWXpq>D%ff1Ke_mPr<|39pb^t!}2DbnJ delta 18 ZcmZpWXpq>D%fc!+W7CxK%|$GI>;OD~273Si diff --git a/main/resources/assets/gregtech/textures/items/gt.metaitem.01/531/Thumbs.db b/main/resources/assets/gregtech/textures/items/gt.metaitem.01/531/Thumbs.db index 0c5676b411c734c540edd2a7c77324d74f5399fd..5092ecf13b51fff33a30ff11850c9e9263c2a19e 100644 GIT binary patch delta 19 acmZpWXpq>D!@{;8_~E>=`prcwee3{9mD!@}mUd-kR&<(rFG`q%+TR0n7P 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 c5c94b210a1791e06932c167bc3baf60f6f8f6b1..e88e63593ffe45359762eea8320205a336b1511e 100644 GIT binary patch delta 19 acmZpWXpq>D!@|~3_IO@d{pKQ;K6U^}s0V=n delta 19 acmZpWXpq>D!@_33I&agI^36poee3{0qXwk_ 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 index 02074473bc78769b3196c5273b0c7daf43652c08..52a873fb1ab052b1e5bd75aa8536daf1c2ae0f6a 100644 GIT binary patch delta 19 acmZpWXpq>D!@^c@;OV@w`prcwee3{B?gza9 delta 19 acmZpWXpq>D!@|bExM0(i^36poee3`}eFk#? 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 68a02250f325b8df730f3d414723d28402985a72..8e29d5ac58ad6bd77241a9c4e072a95b0658fbc8 100644 GIT binary patch delta 19 acmZpWXpq>D!@`!p^D!@~AJdC{gR<(rFG`q%+Ug9mp2 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 55809058db1199e4ff7597038aedbf82aa2e2b12..438ab79ec0636bceb325764664791ff983c2dc1e 100644 GIT binary patch delta 87 zcmZoLX)xK4!@}mE`)XcU{p2E+pvf+*29pg~SSJ5qxxm4~z`*by2qs@-QQ7>3HGqSM V4JrZ?om|3qg@X}USqXm+7XT1UC4K+^ delta 96 zcmZoLX)xK4!@`zeAs(7iIk|`>h=+}Vfq?~x{{z9~KyHo6KUgksFv0{bvZ!qS!WzKA Y1CoY;$w1M`C45&nkOelE@b_>50HOsiwEzGB 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 index ecb70eea7e0ddb7d52a48c876fee34e7891a5876..9a6d991178e98d05b57c51e9eca58e9caf6249ee 100644 GIT binary patch delta 89 zcmZpez}PT>aYGIZn}Ft=Md2n? delta 98 zcmZpez}PT>aYGIZ+lMRvgHtLe7qJBKurV+&umJIYAeby@rZM>k%LNWbn7~CAmCavR a10;Ar(l9U?C_1@B?g|I8z~&P99t{AT05ZA& 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 643bdcfd335c0f971fcf5df295124d0c7d98888f..da8054030d8b7698e06acf8236812df19559e485 100644 GIT binary patch delta 19 acmZoLX)xK4!@_3p;@!Nm`prcweWCzP)d%zd delta 19 acmZoLX)xK4!@{;f`&i4V+Ra5QeWCzN`v=DW 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 46f5cb19c5d1cfdc41f921dd9ca480492906f425..3cb956372717f06d388c81479672591682a020c7 100644 GIT binary patch delta 21 dcmZpez}PT>aYGIZ8^eaYGIZ+kt|EEvITX7qRp?0{~y^2>$>8 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 7f582656f95a4d8dafd5afcce14b4ba846c5232d..eba08d2c151712dcf4e6befdc5b8fd5c1d5c5347 100644 GIT binary patch delta 5401 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 M{MHt@-)w&RA1Ej(!vFvP delta 3542 zcmaKu32anF7{_;>+wHQ<*4C3lgD5D~VxS5IFG`9ch}}Ue79}W(iWfwkDheoy#0xnb z$bb?p-hff?NuOr~YZL+56^gf@#uVbgk$f145&h5GUHG0PZt{}X-*;@r4baP0NWRV)*Sf_r-_HbMe*#&p-H?FKT+3een_UC4kaHu!qql znRF};ayFwrm8g_F3*<;fjV{lm#XJy?Qv!{B0`eiJx&pe#fvjQFrwWynE}^d(HM)y3 zAIJL`>H?crAh|dq?W*K;05uHy)HN&9;&Py63>)gDWL)HHF4T<@E8%`^AD=2w)KyR) z!%g(rIWwfPkJ0@Q{3J+@Vp5;_!Nz&o$f(h^DEV%XCpjfYXM>#2sUEE4$pBp#^l7k4 z$dMq;j2eBhl7j(W=8yoN1{lbouZLw5X>kG2RECXKN`4NooI?Vv0x0KDk8DW(!hlaB zkx>bVo1jCjYgA$NZ5&c#PNK)LQyKJWH0+0h3}MvhYtfSTL1u7DpyDEsV>#91GN!e> zuTSIPX*VRRBGL&s#B$8Ygq)idpKexh*%2C3B3cteABH9>`4;N#1L7ygJ zB5OgeXVmD)N{$Ceb4ZhO@?(G}81(60*dGsa0;5Jhq~y*5IM_@AybW+)M019cjR4Ox z=+lf$DjnMf^c2HJ&sK6Kz?B@*?0m_3j*=rF*u#WA&B-P6tF;gZ(F>yCOl?IEZC?0nUq^?tK&k+_nGPbT=^bK@p zkzWI=PZn*-Y0SITry%B1kTV$#=oFDj=2NbM{8h+qW^zkaBAXTsK({g+P;aD~j-3v6 z1LIZ?5LlJ(fHE8tuxV|t4w?pvOh@@^K~_9{OGEOF3G{`+?a*i_EaVP!J<5NJ6RLNK zIS)R=0cD^V8B(hoMflaV)L3lhXk;lm!)`#tcC^Szc?{5}3|qPpjrp=b4yLScaz5Oj zslrORbqWX=-|M}HscYAm6M_3id^;?*AEw=ee$;KM4)!*Q`h;!m>0u_Oiu&-NXe#pg z0Vcb+Cp`_+rSmqU0ZltNBoDhtk3;x7Q?Pob!*hVTGaS%N(U6L?G0<~GM!0zkXr6HE zbQ%m6Fe9rMx>KyJwtMj+KZ58CCJyu>l|q$;OQ=`p zr_)mSf)404*faS-!Ns8r*TMN>(A$}FOY4fmy&l7z-?g@)$2M5J2JL`b=q>p{4QNZa zo!D``72_VeA6l~_n%i8J?FCd!Bp_h4dKmbf5%qT0!n=T~Ii_}Gktp=K=)~&ng}ezb zN!!{ekj8G24euPi#|1tBFI$+WfcA)7shkM(V+8MaXVeF%g5g!<)p`{N5HN$-3eQM9 z2j-1?uO;ra<}Xqz^AKk;tR^taKp*L;4({J1Tz+2G*4^h}S2}we3r0O0n<~J1dK<%o z#YN^R`6zs>V1BIb?O|lyO!xNi@69)m{S=Y+_i+D~S6S*`P}DVEwlsf;gS?DwUEm@Q z@-~JnprM{yjd$RqDdMNzmC+k$CBp#$m!?Gv*e#4(J<6${1N0EX0gWogrm=`!SBBV4 z*La(g$^A^t>Ip7a3^U;+9JoN=;o-gxud5E|aq)};n&OS=IB)!lmPfrhTw8y_&D9ZC z^Ie>Q0y{n53$LF*FYw%V$9?1$d$Y_}HI?Sanyz-pa_@apo9q;HS|xTQfKK|q=U-U2 B3wr7I`)Sy`0{%`pHEsfs+p_8%{Q0VVV4c#T&%lT*4Z_Ir)f$ z!R9Y~AzU1j85kJ;1Ht5rf-0L!Bm<64KEeW&y60~``LKlH_7XA1^YXk589-HwkW_9j zF=Gti<^gH+M;89#$auw&gAqljnDIR4WM@{x?O$pc{dIX6L7JG5Rg|n|>`?#!-qTUT delta 193 zcmZpe!QL=~eS;4RBje~C%%a{RF zwg^e-_7XG30B)X8ppZYZ@E1qMD~24%)@=V$%y^!2@?jRk?O$pc{dK{tlGTho3IKzQ BQ`!Ik diff --git a/main/resources/assets/gregtech/textures/items/iconsets/Thumbs.db b/main/resources/assets/gregtech/textures/items/iconsets/Thumbs.db index 57e023c7493128c6f3636d370cd727b1360ae098..95147e49211335ea7d5664edd762c7a811d178be 100644 GIT binary patch delta 202 zcmZqZU~1@K+K|J-=CHXdpsap!5li6Y!!m}G4Omzv|6uV3u{W2nhH!95F)%Rv2ZG5L zSyVQE;XTj7%b*SvGDi^>I?p-TnbmOf7nuMq9tEJ3AhL9c`W1c-CM1!`CFcH4+N7Za%oKd!Qwsnu#Dm664nq7 z4n~;FMHZFKUwF^6@G?pPh0IZeh0b$MKFngc`HM^d7Z1oBb!6!h^(*`wAW;yQ3^ZqQ siMc;Sz4>`*UIsCsVl`w9UxKf&O!nZ_+59Eqf*Ow?P|6WSx}Jvx01#zXX#fBK diff --git a/main/resources/mcmod.info b/main/resources/mcmod.info index ffe3951c..7d47238d 100644 --- a/main/resources/mcmod.info +++ b/main/resources/mcmod.info @@ -3,11 +3,11 @@ "name": "GregTech-Addon", "description": "This Mod adds the awesome Technology of GregTech-Intergalactical to your World!", "mcversion": "1.7.10", - "version": "5.07", + "version": "5.08", "logoFile": "/assets/gregtech_addon/textures/LogoGTI_Long.png", - "url": "http://forum.industrial-craft.net/index.php?page=Thread&threadID=7156", + "url": "http://forum.industrial-craft.net/index.php?page=Thread&threadID=11488", "updateUrl": "", - "authors": ["Gregorius Techneticies"], + "authors": ["Gregorius Techneticies","Blood Asp"], "credits": "Notch and Mojang for Minecraft, Alblaka and his Team for IndustrialCraft, Mr. Brain for many of the Crop Textures, OvermindDL for helping me with Code, TheSirusKing and matix for a few Textures", "parent": "", "screenshots": [],