From 678a32be304bcffe457cf869ba6c5d57bdc1b2e1 Mon Sep 17 00:00:00 2001 From: Alkalus <3060479+draknyte1@users.noreply.github.com> Date: Fri, 14 Sep 2018 13:47:51 +1000 Subject: $ Fixed the XP Convertor. % Rewrote base tile entity system. % Added hashCode() to Pair.java. % Changed some calculations on Materials. % Made Rocket Engines produce heavy pollution. --- .../generators/GregtechRocketFuelGeneratorBase.java | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) (limited to 'src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations') diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/GregtechRocketFuelGeneratorBase.java b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/GregtechRocketFuelGeneratorBase.java index fad65535ad..db787c5e80 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/GregtechRocketFuelGeneratorBase.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/GregtechRocketFuelGeneratorBase.java @@ -14,9 +14,11 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicTank; import gregtech.api.util.GT_Recipe; import gregtech.api.util.GT_Recipe.GT_Recipe_Map; +import gregtech.common.GT_Pollution; import gregtech.api.util.GT_Utility; import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.util.minecraft.gregtech.PollutionUtils; import net.minecraftforge.fluids.FluidStack; public abstract class GregtechRocketFuelGeneratorBase extends GT_MetaTileEntity_BasicTank { @@ -56,8 +58,19 @@ public abstract class GregtechRocketFuelGeneratorBase extends GT_MetaTileEntity_ @Override - public String[] getDescription() { - return new String[]{this.mDescription, "Fuel Efficiency: " + this.getEfficiency() + "%", CORE.GT_Tooltip}; + public String[] getDescription() { + if (CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) { + String aPollution = "Causes " + getPollution() + " Pollution per second"; + return new String[]{ + this.mDescription, + "Fuel Efficiency: " + this.getEfficiency() + "%", + aPollution, + CORE.GT_Tooltip}; + } + return new String[]{ + this.mDescription, + "Fuel Efficiency: " + this.getEfficiency() + "%", + CORE.GT_Tooltip}; } @@ -209,6 +222,7 @@ public abstract class GregtechRocketFuelGeneratorBase extends GT_MetaTileEntity_ else { this.useFuel = true; } + PollutionUtils.addPollution(getBaseMetaTileEntity(), 10 * getPollution()); } } } @@ -219,6 +233,7 @@ public abstract class GregtechRocketFuelGeneratorBase extends GT_MetaTileEntity_ if (aBaseMetaTileEntity.addStackToSlot(this.getOutputSlot(), tEmptyContainer)) { aBaseMetaTileEntity.increaseStoredEnergyUnits(tFuelValue, true); aBaseMetaTileEntity.decrStackSize(this.getInputSlot(), 1); + PollutionUtils.addPollution(getBaseMetaTileEntity(), 10 * getPollution()); } } } @@ -229,6 +244,8 @@ public abstract class GregtechRocketFuelGeneratorBase extends GT_MetaTileEntity_ } } + public abstract int getPollution(); + public abstract GT_Recipe_Map getRecipes(); public abstract int getEfficiency(); -- cgit