From 99a280af58603cdb8cb79eb0a5e243bbd4a15bc5 Mon Sep 17 00:00:00 2001 From: Technus Date: Mon, 9 Jan 2017 23:22:59 +0100 Subject: [PATCH 01/15] Duct tape generator fuel issue --- .../implementations/GT_MetaTileEntity_BasicGenerator.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicGenerator.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicGenerator.java index c8031b86..3e7b34e1 100644 --- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicGenerator.java +++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicGenerator.java @@ -143,7 +143,7 @@ public abstract class GT_MetaTileEntity_BasicGenerator extends GT_MetaTileEntity @Override public boolean doesFillContainers() { - return getBaseMetaTileEntity().isAllowedToWork(); + return false; } @Override From 5d58f4aecc3307765a0f014835d3579bb325eb90 Mon Sep 17 00:00:00 2001 From: Technus Date: Mon, 9 Jan 2017 23:26:52 +0100 Subject: [PATCH 02/15] reducing diesel pollution --- .../generators/GT_MetaTileEntity_DieselGenerator.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_DieselGenerator.java b/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_DieselGenerator.java index af6487a0..bdb55695 100644 --- a/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_DieselGenerator.java +++ b/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_DieselGenerator.java @@ -115,6 +115,6 @@ public class GT_MetaTileEntity_DieselGenerator @Override public int getPollution() { - return 10; + return 5; } } From eadaa798805a18a6d9fbaf5c55ea2a01aeacdb10 Mon Sep 17 00:00:00 2001 From: Technus Date: Wed, 11 Jan 2017 08:56:06 +0100 Subject: [PATCH 03/15] MOOOORE capacity in fluid hatches and fix generator even more --- .../GT_MetaTileEntity_BasicGenerator.java | 12 ++++++++++-- .../GT_MetaTileEntity_Hatch_Input.java | 6 ++++-- .../GT_MetaTileEntity_Hatch_Output.java | 5 +++-- 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicGenerator.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicGenerator.java index 3e7b34e1..4378957c 100644 --- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicGenerator.java +++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicGenerator.java @@ -143,6 +143,7 @@ public abstract class GT_MetaTileEntity_BasicGenerator extends GT_MetaTileEntity @Override public boolean doesFillContainers() { + //return getBaseMetaTileEntity().isAllowedToWork(); return false; } @@ -176,6 +177,12 @@ public abstract class GT_MetaTileEntity_BasicGenerator extends GT_MetaTileEntity return getFuelValue(aFluid) > 0; } + @Override + public boolean isLiquidOutput(byte aSide) { + //return super.isLiquidOutput(aSide); + return false; + } + @Override public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) { if (aBaseMetaTileEntity.isServerSide() && aBaseMetaTileEntity.isAllowedToWork() && aTick % 10 == 0) { @@ -192,9 +199,10 @@ public abstract class GT_MetaTileEntity_BasicGenerator extends GT_MetaTileEntity int tFuelValue = getFuelValue(mFluid), tConsumed = consumedFluidPerOperation(mFluid); if (tFuelValue > 0 && tConsumed > 0 && mFluid.amount > tConsumed) { long tFluidAmountToUse = Math.min(mFluid.amount / tConsumed, (maxEUOutput() * 20 + getMinimumStoredEU() - aBaseMetaTileEntity.getUniversalEnergyStored()) / tFuelValue); - if (tFluidAmountToUse > 0 && aBaseMetaTileEntity.increaseStoredEnergyUnits(tFluidAmountToUse * tFuelValue, true)) - tProducedEU = tFluidAmountToUse * tFuelValue; + if (tFluidAmountToUse > 0 && aBaseMetaTileEntity.increaseStoredEnergyUnits(tFluidAmountToUse * tFuelValue, true)) { + tProducedEU = tFluidAmountToUse * tFuelValue; mFluid.amount -= tFluidAmountToUse * tConsumed; + } } } if (mInventory[getInputSlot()] != null && aBaseMetaTileEntity.getUniversalEnergyStored() < (maxEUOutput() * 20 + getMinimumStoredEU()) && GT_Utility.getFluidForFilledItem(mInventory[getInputSlot()], true) == null) { diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Input.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Input.java index 4484347b..2bd655f8 100644 --- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Input.java +++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Input.java @@ -61,7 +61,8 @@ public class GT_MetaTileEntity_Hatch_Input extends GT_MetaTileEntity_Hatch { @Override public boolean doesFillContainers() { - return true; + //return true; + return false; } @Override @@ -111,7 +112,8 @@ public class GT_MetaTileEntity_Hatch_Input extends GT_MetaTileEntity_Hatch { @Override public int getCapacity() { - return 8000 * (mTier + 1); + if (mTier<1) return 8000; + return 16000 * (mTier*(mTier>>2)); } @Override diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Output.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Output.java index 036f5e21..c9826aa1 100644 --- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Output.java +++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Output.java @@ -106,7 +106,7 @@ public class GT_MetaTileEntity_Hatch_Output extends GT_MetaTileEntity_Hatch { @Override public boolean doesEmptyContainers() { - return true; + return false; } @Override @@ -141,7 +141,8 @@ public class GT_MetaTileEntity_Hatch_Output extends GT_MetaTileEntity_Hatch { @Override public int getCapacity() { - return 8000 * (mTier + 1); + if (mTier<1) return 8000; + return 16000 * (mTier*(mTier>>2)); } @Override From 4cc2a9dcc65fb3e528c3df613d92e3b927c83629 Mon Sep 17 00:00:00 2001 From: Dream-Master Date: Thu, 12 Jan 2017 08:14:03 +0100 Subject: [PATCH 04/15] bump version --- build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.properties b/build.properties index 1f4b5bac..2843f3ee 100644 --- a/build.properties +++ b/build.properties @@ -1,7 +1,7 @@ minecraft.version=1.7.10 forge.version=10.13.4.1566-1.7.10 -gt.version=5.09.27.06 +gt.version=5.09.27.07 ae2.version=rv2-beta-33 applecore.version=1.7.10-1.2.1+107.59407 From fca31dd9eb14f36cc177deee1768a77447d77167 Mon Sep 17 00:00:00 2001 From: Technus Date: Thu, 12 Jan 2017 23:36:42 +0100 Subject: [PATCH 05/15] add tier names to scanner --- src/main/java/gregtech/api/util/GT_Utility.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/gregtech/api/util/GT_Utility.java b/src/main/java/gregtech/api/util/GT_Utility.java index b51175dd..108f672c 100644 --- a/src/main/java/gregtech/api/util/GT_Utility.java +++ b/src/main/java/gregtech/api/util/GT_Utility.java @@ -1758,9 +1758,9 @@ public class GT_Utility { } try { if (tTileEntity instanceof IBasicEnergyContainer && ((IBasicEnergyContainer) tTileEntity).getEUCapacity() > 0) { - tList.add("Max IN: " +EnumChatFormatting.RED+ ((IBasicEnergyContainer) tTileEntity).getInputVoltage() +EnumChatFormatting.RESET+ " EU at "+EnumChatFormatting.RED+((IBasicEnergyContainer)tTileEntity).getInputAmperage()+EnumChatFormatting.RESET+" A"); - tList.add("Max OUT: " +EnumChatFormatting.RED+ ((IBasicEnergyContainer) tTileEntity).getOutputVoltage() +EnumChatFormatting.RESET+ " EU at " +EnumChatFormatting.RED+ ((IBasicEnergyContainer) tTileEntity).getOutputAmperage() +EnumChatFormatting.RESET+ " A"); - tList.add("Energy: " +EnumChatFormatting.GREEN+ GT_Utility.formatNumbers(((IBasicEnergyContainer) tTileEntity).getStoredEU()) +EnumChatFormatting.RESET+ " EU / " +EnumChatFormatting.YELLOW+ GT_Utility.formatNumbers(((IBasicEnergyContainer) tTileEntity).getEUCapacity()) +EnumChatFormatting.RESET+ " EU"); + tList.add("Max IN: " +EnumChatFormatting.RED+ ((IBasicEnergyContainer) tTileEntity).getInputVoltage() + " (" + GT_Values.VN[GT_Utility.getTier(((IBasicEnergyContainer) tTileEntity).getInputVoltage())] + ") " +EnumChatFormatting.RESET+ " EU at "+EnumChatFormatting.RED+((IBasicEnergyContainer)tTileEntity).getInputAmperage()+EnumChatFormatting.RESET+" A"); + tList.add("Max OUT: " +EnumChatFormatting.RED+ ((IBasicEnergyContainer) tTileEntity).getOutputVoltage() + " (" + GT_Values.VN[GT_Utility.getTier(((IBasicEnergyContainer) tTileEntity).getOutputVoltage())] + ") " +EnumChatFormatting.RESET+ " EU at " +EnumChatFormatting.RED+ ((IBasicEnergyContainer) tTileEntity).getOutputAmperage() +EnumChatFormatting.RESET+ " A"); + tList.add("Energy: " +EnumChatFormatting.GREEN+ GT_Utility.formatNumbers(((IBasicEnergyContainer) tTileEntity).getStoredEU()) +EnumChatFormatting.RESET+ " EU / " +EnumChatFormatting.YELLOW+ GT_Utility.formatNumbers(((IBasicEnergyContainer) tTileEntity).getEUCapacity()) +EnumChatFormatting.RESET+ " EU"); } } catch (Throwable e) { if (D1) e.printStackTrace(GT_Log.err); From 7c66a8b9eb12d17ab94919d4ea6709c62c863587 Mon Sep 17 00:00:00 2001 From: Dream-Master Date: Fri, 13 Jan 2017 15:28:38 +0100 Subject: [PATCH 06/15] add air texture idea by @mylez --- .../textures/blocks/fluids/fluid.air.png | Bin 133 -> 3002 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.air.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.air.png index 8bcaab412ffa5e0b425222170b31101961b63572..b1d11a2b0ba24d125cbb6c072f4565200cb6c742 100644 GIT binary patch delta 2996 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 From 244174e2fd907b1b20bef393171dcd7d0fd524e4 Mon Sep 17 00:00:00 2001 From: Dream-Master Date: Fri, 13 Jan 2017 15:29:52 +0100 Subject: [PATCH 07/15] bump version --- build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.properties b/build.properties index 2843f3ee..f9e2f389 100644 --- a/build.properties +++ b/build.properties @@ -1,7 +1,7 @@ minecraft.version=1.7.10 forge.version=10.13.4.1566-1.7.10 -gt.version=5.09.27.07 +gt.version=5.09.27.08 ae2.version=rv2-beta-33 applecore.version=1.7.10-1.2.1+107.59407 From 0c035f2159470ce3b72db97b9e94624e5a29101a Mon Sep 17 00:00:00 2001 From: Dream-Master Date: Sat, 14 Jan 2017 11:05:35 +0100 Subject: [PATCH 08/15] Oil and Fuel nerf by 25% @Drobac --- .../java/gregtech/api/enums/Materials.java | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/src/main/java/gregtech/api/enums/Materials.java b/src/main/java/gregtech/api/enums/Materials.java index 9cd4594f..6371b14b 100644 --- a/src/main/java/gregtech/api/enums/Materials.java +++ b/src/main/java/gregtech/api/enums/Materials.java @@ -387,7 +387,7 @@ public enum Materials implements IColorModulationContainer, ISubTagContainer { Creosote ( 712, TextureSet.SET_FLUID , 1.0F, 0, 0, 16 , 128, 64, 0, 0, "Creosote" , 3, 8, -1, 0, false, false, 1, 1, 1, Dyes.dyeBrown ), Ethanol ( 706, TextureSet.SET_FLUID , 1.0F, 0, 0, 16 , 255, 128, 0, 0, "Ethanol" , 0, 192, -1, 0, false, false, 1, 1, 1, Dyes.dyePurple ), FishOil ( 711, TextureSet.SET_FLUID , 1.0F, 0, 0, 16 , 255, 196, 0, 0, "Fish Oil" , 3, 2, -1, 0, false, false, 1, 1, 1, Dyes.dyeYellow , Arrays.asList(new TC_AspectStack(TC_Aspects.CORPUS, 2))), - Fuel ( 708, TextureSet.SET_FLUID , 1.0F, 0, 0, 16 , 255, 255, 0, 0, "Diesel" , 0, 320, -1, 0, false, false, 1, 1, 1, Dyes.dyeYellow ), + Fuel ( 708, TextureSet.SET_FLUID , 1.0F, 0, 0, 16 , 255, 255, 0, 0, "Diesel" , 0, 400, -1, 0, false, false, 1, 1, 1, Dyes.dyeYellow ), Glue ( 726, TextureSet.SET_FLUID , 1.0F, 0, 0, 16 , 200, 196, 0, 0, "Refined Glue" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeOrange , Arrays.asList(new TC_AspectStack(TC_Aspects.LIMUS, 2))), Gunpowder ( 800, TextureSet.SET_DULL , 1.0F, 0, 0, 1 , 128, 128, 128, 0, "Gunpowder" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeGray , Arrays.asList(new TC_AspectStack(TC_Aspects.PERDITIO, 3), new TC_AspectStack(TC_Aspects.IGNIS, 4))), FryingOilHot ( 727, TextureSet.SET_FLUID , 1.0F, 0, 0, 16 , 200, 196, 0, 0, "Hot Frying Oil" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeOrange , Arrays.asList(new TC_AspectStack(TC_Aspects.AQUA, 1), new TC_AspectStack(TC_Aspects.IGNIS, 1))), @@ -400,7 +400,7 @@ public enum Materials implements IColorModulationContainer, ISubTagContainer { MeatCooked ( 893, TextureSet.SET_FINE , 1.0F, 0, 0, 1 , 150, 60, 20, 0, "Cooked Meat" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyePink ), 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 ), + Oil ( 707, TextureSet.SET_FLUID , 1.0F, 0, 0, 16 , 10, 10, 10, 0, "Oil" , 3, 20, -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.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 ), @@ -520,20 +520,20 @@ public enum Materials implements IColorModulationContainer, ISubTagContainer { SodiumSulfide ( 719, TextureSet.SET_FLUID , 1.0F, 0, 2, 16 , 255, 255, 255, 0, "Sodium Sulfide" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeOrange , 1, Arrays.asList(new MaterialStack(Sodium, 2), new MaterialStack(Sulfur, 1))), HydricSulfide ( 460, TextureSet.SET_FLUID , 1.0F, 0, 2, 16 , 255, 255, 255, 0, "Hydrogen Sulfide" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeOrange , 0, Arrays.asList(new MaterialStack(Hydrogen, 2), new MaterialStack(Sulfur, 1))), - OilHeavy ( 730, TextureSet.SET_FLUID , 1.0F, 0, 0, 16 , 10, 10, 10, 0, "Heavy Oil" , 3, 32, -1, 0, false, false, 1, 1, 1, Dyes.dyeBlack ), - OilMedium ( 731, TextureSet.SET_FLUID , 1.0F, 0, 0, 16 , 10, 10, 10, 0, "Raw Oil" , 3, 24, -1, 0, false, false, 1, 1, 1, Dyes.dyeBlack ), - OilLight ( 732, TextureSet.SET_FLUID , 1.0F, 0, 0, 16 , 10, 10, 10, 0, "Light Oil" , 3, 16, -1, 0, false, false, 1, 1, 1, Dyes.dyeBlack ), + OilHeavy ( 730, TextureSet.SET_FLUID , 1.0F, 0, 0, 16 , 10, 10, 10, 0, "Heavy Oil" , 3, 40, -1, 0, false, false, 1, 1, 1, Dyes.dyeBlack ), + OilMedium ( 731, TextureSet.SET_FLUID , 1.0F, 0, 0, 16 , 10, 10, 10, 0, "Raw Oil" , 3, 30, -1, 0, false, false, 1, 1, 1, Dyes.dyeBlack ), + OilLight ( 732, TextureSet.SET_FLUID , 1.0F, 0, 0, 16 , 10, 10, 10, 0, "Light Oil" , 3, 20, -1, 0, false, false, 1, 1, 1, Dyes.dyeBlack ), NatruralGas ( 733, TextureSet.SET_FLUID , 1.0F, 0, 1, 16 , 255, 255, 255, 0, "Natural Gas" , 1, 15, -1, 0, false, false, 3, 1, 1, Dyes.dyeWhite ), - SulfuricGas ( 734, TextureSet.SET_FLUID , 1.0F, 0, 1, 16 , 255, 255, 255, 0, "Sulfuric Gas" , 1, 20, -1, 0, false, false, 3, 1, 1, Dyes.dyeWhite ), - Gas ( 735, TextureSet.SET_FLUID , 1.0F, 0, 1, 16 , 255, 255, 255, 0, "Refinery Gas" , 1, 128, -1, 0, false, false, 3, 1, 1, Dyes.dyeWhite ), - SulfuricNaphtha ( 736, TextureSet.SET_FLUID , 1.0F, 0, 0, 16 , 255, 255, 0, 0, "Sulfuric Naphtha" , 1, 32, -1, 0, false, false, 1, 1, 1, Dyes.dyeYellow ), - SulfuricLightFuel ( 737, TextureSet.SET_FLUID , 1.0F, 0, 0, 16 , 255, 255, 0, 0, "Sulfuric Light Fuel" , 0, 32, -1, 0, false, false, 1, 1, 1, Dyes.dyeYellow ), - SulfuricHeavyFuel ( 738, TextureSet.SET_FLUID , 1.0F, 0, 0, 16 , 255, 255, 0, 0, "Sulfuric Heavy Fuel" , 3, 32, -1, 0, false, false, 1, 1, 1, Dyes.dyeBlack ), - Naphtha ( 739, TextureSet.SET_FLUID , 1.0F, 0, 0, 16 , 255, 255, 0, 0, "Naphtha" , 1, 256, -1, 0, false, false, 1, 1, 1, Dyes.dyeYellow ), - LightFuel ( 740, TextureSet.SET_FLUID , 1.0F, 0, 0, 16 , 255, 255, 0, 0, "Light Fuel" , 0, 256, -1, 0, false, false, 1, 1, 1, Dyes.dyeYellow ), - HeavyFuel ( 741, TextureSet.SET_FLUID , 1.0F, 0, 0, 16 , 255, 255, 0, 0, "Heavy Fuel" , 3, 192, -1, 0, false, false, 1, 1, 1, Dyes.dyeBlack ), - LPG ( 742, TextureSet.SET_FLUID , 1.0F, 0, 0, 16 , 255, 255, 0, 0, "LPG" , 1, 256, -1, 0, false, false, 1, 1, 1, Dyes.dyeYellow ), + SulfuricGas ( 734, TextureSet.SET_FLUID , 1.0F, 0, 1, 16 , 255, 255, 255, 0, "Sulfuric Gas" , 1, 25, -1, 0, false, false, 3, 1, 1, Dyes.dyeWhite ), + Gas ( 735, TextureSet.SET_FLUID , 1.0F, 0, 1, 16 , 255, 255, 255, 0, "Refinery Gas" , 1, 160, -1, 0, false, false, 3, 1, 1, Dyes.dyeWhite ), + SulfuricNaphtha ( 736, TextureSet.SET_FLUID , 1.0F, 0, 0, 16 , 255, 255, 0, 0, "Sulfuric Naphtha" , 1, 40, -1, 0, false, false, 1, 1, 1, Dyes.dyeYellow ), + SulfuricLightFuel ( 737, TextureSet.SET_FLUID , 1.0F, 0, 0, 16 , 255, 255, 0, 0, "Sulfuric Light Fuel" , 0, 40, -1, 0, false, false, 1, 1, 1, Dyes.dyeYellow ), + SulfuricHeavyFuel ( 738, TextureSet.SET_FLUID , 1.0F, 0, 0, 16 , 255, 255, 0, 0, "Sulfuric Heavy Fuel" , 3, 40, -1, 0, false, false, 1, 1, 1, Dyes.dyeBlack ), + Naphtha ( 739, TextureSet.SET_FLUID , 1.0F, 0, 0, 16 , 255, 255, 0, 0, "Naphtha" , 1, 320, -1, 0, false, false, 1, 1, 1, Dyes.dyeYellow ), + LightFuel ( 740, TextureSet.SET_FLUID , 1.0F, 0, 0, 16 , 255, 255, 0, 0, "Light Fuel" , 0, 320, -1, 0, false, false, 1, 1, 1, Dyes.dyeYellow ), + HeavyFuel ( 741, TextureSet.SET_FLUID , 1.0F, 0, 0, 16 , 255, 255, 0, 0, "Heavy Fuel" , 3, 240, -1, 0, false, false, 1, 1, 1, Dyes.dyeBlack ), + LPG ( 742, TextureSet.SET_FLUID , 1.0F, 0, 0, 16 , 255, 255, 0, 0, "LPG" , 1, 320, -1, 0, false, false, 1, 1, 1, Dyes.dyeYellow ), CrackedLightFuel ( 743, TextureSet.SET_FLUID , 1.0F, 0, 0, 16 , 255, 255, 0, 0, "Cracked Light Fuel" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeYellow ), CrackedHeavyFuel ( 744, TextureSet.SET_FLUID , 1.0F, 0, 0, 16 , 255, 255, 0, 0, "Cracked Heavy Fuel" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeBlack ), @@ -595,7 +595,7 @@ public enum Materials implements IColorModulationContainer, ISubTagContainer { BlueSteel ( 349, TextureSet.SET_METALLIC , 7.5F, 1024, 2, 1|2 |64 , 100, 100, 140, 0, "Blue Steel" , 0, 0, -1, 1400, true, false, 4, 1, 1, Dyes.dyeBlue , 2, Arrays.asList(new MaterialStack(RoseGold, 1), new MaterialStack(Brass, 1), new MaterialStack(Steel, 2), new MaterialStack(BlackSteel, 4))), DamascusSteel ( 335, TextureSet.SET_METALLIC , 8.0F, 1280, 2, 1|2 |64 , 110, 110, 110, 0, "Damascus Steel" , 0, 0, 2000, 1500, true, false, 4, 1, 1, Dyes.dyeGray , 2, Arrays.asList(new MaterialStack(Steel, 1))), NitroCoalFuel ( -1, TextureSet.SET_FLUID , 1.0F, 0, 2, 16 , 50, 70, 50, 0, "Nitro-Coalfuel" , 0, 48, -1, 0, false, false, 1, 1, 1, Dyes.dyeBlack , 0, Arrays.asList(new MaterialStack(Glyceryl, 1), new MaterialStack(CoalFuel, 4))), - NitroFuel ( 709, TextureSet.SET_FLUID , 1.0F, 0, 2, 16 , 200, 255, 0, 0, "Nitro-Diesel" , 0, 576, -1, 0, false, false, 1, 1, 1, Dyes.dyeLime , 0, Arrays.asList(new MaterialStack(Glyceryl, 1), new MaterialStack(Fuel, 4))), + NitroFuel ( 709, TextureSet.SET_FLUID , 1.0F, 0, 2, 16 , 200, 255, 0, 0, "Nitro-Diesel" , 0, 720, -1, 0, false, false, 1, 1, 1, Dyes.dyeLime , 0, Arrays.asList(new MaterialStack(Glyceryl, 1), new MaterialStack(Fuel, 4))), AstralSilver ( 333, TextureSet.SET_SHINY , 10.0F, 64, 2, 1|2 |64 , 230, 230, 255, 0, "Astral Silver" , 0, 0, -1, 0, false, false, 4, 3, 2, Dyes.dyeWhite , 2, Arrays.asList(new MaterialStack(Silver, 2), new MaterialStack(Thaumium, 1))), //Midasium ( 332, TextureSet.SET_SHINY , 12.0F, 64, 2, 1|2 |8 |64 , 255, 200, 40, 0, "Midasium" , 0, 0, -1, 0, false, false, 4, 3, 2, Dyes.dyeOrange , 2, Arrays.asList(new MaterialStack(Gold, 2), new MaterialStack(Thaumium, 1))), BlueAlloy ( 309, TextureSet.SET_DULL , 1.0F, 0, 0, 1|2 , 100, 180, 255, 0, "Blue Alloy" , 0, 0, -1, 0, false, false, 3, 5, 1, Dyes.dyeLightBlue , 2, Arrays.asList(new MaterialStack(Silver, 1), new MaterialStack(Nikolite, 4)), Arrays.asList(new TC_AspectStack(TC_Aspects.ELECTRUM, 3))), From 739a7c7bf78816cefe9d35e61174c7db64f52b89 Mon Sep 17 00:00:00 2001 From: Dream-Master Date: Sat, 14 Jan 2017 11:05:52 +0100 Subject: [PATCH 09/15] bump version --- build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.properties b/build.properties index f9e2f389..b09b3d8f 100644 --- a/build.properties +++ b/build.properties @@ -1,7 +1,7 @@ minecraft.version=1.7.10 forge.version=10.13.4.1566-1.7.10 -gt.version=5.09.27.08 +gt.version=5.09.27.09 ae2.version=rv2-beta-33 applecore.version=1.7.10-1.2.1+107.59407 From 889d506f09dd962f25ede5248bff212d0a75ccd1 Mon Sep 17 00:00:00 2001 From: Technus Date: Sat, 14 Jan 2017 11:22:11 +0100 Subject: [PATCH 10/15] More airy air --- .../textures/blocks/fluids/fluid.air.png | Bin 3002 -> 36130 bytes .../blocks/fluids/fluid.air.png.mcmeta | 5 +++++ 2 files changed, 5 insertions(+) create mode 100644 src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.air.png.mcmeta diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.air.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.air.png index b1d11a2b0ba24d125cbb6c072f4565200cb6c742..15fbd772f049cbff3183ebfbcf892d5508f8b02a 100644 GIT binary patch literal 36130 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 Date: Sat, 14 Jan 2017 11:17:41 +0100 Subject: [PATCH 11/15] Biogas nerf 1 --- .../gregtech/loaders/postload/GT_MachineRecipeLoader.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java index 5daee2f2..30d3d2b9 100644 --- a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java +++ b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java @@ -1085,8 +1085,8 @@ public class GT_MachineRecipeLoader implements Runnable { GT_Values.RA.addFuel(new ItemStack(Items.golden_apple,1,1), new ItemStack(Items.apple,1), 6400, 5); GT_Values.RA.addDistilleryRecipe(ItemList.Circuit_Integrated.getWithDamage(0L, 1L, new Object[0]), new FluidStack(FluidRegistry.getFluid("ic2biomass"), 4), Materials.Water.getFluid(2), 80, 30, false); - GT_Values.RA.addDistilleryRecipe(ItemList.Circuit_Integrated.getWithDamage(0L, 2L, new Object[0]), new FluidStack(FluidRegistry.getFluid("ic2biomass"), 4), new FluidStack(FluidRegistry.getFluid("ic2biogas"), 125), 40, 30, false); - GT_Values.RA.addDistilleryRecipe(ItemList.Circuit_Integrated.getWithDamage(0L, 4L, new Object[0]), new FluidStack(FluidRegistry.getFluid("ic2biomass"), 128), new FluidStack(FluidRegistry.getFluid("ic2biogas"), 4000), 80, 120, false); + GT_Values.RA.addDistilleryRecipe(ItemList.Circuit_Integrated.getWithDamage(0L, 2L, new Object[0]), new FluidStack(FluidRegistry.getFluid("ic2biomass"), 4), new FluidStack(FluidRegistry.getFluid("ic2biogas"), 100), 40, 30, false); + //GT_Values.RA.addDistilleryRecipe(ItemList.Circuit_Integrated.getWithDamage(0L, 4L, new Object[0]), new FluidStack(FluidRegistry.getFluid("ic2biomass"), 128), new FluidStack(FluidRegistry.getFluid("ic2biogas"), 3200),320, 120, false); GT_Values.RA.addDistilleryRecipe(ItemList.Circuit_Integrated.getWithDamage(0L, 8L, new Object[0]), new FluidStack(FluidRegistry.getFluid("ic2biomass"), 16), Materials.Plastic.getMolten(16L), 80, 30, false); GT_Values.RA.addFuel(GT_ModHandler.getModItem("Thaumcraft", "ItemShard", 1L, 6), null, 720, 5); From e2948b1ab8727bf5665ff22ad97a5099b4e6ceca Mon Sep 17 00:00:00 2001 From: Technus Date: Sat, 14 Jan 2017 11:46:47 +0100 Subject: [PATCH 12/15] Less evil biogas nerf --- .../gregtech/loaders/postload/GT_MachineRecipeLoader.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java index 30d3d2b9..30dae61c 100644 --- a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java +++ b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java @@ -1085,8 +1085,8 @@ public class GT_MachineRecipeLoader implements Runnable { GT_Values.RA.addFuel(new ItemStack(Items.golden_apple,1,1), new ItemStack(Items.apple,1), 6400, 5); GT_Values.RA.addDistilleryRecipe(ItemList.Circuit_Integrated.getWithDamage(0L, 1L, new Object[0]), new FluidStack(FluidRegistry.getFluid("ic2biomass"), 4), Materials.Water.getFluid(2), 80, 30, false); - GT_Values.RA.addDistilleryRecipe(ItemList.Circuit_Integrated.getWithDamage(0L, 2L, new Object[0]), new FluidStack(FluidRegistry.getFluid("ic2biomass"), 4), new FluidStack(FluidRegistry.getFluid("ic2biogas"), 100), 40, 30, false); - //GT_Values.RA.addDistilleryRecipe(ItemList.Circuit_Integrated.getWithDamage(0L, 4L, new Object[0]), new FluidStack(FluidRegistry.getFluid("ic2biomass"), 128), new FluidStack(FluidRegistry.getFluid("ic2biogas"), 3200),320, 120, false); + GT_Values.RA.addDistilleryRecipe(ItemList.Circuit_Integrated.getWithDamage(0L, 2L, new Object[0]), new FluidStack(FluidRegistry.getFluid("ic2biomass"), 5), new FluidStack(FluidRegistry.getFluid("ic2biogas"), 125), 50, 30, false); + GT_Values.RA.addDistilleryRecipe(ItemList.Circuit_Integrated.getWithDamage(0L, 4L, new Object[0]), new FluidStack(FluidRegistry.getFluid("ic2biomass"), 25), new FluidStack(FluidRegistry.getFluid("ic2biogas"), 625), 70, 120, false); GT_Values.RA.addDistilleryRecipe(ItemList.Circuit_Integrated.getWithDamage(0L, 8L, new Object[0]), new FluidStack(FluidRegistry.getFluid("ic2biomass"), 16), Materials.Plastic.getMolten(16L), 80, 30, false); GT_Values.RA.addFuel(GT_ModHandler.getModItem("Thaumcraft", "ItemShard", 1L, 6), null, 720, 5); From c4eba4d1d704e2c063102004c5d97d87c850ed09 Mon Sep 17 00:00:00 2001 From: Technus Date: Sat, 14 Jan 2017 12:20:34 +0100 Subject: [PATCH 13/15] Nerf all GT Biogassss recipes --- .../gregtech/loaders/postload/GT_MachineRecipeLoader.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java index 30dae61c..6800c898 100644 --- a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java +++ b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java @@ -1080,13 +1080,13 @@ public class GT_MachineRecipeLoader implements Runnable { 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]), 250, 480); + GT_Values.RA.addDistillationTowerRecipe(new FluidStack(FluidRegistry.getFluid("ic2biomass"), 250), new FluidStack[]{new FluidStack(FluidRegistry.getFluid("ic2biogas"), 6250), 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.addFuel(new ItemStack(Items.golden_apple,1,1), new ItemStack(Items.apple,1), 6400, 5); GT_Values.RA.addDistilleryRecipe(ItemList.Circuit_Integrated.getWithDamage(0L, 1L, new Object[0]), new FluidStack(FluidRegistry.getFluid("ic2biomass"), 4), Materials.Water.getFluid(2), 80, 30, false); - GT_Values.RA.addDistilleryRecipe(ItemList.Circuit_Integrated.getWithDamage(0L, 2L, new Object[0]), new FluidStack(FluidRegistry.getFluid("ic2biomass"), 5), new FluidStack(FluidRegistry.getFluid("ic2biogas"), 125), 50, 30, false); - GT_Values.RA.addDistilleryRecipe(ItemList.Circuit_Integrated.getWithDamage(0L, 4L, new Object[0]), new FluidStack(FluidRegistry.getFluid("ic2biomass"), 25), new FluidStack(FluidRegistry.getFluid("ic2biogas"), 625), 70, 120, false); + GT_Values.RA.addDistilleryRecipe(ItemList.Circuit_Integrated.getWithDamage(0L, 2L, new Object[0]), new FluidStack(FluidRegistry.getFluid("ic2biomass"), 5), new FluidStack(FluidRegistry.getFluid("ic2biogas"), 125), 55, 30, false); + GT_Values.RA.addDistilleryRecipe(ItemList.Circuit_Integrated.getWithDamage(0L, 4L, new Object[0]), new FluidStack(FluidRegistry.getFluid("ic2biomass"), 25), new FluidStack(FluidRegistry.getFluid("ic2biogas"), 625), 90, 120, false); GT_Values.RA.addDistilleryRecipe(ItemList.Circuit_Integrated.getWithDamage(0L, 8L, new Object[0]), new FluidStack(FluidRegistry.getFluid("ic2biomass"), 16), Materials.Plastic.getMolten(16L), 80, 30, false); GT_Values.RA.addFuel(GT_ModHandler.getModItem("Thaumcraft", "ItemShard", 1L, 6), null, 720, 5); From 14d9d3ad99cd6ac62bccbf39c2466ed7fd410ef6 Mon Sep 17 00:00:00 2001 From: Technus Date: Sat, 14 Jan 2017 12:35:08 +0100 Subject: [PATCH 14/15] Should do it. --- .../gregtech/loaders/postload/GT_MachineRecipeLoader.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java index 6800c898..487b5908 100644 --- a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java +++ b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java @@ -1085,8 +1085,8 @@ public class GT_MachineRecipeLoader implements Runnable { GT_Values.RA.addFuel(new ItemStack(Items.golden_apple,1,1), new ItemStack(Items.apple,1), 6400, 5); GT_Values.RA.addDistilleryRecipe(ItemList.Circuit_Integrated.getWithDamage(0L, 1L, new Object[0]), new FluidStack(FluidRegistry.getFluid("ic2biomass"), 4), Materials.Water.getFluid(2), 80, 30, false); - GT_Values.RA.addDistilleryRecipe(ItemList.Circuit_Integrated.getWithDamage(0L, 2L, new Object[0]), new FluidStack(FluidRegistry.getFluid("ic2biomass"), 5), new FluidStack(FluidRegistry.getFluid("ic2biogas"), 125), 55, 30, false); - GT_Values.RA.addDistilleryRecipe(ItemList.Circuit_Integrated.getWithDamage(0L, 4L, new Object[0]), new FluidStack(FluidRegistry.getFluid("ic2biomass"), 25), new FluidStack(FluidRegistry.getFluid("ic2biogas"), 625), 90, 120, false); + GT_Values.RA.addDistilleryRecipe(ItemList.Circuit_Integrated.getWithDamage(0L, 2L, new Object[0]), new FluidStack(FluidRegistry.getFluid("ic2biomass"), 5), new FluidStack(FluidRegistry.getFluid("ic2biogas"), 125), 65, 30, false); + GT_Values.RA.addDistilleryRecipe(ItemList.Circuit_Integrated.getWithDamage(0L, 4L, new Object[0]), new FluidStack(FluidRegistry.getFluid("ic2biomass"), 25), new FluidStack(FluidRegistry.getFluid("ic2biogas"), 625), 100, 120, false); GT_Values.RA.addDistilleryRecipe(ItemList.Circuit_Integrated.getWithDamage(0L, 8L, new Object[0]), new FluidStack(FluidRegistry.getFluid("ic2biomass"), 16), Materials.Plastic.getMolten(16L), 80, 30, false); GT_Values.RA.addFuel(GT_ModHandler.getModItem("Thaumcraft", "ItemShard", 1L, 6), null, 720, 5); From ba7ab1faca5ca2b54136f3fba89a1ee20b794399 Mon Sep 17 00:00:00 2001 From: Technus Date: Sat, 14 Jan 2017 12:53:44 +0100 Subject: [PATCH 15/15] MMK i am done --- .../java/gregtech/loaders/postload/GT_MachineRecipeLoader.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java index 487b5908..712e4bb3 100644 --- a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java +++ b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java @@ -1080,7 +1080,7 @@ public class GT_MachineRecipeLoader implements Runnable { 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"), 6250), Materials.Water.getFluid(125L)}, ItemList.IC2_Fertilizer.get(1, new Object[0]), 250, 480); + GT_Values.RA.addDistillationTowerRecipe(new FluidStack(FluidRegistry.getFluid("ic2biomass"), 250), new FluidStack[]{new FluidStack(FluidRegistry.getFluid("ic2biogas"), 6250), Materials.Water.getFluid(125L)}, ItemList.IC2_Fertilizer.get(1, new Object[0]), 200, 480); GT_Values.RA.addFuel(GT_ModHandler.getIC2Item("biogasCell", 1L), null, 32, 1); GT_Values.RA.addFuel(new ItemStack(Items.golden_apple,1,1), new ItemStack(Items.apple,1), 6400, 5);