From 002e757d65f20ab809f7a21d0662e36aa84c2fc0 Mon Sep 17 00:00:00 2001 From: Blood-Asp Date: Mon, 29 Jun 2015 23:03:55 +0200 Subject: Version 5.08.22-23 --- .../generators/GT_MetaTileEntity_FluidNaquadahReactor.java | 14 +++++++++++--- .../generators/GT_MetaTileEntity_SolidNaquadahReactor.java | 14 +++++++++++--- 2 files changed, 22 insertions(+), 6 deletions(-) (limited to 'main/java/gregtech/common/tileentities/generators') diff --git a/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_FluidNaquadahReactor.java b/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_FluidNaquadahReactor.java index cbc8d1ee52..7b084c1223 100644 --- a/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_FluidNaquadahReactor.java +++ b/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_FluidNaquadahReactor.java @@ -1,5 +1,7 @@ package gregtech.common.tileentities.generators; +import gregtech.api.GregTech_API; +import gregtech.api.enums.ConfigCategories; import gregtech.api.enums.Textures; import gregtech.api.enums.Textures.BlockIcons; import gregtech.api.interfaces.ITexture; @@ -13,6 +15,7 @@ import gregtech.api.util.GT_Recipe.GT_Recipe_Map; public class GT_MetaTileEntity_FluidNaquadahReactor extends GT_MetaTileEntity_BasicGenerator { + public int mEfficiency; public boolean isOutputFacing(byte aSide) { return (aSide > 1) && (aSide != getBaseMetaTileEntity().getFrontFacing()) && (aSide != getBaseMetaTileEntity().getBackFacing()); @@ -20,12 +23,12 @@ public class GT_MetaTileEntity_FluidNaquadahReactor public GT_MetaTileEntity_FluidNaquadahReactor(int aID, String aName, String aNameRegional, int aTier) { - super(aID, aName, aNameRegional, aTier, "Requires Enriched Naquadah Cells", new ITexture[0]); + super(aID, aName, aNameRegional, aTier, "Requires Enriched Naquadah Cells", new ITexture[0]);onConfigLoad(); } public GT_MetaTileEntity_FluidNaquadahReactor(String aName, int aTier, String aDescription, ITexture[][][] aTextures) { - super(aName, aTier, aDescription, aTextures); + super(aName, aTier, aDescription, aTextures);onConfigLoad(); } public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) @@ -45,9 +48,14 @@ public class GT_MetaTileEntity_FluidNaquadahReactor public int getEfficiency() { - return 100; + return mEfficiency; } + public void onConfigLoad() + { + this.mEfficiency =GregTech_API.sMachineFile.get(ConfigCategories.machineconfig, "FluidNaquadah.efficiency.tier."+this.mTier, 100); +} + public ITexture[] getFront(byte aColor) { return new ITexture[] { super.getFront(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_FLUID_FRONT) }; diff --git a/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_SolidNaquadahReactor.java b/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_SolidNaquadahReactor.java index 4e85dbfe92..945d0ad084 100644 --- a/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_SolidNaquadahReactor.java +++ b/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_SolidNaquadahReactor.java @@ -1,5 +1,7 @@ package gregtech.common.tileentities.generators; +import gregtech.api.GregTech_API; +import gregtech.api.enums.ConfigCategories; import gregtech.api.enums.Textures; import gregtech.api.enums.Textures.BlockIcons; import gregtech.api.interfaces.ITexture; @@ -13,6 +15,7 @@ import gregtech.api.util.GT_Recipe.GT_Recipe_Map; public class GT_MetaTileEntity_SolidNaquadahReactor extends GT_MetaTileEntity_BasicGenerator { + public int mEfficiency; public boolean isOutputFacing(byte aSide) { return (aSide > 1) && (aSide != getBaseMetaTileEntity().getFrontFacing()) && (aSide != getBaseMetaTileEntity().getBackFacing()); @@ -20,12 +23,12 @@ public class GT_MetaTileEntity_SolidNaquadahReactor public GT_MetaTileEntity_SolidNaquadahReactor(int aID, String aName, String aNameRegional, int aTier) { - super(aID, aName, aNameRegional, aTier, "Requires Enriched Naquadah Bolts", new ITexture[0]); + super(aID, aName, aNameRegional, aTier, "Requires Enriched Naquadah Bolts", new ITexture[0]);onConfigLoad(); } public GT_MetaTileEntity_SolidNaquadahReactor(String aName, int aTier, String aDescription, ITexture[][][] aTextures) { - super(aName, aTier, aDescription, aTextures); + super(aName, aTier, aDescription, aTextures);onConfigLoad(); } public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) @@ -45,9 +48,14 @@ public class GT_MetaTileEntity_SolidNaquadahReactor public int getEfficiency() { - return 80; + return mEfficiency; } + public void onConfigLoad() + { + this.mEfficiency =GregTech_API.sMachineFile.get(ConfigCategories.machineconfig, "SolidNaquadah.efficiency.tier."+this.mTier, 80); +} + public ITexture[] getFront(byte aColor) { return new ITexture[] { super.getFront(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_FRONT) }; -- cgit