From 680676e411c8ae67e2a81cf498598b208f95d4f8 Mon Sep 17 00:00:00 2001 From: Muramasa Date: Tue, 24 May 2016 00:04:36 +0100 Subject: [PATCH 1/9] Redone Tooltips and some scanner info --- .../multi/GT_MetaTileEntity_AdvMiner2.java | 30 +++-- .../multi/GT_MetaTileEntity_AssemblyLine.java | 122 +++++++++--------- .../GT_MetaTileEntity_BronzeBlastFurnace.java | 8 +- .../multi/GT_MetaTileEntity_Charcoal_Pit.java | 20 +-- .../GT_MetaTileEntity_DistillationTower.java | 17 +-- ...T_MetaTileEntity_ElectricBlastFurnace.java | 13 +- .../GT_MetaTileEntity_FusionComputer.java | 24 ++++ .../GT_MetaTileEntity_HeatExchanger.java | 21 ++- ...GT_MetaTileEntity_ImplosionCompressor.java | 12 +- .../multi/GT_MetaTileEntity_LargeBoiler.java | 15 ++- .../multi/GT_MetaTileEntity_LargeTurbine.java | 36 +++--- .../GT_MetaTileEntity_LargeTurbine_Gas.java | 18 +-- ...T_MetaTileEntity_LargeTurbine_HPSteam.java | 19 +-- ...GT_MetaTileEntity_LargeTurbine_Plasma.java | 15 ++- .../GT_MetaTileEntity_LargeTurbine_Steam.java | 15 ++- .../multi/GT_MetaTileEntity_MultiFurnace.java | 14 +- .../multi/GT_MetaTileEntity_OilCracker.java | 23 ++-- .../multi/GT_MetaTileEntity_OilDrill.java | 17 +-- .../GT_MetaTileEntity_ProcessingArray.java | 18 +-- .../multi/GT_MetaTileEntity_PyrolyseOven.java | 20 +-- .../GT_MetaTileEntity_VacuumFreezer.java | 12 +- 21 files changed, 291 insertions(+), 198 deletions(-) diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AdvMiner2.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AdvMiner2.java index cb220907..e9cc7b34 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AdvMiner2.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AdvMiner2.java @@ -44,12 +44,14 @@ public class GT_MetaTileEntity_AdvMiner2 extends GT_MetaTileEntity_MultiBlockBas public String[] getDescription() { return new String[]{ "Controller Block for the Advanced Miner II", - "Size: 3x3x7", "Controller (front middle at bottom)", - "3x3 Base of Solid Steel Casings", - "Also part of Base: MV+ Energy Input Hatch", - "Fluid Input Hatch, Output Bus and Maintainance Hatch", - "3x Solid Steel Casings on top the Center of the base", - "Steel Frame Boxes on each side and 3 more on top"}; + "Size(WxHxD): 3x7x3, Controller (Front middle bottom)", + "3x1x3 Base of Solid Steel Casings", + "1x3x1 Solid Steel Casing pillar (Center of base)", + "1x3x1 Steel Frame Boxes (Each Steel pillar side and on top)", + "1x Input Hatch (Any bottom layer casing)", + "1x Output Bus (Any bottom layer casing)", + "1x Maintenance Hatch (Any bottom layer casing)", + "1x MV+ Energy Hatch (Any bottom layer casing)"}; } public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone) { @@ -58,7 +60,7 @@ public class GT_MetaTileEntity_AdvMiner2 extends GT_MetaTileEntity_MultiBlockBas } return new ITexture[]{Textures.BlockIcons.CASING_BLOCKS[16]}; } - + public Object getClientGUI(int aID, InventoryPlayer aPlayerInventory, IGregTechTileEntity aBaseMetaTileEntity) { return new GT_GUIContainer_MultiMachine(aPlayerInventory, aBaseMetaTileEntity, getLocalName(), "DrillingRig.png"); } @@ -112,18 +114,18 @@ public class GT_MetaTileEntity_AdvMiner2 extends GT_MetaTileEntity_MultiBlockBas } } if (mMineList.isEmpty()) { - if(getBaseMetaTileEntity().getBlockOffset(ForgeDirection.getOrientation(getBaseMetaTileEntity().getBackFacing()).offsetX, getYOfPumpHead() - 1 - getBaseMetaTileEntity().getYCoord(), ForgeDirection.getOrientation(getBaseMetaTileEntity().getBackFacing()).offsetZ) != Blocks.bedrock){ - if (mEnergyHatches.size() > 0 && mEnergyHatches.get(0).getEUVar() > (512 + getMaxInputVoltage() * 4)) { - moveOneDown(); - } - }else{return false;} + if(getBaseMetaTileEntity().getBlockOffset(ForgeDirection.getOrientation(getBaseMetaTileEntity().getBackFacing()).offsetX, getYOfPumpHead() - 1 - getBaseMetaTileEntity().getYCoord(), ForgeDirection.getOrientation(getBaseMetaTileEntity().getBackFacing()).offsetZ) != Blocks.bedrock){ + if (mEnergyHatches.size() > 0 && mEnergyHatches.get(0).getEUVar() > (512 + getMaxInputVoltage() * 4)) { + moveOneDown(); + } + }else{return false;} } ArrayList tDrops = new ArrayList(); if (!mMineList.isEmpty()) { Block tMineBlock = getBaseMetaTileEntity().getBlockOffset(mMineList.get(0).chunkPosX, mMineList.get(0).chunkPosY, mMineList.get(0).chunkPosZ); tDrops = tMineBlock.getDrops(getBaseMetaTileEntity().getWorld(), mMineList.get(0).chunkPosX, mMineList.get(0).chunkPosY, mMineList.get(0).chunkPosZ, getBaseMetaTileEntity().getMetaIDOffset(mMineList.get(0).chunkPosX, mMineList.get(0).chunkPosY, mMineList.get(0).chunkPosZ), 1); if (!tDrops.isEmpty()) { - ItemData tData = GT_OreDictUnificator.getItemData(tDrops.get(0).copy()); + ItemData tData = GT_OreDictUnificator.getItemData(tDrops.get(0).copy()); if (tData.mPrefix != OrePrefixes.crushed&& tData.mMaterial.mMaterial != Materials.Oilsands) { GT_Recipe tRecipe = GT_Recipe.GT_Recipe_Map.sMaceratorRecipes.findRecipe(getBaseMetaTileEntity(), false, tVoltage, null, tDrops.get(0).copy()); if (tRecipe != null) { @@ -291,4 +293,4 @@ public class GT_MetaTileEntity_AdvMiner2 extends GT_MetaTileEntity_MultiBlockBas return new GT_MetaTileEntity_AdvMiner2(this.mName); } -} +} \ No newline at end of file diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AssemblyLine.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AssemblyLine.java index e292c4a1..e4a7d0df 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AssemblyLine.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AssemblyLine.java @@ -34,13 +34,13 @@ public class GT_MetaTileEntity_AssemblyLine } public String[] getDescription() { - return new String[]{"Assembly line", - "Size: 3x(2-16)x4, variable lenght", - "Bottom: Steel Casing(or Maintainance or Input Hatch), Input Bus(Last Output Bus), Steel Casing", - "Middle: Reinforced Glass, Assembling Line, Reinforced Glass", - "UpMiddle: Grate Casing(or Controller), Assambling Casing, Grate Casing", - "Top: Steel Casing(or Energy Hatch)", - "Up to 16 repeating slices, last is Output Bus"}; + return new String[]{"Assembly line", + "Size: 3x(2-16)x4, variable length", + "Bottom: Steel Casing(or Maintenance or Input Hatch), Input Bus(Last Output Bus), Steel Casing", + "Middle: Reinforced Glass, Assembling Line, Reinforced Glass", + "UpMiddle: Grate Casing(or Controller), Assembling Casing, Grate Casing", + "Top: Steel Casing(or Energy Hatch)", + "Up to 16 repeating slices, last is Output Bus"}; } public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone) { @@ -137,74 +137,74 @@ public class GT_MetaTileEntity_AssemblyLine int xDir = ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetX; int zDir = ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetZ; if (xDir != 0) { - for(int r = 0; r <= 16; r++){ - int i = r*xDir; - - if(i!=0&&aBaseMetaTileEntity.getBlockOffset(0, 0, i)!=GregTech_API.sBlockCasings3&&aBaseMetaTileEntity.getMetaIDOffset(0, 0, i)!=10){return false;} - if(!aBaseMetaTileEntity.getBlockOffset(0, -1, i).getUnlocalizedName().equals("blockAlloyGlass")){return false;} - IGregTechTileEntity tTileEntity = aBaseMetaTileEntity.getIGregTechTileEntityOffset(0, -2, i); - if ((!addMaintenanceToMachineList(tTileEntity, 16)) && (!addInputToMachineList(tTileEntity, 16))){ + for(int r = 0; r <= 16; r++){ + int i = r*xDir; + + if(i!=0&&aBaseMetaTileEntity.getBlockOffset(0, 0, i)!=GregTech_API.sBlockCasings3&&aBaseMetaTileEntity.getMetaIDOffset(0, 0, i)!=10){return false;} + if(!aBaseMetaTileEntity.getBlockOffset(0, -1, i).getUnlocalizedName().equals("blockAlloyGlass")){return false;} + IGregTechTileEntity tTileEntity = aBaseMetaTileEntity.getIGregTechTileEntityOffset(0, -2, i); + if ((!addMaintenanceToMachineList(tTileEntity, 16)) && (!addInputToMachineList(tTileEntity, 16))){ if (aBaseMetaTileEntity.getBlockOffset(0, -2, i) != GregTech_API.sBlockCasings2) {return false;} if (aBaseMetaTileEntity.getMetaIDOffset(0, -2, i) != 0) {return false;} - } - - tTileEntity = aBaseMetaTileEntity.getIGregTechTileEntityOffset(xDir, 1, i); - if (!addEnergyInputToMachineList(tTileEntity, 16)){ + } + + tTileEntity = aBaseMetaTileEntity.getIGregTechTileEntityOffset(xDir, 1, i); + if (!addEnergyInputToMachineList(tTileEntity, 16)){ if (aBaseMetaTileEntity.getBlockOffset(xDir, 1, i) != GregTech_API.sBlockCasings2) {return false;} if (aBaseMetaTileEntity.getMetaIDOffset(xDir, 1, i) != 0) {return false;} - } - if(i!=0&&aBaseMetaTileEntity.getBlockOffset(xDir, 0, i)!=GregTech_API.sBlockCasings2&&aBaseMetaTileEntity.getMetaIDOffset(xDir, 0, i)!=9){return false;} - if(i!=0&&aBaseMetaTileEntity.getBlockOffset(xDir,-1, i)!=GregTech_API.sBlockCasings2&&aBaseMetaTileEntity.getMetaIDOffset(xDir,-1, i)!=5){return false;} + } + if(i!=0&&aBaseMetaTileEntity.getBlockOffset(xDir, 0, i)!=GregTech_API.sBlockCasings2&&aBaseMetaTileEntity.getMetaIDOffset(xDir, 0, i)!=9){return false;} + if(i!=0&&aBaseMetaTileEntity.getBlockOffset(xDir,-1, i)!=GregTech_API.sBlockCasings2&&aBaseMetaTileEntity.getMetaIDOffset(xDir,-1, i)!=5){return false;} - - if(aBaseMetaTileEntity.getBlockOffset(xDir*2, 0, i)!=GregTech_API.sBlockCasings3&&aBaseMetaTileEntity.getMetaIDOffset(xDir*2, 0, i)!=10){return false;} - if(!aBaseMetaTileEntity.getBlockOffset(xDir*2, -1, i).getUnlocalizedName().equals("blockAlloyGlass")){return false;} - tTileEntity = aBaseMetaTileEntity.getIGregTechTileEntityOffset(xDir*2, -2, i); - if ((!addMaintenanceToMachineList(tTileEntity, 16)) && (!addInputToMachineList(tTileEntity, 16))){ + + if(aBaseMetaTileEntity.getBlockOffset(xDir*2, 0, i)!=GregTech_API.sBlockCasings3&&aBaseMetaTileEntity.getMetaIDOffset(xDir*2, 0, i)!=10){return false;} + if(!aBaseMetaTileEntity.getBlockOffset(xDir*2, -1, i).getUnlocalizedName().equals("blockAlloyGlass")){return false;} + tTileEntity = aBaseMetaTileEntity.getIGregTechTileEntityOffset(xDir*2, -2, i); + if ((!addMaintenanceToMachineList(tTileEntity, 16)) && (!addInputToMachineList(tTileEntity, 16))){ if (aBaseMetaTileEntity.getBlockOffset(xDir*2, -2, i) != GregTech_API.sBlockCasings2) {return false;} if (aBaseMetaTileEntity.getMetaIDOffset(xDir*2, -2, i) != 0) {return false;} - } - tTileEntity = aBaseMetaTileEntity.getIGregTechTileEntityOffset(xDir, -2, i); - if (!addInputToMachineList(tTileEntity, 16)){ - if (!addOutputToMachineList(tTileEntity, 16)){;return false; - }else{if(r>0){return true;}else{return false;}} - } - } + } + tTileEntity = aBaseMetaTileEntity.getIGregTechTileEntityOffset(xDir, -2, i); + if (!addInputToMachineList(tTileEntity, 16)){ + if (!addOutputToMachineList(tTileEntity, 16)){;return false; + }else{if(r>0){return true;}else{return false;}} + } + } }else{ - for(int r = 0; r <= 16; r++){ - int i = r*-zDir; - - if(i!=0&&aBaseMetaTileEntity.getBlockOffset(i, 0, 0)!=GregTech_API.sBlockCasings3&&aBaseMetaTileEntity.getMetaIDOffset(i, 0, 0)!=10){return false;} - if(!aBaseMetaTileEntity.getBlockOffset(i, -1, 0).getUnlocalizedName().equals("blockAlloyGlass")){return false;} - IGregTechTileEntity tTileEntity = aBaseMetaTileEntity.getIGregTechTileEntityOffset(i, -2, 0); - if ((!addMaintenanceToMachineList(tTileEntity, 16)) && (!addInputToMachineList(tTileEntity, 16))){ + for(int r = 0; r <= 16; r++){ + int i = r*-zDir; + + if(i!=0&&aBaseMetaTileEntity.getBlockOffset(i, 0, 0)!=GregTech_API.sBlockCasings3&&aBaseMetaTileEntity.getMetaIDOffset(i, 0, 0)!=10){return false;} + if(!aBaseMetaTileEntity.getBlockOffset(i, -1, 0).getUnlocalizedName().equals("blockAlloyGlass")){return false;} + IGregTechTileEntity tTileEntity = aBaseMetaTileEntity.getIGregTechTileEntityOffset(i, -2, 0); + if ((!addMaintenanceToMachineList(tTileEntity, 16)) && (!addInputToMachineList(tTileEntity, 16))){ if (aBaseMetaTileEntity.getBlockOffset(i, -2, 0) != GregTech_API.sBlockCasings2) {return false;} if (aBaseMetaTileEntity.getMetaIDOffset(i, -2, 0) != 0) {return false;} - } - - tTileEntity = aBaseMetaTileEntity.getIGregTechTileEntityOffset(i, 1, zDir); - if (!addEnergyInputToMachineList(tTileEntity, 16)){ + } + + tTileEntity = aBaseMetaTileEntity.getIGregTechTileEntityOffset(i, 1, zDir); + if (!addEnergyInputToMachineList(tTileEntity, 16)){ if (aBaseMetaTileEntity.getBlockOffset(i, 1, zDir) != GregTech_API.sBlockCasings2) {return false;} if (aBaseMetaTileEntity.getMetaIDOffset(i, 1, zDir) != 0) {return false;} - } - if(i!=0&&aBaseMetaTileEntity.getBlockOffset(i, 0, zDir)!=GregTech_API.sBlockCasings2&&aBaseMetaTileEntity.getMetaIDOffset(i, 0, zDir)!=9){return false;} - if(i!=0&&aBaseMetaTileEntity.getBlockOffset(i,-1, zDir)!=GregTech_API.sBlockCasings2&&aBaseMetaTileEntity.getMetaIDOffset(i,-1, zDir)!=5){return false;} + } + if(i!=0&&aBaseMetaTileEntity.getBlockOffset(i, 0, zDir)!=GregTech_API.sBlockCasings2&&aBaseMetaTileEntity.getMetaIDOffset(i, 0, zDir)!=9){return false;} + if(i!=0&&aBaseMetaTileEntity.getBlockOffset(i,-1, zDir)!=GregTech_API.sBlockCasings2&&aBaseMetaTileEntity.getMetaIDOffset(i,-1, zDir)!=5){return false;} - - if(aBaseMetaTileEntity.getBlockOffset(i, 0, zDir*2)!=GregTech_API.sBlockCasings3&&aBaseMetaTileEntity.getMetaIDOffset(i, 0, zDir*2)!=10){return false;} - if(!aBaseMetaTileEntity.getBlockOffset(i, -1, zDir*2).getUnlocalizedName().equals("blockAlloyGlass")){return false;} - tTileEntity = aBaseMetaTileEntity.getIGregTechTileEntityOffset(i, -2, zDir*2); - if ((!addMaintenanceToMachineList(tTileEntity, 16)) && (!addInputToMachineList(tTileEntity, 16))){ + + if(aBaseMetaTileEntity.getBlockOffset(i, 0, zDir*2)!=GregTech_API.sBlockCasings3&&aBaseMetaTileEntity.getMetaIDOffset(i, 0, zDir*2)!=10){return false;} + if(!aBaseMetaTileEntity.getBlockOffset(i, -1, zDir*2).getUnlocalizedName().equals("blockAlloyGlass")){return false;} + tTileEntity = aBaseMetaTileEntity.getIGregTechTileEntityOffset(i, -2, zDir*2); + if ((!addMaintenanceToMachineList(tTileEntity, 16)) && (!addInputToMachineList(tTileEntity, 16))){ if (aBaseMetaTileEntity.getBlockOffset(i, -2, zDir*2) != GregTech_API.sBlockCasings2) {return false;} if (aBaseMetaTileEntity.getMetaIDOffset(i, -2, zDir*2) != 0) {return false;} - } - tTileEntity = aBaseMetaTileEntity.getIGregTechTileEntityOffset(i, -2, zDir); - if (!addInputToMachineList(tTileEntity, 16)){ - if (!addOutputToMachineList(tTileEntity, 16)){ - }else{if(r>0){return true;}else{return false;}} - } - } - } + } + tTileEntity = aBaseMetaTileEntity.getIGregTechTileEntityOffset(i, -2, zDir); + if (!addInputToMachineList(tTileEntity, 16)){ + if (!addOutputToMachineList(tTileEntity, 16)){ + }else{if(r>0){return true;}else{return false;}} + } + } + } return false; } @@ -227,4 +227,4 @@ public class GT_MetaTileEntity_AssemblyLine public boolean explodesOnComponentBreak(ItemStack aStack) { return false; } -} +} \ No newline at end of file diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_BronzeBlastFurnace.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_BronzeBlastFurnace.java index fd3546f9..f0056379 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_BronzeBlastFurnace.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_BronzeBlastFurnace.java @@ -43,7 +43,11 @@ public class GT_MetaTileEntity_BronzeBlastFurnace } public String[] getDescription() { - return new String[]{"To get your first Steel", "Multiblock: 3x3x4 hollow with opening on top", "32 Bronze Plated Bricks required"}; + return new String[]{ + "Controller Block for the Bronze Blast Furnace", + "How to get your first Steel", + "Size(WxHxD): 3x4x3 (Hollow, with opening on top)", + "Bronze Plated Bricks for the rest (32 at least!)"}; } public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone) { @@ -338,4 +342,4 @@ public class GT_MetaTileEntity_BronzeBlastFurnace public byte getTileEntityBaseType() { return 0; } -} +} \ No newline at end of file diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_Charcoal_Pit.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_Charcoal_Pit.java index edd98c50..24394ddd 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_Charcoal_Pit.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_Charcoal_Pit.java @@ -36,14 +36,14 @@ public class GT_MetaTileEntity_Charcoal_Pit extends GT_MetaTileEntity_MultiBlock } public String[] getDescription() { - return new String[]{"Charcoal pit controller", - "Place on top of a pile of wood logs", - "Maximum size of logs below 11x11x5", - "No air beween logs alowed", - "Sides and top must be dirt or grass", - "Below logs must be bricks", - "No other blocks can touch logs", - "Turns logs into Brittle Charcoal blocks"}; + return new String[]{ + "Controller for the Charcoal Pit", + "Converts Logs into Brittle Charcoal blocks", + "Max Size(WxHxD): 11x6x11, Controller (Top layer, centered)", + "11x1x11 of Bricks (Bottom layer only)", + "11x5x11 of Logs (Above bottom Brick layer)", + "Only grass/dirt can touch Log blocks", + "No air between logs allowed"}; } public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone) { @@ -184,7 +184,7 @@ public class GT_MetaTileEntity_Charcoal_Pit extends GT_MetaTileEntity_MultiBlock if (p6) aList2.add(new ChunkPosition(aX, aY, aZ - 1)); return true; } - + public boolean isWoodLog(Block log){ String tTool = log.getHarvestTool(0); return OrePrefixes.log.contains(new ItemStack(log, 1))&& ((tTool != null) && (tTool.equals("axe"))) || (log.getMaterial() == Material.wood); @@ -219,4 +219,4 @@ public class GT_MetaTileEntity_Charcoal_Pit extends GT_MetaTileEntity_MultiBlock public boolean explodesOnComponentBreak(ItemStack aStack) { return false; } -} +} \ No newline at end of file diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DistillationTower.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DistillationTower.java index 15e1de6d..4d491725 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DistillationTower.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DistillationTower.java @@ -41,11 +41,12 @@ public class GT_MetaTileEntity_DistillationTower public String[] getDescription() { return new String[]{ "Controller Block for the Distillation Tower", - "Size: 3x3x6 (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)", + "Size(WxHxD): 3x6x3 (Hollow), Controller (Front bottom)", + "1x Input Hatch (Any bottom layer casing)", + "5x Output Hatch (Any casing besides bottom layer)", + "1x Output Bus (Any bottom layer casing)", + "1x Maintenance Hatch (Any casing)", + "1x Energy Hatch (Any casing)", "Clean Stainless Steel Casings for the rest (26 at least!)"}; } @@ -87,12 +88,12 @@ public class GT_MetaTileEntity_DistillationTower } } } - + long tVoltage = getMaxInputVoltage(); byte tTier = (byte) Math.max(1, GT_Utility.getTier(tVoltage)); FluidStack[] tFluids = (FluidStack[]) Arrays.copyOfRange(tFluidList.toArray(new FluidStack[tFluidList.size()]), 0, 1); if (tFluids.length > 0) { - GT_Recipe tRecipe = GT_Recipe.GT_Recipe_Map.sDistillationRecipes.findRecipe(getBaseMetaTileEntity(), false, gregtech.api.enums.GT_Values.V[tTier], tFluids, new ItemStack[]{}); + GT_Recipe tRecipe = GT_Recipe.GT_Recipe_Map.sDistillationRecipes.findRecipe(getBaseMetaTileEntity(), false, gregtech.api.enums.GT_Values.V[tTier], tFluids, new ItemStack[]{}); if (tRecipe != null) { if (tRecipe.isRecipeInputEqual(true, tFluids, new ItemStack[]{})) { this.mEfficiency = (10000 - (getIdealStatus() - getRepairStatus()) * 1000); @@ -114,7 +115,7 @@ public class GT_MetaTileEntity_DistillationTower this.mMaxProgresstime = Math.max(1, this.mMaxProgresstime); this.mOutputItems = new ItemStack[]{tRecipe.getOutput(0)}; this.mOutputFluids = tRecipe.mFluidOutputs.clone(); - ArrayUtils.reverse(mOutputFluids); + ArrayUtils.reverse(mOutputFluids); updateSlots(); return true; } diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ElectricBlastFurnace.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ElectricBlastFurnace.java index 0c6463fc..bdeaa4f2 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ElectricBlastFurnace.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ElectricBlastFurnace.java @@ -35,7 +35,16 @@ public class GT_MetaTileEntity_ElectricBlastFurnace } public String[] getDescription() { - return new String[]{"Controller Block for the Blast Furnace", "Size: 3x3x4 (Hollow)", "Controller (front middle at bottom)", "16x Heating Coils (two middle Layers, hollow)", "1x Input (one of bottom)", "1x Output (one of bottom)", "1x Energy Hatch (one of bottom)", "1x Maintenance Hatch (one of bottom)", "1x Muffler Hatch (top middle)", "Heat Proof Machine Casings for the rest"}; + return new String[]{ + "Controller Block for the Blast Furnace", + "Size(WxHxD): 3x4x3 (Hollow), Controller (Front middle bottom)", + "16x Heating Coils (Two middle Layers, hollow)", + "1x Input (Any bottom layer casing)", + "1x Output (Any bottom layer casing)", + "1x Energy Hatch (Any bottom layer casing)", + "1x Maintenance Hatch (Any bottom layer casing)", + "1x Muffler Hatch (Top middle)", + "Heat Proof Machine Casings for the rest"}; } public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone) { @@ -210,4 +219,4 @@ public class GT_MetaTileEntity_ElectricBlastFurnace public boolean explodesOnComponentBreak(ItemStack aStack) { return false; } -} +} \ No newline at end of file diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer.java index f6edc08e..7d950a49 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer.java @@ -440,4 +440,28 @@ public abstract class GT_MetaTileEntity_FusionComputer extends GT_MetaTileEntity public boolean explodesOnComponentBreak(ItemStack aStack) { return false; } + + @Override + public String[] getInfoData() { + String tier = tier() == 6 ? "I" : tier() == 7 ? "II" : "III"; + float plasmaOut = 0; + int powerRequired = 0; + if (this.mLastRecipe != null) { + powerRequired = this.mLastRecipe.mEUt; + if (this.mLastRecipe.getFluidOutput(0) != null) { + plasmaOut = (float)this.mLastRecipe.getFluidOutput(0).amount / (float)this.mLastRecipe.mDuration; + } + } + + return new String[]{ + "Fusion Reactor MK "+tier, + "EU Required: "+powerRequired+"EU/t", + "Stored EU: "+mEUStore+" / "+maxEUStore(), + "Plasma Output: "+plasmaOut+"L/t"}; + } + + @Override + public boolean isGivingInformation() { + return true; + } } \ No newline at end of file diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_HeatExchanger.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_HeatExchanger.java index a1d94e42..0127a433 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_HeatExchanger.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_HeatExchanger.java @@ -37,16 +37,15 @@ public class GT_MetaTileEntity_HeatExchanger extends GT_MetaTileEntity_MultiBloc public String[] getDescription() { return new String[]{ - "Controller Block for the Heat Exchanger", - "Size: 3x3x4", - "Controller (front middle at bottom)", - "3x3x4 of Stable Titanium Casing (hollow, Min 24!)", - "2 Titanium Pipe Casing Blocks inside the Hollow Casing", - "1x Distillated Water Input (one of the Casings)", - "min 1 Steam Output (one of the Casings)", - "1x Maintenance Hatch (one of the Casings)", - "1x Hot Fluid Input (botton Center)", - "1x Cold Fluid Output (top Center)"}; + "Controller Block for the Heat Exchanger", + "Size(WxHxD): 3x4x3, Controller (Front middle at bottom)", + "3x3x4 of Stable Titanium Casing (hollow, Min 24!)", + "2 Titanium Pipe Casing Blocks (Inside the Hollow Casing)", + "1x Distillated Water Input (Any casing)", + "min 1 Steam Output (Any casing)", + "1x Hot Fluid Input (Bottom center)", + "1x Cold Fluid Output (Top Center)", + "1x Maintenance Hatch (Any casing)"}; } @Override @@ -288,4 +287,4 @@ public class GT_MetaTileEntity_HeatExchanger extends GT_MetaTileEntity_MultiBloc public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { return new GT_MetaTileEntity_HeatExchanger(this.mName); } -} +} \ No newline at end of file diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ImplosionCompressor.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ImplosionCompressor.java index a6118435..6d61e2b0 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ImplosionCompressor.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ImplosionCompressor.java @@ -33,7 +33,15 @@ public class GT_MetaTileEntity_ImplosionCompressor } public String[] getDescription() { - return new String[]{"Controller Block for the Implosion Compressor", "Size: 3x3x3 (Hollow)", "Controller (front centered)", "1x Input (anywhere)", "1x Output (anywhere)", "1x Energy Hatch (anywhere)", "1x Maintenance Hatch (anywhere)", "1x Muffler Hatch (anywhere)", "Solid Steel Casings for the rest (16 at least!)"}; + return new String[]{ + "Controller Block for the Implosion Compressor", + "Size(WxHxD): 3x3x3 (Hollow), Controller (Front centered)", + "1x Input Bus (Any casing)", + "1x Output Bus (Any casing)", + "1x Maintenance Hatch (Any casing)", + "1x Muffler Hatch (Any casing)", + "1x Energy Hatch (Any casing)", + "Solid Steel Casings for the rest (16 at least!)"}; } public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone) { @@ -144,4 +152,4 @@ public class GT_MetaTileEntity_ImplosionCompressor public boolean explodesOnComponentBreak(ItemStack aStack) { return false; } -} +} \ No newline at end of file diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler.java index ea4e6ce9..51715a54 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler.java @@ -32,7 +32,18 @@ public abstract class GT_MetaTileEntity_LargeBoiler } public String[] getDescription() { - return new String[]{"Controller Block for the Large Boiler", "Size: 3x3x5", "Controller (front middle in Fireboxes)", "3x3 of Fire Boxes (bottom Layer, Min 3!)", "3x3x4 of Casing (above Fireboxes, hollow, Min 24!)", "3 Pipe Casing Blocks inside the Hollow Casing", "1x Input (one of Fireboxes)", "1x Maintenance Hatch (one of Fireboxes)", "1x Muffler Hatch (one of Fireboxes)", "1x Fluid Output (one of Main Casing)","Produces "+getEUt()*40+"L/sec steam","Runs "+(runtimeBoost(20)/20f)+" sec per coal of fuel","Refined liquid fuels have 1/4 efficiency"}; + return new String[]{ + "Controller Block for the Large Boiler", + "Produces "+(getEUt()*40)*(runtimeBoost(20)/20f)+"L of Steam/sec for 1 Coal", + "Size(WxHxD): 3x5x3, Controller (Front middle in Fireboxes)", + "3x1x3 of Fire Boxes (Bottom layer, Min 3)", + "3x4x3 of Casing (Above Fireboxes, hollow, Min 24!)", + "3 Pipe Casing Blocks (Inside the Hollow Casing)", + "1x Input Hatch/Bus (Any Firebox)", + "1x Output Hatch (Any Firebox)", + "1x Maintenance Hatch (Any Firebox)", + "1x Muffler Hatch (Any Firebox)", + "Refined liquid fuels have 1/4 efficiency"}; } public abstract Block getCasingBlock(); @@ -227,4 +238,4 @@ public abstract class GT_MetaTileEntity_LargeBoiler public boolean explodesOnComponentBreak(ItemStack aStack) { return false; } -} +} \ No newline at end of file diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine.java index 14098be2..458b65bd 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine.java @@ -20,6 +20,8 @@ public abstract class GT_MetaTileEntity_LargeTurbine extends GT_MetaTileEntity_M protected int baseEff = 0; protected int optFlow = 0; + protected int realOptFlow = 0; + protected int storedFluid = 0; protected int counter = 0; public GT_MetaTileEntity_LargeTurbine(int aID, String aName, String aNameRegional) { @@ -33,7 +35,7 @@ public abstract class GT_MetaTileEntity_LargeTurbine extends GT_MetaTileEntity_M public boolean isCorrectMachinePart(ItemStack aStack) { return getMaxEfficiency(aStack) > 0; } - + public Object getClientGUI(int aID, InventoryPlayer aPlayerInventory, IGregTechTileEntity aBaseMetaTileEntity) { return new GT_GUIContainer_MultiMachine(aPlayerInventory, aBaseMetaTileEntity, getLocalName(), "LargeTurbine.png"); } @@ -190,29 +192,31 @@ public abstract class GT_MetaTileEntity_LargeTurbine extends GT_MetaTileEntity_M public boolean explodesOnComponentBreak(ItemStack aStack) { return true; } - + @Override public String[] getInfoData() { - String tRunning = mMaxProgresstime>0 ? "Turbine running":"Turbine stopped"; - String tMaintainance = getIdealStatus() == getRepairStatus() ? "No Maintainance issues" : "Needs Maintainance" ; - int tDura = 0; - - if (mInventory[1] != null && mInventory[1].getItem() instanceof GT_MetaGenerated_Tool_01) { - tDura = (int) ((100.0f / GT_MetaGenerated_Tool.getToolMaxDamage(mInventory[1]) * (GT_MetaGenerated_Tool.getToolDamage(mInventory[1]))+1)); - } - + String tRunning = mMaxProgresstime>0 ? "Turbine running":"Turbine stopped"; + String tMaintainance = getIdealStatus() == getRepairStatus() ? "No Maintainance issues" : "Needs Maintainance" ; + int tDura = 0; + + if (mInventory[1] != null && mInventory[1].getItem() instanceof GT_MetaGenerated_Tool_01) { + tDura = (int) ((100.0f / GT_MetaGenerated_Tool.getToolMaxDamage(mInventory[1]) * (GT_MetaGenerated_Tool.getToolDamage(mInventory[1]))+1)); + } + return new String[]{ "Large Turbine", tRunning, - "Current output: "+mEUt+" EU/t", - "Current speed: "+(mEfficiency/100)+"%", - tMaintainance, - "Turbine Damage: "+tDura+"%"}; + "Current Output: "+mEUt+" EU/t", + "Optimal Flow: "+realOptFlow+" L/t", + "Fuel Remaining: "+storedFluid+"L", + "Current Speed: "+(mEfficiency/100)+"%", + "Turbine Damage: "+tDura+"%", + tMaintainance}; } @Override public boolean isGivingInformation() { return true; } - -} + +} \ No newline at end of file diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Gas.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Gas.java index a914ab3a..0e59e9e9 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Gas.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Gas.java @@ -35,13 +35,13 @@ public class GT_MetaTileEntity_LargeTurbine_Gas extends GT_MetaTileEntity_LargeT public String[] getDescription() { return new String[]{ "Controller Block for the Large Gas Turbine", - "Size: 3x4x3 (Hollow)", "Controller (front centered)", - "1x Input Hatch (side centered)", - "1x Dynamo Hatch (back centered)", - "1x Maintenance Hatch (side centered)", - "1x Muffler Hatch (side centered)", - "Stainless Steel Turbine Casings for the rest (24 at least!)", - "Needs a Turbine Item (inside controller GUI)"}; + "Size(WxHxD): 3x3x4 (Hollow), Controller (Front centered)", + "1x Input Hatch (Side centered)", + "1x Maintenance Hatch (Side centered)", + "1x Muffler Hatch (Side centered)", + "1x Dynamo Hatch (Back centered)", + "Titanium Turbine Casings for the rest (24 at least!)", + "Needs a Turbine Item (Inside controller GUI)"}; } public int getFuelValue(FluidStack aLiquid) { @@ -89,6 +89,7 @@ public class GT_MetaTileEntity_LargeTurbine_Gas extends GT_MetaTileEntity_LargeT FluidStack firstFuelType = new FluidStack(aFluids.get(0), 0); // Identify a SINGLE type of fluid to process. Doesn't matter which one. Ignore the rest! int fuelValue = getFuelValue(firstFuelType); actualOptimalFlow = (int) (aOptFlow / fuelValue); + this.realOptFlow = actualOptimalFlow; int remainingFlow = (int) (actualOptimalFlow * 1.25f); // Allowed to use up to 125% of optimal flow. Variable required outside of loop for multi-hatch scenarios. int flow = 0; @@ -99,6 +100,7 @@ public class GT_MetaTileEntity_LargeTurbine_Gas extends GT_MetaTileEntity_LargeT flow = aFluids.get(i).amount; // Get all (steam) in hatch flow = Math.min(flow, Math.min(remainingFlow, (int) (actualOptimalFlow * 1.25f))); // try to use up to 125% of optimal flow w/o exceeding remainingFlow depleteInput(new FluidStack(aFluids.get(i), flow)); // deplete that amount + this.storedFluid = aFluids.get(i).amount; remainingFlow -= flow; // track amount we're allowed to continue depleting from hatches totalFlow += flow; // track total input used } @@ -124,4 +126,4 @@ public class GT_MetaTileEntity_LargeTurbine_Gas extends GT_MetaTileEntity_LargeT } -} +} \ No newline at end of file diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_HPSteam.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_HPSteam.java index 7befab00..3321efd9 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_HPSteam.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_HPSteam.java @@ -34,12 +34,13 @@ public class GT_MetaTileEntity_LargeTurbine_HPSteam extends GT_MetaTileEntity_La public String[] getDescription() { return new String[]{ "Controller Block for the Large High Pressure Steam Turbine", - "Size: 3x4x3 (Hollow)", "Controller (front centered)", - "1x Input Hatch (side centered)", "1x Output Hatch(side centered)", - "1x Dynamo Hatch (back centered)", - "1x Maintenance Hatch (side centered)", + "Size(WxHxD): 3x3x4 (Hollow), Controller (Front centered)", + "1x Input Hatch (Side centered)", + "1x Maintenance Hatch (Side centered)", + "1x Muffler Hatch (Side centered)", + "1x Dynamo Hatch (Back centered)", "Stainless Steel Turbine Casings for the rest (24 at least!)", - "Needs a Turbine Item (inside controller GUI)"}; + "Needs a Turbine Item (Inside controller GUI)"}; } @Override @@ -73,13 +74,15 @@ public class GT_MetaTileEntity_LargeTurbine_HPSteam extends GT_MetaTileEntity_La int totalFlow = 0; // Byproducts are based on actual flow int flow = 0; int remainingFlow = (int) (aOptFlow * 1.25f); // Allowed to use up to 125% of optimal flow + this.realOptFlow = (aOptFlow / 2); for (int i = 0; i < aFluids.size() && remainingFlow > 0; i++) { - String fluidName = aFluids.get(i).getFluid().getUnlocalizedName(aFluids.get(i)); + String fluidName = aFluids.get(i).getFluid().getUnlocalizedName(aFluids.get(i)); if (fluidName.equals("ic2.fluidSuperheatedSteam")) { flow = aFluids.get(i).amount; // Get all (steam) in hatch flow = Math.min(flow, Math.min(remainingFlow, (int) (aOptFlow * 1.25f))); // try to use up to 125% of optimal flow w/o exceeding remainingFlow depleteInput(new FluidStack(aFluids.get(i), flow)); // deplete that amount + this.storedFluid = aFluids.get(i).amount; remainingFlow -= flow; // track amount we're allowed to keep depleting from hatches totalFlow += flow; // track total used if (!achievement) { @@ -90,7 +93,7 @@ public class GT_MetaTileEntity_LargeTurbine_HPSteam extends GT_MetaTileEntity_La achievement = true; } }else if(fluidName.equals("fluid.steam") || fluidName.equals("ic2.fluidSteam") || fluidName.equals("fluid.mfr.steam.still.name")){ - depleteInput(new FluidStack(aFluids.get(i), aFluids.get(i).amount)); + depleteInput(new FluidStack(aFluids.get(i), aFluids.get(i).amount)); } } @@ -109,4 +112,4 @@ public class GT_MetaTileEntity_LargeTurbine_HPSteam extends GT_MetaTileEntity_La } -} +} \ No newline at end of file diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Plasma.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Plasma.java index c72e8807..2880c609 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Plasma.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Plasma.java @@ -35,12 +35,13 @@ public class GT_MetaTileEntity_LargeTurbine_Plasma extends GT_MetaTileEntity_Lar public String[] getDescription() { return new String[]{ "Controller Block for the Large Plasma Generator", - "Size: 3x4x3 (Hollow)", "Controller (front centered)", - "1x Input Hatch (side centered)", - "1x Dynamo Hatch (back centered)", - "1x Maintenance Hatch (side centered)", + "Size(WxHxD): 3x3x4 (Hollow), Controller (Front centered)", + "1x Input Hatch (Side centered)", + "1x Maintenance Hatch (Side centered)", + "1x Muffler Hatch (Side centered)", + "1x Dynamo Hatch (Back centered)", "Tungstensteel Turbine Casings for the rest (24 at least!)", - "Needs a Turbine Item (inside controller GUI)"}; + "Needs a Turbine Item (Inside controller GUI)"}; } public int getFuelValue(FluidStack aLiquid) { @@ -90,6 +91,7 @@ public class GT_MetaTileEntity_LargeTurbine_Plasma extends GT_MetaTileEntity_Lar FluidStack firstFuelType = new FluidStack(aFluids.get(0), 0); // Identify a SINGLE type of fluid to process. Doesn't matter which one. Ignore the rest! int fuelValue = getFuelValue(firstFuelType); actualOptimalFlow = (int) ((aOptFlow + fuelValue - 1) / fuelValue); + this.realOptFlow = (aOptFlow / fuelValue); // For scanner info int remainingFlow = (int) (actualOptimalFlow * 1.25f); // Allowed to use up to 125% of optimal flow. Variable required outside of loop for multi-hatch scenarios. int flow = 0; @@ -100,6 +102,7 @@ public class GT_MetaTileEntity_LargeTurbine_Plasma extends GT_MetaTileEntity_Lar flow = aFluids.get(i).amount; // Get all (steam) in hatch flow = Math.min(flow, Math.min(remainingFlow, (int) (actualOptimalFlow * 1.25f))); // try to use up to 125% of optimal flow w/o exceeding remainingFlow depleteInput(new FluidStack(aFluids.get(i), flow)); // deplete that amount + this.storedFluid = aFluids.get(i).amount; remainingFlow -= flow; // track amount we're allowed to continue depleting from hatches totalFlow += flow; // track total input used } @@ -125,4 +128,4 @@ public class GT_MetaTileEntity_LargeTurbine_Plasma extends GT_MetaTileEntity_Lar } -} +} \ No newline at end of file diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Steam.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Steam.java index 534f53c3..6cf3897e 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Steam.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Steam.java @@ -36,12 +36,13 @@ public class GT_MetaTileEntity_LargeTurbine_Steam extends GT_MetaTileEntity_Larg public String[] getDescription() { return new String[]{ "Controller Block for the Large Steam Turbine", - "Size: 3x4x3 (Hollow)", "Controller (front centered)", - "1x Input Hatch (side centered)", "1x Output Hatch(side centered)", - "1x Dynamo Hatch (back centered)", - "1x Maintenance Hatch (side centered)", + "Size(WxHxD): 3x3x4 (Hollow), Controller (Front centered)", + "1x Input Hatch (Side centered)", + "1x Maintenance Hatch (Side centered)", + "1x Muffler Hatch (Side centered)", + "1x Dynamo Hatch (Back centered)", "Turbine Casings for the rest (24 at least!)", - "Needs a Turbine Item (inside controller GUI)"}; + "Needs a Turbine Item (Inside controller GUI)"}; } @Override @@ -82,6 +83,7 @@ public class GT_MetaTileEntity_LargeTurbine_Steam extends GT_MetaTileEntity_Larg int totalFlow = 0; // Byproducts are based on actual flow int flow = 0; int remainingFlow = (int) (aOptFlow * 1.25f); // Allowed to use up to 125% of optimal flow. Variable required outside of loop for multi-hatch scenarios. + this.realOptFlow = ((aOptFlow / 2) / 2); for (int i = 0; i < aFluids.size() && remainingFlow > 0; i++) { // loop through each hatch; extract inputs and track totals. String fluidName = aFluids.get(i).getFluid().getUnlocalizedName(aFluids.get(i)); @@ -89,6 +91,7 @@ public class GT_MetaTileEntity_LargeTurbine_Steam extends GT_MetaTileEntity_Larg flow = aFluids.get(i).amount; // Get all (steam) in hatch flow = Math.min(flow, Math.min(remainingFlow, (int) (aOptFlow * 1.25f))); // try to use up to 125% of optimal flow w/o exceeding remainingFlow depleteInput(new FluidStack(aFluids.get(i), flow)); // deplete that amount + this.storedFluid = aFluids.get(i).amount; remainingFlow -= flow; // track amount we're allowed to continue depleting from hatches totalFlow += flow; // track total input used if (!achievement) { @@ -115,4 +118,4 @@ public class GT_MetaTileEntity_LargeTurbine_Steam extends GT_MetaTileEntity_Larg return tEU; } -} +} \ No newline at end of file diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_MultiFurnace.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_MultiFurnace.java index 77698c07..70a7249c 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_MultiFurnace.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_MultiFurnace.java @@ -34,7 +34,17 @@ public class GT_MetaTileEntity_MultiFurnace } public String[] getDescription() { - return new String[]{"Smelts up to 6-18 Items at once", "Controller Block for the Multi Smelter", "Size: 3x3x3 (Hollow)", "Controller (front middle at bottom)", "8x Heating Coils (middle Layer, hollow)", "1x Input (one of bottom)", "1x Output (one of bottom)", "1x Energy Hatch (one of bottom)", "1x Maintenance Hatch (one of bottom)", "1x Muffler Hatch (top middle)", "Heat Proof Machine Casings for the rest"}; + return new String[]{ + "Controller Block for the Multi Smelter", + "Smelts up to 6-18 Items at once", + "Size(WxHxD): 3x3x3 (Hollow), Controller (Front middle at bottom)", + "8x Heating Coils (Middle layer, hollow)", + "1x Input Bus (One of bottom)", + "1x Output Bus (One of bottom)", + "1x Maintenance Hatch (One of bottom)", + "1x Muffler Hatch (Top middle)", + "1x Energy Hatch (One of bottom)", + "Heat Proof Machine Casings for the rest",}; } public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone) { @@ -164,4 +174,4 @@ public class GT_MetaTileEntity_MultiFurnace public boolean explodesOnComponentBreak(ItemStack aStack) { return false; } -} +} \ No newline at end of file diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilCracker.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilCracker.java index 64f77047..df625718 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilCracker.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilCracker.java @@ -33,16 +33,15 @@ public class GT_MetaTileEntity_OilCracker extends GT_MetaTileEntity_MultiBlockBa return new String[]{ "Controller Block for the Oil Cracking Unit", "Cracks heavy oil into lighter parts", - "Size: 3 high, 3 deep, 5 wide", - "Controller (front center)", - "Made from Clean Stainless Steel Casings (18 at least!)", - "On both sides of the Controller each", - "a ring of 8 Cupronickel Coils", - "2 Blocks left Input Hatch and 8 Casings", - "2 Blocks right Output Hatch and 8 Casings", - "beween coils: Controller, second input Hatch", - "Add steam for lower energy cost(50%) or Hydrogen for bonus output(30%)", - "Maintainance Hatch and Energy Hatch"}; + "Size(WxHxD): 5x3x3 (Hollow), Controller (Front center)", + "Ring of 8 Cupronickel Coils (Each side of Controller)", + "1x Input Hatch (Left side middle)", + "1x Input Hatch (Any middle ring casing)", + "1x Output Hatch (Right side middle)", + "1x Maintenance Hatch (Any casing)", + "1x Energy Hatch (Any casing)", + "Clean Stainless Steel Casings for the rest (18 at least!)", + "Optional Steam(50% less EU/t) or Hydrogen(30% more output)"}; } public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone) { @@ -52,7 +51,7 @@ public class GT_MetaTileEntity_OilCracker extends GT_MetaTileEntity_MultiBlockBa } return new ITexture[]{Textures.BlockIcons.CASING_BLOCKS[49]}; } - + public Object getClientGUI(int aID, InventoryPlayer aPlayerInventory, IGregTechTileEntity aBaseMetaTileEntity) { return new GT_GUIContainer_MultiMachine(aPlayerInventory, aBaseMetaTileEntity, getLocalName(), "OilCrackingUnit.png"); } @@ -247,4 +246,4 @@ public class GT_MetaTileEntity_OilCracker extends GT_MetaTileEntity_MultiBlockBa return new GT_MetaTileEntity_OilCracker(this.mName); } -} +} \ No newline at end of file diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilDrill.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilDrill.java index e5d4f60d..f7973c80 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilDrill.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilDrill.java @@ -33,12 +33,13 @@ public class GT_MetaTileEntity_OilDrill extends GT_MetaTileEntity_MultiBlockBase public String[] getDescription() { return new String[]{ "Controller Block for the Oil Drilling Rig", - "Size: 3x3x7", "Controller (front middle at bottom)", - "3x3 Base of Solid Steel Casings", - "Also part of Base: Energy Input Hatch", - "Fluid Output Hatch and Maintainance Hatch", - "3x Solid Steel Casings on top the Center of the base", - "Steel Frame Boxes on each side and 3 more on top"}; + "Size(WxHxD): 3x7x3", "Controller (Front middle at bottom)", + "3x1x3 Base of Solid Steel Casings", + "1x3x1 Solid Steel Casing pillar (Center of base)", + "1x3x1 Steel Frame Boxes (Each Steel pillar side and on top)", + "1x Output Hatch (One of base casings)", + "1x Maintenance Hatch (One of base casings)", + "1x Energy Hatch (One of base casings)"}; } public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone) { @@ -47,7 +48,7 @@ public class GT_MetaTileEntity_OilDrill extends GT_MetaTileEntity_MultiBlockBase } return new ITexture[]{Textures.BlockIcons.CASING_BLOCKS[16]}; } - + public Object getClientGUI(int aID, InventoryPlayer aPlayerInventory, IGregTechTileEntity aBaseMetaTileEntity) { return new GT_GUIContainer_MultiMachine(aPlayerInventory, aBaseMetaTileEntity, getLocalName(), "DrillingRig.png"); } @@ -233,4 +234,4 @@ public class GT_MetaTileEntity_OilDrill extends GT_MetaTileEntity_MultiBlockBase return new GT_MetaTileEntity_OilDrill(this.mName); } -} +} \ No newline at end of file diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ProcessingArray.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ProcessingArray.java index 81259fbe..bedc4d65 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ProcessingArray.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ProcessingArray.java @@ -37,16 +37,16 @@ public class GT_MetaTileEntity_ProcessingArray extends GT_MetaTileEntity_MultiBl } public String[] getDescription() { - 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)", + return new String[]{ + "Controller Block for the Processing Array", + "Runs supplied machines as if placed in the world", + "Size(WxHxD): 3x3x3 (Hollow), Controller (Front centered)", + "1x Input Hatch/Bus (Any casing)", + "1x Output Hatch/Bus (Any casing)", + "1x Maintenance Hatch (Any casing)", + "1x Energy Hatch (Any casing)", "Robust Tungstensteel Casings for the rest (16 at least!)", - "Place up to 16 Single Block GT Machines into the GUI Inventory", - "They will work the same way as placed directly in world"}; + "Place up to 16 Single Block GT Machines into the GUI Inventory"}; } public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone) { diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PyrolyseOven.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PyrolyseOven.java index 8ab62e07..463fb144 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PyrolyseOven.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PyrolyseOven.java @@ -31,13 +31,15 @@ public class GT_MetaTileEntity_PyrolyseOven extends GT_MetaTileEntity_MultiBlock return new String[]{ "Controller Block for the Pyrolyse Oven", "Industrial Charcoal producer and Oil from Plants", - "Size: 5x5x4, Controller (bottom center)", - "Made from ULV Machine Casings (min 60)", - "Bottom 3x3 Kantal Heating Coils", - "4 high ULV Casings around the coils", - "bottom row of casings are Energy Hatch", - "Maintainance Hatch and Output Hatch/Bus", - "top 3x3 has Input Hatch/Bus and Muffler Hatch"}; + "Size(WxHxD): 5x4x5, Controller (Bottom center)", + "3x1x3 Kanthal Heating Coils (Inside bottom 5x1x5 layer)", + "9x Kanthal Heating Coils (Centered 3x1x3 area in Bottom layer)", + "1x Input Hatch/Bus (Centered 3x1x3 area in Top layer)", + "1x Output Hatch/Bus (Any bottom layer casing)", + "1x Maintenance Hatch (Any bottom layer casing)", + "1x Muffler Hatch (Centered 3x1x3 area in Top layer)", + "1x Energy Hatch (Any bottom layer casing)", + "ULV Machine Casings for the rest (60 at least!)"}; } public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone) { @@ -47,7 +49,7 @@ public class GT_MetaTileEntity_PyrolyseOven extends GT_MetaTileEntity_MultiBlock } return new ITexture[]{Textures.BlockIcons.CASING_BLOCKS[0]}; } - + public Object getClientGUI(int aID, InventoryPlayer aPlayerInventory, IGregTechTileEntity aBaseMetaTileEntity) { return new GT_GUIContainer_MultiMachine(aPlayerInventory, aBaseMetaTileEntity, getLocalName(), "PyrolyseOven.png"); } @@ -174,4 +176,4 @@ public class GT_MetaTileEntity_PyrolyseOven extends GT_MetaTileEntity_MultiBlock return new GT_MetaTileEntity_PyrolyseOven(this.mName); } -} +} \ No newline at end of file diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_VacuumFreezer.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_VacuumFreezer.java index e222584d..9c1d5399 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_VacuumFreezer.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_VacuumFreezer.java @@ -31,7 +31,15 @@ public class GT_MetaTileEntity_VacuumFreezer } public String[] getDescription() { - return new String[]{"Controller Block for the Vacuum Freezer", "Size: 3x3x3 (Hollow)", "Controller (front centered)", "1x Input (anywhere)", "1x Output (anywhere)", "1x Energy Hatch (anywhere)", "1x Maintenance Hatch (anywhere)", "Frost Proof Casings for the rest (16 at least!)"}; + return new String[]{ + "Controller Block for the Vacuum Freezer", + "Super cools hot ingots and cells", + "Size(WxHxD): 3x3x3 (Hollow), Controller (Front centered)", + "1x Input Bus (Any casing)", + "1x Output Bus (Any casing)", + "1x Maintenance Hatch (Any casing)", + "1x Energy Hatch (Any casing)", + "Frost Proof Casings for the rest (16 at least!)"}; } public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone) { @@ -139,4 +147,4 @@ public class GT_MetaTileEntity_VacuumFreezer public boolean explodesOnComponentBreak(ItemStack aStack) { return false; } -} +} \ No newline at end of file From 3c32671623dcabcf25fca16b062f7b600963b1d3 Mon Sep 17 00:00:00 2001 From: Muramasa Date: Tue, 24 May 2016 00:05:20 +0100 Subject: [PATCH 2/9] Crash Fix --- .../common/covers/GT_Cover_Fluidfilter.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/main/java/gregtech/common/covers/GT_Cover_Fluidfilter.java b/src/main/java/gregtech/common/covers/GT_Cover_Fluidfilter.java index 0c8740a3..a1853b1a 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_Fluidfilter.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_Fluidfilter.java @@ -26,23 +26,25 @@ public class GT_Cover_Fluidfilter } public boolean onCoverRightclick(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity, EntityPlayer aPlayer, float aX, float aY, float aZ) { - System.out.println("rightclick"); + //System.out.println("rightclick"); if (((aX > 0.375D) && (aX < 0.625D)) || ((aSide > 3) && (((aY > 0.375D) && (aY < 0.625D)) || ((aSide < 2) && (((aZ > 0.375D) && (aZ < 0.625D)) || (aSide == 2) || (aSide == 3)))))) { ItemStack tStack = aPlayer.inventory.getCurrentItem(); if(tStack!=null){ FluidStack tFluid = FluidContainerRegistry.getFluidForFilledItem(tStack); if(tFluid!=null){ - System.out.println(tFluid.getLocalizedName()+" "+tFluid.getFluidID()); + //System.out.println(tFluid.getLocalizedName()+" "+tFluid.getFluidID()); aCoverVariable = tFluid.getFluidID(); aTileEntity.setCoverDataAtSide(aSide, aCoverVariable); FluidStack sFluid = new FluidStack(FluidRegistry.getFluid(aCoverVariable),1000); GT_Utility.sendChatToPlayer(aPlayer, "Filter Fluid: " + sFluid.getLocalizedName()); }else if(tStack.getItem() instanceof IFluidContainerItem){ IFluidContainerItem tContainer = (IFluidContainerItem)tStack.getItem(); - aCoverVariable = tContainer.getFluid(tStack).getFluidID(); - System.out.println("fluidcontainer " + aCoverVariable); - FluidStack sFluid = new FluidStack(FluidRegistry.getFluid(aCoverVariable),1000); - GT_Utility.sendChatToPlayer(aPlayer, "Filter Fluid: " + sFluid.getLocalizedName()); + if(tContainer.getFluid(tStack) != null) { + aCoverVariable = tContainer.getFluid(tStack).getFluidID(); + //System.out.println("fluidcontainer " + aCoverVariable); + FluidStack sFluid = new FluidStack(FluidRegistry.getFluid(aCoverVariable), 1000); + GT_Utility.sendChatToPlayer(aPlayer, "Filter Fluid: " + sFluid.getLocalizedName()); + } } } return true; From 0fadfa254395af972d1b386388e4b7718a97398c Mon Sep 17 00:00:00 2001 From: Muramasa Date: Tue, 24 May 2016 21:37:46 +0100 Subject: [PATCH 3/9] Fixes #501 --- src/main/java/gregtech/api/items/GT_MetaGenerated_Tool.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/gregtech/api/items/GT_MetaGenerated_Tool.java b/src/main/java/gregtech/api/items/GT_MetaGenerated_Tool.java index 5c98e035..ca862c2c 100644 --- a/src/main/java/gregtech/api/items/GT_MetaGenerated_Tool.java +++ b/src/main/java/gregtech/api/items/GT_MetaGenerated_Tool.java @@ -339,7 +339,7 @@ public abstract class GT_MetaGenerated_Tool extends GT_MetaBase_Item implements aList.add(tOffset + 1, EnumChatFormatting.WHITE + tMaterial.mDefaultLocalName + EnumChatFormatting.YELLOW + " lvl " + getHarvestLevel(aStack, "") + EnumChatFormatting.GRAY); aList.add(tOffset + 2, EnumChatFormatting.WHITE + "Turbine Efficency: " + EnumChatFormatting.BLUE + (50.0F + (10.0F * getToolCombatDamage(aStack))) + EnumChatFormatting.GRAY); aList.add(tOffset + 3, EnumChatFormatting.WHITE + "Optimal Steam flow: " + EnumChatFormatting.LIGHT_PURPLE + Math.max(Float.MIN_NORMAL, tStats.getSpeedMultiplier() * getPrimaryMaterial(aStack).mToolSpeed * 1000) + EnumChatFormatting.GRAY + "L/sec"); - aList.add(tOffset + 3, EnumChatFormatting.WHITE + "Optimal Gas flow(EU burnvalue per tick): " + EnumChatFormatting.LIGHT_PURPLE + Math.max(Float.MIN_NORMAL, tStats.getSpeedMultiplier() * getPrimaryMaterial(aStack).mToolSpeed * 25) + EnumChatFormatting.GRAY + "EU/t"); + aList.add(tOffset + 3, EnumChatFormatting.WHITE + "Optimal Gas flow(EU burnvalue per tick): " + EnumChatFormatting.LIGHT_PURPLE + Math.max(Float.MIN_NORMAL, tStats.getSpeedMultiplier() * getPrimaryMaterial(aStack).mToolSpeed * 50) + EnumChatFormatting.GRAY + "EU/t"); aList.add(tOffset + 3, EnumChatFormatting.WHITE + "Optimal Plasma flow(Plasma energyvalue per tick): " + EnumChatFormatting.LIGHT_PURPLE + Math.max(Float.MIN_NORMAL, tStats.getSpeedMultiplier() * getPrimaryMaterial(aStack).mToolSpeed * 1000) + EnumChatFormatting.GRAY + "EU/t"); } else { From 240d346883b1cdb22d66d09ace16cff65c6b0986 Mon Sep 17 00:00:00 2001 From: Muramasa Date: Tue, 24 May 2016 21:59:42 +0100 Subject: [PATCH 4/9] Fixes #367 by adding missing buttons to guis --- .../gui/basicmachines/BronzeAlloySmelter.png | Bin 2543 -> 2541 bytes .../gui/basicmachines/BronzeCompressor.png | Bin 2393 -> 2416 bytes .../gui/basicmachines/BronzeExtractor.png | Bin 2492 -> 2460 bytes .../gui/basicmachines/BronzeFurnace.png | Bin 2488 -> 2482 bytes .../gui/basicmachines/BronzeHammer.png | Bin 2364 -> 2394 bytes .../gui/basicmachines/BronzeMacerator.png | Bin 2723 -> 2532 bytes .../gui/basicmachines/SteelAlloySmelter.png | Bin 2560 -> 2545 bytes .../gui/basicmachines/SteelCompressor.png | Bin 2419 -> 2418 bytes .../gui/basicmachines/SteelExtractor.png | Bin 2511 -> 2462 bytes .../gui/basicmachines/SteelFurnace.png | Bin 2502 -> 2482 bytes .../gui/basicmachines/SteelHammer.png | Bin 2394 -> 2404 bytes .../gui/basicmachines/SteelMacerator.png | Bin 2726 -> 2534 bytes 12 files changed, 0 insertions(+), 0 deletions(-) diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/BronzeAlloySmelter.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/BronzeAlloySmelter.png index 236e8774c95e474f1346163f5e7611cc5d528c3d..54e112e67b6e20cbe6105c64192dfb20f01df3ff 100644 GIT binary patch literal 2541 zcmeHIYgki98lH1V0wkay1Qa4fizGlu@Ww^Ta-u;%NkA@&MALvGE7%xAssd^b*HX~} zD~ec)phZ9wZxBQX90Ai+DFkbga?yZPutlIOC<-)tsN3$({l8D=`DVVE_nUdY%gpo4 z7eNAFW3m+)0ATFz#|s7k!lw{0(8E>S)$mYU5n{M}E&w;PDYKD80Q5jmK&TInJD37D zH@6K-fkL6k1k_TNIf?)s0J=jY9g3hRnw6EMQ=h~zthu>atyb%Fxbd&{R|WnbD$v_0 z>c;ahl=^Lt2Vg<-e22c>U$z?u_2vG2AN?Lfn}yCcT`6{S99k^*373cL-y=U1DT@Zu z$h{IdTM{j&uVK5eJ@&0WCIEmG;LqcR9u~d+D(hgkiwV#F)a7Lytxln=tGGGk0$tez z`^UGJJMZ7^8}Do#H9T6uc{9{Cx6ob67`c%9W4N5Y$;Mq~J91$c`dEi2LP(?Q2Hm*j zIHQW9fiDhr)PkOkc^|*G(7Kwg$gU)cDO)Cnw_~@GaUPZ!!WVojCbi)1OtKU!1-X%)}Yx4MwNxzu6kV`PBfjI>aE(wql*uHTqrn6xKnp+ zC{D7 zmWOa((OA`aiBsp6t~4W~JgWGgp8c-y?%I~q8Du}lTWdr=Nhz`R z0owx*)P~5Fb>xcF0}&BIHhl58YY0m^ekvGV)NPRSeXZ`j%$Py1EQ(88uy&Ta1nQ^7 z)BV^o0&R}5!{lTIrLSx2?~zWef~BcbPZZ0);STPo*cW#e{U)W-G|;~`2aMD|-b3Pb z8D+Y2=;de3#u?gVVi$i^(OJ}c%xR%By(ABuPkfKUdZq?l zd=6sV>Wmn*I)V+)w*U_GjKHuc$|@i(o)8?~2tn^NthlmQfk@LnSgF|ZAvl#D4@5u) z|DX^j8QRyc`L;fuOcXY;%NG%6NoMWnDVM1g(slK;hlV*}tp&ct-D6hMchvEFIr3k3 z%usXD=KjgxATa9S6xeh8O`Y1?Yo?+2ws}YJa)?tJ@?Z(Q(a_ezS^$0& z>Tqmx$7cE*xssfz8{fyFx5PeJA!Ry((r51H=F^)Kz)kAqSP&E)gSbO<5cA2MRA5}F z99R-Gy~wX2sfrwa!K>O5&0s8&u2Y#GvAsbKZ#epr$O^O_J75-&8H1INdjWWSt{DM^ z-ZfOZFdXV5k3u$Cxq);*eQO+QhNjFAQs9xNJB#mv6J@mQL_-$oL`feHW!VhaGs`>1 zzq5dCUPVh+-cVW@xJ){gRe%lNDSuZO8bn@FqTpS+BOP&a&2YjWXH@kSco7e2@{*)% z^%0gawXKTu=I&j)?lgHHrH*8@ZI=7`Kt~bCJctk2@$JrT>6cG;!z0J6r7tP>-d+m= z#6Kis=K^vO_>YvijR&882)7+^Fp6tG>U5f@t<5SOxV`kMms?mY1q%?CyBGY+(H!Uf zAZTQMDvV#;2l?5!KD6W(niweC6y`|5;w=O3$9RS(Nv=GxKns+?2UZP*{kfM3n%Vk) z20?sceYkv6G&EH>n0F=ALZd&=kCW@c<0C(W{Q8dFS@@M>HBtM+o{|Adged*LK3zs+ ze`G=oLR885`0=2zy^?vh`TP-R@j(x}Mw-$V-zh)SSdX?%aLcd zAw~pHkw{#K*y;evSE%%acX`*7ZSf##q|NU>%)6)m}UUPA=HKr+j z>V9TN_Fc@8nzIg*ywKiCx_lmLdRrqR!coE_k>9uA*h|%5z7S0GB-Cs)INtRsZH=;* zz(<7wdnBe|@bU1u=PL7AI_g8Wt?nE8QNKCv@vU$XHL1Om?Rz-|| vBOd6z?~)#kUWeKVFb#J}IpI&BWh#?gWCzUz&2w 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 literal 2393 zcmc&$c~H|y7Jk1Fa%eyhP!I!?!NQj(CfRHc|Yqw^r{A2d7{iEx3zgMrj-}im} zsxSI_@6cJaVi5r7?AqzR4*=0j5x`+ICMY`Zh{m9glD)_PkJA>|IM{gFpv;zFXsz&GUBsTdn?4?l}o z2OB3FdpoL)&`&7fdw+wNwSGKNO z`g3Kkd$Q%Nq0|lfZ&b)SL)_kGce3ZT_qIf2BdXBNdey3jjxUI)8S8ielXVTLuX%ZzInooY~au`gc?b{ zu~p%WjvUpvsf1k-LmKU~wW(QREw2hsJQ#YXSK#y`w1(oL7ES%f#O1dU#eOI|a@O?> zFG9e2B#(tpGA?#R`DPgxuR+M<_6tzmURh7QJMaa=4H8vepiJ=)TCF~N2L274x*Z=>N2$>aVWwmo2x z32t^8&{3M|7x0|iM_tA>N*dOOWrOvjsJUtWK)d7eoP(nd7uN#XL5ms{%ZIL}-kd{K zi9`M3Mqm;@0=ADxC8=+(B;5hMzP5b-d~2V(k3`XR6ehmG zT#|V_;rnskwIN~gi^S7{%n}f(Wut;f((KSLG<3DHBDi2QH%D8KiBF#v(7iv1-nx3k z?ewiji;GBeopkZ?Fw9t5j+&YvJm!{3G5LYl9xk#eHYWgAc*9gh=fia^>LbE;b(fZB2O6R{Bjs9Wg)EV*I{60eY{|)xv3U|A{;Slq z)eEOV?J9Lqz^}&1?6fzUfFy!fg^#!Z*+)BEllN8Y@&ja5N=$acG`tWZ~TO0 zad>}LMSZ#_WFCm0?YT4Ij8&Eg1}a=>cqlR5d_hM&g9r9;QBuu*V(3+O$UGS5o1xq$ z;#Q)WzZ}CURO=!mzn#cZ>4QOUHKbHb^Ifj zKz02)^4~iB!X-Zo_;aAqD9Nfghw)V2M~BG|I&jv}#TWLWTNzK>W2D z8p$C3VdPuX)CceWOZI678t2Jegsn4hGMSNaFD-5vEE8X?4UQot3i@~;ektFG=zcYq zVyDG4*fc1%MT7Utt6JYXEx<$Et9&pYR@xj9`V9_e5V85Ze`SI)RyNW9idWS(tX3)W zH^+U9_}KmA1Sqsw?fYs8U`1EY%_s|Ao6UJB)um15Cx*#e5oYQvCbobq+C;OW;=$m? zT23MP-~-i_kC$2FWAC2x3N}a)m-ohQp(BHfU{CW(t?(Tz!f-T!RX~}KBNgQrofO7K?@^Me3$}|2ZkA!!nDaI244v@*JK!=-7dUAfw(vC2# z+@FE{M9iLM#Xj+>Qf+EpEJ5zlGI|&fMmLeF6TTTHwKotFR+C2+$RJhT$fD?ulv{C( fTaH40+dLc~X0x9k}^w|n7M>bc(lgMRcw diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/BronzeExtractor.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/BronzeExtractor.png index 302a7bf12c624acdb5ea18861b12c2f74ad6fee7..decb60232f25ba895fa6a0e6c656300b7d92b2b6 100644 GIT binary patch literal 2460 zcmeHIX;f3!7C!eT7cu}QkN{PL-~dq|MnsT4DnUSkVF*JN%8)RLs0>0FL?jm~gJLy^ zEtJQ?=z|J~h*es6R=k1)91yGpBT-gBX{}S3R1h%l(pTU6`ToDvv%YioK6~%A_qWgf zaSjXpy!0tcDF6U{Z@xz$01&Q1fJDH>p2m=1ToB{keBA)Jc$_*Pg#bVRLZ4ty+`fhm zoSdB8mjkI(S`3(HZ5b#JXaUe>>S$3OilQYYC0fN-7>0Frb}AGKtrmCwwf=g6|A!ZN zG#ELA_d!nKho%8w(7Cvw?&P{y+^8$@_Vv_NkGv2c^A#4|(^l)O`t8I>9b zQlb))B%Gu;3Cn@QErmYs-}x`7XABHRz=F3p@6}>YL$BW1O+SRolM{LWAFG05_&QK zX`Sh)fWtGoQ8;}3+Yw@`l3x71L4xMfWQeJ@w`Se?wC1zyWI$K1IQvmw4$WN^ELX0? zU4-djkYv!q)U##W(9J;L*-)E*IKwiyl%FLDW~i$V87V)1;A@wwi2I8^N_VT zSgR{0r0?<)DKpIVXHZdDJRjQhM&VEcst!ikKowGg*ZhcAbF#W=JGm5n>=42EJ2_^xCVZgu%Q-t>1Y9cA*tOH(L-~!qTC{5r!|h|P}AP7IFqHK z!+H{H)(TDZv2{ek7}2F`HCOauJO4`Y=mQ3;L?4-%?c27`#5?EuGPbQ)b-^u^RlsyN z*+0J<)@w7$wTDV%0e7O|6_-tjp@I>Cddg^^dK9*=PBOg1WEiKMB>1_>TKG$zE#xM7 zcry;UGM7TmVJ`I4fbfS$_M4REkHY=ROCzNIGd6ZtDwrP9HP&kX8{fbkK3V6fpUb8r ze6UkaeG1s+!IhqD&T4RWI7_t^OSMv1KPU zytj}v;osM;QHHJ!2sDI>Zr45~$^1L~?-m-NQs<*yRGDv>I4->&b-yQINs%2$jW%m@ zB=6`zTshWO2dc7T>=%ct+6s?$*kVE`&Wq;)Sc{GEP@O)(?<95(IaXu7ANug{{u4w_ z;}gRjxX5ly_7jqU?Sw|0ggDaISu1SfOv4HfssTPB6;kHCrti7MAL7+jZgz?b84%Y|np= zn7%i<@njuj$@#^YW@%A}k6CeSM5h+XYHVsi_2{yTU8{Dru&GSMY=Xa{x$$C5>vh+w zl#K4XX%a6_D3J#-guZ|?g?(1m;l5`#wRzTYbn4-5HVXd;r!oR^5MMlhI(81a9LI0 z#;*}|n?OE#X?Y_dbKnvU}K@i+poUz7CiI^ z!4%~f3S1882j{exq^p}Mhv4zVC-pN0KQtA7Z_9f{o4IXO9UV)Kq}7F&+4M_4U2nPNe? z@?4B&Uv)#*q^_G{uHj7$zApL09oyo8Q8}Wr>_fD3~L%64M za&A6`G!q4c;O%o$@+V`WIxKQQ9ewcXwQJJ0Gu64Lh7xbcLtT9g5B`j7Z$lqJm2bYh zZEl)MB#A`XOj2>;M1d#0_x<&+4%}Q91SVDcf83(C_Fkif!w)|BR+ycxk$j~nH9^v= zX{WT)ny1-0U8+>!@8 lF@OwuHLu|yd+7eONo$dEW5!#JF8);jZ%;purY++9e*vjS({TU* literal 2492 zcmc&$c~sL^7JdnVghe0%g2<|Mu%M7sS=@kt2xy2b#eyseG9a=fh=HJNA-151;7l!2 z1qD%yMOg*`0UIC?m-KtGXkQ5fNQ{6D&3Ui@TEb_UQ=^Z zJPs#_%7?*rIv*i?8S6jK!(Y{D-6}WSuW0e~+t=Zdp$J4)ge`o70lmi^UTr!coipn!{4HfL^3D#KU`{* z2U&sPBj}VAK#}AuqtyWC_6vOnfTNKUDr*v0-3YNhYK*2Yo z2p1ABL}(+R(P^v>36y%J$`NMz*{WdoP_aQshR0QS_;Ol~a6X3!R2@gizf3`#_P8Wv zaf_KnT;t&jYq7$sw0f>i5EgJqmf#p7bD5izP$im8vOotYAq=tslY#^+d4Q>W<_!6e zGsy3jEp65!g{VP@h%6WI1WWj4AFmukx0Hp?0iNF?z01YVcJA?BC;$&zf z&%lhqOe!udPXyC)u6C4giKj83K>)IIa}P6Dyv1*eIu?D_^SzBpD&X=C08>fnl1SPd z7PDZTgxH8$Zwpu6-%eszncqEO1THU+HeKy5aLnw{uO2mqFcWPDnvH2I=jLiRXX0B* zs>5D+GW8{rj@eAc!k~95lqnU|3eSl=0Rs0zhyP?Mr+#u}XH6h7$O(w&r`Z0QiEbBx zRNURsvu-N$;^i@{g-<~pnXW%;%}&`2TriOiAhJND5SMn3HdxD8Db;J6ODgZsKtSUU zwR`mos#nO9U=SVI76f5^dOxRG;zZjvcDhEg+#3@6*1Q)sZdPWSwu$?H?MJjU!} z#fZ8?TP}jPW!pP#2i|{Gu4{sHX-Tt{Ir{^-Ek*zy1}c9n6My+tX#cJme{N_bAMGTu zPtAL&P!7}~z?2hs7YHl(H_3B;gnom5tZ+!T2&r;EH_@DXPJ?nF<$rcw;n07aH^%)J zC2&=XIgDP45%cwY8g#N{w5EPU=dBsOL8s|Q`90?qo5>*Eh)BCX$iq(s>J#bu|J-Ie zM5PtSBzwdPXS#zIt<1>vgL6+#R?+xFbGnWyANdN#0HYpVx?icl6(M}eHb`PnnAdBySg@n|F!?Th^FUHrWyMM z!eS((q~jrWSp87zUxEfkl{8Fb__Dse3TW@U(L}}os~xGt@$Sz)iezs^$vXL>Vw=Sc zXIrfR?#}0N*QHl7|~OtP_lyUt{uW&Ky>JiMS9366$L zf&oLFcLsri_6;g_14GlDWd@x2lkdr%nS<5u;ZKcPI@eiVLZx@%f2SCzs|mm12F z$I|&faO+|GrRlDMwxRVv$?4u_>>`?8o|c-z`oJ3*=H9n^-cYgnGuI8U04LLu0_AsD zqL|oYmTX=(jWHGGC*K#$?T>#o3nO>dDa8_j(jH0KfFT6~G$LxZcUCSg7rQ^^wy&gG zjaOU*I6DTW(_)+i-Fq(^ZZcHXcxfRJ_J6uoV@;Kd9Cn?@^)Vjun^b|Zv20yY;qgog zvEc+k1sv_G(6jAY*t)MV*)I&Kgs(@Jp4w1}JNIbQ9Il=Xf2)AA1L;Vy9fkEzRo)By diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/BronzeFurnace.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/BronzeFurnace.png index 39b3ed682008f985f61f2eaaf9a6072cff6b9ef0..6bbe2eb9046f82149067f3a5570b9f36a58d6ce7 100644 GIT binary patch literal 2482 zcmeHIc~nzZ8o%$67ec}gK?YDFvP6WGDN2Hc@v%g}0Hs2et(hQ&k;*EufH35NMucF9 z;sJFm#I_WqAYl`#Rh~Lx9kgVSC4fpOg2>jmu;`@HXKPRY?EiCm&v(D=e)sp?@4NS$ zTO1Y|U_iB^0sstx0{wRa01+w#C_04L*AN*&2+}`%LVN&dE~9DV5CC*QSa1ZF@NYB$ zY&P3(Ef9%BM*+Ro#T-MyDgdil7@n3W%!=Ee z0Mg@?o@X_eSRngMIl~#sP z-WDg5@&?cC>*wIa5Z|``yXRb&Dpgt{KF7Azo?efr`>bmTK1185hihkt$Jem0U9BpTmQYB^p|#I*wm_+`7h}C{ zS`V6)tvyg4hFM0Ykr>zRBtXRleXz%@6!Xqc&WOTU9$}&2($%N~q&bI`7nvbwvfLdy zI2nQuFfZ-iD?f`3bt1v|>m|xj{gW09NjoxaXMwRfMMw1Y%`Fs5qjGX(qBDMidx!iV zs@tP-O*H(mr=F}kujI3{slIm)ZUSK2-i&g(L zuC^LN4tFs(Fl^!tNw>M*W3AhylCNN4hHJ?jeV~VelV+nPie=l&zixWfm=S`;vh0Cw zZ^IVYjztTspCoAwvg06+AhNlcW;t`J2Kn-&DaK37yRbpvX*RKjefvG<>w5UWnn6>A zRRMNa1NY-9_}_RPtXwoeG!|-mjskpC>VnJOzrKM=Q5yAAPVjPJ)9q#otpxVjf870- zi&IijSu9iT4cXe-zG9B}K;{_Zn>J_lHa880L-QMhA5SbrhGGqSDr`BA+7}LqhO$%F zia+vN=G&R3dsTHHh#>TIPRuT0SFUzucvm)+=I(omwo;;bbDi`>A!QYD?0}8%u zqyuHY*2Y3DV!En$~iagcEpcLzNg!CP)9s`Y$whLj=c-wLOXhhzN2qxaVx)mXA~}eM;tdF)v+@QR9((?{@duak>_DG7eQ&;>5@a9O}@X! zPk-vkBvSlJa{eveht9ORW&7HQnik-d^)w>y;-U7(=XRt(mPzh(-Aumtw^$5T&hHNc z$Xi0MNGt0jEW&;a3O&Cg0ZRGhJOnrc^zyyw)j#f;&#BuP10JR%I$u3E`Qh(5!2_1= zZy*5apUr-=eX(k)fJ?VFjb4!?ZN z*k;hksW`t6*>xW4hYV+RD<8N&q8R7rzhD^~kN!ZDI1)bgfIyX9vbBGTF1aU+CFZc=ye+EC! B-Sq$f literal 2488 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 D<6!g| literal 2723 zcmd5;X;_n27QP7|lCXpTVnh%UWCTGLiwlTIBp@&VkqQ1g$pD}_J`UJf z2b8(yP$xNHi?5CVX=&(a*_&;H)f_EK_6<$m9=|U+Eh;GnY>hf_B-ts@HyE4h>a@yf zg^SB%QWXHY`T;&0f{*Tz2)&9d0?c&8{cLf7uyY>#f~g#Xpov!pdI z1+tzUe0Gy;fIT}XoEON8pb908Wa$J`xJO@_!b}KzQlREp?KK@UhCsF7_!=?=QI9Xv z4Ra_^-?f#o*sJwnk&mg0$-NGInU)dANsQ~|nkt8)HxTdu9k$4O-CSRFR32v-xVd|b zfHyy;kCPdq%-Ocd{=sxINXRGRM&f+z6}uEXmiiAG<-1|^ zo2crc%cEh&v zEJs;r_G-Ii9Bo-cF71^7b}sX9Cu1{l)zce|W076<5G6 z&1c)GT7+uziYD95KYeAjcV~(r*7T?uMEG!MIz8?=X_ECy_Drar?8VK~W7%%a0ns5| zkiT|uLFMxIw?wiR>xo9yj=OzMGgrif9@cB}jjyBz_36=hENtP92xO?0@{P4~g>%LE zweBR#2i>uD0?u^Ho9P1l!Y`)TsV(}flcKTSQW9J>$dXF+MU>|GZpZ~7Amj0=$k3Xt zAGWm|@}N9_R?zD=%RX(6b3t1>W=ncQjV>|xYA3u?Y1faDLAPy(UNX1Y&63~AMKv5! z(h|s?x!^GKkrdw8Fy~GShGNFcn0?%rn`&&~)pnfl1EYzTa$8YYjPGs>LXmSFkLN~t zmvo$xt4sUx5`I3)=;{#^*7U>8L!Lb)%J3^wnOmYzl?=W%7_$Za$TbkC`<+hk&pEOb zU|nF~7!n{JU2HG6aDX>0(Ue0E6(c^Q3<>TZ8W2wWg3h$7 z6UC%szi5GA@N*E+P#nQgJV+HCz=wv~|9mTEh)VP#aoTd{19zwy3z~OC z=dyixu|<}ituLCbL9^>+IfJ>B$n=WW+H>nDPf~&a3rLuw5j;cB)Z&$ePs0uGW}N}z z5Q+U83rGi}Mx{@CNy!^Pee=b8Q+fACRNWS|F;M4b;C8&5#yWd9!iq05I59_guC?FK z@Z*b?HzvP2a^3eIAT+p-a*d@(zj1BgpHq~6W3c?lK_ds%5E2~W*PY}_ zZPjx5`g=DZkhT=V_U3rNY2o}eys}fConP!itR$>WigV6CH?}}6EPCx)=BFa)a&DnV zYvWrNFEs+?7BFrh4nUgp)$?%pT5X$f#Z-von{cwnl!AuCdw6JJm4@^sTiht`dDZ=9 zm5jv8jJXjaXpGk6Qj_hEedWIp;V;nYR?CkTDm>F`7)Jelw=+P&b!)Cqzgf?X#SU=C z&V0Pdf!JMLsgvN_Xw=`6>n}P#<6S=9b${%x+SDsL^&0+dxxh$t6lnA(T|ulYNxj!} z*v~N1efSTW{tr!mhBV^GHR1<5GeDP_0dU(0uUt&{Bk%_M_n!i&g*$iFw0{bqTs!pl zNBzAf{;W~cQvc)jXV8vgvD_!kA(BvyqaoVEuMo6Ueb~Rt>g_?4_$x(3;Z^Z`x)y!p z2c60p+y&WuuZ|SySFE)Lh@8E~=+Aog-x~PT&i{|0UiO4Uc-JWbGjJ=tTe5g~YOF^% zux~zk&$nT|~l}j6nOP)B$$ph2E&cK+B!u zbM7$U`ps_LTSaZ4mt;1NRX9n|hgDVua|ynT42Y~tMP>k(JKPKq(C2#p&atXhu%GB6 dt=_{b!|W2mGBNX%=D!et0N+5LI`7Er-vE$=aB~0v diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/SteelAlloySmelter.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/SteelAlloySmelter.png index e90edae344ac9d87e5a0976f4ad481f0090fab1f..862c785606c3aa955c60e668efdfeebe0986ef87 100644 GIT binary patch literal 2545 zcmeHIdo-JA8h^hepWIyH5;~}+ErzJnQbMr}MdDU*jn+`iwxud=SxidvxwK_ysbN&j zs;Q&sV4{??s9@YWdnz;R=&4)AWolc+vRW*%pEI{V_wPMt-t)ZA<#(R@dCz%sxu@7F zBwZ2!K*gQo;s*ePst_PxQ4v!g9DoYk1t)JO0GbNO+YvATSitoPa7A%tWi>6W4@^xh znM|gSPk2yJG>>;tBod{j-bzm|&H+?}1rz`%5LQ;!o!;Kw{{DW20tNm!e{A6Yegozy zc6ZSsi1D1$NdTz!?pdNK zFAYxOyE7yAOIvb|1=DuqO<}?q3zmdhUE<;su5MR@Gb>R$Xr5F`dz(@3QirB*#ZPb{;IaGJhIE+bR zs{2NpT2DG@L(`%PIZ;z$3d=|JYEZsNj>XCOZ$9aMxt7_;b2>Zhec2USNu^jbzQ9vDvy||(jr!(xcm@_*4G-RH z0HG2ITB|?qudB{cm13kdE=$+{PELD6Fgrri(t;a=9K4%7PAHt$;OWw7b%Woh-s&~4 zEwecHCkPU1;f7q^Cg1yRRk_O&y!l`6PV80OoV4<^DL*Y6UdDRyJ@ab06tU1iKS{(cNYVE=VX z8KiE5J;We$9?avmRZ_#Dd)QVw1=eY%@tJOVN^gBFyewcp>sUbS+Jz!k2|ysdOv+XiKxuq8xb}r}cAl z%Rn6o0-1Bp&<=59dwZ1qohqpk;D)MskRl`Zg7oz5Ee%`Ifv4XR3j_atmHp+*W#-B& z-GXT{JnW6n&%vdM?yAACyyD?%OG8xGv}ASB{!NoaaMCjur~mv_krnHT#_rrDTWF)C zH_DuK`~}ABt3HgX>(PvVn@Q-j-M;2dgz}Y9sWinGvR&^V!lCcwY>EcOMjN_DGO@?@ z5CLTSpPv1=sFfD#Fw#@XTAi#4lx{87b%J9Kw~)0>?n;uB9=`dmOh@dH-Z9{9aj*h< z)$<+@r0>+kFaAez_xlDefPbZHp?k~!g=(2AekIQ^j5Jf_nBjD@5?KB?uV$usf4w6!@FH32 z6;fwgwno=N^ZraoL}?br1o?$tt8@fZKSYE+i5`J;vNTD@r|*J&@MZpkQEjBG)i1&F zRp4*FCZLyr|E&plR4=v8;~cbJF<1N`KwF02%a10w4F-!Jn=XB!fpV9nfS>n=B?g z?R<>gwvA9Fzt3wmq}v)rj?Ei);X9Sw{CB?)sX{zs09TGlIfFEX8!Wt$mAAgTwY9Z$ zN4PaM%0G;2ztMZ$MInQO>X1<=Sr1=2X*I7*nVMdwQz+vzdsA6lews_o@ zGj{-&t+Z`}f+97}lv4g%ZB%{F5R+v2e@=K-i!p2^5M$}`05G( literal 2560 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 J$F#vF{u}mZICKC2 diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/SteelCompressor.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/SteelCompressor.png index 42a4d44d28a19ba7b2ea4f4d63c631b685475a7c..cca9978663d2784196746511f8383a7efae4504f 100644 GIT binary patch literal 2418 zcmeHIYgAKL7C!eTSMuOZfGCK8@(52;Ed&N)FAS7W-im;z5ESGgj|>I^0m3Cb3iTDK z!&sq^3L;jhFi6ynl1L~@%Pe39ODw2S5i6A#s0avM%ymu2`8mI5t)8{d+28uUv(MgV z|Jk)s5y1wOO%wotK?pZ+Cjbx*AwVMF?r=wZ4DN_&{^9-rbf2WIB_jY3KvY;v5YFrC z8_{SRot?L_+3d(jUTkbeTwG>ZSy^G>snXKZHNYH0!8!oz7+O(rR;5x64i2ub7wpPC zBoHR&r2>9(MvlNECsn}sz=P%CleJwO0RS=<66haOm^gQK^1wM3E$D82Ob*H8-_zReLS|9gQcL&J`sr|Jp+LanObnrzhWd^R)A}^L|>OOgeJ#giD z@DvY)euOL$6ulr7XF2UQrqKUM#Z^I7jtkG!xYg3w;Uonac#Z@PwRk~2ui$gj(GB2= zow0)vrTwL8P0=5v`@S;M)$1x4*TOprVPc{w@x5uf<|Dsg^+8(5Hv&ZluYkz#ws5Whu2$B>AqII zSBa1v=mf-}DtOjRx43A&;{?t#F?g1yvl93bHhlSWDDPUMhX_tF-@dN2y}W2$vj0hu zfL1W?S6s_gKHb(xLo`j>x|`#M#UslX(jHO^>g^J$xylUs2Wi+1)4n{pH?;g0)j}rp z*9^<}dkJouRuQ@N!&{#4<1)Xbt&D*m>OwW=T)>3~dA%@y*8QO?nPk-hj+)4P3H@XM zd9U_U;4s}4^AYegl(8~5X3rD7ekFp^3+*5kf9IMti%c&ook5O8Zkf17b{yEwi|W%u zfw+uLQvUL6f+BVA!0u7Bkd4)Q%_wluTDHdmiq?um>Dszf`50!|apWTMu?=nqR~_J# z?%D=f>qjbfk}WSZx1y!|;vx)L{9-m9f_+cUTSv@>%;d2# zsD#9gf8v;aDV>TSXOiT%hg}QwBbP5UOWf5($FxkQ%n zf!|EowfGLpusp)VS2T+#ZODn(^IgDCI8Q5)SM;Vu<7tPl)Ji_{xf}q|(BF(Mw|R$Y zQ8}7~Klj7mafZg;zM%J3!IFQ5pu*R)&dVj1heytRoBNfTJ3mf_o;J;7?xs-N32zm=Lh0H+vN=4pD5gFs2~AyDM2rJSww3?unAKR%&(D`z zC=(4TWElL0hK<)fD0lA}NHjRua<q4qc$9@b;ObWlve(uYmLNs_q{OiGHYY$w`gsQ$dG=R)0DzF7h`_G{c#?ks D@Eo$L literal 2419 zcmdT`c~n!!9-eziAW#>mED;eDd=yYNtA%PISXl)G0YOA1F;zeXu_(xvglM&b8W(&Z ziwTIJ0tqyf9uY`TF;)Y-3IbtCpjZ||0zwFo5Ynsl*teYX`u=_Ao;i2EIWyn zyZ1uiPOqgp#yS9ir9R&7K>$EV7XlbfnCkUI|Mp6jldf48MPfe`dJXOEzBo0xumSp9wX zHlc_ecfS9=uLL7~-RhBf1vR*4UrCT2CJwg5`UOfW6H6ZaEFB-`=Qk9pNUoFJg5LhJ z-gZ^vw2(jk@aP1GJTazYI6B>?t`*!LX*#pqDPrY;p1w!L*}tk~?YLu7$G-#o34O9l zPAN!Oa*t7)_?DxRvz#JMk;wiKzUV-zB(-hTV+?4$=79AC@$$1xaWKW|(ZEK?Z3AHq zz)P+Nkba7bL4j(iFnuIBb?6eE8DR{$WygBZ_slJYxPoBWLv3Vvu^F=b3w_mKnjxh* zhHN+>W~teNy}PXw>1YbNx{U4#+#G^|VN@3{gI7mZ-+nd3BMbUon1ek9aUdJM_3O{q z$rX)?H=_L1a6f2GE}-CHK-C7A#6&IVXj;j%VrHTuPPi~QER1pPn%#Wv3}vR^5Xg>{ z70(|c%SHplz5DChQpJ^#1$}MBs>Y{VnvqH1E>9m}pYB0UDx z5_1;vwE#9NG&fuTxmO(qItmfK_7q}k5-q)7_Yo!d8&o{HhcLkEh`-Ug5j;n`DD4&n zhsVXscH2FR+55m@#Kf+ZaPuO#{7u9!>lenJ@232=qtV*-rf-J*NqU!l3|-D)`;L`4 z&O~i}E$WSWrrZm!hhJF$yN)H4JP(m2I4~JbN%4bhtiF3y6NL9a6Z{$Qv`Hm;w7q;6 za?Q41*e9csmN583FAgN%4_1a3h?T~V9VscTcEFhoGfaa4#uEIKSN{QgGr|kxcet$j zDTz(FVr~N$4RJrM(HNNNBG(A=hTmt*A9fEMTUb13FRbyL$DWGx{py+iR)8mSutP#~<7 z&&dznesk6-HfN*303vd{4&7Kenv^cl?X^S41uv)rKzxWYvre13J&Q~q9woC|K8GoS zmdz}jdxDf>q7lEE`w3Gcmr)RGU)Ee2y;wh2ZK6z#Ga@IkTsL9sSZq@_7f+ze$KYWL zifY&tN}K-;=M-^~fZ|s4H22!hO?B6Hb~Xg;M_4b}9&E7D*5t4!@%lgV#fi!D? zS^;$Zkb4J#Ce&YpD&Y(`V!I|;z38PFE25J+HF9YN8J;f#IC-i)deN?-C}SU->WG|( zaxmll*R1<^cmK@CaJ^_)B`beLn*qZ_55`qlJL@nm6qWaJ2Q0+rIsR2T|2r{4;D&@W zLv*3c%QQiO`M=06hiN5r(q?6~&171I&R5q+idW;jaLRlx{J&cA!8x|gBuX(BR&FLn zg1pb&aQQ=7c^_`~G!YzH6y1tw`qWv|p(O>ym|NTKn`!p#{)f?R0UB_)3F_>JQue1E zNL~B?0EmbHdMq3^*f2|C3%2l$A{WxxKkjW%yh(D3IPVC*uhKVRu7P+blvkvxC8Vcz zb9_bOI@(Hzs~ux>Iw{rrtx^Aow8stw3aa89%?>_0>JJTMO7dXYz0EGVAilY_P_r+T z-}!NA!iUtS5j{yr0Sb~Fx> zSK4lh-Jk^#sQc-!mBaaJrYUYwJS;qNYUt@~m_28qvZdigqCtEl=*Y9dLR@#6scJs? zXiXL;S|pM$RF|5r(+7dOA_-kKirRY?P%y}4_(6#Vr&h|H>MW>FTk>(;$6VU&M%VIy zF_FF=;Hkq{x2>ohyK;yiwq=2%tY=D1)8FWFM#b&=z@{g(Blb|pKWgH<_n{%MBHLW} z1-d)&3E8`;t9xj6OnzJktf-$KZgYyr8Chs%CX>UGIsy}nt627kM8|$}iQ(J8?NoQb zg-wj%?ezE4l~S#oa|+2|TIJ_Z@3G!|T5_Qt@C(dLiO^f_SUZ1U7~s*bu)id{BFmufuhL}7^v4E{%j+4>Z-!w*9rEJOZ)fRD#c Jcjni4>hC)z{j&f7 diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/SteelExtractor.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/SteelExtractor.png index b2d2ff508eb413241856815aa4741cf1daaffa92..700944727fc150d3f0f24184a9302096dc20082c 100644 GIT binary patch literal 2462 zcmeHIYgAKL7C!fqkOu(*4G={zAS#KFfD!>wxRLNwKp_M&2=Yn`q9kH?D34q~g#ucc zqEU1(U_mWGQ*05N0FhLrB7^M`ily3EX%UeYM2i%}UORUBbAHcSJ!_x6_xaXd-~RUg zbKc(;9%M>hN(KO!h6M8?0f4X+0z@M$WT;{VSirr<3*!Os$pP}CT5phF3-!WE-b7m2UaKoUIXwNMM_I+^?H3zPtWVu81VP` zdjtRX8*t6_K8p=Ok_L7^Ar1fZ zl$y%yCk=}izAsEX4HpGeIUByYx9%fw=D?$km@iCng-*(id=?%CsU?O>LQ*x_KUZ)~ zwMy6DRjm0uc8KL*%`hIag@V=JpObc&e0M&q##${Z#HD?8{8F}qe}Tf;c{M2O6z#{g zw_1(GrxmPRd*@$hxwewoNu|`hGeuMAWOH#2la3WTqfi$i%`oP-=0?2JG+v@qquE`? z;$oVR5cfq1WflKPVr@qAiu(-H}CThx0r3Qx^OcuJnw|# zCgtq>HH($osf&U%+^A}r-y5)3yymBPKDojKNg1eEfmB}d_$4`#`l|5^>SvKbCa!z< z8C$^nI@cYN`)*oeGPUCu$BAn-Z?>?{4w^Ydm%pqQw^*L}&qA6lNW&BkVp`>jP^wti zboC$sK7%7zD=Vw<^sLnz8&G0Lec-XiPggTiJfMhaej1k#LM@1`G;&&m?&i%hIqk|h zKt`|%mcf&rhud+mo>Sa6E@iDogv=RRvpLm>VXRgc(W2gB7z%QN!_W8CE5U7M-J~{f zR&&E|(|l*jdl&g3A-H91#Xnadz9c_y+iqno`evVKqT@xeyeEPzwIV70^Q*y5wP zJjh+Bh=nLSJ~Rf1y7{tduu)#50{6PfkA)rtoJ&uZ zBXnV}L|F?2?K>IHI^Um-2l0mTThl6qE>(B(mbnF^^888MN-nwnB@r5U&h=U{)kq+^ zJ+~5Yba&1&?Byil-ugC_IEPqK>$y1;PiI$MN_I3pwH&SDuHrQZh%PuMmIYZB?>}Ov zH(eZ$R{P}CHTbZ|X+~rvx(k+`BK&-cX8(_`n%C2;Z2@pkHxjhJDxdYtIeqCL+PHVDz-Aa(QqaOtHf-6JEmp&&n-QUa6dQ6O^50YaPX z{f-Si4ZC71echvvt}w995sAjK75BRn?A}=$_oYSKCowl;Z@Y9wx5K|ap@(_*E!QR3 zonv+l_#H-<8v}ge<)hWdwlAI{KOHn@56w?ZOla0T8K1p)Kaf)ULchIXd3JF$n~{sY z`^wNtIJ^w%p4TMc;pDi2Bq9Gwk@Qi*vpyQSkn^C0S{mvxK{(?2p^_x+yN-L@tJtwL zenxY-M1p%v?*EPVEF)6{9qc#V8l5&|Zn>YGn5m0Viu{5{CAcq)yVuvg@IPtPdKpUT zJcPCC#A`u6-E!_JA_TAWL0YU=8`Ij~)mi!K)?znmY literal 2511 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 literal 2502 zcmdT`X;4#H8oe)x64nG|Cq!|iL6~OIRseajFtNWerynF6; z!N=P}Tf;;H0HE!;d#5h|kg5p*^h(tyFg8DI8PR+_+(3~4_dx|v;ja5!0VvJXT>4>! z3aiKLK0*UP=f(01U9-_KRRvcDdwJ{x%H=1w=D`(JL@my9pSxNgdX=^lg0M?R#h|{$ zbEm7{iSH$SHECuYW-Em@hB8dxU7u^#zn39Nq8grdj@WzXl`EM6dsmY zbZV|k-eI%VZ6ImBIIQ^Ac?|E^+{ULJr;_u0QoKeDW^X}ZRT)R;q4MrQyEhQw5>;xs3cT23 zr*H#UPbtp={5fx-SsmQ5Qlz240X?O=EiyJPVnAa_SeI33Xs77Hh3cvp7~m@6*3d{J zvzW0YdRnlfx^{b6g{Bt_#2JbUv` z;3{dxY5S*PP8-u;gqAeZTFlCmn2pa@U=X=@B5d~XxWV}w-rIpJsQ+1DLyj(zPFq+2W+6TH!FMINh`6WzDQ z@Am1oc5I8}YO_bYq*hZ_SUKd+gW`%jl&fDcVl!zXL z@Fs6X{^;HFV8k%5Pu4)p{959tap|pYf^iJ#byt9tb_~VOh_hVxcb}WRIKuT#QHJP& zb9qjE0fY2iHZp&77y-Yv1mg~<&*QHCYZHD0s`Rt--qz?Z$mf~9p$FG6HK$U5&?pWm zY=4}|s`&}Oed$hDV=x-jp@8L3akOAi(r(S%zRTcp+=6v!kmogjYyRcS(Xo6k$R zq|)11BgPw)JYk&1=*zhcl@4(>F%}E_ORRK%#GTHsQ7G};Y7;i2t*%-iH#{Srro*#yj=TIQ(J(I$4!t z`Z5I?&?AoBDc(GXYm70DNr`>`P|A^3FIBDiTlmDSPn->>vLKOa&6z}Bk3yvZr#5JYx!pj5&J(=ms(H7KGOL1GW}&+WWzyt#0c@finpHnBK{%& zSDvWKlqAqV=+b~$K%IlVntk&T3_(h~Kd-lAnENs8WP&mFufeOZXTC^Q?UVmcfIiYR zCzIHgV48DwM9)=Di@VCgqAR!zd14vI%;lecnFH|=Cc1?#InSN#qbi+4CPh0e0lAqA zwb)Hnk{vfJ)y7XsQeXhPm}Z9l139TK&SKPdeU+-YwvK|`p>5hGXBUsZ^ocI%K8dy|GdTG z>0n!-f1&06Tidy~>d?@+3YG9K~;>=iI`?vwK)dim@_oG>= zuK<4E9O|q{t))=+^RXbziU`NM2XW<(8JW59qXKr=ljNIZy|xU8_WR~4BENS*_xxL^@=Kj+s=im(;Y|=)O$*V!Q=0_~Au@?6 zg0Gb@*&j7$oAD_ven?SU`V$=NZ57!53m)LI8JFkMPJG8gT>$VON}|w_vP2@tz8yDR z9VDkF)V5!P&57aD8zxr+d!llqa0_H#u`oKG0x#E%bI%q1Wpr^*sSaD>So-SZEFh;S zu(_1iY}ma=)5yBN>iJm(4FST8s`XE-CPF0zRHH!peNqD!SX-~CDa!ZCBzxD{xne-r tVGf?qDlsm9emb6l*z3SkD>*91yyNf5tZ2F(pt@86Pj~N~MQ-FX{{WV@A$9-& diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/SteelHammer.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/SteelHammer.png index 7ebd375d4a273348222c2378c38becaddd22be97..f379f8c000a54c5e195f8293036ee67cde827a3e 100644 GIT binary patch literal 2404 zcmeGcSyWR;bl&sDEG%J3STxYcCMv`zD$syDC~Kif5W;2)37eHgDI$a-=D-?-!zlrJ_@E`CA5P zecT+o=We2?bRBz#VfD6*i7QUFlP3q(kNmVqR|Z+LA~$dNaFObC)keRHS9c(kRt4T0 z(ZHnljRS{QW!*d#43UI@G&%Hzu`Sw~e?j-|k=a_BEe6}7$G3coLL**fd%GjkR*Sea z=?5=m0_6aipVp7Hze80HI9YZ_Brtw68mz%C*Vp(%PQTx1A@Cm_Yam&UYnF?|{n4(> z*k>9C1Wy0qA(vq&o`@PqGoGE|-7gtaq}Za`Wh)E++ z3i>dU=6k5l16wA2EoDRip$I=pQJ9o}caaVAfW724L35ZSlv z?ucR9pa2@$(tj0>XBbxbcG+#DDSIJ-dvQy*dDHv^wc1x;?m)xmDS`r?hlDZpfQc2F z9rVFA7l-3x*c{xKBn!pIc6ZqzlyH*j_PVh+#BN8li{z1@Mx5Dn$06)>cy0%JOsh-^ zP<)ph)^zYUT#U8zfI9KzB-Na5zB9!J?m*AODU&>!vI28`@SUCuGj}EmF1Y)`N+uIx znUmp|MP*(VLyvtdDF=?%*oYSjVfSH+EPQkwic~Q%cH(L58L}@syT^xvLJVSGC&J$t zd_*zHJGXxS~C4B1E4^wL>#5k+mG;sL>S33H(4xQz1kyN6;tAz2V>eedCLwZ7uY z{9?zAZJxbc{S?+AnI#%YT}lmU0Q>F>Q?-iEZ55wxsl#G!`-@)~zH2FdcHKdN={5Fq z_WK9FET-sH1`Z;5g@IT!(qRVu3@~sq`!og&_l=(T1nWMIPha-oW3BULQD8+y0VZ+s ze$G-MM-^Ki!=0@~);4XXxAeK570cK_;iiqKUhIj4hT36SB$q7R)cGL{eW{G9Itv)n zIc!@rY8L7tsq%kmzT+?6RCRR54jz{n9;>SLZg<>6Q4am6dLM7uND=l4gr~su=UNs^ z*6h5(+b}#%D#Sq0%@`?~1nD+fGr4aeeYP8@3C!eGr?LBPPmVKP50UNEHL8N`F3oc$ zKa~nmGot6M46)vOkNawiTS_Ca?=M3WjiQ%*{~Ex@W_04I`~|)ls^+x?qTP0A}S zeA)r0j9owW+o*1N#hJBrByp{?f$oF7%zy6VlCIppHDU0OnY7{UXlQD7yyL8u5%veC zB5yvuN#i2&vj>*_B`MtV^@KZrgD%gUK~(%T6wl%@A_FbojMb|{tedenUwOnzcVUD1 zNLQ*_9X*wKwlo5aCbOtxgTw#ke{HLLWqoPbtLTM*FjN|qzMbwgEe$Sr`wqJ?*JX@S zR^{n={0pkfy_Hu~ME?p5Czv24#^4!HTdpzE^jQ-7!h~xHnv!N^5hmAI;48VOcG43! zA0240KcbFlJakib@p(j(PQx9p&3y|6nK<#wbjx`I{>TI{u$C3x9?KVu*EWUllwp-> zwYu`sPQJoFnYT*WV8%CCj5TkPX~}qa{EYZw))f|XZQ{%~G^Atr>9y*D{*ks%vU=7B zfw_m7KX_9P6A}SQpCKYFdpZC!T`2AKbX=I(-ev~H@9!URpOfFa04O|1Zh2EU&v*QD z>~koTP|Ge+Qz$x5w{A%!yOH}wmzTxS*IXF_{k@F{lA*t;t~3kADq9txLGxYV%NtnSHfrdkdyo+VBtFXB==G@@#6#F M=f(Ft=OI4uCnUD600000 literal 2394 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 Date: Tue, 24 May 2016 22:02:46 +0100 Subject: [PATCH 5/9] Fixes #507 --- src/main/java/gregtech/api/enums/TC_Aspects.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/gregtech/api/enums/TC_Aspects.java b/src/main/java/gregtech/api/enums/TC_Aspects.java index 7a542a7a..6a9f085d 100644 --- a/src/main/java/gregtech/api/enums/TC_Aspects.java +++ b/src/main/java/gregtech/api/enums/TC_Aspects.java @@ -3,7 +3,7 @@ package gregtech.api.enums; import java.util.List; public enum TC_Aspects { - AER(1), ALIENIS(20), AQUA(3), ARBOR(1), AURAM(16), BESTIA(6), COGNITO(2), CORPUS(2), ELECTRUM(24), EXAMINIS(32), FABRICO(2), FAMES(2), GELUM(1), GRANUM(4), HERBA(2), HUMANUS(8), IGNIS(4), INSTRUMENTUM(4), ITER(6), LIMUS(3), LUCRUM(32), LUX(4), MACHINA(16), MAGNETO(24), MESSIS(3), METALLUM(8), METO(2), MORTUUS(16), MOTUS(4), NEBRISUM(48), ORDO(8), PANNUS(6), PERDITIO(2), PERFODIO(4), PERMUTATIO(12), POTENTIA(16), PRAECANTIO(16), RADIO(48), SANO(24), SENSUS(4), SPIRITUS(24), STRONTIO(64), TELUM(6), TERRA(1), TEMPESTAS(64), TENEBRAE(24), TUTAMEN(12), VACUOS(6), VENENUM(16), VICTUS(4), VINCULUM(16), VITIUM(48), VITREUS(3), VOLATUS(12); + AER(1), ALIENIS(20), AQUA(3), ARBOR(1), AURAM(16), BESTIA(6), COGNITIO(2), CORPUS(2), ELECTRUM(24), EXANIMIS(32), FABRICO(2), FAMES(2), GELUM(1), GRANUM(4), HERBA(2), HUMANUS(8), IGNIS(4), INSTRUMENTUM(4), ITER(6), LIMUS(3), LUCRUM(32), LUX(4), MACHINA(16), MAGNETO(24), MESSIS(3), METALLUM(8), METO(2), MORTUUS(16), MOTUS(4), NEBRISUM(48), ORDO(8), PANNUS(6), PERDITIO(2), PERFODIO(4), PERMUTATIO(12), POTENTIA(16), PRAECANTATIO(16), RADIO(48), SANO(24), SENSUS(4), SPIRITUS(24), STRONTIO(64), TELUM(6), TERRA(1), TEMPESTAS(64), TENEBRAE(24), TUTAMEN(12), VACUOS(6), VENENUM(16), VICTUS(4), VINCULUM(16), VITIUM(48), VITREUS(3), VOLATUS(12); /** * The Thaumcraft Aspect Object of the Mod itself. From bbcc38e93004443693e11025a344c50ee291680d Mon Sep 17 00:00:00 2001 From: Muramasa Date: Wed, 25 May 2016 19:16:41 +0100 Subject: [PATCH 6/9] More fixes for #507 --- .../java/gregtech/api/enums/Materials.java | 40 +++++++++--------- .../java/gregtech/api/enums/OrePrefixes.java | 4 +- .../gregtech/common/GT_ThaumcraftCompat.java | 6 +-- .../items/GT_MetaGenerated_Item_01.java | 42 +++++++++---------- .../postload/GT_MachineRecipeLoader.java | 12 +++--- 5 files changed, 52 insertions(+), 52 deletions(-) diff --git a/src/main/java/gregtech/api/enums/Materials.java b/src/main/java/gregtech/api/enums/Materials.java index 920c5196..c961c542 100644 --- a/src/main/java/gregtech/api/enums/Materials.java +++ b/src/main/java/gregtech/api/enums/Materials.java @@ -72,7 +72,7 @@ public enum Materials implements IColorModulationContainer, ISubTagContainer { Lead ( 89, TextureSet.SET_DULL , 8.0F, 64, 1, 1|2 |8 |32|64|128 , 140, 100, 140, 0, "Lead" , 0, 0, 600, 0, false, false, 3, 1, 1, Dyes.dyePurple , Element.Pb , Arrays.asList(new TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_AspectStack(TC_Aspects.ORDO, 1))), Lithium ( 6, TextureSet.SET_DULL , 1.0F, 0, 2, 1|2 |8 |32 , 225, 220, 255, 0, "Lithium" , 0, 0, 454, 0, false, false, 4, 1, 1, Dyes.dyeLightBlue , Element.Li , Arrays.asList(new TC_AspectStack(TC_Aspects.VITREUS, 1), new TC_AspectStack(TC_Aspects.POTENTIA, 2))), Lutetium ( 78, TextureSet.SET_METALLIC , 1.0F, 0, 2, 1|2 |8 |32 , 255, 255, 255, 0, "Lutetium" , 0, 0, 1925, 1925, true, false, 4, 1, 1, Dyes._NULL , Element.Lu , Arrays.asList(new TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_AspectStack(TC_Aspects.RADIO, 1))), - Magic (-128, TextureSet.SET_SHINY , 8.0F, 5120, 5, 1|2|4|8|16|32|64|128 , 100, 0, 200, 0, "Magic" , 5, 32, 5000, 0, false, false, 7, 1, 1, Dyes.dyePurple , Element.Ma , Arrays.asList(new TC_AspectStack(TC_Aspects.PRAECANTIO, 4))), + Magic (-128, TextureSet.SET_SHINY , 8.0F, 5120, 5, 1|2|4|8|16|32|64|128 , 100, 0, 200, 0, "Magic" , 5, 32, 5000, 0, false, false, 7, 1, 1, Dyes.dyePurple , Element.Ma , Arrays.asList(new TC_AspectStack(TC_Aspects.PRAECANTATIO, 4))), Magnesium ( 18, TextureSet.SET_METALLIC , 1.0F, 0, 2, 1|2 |8 |32 , 255, 200, 200, 0, "Magnesium" , 0, 0, 923, 0, false, false, 3, 1, 1, Dyes.dyePink , Element.Mg , Arrays.asList(new TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_AspectStack(TC_Aspects.SANO, 1))), Manganese ( 31, TextureSet.SET_DULL , 7.0F, 512, 2, 1|2 |8 |32|64 , 250, 250, 250, 0, "Manganese" , 0, 0, 1519, 0, false, false, 3, 1, 1, Dyes.dyeWhite , Element.Mn , Arrays.asList(new TC_AspectStack(TC_Aspects.METALLUM, 3))), Mercury ( 87, TextureSet.SET_SHINY , 1.0F, 0, 0, 16|32 , 255, 220, 220, 0, "Mercury" , 5, 32, 234, 0, false, false, 3, 1, 1, Dyes.dyeLightGray , Element.Hg , Arrays.asList(new TC_AspectStack(TC_Aspects.METALLUM, 1), new TC_AspectStack(TC_Aspects.AQUA, 1), new TC_AspectStack(TC_Aspects.VENENUM, 1))), @@ -240,7 +240,7 @@ public enum Materials implements IColorModulationContainer, ISubTagContainer { Energized ( -1, TextureSet.SET_NONE , 1.0F, 0, 2, 0 , 255, 255, 255, 0, "Energized" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes._NULL ), Epidote ( 862, TextureSet.SET_DULL , 1.0F, 0, 2, 1 , 255, 255, 255, 0, "Epidote" , 0, 0, -1, 0, false, false, 0, 1, 1, Dyes._NULL ), Eximite ( 959, TextureSet.SET_METALLIC , 5.0F, 2560, 3, 1|2 |8 |64 , 124, 90, 150, 0, "Eximite" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes._NULL ), - FierySteel ( 346, TextureSet.SET_FIERY , 8.0F, 256, 3, 1|2 |16 |64|128 , 64, 0, 0, 0, "Fiery Steel" , 5, 2048, 1811, 1000, true, false, 1, 1, 1, Dyes.dyeRed , Arrays.asList(new TC_AspectStack(TC_Aspects.PRAECANTIO, 3), new TC_AspectStack(TC_Aspects.IGNIS, 3), new TC_AspectStack(TC_Aspects.CORPUS, 3))), + FierySteel ( 346, TextureSet.SET_FIERY , 8.0F, 256, 3, 1|2 |16 |64|128 , 64, 0, 0, 0, "Fiery Steel" , 5, 2048, 1811, 1000, true, false, 1, 1, 1, Dyes.dyeRed , Arrays.asList(new TC_AspectStack(TC_Aspects.PRAECANTATIO, 3), new TC_AspectStack(TC_Aspects.IGNIS, 3), new TC_AspectStack(TC_Aspects.CORPUS, 3))), Firestone ( 347, TextureSet.SET_QUARTZ , 6.0F, 1280, 3, 1 |4|8 |64 , 200, 20, 0, 0, "Firestone" , 0, 0, -1, 0, false, false, 3, 1, 1, Dyes.dyeRed ), Fluorite ( -1, TextureSet.SET_NONE , 1.0F, 0, 2, 1 |8 , 255, 255, 255, 0, "Fluorite" , 0, 0, -1, 0, false, false, 3, 1, 1, Dyes.dyeGreen ), FoolsRuby ( 512, TextureSet.SET_RUBY , 1.0F, 0, 2, 1 |4|8 , 255, 100, 100, 127, "Ruby" , 0, 0, -1, 0, false, true, 3, 1, 1, Dyes.dyeRed , Arrays.asList(new TC_AspectStack(TC_Aspects.LUCRUM, 2), new TC_AspectStack(TC_Aspects.VITREUS, 2))), @@ -263,14 +263,14 @@ public enum Materials implements IColorModulationContainer, ISubTagContainer { Infernal ( -1, TextureSet.SET_NONE , 1.0F, 0, 2, 0 , 255, 255, 255, 0, "Infernal" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes._NULL ), Infuscolium ( 490, TextureSet.SET_METALLIC , 6.0F, 64, 2, 1|2 |8|16 |64 , 146, 33, 86, 0, "Infuscolium" , 0, 0, -1, 0, false, false, 3, 1, 1, Dyes._NULL ), InfusedGold ( 323, TextureSet.SET_SHINY , 12.0F, 64, 3, 1|2 |8 |64|128 , 255, 200, 60, 0, "Infused Gold" , 0, 0, -1, 0, false, false, 3, 1, 1, Dyes.dyeYellow ), - InfusedAir ( 540, TextureSet.SET_SHARDS , 8.0F, 64, 3, 1 |4|8 |64|128 , 255, 255, 0, 0, "Aer" , 5, 160, -1, 0, false, true, 3, 1, 1, Dyes.dyeYellow , Arrays.asList(new TC_AspectStack(TC_Aspects.PRAECANTIO, 1), new TC_AspectStack(TC_Aspects.AER, 2))), - InfusedFire ( 541, TextureSet.SET_SHARDS , 8.0F, 64, 3, 1 |4|8 |64|128 , 255, 0, 0, 0, "Ignis" , 5, 320, -1, 0, false, true, 3, 1, 1, Dyes.dyeRed , Arrays.asList(new TC_AspectStack(TC_Aspects.PRAECANTIO, 1), new TC_AspectStack(TC_Aspects.IGNIS, 2))), - InfusedEarth ( 542, TextureSet.SET_SHARDS , 8.0F, 256, 3, 1 |4|8 |64|128 , 0, 255, 0, 0, "Terra" , 5, 160, -1, 0, false, true, 3, 1, 1, Dyes.dyeGreen , Arrays.asList(new TC_AspectStack(TC_Aspects.PRAECANTIO, 1), new TC_AspectStack(TC_Aspects.TERRA, 2))), - InfusedWater ( 543, TextureSet.SET_SHARDS , 8.0F, 64, 3, 1 |4|8 |64|128 , 0, 0, 255, 0, "Aqua" , 5, 160, -1, 0, false, true, 3, 1, 1, Dyes.dyeBlue , Arrays.asList(new TC_AspectStack(TC_Aspects.PRAECANTIO, 1), new TC_AspectStack(TC_Aspects.AQUA, 2))), - InfusedEntropy ( 544, TextureSet.SET_SHARDS , 32.0F, 64, 4, 1 |4|8 |64|128 , 62, 62, 62, 0, "Perditio" , 5, 320, -1, 0, false, true, 3, 1, 1, Dyes.dyeBlack , Arrays.asList(new TC_AspectStack(TC_Aspects.PRAECANTIO, 1), new TC_AspectStack(TC_Aspects.PERDITIO, 2))), - InfusedOrder ( 545, TextureSet.SET_SHARDS , 8.0F, 64, 3, 1 |4|8 |64|128 , 252, 252, 252, 0, "Ordo" , 5, 240, -1, 0, false, true, 3, 1, 1, Dyes.dyeWhite , Arrays.asList(new TC_AspectStack(TC_Aspects.PRAECANTIO, 1), new TC_AspectStack(TC_Aspects.ORDO, 2))), - InfusedVis ( -1, TextureSet.SET_SHARDS , 8.0F, 64, 3, 1 |4|8 |64|128 , 255, 0, 255, 0, "Auram" , 5, 240, -1, 0, false, true, 3, 1, 1, Dyes.dyePurple , Arrays.asList(new TC_AspectStack(TC_Aspects.PRAECANTIO, 1), new TC_AspectStack(TC_Aspects.AURAM, 2))), - InfusedDull ( -1, TextureSet.SET_SHARDS , 32.0F, 64, 3, 1 |4|8 |64|128 , 100, 100, 100, 0, "Vacuus" , 5, 160, -1, 0, false, true, 3, 1, 1, Dyes.dyeLightGray , Arrays.asList(new TC_AspectStack(TC_Aspects.PRAECANTIO, 1), new TC_AspectStack(TC_Aspects.VACUOS, 2))), + InfusedAir ( 540, TextureSet.SET_SHARDS , 8.0F, 64, 3, 1 |4|8 |64|128 , 255, 255, 0, 0, "Aer" , 5, 160, -1, 0, false, true, 3, 1, 1, Dyes.dyeYellow , Arrays.asList(new TC_AspectStack(TC_Aspects.PRAECANTATIO, 1), new TC_AspectStack(TC_Aspects.AER, 2))), + InfusedFire ( 541, TextureSet.SET_SHARDS , 8.0F, 64, 3, 1 |4|8 |64|128 , 255, 0, 0, 0, "Ignis" , 5, 320, -1, 0, false, true, 3, 1, 1, Dyes.dyeRed , Arrays.asList(new TC_AspectStack(TC_Aspects.PRAECANTATIO, 1), new TC_AspectStack(TC_Aspects.IGNIS, 2))), + InfusedEarth ( 542, TextureSet.SET_SHARDS , 8.0F, 256, 3, 1 |4|8 |64|128 , 0, 255, 0, 0, "Terra" , 5, 160, -1, 0, false, true, 3, 1, 1, Dyes.dyeGreen , Arrays.asList(new TC_AspectStack(TC_Aspects.PRAECANTATIO, 1), new TC_AspectStack(TC_Aspects.TERRA, 2))), + InfusedWater ( 543, TextureSet.SET_SHARDS , 8.0F, 64, 3, 1 |4|8 |64|128 , 0, 0, 255, 0, "Aqua" , 5, 160, -1, 0, false, true, 3, 1, 1, Dyes.dyeBlue , Arrays.asList(new TC_AspectStack(TC_Aspects.PRAECANTATIO, 1), new TC_AspectStack(TC_Aspects.AQUA, 2))), + InfusedEntropy ( 544, TextureSet.SET_SHARDS , 32.0F, 64, 4, 1 |4|8 |64|128 , 62, 62, 62, 0, "Perditio" , 5, 320, -1, 0, false, true, 3, 1, 1, Dyes.dyeBlack , Arrays.asList(new TC_AspectStack(TC_Aspects.PRAECANTATIO, 1), new TC_AspectStack(TC_Aspects.PERDITIO, 2))), + InfusedOrder ( 545, TextureSet.SET_SHARDS , 8.0F, 64, 3, 1 |4|8 |64|128 , 252, 252, 252, 0, "Ordo" , 5, 240, -1, 0, false, true, 3, 1, 1, Dyes.dyeWhite , Arrays.asList(new TC_AspectStack(TC_Aspects.PRAECANTATIO, 1), new TC_AspectStack(TC_Aspects.ORDO, 2))), + InfusedVis ( -1, TextureSet.SET_SHARDS , 8.0F, 64, 3, 1 |4|8 |64|128 , 255, 0, 255, 0, "Auram" , 5, 240, -1, 0, false, true, 3, 1, 1, Dyes.dyePurple , Arrays.asList(new TC_AspectStack(TC_Aspects.PRAECANTATIO, 1), new TC_AspectStack(TC_Aspects.AURAM, 2))), + InfusedDull ( -1, TextureSet.SET_SHARDS , 32.0F, 64, 3, 1 |4|8 |64|128 , 100, 100, 100, 0, "Vacuus" , 5, 160, -1, 0, false, true, 3, 1, 1, Dyes.dyeLightGray , Arrays.asList(new TC_AspectStack(TC_Aspects.PRAECANTATIO, 1), new TC_AspectStack(TC_Aspects.VACUOS, 2))), Inolashite ( 954, TextureSet.SET_NONE , 8.0F, 2304, 3, 1|2 |8|16 |64 , 148, 216, 187, 0, "Inolashite" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes._NULL ), Invisium ( -1, TextureSet.SET_NONE , 1.0F, 0, 2, 1 , 255, 255, 255, 0, "Invisium" , 0, 0, -1, 0, false, false, 3, 1, 1, Dyes._NULL ), Jade ( 537, TextureSet.SET_SHINY , 1.0F, 0, 2, 1 |8 , 0, 100, 0, 0, "Jade" , 0, 0, -1, 0, false, false, 5, 1, 1, Dyes.dyeGreen , Arrays.asList(new TC_AspectStack(TC_Aspects.LUCRUM, 6), new TC_AspectStack(TC_Aspects.VITREUS, 3))), @@ -391,7 +391,7 @@ public enum Materials implements IColorModulationContainer, ISubTagContainer { Milk ( 885, TextureSet.SET_FINE , 1.0F, 0, 0, 1 |16 , 254, 254, 254, 0, "Milk" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeWhite , Arrays.asList(new TC_AspectStack(TC_Aspects.SANO, 2))), Mud ( -1, TextureSet.SET_NONE , 1.0F, 0, 0, 0 , 255, 255, 255, 0, "Mud" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeBrown ), Oil ( 707, TextureSet.SET_FLUID , 1.0F, 0, 0, 16 , 10, 10, 10, 0, "Oil" , 3, 16, -1, 0, false, false, 1, 1, 1, Dyes.dyeBlack ), - Paper ( 879, TextureSet.SET_PAPER , 1.0F, 0, 0, 1 , 250, 250, 250, 0, "Paper" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeWhite , Arrays.asList(new TC_AspectStack(TC_Aspects.COGNITO, 1))), + Paper ( 879, TextureSet.SET_PAPER , 1.0F, 0, 0, 1 , 250, 250, 250, 0, "Paper" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeWhite , Arrays.asList(new TC_AspectStack(TC_Aspects.COGNITIO, 1))), Peat ( -1, TextureSet.SET_NONE , 1.0F, 0, 0, 0 , 255, 255, 255, 0, "Peat" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeBrown , Arrays.asList(new TC_AspectStack(TC_Aspects.POTENTIA, 2), new TC_AspectStack(TC_Aspects.IGNIS, 2))), Quantum ( -1, TextureSet.SET_NONE , 1.0F, 0, 0, 0 , 255, 255, 255, 0, "Quantum" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeWhite ), RareEarth ( 891, TextureSet.SET_FINE , 1.0F, 0, 0, 1 , 128, 128, 100, 0, "Rare Earth" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeGray , Arrays.asList(new TC_AspectStack(TC_Aspects.VITREUS, 1), new TC_AspectStack(TC_Aspects.LUCRUM, 1))), @@ -554,7 +554,7 @@ public enum Materials implements IColorModulationContainer, ISubTagContainer { * Second Degree Compounds */ WoodSealed ( 889, TextureSet.SET_WOOD , 3.0F, 24, 0, 1|2 |64|128 , 80, 40, 0, 0, "Sealed Wood" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeBrown , 0, Arrays.asList(new MaterialStack(Wood, 1)), Arrays.asList(new TC_AspectStack(TC_Aspects.ARBOR, 2), new TC_AspectStack(TC_Aspects.FABRICO, 1))), - LiveRoot ( 832, TextureSet.SET_WOOD , 1.0F, 0, 1, 1 , 220, 200, 0, 0, "Liveroot" , 5, 16, -1, 0, false, false, 2, 4, 3, Dyes.dyeBrown , 2, Arrays.asList(new MaterialStack(Wood, 3), new MaterialStack(Magic, 1)), Arrays.asList(new TC_AspectStack(TC_Aspects.ARBOR, 2), new TC_AspectStack(TC_Aspects.VICTUS, 2), new TC_AspectStack(TC_Aspects.PRAECANTIO, 1))), + LiveRoot ( 832, TextureSet.SET_WOOD , 1.0F, 0, 1, 1 , 220, 200, 0, 0, "Liveroot" , 5, 16, -1, 0, false, false, 2, 4, 3, Dyes.dyeBrown , 2, Arrays.asList(new MaterialStack(Wood, 3), new MaterialStack(Magic, 1)), Arrays.asList(new TC_AspectStack(TC_Aspects.ARBOR, 2), new TC_AspectStack(TC_Aspects.VICTUS, 2), new TC_AspectStack(TC_Aspects.PRAECANTATIO, 1))), IronWood ( 338, TextureSet.SET_WOOD , 6.0F, 384, 2, 1|2 |64|128 , 150, 140, 110, 0, "Ironwood" , 5, 8, -1, 0, false, false, 2, 19, 18, Dyes.dyeBrown , 2, Arrays.asList(new MaterialStack(Iron, 9), new MaterialStack(LiveRoot, 9), new MaterialStack(Gold, 1))), Glass ( 890, TextureSet.SET_GLASS , 1.0F, 4, 0, 1 |4 , 250, 250, 250, 220, "Glass" , 0, 0, 1500, 0, false, true, 1, 1, 1, Dyes.dyeWhite , 2, Arrays.asList(new MaterialStack(SiliconDioxide, 1)), Arrays.asList(new TC_AspectStack(TC_Aspects.VITREUS, 2))), Perlite ( 925, TextureSet.SET_DULL , 1.0F, 0, 1, 1 |8 , 30, 20, 30, 0, "Perlite" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeBlack , 2, Arrays.asList(new MaterialStack(Obsidian, 2), new MaterialStack(Water, 1))), @@ -565,21 +565,21 @@ public enum Materials implements IColorModulationContainer, ISubTagContainer { Amethyst ( 509, TextureSet.SET_FLINT , 7.0F, 256, 3, 1 |4|8 |64 , 210, 50, 210, 127, "Amethyst" , 0, 0, -1, 0, false, true, 3, 1, 1, Dyes.dyePink , 1, Arrays.asList(new MaterialStack(SiliconDioxide, 4), new MaterialStack(Iron, 1)), Arrays.asList(new TC_AspectStack(TC_Aspects.LUCRUM, 6), new TC_AspectStack(TC_Aspects.VITREUS, 4))), Redstone ( 810, TextureSet.SET_ROUGH , 1.0F, 0, 2, 1 |8 , 200, 0, 0, 0, "Redstone" , 0, 0, 500, 0, false, false, 3, 1, 1, Dyes.dyeRed , 2, Arrays.asList(new MaterialStack(Silicon, 1), new MaterialStack(Pyrite, 5), new MaterialStack(Ruby, 1), new MaterialStack(Mercury, 3)), Arrays.asList(new TC_AspectStack(TC_Aspects.MACHINA, 1), new TC_AspectStack(TC_Aspects.POTENTIA, 2))), Lapis ( 526, TextureSet.SET_LAPIS , 1.0F, 0, 1, 1 |4|8 , 70, 70, 220, 0, "Lapis" , 0, 0, -1, 0, false, false, 3, 1, 1, Dyes.dyeBlue , 2, Arrays.asList(new MaterialStack(Lazurite, 12), new MaterialStack(Sodalite, 2), new MaterialStack(Pyrite, 1), new MaterialStack(Calcite, 1)), Arrays.asList(new TC_AspectStack(TC_Aspects.SENSUS, 1))), - Blaze ( 801, TextureSet.SET_POWDER , 2.0F, 16, 1, 1 |64 , 255, 200, 0, 0, "Blaze" , 0, 0, 6400, 0, false, false, 2, 3, 2, Dyes.dyeYellow , 2, Arrays.asList(new MaterialStack(DarkAsh, 1), new MaterialStack(Sulfur, 1), new MaterialStack(Magic, 1)), Arrays.asList(new TC_AspectStack(TC_Aspects.PRAECANTIO, 2), new TC_AspectStack(TC_Aspects.IGNIS, 4))), - EnderPearl ( 532, TextureSet.SET_SHINY , 1.0F, 16, 1, 1 |4 , 108, 220, 200, 0, "Enderpearl" , 0, 0, -1, 0, false, false, 1, 16, 10, Dyes.dyeGreen , 1, Arrays.asList(new MaterialStack(Beryllium, 1), new MaterialStack(Potassium, 4), new MaterialStack(Nitrogen, 5), new MaterialStack(Magic, 6)), Arrays.asList(new TC_AspectStack(TC_Aspects.ALIENIS, 4), new TC_AspectStack(TC_Aspects.ITER, 4), new TC_AspectStack(TC_Aspects.PRAECANTIO, 2))), - EnderEye ( 533, TextureSet.SET_SHINY , 1.0F, 16, 1, 1 |4 , 160, 250, 230, 0, "Endereye" , 5, 10, -1, 0, false, false, 1, 2, 1, Dyes.dyeGreen , 2, Arrays.asList(new MaterialStack(EnderPearl, 1), new MaterialStack(Blaze, 1)), Arrays.asList(new TC_AspectStack(TC_Aspects.SENSUS, 4), new TC_AspectStack(TC_Aspects.ALIENIS, 4), new TC_AspectStack(TC_Aspects.ITER, 4), new TC_AspectStack(TC_Aspects.PRAECANTIO, 3), new TC_AspectStack(TC_Aspects.IGNIS, 2))), + Blaze ( 801, TextureSet.SET_POWDER , 2.0F, 16, 1, 1 |64 , 255, 200, 0, 0, "Blaze" , 0, 0, 6400, 0, false, false, 2, 3, 2, Dyes.dyeYellow , 2, Arrays.asList(new MaterialStack(DarkAsh, 1), new MaterialStack(Sulfur, 1), new MaterialStack(Magic, 1)), Arrays.asList(new TC_AspectStack(TC_Aspects.PRAECANTATIO, 2), new TC_AspectStack(TC_Aspects.IGNIS, 4))), + EnderPearl ( 532, TextureSet.SET_SHINY , 1.0F, 16, 1, 1 |4 , 108, 220, 200, 0, "Enderpearl" , 0, 0, -1, 0, false, false, 1, 16, 10, Dyes.dyeGreen , 1, Arrays.asList(new MaterialStack(Beryllium, 1), new MaterialStack(Potassium, 4), new MaterialStack(Nitrogen, 5), new MaterialStack(Magic, 6)), Arrays.asList(new TC_AspectStack(TC_Aspects.ALIENIS, 4), new TC_AspectStack(TC_Aspects.ITER, 4), new TC_AspectStack(TC_Aspects.PRAECANTATIO, 2))), + EnderEye ( 533, TextureSet.SET_SHINY , 1.0F, 16, 1, 1 |4 , 160, 250, 230, 0, "Endereye" , 5, 10, -1, 0, false, false, 1, 2, 1, Dyes.dyeGreen , 2, Arrays.asList(new MaterialStack(EnderPearl, 1), new MaterialStack(Blaze, 1)), Arrays.asList(new TC_AspectStack(TC_Aspects.SENSUS, 4), new TC_AspectStack(TC_Aspects.ALIENIS, 4), new TC_AspectStack(TC_Aspects.ITER, 4), new TC_AspectStack(TC_Aspects.PRAECANTATIO, 3), new TC_AspectStack(TC_Aspects.IGNIS, 2))), Flint ( 802, TextureSet.SET_FLINT , 2.5F, 64, 1, 1 |64 , 0, 32, 64, 0, "Flint" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeGray , 2, Arrays.asList(new MaterialStack(SiliconDioxide, 1)), Arrays.asList(new TC_AspectStack(TC_Aspects.TERRA, 1), new TC_AspectStack(TC_Aspects.INSTRUMENTUM, 1))), Diatomite ( 948, TextureSet.SET_DULL , 1.0F, 0, 1, 1 |8 , 225, 225, 225, 0, "Diatomite" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeGray , 2, Arrays.asList(new MaterialStack(Flint, 8), new MaterialStack(BandedIron, 1), new MaterialStack(Sapphire, 1))), VolcanicAsh ( 940, TextureSet.SET_FLINT , 1.0F, 0, 0, 1 , 60, 50, 50, 0, "Volcanic Ashes" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeBlack , 2, Arrays.asList(new MaterialStack(Flint, 6), new MaterialStack(Iron, 1), new MaterialStack(Magnesium, 1))), Niter ( 531, TextureSet.SET_FLINT , 1.0F, 0, 1, 1 |4|8 , 255, 200, 200, 0, "Niter" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyePink , 2, Arrays.asList(new MaterialStack(Saltpeter, 1))), - Pyrotheum ( 843, TextureSet.SET_FIERY , 1.0F, 0, 1, 1 , 255, 128, 0, 0, "Pyrotheum" , 2, 62, -1, 0, false, false, 2, 3, 1, Dyes.dyeYellow , 2, Arrays.asList(new MaterialStack(Coal, 1), new MaterialStack(Redstone, 1), new MaterialStack(Blaze, 1)), Arrays.asList(new TC_AspectStack(TC_Aspects.PRAECANTIO, 2), new TC_AspectStack(TC_Aspects.IGNIS, 1))), + Pyrotheum ( 843, TextureSet.SET_FIERY , 1.0F, 0, 1, 1 , 255, 128, 0, 0, "Pyrotheum" , 2, 62, -1, 0, false, false, 2, 3, 1, Dyes.dyeYellow , 2, Arrays.asList(new MaterialStack(Coal, 1), new MaterialStack(Redstone, 1), new MaterialStack(Blaze, 1)), Arrays.asList(new TC_AspectStack(TC_Aspects.PRAECANTATIO, 2), new TC_AspectStack(TC_Aspects.IGNIS, 1))), HydratedCoal ( 818, TextureSet.SET_ROUGH , 1.0F, 0, 1, 1 , 70, 70, 100, 0, "Hydrated Coal" , 0, 0, -1, 0, false, false, 1, 9, 8, Dyes.dyeBlack , 2, Arrays.asList(new MaterialStack(Coal, 8), new MaterialStack(Water, 1))), Apatite ( 530, TextureSet.SET_DIAMOND , 1.0F, 0, 1, 1 |4|8 , 200, 200, 255, 0, "Apatite" , 0, 0, -1, 0, false, false, 2, 1, 1, Dyes.dyeCyan , 1, Arrays.asList(new MaterialStack(Calcium, 5), new MaterialStack(Phosphate, 3), new MaterialStack(Chlorine, 1)), Arrays.asList(new TC_AspectStack(TC_Aspects.MESSIS, 2))), Alumite ( -1, TextureSet.SET_METALLIC , 1.5F, 64, 0, 1|2 |64 , 255, 255, 255, 0, "Alumite" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyePink , 2, Arrays.asList(new MaterialStack(Aluminium, 5), new MaterialStack(Iron, 2), new MaterialStack(Obsidian, 2)), Arrays.asList(new TC_AspectStack(TC_Aspects.STRONTIO, 2))), Manyullyn ( -1, TextureSet.SET_METALLIC , 1.5F, 64, 0, 1|2 |64 , 255, 255, 255, 0, "Manyullyn" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyePurple , 2, Arrays.asList(new MaterialStack(Cobalt, 1), new MaterialStack(Aredrite, 1)), Arrays.asList(new TC_AspectStack(TC_Aspects.STRONTIO, 2))), ShadowIron ( 336, TextureSet.SET_METALLIC , 6.0F, 384, 2, 1|2 |8 |64 , 120, 120, 120, 0, "Shadowiron" , 0, 0, -1, 0, false, false, 3, 4, 3, Dyes.dyeBlack , 2, Arrays.asList(new MaterialStack(Iron, 3), new MaterialStack(Magic, 1))), ShadowSteel ( 337, TextureSet.SET_METALLIC , 6.0F, 768, 2, 1|2 |64 , 90, 90, 90, 0, "Shadowsteel" , 0, 0, -1, 1700, true, false, 4, 4, 3, Dyes.dyeBlack , 2, Arrays.asList(new MaterialStack(Steel, 3), new MaterialStack(Magic, 1))), - Steeleaf ( 339, TextureSet.SET_LEAF , 8.0F, 768, 3, 1|2 |64|128 , 50, 127, 50, 0, "Steeleaf" , 5, 24, -1, 0, false, false, 4, 1, 1, Dyes.dyeGreen , 2, Arrays.asList(new MaterialStack(Steel, 1), new MaterialStack(Magic, 1)), Arrays.asList(new TC_AspectStack(TC_Aspects.HERBA, 2), new TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_AspectStack(TC_Aspects.PRAECANTIO, 1))), + Steeleaf ( 339, TextureSet.SET_LEAF , 8.0F, 768, 3, 1|2 |64|128 , 50, 127, 50, 0, "Steeleaf" , 5, 24, -1, 0, false, false, 4, 1, 1, Dyes.dyeGreen , 2, Arrays.asList(new MaterialStack(Steel, 1), new MaterialStack(Magic, 1)), Arrays.asList(new TC_AspectStack(TC_Aspects.HERBA, 2), new TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_AspectStack(TC_Aspects.PRAECANTATIO, 1))), Knightmetal ( 362, TextureSet.SET_METALLIC , 8.0F, 1024, 3, 1|2 |64|128 , 210, 240, 200, 0, "Knightmetal" , 5, 24, -1, 0, false, false, 4, 1, 1, Dyes.dyeLime , 2, Arrays.asList(new MaterialStack(Steel, 2), new MaterialStack(Magic, 1)), Arrays.asList(new TC_AspectStack(TC_Aspects.LUCRUM, 1), new TC_AspectStack(TC_Aspects.METALLUM, 2))), SterlingSilver ( 350, TextureSet.SET_SHINY , 13.0F, 128, 2, 1|2 |64|128 , 250, 220, 225, 0, "Sterling Silver" , 0, 0, -1, 1700, true, false, 4, 1, 1, Dyes.dyeWhite , 2, Arrays.asList(new MaterialStack(Copper, 1), new MaterialStack(Silver, 4))), RoseGold ( 351, TextureSet.SET_SHINY , 14.0F, 128, 2, 1|2 |64|128 , 255, 230, 30, 0, "Rose Gold" , 0, 0, -1, 1600, true, false, 4, 1, 1, Dyes.dyeOrange , 2, Arrays.asList(new MaterialStack(Copper, 1), new MaterialStack(Gold, 4))), @@ -604,9 +604,9 @@ public enum Materials implements IColorModulationContainer, ISubTagContainer { GarnetYellow ( 528, TextureSet.SET_RUBY , 7.0F, 128, 2, 1 |4|8 |64 , 200, 200, 80, 127, "Yellow Garnet" , 0, 0, -1, 0, false, true, 4, 1, 1, Dyes.dyeYellow , 2, Arrays.asList(new MaterialStack(Andradite, 5), new MaterialStack(Grossular, 8), new MaterialStack(Uvarovite, 3)), Arrays.asList(new TC_AspectStack(TC_Aspects.VITREUS, 3))), Marble ( 845, TextureSet.SET_FINE , 1.0F, 0, 1, 1 , 200, 200, 200, 0, "Marble" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeWhite , 2, Arrays.asList(new MaterialStack(Magnesium, 1), new MaterialStack(Calcite, 7)), Arrays.asList(new TC_AspectStack(TC_Aspects.PERFODIO, 1))), Sugar ( 803, TextureSet.SET_FINE , 1.0F, 0, 1, 1 , 250, 250, 250, 0, "Sugar" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeWhite , 1, Arrays.asList(new MaterialStack(Carbon, 2), new MaterialStack(Water, 5), new MaterialStack(Oxygen, 25)), Arrays.asList(new TC_AspectStack(TC_Aspects.HERBA, 1), new TC_AspectStack(TC_Aspects.AQUA, 1), new TC_AspectStack(TC_Aspects.AER, 1))), - Thaumium ( 330, TextureSet.SET_METALLIC , 12.0F, 256, 3, 1|2 |64|128 , 150, 100, 200, 0, "Thaumium" , 0, 0, -1, 0, false, false, 5, 2, 1, Dyes.dyePurple , 0, Arrays.asList(new MaterialStack(Iron, 1), new MaterialStack(Magic, 1)), Arrays.asList(new TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_AspectStack(TC_Aspects.PRAECANTIO, 1))), - Vinteum ( 529, TextureSet.SET_EMERALD , 10.0F, 128, 3, 1 |4|8 |64 , 100, 200, 255, 0, "Vinteum" , 5, 32, -1, 0, false, false, 4, 1, 1, Dyes.dyeLightBlue , 2, Arrays.asList(new MaterialStack(Magic, 1)), Arrays.asList(new TC_AspectStack(TC_Aspects.VITREUS, 2), new TC_AspectStack(TC_Aspects.PRAECANTIO, 1))), - Vis ( -1, TextureSet.SET_SHINY , 1.0F, 0, 3, 0 , 128, 0, 255, 0, "Vis" , 5, 32, -1, 0, false, false, 1, 1, 1, Dyes.dyePurple , 2, Arrays.asList(new MaterialStack(Magic, 1)), Arrays.asList(new TC_AspectStack(TC_Aspects.AURAM, 2), new TC_AspectStack(TC_Aspects.PRAECANTIO, 1))), + Thaumium ( 330, TextureSet.SET_METALLIC , 12.0F, 256, 3, 1|2 |64|128 , 150, 100, 200, 0, "Thaumium" , 0, 0, -1, 0, false, false, 5, 2, 1, Dyes.dyePurple , 0, Arrays.asList(new MaterialStack(Iron, 1), new MaterialStack(Magic, 1)), Arrays.asList(new TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_AspectStack(TC_Aspects.PRAECANTATIO, 1))), + Vinteum ( 529, TextureSet.SET_EMERALD , 10.0F, 128, 3, 1 |4|8 |64 , 100, 200, 255, 0, "Vinteum" , 5, 32, -1, 0, false, false, 4, 1, 1, Dyes.dyeLightBlue , 2, Arrays.asList(new MaterialStack(Magic, 1)), Arrays.asList(new TC_AspectStack(TC_Aspects.VITREUS, 2), new TC_AspectStack(TC_Aspects.PRAECANTATIO, 1))), + Vis ( -1, TextureSet.SET_SHINY , 1.0F, 0, 3, 0 , 128, 0, 255, 0, "Vis" , 5, 32, -1, 0, false, false, 1, 1, 1, Dyes.dyePurple , 2, Arrays.asList(new MaterialStack(Magic, 1)), Arrays.asList(new TC_AspectStack(TC_Aspects.AURAM, 2), new TC_AspectStack(TC_Aspects.PRAECANTATIO, 1))), Redrock ( 846, TextureSet.SET_ROUGH , 1.0F, 0, 1, 1 , 255, 80, 50, 0, "Redrock" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeRed , 2, Arrays.asList(new MaterialStack(Calcite, 2), new MaterialStack(Flint, 1), new MaterialStack(Clay, 1))), PotassiumFeldspar ( 847, TextureSet.SET_FINE , 1.0F, 0, 1, 1 , 120, 40, 40, 0, "Potassium Feldspar" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyePink , 1, Arrays.asList(new MaterialStack(Potassium, 1), new MaterialStack(Aluminium, 1), new MaterialStack(Silicon, 3), new MaterialStack(Oxygen, 8))), Biotite ( 848, TextureSet.SET_METALLIC , 1.0F, 0, 1, 1 , 20, 30, 20, 0, "Biotite" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeGray , 1, Arrays.asList(new MaterialStack(Potassium, 1), new MaterialStack(Magnesium, 3), new MaterialStack(Aluminium, 3), new MaterialStack(Fluorine, 2), new MaterialStack(Silicon, 3), new MaterialStack(Oxygen, 10))), diff --git a/src/main/java/gregtech/api/enums/OrePrefixes.java b/src/main/java/gregtech/api/enums/OrePrefixes.java index 506bfe11..8c432372 100644 --- a/src/main/java/gregtech/api/enums/OrePrefixes.java +++ b/src/main/java/gregtech/api/enums/OrePrefixes.java @@ -595,9 +595,9 @@ public enum OrePrefixes { } else if (name().startsWith("crate")) { new TC_AspectStack(TC_Aspects.ITER, 2).addToAspectList(mAspects); } else if (name().startsWith("circuit")) { - new TC_AspectStack(TC_Aspects.COGNITO, 1).addToAspectList(mAspects); + new TC_AspectStack(TC_Aspects.COGNITIO, 1).addToAspectList(mAspects); } else if (name().startsWith("computer")) { - new TC_AspectStack(TC_Aspects.COGNITO, 4).addToAspectList(mAspects); + new TC_AspectStack(TC_Aspects.COGNITIO, 4).addToAspectList(mAspects); } else if (name().startsWith("battery")) { new TC_AspectStack(TC_Aspects.ELECTRUM, 1).addToAspectList(mAspects); } diff --git a/src/main/java/gregtech/common/GT_ThaumcraftCompat.java b/src/main/java/gregtech/common/GT_ThaumcraftCompat.java index 443d1ffe..8e5c00c1 100644 --- a/src/main/java/gregtech/common/GT_ThaumcraftCompat.java +++ b/src/main/java/gregtech/common/GT_ThaumcraftCompat.java @@ -36,9 +36,9 @@ public class GT_ThaumcraftCompat TC_Aspects.ARBOR.mAspect = Aspect.TREE; TC_Aspects.AURAM.mAspect = Aspect.AURA; TC_Aspects.BESTIA.mAspect = Aspect.BEAST; - TC_Aspects.COGNITO.mAspect = Aspect.MIND; + TC_Aspects.COGNITIO.mAspect = Aspect.MIND; TC_Aspects.CORPUS.mAspect = Aspect.FLESH; - TC_Aspects.EXAMINIS.mAspect = Aspect.UNDEAD; + TC_Aspects.EXANIMIS.mAspect = Aspect.UNDEAD; TC_Aspects.FABRICO.mAspect = Aspect.CRAFT; TC_Aspects.FAMES.mAspect = Aspect.HUNGER; TC_Aspects.GELUM.mAspect = Aspect.COLD; @@ -63,7 +63,7 @@ public class GT_ThaumcraftCompat TC_Aspects.PERFODIO.mAspect = Aspect.MINE; TC_Aspects.PERMUTATIO.mAspect = Aspect.EXCHANGE; TC_Aspects.POTENTIA.mAspect = Aspect.ENERGY; - TC_Aspects.PRAECANTIO.mAspect = Aspect.MAGIC; + TC_Aspects.PRAECANTATIO.mAspect = Aspect.MAGIC; TC_Aspects.SANO.mAspect = Aspect.HEAL; TC_Aspects.SENSUS.mAspect = Aspect.SENSES; TC_Aspects.SPIRITUS.mAspect = Aspect.SOUL; diff --git a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java index 60bb4a89..479ed9aa 100644 --- a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java +++ b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java @@ -337,22 +337,22 @@ public class GT_MetaGenerated_Item_01 GT_ModHandler.addRollingMachineRecipe(ItemList.Ingot_IridiumAlloy.get(1L, new Object[0]), new Object[]{"IAI", "ADA", "IAI", Character.valueOf('D'), GregTech_API.sRecipeFile.get(ConfigCategories.Recipes.harderrecipes, "iridiumplate", true) ? OreDictNames.craftingIndustrialDiamond : OrePrefixes.dust.get(Materials.Diamond), Character.valueOf('A'), OrePrefixes.plateAlloy.get("Advanced"), Character.valueOf('I'), OrePrefixes.plate.get(Materials.Iridium)}); GT_ModHandler.addCraftingRecipe(ItemList.Ingot_IridiumAlloy.get(1L, new Object[0]), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[]{"IAI", "ADA", "IAI", Character.valueOf('D'), GregTech_API.sRecipeFile.get(ConfigCategories.Recipes.harderrecipes, "iridiumplate", true) ? OreDictNames.craftingIndustrialDiamond : OrePrefixes.dust.get(Materials.Diamond), Character.valueOf('A'), OrePrefixes.plateAlloy.get("Advanced"), Character.valueOf('I'), OrePrefixes.plate.get(Materials.Iridium)}); - ItemList.Paper_Printed_Pages.set(addItem(tLastID = 481, "Printed Pages", "Used to make written Books", new Object[]{new ItemData(Materials.Paper, 10886400L, new MaterialStack[0]), new Behaviour_PrintedPages(), new TC_Aspects.TC_AspectStack(TC_Aspects.COGNITO, 2L)})); - ItemList.Paper_Magic_Empty.set(addItem(tLastID = 482, "Magic Paper", "", new Object[]{SubTag.INVISIBLE, new ItemData(Materials.Paper, 3628800L, new MaterialStack[0]), new TC_Aspects.TC_AspectStack(TC_Aspects.COGNITO, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.PRAECANTIO, 1L)})); - ItemList.Paper_Magic_Page.set(addItem(tLastID = 483, "Enchanted Page", "", new Object[]{SubTag.INVISIBLE, new ItemData(Materials.Paper, 3628800L, new MaterialStack[0]), new TC_Aspects.TC_AspectStack(TC_Aspects.COGNITO, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.PRAECANTIO, 2L)})); - ItemList.Paper_Magic_Pages.set(addItem(tLastID = 484, "Enchanted Pages", "", new Object[]{SubTag.INVISIBLE, new ItemData(Materials.Paper, 10886400L, new MaterialStack[0]), new TC_Aspects.TC_AspectStack(TC_Aspects.COGNITO, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.PRAECANTIO, 4L)})); - ItemList.Paper_Punch_Card_Empty.set(addItem(tLastID = 485, "Punch Card", "", new Object[]{SubTag.INVISIBLE, new ItemData(Materials.Paper, 7257600L, new MaterialStack[0]), new TC_Aspects.TC_AspectStack(TC_Aspects.COGNITO, 1L)})); - ItemList.Paper_Punch_Card_Encoded.set(addItem(tLastID = 486, "Punched Card", "", new Object[]{SubTag.INVISIBLE, new ItemData(Materials.Paper, 7257600L, new MaterialStack[0]), new TC_Aspects.TC_AspectStack(TC_Aspects.COGNITO, 2L)})); - ItemList.Book_Written_01.set(addItem(tLastID = 487, "Book", "", new Object[]{new ItemData(Materials.Paper, 10886400L, new MaterialStack[0]), "bookWritten", OreDictNames.craftingBook, new Behaviour_WrittenBook(), new TC_Aspects.TC_AspectStack(TC_Aspects.COGNITO, 2L)})); - ItemList.Book_Written_02.set(addItem(tLastID = 488, "Book", "", new Object[]{new ItemData(Materials.Paper, 10886400L, new MaterialStack[0]), "bookWritten", OreDictNames.craftingBook, new Behaviour_WrittenBook(), new TC_Aspects.TC_AspectStack(TC_Aspects.COGNITO, 2L)})); - ItemList.Book_Written_03.set(addItem(tLastID = 489, "Book", "", new Object[]{new ItemData(Materials.Paper, 10886400L, new MaterialStack[0]), "bookWritten", OreDictNames.craftingBook, new Behaviour_WrittenBook(), new TC_Aspects.TC_AspectStack(TC_Aspects.COGNITO, 2L)})); + ItemList.Paper_Printed_Pages.set(addItem(tLastID = 481, "Printed Pages", "Used to make written Books", new Object[]{new ItemData(Materials.Paper, 10886400L, new MaterialStack[0]), new Behaviour_PrintedPages(), new TC_Aspects.TC_AspectStack(TC_Aspects.COGNITIO, 2L)})); + ItemList.Paper_Magic_Empty.set(addItem(tLastID = 482, "Magic Paper", "", new Object[]{SubTag.INVISIBLE, new ItemData(Materials.Paper, 3628800L, new MaterialStack[0]), new TC_Aspects.TC_AspectStack(TC_Aspects.COGNITIO, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.PRAECANTATIO, 1L)})); + ItemList.Paper_Magic_Page.set(addItem(tLastID = 483, "Enchanted Page", "", new Object[]{SubTag.INVISIBLE, new ItemData(Materials.Paper, 3628800L, new MaterialStack[0]), new TC_Aspects.TC_AspectStack(TC_Aspects.COGNITIO, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.PRAECANTATIO, 2L)})); + ItemList.Paper_Magic_Pages.set(addItem(tLastID = 484, "Enchanted Pages", "", new Object[]{SubTag.INVISIBLE, new ItemData(Materials.Paper, 10886400L, new MaterialStack[0]), new TC_Aspects.TC_AspectStack(TC_Aspects.COGNITIO, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.PRAECANTATIO, 4L)})); + ItemList.Paper_Punch_Card_Empty.set(addItem(tLastID = 485, "Punch Card", "", new Object[]{SubTag.INVISIBLE, new ItemData(Materials.Paper, 7257600L, new MaterialStack[0]), new TC_Aspects.TC_AspectStack(TC_Aspects.COGNITIO, 1L)})); + ItemList.Paper_Punch_Card_Encoded.set(addItem(tLastID = 486, "Punched Card", "", new Object[]{SubTag.INVISIBLE, new ItemData(Materials.Paper, 7257600L, new MaterialStack[0]), new TC_Aspects.TC_AspectStack(TC_Aspects.COGNITIO, 2L)})); + ItemList.Book_Written_01.set(addItem(tLastID = 487, "Book", "", new Object[]{new ItemData(Materials.Paper, 10886400L, new MaterialStack[0]), "bookWritten", OreDictNames.craftingBook, new Behaviour_WrittenBook(), new TC_Aspects.TC_AspectStack(TC_Aspects.COGNITIO, 2L)})); + ItemList.Book_Written_02.set(addItem(tLastID = 488, "Book", "", new Object[]{new ItemData(Materials.Paper, 10886400L, new MaterialStack[0]), "bookWritten", OreDictNames.craftingBook, new Behaviour_WrittenBook(), new TC_Aspects.TC_AspectStack(TC_Aspects.COGNITIO, 2L)})); + ItemList.Book_Written_03.set(addItem(tLastID = 489, "Book", "", new Object[]{new ItemData(Materials.Paper, 10886400L, new MaterialStack[0]), "bookWritten", OreDictNames.craftingBook, new Behaviour_WrittenBook(), new TC_Aspects.TC_AspectStack(TC_Aspects.COGNITIO, 2L)})); ItemList.Schematic.set(addItem(tLastID = 490, "Schematic", "EMPTY", new Object[]{new ItemData(Materials.StainlessSteel, 7257600L, new MaterialStack[0]), new TC_Aspects.TC_AspectStack(TC_Aspects.STRONTIO, 1L)})); - ItemList.Schematic_Crafting.set(addItem(tLastID = 491, "Schematic (Crafting)", "Crafts the Programmed Recipe", new Object[]{new ItemData(Materials.StainlessSteel, 7257600L, new MaterialStack[0]), new TC_Aspects.TC_AspectStack(TC_Aspects.COGNITO, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.FABRICO, 1L)})); - ItemList.Schematic_1by1.set(addItem(tLastID = 495, "Schematic (1x1)", "Crafts 1 Items as 1x1 (use in Packager)", new Object[]{new ItemData(Materials.StainlessSteel, 7257600L, new MaterialStack[0]), new TC_Aspects.TC_AspectStack(TC_Aspects.COGNITO, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.FABRICO, 1L)})); - ItemList.Schematic_2by2.set(addItem(tLastID = 496, "Schematic (2x2)", "Crafts 4 Items as 2x2 (use in Packager)", new Object[]{new ItemData(Materials.StainlessSteel, 7257600L, new MaterialStack[0]), new TC_Aspects.TC_AspectStack(TC_Aspects.COGNITO, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.FABRICO, 1L)})); - ItemList.Schematic_3by3.set(addItem(tLastID = 497, "Schematic (3x3)", "Crafts 9 Items as 3x3 (use in Packager)", new Object[]{new ItemData(Materials.StainlessSteel, 7257600L, new MaterialStack[0]), new TC_Aspects.TC_AspectStack(TC_Aspects.COGNITO, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.FABRICO, 1L)})); - ItemList.Schematic_Dust.set(addItem(tLastID = 498, "Schematic (Dusts)", "Combines Dusts (use in Packager)", new Object[]{new ItemData(Materials.StainlessSteel, 7257600L, new MaterialStack[0]), new TC_Aspects.TC_AspectStack(TC_Aspects.COGNITO, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.FABRICO, 1L)})); + ItemList.Schematic_Crafting.set(addItem(tLastID = 491, "Schematic (Crafting)", "Crafts the Programmed Recipe", new Object[]{new ItemData(Materials.StainlessSteel, 7257600L, new MaterialStack[0]), new TC_Aspects.TC_AspectStack(TC_Aspects.COGNITIO, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.FABRICO, 1L)})); + ItemList.Schematic_1by1.set(addItem(tLastID = 495, "Schematic (1x1)", "Crafts 1 Items as 1x1 (use in Packager)", new Object[]{new ItemData(Materials.StainlessSteel, 7257600L, new MaterialStack[0]), new TC_Aspects.TC_AspectStack(TC_Aspects.COGNITIO, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.FABRICO, 1L)})); + ItemList.Schematic_2by2.set(addItem(tLastID = 496, "Schematic (2x2)", "Crafts 4 Items as 2x2 (use in Packager)", new Object[]{new ItemData(Materials.StainlessSteel, 7257600L, new MaterialStack[0]), new TC_Aspects.TC_AspectStack(TC_Aspects.COGNITIO, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.FABRICO, 1L)})); + ItemList.Schematic_3by3.set(addItem(tLastID = 497, "Schematic (3x3)", "Crafts 9 Items as 3x3 (use in Packager)", new Object[]{new ItemData(Materials.StainlessSteel, 7257600L, new MaterialStack[0]), new TC_Aspects.TC_AspectStack(TC_Aspects.COGNITIO, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.FABRICO, 1L)})); + ItemList.Schematic_Dust.set(addItem(tLastID = 498, "Schematic (Dusts)", "Combines Dusts (use in Packager)", new Object[]{new ItemData(Materials.StainlessSteel, 7257600L, new MaterialStack[0]), new TC_Aspects.TC_AspectStack(TC_Aspects.COGNITIO, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.FABRICO, 1L)})); GT_ModHandler.addCraftingRecipe(ItemList.Schematic_1by1.get(1L, new Object[0]), GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[]{"d ", " P ", " ", Character.valueOf('P'), ItemList.Schematic}); GT_ModHandler.addCraftingRecipe(ItemList.Schematic_2by2.get(1L, new Object[0]), GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[]{" d ", " P ", " ", Character.valueOf('P'), ItemList.Schematic}); @@ -546,11 +546,11 @@ public class GT_MetaGenerated_Item_01 GT_ModHandler.addCraftingRecipe(ItemList.Electric_Piston_EV.get(1L, new Object[0]), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"PPP", "CSS", "CMG", Character.valueOf('P'), OrePrefixes.plate.get(Materials.Titanium), Character.valueOf('S'), OrePrefixes.stick.get(Materials.Titanium), Character.valueOf('G'), OrePrefixes.gearGtSmall.get(Materials.Titanium), Character.valueOf('M'), ItemList.Electric_Motor_EV, Character.valueOf('C'), OrePrefixes.cableGt01.get(Materials.Aluminium)}); GT_ModHandler.addCraftingRecipe(ItemList.Electric_Piston_IV.get(1L, new Object[0]), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"PPP", "CSS", "CMG", Character.valueOf('P'), OrePrefixes.plate.get(Materials.TungstenSteel), Character.valueOf('S'), OrePrefixes.stick.get(Materials.TungstenSteel), Character.valueOf('G'), OrePrefixes.gearGtSmall.get(Materials.TungstenSteel), Character.valueOf('M'), ItemList.Electric_Motor_IV, Character.valueOf('C'), OrePrefixes.cableGt01.get(Materials.Tungsten)}); - ItemList.Robot_Arm_LV.set(addItem(tLastID = 650, "Robot Arm (LV)", "Inserts into specific Slots (as Cover)", new Object[]{new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.MOTUS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.COGNITO, 1L)})); - ItemList.Robot_Arm_MV.set(addItem(tLastID = 651, "Robot Arm (MV)", "Inserts into specific Slots (as Cover)", new Object[]{new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 4L), new TC_Aspects.TC_AspectStack(TC_Aspects.MOTUS, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.COGNITO, 2L)})); - ItemList.Robot_Arm_HV.set(addItem(tLastID = 652, "Robot Arm (HV)", "Inserts into specific Slots (as Cover)", new Object[]{new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 4L), new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 8L), new TC_Aspects.TC_AspectStack(TC_Aspects.MOTUS, 4L), new TC_Aspects.TC_AspectStack(TC_Aspects.COGNITO, 4L)})); - ItemList.Robot_Arm_EV.set(addItem(tLastID = 653, "Robot Arm (EV)", "Inserts into specific Slots (as Cover)", new Object[]{new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 8L), new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 16L), new TC_Aspects.TC_AspectStack(TC_Aspects.MOTUS, 8L), new TC_Aspects.TC_AspectStack(TC_Aspects.COGNITO, 8L)})); - ItemList.Robot_Arm_IV.set(addItem(tLastID = 654, "Robot Arm (IV)", "Inserts into specific Slots (as Cover)", new Object[]{new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 16L), new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 32L), new TC_Aspects.TC_AspectStack(TC_Aspects.MOTUS, 16L), new TC_Aspects.TC_AspectStack(TC_Aspects.COGNITO, 16L)})); + ItemList.Robot_Arm_LV.set(addItem(tLastID = 650, "Robot Arm (LV)", "Inserts into specific Slots (as Cover)", new Object[]{new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.MOTUS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.COGNITIO, 1L)})); + ItemList.Robot_Arm_MV.set(addItem(tLastID = 651, "Robot Arm (MV)", "Inserts into specific Slots (as Cover)", new Object[]{new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 4L), new TC_Aspects.TC_AspectStack(TC_Aspects.MOTUS, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.COGNITIO, 2L)})); + ItemList.Robot_Arm_HV.set(addItem(tLastID = 652, "Robot Arm (HV)", "Inserts into specific Slots (as Cover)", new Object[]{new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 4L), new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 8L), new TC_Aspects.TC_AspectStack(TC_Aspects.MOTUS, 4L), new TC_Aspects.TC_AspectStack(TC_Aspects.COGNITIO, 4L)})); + ItemList.Robot_Arm_EV.set(addItem(tLastID = 653, "Robot Arm (EV)", "Inserts into specific Slots (as Cover)", new Object[]{new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 8L), new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 16L), new TC_Aspects.TC_AspectStack(TC_Aspects.MOTUS, 8L), new TC_Aspects.TC_AspectStack(TC_Aspects.COGNITIO, 8L)})); + ItemList.Robot_Arm_IV.set(addItem(tLastID = 654, "Robot Arm (IV)", "Inserts into specific Slots (as Cover)", new Object[]{new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 16L), new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 32L), new TC_Aspects.TC_AspectStack(TC_Aspects.MOTUS, 16L), new TC_Aspects.TC_AspectStack(TC_Aspects.COGNITIO, 16L)})); ItemList.Robot_Arm_LuV.set(ItemList.Robot_Arm_IV.get(1L, new Object[0])); ItemList.Robot_Arm_ZPM.set(ItemList.Robot_Arm_LuV.get(1L, new Object[0])); ItemList.Robot_Arm_UV.set(ItemList.Robot_Arm_ZPM.get(1L, new Object[0])); @@ -660,7 +660,7 @@ public class GT_MetaGenerated_Item_01 GT_Values.RA.addAssemblerRecipe(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iron, 1L), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iridium, 1L), ItemList.Upgrade_Lock.get(1L, new Object[0]), 6400, 16); GT_Values.RA.addAssemblerRecipe(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.WroughtIron, 1L), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iridium, 1L), ItemList.Upgrade_Lock.get(1L, new Object[0]), 6400, 16); - ItemList.Component_Filter.set(addItem(tLastID = 729, "Item Filter", "", new Object[]{new ItemData(Materials.Zinc, OrePrefixes.foil.mMaterialAmount * 16L, new MaterialStack[0]), new TC_Aspects.TC_AspectStack(TC_Aspects.COGNITO, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.SENSUS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.ITER, 1L), OreDictNames.craftingFilter})); + ItemList.Component_Filter.set(addItem(tLastID = 729, "Item Filter", "", new Object[]{new ItemData(Materials.Zinc, OrePrefixes.foil.mMaterialAmount * 16L, new MaterialStack[0]), new TC_Aspects.TC_AspectStack(TC_Aspects.COGNITIO, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.SENSUS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.ITER, 1L), OreDictNames.craftingFilter})); GT_Values.RA.addAssemblerRecipe(GT_ModHandler.getIC2Item("carbonMesh", 4L), GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Zinc, 16L), Materials.Plastic.getMolten(144), ItemList.Component_Filter.get(1L, new Object[0]), 1600, 32); @@ -679,7 +679,7 @@ public class GT_MetaGenerated_Item_01 GregTech_API.registerCover(ItemList.Cover_EnergyDetector.get(1L, new Object[0]), new GT_MultiTexture(new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[2][0], new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_ENERGYDETECTOR)}), new GT_Cover_EUMeter()); GregTech_API.registerCover(ItemList.Cover_PlayerDetector.get(1L, new Object[0]), new GT_MultiTexture(new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[2][0], new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_ACTIVITYDETECTOR)}), new GT_Cover_PlayerDetector()); - ItemList.Cover_Screen.set(addItem(tLastID = 740, "Computer Monitor", "Displays Data", new Object[]{new TC_Aspects.TC_AspectStack(TC_Aspects.COGNITO, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.LUX, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1L)})); + ItemList.Cover_Screen.set(addItem(tLastID = 740, "Computer Monitor", "Displays Data", new Object[]{new TC_Aspects.TC_AspectStack(TC_Aspects.COGNITIO, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.LUX, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1L)})); ItemList.Cover_Crafting.set(addItem(tLastID = 744, "Crafting Table Cover", "Better than a wooden Workbench", new Object[]{new TC_Aspects.TC_AspectStack(TC_Aspects.FABRICO, 4L)})); ItemList.Cover_Drain.set(addItem(tLastID = 745, "Drain", "Absorbs Fluids and collects Rain", new Object[]{new TC_Aspects.TC_AspectStack(TC_Aspects.VACUOS, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 2L)})); diff --git a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java index a6ebb643..66ea539c 100644 --- a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java +++ b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java @@ -1347,7 +1347,7 @@ public class GT_MachineRecipeLoader tKey = "GT_ADVANCEDMETALLURGY"; GT_LanguageManager.addStringLocalization("gt.research.page.1." + tKey, "Now that you have discovered all the basic metals, you can finally move on to the next Level of magic metallurgy and create more advanced metals"); - GregTech_API.sThaumcraftCompat.addResearch(tKey, "Advanced Metallurgic Transmutation", "Mastering the basic metals", new String[]{"GT_TRANSBISMUTH", "GT_IRON_TO_STEEL", "GT_TRANSSOLDERINGALLOY", "GT_TRANSBATTERYALLOY", "GT_TRANSBRASS", "GT_TRANSELECTRUM", "GT_TRANSCUPRONICKEL", "GT_TRANSINVAR"}, "ALCHEMY", GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Iron, 1L), 3, 0, 16, 14, Arrays.asList(new TC_Aspects.TC_AspectStack[]{new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 50L), new TC_Aspects.TC_AspectStack(TC_Aspects.PERMUTATIO, 20L), new TC_Aspects.TC_AspectStack(TC_Aspects.COGNITO, 20L), new TC_Aspects.TC_AspectStack(TC_Aspects.PRAECANTIO, 20L), new TC_Aspects.TC_AspectStack(TC_Aspects.NEBRISUM, 20L), new TC_Aspects.TC_AspectStack(TC_Aspects.MAGNETO, 20L)}), null, new Object[]{"gt.research.page.1." + tKey}); + GregTech_API.sThaumcraftCompat.addResearch(tKey, "Advanced Metallurgic Transmutation", "Mastering the basic metals", new String[]{"GT_TRANSBISMUTH", "GT_IRON_TO_STEEL", "GT_TRANSSOLDERINGALLOY", "GT_TRANSBATTERYALLOY", "GT_TRANSBRASS", "GT_TRANSELECTRUM", "GT_TRANSCUPRONICKEL", "GT_TRANSINVAR"}, "ALCHEMY", GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Iron, 1L), 3, 0, 16, 14, Arrays.asList(new TC_Aspects.TC_AspectStack[]{new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 50L), new TC_Aspects.TC_AspectStack(TC_Aspects.PERMUTATIO, 20L), new TC_Aspects.TC_AspectStack(TC_Aspects.COGNITIO, 20L), new TC_Aspects.TC_AspectStack(TC_Aspects.PRAECANTATIO, 20L), new TC_Aspects.TC_AspectStack(TC_Aspects.NEBRISUM, 20L), new TC_Aspects.TC_AspectStack(TC_Aspects.MAGNETO, 20L)}), null, new Object[]{"gt.research.page.1." + tKey}); tKey = "GT_TRANSALUMINIUM"; GT_LanguageManager.addStringLocalization("gt.research.page.1." + tKey, "You have discovered a way to multiply aluminium by steeping aluminium nuggets in metallum harvested from other metals.

This transmutation is slightly harder to achieve, because aluminium has special properties, which require more order to achieve the desired result."); @@ -1369,7 +1369,7 @@ public class GT_MachineRecipeLoader 3, 0, -3, 10, Arrays.asList(new TC_Aspects.TC_AspectStack[]{ new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 10L), - new TC_Aspects.TC_AspectStack(TC_Aspects.COGNITO, 10L), + new TC_Aspects.TC_AspectStack(TC_Aspects.COGNITIO, 10L), new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 20L), new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 10L)}), null, new Object[]{"gt.research.page.1." + tKey, @@ -1403,7 +1403,7 @@ public class GT_MachineRecipeLoader 1, 1, -4, 12, Arrays.asList(new TC_Aspects.TC_AspectStack[]{ new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 10L), - new TC_Aspects.TC_AspectStack(TC_Aspects.COGNITO, 10L), + new TC_Aspects.TC_AspectStack(TC_Aspects.COGNITIO, 10L), new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 20L), new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 10L)}), null, new Object[]{"gt.research.page.1." + tKey, @@ -1437,7 +1437,7 @@ public class GT_MachineRecipeLoader 1, 1, -4, 14, Arrays.asList(new TC_Aspects.TC_AspectStack[]{ new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 20L), - new TC_Aspects.TC_AspectStack(TC_Aspects.COGNITO, 20L), + new TC_Aspects.TC_AspectStack(TC_Aspects.COGNITIO, 20L), new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 40L), new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 20L)}), null, new Object[]{"gt.research.page.1." + tKey, @@ -1472,7 +1472,7 @@ public class GT_MachineRecipeLoader 3, 0, -2, 12, Arrays.asList(new TC_Aspects.TC_AspectStack[]{ new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 10L), - new TC_Aspects.TC_AspectStack(TC_Aspects.COGNITO, 10L), + new TC_Aspects.TC_AspectStack(TC_Aspects.COGNITIO, 10L), new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 20L), new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 10L)}), null, new Object[]{"gt.research.page.1." + tKey, @@ -1506,7 +1506,7 @@ public class GT_MachineRecipeLoader 3, 1, -2, 14, Arrays.asList(new TC_Aspects.TC_AspectStack[]{ new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 10L), - new TC_Aspects.TC_AspectStack(TC_Aspects.COGNITO, 10L), + new TC_Aspects.TC_AspectStack(TC_Aspects.COGNITIO, 10L), new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 20L), new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 10L)}), null, new Object[]{"gt.research.page.1." + tKey, From ab6c431b880641f287e68c5e9a24cf5fe6bf39d2 Mon Sep 17 00:00:00 2001 From: Muramasa Date: Wed, 25 May 2016 22:25:24 +0100 Subject: [PATCH 7/9] Rearranged two achievements. Fixes #478 --- src/main/java/gregtech/loaders/misc/GT_Achievements.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/gregtech/loaders/misc/GT_Achievements.java b/src/main/java/gregtech/loaders/misc/GT_Achievements.java index 5cde8a42..87e18a98 100644 --- a/src/main/java/gregtech/loaders/misc/GT_Achievements.java +++ b/src/main/java/gregtech/loaders/misc/GT_Achievements.java @@ -172,9 +172,9 @@ public class GT_Achievements { registerAchievement("higherefficency", 14, 10, ItemList.Generator_Plasma_IV.get(1, new Object[]{}), "fusion", false); registerAchievement("advancing", 12, 8, ItemList.FusionComputer_ZPMV.get(1, new Object[]{}), "fusion", false); registerAchievement("tothelimit", 12, 10, ItemList.Generator_Plasma_LuV.get(1, new Object[]{}), "advancing", false); - registerAchievement("denseaspossible", 10, 10, ItemList.FusionComputer_UV.get(1, new Object[]{}), "tothelimit", false); - registerAchievement("fullefficiency", 10, 12, ItemList.Generator_Plasma_ZPMV.get(1, new Object[]{}), "denseaspossible", false); - registerAchievement("whatnow", 8, 10, ItemList.ZPM2.get(1, new Object[]{}), "denseaspossible", false); + registerAchievement("fullefficiency", 10, 10, ItemList.Generator_Plasma_ZPMV.get(1, new Object[]{}), "tothelimit", false); + registerAchievement("denseaspossible", 8, 10, ItemList.FusionComputer_UV.get(1, new Object[]{}), "fullefficiency", false); + registerAchievement("whatnow", 6, 10, ItemList.ZPM2.get(1, new Object[]{}), "denseaspossible", false); if(Loader.isModLoaded("NotEnoughItems") && GT_Mod.gregtechproxy.mHideUnusedOres){ for (int i = 1; i < GregTech_API.sGeneratedMaterials.length; i++) { From fced86e11af35318bf3ef4129dd5a6584ad079e0 Mon Sep 17 00:00:00 2001 From: Muramasa Date: Thu, 26 May 2016 00:52:09 +0100 Subject: [PATCH 8/9] Fixes #268. Shows plasma cells that have a fusion recipe --- .../common/items/GT_MetaGenerated_Item_01.java | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java index 479ed9aa..5c480569 100644 --- a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java +++ b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java @@ -14,6 +14,7 @@ import gregtech.api.objects.MaterialStack; import gregtech.api.util.*; import gregtech.common.covers.*; import gregtech.common.items.behaviors.*; +import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_FusionComputer; import net.minecraft.block.Block; import net.minecraft.enchantment.Enchantment; import net.minecraft.entity.item.EntityItem; @@ -24,7 +25,9 @@ import net.minecraft.item.EnumAction; import net.minecraft.item.ItemStack; import net.minecraft.potion.Potion; import net.minecraft.util.MathHelper; +import net.minecraftforge.fluids.FluidStack; +import java.util.Collection; import java.util.List; public class GT_MetaGenerated_Item_01 @@ -813,8 +816,18 @@ public class GT_MetaGenerated_Item_01 } } + public boolean isPlasmaCellUsed(OrePrefixes aPrefix, Materials aMaterial) { + Collection fusionRecipes = GT_Recipe.GT_Recipe_Map.sFusionRecipes.mRecipeList; + if(aPrefix == OrePrefixes.cellPlasma && aMaterial.getPlasma(1L) != null) { //Materials has a plasma fluid + for(GT_Recipe recipe : fusionRecipes) { //Loop through fusion recipes + if(recipe.getFluidOutput(0).isFluidEqual(aMaterial.getPlasma(1L))) return true; //Fusion recipe output matches current plasma cell fluid + } + } + return false; + } + public boolean doesShowInCreative(OrePrefixes aPrefix, Materials aMaterial, boolean aDoShowAllItems) { - return (aDoShowAllItems) || (((aPrefix != OrePrefixes.gem) || (!aMaterial.name().startsWith("Infused"))) && (aPrefix != OrePrefixes.nugget) && (aPrefix != OrePrefixes.dustTiny) && (aPrefix != OrePrefixes.dustSmall) && (aPrefix != OrePrefixes.dustImpure) && (aPrefix != OrePrefixes.dustPure) && (aPrefix != OrePrefixes.crushed) && (aPrefix != OrePrefixes.crushedPurified) && (aPrefix != OrePrefixes.crushedCentrifuged) && (aPrefix != OrePrefixes.ingotHot) && (aPrefix != OrePrefixes.cellPlasma)); + return (aDoShowAllItems) || (((aPrefix != OrePrefixes.gem) || (!aMaterial.name().startsWith("Infused"))) && (aPrefix != OrePrefixes.nugget) && (aPrefix != OrePrefixes.dustTiny) && (aPrefix != OrePrefixes.dustSmall) && (aPrefix != OrePrefixes.dustImpure) && (aPrefix != OrePrefixes.dustPure) && (aPrefix != OrePrefixes.crushed) && (aPrefix != OrePrefixes.crushedPurified) && (aPrefix != OrePrefixes.crushedCentrifuged) && (aPrefix != OrePrefixes.ingotHot) && isPlasmaCellUsed(aPrefix, aMaterial)); } public ItemStack getContainerItem(ItemStack aStack) { From 79fc84d5d2f5e0ca633f54980cf8ac38ad5023ad Mon Sep 17 00:00:00 2001 From: Muramasa Date: Thu, 26 May 2016 00:55:34 +0100 Subject: [PATCH 9/9] isPlasmaCellUsed additional null check --- .../java/gregtech/common/items/GT_MetaGenerated_Item_01.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java index 5c480569..d29cd13c 100644 --- a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java +++ b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java @@ -820,7 +820,10 @@ public class GT_MetaGenerated_Item_01 Collection fusionRecipes = GT_Recipe.GT_Recipe_Map.sFusionRecipes.mRecipeList; if(aPrefix == OrePrefixes.cellPlasma && aMaterial.getPlasma(1L) != null) { //Materials has a plasma fluid for(GT_Recipe recipe : fusionRecipes) { //Loop through fusion recipes - if(recipe.getFluidOutput(0).isFluidEqual(aMaterial.getPlasma(1L))) return true; //Fusion recipe output matches current plasma cell fluid + if(recipe.getFluidOutput(0) != null) { //Make sure fluid output can't be null (not sure if possible) + if (recipe.getFluidOutput(0).isFluidEqual(aMaterial.getPlasma(1L))) + return true; //Fusion recipe output matches current plasma cell fluid + } } } return false;