diff options
author | miozune <miozune@gmail.com> | 2022-07-15 14:34:19 +0900 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-07-15 06:34:19 +0100 |
commit | c0eb617fa5c146b7a222c5461faf14394508cf4b (patch) | |
tree | e25d23490122b5c663fd4e2791a81704c0183b00 /src/main/java/goodgenerator/blocks/tileEntity/LargeEssentiaGenerator.java | |
parent | 36301feacf5a33ded24d338ae39985da6080d2bb (diff) | |
download | GT5-Unofficial-c0eb617fa5c146b7a222c5461faf14394508cf4b.tar.gz GT5-Unofficial-c0eb617fa5c146b7a222c5461faf14394508cf4b.tar.bz2 GT5-Unofficial-c0eb617fa5c146b7a222c5461faf14394508cf4b.zip |
Expand item limit for Neutron Activator & Add back Low Quality Naquadria Sulphate to the outputs from Concentrated Enriched-Naquadah Sludge (#53)
* Expand item limit for Neutron Activator & Add back Low Quality Naquadria Sulphate to the outputs from Concentrated Enriched-Naquadah Sludge
* updateBuildScript & spotlessApply
Diffstat (limited to 'src/main/java/goodgenerator/blocks/tileEntity/LargeEssentiaGenerator.java')
-rw-r--r-- | src/main/java/goodgenerator/blocks/tileEntity/LargeEssentiaGenerator.java | 333 |
1 files changed, 176 insertions, 157 deletions
diff --git a/src/main/java/goodgenerator/blocks/tileEntity/LargeEssentiaGenerator.java b/src/main/java/goodgenerator/blocks/tileEntity/LargeEssentiaGenerator.java index 049d30b66d..ce77b0f365 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/LargeEssentiaGenerator.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/LargeEssentiaGenerator.java @@ -1,8 +1,11 @@ package goodgenerator.blocks.tileEntity; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.*; +import static goodgenerator.util.DescTextLocalization.BLUE_PRINT_INFO; +import static gregtech.api.util.GT_StructureUtility.ofHatchAdder; + import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader; import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_DynamoMulti; -import com.github.technus.tectech.thing.metaTileEntity.multi.base.GT_MetaTileEntity_MultiblockBase_EM; import com.gtnewhorizon.structurelib.alignment.constructable.IConstructable; import com.gtnewhorizon.structurelib.structure.IStructureDefinition; import com.gtnewhorizon.structurelib.structure.StructureDefinition; @@ -14,7 +17,6 @@ import goodgenerator.util.DescTextLocalization; import goodgenerator.util.ItemRefer; import gregtech.api.enums.Materials; import gregtech.api.enums.Textures; -import gregtech.api.interfaces.ISecondaryDescribable; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; @@ -27,6 +29,7 @@ import gregtech.api.objects.XSTR; import gregtech.api.render.TextureFactory; import gregtech.api.util.GT_Multiblock_Tooltip_Builder; import gregtech.api.util.GT_Utility; +import java.util.ArrayList; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -34,17 +37,10 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.StatCollector; import net.minecraft.world.World; import net.minecraftforge.fluids.FluidRegistry; -import org.lwjgl.input.Keyboard; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; import thaumcraft.common.config.ConfigBlocks; -import java.util.ArrayList; - -import static com.gtnewhorizon.structurelib.structure.StructureUtility.*; -import static goodgenerator.util.DescTextLocalization.BLUE_PRINT_INFO; -import static gregtech.api.util.GT_StructureUtility.ofHatchAdder; - public class LargeEssentiaGenerator extends GT_MetaTileEntity_TooltipMultiBlockBase_EM implements IConstructable { private IStructureDefinition<LargeEssentiaGenerator> multiDefinition = null; @@ -55,12 +51,12 @@ public class LargeEssentiaGenerator extends GT_MetaTileEntity_TooltipMultiBlockB final XSTR R = new XSTR(); protected ArrayList<EssentiaHatch> mEssentiaHatch = new ArrayList<>(); - public LargeEssentiaGenerator(String name){ + public LargeEssentiaGenerator(String name) { super(name); } - public LargeEssentiaGenerator(int id, String name, String nameRegional){ - super(id,name,nameRegional); + public LargeEssentiaGenerator(int id, String name, String nameRegional) { + super(id, name, nameRegional); } @Override @@ -72,8 +68,10 @@ public class LargeEssentiaGenerator extends GT_MetaTileEntity_TooltipMultiBlockB public boolean checkMachine_EM(IGregTechTileEntity aBaseMetaTileEntity, ItemStack aStack) { mStableValue = 0; mEssentiaHatch.clear(); - return structureCheck_EM(mName, 4, 0, 4) && (mDynamoHatches.size() + eDynamoMulti.size()) == 1 - && checkHatchTier() && updateEssentiaHatchState(); + return structureCheck_EM(mName, 4, 0, 4) + && (mDynamoHatches.size() + eDynamoMulti.size()) == 1 + && checkHatchTier() + && updateEssentiaHatchState(); } public boolean checkHatchTier() { @@ -113,7 +111,8 @@ public class LargeEssentiaGenerator extends GT_MetaTileEntity_TooltipMultiBlockB } @Override - public boolean onWrenchRightClick(byte aSide, byte aWrenchingSide, EntityPlayer aPlayer, float aX, float aY, float aZ) { + public boolean onWrenchRightClick( + byte aSide, byte aWrenchingSide, EntityPlayer aPlayer, float aX, float aY, float aZ) { if (aWrenchingSide == 0 || aWrenchingSide == 1) return false; if (getBaseMetaTileEntity().isValidFacing(aWrenchingSide)) { getBaseMetaTileEntity().setFrontFacing(aWrenchingSide); @@ -126,12 +125,18 @@ public class LargeEssentiaGenerator extends GT_MetaTileEntity_TooltipMultiBlockB public boolean onRightclick(IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer) { if (this.getBaseMetaTileEntity().isServerSide()) { ItemStack tCurrentItem = aPlayer.inventory.getCurrentItem(); - if (tCurrentItem != null && tCurrentItem.getItem().equals(ItemRefer.Essentia_Upgrade_Empty.get(1).getItem())) { + if (tCurrentItem != null + && tCurrentItem + .getItem() + .equals(ItemRefer.Essentia_Upgrade_Empty.get(1).getItem())) { int tMeta = tCurrentItem.getItemDamage(); if ((mUpgrade & (1 << tMeta)) == 0 && tMeta != 0) { - tCurrentItem.stackSize --; + tCurrentItem.stackSize--; mUpgrade = mUpgrade | (1 << tMeta); - GT_Utility.sendChatToPlayer(aPlayer, tCurrentItem.getDisplayName() + StatCollector.translateToLocal("largeessentiagenerator.chat")); + GT_Utility.sendChatToPlayer( + aPlayer, + tCurrentItem.getDisplayName() + + StatCollector.translateToLocal("largeessentiagenerator.chat")); } updateEssentiaHatchState(); return true; @@ -143,73 +148,79 @@ public class LargeEssentiaGenerator extends GT_MetaTileEntity_TooltipMultiBlockB @Override public IStructureDefinition<LargeEssentiaGenerator> getStructure_EM() { - if(multiDefinition == null) { - multiDefinition = StructureDefinition - .<LargeEssentiaGenerator>builder() - .addShape(mName, - transpose(new String[][]{ - {"A A"," "," "," "," ~ "," "," "," ","A A"}, - {"T C T"," CEC "," CEEEC "," CEEEEEC ","CEEEEEEEC"," CEEEEEC "," CEEEC "," CEC ","T C T"}, - {"T TXT T"," TCCCT "," TCCCCCT ","TCCCCCCCT","XCCCCCCCX","TCCCCCCCT"," TCCCCCT "," TCCCT ","T TXT T"} - }) - ).addElement( - 'A', - ofBlock( - ConfigBlocks.blockCosmeticOpaque, 1 - ) - ).addElement( - 'T', - ofBlock( - ConfigBlocks.blockCosmeticSolid, 7 - ) - ).addElement( - 'C', - ofBlock( - Loaders.magicCasing, 0 - ) - ).addElement( + if (multiDefinition == null) { + multiDefinition = StructureDefinition.<LargeEssentiaGenerator>builder() + .addShape(mName, transpose(new String[][] { + { + "A A", + " ", + " ", + " ", + " ~ ", + " ", + " ", + " ", + "A A" + }, + { + "T C T", + " CEC ", + " CEEEC ", + " CEEEEEC ", + "CEEEEEEEC", + " CEEEEEC ", + " CEEEC ", + " CEC ", + "T C T" + }, + { + "T TXT T", + " TCCCT ", + " TCCCCCT ", + "TCCCCCCCT", + "XCCCCCCCX", + "TCCCCCCCT", + " TCCCCCT ", + " TCCCT ", + "T TXT T" + } + })) + .addElement('A', ofBlock(ConfigBlocks.blockCosmeticOpaque, 1)) + .addElement('T', ofBlock(ConfigBlocks.blockCosmeticSolid, 7)) + .addElement('C', ofBlock(Loaders.magicCasing, 0)) + .addElement( 'E', ofChain( onElementPass( - x -> {++x.mStableValue; x.mTierLimit = Math.max(x.mTierLimit, 4);}, - ofBlock( - Loaders.essentiaCell, 0 - ) - ), + x -> { + ++x.mStableValue; + x.mTierLimit = Math.max(x.mTierLimit, 4); + }, + ofBlock(Loaders.essentiaCell, 0)), onElementPass( - x -> {x.mStableValue += 2; x.mTierLimit = Math.max(x.mTierLimit, 5);}, - ofBlock( - Loaders.essentiaCell, 1 - ) - ), + x -> { + x.mStableValue += 2; + x.mTierLimit = Math.max(x.mTierLimit, 5); + }, + ofBlock(Loaders.essentiaCell, 1)), onElementPass( - x -> {x.mStableValue += 5; x.mTierLimit = Math.max(x.mTierLimit, 6);}, - ofBlock( - Loaders.essentiaCell, 2 - ) - ), + x -> { + x.mStableValue += 5; + x.mTierLimit = Math.max(x.mTierLimit, 6); + }, + ofBlock(Loaders.essentiaCell, 2)), onElementPass( - x -> {x.mStableValue += 10; x.mTierLimit = Math.max(x.mTierLimit, 7);}, - ofBlock( - Loaders.essentiaCell, 3 - ) - ) - ) - ).addElement( + x -> { + x.mStableValue += 10; + x.mTierLimit = Math.max(x.mTierLimit, 7); + }, + ofBlock(Loaders.essentiaCell, 3)))) + .addElement( 'X', ofChain( - ofHatchAdder( - LargeEssentiaGenerator::addLargeEssentiaGeneratorList,1536, - 1 - ), - ofBlock( - Loaders.magicCasing, 0 - ), - ofTileAdder( - LargeEssentiaGenerator::addEssentiaHatch, Loaders.magicCasing, 0 - ) - ) - ) + ofHatchAdder(LargeEssentiaGenerator::addLargeEssentiaGeneratorList, 1536, 1), + ofBlock(Loaders.magicCasing, 0), + ofTileAdder(LargeEssentiaGenerator::addEssentiaHatch, Loaders.magicCasing, 0))) .build(); } return multiDefinition; @@ -227,18 +238,18 @@ public class LargeEssentiaGenerator extends GT_MetaTileEntity_TooltipMultiBlockB return false; } else { IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity(); - if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Input){ - ((GT_MetaTileEntity_Hatch)aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mInputHatches.add((GT_MetaTileEntity_Hatch_Input)aMetaTileEntity); - } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Maintenance){ - ((GT_MetaTileEntity_Hatch)aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mMaintenanceHatches.add((GT_MetaTileEntity_Hatch_Maintenance)aMetaTileEntity); - } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Dynamo){ - ((GT_MetaTileEntity_Hatch)aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mDynamoHatches.add((GT_MetaTileEntity_Hatch_Dynamo)aMetaTileEntity); - } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_DynamoMulti){ - ((GT_MetaTileEntity_Hatch)aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.eDynamoMulti.add((GT_MetaTileEntity_Hatch_DynamoMulti)aMetaTileEntity); + if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Input) { + ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); + return this.mInputHatches.add((GT_MetaTileEntity_Hatch_Input) aMetaTileEntity); + } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Maintenance) { + ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); + return this.mMaintenanceHatches.add((GT_MetaTileEntity_Hatch_Maintenance) aMetaTileEntity); + } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Dynamo) { + ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); + return this.mDynamoHatches.add((GT_MetaTileEntity_Hatch_Dynamo) aMetaTileEntity); + } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_DynamoMulti) { + ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); + return this.eDynamoMulti.add((GT_MetaTileEntity_Hatch_DynamoMulti) aMetaTileEntity); } } return false; @@ -261,7 +272,7 @@ public class LargeEssentiaGenerator extends GT_MetaTileEntity_TooltipMultiBlockB voltage += tHatch.maxEUOutput(); } if (voltage > Integer.MAX_VALUE) voltage = Integer.MAX_VALUE; - return (int)voltage; + return (int) voltage; } public int getAmpLimit() { @@ -273,24 +284,35 @@ public class LargeEssentiaGenerator extends GT_MetaTileEntity_TooltipMultiBlockB amp += tHatch.maxAmperesOut(); } if (amp > Integer.MAX_VALUE) amp = Integer.MAX_VALUE; - return (int)amp; + return (int) amp; } public long getPerAspectEnergy(Aspect aspect) { int type = LargeEssentiaEnergyData.getAspectTypeIndex(aspect); if (!isValidEssentia(aspect)) return 0; switch (type) { - case 0: return normalEssentia(aspect); - case 1: return airEssentia(aspect); - case 2: return thermalEssentia(aspect); - case 3: return unstableEssentia(aspect); - case 4: return victusEssentia(aspect); - case 5: return taintedEssentia(aspect); - case 6: return mechanicEssentia(aspect); - case 7: return spiritEssentia(aspect); - case 8: return radiationEssentia(aspect); - case 9: return electricEssentia(aspect); - default: return 0; + case 0: + return normalEssentia(aspect); + case 1: + return airEssentia(aspect); + case 2: + return thermalEssentia(aspect); + case 3: + return unstableEssentia(aspect); + case 4: + return victusEssentia(aspect); + case 5: + return taintedEssentia(aspect); + case 6: + return mechanicEssentia(aspect); + case 7: + return spiritEssentia(aspect); + case 8: + return radiationEssentia(aspect); + case 9: + return electricEssentia(aspect); + default: + return 0; } } @@ -304,8 +326,7 @@ public class LargeEssentiaGenerator extends GT_MetaTileEntity_TooltipMultiBlockB int ceoInput = (int) LargeEssentiaEnergyData.getAspectCeo(aspect) * 8; if (depleteInput(Materials.LiquidAir.getFluid(ceoInput))) { ceoOutput = 1.5D; - } - else if (depleteInput(Materials.Air.getGas(ceoInput))){ + } else if (depleteInput(Materials.Air.getGas(ceoInput))) { ceoOutput = 1.0D; } return (long) (baseValue * ceoOutput); @@ -317,20 +338,15 @@ public class LargeEssentiaGenerator extends GT_MetaTileEntity_TooltipMultiBlockB int ceoInput = (int) LargeEssentiaEnergyData.getAspectCeo(aspect) * 2; if (depleteInput(Materials.SuperCoolant.getFluid(ceoInput))) { ceoOutput = 9.0D; - } - else if (depleteInput(FluidRegistry.getFluidStack("cryotheum", ceoInput))) { + } else if (depleteInput(FluidRegistry.getFluidStack("cryotheum", ceoInput))) { ceoOutput = 5.0D; - } - else if (depleteInput(FluidRegistry.getFluidStack("ic2coolant", ceoInput))) { + } else if (depleteInput(FluidRegistry.getFluidStack("ic2coolant", ceoInput))) { ceoOutput = 1.5D; - } - else if (depleteInput(Materials.Ice.getSolid(ceoInput))) { + } else if (depleteInput(Materials.Ice.getSolid(ceoInput))) { ceoOutput = 1.2D; - } - else if (depleteInput(FluidRegistry.getFluidStack("ic2distilledwater", ceoInput))){ + } else if (depleteInput(FluidRegistry.getFluidStack("ic2distilledwater", ceoInput))) { ceoOutput = 1.0D; - } - else if (depleteInput(Materials.Water.getFluid(ceoInput))) { + } else if (depleteInput(Materials.Water.getFluid(ceoInput))) { ceoOutput = 0.5D; } @@ -341,22 +357,17 @@ public class LargeEssentiaGenerator extends GT_MetaTileEntity_TooltipMultiBlockB long baseValue = LargeEssentiaEnergyData.getAspectFuelValue(aspect); double ceoOutput = 0; int ceoInput = (int) LargeEssentiaEnergyData.getAspectCeo(aspect) * 4; - if (depleteInput(WerkstoffLoader.Xenon.getFluidOrGas(ceoInput))){ + if (depleteInput(WerkstoffLoader.Xenon.getFluidOrGas(ceoInput))) { ceoOutput = 4.0D; - } - else if (depleteInput(WerkstoffLoader.Krypton.getFluidOrGas(ceoInput))){ + } else if (depleteInput(WerkstoffLoader.Krypton.getFluidOrGas(ceoInput))) { ceoOutput = 3.0D; - } - else if (depleteInput(Materials.Argon.getFluid(ceoInput))){ + } else if (depleteInput(Materials.Argon.getFluid(ceoInput))) { ceoOutput = 2.5D; - } - else if (depleteInput(WerkstoffLoader.Neon.getFluidOrGas(ceoInput))){ + } else if (depleteInput(WerkstoffLoader.Neon.getFluidOrGas(ceoInput))) { ceoOutput = 2.2D; - } - else if (depleteInput(Materials.Helium.getFluid(ceoInput))){ + } else if (depleteInput(Materials.Helium.getFluid(ceoInput))) { ceoOutput = 2.0D; - } - else if (depleteInput(Materials.Nitrogen.getFluid(ceoInput))){ + } else if (depleteInput(Materials.Nitrogen.getFluid(ceoInput))) { ceoOutput = 1.0D; } return (long) (baseValue * ceoOutput); @@ -368,8 +379,7 @@ public class LargeEssentiaGenerator extends GT_MetaTileEntity_TooltipMultiBlockB int ceoInput = (int) LargeEssentiaEnergyData.getAspectCeo(aspect) * 18; if (depleteInput(FluidRegistry.getFluidStack("xpjuice", ceoInput))) { ceoOutput = 2.0D; - } - else if (depleteInput(FluidRegistry.getFluidStack("lifeessence", ceoInput))){ + } else if (depleteInput(FluidRegistry.getFluidStack("lifeessence", ceoInput))) { ceoOutput = 6.0D; } return (long) (baseValue * ceoOutput); @@ -383,8 +393,7 @@ public class LargeEssentiaGenerator extends GT_MetaTileEntity_TooltipMultiBlockB if (depleteInput(FluidRegistry.getFluidStack("fluidpure", ceoInput))) { ceoOutput = 60.0D; chance = 0; - } - else if (depleteInput(FluidRegistry.getFluidStack("fluiddeath", ceoInput))){ + } else if (depleteInput(FluidRegistry.getFluidStack("fluiddeath", ceoInput))) { ceoOutput = Math.pow(25000D / baseValue, 4); chance = 4000; } @@ -393,8 +402,7 @@ public class LargeEssentiaGenerator extends GT_MetaTileEntity_TooltipMultiBlockB World world = getBaseMetaTileEntity().getWorld(); int tX = R.nextInt(4); int tZ = R.nextInt(4); - if (world.isAirBlock(tX, 0, tZ)) - world.setBlock(tX, 0, tZ, ConfigBlocks.blockFluxGas, R.nextInt(8), 3); + if (world.isAirBlock(tX, 0, tZ)) world.setBlock(tX, 0, tZ, ConfigBlocks.blockFluxGas, R.nextInt(8), 3); } return (long) (baseValue * ceoOutput); @@ -416,8 +424,7 @@ public class LargeEssentiaGenerator extends GT_MetaTileEntity_TooltipMultiBlockB int ceoInput = (int) LargeEssentiaEnergyData.getAspectCeo(aspect) * 2; if (depleteInput(FluidRegistry.getFluidStack("witchery:fluidspirit", ceoInput))) { ceoOutput = 10D * (1 + mStableValue / 100D); - } - else if (depleteInput(FluidRegistry.getFluidStack("witchery:hollowtears", ceoInput))) { + } else if (depleteInput(FluidRegistry.getFluidStack("witchery:hollowtears", ceoInput))) { ceoOutput = 15D * (1 + 100D / mStableValue); } return (long) (baseValue * ceoOutput); @@ -429,14 +436,11 @@ public class LargeEssentiaGenerator extends GT_MetaTileEntity_TooltipMultiBlockB int ceoInput = (int) LargeEssentiaEnergyData.getAspectCeo(aspect) * 6; if (depleteInput(Materials.Caesium.getMolten(ceoInput))) { ceoOutput = 2.0D; - } - else if (depleteInput(Materials.Uranium235.getMolten(ceoInput))) { + } else if (depleteInput(Materials.Uranium235.getMolten(ceoInput))) { ceoOutput = 3.0D; - } - else if (depleteInput(Materials.Naquadah.getMolten(ceoInput))) { + } else if (depleteInput(Materials.Naquadah.getMolten(ceoInput))) { ceoOutput = 4.0D; - } - else if (depleteInput(MyMaterial.atomicSeparationCatalyst.getMolten(ceoInput))) { + } else if (depleteInput(MyMaterial.atomicSeparationCatalyst.getMolten(ceoInput))) { ceoOutput = 16.0D; } return (long) (baseValue * ceoOutput); @@ -452,23 +456,22 @@ public class LargeEssentiaGenerator extends GT_MetaTileEntity_TooltipMultiBlockB long EUt = mLeftEnergy; long EUVoltage = voltageLimit, EUAmp = 1; - for (EssentiaHatch hatch: this.mEssentiaHatch){ + for (EssentiaHatch hatch : this.mEssentiaHatch) { AspectList aspects = hatch.getAspects(); - for (Aspect aspect: aspects.aspects.keySet()) { + for (Aspect aspect : aspects.aspects.keySet()) { if (!isValidEssentia(aspect) || getPerAspectEnergy(aspect) == 0) continue; while (EUt <= (voltageLimit * ampLimit) && aspects.getAmount(aspect) > 0) { EUt += getPerAspectEnergy(aspect) * mStableValue / 25; aspects.reduce(aspect, 1); - if (aspects.getAmount(aspect) == 0) - aspects.remove(aspect); + if (aspects.getAmount(aspect) == 0) aspects.remove(aspect); } } if (EUt == 0 && aspects.size() != 0) { - if (!isValidEssentia(aspects.getAspects()[0]) || getPerAspectEnergy(aspects.getAspects()[0]) == 0) continue; + if (!isValidEssentia(aspects.getAspects()[0]) || getPerAspectEnergy(aspects.getAspects()[0]) == 0) + continue; EUt += getPerAspectEnergy(aspects.getAspects()[0]) * mStableValue / 25; aspects.reduce(aspects.getAspects()[0], 1); - if (aspects.getAmount(aspects.getAspects()[0]) == 0) - aspects.remove(aspects.getAspects()[0]); + if (aspects.getAmount(aspects.getAspects()[0]) == 0) aspects.remove(aspects.getAspects()[0]); } } @@ -476,16 +479,15 @@ public class LargeEssentiaGenerator extends GT_MetaTileEntity_TooltipMultiBlockB EUVoltage = EUt; EUAmp = 1; mLeftEnergy = 0; - } - else { + } else { while (EUVoltage * (EUAmp + 1) <= EUt && EUAmp + 1 <= ampLimit) { - EUAmp ++; + EUAmp++; } mLeftEnergy = EUt - (EUVoltage * EUAmp); } - this.mEUt = (int)EUVoltage; - this.eAmpereFlow = (int)EUAmp; + this.mEUt = (int) EUVoltage; + this.eAmpereFlow = (int) EUAmp; } @Override @@ -525,12 +527,29 @@ public class LargeEssentiaGenerator extends GT_MetaTileEntity_TooltipMultiBlockB @Override @SuppressWarnings("ALL") - public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone) { - if(aSide == aFacing) { - if(aActive) return new ITexture[]{Textures.BlockIcons.getCasingTextureForId(1536), new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_DRAGONEGG), TextureFactory.builder().addIcon(Textures.BlockIcons.MACHINE_CASING_DRAGONEGG_GLOW).glow().build()}; - return new ITexture[]{Textures.BlockIcons.getCasingTextureForId(1536), new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_DRAGONEGG)}; - } - return new ITexture[]{Textures.BlockIcons.getCasingTextureForId(1536)}; + public ITexture[] getTexture( + IGregTechTileEntity aBaseMetaTileEntity, + byte aSide, + byte aFacing, + byte aColorIndex, + boolean aActive, + boolean aRedstone) { + if (aSide == aFacing) { + if (aActive) + return new ITexture[] { + Textures.BlockIcons.getCasingTextureForId(1536), + new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_DRAGONEGG), + TextureFactory.builder() + .addIcon(Textures.BlockIcons.MACHINE_CASING_DRAGONEGG_GLOW) + .glow() + .build() + }; + return new ITexture[] { + Textures.BlockIcons.getCasingTextureForId(1536), + new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_DRAGONEGG) + }; + } + return new ITexture[] {Textures.BlockIcons.getCasingTextureForId(1536)}; } public boolean isValidEssentia(Aspect aspect) { |