From b846f1dc3a502d157ecf871e2a4a1ff49915f871 Mon Sep 17 00:00:00 2001 From: Jason Mitchell Date: Sat, 28 Jan 2023 18:39:10 -0800 Subject: [ci skip] spotlessApply with the new settings --- .../goodgenerator/blocks/myFluids/BaseFluid.java | 6 +- .../blocks/myFluids/FluidsBuilder.java | 6 +- .../goodgenerator/blocks/regularBlock/Casing.java | 10 +- .../blocks/regularBlock/ComplexTextureCasing.java | 6 +- .../goodgenerator/blocks/regularBlock/Frame.java | 6 +- .../blocks/regularBlock/ITextureBlock.java | 3 +- .../goodgenerator/blocks/regularBlock/TEBlock.java | 34 +- .../blocks/regularBlock/TurbineCasing.java | 18 +- .../blocks/tileEntity/ComponentAssemblyLine.java | 677 +++------- .../blocks/tileEntity/CoolantTower.java | 288 +---- .../blocks/tileEntity/EssentiaHatch.java | 23 +- .../blocks/tileEntity/EssentiaOutputHatch.java | 2 + .../blocks/tileEntity/EssentiaOutputHatch_ME.java | 30 +- .../blocks/tileEntity/ExtremeHeatExchanger.java | 199 ++- .../blocks/tileEntity/FuelRefineFactory.java | 114 +- .../GTMetaTileEntity/DieselGenerator.java | 159 +-- .../GTMetaTileEntity/NeutronAccelerator.java | 9 +- .../tileEntity/GTMetaTileEntity/NeutronSensor.java | 85 +- .../tileEntity/GTMetaTileEntity/YOTTAHatch.java | 186 ++- .../blocks/tileEntity/LargeEssentiaGenerator.java | 180 +-- .../blocks/tileEntity/LargeEssentiaSmeltery.java | 202 +-- .../blocks/tileEntity/LargeFusionComputer1.java | 42 +- .../blocks/tileEntity/LargeFusionComputer2.java | 42 +- .../blocks/tileEntity/LargeFusionComputer3.java | 42 +- .../blocks/tileEntity/LargeFusionComputer4.java | 84 +- .../blocks/tileEntity/LargeFusionComputer5.java | 90 +- .../blocks/tileEntity/MegaPlasmaTurbine.java | 9 +- .../blocks/tileEntity/MultiNqGenerator.java | 224 ++-- .../blocks/tileEntity/NeutronActivator.java | 204 +-- .../blocks/tileEntity/PreciseAssembler.java | 175 ++- .../tileEntity/SupercriticalFluidTurbine.java | 64 +- .../tileEntity/UniversalChemicalFuelEngine.java | 143 +-- .../blocks/tileEntity/YottaFluidTank.java | 328 +++-- .../base/GT_MetaTileEntity_LargeTurbineBase.java | 228 ++-- .../base/GT_MetaTileEntity_LongPowerUsageBase.java | 85 +- ...GT_MetaTileEntity_TooltipMultiBlockBase_EM.java | 11 +- .../tileEntity/base/LargeFusionComputer.java | 580 ++++----- .../tileEntity/base/LargeFusionComputerPP.java | 572 ++++----- .../java/goodgenerator/client/ClientProxy.java | 1 + .../goodgenerator/client/GUI/GG_UITextures.java | 12 +- .../client/render/BlockRenderHandler.java | 68 +- .../java/goodgenerator/common/CommonProxy.java | 1 + .../crossmod/ic2/GGCropsSaltyRoot.java | 16 +- .../java/goodgenerator/crossmod/nei/IMCForNEI.java | 8 +- .../goodgenerator/crossmod/nei/NEI_Config.java | 8 +- .../thaumcraft/LargeEssentiaEnergyData.java | 14 +- .../crossmod/thaumcraft/Research.java | 896 ++++++------- .../java/goodgenerator/items/DepletedFuelRod.java | 9 +- src/main/java/goodgenerator/items/FuelRod.java | 87 +- .../java/goodgenerator/items/MyItemBlocks.java | 44 +- src/main/java/goodgenerator/items/MyItems.java | 10 +- src/main/java/goodgenerator/items/MyMaterial.java | 475 +++---- .../java/goodgenerator/items/RadioactiveItem.java | 5 +- .../items/nuclear/IsotopeMaterial.java | 96 +- .../items/nuclear/IsotopeMaterialLoader.java | 344 ++--- .../items/nuclear/NuclearMetaItemGenerator.java | 156 +-- .../items/nuclear/NuclearTextures.java | 44 +- .../goodgenerator/loader/AchievementLoader.java | 3 +- .../loader/ComponentAssemblyLineMiscRecipes.java | 379 +++--- .../loader/ComponentAssemblyLineRecipeLoader.java | 98 +- .../goodgenerator/loader/FuelRecipeLoader.java | 80 +- .../java/goodgenerator/loader/FuelRodLoader.java | 85 +- src/main/java/goodgenerator/loader/Loaders.java | 406 +++--- .../loader/NaquadahReworkRecipeLoader.java | 491 ++++--- .../loader/NeutronActivatorLoader.java | 24 +- .../java/goodgenerator/loader/RecipeLoader.java | 1003 ++++++--------- .../java/goodgenerator/loader/RecipeLoader_02.java | 1334 +++++++------------- .../java/goodgenerator/main/GG_Config_Loader.java | 126 +- .../java/goodgenerator/main/GoodGenerator.java | 11 +- .../java/goodgenerator/network/MessageMTEBase.java | 41 +- src/main/java/goodgenerator/tabs/MyTabs.java | 4 +- .../java/goodgenerator/util/CharExchanger.java | 40 +- .../java/goodgenerator/util/CrackRecipeAdder.java | 417 +++--- .../goodgenerator/util/DescTextLocalization.java | 9 +- src/main/java/goodgenerator/util/ItemRefer.java | 5 +- src/main/java/goodgenerator/util/Log.java | 1 + src/main/java/goodgenerator/util/MaterialFix.java | 158 ++- .../java/goodgenerator/util/MyRecipeAdder.java | 425 +++---- src/main/java/goodgenerator/util/StackUtils.java | 21 +- .../java/goodgenerator/util/StructureHelper.java | 48 +- 80 files changed, 5383 insertions(+), 7286 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 078012e64c..47f73b186b 100644 --- a/src/main/java/goodgenerator/blocks/myFluids/BaseFluid.java +++ b/src/main/java/goodgenerator/blocks/myFluids/BaseFluid.java @@ -2,8 +2,6 @@ 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; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.util.IIcon; @@ -11,7 +9,11 @@ import net.minecraftforge.fluids.BlockFluidClassic; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class BaseFluid extends BlockFluidClassic { + @SideOnly(Side.CLIENT) protected IIcon stillIcon; diff --git a/src/main/java/goodgenerator/blocks/myFluids/FluidsBuilder.java b/src/main/java/goodgenerator/blocks/myFluids/FluidsBuilder.java index 87466ea26a..720d782538 100644 --- a/src/main/java/goodgenerator/blocks/myFluids/FluidsBuilder.java +++ b/src/main/java/goodgenerator/blocks/myFluids/FluidsBuilder.java @@ -1,11 +1,13 @@ package goodgenerator.blocks.myFluids; -import cpw.mods.fml.common.registry.GameRegistry; -import goodgenerator.crossmod.nei.NEI_Config; import net.minecraft.block.material.Material; import net.minecraftforge.fluids.Fluid; +import cpw.mods.fml.common.registry.GameRegistry; +import goodgenerator.crossmod.nei.NEI_Config; + public class FluidsBuilder { + public FluidsBuilder() {} public static void Register() { diff --git a/src/main/java/goodgenerator/blocks/regularBlock/Casing.java b/src/main/java/goodgenerator/blocks/regularBlock/Casing.java index 8808abd169..9e01d783d2 100644 --- a/src/main/java/goodgenerator/blocks/regularBlock/Casing.java +++ b/src/main/java/goodgenerator/blocks/regularBlock/Casing.java @@ -1,10 +1,7 @@ package goodgenerator.blocks.regularBlock; -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; @@ -17,6 +14,11 @@ import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import goodgenerator.main.GoodGenerator; +import gregtech.api.GregTech_API; + public class Casing extends Block { @SideOnly(Side.CLIENT) diff --git a/src/main/java/goodgenerator/blocks/regularBlock/ComplexTextureCasing.java b/src/main/java/goodgenerator/blocks/regularBlock/ComplexTextureCasing.java index 149a1b2bfb..0a0169d0b4 100644 --- a/src/main/java/goodgenerator/blocks/regularBlock/ComplexTextureCasing.java +++ b/src/main/java/goodgenerator/blocks/regularBlock/ComplexTextureCasing.java @@ -1,14 +1,16 @@ 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 cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class ComplexTextureCasing extends Casing { @SideOnly(Side.CLIENT) diff --git a/src/main/java/goodgenerator/blocks/regularBlock/Frame.java b/src/main/java/goodgenerator/blocks/regularBlock/Frame.java index f5a62bed4f..b4acb03518 100644 --- a/src/main/java/goodgenerator/blocks/regularBlock/Frame.java +++ b/src/main/java/goodgenerator/blocks/regularBlock/Frame.java @@ -1,11 +1,13 @@ package goodgenerator.blocks.regularBlock; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.material.Material; import net.minecraft.world.IBlockAccess; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class Frame extends Casing { + public Frame(String name, String[] texture) { super(name, texture, Material.iron); } diff --git a/src/main/java/goodgenerator/blocks/regularBlock/ITextureBlock.java b/src/main/java/goodgenerator/blocks/regularBlock/ITextureBlock.java index 914552ad8d..fb98b6adc8 100644 --- a/src/main/java/goodgenerator/blocks/regularBlock/ITextureBlock.java +++ b/src/main/java/goodgenerator/blocks/regularBlock/ITextureBlock.java @@ -1,9 +1,10 @@ package goodgenerator.blocks.regularBlock; -import gregtech.api.interfaces.ITexture; import net.minecraft.block.Block; import net.minecraft.world.IBlockAccess; +import gregtech.api.interfaces.ITexture; + public interface ITextureBlock { default ITexture[] getTexture(Block aBlock, byte aSide) { diff --git a/src/main/java/goodgenerator/blocks/regularBlock/TEBlock.java b/src/main/java/goodgenerator/blocks/regularBlock/TEBlock.java index df98dc67dd..afaca2e834 100644 --- a/src/main/java/goodgenerator/blocks/regularBlock/TEBlock.java +++ b/src/main/java/goodgenerator/blocks/regularBlock/TEBlock.java @@ -1,14 +1,7 @@ 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 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; @@ -24,8 +17,17 @@ import net.minecraft.util.IIcon; import net.minecraft.util.StatCollector; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; + import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.IEssentiaContainerItem; +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 gregtech.api.GregTech_API; +import gregtech.api.util.GT_Utility; public class TEBlock extends BlockContainer { @@ -153,8 +155,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 { @@ -166,12 +168,8 @@ public class TEBlock extends BlockContainer { 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()) + && ((IEssentiaContainerItem) tItem).getAspects(player.getHeldItem()).size() > 0) { + Aspect tLocked = ((IEssentiaContainerItem) tItem).getAspects(player.getHeldItem()) .getAspects()[0]; ((EssentiaHatch) tile).setLockedAspect(tLocked); GT_Utility.sendChatToPlayer( @@ -192,8 +190,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 b07d173491..95358505f6 100644 --- a/src/main/java/goodgenerator/blocks/regularBlock/TurbineCasing.java +++ b/src/main/java/goodgenerator/blocks/regularBlock/TurbineCasing.java @@ -1,5 +1,9 @@ package goodgenerator.blocks.regularBlock; +import net.minecraft.block.Block; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.IBlockAccess; + import goodgenerator.blocks.tileEntity.base.GT_MetaTileEntity_LargeTurbineBase; import goodgenerator.client.render.BlockRenderHandler; import goodgenerator.main.GoodGenerator; @@ -8,9 +12,6 @@ import gregtech.api.interfaces.IIconContainer; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.render.TextureFactory; -import net.minecraft.block.Block; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.IBlockAccess; public class TurbineCasing extends Casing implements ITextureBlock { @@ -18,13 +19,12 @@ public class TurbineCasing extends Casing implements ITextureBlock { public IIconContainer base; static { - 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); + 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); } @@ -42,7 +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 @@ -91,7 +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/ComponentAssemblyLine.java b/src/main/java/goodgenerator/blocks/tileEntity/ComponentAssemblyLine.java index 65f0e23810..991903b130 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/ComponentAssemblyLine.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/ComponentAssemblyLine.java @@ -4,10 +4,22 @@ import static com.gtnewhorizon.structurelib.structure.StructureUtility.*; import static gregtech.api.enums.GT_HatchElement.*; import static gregtech.api.enums.Textures.BlockIcons.*; +import java.util.stream.Collectors; +import java.util.stream.IntStream; + +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.EnumChatFormatting; +import net.minecraft.util.StatCollector; +import net.minecraftforge.fluids.FluidStack; + +import org.apache.commons.lang3.tuple.Pair; + import com.gtnewhorizon.structurelib.alignment.constructable.ISurvivalConstructable; import com.gtnewhorizon.structurelib.structure.IStructureDefinition; import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment; import com.gtnewhorizon.structurelib.structure.StructureDefinition; + import goodgenerator.blocks.tileEntity.base.GT_MetaTileEntity_LongPowerUsageBase; import goodgenerator.loader.Loaders; import goodgenerator.util.MyRecipeAdder; @@ -22,14 +34,6 @@ import gregtech.api.render.TextureFactory; import gregtech.api.util.GT_Multiblock_Tooltip_Builder; import gregtech.api.util.GT_Recipe; import gregtech.api.util.GT_StructureUtility; -import java.util.stream.Collectors; -import java.util.stream.IntStream; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.StatCollector; -import net.minecraftforge.fluids.FluidStack; -import org.apache.commons.lang3.tuple.Pair; public class ComponentAssemblyLine extends GT_MetaTileEntity_LongPowerUsageBase implements ISurvivalConstructable { @@ -37,467 +41,121 @@ public class ComponentAssemblyLine extends GT_MetaTileEntity_LongPowerUsageBase< private int casingTier; private GT_Recipe lastRecipe; protected static final String STRUCTURE_PIECE_MAIN = "main"; - private static final IStructureDefinition STRUCTURE_DEFINITION = - StructureDefinition.builder() - .addShape(STRUCTURE_PIECE_MAIN, new String[][] { - { - " ", - " III ", - " HHI~IHH ", - "HH III HH", - "H H", - "H H", - "H JJJ H", - "H N N H", - "H N N H", - "HHHHHHHHH" - }, - { - " ", - " EHHHHHE ", - "E E", - "H H", - "A A", - "A A", - "A HHH A", - "A A", - "A A", - "MHHHHHHHM" - }, - { - " HBH ", - " EL LE ", - "E E", - "HC CH", - "AC CA", - "AC CA", - "A D D A", - "A HHH A", - "A A", - "MHHHHHHHM" - }, - { - " HBH ", - " EL LE ", - "E E", - "H H", - "A A", - "A A", - "A A", - "A HHH A", - "A A", - "MHHHHHHHM" - }, - { - " BBB ", - " EL LE ", - "E GGDGG E", - "HGG D GGH", - "AG C GA", - "AG GA", - "AG GA", - "AG HHH GA", - "AG GA", - "MHHHHHHHM" - }, - { - " HBH ", - " EL LE ", - "E E", - "H H", - "A A", - "A A", - "A A", - "A HHH A", - "A A", - "MHHHHHHHM" - }, - { - " HBH ", - " EL LE ", - "E E", - "HC CH", - "AC CA", - "AC CA", - "A D D A", - "A HHH A", - "A A", - "MHHHHHHHM" - }, - { - " HBH ", - " EL LE ", - "E E", - "H H", - "A A", - "A A", - "A A", - "A HHH A", - "A A", - "MHHHHHHHM" - }, - { - " BBB ", - " EL LE ", - "E GGDGG E", - "HGG D GGH", - "HG C GH", - "HG GH", - "HG GH", - "HG HHH GH", - "HG GH", - "MHHHHHHHM" - }, - { - " HBH ", - " EL LE ", - "E E", - "H H", - "A A", - "A A", - "A A", - "A HHH A", - "A A", - "MHHHHHHHM" - }, - { - " HBH ", - " EL LE ", - "E E", - "HC CH", - "AC CA", - "AC CA", - "A D D A", - "A HHH A", - "A A", - "MHHHHHHHM" - }, - { - " HBH ", - " EL LE ", - "E E", - "H H", - "A A", - "A A", - "A A", - "A HHH A", - "A A", - "MHHHHHHHM" - }, - { - " BBB ", - " EL LE ", - "E GGDGG E", - "HGG D GGH", - "AG C GA", - "AG GA", - "AG GA", - "AG HHH GA", - "AG GA", - "MHHHHHHHM" - }, - { - " HBH ", - " EL LE ", - "E E", - "H H", - "A A", - "A A", - "A A", - "A HHH A", - "A A", - "MHHHHHHHM" - }, - { - " HBH ", - " EL LE ", - "E E", - "HC CH", - "AC CA", - "AC CA", - "A D D A", - "A HHH A", - "A A", - "MHHHHHHHM" - }, - { - " HBH ", - " EL LE ", - "E E", - "H H", - "A A", - "A A", - "A A", - "A HHH A", - "A A", - "MHHHHHHHM" - }, - { - " BBB ", - " EL LE ", - "E GGDGG E", - "HGG D GGH", - "HG C GH", - "HG GH", - "HG GH", - "HG HHH GH", - "HG GH", - "MHHHHHHHM" - }, - { - " HBH ", - " EL LE ", - "E E", - "H H", - "A A", - "A A", - "A A", - "A HHH A", - "A A", - "MHHHHHHHM" - }, - { - " HBH ", - " EL LE ", - "E E", - "HC CH", - "AC CA", - "AC CA", - "A D D A", - "A HHH A", - "A A", - "MHHHHHHHM" - }, - { - " HBH ", - " EL LE ", - "E E", - "H H", - "A A", - "A A", - "A A", - "A HHH A", - "A A", - "MHHHHHHHM" - }, - { - " BBB ", - " EL LE ", - "E GGDGG E", - "HGG D GGH", - "AG C GA", - "AG GA", - "AG GA", - "AG HHH GA", - "AG GA", - "MHHHHHHHM" - }, - { - " HBH ", - " EL LE ", - "E E", - "H H", - "A A", - "A A", - "A A", - "A HHH A", - "A A", - "MHHHHHHHM" - }, - { - " HBH ", - " EL LE ", - "E E", - "HC CH", - "AC CA", - "AC CA", - "A D D A", - "A HHH A", - "A A", - "MHHHHHHHM" - }, - { - " HBH ", - " EL LE ", - "E E", - "H H", - "A A", - "A A", - "A A", - "A HHH A", - "A A", - "MHHHHHHHM" - }, - { - " BBB ", - " EL LE ", - "E GGDGG E", - "HGG D GGH", - "HG C GH", - "HG GH", - "HG GH", - "HG HHH GH", - "HG GH", - "MHHHHHHHM" - }, - { - " HBH ", - " EL LE ", - "E E", - "H H", - "A A", - "A A", - "A A", - "A HHH A", - "A A", - "MHHHHHHHM" - }, - { - " HBH ", - " EL LE ", - "E E", - "HC CH", - "AC CA", - "AC CA", - "A D D A", - "A HHH A", - "A A", - "MHHHHHHHM" - }, - { - " HBH ", - " EL LE ", - "E E", - "H H", - "A A", - "A A", - "A A", - "A HHH A", - "A A", - "MHHHHHHHM" - }, - { - " BBB ", - " EL LE ", - "E GGDGG E", - "HGG D GGH", - "AG C GA", - "AG GA", - "AG GA", - "AG HHH GA", - "AG GA", - "MHHHHHHHM" - }, - { - " HBH ", - " EL LE ", - "E E", - "H H", - "A A", - "A A", - "A A", - "A HHH A", - "A N N A", - "MHHHHHHHM" - }, - { - " HBH ", - " EL LE ", - "E E", - "HC CH", - "AC CA", - "AC CA", - "A D D A", - "A HHH A", - "A A", - "MHHHHHHHM" - }, - { - " ", - " EHHHHHE ", - "E E", - "H H", - "A A", - "A A", - "A A", - "A HHH A", - "A A", - "MHHHHHHHM" - }, - { - " ", - " ", - " HHHHHHH ", - "HH HH", - "H H", - "H H", - "H H", - "H H", - "H KKK H", - "HHHHHHHHH" - } - }) - .addElement( - 'A', - ofChain( - ofBlockUnlocalizedName("bartworks", "BW_GlasBlocks", 5), - ofBlockUnlocalizedName("bartworks", "BW_GlasBlocks", 13), - ofBlockUnlocalizedName("bartworks", "BW_GlasBlocks", 14), - ofBlockUnlocalizedName("bartworks", "BW_GlasBlocks", 15), - ofBlockUnlocalizedName("bartworks", "BW_GlasBlocks2", 0))) - .addElement('H', ofBlock(GregTech_API.sBlockCasings8, 7)) - .addElement('C', ofBlock(GregTech_API.sBlockCasings2, 5)) - .addElement('D', ofBlock(GregTech_API.sBlockCasings2, 9)) - .addElement('G', ofBlock(GregTech_API.sBlockCasings9, 0)) - .addElement('E', ofBlock(GregTech_API.sBlockCasings9, 1)) - .addElement('F', ofBlock(GregTech_API.sBlockCasings4, 1)) - .addElement( - 'B', - ofBlocksTiered( - (block, meta) -> block == Loaders.componentAssemblylineCasing ? meta : -1, - IntStream.range(0, 14) - .mapToObj(i -> Pair.of(Loaders.componentAssemblylineCasing, i)) - .collect(Collectors.toList()), - -1, - (t, meta) -> t.casingTier = meta, - t -> t.casingTier)) - .addElement( - 'J', - GT_StructureUtility.buildHatchAdder(ComponentAssemblyLine.class) - .atLeast(InputBus) - .dot(1) - .casingIndex(183) - .buildAndChain(GregTech_API.sBlockCasings8, 7)) - .addElement( - 'K', - GT_StructureUtility.buildHatchAdder(ComponentAssemblyLine.class) - .atLeast(OutputBus) - .dot(2) - .casingIndex(183) - .buildAndChain(GregTech_API.sBlockCasings8, 7)) - .addElement( - 'L', - GT_StructureUtility.buildHatchAdder(ComponentAssemblyLine.class) - .atLeast(Energy, ExoticEnergy) - .dot(3) - .casingIndex(183) - .buildAndChain(GregTech_API.sBlockCasings8, 7)) - .addElement( - 'I', - GT_StructureUtility.buildHatchAdder(ComponentAssemblyLine.class) - .atLeast(Maintenance) - .dot(4) - .casingIndex(183) - .buildAndChain(GregTech_API.sBlockCasings8, 7)) - .addElement( - 'M', - GT_StructureUtility.buildHatchAdder(ComponentAssemblyLine.class) - .atLeast(InputHatch) - .dot(5) - .casingIndex(183) - .buildAndChain(GregTech_API.sBlockCasings8, 7)) - .addElement('N', GT_StructureUtility.ofFrame(Materials.TungstenSteel)) - .build(); + private static final IStructureDefinition STRUCTURE_DEFINITION = StructureDefinition + .builder() + .addShape( + STRUCTURE_PIECE_MAIN, + new String[][] { + { " ", " III ", " HHI~IHH ", "HH III HH", "H H", "H H", "H JJJ H", + "H N N H", "H N N H", "HHHHHHHHH" }, + { " ", " EHHHHHE ", "E E", "H H", "A A", "A A", "A HHH A", + "A A", "A A", "MHHHHHHHM" }, + { " HBH ", " EL LE ", "E E", "HC CH", "AC CA", "AC CA", "A D D A", + "A HHH A", "A A", "MHHHHHHHM" }, + { " HBH ", " EL LE ", "E E", "H H", "A A", "A A", "A A", + "A HHH A", "A A", "MHHHHHHHM" }, + { " BBB ", " EL LE ", "E GGDGG E", "HGG D GGH", "AG C GA", "AG GA", "AG GA", + "AG HHH GA", "AG GA", "MHHHHHHHM" }, + { " HBH ", " EL LE ", "E E", "H H", "A A", "A A", "A A", + "A HHH A", "A A", "MHHHHHHHM" }, + { " HBH ", " EL LE ", "E E", "HC CH", "AC CA", "AC CA", "A D D A", + "A HHH A", "A A", "MHHHHHHHM" }, + { " HBH ", " EL LE ", "E E", "H H", "A A", "A A", "A A", + "A HHH A", "A A", "MHHHHHHHM" }, + { " BBB ", " EL LE ", "E GGDGG E", "HGG D GGH", "HG C GH", "HG GH", "HG GH", + "HG HHH GH", "HG GH", "MHHHHHHHM" }, + { " HBH ", " EL LE ", "E E", "H H", "A A", "A A", "A A", + "A HHH A", "A A", "MHHHHHHHM" }, + { " HBH ", " EL LE ", "E E", "HC CH", "AC CA", "AC CA", "A D D A", + "A HHH A", "A A", "MHHHHHHHM" }, + { " HBH ", " EL LE ", "E E", "H H", "A A", "A A", "A A", + "A HHH A", "A A", "MHHHHHHHM" }, + { " BBB ", " EL LE ", "E GGDGG E", "HGG D GGH", "AG C GA", "AG GA", "AG GA", + "AG HHH GA", "AG GA", "MHHHHHHHM" }, + { " HBH ", " EL LE ", "E E", "H H", "A A", "A A", "A A", + "A HHH A", "A A", "MHHHHHHHM" }, + { " HBH ", " EL LE ", "E E", "HC CH", "AC CA", "AC CA", "A D D A", + "A HHH A", "A A", "MHHHHHHHM" }, + { " HBH ", " EL LE ", "E E", "H H", "A A", "A A", "A A", + "A HHH A", "A A", "MHHHHHHHM" }, + { " BBB ", " EL LE ", "E GGDGG E", "HGG D GGH", "HG C GH", "HG GH", "HG GH", + "HG HHH GH", "HG GH", "MHHHHHHHM" }, + { " HBH ", " EL LE ", "E E", "H H", "A A", "A A", "A A", + "A HHH A", "A A", "MHHHHHHHM" }, + { " HBH ", " EL LE ", "E E", "HC CH", "AC CA", "AC CA", "A D D A", + "A HHH A", "A A", "MHHHHHHHM" }, + { " HBH ", " EL LE ", "E E", "H H", "A A", "A A", "A A", + "A HHH A", "A A", "MHHHHHHHM" }, + { " BBB ", " EL LE ", "E GGDGG E", "HGG D GGH", "AG C GA", "AG GA", "AG GA", + "AG HHH GA", "AG GA", "MHHHHHHHM" }, + { " HBH ", " EL LE ", "E E", "H H", "A A", "A A", "A A", + "A HHH A", "A A", "MHHHHHHHM" }, + { " HBH ", " EL LE ", "E E", "HC CH", "AC CA", "AC CA", "A D D A", + "A HHH A", "A A", "MHHHHHHHM" }, + { " HBH ", " EL LE ", "E E", "H H", "A A", "A A", "A A", + "A HHH A", "A A", "MHHHHHHHM" }, + { " BBB ", " EL LE ", "E GGDGG E", "HGG D GGH", "HG C GH", "HG GH", "HG GH", + "HG HHH GH", "HG GH", "MHHHHHHHM" }, + { " HBH ", " EL LE ", "E E", "H H", "A A", "A A", "A A", + "A HHH A", "A A", "MHHHHHHHM" }, + { " HBH ", " EL LE ", "E E", "HC CH", "AC CA", "AC CA", "A D D A", + "A HHH A", "A A", "MHHHHHHHM" }, + { " HBH ", " EL LE ", "E E", "H H", "A A", "A A", "A A", + "A HHH A", "A A", "MHHHHHHHM" }, + { " BBB ", " EL LE ", "E GGDGG E", "HGG D GGH", "AG C GA", "AG GA", "AG GA", + "AG HHH GA", "AG GA", "MHHHHHHHM" }, + { " HBH ", " EL LE ", "E E", "H H", "A A", "A A", "A A", + "A HHH A", "A N N A", "MHHHHHHHM" }, + { " HBH ", " EL LE ", "E E", "HC CH", "AC CA", "AC CA", "A D D A", + "A HHH A", "A A", "MHHHHHHHM" }, + { " ", " EHHHHHE ", "E E", "H H", "A A", "A A", "A A", + "A HHH A", "A A", "MHHHHHHHM" }, + { " ", " ", " HHHHHHH ", "HH HH", "H H", "H H", "H H", + "H H", "H KKK H", "HHHHHHHHH" } }) + .addElement( + 'A', + ofChain( + ofBlockUnlocalizedName("bartworks", "BW_GlasBlocks", 5), + ofBlockUnlocalizedName("bartworks", "BW_GlasBlocks", 13), + ofBlockUnlocalizedName("bartworks", "BW_GlasBlocks", 14), + ofBlockUnlocalizedName("bartworks", "BW_GlasBlocks", 15), + ofBlockUnlocalizedName("bartworks", "BW_GlasBlocks2", 0))) + .addElement('H', ofBlock(GregTech_API.sBlockCasings8, 7)) + .addElement('C', ofBlock(GregTech_API.sBlockCasings2, 5)) + .addElement('D', ofBlock(GregTech_API.sBlockCasings2, 9)) + .addElement('G', ofBlock(GregTech_API.sBlockCasings9, 0)) + .addElement('E', ofBlock(GregTech_API.sBlockCasings9, 1)) + .addElement('F', ofBlock(GregTech_API.sBlockCasings4, 1)) + .addElement( + 'B', + ofBlocksTiered( + (block, meta) -> block == Loaders.componentAssemblylineCasing ? meta : -1, + IntStream.range(0, 14).mapToObj(i -> Pair.of(Loaders.componentAssemblylineCasing, i)) + .collect(Collectors.toList()), + -1, + (t, meta) -> t.casingTier = meta, + t -> t.casingTier)) + .addElement( + 'J', + GT_StructureUtility.buildHatchAdder(ComponentAssemblyLine.class).atLeast(InputBus).dot(1) + .casingIndex(183).buildAndChain(GregTech_API.sBlockCasings8, 7)) + .addElement( + 'K', + GT_StructureUtility.buildHatchAdder(ComponentAssemblyLine.class).atLeast(OutputBus).dot(2) + .casingIndex(183).buildAndChain(GregTech_API.sBlockCasings8, 7)) + .addElement( + 'L', + GT_StructureUtility.buildHatchAdder(ComponentAssemblyLine.class).atLeast(Energy, ExoticEnergy) + .dot(3).casingIndex(183).buildAndChain(GregTech_API.sBlockCasings8, 7)) + .addElement( + 'I', + GT_StructureUtility.buildHatchAdder(ComponentAssemblyLine.class).atLeast(Maintenance).dot(4) + .casingIndex(183).buildAndChain(GregTech_API.sBlockCasings8, 7)) + .addElement( + 'M', + GT_StructureUtility.buildHatchAdder(ComponentAssemblyLine.class).atLeast(InputHatch).dot(5) + .casingIndex(183).buildAndChain(GregTech_API.sBlockCasings8, 7)) + .addElement('N', GT_StructureUtility.ofFrame(Materials.TungstenSteel)).build(); public ComponentAssemblyLine(int aID, String aName, String aNameRegional) { super(aID, aName, aNameRegional); @@ -523,23 +181,33 @@ public class ComponentAssemblyLine extends GT_MetaTileEntity_LongPowerUsageBase< tt.addMachineType("High-Capacity Component Assembler") .addInfo("Controller block for the Component Assembly Line.") .addInfo("Assembles basic components (motors, pumps, etc.) in large batches.") - .addInfo("The " + EnumChatFormatting.BOLD + EnumChatFormatting.YELLOW - + "Special Component Assembly Line Casing" + EnumChatFormatting.RESET + EnumChatFormatting.GRAY) + .addInfo( + "The " + EnumChatFormatting.BOLD + + EnumChatFormatting.YELLOW + + "Special Component Assembly Line Casing" + + EnumChatFormatting.RESET + + EnumChatFormatting.GRAY) .addInfo("limits the recipes the machine can perform. See the NEI pages for details.") - .addInfo("Supports " + EnumChatFormatting.BLUE + "Tec" + EnumChatFormatting.DARK_BLUE + "Tech" - + EnumChatFormatting.GRAY + " laser and multi-amp hatches!") + .addInfo( + "Supports " + EnumChatFormatting.BLUE + + "Tec" + + EnumChatFormatting.DARK_BLUE + + "Tech" + + EnumChatFormatting.GRAY + + " laser and multi-amp hatches!") .addInfo("Supports overclocking beyond MAX!") .addInfo(EnumChatFormatting.ITALIC + "Much more efficient than other competing brands!") .beginStructureBlock(9, 10, 33, false) .addStructureInfo("This structure is too complex! See schematic for details.") .addOtherStructurePart("Borosilicate Glass", "Can be UV tier or higher") - .addInputBus("Start of conveyor belt", 1) - .addOutputBus("End of conveyor belt", 2) - .addEnergyHatch("Second-top layer", 3) - .addMaintenanceHatch("Around the controller", 4) - .addInputHatch("Bottom left and right corners", 5) - .toolTipFinisher(EnumChatFormatting.AQUA + "MadMan310" + EnumChatFormatting.GRAY + " via " - + EnumChatFormatting.GREEN + "Good Generator"); + .addInputBus("Start of conveyor belt", 1).addOutputBus("End of conveyor belt", 2) + .addEnergyHatch("Second-top layer", 3).addMaintenanceHatch("Around the controller", 4) + .addInputHatch("Bottom left and right corners", 5).toolTipFinisher( + EnumChatFormatting.AQUA + "MadMan310" + + EnumChatFormatting.GRAY + + " via " + + EnumChatFormatting.GREEN + + "Good Generator"); return tt; } @@ -551,7 +219,7 @@ public class ComponentAssemblyLine extends GT_MetaTileEntity_LongPowerUsageBase< /** * Changes and adds new information to the default info data for the scanner. - * */ + */ @Override public String[] getInfoData() { String[] origin = super.getInfoData(); @@ -563,41 +231,18 @@ public class ComponentAssemblyLine extends GT_MetaTileEntity_LongPowerUsageBase< } @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[] { - Textures.BlockIcons.getCasingTextureForId(183), - TextureFactory.builder() - .addIcon(OVERLAY_FRONT_PROCESSING_ARRAY_ACTIVE) - .extFacing() - .build(), - TextureFactory.builder() - .addIcon(OVERLAY_FRONT_PROCESSING_ARRAY_ACTIVE_GLOW) - .extFacing() - .glow() - .build() - }; - return new ITexture[] { - Textures.BlockIcons.getCasingTextureForId(183), - TextureFactory.builder() - .addIcon(OVERLAY_FRONT_PROCESSING_ARRAY) - .extFacing() - .build(), - TextureFactory.builder() - .addIcon(OVERLAY_FRONT_PROCESSING_ARRAY_GLOW) - .extFacing() - .glow() - .build() - }; + if (aActive) return new ITexture[] { Textures.BlockIcons.getCasingTextureForId(183), + TextureFactory.builder().addIcon(OVERLAY_FRONT_PROCESSING_ARRAY_ACTIVE).extFacing().build(), + TextureFactory.builder().addIcon(OVERLAY_FRONT_PROCESSING_ARRAY_ACTIVE_GLOW).extFacing().glow() + .build() }; + return new ITexture[] { Textures.BlockIcons.getCasingTextureForId(183), + TextureFactory.builder().addIcon(OVERLAY_FRONT_PROCESSING_ARRAY).extFacing().build(), + TextureFactory.builder().addIcon(OVERLAY_FRONT_PROCESSING_ARRAY_GLOW).extFacing().glow().build() }; } - return new ITexture[] {Textures.BlockIcons.getCasingTextureForId(183)}; + return new ITexture[] { Textures.BlockIcons.getCasingTextureForId(183) }; } @Override @@ -612,8 +257,8 @@ public class ComponentAssemblyLine extends GT_MetaTileEntity_LongPowerUsageBase< long totalEU = getRealVoltage(); ItemStack[] tItems = getStoredInputs().toArray(new ItemStack[0]); FluidStack[] tFluids = getStoredFluids().toArray(new FluidStack[0]); - this.lastRecipe = - getRecipeMap().findRecipe(getBaseMetaTileEntity(), this.lastRecipe, false, totalEU, tFluids, tItems); + this.lastRecipe = getRecipeMap() + .findRecipe(getBaseMetaTileEntity(), this.lastRecipe, false, totalEU, tFluids, tItems); if (this.lastRecipe == null) return false; if (this.lastRecipe.mSpecialValue > casingTier + 1) return false; if (!this.lastRecipe.isRecipeInputEqual(true, tFluids, tItems)) return false; diff --git a/src/main/java/goodgenerator/blocks/tileEntity/CoolantTower.java b/src/main/java/goodgenerator/blocks/tileEntity/CoolantTower.java index 3cee14c86f..62301ca41f 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/CoolantTower.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/CoolantTower.java @@ -5,12 +5,17 @@ import static goodgenerator.util.DescTextLocalization.BLUE_PRINT_INFO; import static gregtech.api.enums.Textures.BlockIcons.*; import static gregtech.api.util.GT_StructureUtility.*; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidStack; + import com.github.technus.tectech.thing.metaTileEntity.multi.base.GT_MetaTileEntity_MultiblockBase_EM; import com.gtnewhorizon.structurelib.alignment.constructable.IConstructable; import com.gtnewhorizon.structurelib.alignment.constructable.ISurvivalConstructable; import com.gtnewhorizon.structurelib.structure.IItemSource; import com.gtnewhorizon.structurelib.structure.IStructureDefinition; import com.gtnewhorizon.structurelib.structure.StructureDefinition; + import goodgenerator.blocks.tileEntity.base.GT_MetaTileEntity_TooltipMultiBlockBase_EM; import goodgenerator.util.DescTextLocalization; import gregtech.api.GregTech_API; @@ -26,9 +31,6 @@ import gregtech.api.render.TextureFactory; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_Multiblock_Tooltip_Builder; import gregtech.api.util.GT_Utility; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidStack; public class CoolantTower extends GT_MetaTileEntity_TooltipMultiBlockBase_EM implements IConstructable, ISurvivalConstructable { @@ -48,186 +50,58 @@ public class CoolantTower extends GT_MetaTileEntity_TooltipMultiBlockBase_EM 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 " - }, - })) + .addShape( + mName, + transpose( + new String[][] { + { " ", " ", " BBB ", " B B ", " B B ", +