From 0bdf8a2e401e622eadcefe7f546f3fb0226e5481 Mon Sep 17 00:00:00 2001 From: Blood-Asp Date: Sun, 13 Dec 2015 16:03:22 +0100 Subject: [PATCH] removed passive energy use of covers, changed size tooltips and changed comb processing --- .../gregtech/common/covers/GT_Cover_Arm.java | 2 +- .../common/covers/GT_Cover_Conveyor.java | 2 +- .../gregtech/common/covers/GT_Cover_Pump.java | 2 +- .../java/gregtech/common/items/ItemComb.java | 228 ++++++++++++++---- .../multi/GT_MetaTileEntity_AdvMiner2.java | 2 +- .../multi/GT_MetaTileEntity_Charcoal_Pit.java | 2 +- .../GT_MetaTileEntity_DistillationTower.java | 2 +- .../GT_MetaTileEntity_HeatExchanger.java | 12 +- .../GT_MetaTileEntity_LargeTurbine_Gas.java | 2 +- ...T_MetaTileEntity_LargeTurbine_HPSteam.java | 2 +- ...GT_MetaTileEntity_LargeTurbine_Plasma.java | 2 +- .../GT_MetaTileEntity_LargeTurbine_Steam.java | 2 +- .../multi/GT_MetaTileEntity_OilDrill.java | 2 +- .../multi/GT_MetaTileEntity_PyrolyseOven.java | 2 +- .../postload/GT_MachineRecipeLoader.java | 4 +- 15 files changed, 209 insertions(+), 59 deletions(-) diff --git a/src/main/java/gregtech/common/covers/GT_Cover_Arm.java b/src/main/java/gregtech/common/covers/GT_Cover_Arm.java index 80f957e5..d0c2ae3c 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_Arm.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_Arm.java @@ -21,7 +21,7 @@ public class GT_Cover_Arm return aCoverVariable; } TileEntity tTileEntity = aTileEntity.getTileEntityAtSide(aSide); - aTileEntity.decreaseStoredEnergyUnits(1L, true); + //aTileEntity.decreaseStoredEnergyUnits(1L, true); if (aTileEntity.getUniversalEnergyCapacity() >= 128L) { if (aTileEntity.isUniversalEnergyStored(256L)) { aTileEntity.decreaseStoredEnergyUnits(4 * GT_Utility.moveOneItemStackIntoSlot(aCoverVariable > 0 ? aTileEntity : tTileEntity, aCoverVariable > 0 ? tTileEntity : aTileEntity, aCoverVariable > 0 ? aSide : GT_Utility.getOppositeSide(aSide), Math.abs(aCoverVariable) - 1, null, false, (byte) 64, (byte) 1, (byte) 64, (byte) 1), true); diff --git a/src/main/java/gregtech/common/covers/GT_Cover_Conveyor.java b/src/main/java/gregtech/common/covers/GT_Cover_Conveyor.java index d52cf94a..48938187 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_Conveyor.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_Conveyor.java @@ -23,7 +23,7 @@ public class GT_Cover_Conveyor } } TileEntity tTileEntity = aTileEntity.getTileEntityAtSide(aSide); - aTileEntity.decreaseStoredEnergyUnits(1L, true); + //aTileEntity.decreaseStoredEnergyUnits(1L, true); if (((aCoverVariable % 2 != 1) || (aSide != 1)) && ((aCoverVariable % 2 != 0) || (aSide != 0)) && (aTileEntity.getUniversalEnergyCapacity() >= 128L)) { if (aTileEntity.isUniversalEnergyStored(256L)) { aTileEntity.decreaseStoredEnergyUnits(4 * GT_Utility.moveOneItemStack(aCoverVariable % 2 == 0 ? aTileEntity : tTileEntity, aCoverVariable % 2 != 0 ? aTileEntity : tTileEntity, aCoverVariable % 2 != 0 ? GT_Utility.getOppositeSide(aSide) : aSide, aCoverVariable % 2 == 0 ? GT_Utility.getOppositeSide(aSide) : aSide, null, false, (byte) 64, (byte) 1, (byte) 64, (byte) 1), true); diff --git a/src/main/java/gregtech/common/covers/GT_Cover_Pump.java b/src/main/java/gregtech/common/covers/GT_Cover_Pump.java index bef8fd4b..570d73e6 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_Pump.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_Pump.java @@ -27,7 +27,7 @@ public class GT_Cover_Pump if ((aTileEntity instanceof IFluidHandler)) { IFluidHandler tTank2 = aTileEntity.getITankContainerAtSide(aSide); if (tTank2 != null) { - aTileEntity.decreaseStoredEnergyUnits(GT_Utility.getTier(this.mTransferRate), true); + //aTileEntity.decreaseStoredEnergyUnits(GT_Utility.getTier(this.mTransferRate), true); IFluidHandler tTank1 = (IFluidHandler) aTileEntity; if (aCoverVariable % 2 == 0) { FluidStack tLiquid = tTank1.drain(ForgeDirection.getOrientation(aSide), this.mTransferRate, false); diff --git a/src/main/java/gregtech/common/items/ItemComb.java b/src/main/java/gregtech/common/items/ItemComb.java index 42311602..23c869f3 100644 --- a/src/main/java/gregtech/common/items/ItemComb.java +++ b/src/main/java/gregtech/common/items/ItemComb.java @@ -97,51 +97,191 @@ public class ItemComb extends Item { } public void initCombsRecipes() { - for (CombType type : CombType.values()) { - ItemStack tComb = getStackForType(type); - if (type.material == Materials._NULL || type == type.COAL || type == type.LIGNIE) { - if (type == type.STICKY) { - GT_Values.RA.addCentrifugeRecipe(tComb, GT_Values.NI, GT_Values.NF, GT_Values.NF, ItemList.IC2_Resin.get(1, new Object[0]), ItemList.FR_Wax.get(1, new Object[0]), - ItemList.IC2_Plantball.get(1, new Object[0]), GT_Values.NI, GT_Values.NI, GT_Values.NI, new int[] { 5000, 10000, 1500 }, 128, 5); - RecipeManagers.centrifugeManager.addRecipe(40, tComb, - ImmutableMap.of(ItemList.IC2_Resin.get(1, new Object[0]), 0.5f, ItemList.FR_Wax.get(1, new Object[0]), 1.0f, ItemList.IC2_Plantball.get(1, new Object[0]), 0.15f)); - } else if (type == type.OIL) { - GT_Values.RA.addCentrifugeRecipe(tComb, GT_Values.NI, GT_Values.NF, GT_Values.NF, ItemList.Crop_Drop_OilBerry.get(1, new Object[0]), ItemList.FR_Wax.get(1, new Object[0]), - GT_Values.NI, GT_Values.NI, GT_Values.NI, GT_Values.NI, new int[] { 10000, 10000 }, 128, 5); - RecipeManagers.centrifugeManager.addRecipe(40, tComb, ImmutableMap.of(ItemList.Crop_Drop_OilBerry.get(1, new Object[0]), 1.0f, ItemList.FR_Wax.get(1, new Object[0]), 1.0f)); - } else if (type == type.STONE || type == type.SLAG) { - GT_Values.RA.addCentrifugeRecipe(tComb, GT_Values.NI, GT_Values.NF, GT_Values.NF, GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 1), - ItemList.FR_Wax.get(1, new Object[0]), GT_Values.NI, GT_Values.NI, GT_Values.NI, GT_Values.NI, new int[] { 7000, 3000 }, 128, 5); - RecipeManagers.centrifugeManager.addRecipe(40, tComb, - ImmutableMap.of(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 1), 0.7f, ItemList.FR_Wax.get(1, new Object[0]), 0.3f)); - } else { - GT_Values.RA.addCentrifugeRecipe(tComb, GT_Values.NI, GT_Values.NF, GT_Values.NF, GT_OreDictUnificator.get(OrePrefixes.dustTiny, type.material, 1), - ItemList.FR_Wax.get(1, new Object[0]), GT_Values.NI, GT_Values.NI, GT_Values.NI, GT_Values.NI, new int[] { type.chance * 100, 3000 }, 128, 5); - RecipeManagers.centrifugeManager.addRecipe(40, tComb, - ImmutableMap.of(GT_OreDictUnificator.get(OrePrefixes.dustTiny, type.material, 1), type.chance * 0.01f, ItemList.FR_Wax.get(1, new Object[0]), 0.3f)); - } - } else { - if (GT_Mod.gregtechproxy.mNervedCombs) { - GT_Values.RA.addChemicalRecipe(GT_Utility.copyAmount(9, tComb), GT_OreDictUnificator.get(OrePrefixes.crushed, type.material, 1), Materials.Water.getFluid(1000), - type.material.mOreByProducts.isEmpty() ? null : type.material.mOreByProducts.get(0).getMolten(144), - GT_OreDictUnificator.get(OrePrefixes.crushedPurified, type.material, 4), 96, 300); + ItemStack tComb; + + //Organic + tComb = getStackForType(CombType.LIGNIE); + addSpecialCent(tComb,GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Lignite, 1), 90); + addProcess(tComb, Materials.Lignite, 100); + tComb = getStackForType(CombType.COAL); + addSpecialCent(tComb,GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Coal, 1), 40); + addProcess(tComb, Materials.Coal, 100); + tComb = getStackForType(CombType.STICKY); + addSpecialCent(tComb, ItemList.IC2_Resin.get(1, new Object[0]), 70); + tComb = getStackForType(CombType.OIL); + addSpecialCent(tComb, ItemList.Crop_Drop_OilBerry.get(1, new Object[0]), 70); + addProcess(tComb, Materials.Oilsands, 100); + + //Gem Line + tComb = getStackForType(CombType.STONE); + addSpecialCent(tComb,GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 1), 70); + addProcess(tComb, Materials.Soapstone, 100); + addProcess(tComb, Materials.Talc, 100); + addProcess(tComb, Materials.Apatite, 100); + addProcess(tComb, Materials.Phosphate, 100); + addProcess(tComb, Materials.Phosphorus, 100); + tComb = getStackForType(CombType.CERTUS); + addProcess(tComb, Materials.CertusQuartz, 100); + addProcess(tComb, Materials.Quartzite, 100); + addProcess(tComb, Materials.Barite, 100); + tComb = getStackForType(CombType.REDSTONE); + addProcess(tComb, Materials.Redstone, 100); + addProcess(tComb, Materials.Cinnabar, 100); + tComb = getStackForType(CombType.LAPIS); + addProcess(tComb, Materials.Lapis, 100); + addProcess(tComb, Materials.Sodalite, 100); + addProcess(tComb, Materials.Lazurite, 100); + addProcess(tComb, Materials.Calcite, 100); + tComb = getStackForType(CombType.RUBY); + addProcess(tComb, Materials.Ruby, 100); + addProcess(tComb, Materials.Redstone, 100); + tComb = getStackForType(CombType.SAPPHIRE); + addProcess(tComb, Materials.Sapphire, 100); + addProcess(tComb, Materials.GreenSapphire, 100); + addProcess(tComb, Materials.Almandine, 100); + addProcess(tComb, Materials.Pyrope, 100); + tComb = getStackForType(CombType.DIAMOND); + addProcess(tComb, Materials.Diamond, 100); + addProcess(tComb, Materials.Graphite, 100); + tComb = getStackForType(CombType.OLIVINE); + addProcess(tComb, Materials.Olivine, 100); + addProcess(tComb, Materials.Bentonite, 100); + addProcess(tComb, Materials.Magnesite, 100); + addProcess(tComb, Materials.Glauconite, 100); + tComb = getStackForType(CombType.EMERALD); + addProcess(tComb, Materials.Emerald, 100); + addProcess(tComb, Materials.Beryllium, 100); + addProcess(tComb, Materials.Thorium, 100); - GT_Values.RA.addAutoclaveRecipe(GT_Utility.copyAmount(16, tComb), Materials.UUMatter.getFluid(1), GT_OreDictUnificator.get(OrePrefixes.crushedPurified, type.material, 1),(type==CombType.URANIUM||type==CombType.PLUTONIUM||type==CombType.NAQUADAH)? 300: 1000, 1000, 24); - } else { - if (type == type.IRIDIUM) { - GT_Values.RA.addCentrifugeRecipe(tComb, GT_Values.NI, GT_Values.NF, GT_Values.NF, GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Iridium, 1), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Osmium, 1), ItemList.FR_Wax.get(1, new Object[0]), GT_Values.NI, GT_Values.NI, GT_Values.NI, new int[] { 2000, - 800, 3000 }, 128, 5); - RecipeManagers.centrifugeManager.addRecipe(40, tComb, ImmutableMap.of(GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Iridium, 1), 0.2f, - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Osmium, 1), 0.08f, ItemList.FR_Wax.get(1, new Object[0]), 0.3f)); - } else { - GT_Values.RA.addCentrifugeRecipe(tComb, GT_Values.NI, GT_Values.NF, GT_Values.NF, GT_OreDictUnificator.get(OrePrefixes.dustTiny, type.material, 1), - ItemList.FR_Wax.get(1, new Object[0]), GT_Values.NI, GT_Values.NI, GT_Values.NI, GT_Values.NI, new int[] { type.chance * 100, 3000 }, 128, 5); - RecipeManagers.centrifugeManager.addRecipe(40, tComb, - ImmutableMap.of(GT_OreDictUnificator.get(OrePrefixes.dustTiny, type.material, 1), type.chance * 0.01f, ItemList.FR_Wax.get(1, new Object[0]), 0.3f)); - } - } - } +// // Metals Line + tComb = getStackForType(CombType.SLAG); + addSpecialCent(tComb,GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 1), 50); + addProcess(tComb, Materials.Salt, 100); + addProcess(tComb, Materials.RockSalt, 100); + addProcess(tComb, Materials.Lepidolite, 100); + addProcess(tComb, Materials.Spodumene, 100); + addProcess(tComb, Materials.Monazite, 100); + tComb = getStackForType(CombType.COPPER); + addProcess(tComb, Materials.Copper, 100); + addProcess(tComb, Materials.Tetrahedrite, 100); + addProcess(tComb, Materials.Chalcopyrite, 100); + addProcess(tComb, Materials.Malachite, 100); + addProcess(tComb, Materials.Pyrite, 100); + addProcess(tComb, Materials.Stibnite, 100); + tComb = getStackForType(CombType.TIN); + addProcess(tComb, Materials.Tin, 100); + addProcess(tComb, Materials.Cassiterite, 100); + tComb = getStackForType(CombType.LEAD); + addProcess(tComb, Materials.Lead, 100); + addProcess(tComb, Materials.Galena, 100); + tComb = getStackForType(CombType.IRON); + addProcess(tComb, Materials.Iron, 100); + addProcess(tComb, Materials.Magnetite, 100); + addProcess(tComb, Materials.BrownLimonite, 100); + addProcess(tComb, Materials.YellowLimonite, 100); + addProcess(tComb, Materials.VanadiumMagnetite, 100); + addProcess(tComb, Materials.BandedIron, 100); + addProcess(tComb, Materials.Pyrite, 100); + addProcess(tComb, Materials.MeteoricIron, 100); + tComb = getStackForType(CombType.STEEL); + addProcess(tComb, Materials.Iron, Materials.Steel, 100); + addProcess(tComb, Materials.Magnetite, Materials.Steel, 100); + addProcess(tComb, Materials.BrownLimonite, Materials.Steel, 100); + addProcess(tComb, Materials.YellowLimonite, Materials.Steel, 100); + addProcess(tComb, Materials.VanadiumMagnetite, Materials.VanadiumSteel, 100); + addProcess(tComb, Materials.BandedIron, Materials.Steel, 100); + addProcess(tComb, Materials.Pyrite, Materials.Steel, 100); + addProcess(tComb, Materials.MeteoricIron, Materials.MeteoricSteel, 100); + addProcess(tComb, Materials.Molybdenite, 100); + addProcess(tComb, Materials.Molybdenum, 100); + tComb = getStackForType(CombType.NICKEL); + addProcess(tComb, Materials.Nickel, 100); + addProcess(tComb, Materials.Garnierite, 100); + addProcess(tComb, Materials.Pentlandite, 100); + addProcess(tComb, Materials.Cobaltite, 100); + addProcess(tComb, Materials.Wulfenite, 100); + addProcess(tComb, Materials.Powellite, 100); + tComb = getStackForType(CombType.ZINC); + addProcess(tComb, Materials.Zinc, 100); + addProcess(tComb, Materials.Sphalerite, 100); + addProcess(tComb, Materials.Sulfur, 100); + tComb = getStackForType(CombType.SILVER); + addProcess(tComb, Materials.Silver, 100); + addProcess(tComb, Materials.Galena, 100); + tComb = getStackForType(CombType.GOLD); + addProcess(tComb, Materials.Gold, 100); + addProcess(tComb, Materials.Magnetite, Materials.Gold, 100); + + // Rare Metals Line + tComb = getStackForType(CombType.ALUMINIUM); + addProcess(tComb,Materials.Aluminium,60); + addProcess(tComb,Materials.Bauxite,100); + tComb = getStackForType(CombType.MANGANESE); + addProcess(tComb,Materials.Manganese,30); + addProcess(tComb,Materials.Grossular,100); + addProcess(tComb,Materials.Spessartine,100); + addProcess(tComb,Materials.Pyrolusite,100); + addProcess(tComb,Materials.Tantalite,100); + tComb = getStackForType(CombType.TITANIUM); + addProcess(tComb,Materials.Titanium,100); + addProcess(tComb,Materials.Ilmenite,100); + addProcess(tComb,Materials.Bauxite,100); + tComb = getStackForType(CombType.CHROME); + addProcess(tComb,Materials.Chrome,50); + addProcess(tComb,Materials.Ruby,100); + addProcess(tComb,Materials.Chromite,50); + addProcess(tComb,Materials.Redstone,100); + addProcess(tComb, Materials.Neodymium, 100); + addProcess(tComb, Materials.Bastnasite, 100); + tComb = getStackForType(CombType.TUNGSTEN); + addProcess(tComb,Materials.Tungstate,100); + addProcess(tComb,Materials.Scheelite,100); + addProcess(tComb,Materials.Lithium,100); + tComb = getStackForType(CombType.PLATINUM); + addProcess(tComb,Materials.Platinum,40); + addProcess(tComb,Materials.Cooperite,40); + addProcess(tComb,Materials.Palladium,40); + tComb = getStackForType(CombType.IRIDIUM); + addProcess(tComb,Materials.Iridium,20); + addProcess(tComb,Materials.Osmium,20); + + // Radioactive Line + tComb = getStackForType(CombType.URANIUM); + addProcess(tComb,Materials.Uranium,50); + addProcess(tComb,Materials.Pitchblende,50); + addProcess(tComb,Materials.Uraninite,50); + addProcess(tComb,Materials.Uranium235,50); + tComb = getStackForType(CombType.PLUTONIUM); + addProcess(tComb,Materials.Plutonium,10); + addProcess(tComb,Materials.Uranium235,Materials.Plutonium,5); + tComb = getStackForType(CombType.NAQUADAH); + addProcess(tComb,Materials.Naquadah,10); + addProcess(tComb,Materials.NaquadahEnriched,10); + addProcess(tComb,Materials.Naquadria,10); + } + public void addSpecialCent(ItemStack tComb, ItemStack aOutput, int chance){ + GT_Values.RA.addCentrifugeRecipe(tComb, GT_Values.NI, GT_Values.NF, GT_Values.NF, aOutput, ItemList.FR_Wax.get(1, new Object[0]), GT_Values.NI, GT_Values.NI, GT_Values.NI, GT_Values.NI, new int[] { chance * 100, 3000 }, 128, 5); + RecipeManagers.centrifugeManager.addRecipe(40, tComb, ImmutableMap.of(aOutput, chance * 0.01f, ItemList.FR_Wax.get(1, new Object[0]), 0.3f)); + } + + public void addProcess(ItemStack tComb, Materials aMaterial, int chance){ + if(GT_Mod.gregtechproxy.mNervedCombs){ + GT_Values.RA.addChemicalRecipe(GT_Utility.copyAmount(9, tComb), GT_OreDictUnificator.get(OrePrefixes.crushed, aMaterial, 1), Materials.Water.getFluid(1000), aMaterial.mOreByProducts.isEmpty() ? null : aMaterial.mOreByProducts.get(0).getMolten(144), GT_OreDictUnificator.get(OrePrefixes.crushedPurified, aMaterial, 4), 96, 300); + GT_Values.RA.addAutoclaveRecipe(GT_Utility.copyAmount(16, tComb), Materials.UUMatter.getFluid(1), GT_OreDictUnificator.get(OrePrefixes.crushedPurified, aMaterial, 1), 1000, 1000, 24); + }else{ + GT_Values.RA.addCentrifugeRecipe(tComb, GT_Values.NI, GT_Values.NF, GT_Values.NF, GT_OreDictUnificator.get(OrePrefixes.dustTiny, aMaterial, 1), ItemList.FR_Wax.get(1, new Object[0]), GT_Values.NI, GT_Values.NI, GT_Values.NI, GT_Values.NI, new int[] { chance * 100, 3000 }, 128, 5); + RecipeManagers.centrifugeManager.addRecipe(40, tComb, ImmutableMap.of(GT_OreDictUnificator.get(OrePrefixes.dustTiny, aMaterial, 1), chance * 0.01f, ItemList.FR_Wax.get(1, new Object[0]), 0.3f)); } } + + public void addProcess(ItemStack tComb, Materials aInMaterial, Materials aOutMaterial, int chance){ + if(GT_Mod.gregtechproxy.mNervedCombs){ + GT_Values.RA.addChemicalRecipe(GT_Utility.copyAmount(9, tComb), GT_OreDictUnificator.get(OrePrefixes.crushed, aInMaterial, 1), Materials.Water.getFluid(1000), aInMaterial.mOreByProducts.isEmpty() ? null : aInMaterial.mOreByProducts.get(0).getMolten(144), GT_OreDictUnificator.get(OrePrefixes.crushedPurified, aOutMaterial, 4), 96, 300); + GT_Values.RA.addAutoclaveRecipe(GT_Utility.copyAmount(16, tComb), Materials.UUMatter.getFluid(1), GT_OreDictUnificator.get(OrePrefixes.crushedPurified, aOutMaterial, 1), 1000, 1000, 24); + }else{ + GT_Values.RA.addCentrifugeRecipe(tComb, GT_Values.NI, GT_Values.NF, GT_Values.NF, GT_OreDictUnificator.get(OrePrefixes.dustTiny, aOutMaterial, 1), ItemList.FR_Wax.get(1, new Object[0]), GT_Values.NI, GT_Values.NI, GT_Values.NI, GT_Values.NI, new int[] { chance * 100, 3000 }, 128, 5); + RecipeManagers.centrifugeManager.addRecipe(40, tComb, ImmutableMap.of(GT_OreDictUnificator.get(OrePrefixes.dustTiny, aOutMaterial, 1), chance * 0.01f, ItemList.FR_Wax.get(1, new Object[0]), 0.3f)); + } + } + } \ No newline at end of file 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 553b8f7b..fd5fceff 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 @@ -42,7 +42,7 @@ public class GT_MetaTileEntity_AdvMiner2 extends GT_MetaTileEntity_MultiBlockBas public String[] getDescription() { return new String[]{ "Controller Block for the Advanced Miner II", - "Size: 3x7x3", "Controller (front middle at bottom)", + "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", 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 77005386..6952859d 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 @@ -38,7 +38,7 @@ 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 11x5x11", + "Maximum size of logs below 11x11x5", "Each log only can have other logs,", "dirt or grass on its sides or above", "or only logs or bricks below", 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 9b932375..c0102acb 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 @@ -36,7 +36,7 @@ public class GT_MetaTileEntity_DistillationTower public String[] getDescription() { return new String[]{ "Controller Block for the Distillation Tower", - "Size: 3x6x3 (Hollow)", "Controller (front bottom)", + "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)", 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 e2b71b65..80e0d321 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 @@ -36,7 +36,17 @@ 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)"}; + 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)"}; } @Override 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 0fa94f00..e63cf31a 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,7 +35,7 @@ public class GT_MetaTileEntity_LargeTurbine_Gas extends GT_MetaTileEntity_LargeT public String[] getDescription() { return new String[]{ "Controller Block for the Large Gas Turbine", - "Size: 3x3x4 (Hollow)", "Controller (front centered)", + "Size: 3x4x3 (Hollow)", "Controller (front centered)", "1x Input Hatch (side centered)", "1x Dynamo Hatch (back centered)", "1x Maintenance Hatch (side centered)", 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 03f85015..877cf53a 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,7 +34,7 @@ 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: 3x3x4 (Hollow)", "Controller (front centered)", + "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)", 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 ace75246..f1b18ff0 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,7 +35,7 @@ public class GT_MetaTileEntity_LargeTurbine_Plasma extends GT_MetaTileEntity_Lar public String[] getDescription() { return new String[]{ "Controller Block for the Large Plasma Generator", - "Size: 3x3x4 (Hollow)", "Controller (front centered)", + "Size: 3x4x3 (Hollow)", "Controller (front centered)", "1x Input Hatch (side centered)", "1x Dynamo Hatch (back centered)", "1x Maintenance Hatch (side centered)", 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 b697ad82..9a781dad 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,7 +36,7 @@ public class GT_MetaTileEntity_LargeTurbine_Steam extends GT_MetaTileEntity_Larg public String[] getDescription() { return new String[]{ "Controller Block for the Large Steam Turbine", - "Size: 3x3x4 (Hollow)", "Controller (front centered)", + "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)", 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 1a0e1119..e5d4f60d 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,7 +33,7 @@ public class GT_MetaTileEntity_OilDrill extends GT_MetaTileEntity_MultiBlockBase public String[] getDescription() { return new String[]{ "Controller Block for the Oil Drilling Rig", - "Size: 3x7x3", "Controller (front middle at bottom)", + "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", 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 ca2bc372..8ab62e07 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,7 +31,7 @@ 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: 5x4x5, Controller (bottom center)", + "Size: 5x5x4, Controller (bottom center)", "Made from ULV Machine Casings (min 60)", "Bottom 3x3 Kantal Heating Coils", "4 high ULV Casings around the coils", diff --git a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java index 8e684a05..17abdcf8 100644 --- a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java +++ b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java @@ -808,7 +808,7 @@ public class GT_MachineRecipeLoader GT_Values.RA.addDistillationTowerRecipe(Materials.FishOil.getFluid(24L), new FluidStack[]{Materials.Lubricant.getFluid(12L)}, null, 16, 96); GT_Values.RA.addDistillationTowerRecipe(Materials.Biomass.getFluid(150L), new FluidStack[]{Materials.Ethanol.getFluid(60L), Materials.Water.getFluid(60L)}, GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Wood, 1L), 25, 64); GT_Values.RA.addDistillationTowerRecipe(Materials.Water.getFluid(288L), new FluidStack[]{GT_ModHandler.getDistilledWater(260L)}, null, 16, 64); - GT_Values.RA.addDistillationTowerRecipe(new FluidStack(FluidRegistry.getFluid("ic2biomass"), 250), new FluidStack[]{new FluidStack(FluidRegistry.getFluid("ic2biogas"), 8000), Materials.Water.getFluid(125L)}, ItemList.IC2_Fertilizer.get(1, new Object[0]), 150, 512); + GT_Values.RA.addDistillationTowerRecipe(new FluidStack(FluidRegistry.getFluid("ic2biomass"), 250), new FluidStack[]{new FluidStack(FluidRegistry.getFluid("ic2biogas"), 8000), Materials.Water.getFluid(125L)}, ItemList.IC2_Fertilizer.get(1, new Object[0]), 250, 480); GT_Values.RA.addFuel(GT_ModHandler.getIC2Item("biogasCell", 1L), null, 32, 1); GT_Values.RA.addDistilleryRecipe(ItemList.Circuit_Integrated.getWithDamage(0L, 1L, new Object[0]), new FluidStack(FluidRegistry.getFluid("ic2biomass"), 1), new FluidStack(FluidRegistry.getFluid("ic2biogas"), 32), 20, 30, false); @@ -1149,7 +1149,7 @@ public class GT_MachineRecipeLoader GT_ModHandler.removeFurnaceSmelting(ItemList.IC2_Resin.get(1L, new Object[0])); - GT_Values.RA.addPyrolyseRecipe(GT_ModHandler.getIC2Item("biochaff", 4), null, 1, null, new FluidStack(FluidRegistry.getFluid("ic2biomass"), 5000), 900, 10); + GT_Values.RA.addPyrolyseRecipe(GT_ModHandler.getIC2Item("biochaff", 4), Materials.Water.getFluid(4000), 1, null, new FluidStack(FluidRegistry.getFluid("ic2biomass"), 5000), 900, 10); if (Loader.isModLoaded("Railcraft")) { GT_Values.RA.addPyrolyseRecipe(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Coal, 16), null, 1, GT_ModHandler.getModItem("Railcraft", "fuel.coke", 16), Materials.Creosote.getFluid(8000), 640, 64); GT_Values.RA.addPyrolyseRecipe(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Coal, 16), Materials.Nitrogen.getGas(1000), 2, GT_ModHandler.getModItem("Railcraft", "fuel.coke", 16), Materials.Creosote.getFluid(8000), 320, 96);