From c0eb617fa5c146b7a222c5461faf14394508cf4b Mon Sep 17 00:00:00 2001 From: miozune Date: Fri, 15 Jul 2022 14:34:19 +0900 Subject: 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 --- .../goodgenerator/blocks/myFluids/BaseFluid.java | 34 +- .../blocks/myFluids/FluidsBuilder.java | 118 +- .../goodgenerator/blocks/regularBlock/Casing.java | 17 +- .../blocks/regularBlock/ComplexTextureCasing.java | 10 +- .../goodgenerator/blocks/regularBlock/Frame.java | 9 +- .../blocks/regularBlock/ITextureBlock.java | 1 - .../goodgenerator/blocks/regularBlock/TEBlock.java | 43 +- .../blocks/regularBlock/TurbineCasing.java | 40 +- .../blocks/tileEntity/CoolantTower.java | 287 ++- .../blocks/tileEntity/EssentiaHatch.java | 25 +- .../blocks/tileEntity/EssentiaOutputHatch.java | 6 +- .../blocks/tileEntity/EssentiaOutputHatch_ME.java | 36 +- .../blocks/tileEntity/ExtremeHeatExchanger.java | 242 +- .../blocks/tileEntity/FuelRefineFactory.java | 182 +- .../GTMetaTileEntity/DieselGenerator.java | 142 +- .../GTMetaTileEntity/NeutronAccelerator.java | 16 +- .../tileEntity/GTMetaTileEntity/NeutronSensor.java | 50 +- .../tileEntity/GTMetaTileEntity/YOTTAHatch.java | 161 +- .../blocks/tileEntity/LargeEssentiaGenerator.java | 333 +-- .../blocks/tileEntity/LargeEssentiaSmeltery.java | 189 +- .../blocks/tileEntity/LargeFusionComputer1.java | 59 +- .../blocks/tileEntity/LargeFusionComputer2.java | 19 +- .../blocks/tileEntity/LargeFusionComputer3.java | 19 +- .../blocks/tileEntity/LargeFusionComputer4.java | 68 +- .../blocks/tileEntity/LargeFusionComputer5.java | 66 +- .../blocks/tileEntity/MegaPlasmaTurbine.java | 19 +- .../blocks/tileEntity/MultiNqGenerator.java | 220 +- .../blocks/tileEntity/NeutronActivator.java | 172 +- .../blocks/tileEntity/PreciseAssembler.java | 155 +- .../tileEntity/SupercriticalFluidTurbine.java | 31 +- .../tileEntity/UniversalChemicalFuelEngine.java | 215 +- .../blocks/tileEntity/YottaFluidTank.java | 206 +- .../base/GT_MetaTileEntity_LargeTurbineBase.java | 232 +- ...GT_MetaTileEntity_TooltipMultiBlockBase_EM.java | 7 +- .../tileEntity/base/LargeFusionComputer.java | 677 ++--- .../tileEntity/base/LargeFusionComputerPP.java | 669 ++--- .../java/goodgenerator/client/ClientProxy.java | 10 +- .../client/GUI/LargeFusionComputerGUIClient.java | 18 +- .../client/GUI/NeutronActivatorGUIClient.java | 6 +- .../client/GUI/NeutronSensorGUIClient.java | 41 +- .../goodgenerator/client/GUI/YOTTankGUIClient.java | 26 +- .../client/render/BlockRenderHandler.java | 89 +- .../java/goodgenerator/common/CommonProxy.java | 8 +- .../container/NeutronActivatorGUIContainer.java | 9 +- .../common/container/YOTTankGUIContainer.java | 20 +- .../java/goodgenerator/crossmod/LoadedList.java | 1 - .../goodgenerator/crossmod/ic2/CropsLoader.java | 1 - .../crossmod/ic2/GGCropsSaltyRoot.java | 14 +- .../crossmod/nei/ExtremeHeatExchangerHandler.java | 26 +- .../java/goodgenerator/crossmod/nei/IMCForNEI.java | 6 +- .../goodgenerator/crossmod/nei/NEI_Config.java | 4 +- .../crossmod/nei/NeutronActivatorHandler.java | 32 +- .../crossmod/nei/PreciseAssemblerHandler.java | 8 +- .../thaumcraft/LargeEssentiaEnergyData.java | 56 +- .../crossmod/thaumcraft/Research.java | 1166 +++++---- .../java/goodgenerator/items/DepletedFuelRod.java | 7 +- src/main/java/goodgenerator/items/FuelRod.java | 87 +- .../java/goodgenerator/items/MyItemBlocks.java | 37 +- src/main/java/goodgenerator/items/MyItems.java | 194 +- src/main/java/goodgenerator/items/MyMaterial.java | 780 +++--- .../java/goodgenerator/items/RadioactiveItem.java | 3 +- .../items/nuclear/IsotopeMaterial.java | 17 +- .../items/nuclear/IsotopeMaterialLoader.java | 6 +- .../items/nuclear/NuclearMetaItemGenerator.java | 44 +- .../items/nuclear/NuclearTextures.java | 10 +- .../goodgenerator/loader/AchievementLoader.java | 3 +- .../goodgenerator/loader/FuelRecipeLoader.java | 113 +- .../java/goodgenerator/loader/FuelRodLoader.java | 183 +- src/main/java/goodgenerator/loader/Loaders.java | 253 +- .../loader/NaquadahReworkRecipeLoader.java | 658 +++-- .../loader/NeutronActivatorLoader.java | 45 +- .../java/goodgenerator/loader/RecipeLoader.java | 1841 +++++++------ .../java/goodgenerator/loader/RecipeLoader_02.java | 2713 ++++++++++---------- .../java/goodgenerator/main/GG_Config_Loader.java | 133 +- .../java/goodgenerator/main/GoodGenerator.java | 49 +- .../java/goodgenerator/network/MessageMTEBase.java | 15 +- .../network/MessageOpenNeutronSensorGUI.java | 5 +- .../network/MessageResetTileTexture.java | 4 +- .../network/MessageSetNeutronSensorData.java | 8 +- src/main/java/goodgenerator/tabs/MyTabs.java | 2 +- .../java/goodgenerator/util/CharExchanger.java | 94 +- .../java/goodgenerator/util/CrackRecipeAdder.java | 454 +++- .../goodgenerator/util/DescTextLocalization.java | 8 +- src/main/java/goodgenerator/util/ItemRefer.java | 6 +- src/main/java/goodgenerator/util/MaterialFix.java | 207 +- .../java/goodgenerator/util/MyRecipeAdder.java | 357 ++- .../java/goodgenerator/util/StructureHelper.java | 39 +- 87 files changed, 8094 insertions(+), 6597 deletions(-) (limited to 'src/main/java/goodgenerator') diff --git a/src/main/java/goodgenerator/blocks/myFluids/BaseFluid.java b/src/main/java/goodgenerator/blocks/myFluids/BaseFluid.java index 9ccbd27e70..078012e64c 100644 --- a/src/main/java/goodgenerator/blocks/myFluids/BaseFluid.java +++ b/src/main/java/goodgenerator/blocks/myFluids/BaseFluid.java @@ -1,5 +1,7 @@ package goodgenerator.blocks.myFluids; +import static goodgenerator.main.GoodGenerator.MOD_ID; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.material.Material; @@ -9,46 +11,42 @@ import net.minecraftforge.fluids.BlockFluidClassic; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; -import static goodgenerator.main.GoodGenerator.MOD_ID; - -public class BaseFluid extends BlockFluidClassic{ - @SideOnly( Side.CLIENT ) +public class BaseFluid extends BlockFluidClassic { + @SideOnly(Side.CLIENT) protected IIcon stillIcon; - @SideOnly( Side.CLIENT ) + + @SideOnly(Side.CLIENT) protected IIcon flowingIcon; + private String stillTexture; private String flowingTexture; - public BaseFluid(Fluid fluid, Material material) - { - super( fluid, material ); + public BaseFluid(Fluid fluid, Material material) { + super(fluid, material); } - public void SetTexture(String fluidName) - { + public void SetTexture(String fluidName) { stillTexture = MOD_ID + ":fluids/" + fluidName + ".still"; flowingTexture = MOD_ID + ":fluids/" + fluidName + ".flowing"; } - public static Fluid BuildFluid(String fluidName){ + public static Fluid BuildFluid(String fluidName) { Fluid tFluid = new Fluid(fluidName); FluidRegistry.registerFluid(tFluid); return tFluid; } - @SideOnly( Side.CLIENT ) + @SideOnly(Side.CLIENT) @Override - public void registerBlockIcons( IIconRegister register ) - { + public void registerBlockIcons(IIconRegister register) { stillIcon = register.registerIcon(stillTexture); flowingIcon = register.registerIcon(flowingTexture); - super.getFluid().setIcons( stillIcon, flowingIcon ); + super.getFluid().setIcons(stillIcon, flowingIcon); } @Override - public IIcon getIcon( int side, int meta ) - { - return ( side == 0 || side == 1 ) ? stillIcon : flowingIcon; + public IIcon getIcon(int side, int meta) { + return (side == 0 || side == 1) ? stillIcon : flowingIcon; } } diff --git a/src/main/java/goodgenerator/blocks/myFluids/FluidsBuilder.java b/src/main/java/goodgenerator/blocks/myFluids/FluidsBuilder.java index eb7879200f..87466ea26a 100644 --- a/src/main/java/goodgenerator/blocks/myFluids/FluidsBuilder.java +++ b/src/main/java/goodgenerator/blocks/myFluids/FluidsBuilder.java @@ -1,13 +1,12 @@ package goodgenerator.blocks.myFluids; -import goodgenerator.crossmod.nei.NEI_Config; import cpw.mods.fml.common.registry.GameRegistry; +import goodgenerator.crossmod.nei.NEI_Config; import net.minecraft.block.material.Material; import net.minecraftforge.fluids.Fluid; public class FluidsBuilder { - public FluidsBuilder(){ - } + public FluidsBuilder() {} public static void Register() { crackedNaquadahGas_Lightly(); @@ -27,176 +26,153 @@ public class FluidsBuilder { supercriticalSteam(); } - public static void crackedNaquadahGas_Lightly(){ + public static void crackedNaquadahGas_Lightly() { Fluid tmp = BaseFluid.BuildFluid("lightlyCrackedNaquadahGas"); - tmp.setGaseous(true) - .setTemperature(800); + tmp.setGaseous(true).setTemperature(800); BaseFluid tmp2 = new BaseFluid(tmp, Material.water); tmp2.SetTexture("lightlyCrackedNaquadahGas"); tmp2.setBlockName("lightlyCrackedNaquadahGas"); - GameRegistry.registerBlock(tmp2,"lightlyCrackedNaquadahGas"); + GameRegistry.registerBlock(tmp2, "lightlyCrackedNaquadahGas"); NEI_Config.hide(tmp2); } - public static void crackedNaquadahGas_Moderately(){ + public static void crackedNaquadahGas_Moderately() { Fluid tmp = BaseFluid.BuildFluid("moderatelyCrackedNaquadahGas"); - tmp.setGaseous(true) - .setTemperature(800); + tmp.setGaseous(true).setTemperature(800); BaseFluid tmp2 = new BaseFluid(tmp, Material.water); tmp2.SetTexture("moderatelyCrackedNaquadahGas"); tmp2.setBlockName("moderatelyCrackedNaquadahGas"); - GameRegistry.registerBlock(tmp2,"moderatelyCrackedNaquadahGas"); + GameRegistry.registerBlock(tmp2, "moderatelyCrackedNaquadahGas"); NEI_Config.hide(tmp2); } - public static void crackedNaquadahGas_Heavily(){ + public static void crackedNaquadahGas_Heavily() { Fluid tmp = BaseFluid.BuildFluid("heavilyCrackedNaquadahGas"); - tmp.setGaseous(true) - .setTemperature(800); + tmp.setGaseous(true).setTemperature(800); BaseFluid tmp2 = new BaseFluid(tmp, Material.water); tmp2.SetTexture("heavilyCrackedNaquadahGas"); tmp2.setBlockName("heavilyCrackedNaquadahGas"); - GameRegistry.registerBlock(tmp2,"heavilyCrackedNaquadahGas"); + GameRegistry.registerBlock(tmp2, "heavilyCrackedNaquadahGas"); NEI_Config.hide(tmp2); } - public static void crackedLightNaquadahFuel_Lightly(){ + public static void crackedLightNaquadahFuel_Lightly() { Fluid tmp = BaseFluid.BuildFluid("lightlyCrackedLightNaquadahFuel"); - tmp.setGaseous(false) - .setTemperature(1200); + tmp.setGaseous(false).setTemperature(1200); BaseFluid tmp2 = new BaseFluid(tmp, Material.water); tmp2.SetTexture("lightlyCrackedLightNaquadahFuel"); tmp2.setBlockName("lightlyCrackedLightNaquadahFuel"); - GameRegistry.registerBlock(tmp2,"lightlyCrackedLightNaquadahFuel"); + GameRegistry.registerBlock(tmp2, "lightlyCrackedLightNaquadahFuel"); NEI_Config.hide(tmp2); } - public static void crackedLightNaquadahFuel_Moderately(){ + public static void crackedLightNaquadahFuel_Moderately() { Fluid tmp = BaseFluid.BuildFluid("moderatelyCrackedLightNaquadahFuel"); - tmp.setGaseous(false) - .setTemperature(1200); + tmp.setGaseous(false).setTemperature(1200); BaseFluid tmp2 = new BaseFluid(tmp, Material.water); tmp2.SetTexture("moderatelyCrackedLightNaquadahFuel"); tmp2.setBlockName("moderatelyCrackedLightNaquadahFuel"); - GameRegistry.registerBlock(tmp2,"moderatelyCrackedLightNaquadahFuel"); + GameRegistry.registerBlock(tmp2, "moderatelyCrackedLightNaquadahFuel"); NEI_Config.hide(tmp2); } - public static void crackedLightNaquadahFuel_Heavily(){ + public static void crackedLightNaquadahFuel_Heavily() { Fluid tmp = BaseFluid.BuildFluid("heavilyCrackedLightNaquadahFuel"); - tmp.setGaseous(false) - .setTemperature(1200); + tmp.setGaseous(false).setTemperature(1200); BaseFluid tmp2 = new BaseFluid(tmp, Material.water); tmp2.SetTexture("heavilyCrackedLightNaquadahFuel"); tmp2.setBlockName("heavilyCrackedLightNaquadahFuel"); - GameRegistry.registerBlock(tmp2,"heavilyCrackedLightNaquadahFuel"); + GameRegistry.registerBlock(tmp2, "heavilyCrackedLightNaquadahFuel"); NEI_Config.hide(tmp2); } - public static void crackedHeavyNaquadahFuel_Lightly(){ + public static void crackedHeavyNaquadahFuel_Lightly() { Fluid tmp = BaseFluid.BuildFluid("lightlyCrackedHeavyNaquadahFuel"); - tmp.setGaseous(false) - .setTemperature(1200); + tmp.setGaseous(false).setTemperature(1200); BaseFluid tmp2 = new BaseFluid(tmp, Material.water); tmp2.SetTexture("lightlyCrackedHeavyNaquadahFuel"); tmp2.setBlockName("lightlyCrackedHeavyNaquadahFuel"); - GameRegistry.registerBlock(tmp2,"lightlyCrackedHeavyNaquadahFuel"); + GameRegistry.registerBlock(tmp2, "lightlyCrackedHeavyNaquadahFuel"); NEI_Config.hide(tmp2); } - public static void crackedHeavyNaquadahFuel_Moderately(){ + public static void crackedHeavyNaquadahFuel_Moderately() { Fluid tmp = BaseFluid.BuildFluid("moderatelyCrackedHeavyNaquadahFuel"); - tmp.setGaseous(false) - .setTemperature(1200); + tmp.setGaseous(false).setTemperature(1200); BaseFluid tmp2 = new BaseFluid(tmp, Material.water); tmp2.SetTexture("moderatelyCrackedHeavyNaquadahFuel"); tmp2.setBlockName("moderatelyCrackedHeavyNaquadahFuel"); - GameRegistry.registerBlock(tmp2,"moderatelyCrackedHeavyNaquadahFuel"); + GameRegistry.registerBlock(tmp2, "moderatelyCrackedHeavyNaquadahFuel"); NEI_Config.hide(tmp2); } - public static void crackedHeavyNaquadahFuel_Heavily(){ + public static void crackedHeavyNaquadahFuel_Heavily() { Fluid tmp = BaseFluid.BuildFluid("heavilyCrackedHeavyNaquadahFuel"); - tmp.setGaseous(false) - .setTemperature(1200); + tmp.setGaseous(false).setTemperature(1200); BaseFluid tmp2 = new BaseFluid(tmp, Material.water); tmp2.SetTexture("heavilyCrackedHeavyNaquadahFuel"); tmp2.setBlockName("heavilyCrackedHeavyNaquadahFuel"); - GameRegistry.registerBlock(tmp2,"heavilyCrackedHeavyNaquadahFuel"); + GameRegistry.registerBlock(tmp2, "heavilyCrackedHeavyNaquadahFuel"); NEI_Config.hide(tmp2); } - public static void crackedNaquadahAsphalt_Lightly(){ + public static void crackedNaquadahAsphalt_Lightly() { Fluid tmp = BaseFluid.BuildFluid("lightlyCrackedNaquadahAsphalt"); - tmp.setGaseous(false) - .setTemperature(1800) - .setDensity(20000) - .setViscosity(20000); + tmp.setGaseous(false).setTemperature(1800).setDensity(20000).setViscosity(20000); BaseFluid tmp2 = new BaseFluid(tmp, Material.water); tmp2.SetTexture("lightlyCrackedNaquadahAsphalt"); tmp2.setBlockName("lightlyCrackedNaquadahAsphalt"); - GameRegistry.registerBlock(tmp2,"lightlyCrackedNaquadahAsphalt"); + GameRegistry.registerBlock(tmp2, "lightlyCrackedNaquadahAsphalt"); NEI_Config.hide(tmp2); } - public static void crackedNaquadahAsphalt_Moderately(){ + public static void crackedNaquadahAsphalt_Moderately() { Fluid tmp = BaseFluid.BuildFluid("moderatelyCrackedNaquadahAsphalt"); - tmp.setGaseous(false) - .setTemperature(1800) - .setDensity(20000) - .setViscosity(20000); + tmp.setGaseous(false).setTemperature(1800).setDensity(20000).setViscosity(20000); BaseFluid tmp2 = new BaseFluid(tmp, Material.water); tmp2.SetTexture("moderatelyCrackedNaquadahAsphalt"); tmp2.setBlockName("moderatelyCrackedNaquadahAsphalt"); - GameRegistry.registerBlock(tmp2,"moderatelyCrackedNaquadahAsphalt"); + GameRegistry.registerBlock(tmp2, "moderatelyCrackedNaquadahAsphalt"); NEI_Config.hide(tmp2); } - public static void crackedNaquadahAsphalt_Heavily(){ + public static void crackedNaquadahAsphalt_Heavily() { Fluid tmp = BaseFluid.BuildFluid("heavilyCrackedNaquadahAsphalt"); - tmp.setGaseous(false) - .setTemperature(1800) - .setDensity(20000) - .setViscosity(20000); + tmp.setGaseous(false).setTemperature(1800).setDensity(20000).setViscosity(20000); BaseFluid tmp2 = new BaseFluid(tmp, Material.water); tmp2.SetTexture("heavilyCrackedNaquadahAsphalt"); tmp2.setBlockName("heavilyCrackedNaquadahAsphalt"); - GameRegistry.registerBlock(tmp2,"heavilyCrackedNaquadahAsphalt"); + GameRegistry.registerBlock(tmp2, "heavilyCrackedNaquadahAsphalt"); NEI_Config.hide(tmp2); } - public static void combustionPromotor(){ + public static void combustionPromotor() { Fluid tmp = BaseFluid.BuildFluid("combustionPromotor"); - tmp.setGaseous(false) - .setTemperature(300); + tmp.setGaseous(false).setTemperature(300); BaseFluid tmp2 = new BaseFluid(tmp, Material.water); tmp2.SetTexture("combustionPromotor"); tmp2.setBlockName("combustionPromotor"); - GameRegistry.registerBlock(tmp2,"combustionPromotor"); + GameRegistry.registerBlock(tmp2, "combustionPromotor"); NEI_Config.hide(tmp2); } - public static void coalTar(){ + public static void coalTar() { Fluid tmp = BaseFluid.BuildFluid("fluid.coalTar"); - tmp.setGaseous(false) - .setTemperature(450) - .setUnlocalizedName("fluid.coalTar"); + tmp.setGaseous(false).setTemperature(450).setUnlocalizedName("fluid.coalTar"); BaseFluid tmp2 = new BaseFluid(tmp, Material.water); tmp2.SetTexture("coalTar"); tmp2.setBlockTextureName("coalTar"); - GameRegistry.registerBlock(tmp2,"coalTar"); + GameRegistry.registerBlock(tmp2, "coalTar"); NEI_Config.hide(tmp2); } - public static void supercriticalSteam(){ + public static void supercriticalSteam() { Fluid tmp = BaseFluid.BuildFluid("supercriticalSteam"); - tmp.setGaseous(true) - .setTemperature(648) - .setUnlocalizedName("supercriticalSteam"); + tmp.setGaseous(true).setTemperature(648).setUnlocalizedName("supercriticalSteam"); BaseFluid tmp2 = new BaseFluid(tmp, Material.water); tmp2.SetTexture("supercriticalSteam"); tmp2.setBlockTextureName("supercriticalSteam"); - GameRegistry.registerBlock(tmp2,"supercriticalSteam"); + GameRegistry.registerBlock(tmp2, "supercriticalSteam"); NEI_Config.hide(tmp2); } } diff --git a/src/main/java/goodgenerator/blocks/regularBlock/Casing.java b/src/main/java/goodgenerator/blocks/regularBlock/Casing.java index 7a1db3278d..8808abd169 100644 --- a/src/main/java/goodgenerator/blocks/regularBlock/Casing.java +++ b/src/main/java/goodgenerator/blocks/regularBlock/Casing.java @@ -1,9 +1,10 @@ package goodgenerator.blocks.regularBlock; -import goodgenerator.main.GoodGenerator; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import goodgenerator.main.GoodGenerator; import gregtech.api.GregTech_API; +import java.util.List; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -16,12 +17,11 @@ import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import java.util.List; - public class Casing extends Block { @SideOnly(Side.CLIENT) protected IIcon[] texture; + String[] textureNames; protected String name; @@ -30,29 +30,29 @@ public class Casing extends Block { this.setHardness(9.0F); this.setResistance(5.0F); this.name = name; - this.setHarvestLevel("wrench",2); + this.setHarvestLevel("wrench", 2); this.setCreativeTab(GoodGenerator.GG); GregTech_API.registerMachineBlock(this, -1); } - public Casing(String name, String[] texture){ + public Casing(String name, String[] texture) { super(Material.iron); this.setHardness(9.0F); this.setResistance(5.0F); this.name = name; this.textureNames = texture; - this.setHarvestLevel("wrench",2); + this.setHarvestLevel("wrench", 2); this.setCreativeTab(GoodGenerator.GG); GregTech_API.registerMachineBlock(this, -1); } - public Casing(String name, String[] texture, Material material){ + public Casing(String name, String[] texture, Material material) { super(material); this.setHardness(9.0F); this.setResistance(5.0F); this.name = name; this.textureNames = texture; - this.setHarvestLevel("wrench",2); + this.setHarvestLevel("wrench", 2); this.setCreativeTab(GoodGenerator.GG); GregTech_API.registerMachineBlock(this, -1); } @@ -119,5 +119,4 @@ public class Casing extends Block { public boolean canCreatureSpawn(EnumCreatureType type, IBlockAccess world, int x, int y, int z) { return false; } - } diff --git a/src/main/java/goodgenerator/blocks/regularBlock/ComplexTextureCasing.java b/src/main/java/goodgenerator/blocks/regularBlock/ComplexTextureCasing.java index 18a1629cbf..149a1b2bfb 100644 --- a/src/main/java/goodgenerator/blocks/regularBlock/ComplexTextureCasing.java +++ b/src/main/java/goodgenerator/blocks/regularBlock/ComplexTextureCasing.java @@ -2,22 +2,21 @@ package goodgenerator.blocks.regularBlock; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import java.util.List; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; -import java.util.List; - -public class ComplexTextureCasing extends Casing{ +public class ComplexTextureCasing extends Casing { @SideOnly(Side.CLIENT) protected IIcon[] texture1, texture2; String[] textureSide; String[] textureTopAndDown; - public ComplexTextureCasing(String name, String[] textureSide, String[] textureTopAndDown){ + public ComplexTextureCasing(String name, String[] textureSide, String[] textureTopAndDown) { super(name); this.textureSide = textureSide; this.textureTopAndDown = textureTopAndDown; @@ -28,8 +27,7 @@ public class ComplexTextureCasing extends Casing{ public IIcon getIcon(int side, int meta) { if (side < 2) { return meta < this.texture2.length ? this.texture2[meta] : this.texture2[0]; - } - else { + } else { return meta < this.texture1.length ? this.texture1[meta] : this.texture1[0]; } } diff --git a/src/main/java/goodgenerator/blocks/regularBlock/Frame.java b/src/main/java/goodgenerator/blocks/regularBlock/Frame.java index 90c38c4cce..f5a62bed4f 100644 --- a/src/main/java/goodgenerator/blocks/regularBlock/Frame.java +++ b/src/main/java/goodgenerator/blocks/regularBlock/Frame.java @@ -5,9 +5,9 @@ import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.material.Material; import net.minecraft.world.IBlockAccess; -public class Frame extends Casing{ - public Frame(String name,String[] texture){ - super(name,texture, Material.iron); +public class Frame extends Casing { + public Frame(String name, String[] texture) { + super(name, texture, Material.iron); } @Override @@ -18,8 +18,7 @@ public class Frame extends Casing{ @Override @SideOnly(Side.CLIENT) public boolean shouldSideBeRendered(IBlockAccess worldClient, int xCoord, int yCoord, int zCoord, int aSide) { - if (worldClient.getBlock(xCoord, yCoord, zCoord) instanceof Frame) - return false; + if (worldClient.getBlock(xCoord, yCoord, zCoord) instanceof Frame) return false; return super.shouldSideBeRendered(worldClient, xCoord, yCoord, zCoord, aSide); } diff --git a/src/main/java/goodgenerator/blocks/regularBlock/ITextureBlock.java b/src/main/java/goodgenerator/blocks/regularBlock/ITextureBlock.java index eba7c2c890..914552ad8d 100644 --- a/src/main/java/goodgenerator/blocks/regularBlock/ITextureBlock.java +++ b/src/main/java/goodgenerator/blocks/regularBlock/ITextureBlock.java @@ -13,5 +13,4 @@ public interface ITextureBlock { ITexture[] getTexture(Block aBlock, byte aSide, IBlockAccess aWorld, int xCoord, int yCoord, int zCoord); ITexture[] getTexture(Block aBlock, int aMeta, byte aSide); - } diff --git a/src/main/java/goodgenerator/blocks/regularBlock/TEBlock.java b/src/main/java/goodgenerator/blocks/regularBlock/TEBlock.java index 3be9619968..df98dc67dd 100644 --- a/src/main/java/goodgenerator/blocks/regularBlock/TEBlock.java +++ b/src/main/java/goodgenerator/blocks/regularBlock/TEBlock.java @@ -1,13 +1,14 @@ package goodgenerator.blocks.regularBlock; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import goodgenerator.blocks.tileEntity.EssentiaHatch; import goodgenerator.blocks.tileEntity.EssentiaOutputHatch; import goodgenerator.blocks.tileEntity.EssentiaOutputHatch_ME; import goodgenerator.main.GoodGenerator; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import gregtech.api.GregTech_API; import gregtech.api.util.GT_Utility; +import java.util.List; import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; @@ -26,46 +27,45 @@ import net.minecraft.world.World; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.IEssentiaContainerItem; -import java.util.List; - public class TEBlock extends BlockContainer { @SideOnly(Side.CLIENT) protected IIcon[] texture; + String[] textureNames; protected String name; protected int index; - public TEBlock(String name, String[] texture, CreativeTabs Tab){ + public TEBlock(String name, String[] texture, CreativeTabs Tab) { super(Material.iron); this.setHardness(9.0F); this.setResistance(5.0F); this.name = name; this.textureNames = texture; - this.setHarvestLevel("wrench",2); + this.setHarvestLevel("wrench", 2); this.setCreativeTab(GoodGenerator.GG); GregTech_API.registerMachineBlock(this, -1); } - public TEBlock(String name, String[] texture, int index){ + public TEBlock(String name, String[] texture, int index) { super(Material.iron); this.setHardness(9.0F); this.setResistance(5.0F); this.name = name; this.textureNames = texture; - this.setHarvestLevel("wrench",2); + this.setHarvestLevel("wrench", 2); this.index = index; this.setCreativeTab(GoodGenerator.GG); GregTech_API.registerMachineBlock(this, -1); } - public TEBlock(String name, String[] texture, Material material){ + public TEBlock(String name, String[] texture, Material material) { super(material); this.setHardness(9.0F); this.setResistance(5.0F); this.name = name; this.textureNames = texture; - this.setHarvestLevel("wrench",2); + this.setHarvestLevel("wrench", 2); this.setCreativeTab(GoodGenerator.GG); GregTech_API.registerMachineBlock(this, -1); } @@ -153,7 +153,8 @@ public class TEBlock extends BlockContainer { } @Override - public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int par6, float par7, float par8, float par9) { + public boolean onBlockActivated( + World world, int x, int y, int z, EntityPlayer player, int par6, float par7, float par8, float par9) { if (world.isRemote) { return false; } else { @@ -163,10 +164,21 @@ public class TEBlock extends BlockContainer { ItemStack tItemStack = player.getHeldItem(); if (tItemStack != null) { Item tItem = tItemStack.getItem(); - if (tItem instanceof IEssentiaContainerItem && ((IEssentiaContainerItem) tItem).getAspects(player.getHeldItem()) != null && ((IEssentiaContainerItem) tItem).getAspects(player.getHeldItem()).size() > 0) { - Aspect tLocked = ((IEssentiaContainerItem) tItem).getAspects(player.getHeldItem()).getAspects()[0]; + if (tItem instanceof IEssentiaContainerItem + && ((IEssentiaContainerItem) tItem).getAspects(player.getHeldItem()) != null + && ((IEssentiaContainerItem) tItem) + .getAspects(player.getHeldItem()) + .size() + > 0) { + Aspect tLocked = ((IEssentiaContainerItem) tItem) + .getAspects(player.getHeldItem()) + .getAspects()[0]; ((EssentiaHatch) tile).setLockedAspect(tLocked); - GT_Utility.sendChatToPlayer(player, String.format(StatCollector.translateToLocal("essentiahatch.chat.0"), tLocked.getLocalizedDescription())); + GT_Utility.sendChatToPlayer( + player, + String.format( + StatCollector.translateToLocal("essentiahatch.chat.0"), + tLocked.getLocalizedDescription())); } } else { ((EssentiaHatch) tile).setLockedAspect(null); @@ -180,7 +192,8 @@ public class TEBlock extends BlockContainer { ItemStack tItemStack = player.getHeldItem(); if (tItemStack == null) { ((EssentiaOutputHatch) tile).clear(); - GT_Utility.sendChatToPlayer(player, StatCollector.translateToLocal("essentiaoutputhatch.chat.0")); + GT_Utility.sendChatToPlayer( + player, StatCollector.translateToLocal("essentiaoutputhatch.chat.0")); } return true; } else return false; diff --git a/src/main/java/goodgenerator/blocks/regularBlock/TurbineCasing.java b/src/main/java/goodgenerator/blocks/regularBlock/TurbineCasing.java index 6fd25af048..b07d173491 100644 --- a/src/main/java/goodgenerator/blocks/regularBlock/TurbineCasing.java +++ b/src/main/java/goodgenerator/blocks/regularBlock/TurbineCasing.java @@ -1,7 +1,7 @@ package goodgenerator.blocks.regularBlock; -import goodgenerator.client.render.BlockRenderHandler; import goodgenerator.blocks.tileEntity.base.GT_MetaTileEntity_LargeTurbineBase; +import goodgenerator.client.render.BlockRenderHandler; import goodgenerator.main.GoodGenerator; import gregtech.api.enums.Textures; import gregtech.api.interfaces.IIconContainer; @@ -12,19 +12,19 @@ import net.minecraft.block.Block; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.IBlockAccess; -public class TurbineCasing extends Casing implements ITextureBlock{ +public class TurbineCasing extends Casing implements ITextureBlock { public static IIconContainer[][] turbineShape = new IIconContainer[3][9]; public IIconContainer base; static { - for (int i = 0; i < 3; i ++) - for (int j = 1; j <= 9; j ++) + for (int i = 0; i < 3; i++) + for (int j = 1; j <= 9; j++) turbineShape[i][j - 1] = new Textures.BlockIcons.CustomIcon("icons/turbines/TURBINE_" + i + "" + j); } public TurbineCasing(String name, String texture) { - super(name, new String[]{GoodGenerator.MOD_ID + ":" + texture}); + super(name, new String[] {GoodGenerator.MOD_ID + ":" + texture}); base = new Textures.BlockIcons.CustomIcon("icons/" + texture); } @@ -32,7 +32,8 @@ public class TurbineCasing extends Casing implements ITextureBlock{ TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ); if (!(tTileEntity instanceof IGregTechTileEntity)) return 0; IGregTechTileEntity tTile = (IGregTechTileEntity) tTileEntity; - if (tTile.getMetaTileEntity() instanceof GT_MetaTileEntity_LargeTurbineBase && tTile.getFrontFacing() == aSide) { + if (tTile.getMetaTileEntity() instanceof GT_MetaTileEntity_LargeTurbineBase + && tTile.getFrontFacing() == aSide) { if (tTile.isActive()) return 1; return ((GT_MetaTileEntity_LargeTurbineBase) tTile.getMetaTileEntity()).hasTurbine() ? 2 : 3; } @@ -41,10 +42,7 @@ public class TurbineCasing extends Casing implements ITextureBlock{ public ITexture[] getTurbineCasing(int iconIndex, boolean active, boolean hasTurbine) { int states = active ? 0 : hasTurbine ? 1 : 2; - return new ITexture[] { - TextureFactory.of(base), - TextureFactory.of(turbineShape[states][iconIndex]) - }; + return new ITexture[] {TextureFactory.of(base), TextureFactory.of(turbineShape[states][iconIndex])}; } @Override @@ -54,10 +52,10 @@ public class TurbineCasing extends Casing implements ITextureBlock{ case 0: for (int i = -1; i < 2; i++) { for (int j = -1; j < 2; j++) { - if (i == 0 && j == 0) - continue; + if (i == 0 && j == 0) continue; int tState; - if ((tState = isTurbineControllerWithSide(aWorld, xCoord + j, yCoord, zCoord + i, aSide)) != 0) { + if ((tState = isTurbineControllerWithSide(aWorld, xCoord + j, yCoord, zCoord + i, aSide)) + != 0) { return getTurbineCasing(4 - i * 3 - j, tState == 1, tState == 2); } } @@ -66,10 +64,10 @@ public class TurbineCasing extends Casing implements ITextureBlock{ case 1: for (int i = -1; i < 2; i++) { for (int j = -1; j < 2; j++) { - if (i == 0 && j == 0) - continue; + if (i == 0 && j == 0) continue; int tState; - if ((tState = isTurbineControllerWithSide(aWorld, xCoord + j, yCoord + i, zCoord, aSide)) != 0) { + if ((tState = isTurbineControllerWithSide(aWorld, xCoord + j, yCoord + i, zCoord, aSide)) + != 0) { return getTurbineCasing(4 + i * 3 - j * tInvertLeftRightMod, tState == 1, tState == 2); } } @@ -78,10 +76,10 @@ public class TurbineCasing extends Casing implements ITextureBlock{ case 2: for (int i = -1; i < 2; i++) { for (int j = -1; j < 2; j++) { - if (i == 0 && j == 0) - continue; + if (i == 0 && j == 0) continue; int tState; - if ((tState = isTurbineControllerWithSide(aWorld, xCoord, yCoord + i, zCoord + j, aSide)) != 0) { + if ((tState = isTurbineControllerWithSide(aWorld, xCoord, yCoord + i, zCoord + j, aSide)) + != 0) { return getTurbineCasing(4 + i * 3 + j * tInvertLeftRightMod, tState == 1, tState == 2); } } @@ -93,9 +91,7 @@ public class TurbineCasing extends Casing implements ITextureBlock{ @Override public ITexture[] getTexture(Block aBlock, int aMeta, byte aSide) { - return new ITexture[] { - TextureFactory.of(base) - }; + return new ITexture[] {TextureFactory.of(base)}; } @Override diff --git a/src/main/java/goodgenerator/blocks/tileEntity/CoolantTower.java b/src/main/java/goodgenerator/blocks/tileEntity/CoolantTower.java index 67dc2b9101..f011934b66 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/CoolantTower.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/CoolantTower.java @@ -1,5 +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.enums.Textures.BlockIcons.*; +import static gregtech.api.util.GT_StructureUtility.ofFrame; +import static gregtech.api.util.GT_StructureUtility.ofHatchAdder; + 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; @@ -21,12 +27,6 @@ import gregtech.api.util.GT_Utility; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; -import static com.gtnewhorizon.structurelib.structure.StructureUtility.*; -import static goodgenerator.util.DescTextLocalization.BLUE_PRINT_INFO; -import static gregtech.api.enums.Textures.BlockIcons.*; -import static gregtech.api.util.GT_StructureUtility.ofFrame; -import static gregtech.api.util.GT_StructureUtility.ofHatchAdder; - public class CoolantTower extends GT_MetaTileEntity_TooltipMultiBlockBase_EM implements IConstructable { protected IStructureDefinition multiDefinition = null; @@ -42,38 +42,187 @@ public class CoolantTower extends GT_MetaTileEntity_TooltipMultiBlockBase_EM imp @Override public IStructureDefinition getStructure_EM() { - if(multiDefinition == null) { - multiDefinition = StructureDefinition - .builder() - .addShape(mName, - transpose(new String[][]{ - {" ", " ", " BBB ", " B B ", " B B ", " B B ", " B B ", " B B ", " BBB ", " ", " "}, - {" ", " ", " BBB ", " BBBBB ", " BB BB ", " BB BB ", " BB BB ", " BBBBB ", " BBB ", " ", " "}, - {" ", " ", " ", " BBB ", " B B ", " B B ", " B B ", " BBB ", " ", " ", " "}, - {" ", " ", " ", " BBB ", " B B ", " B B ", " B B ", " BBB ", " ", " ", " "}, - {" ", " ", " ", " BBB ", " B B ", " B B ", " B B ", " BBB ", " ", " ", " "}, - {" ", " ", " BBB ", " BBBBB ", " BB BB ", " BB BB ", " BB BB ", " BBBBB ", " BBB ", " ", " "}, - {" ", " ", " BBB ", " B B ", " B B ", " B B ", " B B ", " B B ", " BBB ", " ", " "}, - {" ", " ", " BBB ", " B B ", " B B ", " B B ", " B B ", " B B ", " BBB ", " ", " "}, - {" ", " BBB ", " BBBBB ", " BB BB ", " BB BB ", " BB BB ", " BB BB ", " BB BB ", " BBBBB ", " BBB ", " "}, - {" ", " BBB ", " B B ", " B B ", " B B ", " B B ", " B B ", " B B ", " B B ", " BBB ", " "}, - {" ", " BBBBB ", " BB BB ", " BB BB ", " B B ", " B B ", " B B ", " BB BB ", " BB BB ", " BBBBB ", " "}, - {" HH~HH ", " HBBBBBH ", " HB BH ", "HB BH", "HB BH", "HB BH", "HB BH", "HB BH", " HB BH ", " HBBBBBH ", " HHHHH "}, - {" CCCCC ", " C C ", " C C ", "C C", "C C", "C C", "C C", "C C", " C C ", " C C ", " CCCCC "}, - }) - ).addElement('B', - ofBlockAnyMeta(GregTech_API.sBlockConcretes, 8) - ).addElement('C', - ofFrame(Materials.TungstenCarbide) - ).addElement('H', - ofChain( - ofHatchAdder( - CoolantTower::addIOFluidToMachineList, CASING_INDEX, 1 - ), - ofBlockAnyMeta(GregTech_API.sBlockConcretes, 8) - ) - ) - .build(); + if (multiDefinition == null) { + multiDefinition = StructureDefinition.builder() + .addShape(mName, transpose(new String[][] { + { + " ", + " ", + " BBB ", + " B B ", + " B B ", + " B B ", + " B B ", + " B B ", + " BBB ", + " ", + " " + }, + { + " ", + " ", + " BBB ", + " BBBBB ", + " BB BB ", + " BB BB ", + " BB BB ", + " BBBBB ", + " BBB ", + " ", + " " + }, + { + " ", + " ", + " ", + " BBB ", + " B B ", + " B B ", + " B B ", + " BBB ", + " ", + " ", + " " + }, + { + " ", + " ", + " ", + " BBB ", + " B B ", + " B B ", + " B B ", + " BBB ", + " ", + " ", + " " + }, + { + " ", + " ", + " ", + " BBB ", + " B B ", + " B B ", + " B B ", + " BBB ", + " ", + " ", + " " + }, + { + " ", + " ", + " BBB ", + " BBBBB ", + " BB BB ", + " BB BB ", + " BB BB ", + " BBBBB ", + " BBB ", + " ", + " " + }, + { + " ", + " ", + " BBB ", + " B B ", + " B B ", + " B B ", + " B B ", + " B B ", + " BBB ", + " ", + " " + }, + { + " ", + " ", + " BBB ", + " B B ", + " B B ", + " B B ", + " B B ", + " B B ", + " BBB ", + " ", + " " + }, + { + " ", + " BBB ", + " BBBBB ", + " BB BB ", + " BB BB ", + " BB BB ", + " BB BB ", + " BB BB ", + " BBBBB ", + " BBB ", + " " + }, + { + " ", + " BBB ", + " B B ", + " B B ", + " B B ", + " B B ", + " B B ", + " B B ", + " B B ", + " BBB ", + " " + }, + { + " ", + " BBBBB ", + " BB BB ", + " BB BB ", + " B B ", + " B B ", + " B B ", + " BB BB ", + " BB BB ", + " BBBBB ", + " " + }, + { + " HH~HH ", + " HBBBBBH ", + " HB BH ", + "HB BH", + "HB BH", + "HB BH", + "HB BH", + "HB BH", + " HB BH ", + " HBBBBBH ", + " HHHHH " + }, + { + " CCCCC ", + " C C ", + " C C ", + "C C", + "C C", + "C C", + "C C", + "C C", + " C C ", + " C C ", + " CCCCC " + }, + })) + .addElement('B', ofBlockAnyMeta(GregTech_API.sBlockConcretes, 8)) + .addElement('C', ofFrame(Materials.TungstenCarbide)) + .addElement( + 'H', + ofChain( + ofHatchAdder(CoolantTower::addIOFluidToMachineList, CASING_INDEX, 1), + ofBlockAnyMeta(GregTech_API.sBlockConcretes, 8))) + .build(); } return multiDefinition; } @@ -86,11 +235,11 @@ public class CoolantTower extends GT_MetaTileEntity_TooltipMultiBlockBase_EM imp if (aMetaTileEntity == null) { return false; } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Input) { - ((GT_MetaTileEntity_Hatch)aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mInputHatches.add((GT_MetaTileEntity_Hatch_Input)aMetaTileEntity); + ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); + return this.mInputHatches.add((GT_MetaTileEntity_Hatch_Input) aMetaTileEntity); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Output) { - ((GT_MetaTileEntity_Hatch)aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mOutputHatches.add((GT_MetaTileEntity_Hatch_Output)aMetaTileEntity); + ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); + return this.mOutputHatches.add((GT_MetaTileEntity_Hatch_Output) aMetaTileEntity); } else { return false; } @@ -112,14 +261,14 @@ public class CoolantTower extends GT_MetaTileEntity_TooltipMultiBlockBase_EM imp protected GT_Multiblock_Tooltip_Builder createTooltip() { final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); tt.addMachineType("Coolant Tower") - .addInfo("Controller block for the Coolant Tower.") - .addInfo("Turn Steam back to Distilled Water.") - .addInfo(BLUE_PRINT_INFO) - .addSeparator() - .addController("Mid of the second layer.") - .addInputHatch("Input Hatch", 1) - .addOutputHatch("Output Hatch", 1) - .toolTipFinisher("Good Generator"); + .addInfo("Controller block for the Coolant Tower.") + .addInfo("Turn Steam back to Distilled Water.") + .addInfo(BLUE_PRINT_INFO) + .addSeparator() + .addController("Mid of the second layer.") + .addInputHatch("Input Hatch", 1) + .addOutputHatch("Output Hatch", 1) + .toolTipFinisher("Good Generator"); return tt; } @@ -177,18 +326,40 @@ public class CoolantTower extends GT_MetaTileEntity_TooltipMultiBlockBase_EM imp } @Override - public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone) { + public ITexture[] getTexture( + IGregTechTileEntity aBaseMetaTileEntity, + byte aSide, + byte aFacing, + byte aColorIndex, + boolean aActive, + boolean aRedstone) { if (aSide == aFacing) { if (aActive) - return new ITexture[]{ + return new ITexture[] { casingTexturePages[12][6], - TextureFactory.builder().addIcon(OVERLAY_FRONT_HEAT_EXCHANGER_ACTIVE).extFacing().build(), - TextureFactory.builder().addIcon(OVERLAY_FRONT_HEAT_EXCHANGER_ACTIVE_GLOW).extFacing().glow().build()}; - return new ITexture[]{ + TextureFactory.builder() + .addIcon(OVERLAY_FRONT_HEAT_EXCHANGER_ACTIVE) + .extFacing() + .build(), + TextureFactory.builder() + .addIcon(OVERLAY_FRONT_HEAT_EXCHANGER_ACTIVE_GLOW) + .extFacing() + .glow() + .build() + }; + return new ITexture[] { casingTexturePages[12][6], - TextureFactory.builder().addIcon(OVERLAY_FRONT_HEAT_EXCHANGER).extFacing().build(), - TextureFactory.builder().addIcon(OVERLAY_FRONT_HEAT_EXCHANGER_GLOW).extFacing().glow().build()}; + TextureFactory.builder() + .addIcon(OVERLAY_FRONT_HEAT_EXCHANGER) + .extFacing() + .build(), + TextureFactory.builder() + .addIcon(OVERLAY_FRONT_HEAT_EXCHANGER_GLOW) + .extFacing() + .glow() + .build() + }; } - return new ITexture[]{casingTexturePages[12][6]}; + return new ITexture[] {casingTexturePages[12][6]}; } } diff --git a/src/main/java/goodgenerator/blocks/tileEntity/EssentiaHatch.java b/src/main/java/goodgenerator/blocks/tileEntity/EssentiaHatch.java index 662767d3cf..4c72fff073 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/EssentiaHatch.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/EssentiaHatch.java @@ -1,6 +1,7 @@ package goodgenerator.blocks.tileEntity; import goodgenerator.crossmod.thaumcraft.LargeEssentiaEnergyData; +import java.util.ArrayList; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.network.NetworkManager; @@ -14,8 +15,6 @@ import thaumcraft.api.aspects.AspectList; import thaumcraft.api.aspects.IAspectContainer; import thaumcraft.api.aspects.IEssentiaTransport; -import java.util.ArrayList; - public class EssentiaHatch extends TileEntity implements IAspectContainer, IEssentiaTransport { private Aspect mLocked; @@ -86,17 +85,19 @@ public class EssentiaHatch extends TileEntity implements IAspectContainer, IEsse } public void fillfrompipe() { - if (getEssentiaAmount(null) >= 1000) - return; + if (getEssentiaAmount(null) >= 1000) return; TileEntity[] te = new TileEntity[ForgeDirection.VALID_DIRECTIONS.length]; for (int i = 0; i < ForgeDirection.VALID_DIRECTIONS.length; i++) { - te[i] = ThaumcraftApiHelper.getConnectableTile(this.worldObj, this.xCoord, this.yCoord, this.zCoord, ForgeDirection.VALID_DIRECTIONS[i]); + te[i] = ThaumcraftApiHelper.getConnectableTile( + this.worldObj, this.xCoord, this.yCoord, this.zCoord, ForgeDirection.VALID_DIRECTIONS[i]); if (te[i] != null) { IEssentiaTransport pipe = (IEssentiaTransport) te[i]; if (!pipe.canOutputTo(ForgeDirection.VALID_DIRECTIONS[i])) { return; } - if ((pipe.getEssentiaType(ForgeDirection.VALID_DIRECTIONS[i].getOpposite()) != null) && (pipe.getSuctionAmount(ForgeDirection.VALID_DIRECTIONS[i]) < getSuctionAmount(ForgeDirection.VALID_DIRECTIONS[i]))) { + if ((pipe.getEssentiaType(ForgeDirection.VALID_DIRECTIONS[i].getOpposite()) != null) + && (pipe.getSuctionAmount(ForgeDirection.VALID_DIRECTIONS[i]) + < getSuctionAmount(ForgeDirection.VALID_DIRECTIONS[i]))) { Aspect readyInput = pipe.getEssentiaType(ForgeDirection.VALID_DIRECTIONS[i].getOpposite()); int type = LargeEssentiaEnergyData.getAspectTypeIndex(readyInput); if (type != -1 && (mState & (1 << type)) == 0) continue; @@ -104,7 +105,12 @@ public class EssentiaHatch extends TileEntity implements IAspectContainer, IEsse addToContainer(mLocked, pipe.takeEssentia(mLocked, 1, ForgeDirection.VALID_DIRECTIONS[i])); } if (mLocked == null) - addToContainer(pipe.getEssentiaType(ForgeDirection.VALID_DIRECTIONS[i]), pipe.takeEssentia(pipe.getEssentiaType(ForgeDirection.VALID_DIRECTIONS[i]), 1, ForgeDirection.VALID_DIRECTIONS[i])); + addToContainer( + pipe.getEssentiaType(ForgeDirection.VALID_DIRECTIONS[i]), + pipe.takeEssentia( + pipe.getEssentiaType(ForgeDirection.VALID_DIRECTIONS[i]), + 1, + ForgeDirection.VALID_DIRECTIONS[i])); } } } @@ -159,8 +165,7 @@ public class EssentiaHatch extends TileEntity implements IAspectContainer, IEsse @Override public boolean doesContainerContain(AspectList aspectList) { ArrayList ret = new ArrayList(); - for (Aspect a : aspectList.aspects.keySet()) - ret.add(current.aspects.containsKey(a)); + for (Aspect a : aspectList.aspects.keySet()) ret.add(current.aspects.containsKey(a)); return !ret.contains(false); } @@ -185,7 +190,7 @@ public class EssentiaHatch extends TileEntity implements IAspectContainer, IEsse } @Override - public void setSuction(Aspect aspect, int i) { } + public void setSuction(Aspect aspect, int i) {} @Override public Aspect getSuctionType(ForgeDirection forgeDirection) { diff --git a/src/main/java/goodgenerator/blocks/tileEntity/EssentiaOutputHatch.java b/src/main/java/goodgenerator/blocks/tileEntity/EssentiaOutputHatch.java index 77d8004446..b3f3f51aff 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/EssentiaOutputHatch.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/EssentiaOutputHatch.java @@ -1,5 +1,6 @@ package goodgenerator.blocks.tileEntity; +import java.util.Map; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraftforge.common.util.ForgeDirection; @@ -9,8 +10,6 @@ import thaumcraft.api.aspects.AspectList; import thaumcraft.api.aspects.IAspectContainer; import thaumcraft.api.aspects.IEssentiaTransport; -import java.util.Map; - public class EssentiaOutputHatch extends TileThaumcraft implements IAspectContainer, IEssentiaTransport { public static final int CAPACITY = 256; @@ -134,8 +133,7 @@ public class EssentiaOutputHatch extends TileThaumcraft implements IAspectContai } @Override - public void setSuction(Aspect var1, int var2) { - } + public void setSuction(Aspect var1, int var2) {} @Override public Aspect getSuctionType(ForgeDirection var1) { diff --git a/src/main/java/goodgenerator/blocks/tileEntity/EssentiaOutputHatch_ME.java b/src/main/java/goodgenerator/blocks/tileEntity/EssentiaOutputHatch_ME.java index 8f2c4c920f..44a5bea3c6 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/EssentiaOutputHatch_ME.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/EssentiaOutputHatch_ME.java @@ -21,12 +21,17 @@ import thaumcraft.api.aspects.AspectList; import thaumicenergistics.api.grid.IEssentiaGrid; import thaumicenergistics.api.grid.IMEEssentiaMonitor; -import java.util.Map; - - -@Optional.InterfaceList(value = { - @Optional.Interface(iface = "appeng.api.networking.security.IActionHost", modid = "appliedenergistics2", striprefs = true), - @Optional.Interface(iface = "appeng.me.helpers.IGridProxyable", modid = "appliedenergistics2", striprefs = true),}) +@Optional.InterfaceList( + value = { + @Optional.Interface( + iface = "appeng.api.networking.security.IActionHost", + modid = "appliedenergistics2", + striprefs = true), + @Optional.Interface( + iface = "appeng.me.helpers.IGridProxyable", + modid = "appliedenergistics2", + striprefs = true), + }) public class EssentiaOutputHatch_ME extends EssentiaOutputHatch implements IActionHost, IGridProxyable { private AENetworkProxy gridProxy = null; @@ -55,30 +60,26 @@ public class EssentiaOutputHatch_ME extends EssentiaOutputHatch implements IActi @Optional.Method(modid = "appliedenergistics2") public void readFromNBT_AENetwork(final NBTTagCompound data) { AENetworkProxy gp = getProxy(); - if (gp != null) - getProxy().readFromNBT(data); + if (gp != null) getProxy().readFromNBT(data); } @TileEvent(TileEventType.WORLD_NBT_WRITE) @Optional.Method(modid = "appliedenergistics2") public void writeToNBT_AENetwork(final NBTTagCompound data) { AENetworkProxy gp = getProxy(); - if (gp != null) - gp.writeToNBT(data); + if (gp != null) gp.writeToNBT(data); } @Optional.Method(modid = "appliedenergistics2") void onChunkUnloadAE() { AENetworkProxy gp = getProxy(); - if (gp != null) - gp.onChunkUnload(); + if (gp != null) gp.onChunkUnload(); } @Optional.Method(modid = "appliedenergistics2") void invalidateAE() { AENetworkProxy gp = getProxy(); - if (gp != null) - gp.invalidate(); + if (gp != null) gp.invalidate(); } @Optional.Method(modid = "appliedenergistics2") @@ -89,8 +90,7 @@ public class EssentiaOutputHatch_ME extends EssentiaOutputHatch implements IActi @Override @Optional.Method(modid = "appliedenergistics2") - public void gridChanged() { - } + public void gridChanged() {} @Override @Optional.Method(modid = "appliedenergistics2") @@ -100,8 +100,7 @@ public class EssentiaOutputHatch_ME extends EssentiaOutputHatch implements IActi @Override @Optional.Method(modid = "appliedenergistics2") - public void securityBreak() { - } + public void securityBreak() {} @Override @Optional.Method(modid = "appliedenergistics2") @@ -168,5 +167,4 @@ public class EssentiaOutputHatch_ME extends EssentiaOutputHatch implements IActi public MachineSource getMachineSource() { return this.asMachineSource; } - } diff --git a/src/main/java/goodgenerator/blocks/tileEntity/ExtremeHeatExchanger.java b/src/main/java/goodgenerator/blocks/tileEntity/ExtremeHeatExchanger.java index b9ce6aa0d4..c7472acfbe 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/ExtremeHeatExchanger.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/ExtremeHeatExchanger.java @@ -1,5 +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.enums.GT_Values.V; +import static gregtech.api.enums.Textures.BlockIcons.*; +import static gregtech.api.