diff options
Diffstat (limited to 'src/main')
80 files changed, 5383 insertions, 7286 deletions
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<ComponentAssemblyLine> 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<ComponentAssemblyLine> STRUCTURE_DEFINITION = - StructureDefinition.<ComponentAssemblyLine>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<ComponentAssemblyLine> STRUCTURE_DEFINITION = StructureDefinition + .<ComponentAssemblyLine>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<? extends GT_MetaTileEntity_MultiblockBase_EM> getStructure_EM() { if (multiDefinition == null) { multiDefinition = StructureDefinition.<CoolantTower>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 ", + " 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(buildHatchAdder(CoolantTower.class) - .atLeast(GT_HatchElement.InputHatch, GT_HatchElement.OutputHatch) - .casingIndex(CASING_INDEX) - .dot(1) - .buildAndChain(ofBlockAnyMeta(GregTech_API.sBlockConcretes, 8)))) + ofChain( + buildHatchAdder(CoolantTower.class) + .atLeast(GT_HatchElement.InputHatch, GT_HatchElement.OutputHatch) + .casingIndex(CASING_INDEX).dot(1) + .buildAndChain(ofBlockAnyMeta(GregTech_API.sBlockConcretes, 8)))) .build(); } return multiDefinition; @@ -266,15 +140,10 @@ public class CoolantTower extends GT_MetaTileEntity_TooltipMultiBlockBase_EM @Override 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"); + 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"); return tt; } @@ -332,41 +201,18 @@ public class CoolantTower extends GT_MetaTileEntity_TooltipMultiBlockBase_EM } @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[] { - 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[] { - casingTexturePages[12][6], - TextureFactory.builder() - .addIcon(OVERLAY_FRONT_HEAT_EXCHANGER) - .extFacing() - .build(), - TextureFactory.builder() - .addIcon(OVERLAY_FRONT_HEAT_EXCHANGER_GLOW) - .extFacing() - .glow() - .build() - }; + if (aActive) 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[] { casingTexturePages[12][6], + 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] }; } @Override diff --git a/src/main/java/goodgenerator/blocks/tileEntity/EssentiaHatch.java b/src/main/java/goodgenerator/blocks/tileEntity/EssentiaHatch.java index 4c72fff073..f965ff9399 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/EssentiaHatch.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/EssentiaHatch.java @@ -1,7 +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; @@ -9,11 +9,13 @@ import net.minecraft.network.Packet; import net.minecraft.network.play.server.S35PacketUpdateTileEntity; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; + import thaumcraft.api.ThaumcraftApiHelper; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; import thaumcraft.api.aspects.IAspectContainer; import thaumcraft.api.aspects.IEssentiaTransport; +import goodgenerator.crossmod.thaumcraft.LargeEssentiaEnergyData; public class EssentiaHatch extends TileEntity implements IAspectContainer, IEssentiaTransport { @@ -89,7 +91,11 @@ public class EssentiaHatch extends TileEntity implements IAspectContainer, IEsse 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]); + 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])) { @@ -104,13 +110,12 @@ public class EssentiaHatch extends TileEntity implements IAspectContainer, IEsse if (readyInput.equals(mLocked)) { 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])); + if (mLocked == null) addToContainer( + pipe.getEssentiaType(ForgeDirection.VALID_DIRECTIONS[i]), + pipe.takeEssentia( + pipe.getEssentiaType(ForgeDirection.VALID_DIRECTIONS[i]), + 1, + ForgeDirection.VALID_DIRECTIONS[i])); } } } diff --git a/src/main/java/goodgenerator/blocks/tileEntity/EssentiaOutputHatch.java b/src/main/java/goodgenerator/blocks/tileEntity/EssentiaOutputHatch.java index ba87a66af0..93cec4672c 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/EssentiaOutputHatch.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/EssentiaOutputHatch.java @@ -1,9 +1,11 @@ package goodgenerator.blocks.tileEntity; import java.util.Map; + import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraftforge.common.util.ForgeDirection; + import thaumcraft.api.TileThaumcraft; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; diff --git a/src/main/java/goodgenerator/blocks/tileEntity/EssentiaOutputHatch_ME.java b/src/main/java/goodgenerator/blocks/tileEntity/EssentiaOutputHatch_ME.java index 44a5bea3c6..f86c5a4663 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/EssentiaOutputHatch_ME.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/EssentiaOutputHatch_ME.java @@ -1,5 +1,12 @@ package goodgenerator.blocks.tileEntity; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraftforge.common.util.ForgeDirection; + +import thaumcraft.api.aspects.Aspect; +import thaumcraft.api.aspects.AspectList; +import thaumicenergistics.api.grid.IEssentiaGrid; +import thaumicenergistics.api.grid.IMEEssentiaMonitor; import appeng.api.config.Actionable; import appeng.api.networking.GridFlags; import appeng.api.networking.IGrid; @@ -14,24 +21,17 @@ import appeng.tile.TileEvent; import appeng.tile.events.TileEventType; import cpw.mods.fml.common.Optional; import goodgenerator.util.ItemRefer; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraftforge.common.util.ForgeDirection; -import thaumcraft.api.aspects.Aspect; -import thaumcraft.api.aspects.AspectList; -import thaumicenergistics.api.grid.IEssentiaGrid; -import thaumicenergistics.api.grid.IMEEssentiaMonitor; @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.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; diff --git a/src/main/java/goodgenerator/blocks/tileEntity/ExtremeHeatExchanger.java b/src/main/java/goodgenerator/blocks/tileEntity/ExtremeHeatExchanger.java index 1cef7179dc..a720ed5cad 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/ExtremeHeatExchanger.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/ExtremeHeatExchanger.java @@ -7,11 +7,26 @@ import static gregtech.api.enums.Textures.BlockIcons.*; import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; import static gregtech.api.util.GT_StructureUtility.ofHatchAdder; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; + +import net.minecraft.block.Block; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.EnumChatFormatting; +import net.minecraft.util.StatCollector; +import net.minecraftforge.common.util.Constants; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidStack; + 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.loader.Loaders; import goodgenerator.util.DescTextLocalization; @@ -28,18 +43,6 @@ import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Outpu import gregtech.api.render.TextureFactory; import gregtech.api.util.*; import ic2.core.Ic2Items; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; -import net.minecraft.block.Block; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.StatCollector; -import net.minecraftforge.common.util.Constants; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidStack; public class ExtremeHeatExchanger extends GT_MetaTileEntity_TooltipMultiBlockBase_EM implements IConstructable, ISurvivalConstructable { @@ -66,64 +69,44 @@ public class ExtremeHeatExchanger extends GT_MetaTileEntity_TooltipMultiBlockBas public IStructureDefinition<ExtremeHeatExchanger> getStructure_EM() { if (multiDefinition == null) { multiDefinition = StructureDefinition.<ExtremeHeatExchanger>builder() - .addShape(mName, transpose(new String[][] { - { - " CCC ", "TTTTT", "TTTTT", "TTTTT", "TTTTT", "TTTTT", "TTTTT", "TTTTT", "TTTTT", "TTTTT", - " CCC " - }, - { - " CCC ", "GPPPG", "GWWWG", "GPPPG", "GWWWG", "GPPPG", "GWWWG", "GPPPG", "GWWWG", "GPPPG", - " CCC " - }, - { - " CFC ", "GPPPG", "GWWWG", "GPPPG", "GWWWG", "GPPPG", "GWWWG", "GPPPG", "GWWWG", "GPPPG", - " CEC " - }, - { - " CCC ", "GPPPG", "GWWWG", "GPPPG", "GWWWG", "GPPPG", "GWWWG", "GPPPG", "GWWWG", "GPPPG", - " CCC " - }, - { - " CCC ", "GPPPG", "GWWWG", "GPPPG", "GWWWG", "GPPPG", "GWWWG", "GPPPG", "GWWWG", "GPPPG", - " CCC " - }, - { - " C~C ", "BBBBB", "BBBBB", "BBBBB", "BBBBB", "BBBBB", "BBBBB", "BBBBB", "BBBBB", "BBBBB", - " CCC " - }, - })) + .addShape( + mName, + transpose( + new String[][] { + { " CCC ", "TTTTT", "TTTTT", "TTTTT", "TTTTT", "TTTTT", "TTTTT", "TTTTT", + "TTTTT", "TTTTT", " CCC " }, + { " CCC ", "GPPPG", "GWWWG", "GPPPG", "GWWWG", "GPPPG", "GWWWG", "GPPPG", + "GWWWG", "GPPPG", " CCC " }, + { " CFC ", "GPPPG", "GWWWG", "GPPPG", "GWWWG", "GPPPG", "GWWWG", "GPPPG", + "GWWWG", "GPPPG", " CEC " }, + { " CCC ", "GPPPG", "GWWWG", "GPPPG", "GWWWG", "GPPPG", "GWWWG", "GPPPG", + "GWWWG", "GPPPG", " CCC " }, + { " CCC ", "GPPPG", "GWWWG", "GPPPG", "GWWWG", "GPPPG", "GWWWG", "GPPPG", + "GWWWG", "GPPPG", " CCC " }, + { " C~C ", "BBBBB", "BBBBB", "BBBBB", "BBBBB", "BBBBB", "BBBBB", "BBBBB", + "BBBBB", "BBBBB", " CCC " }, })) .addElement( 'B', ofChain( buildHatchAdder(ExtremeHeatExchanger.class) .atLeast(GT_HatchElement.InputHatch, GT_HatchElement.Maintenance) - .casingIndex(48) - .dot(1) - .build(), + .casingIndex(48).dot(1).build(), onElementPass(x -> x.casingAmount++, ofBlock(GregTech_API.sBlockCasings4, 0)))) .addElement( 'T', ofChain( buildHatchAdder(ExtremeHeatExchanger.class) .atLeast(GT_HatchElement.OutputHatch, GT_HatchElement.Maintenance) - .casingIndex(48) - .dot(1) - .build(), + .casingIndex(48).dot(1).build(), onElementPass(x -> x.casingAmount++, ofBlock(GregTech_API.sBlockCasings4, 0)))) .addElement( 'F', - buildHatchAdder(ExtremeHeatExchanger.class) - .atLeast(EHEHatches.HotInputHatch) - .casingIndex(48) - .dot(3) - .build()) + buildHatchAdder(ExtremeHeatExchanger.class).atLeast(EHEHatches.HotInputHatch) + .casingIndex(48).dot(3).build()) .addElement( 'E', - buildHatchAdder(ExtremeHeatExchanger.class) - .atLeast(EHEHatches.ColdOutputHatch) - .casingIndex(48) - .dot(4) - .build()) + buildHatchAdder(ExtremeHeatExchanger.class).atLeast(EHEHatches.ColdOutputHatch) + .casingIndex(48).dot(4).build()) .addElement( 'C', ofChain( @@ -135,8 +118,7 @@ public class ExtremeHeatExchanger extends GT_MetaTileEntity_TooltipMultiBlockBas onElementPass(x -> x.casingAmount++, ofBlock(GregTech_API.sBlockCasings4, 0)))) .addElement('G', ofBlock(Block.getBlockFromItem(Ic2Items.reinforcedGlass.getItem()), 0)) .addElement('P', ofBlock(GregTech_API.sBlockCasings2, 15)) - .addElement('W', ofBlock(Loaders.pressureResistantWalls, 0)) - .build(); + .addElement('W', ofBlock(Loaders.pressureResistantWalls, 0)).build(); } return multiDefinition; } @@ -199,17 +181,13 @@ public class ExtremeHeatExchanger extends GT_MetaTileEntity_TooltipMultiBlockBas tt.addMachineType("Heat Exchanger/Plasma Heat Exchanger") .addInfo("Controller block for the Extreme Heat Exchanger.") .addInfo("Accept Hot fluid like lava, hot coolant or plasma.") - .addInfo("Output SC Steam/SH Steam/Steam.") - .addInfo("Check NEI for more info.") - .addInfo(BLUE_PRINT_INFO) - .addSeparator() - .addController("Front bottom") + .addInfo("Output SC Steam/SH Steam/Steam.").addInfo("Check NEI for more info.").addInfo(BLUE_PRINT_INFO) + .addSeparator().addController("Front bottom") .addOtherStructurePart("Input Hatch: distilled water", "Hint block with dot 1") .addOtherStructurePart("Output Hatch: SC Steam/SH Steam/Steam", "Hint block with dot 2") .addOtherStructurePart("Input Hatch: Hot fluid or plasma", "Hint block with dot 3") .addOtherStructurePart("Output Hatch: Cold fluid", "Hint block with dot 4") - .addMaintenanceHatch("Any Casing") - .addCasingInfo("Robust Tungstensteel Machine Casings", 25) + .addMaintenanceHatch("Any Casing").addCasingInfo("Robust Tungstensteel Machine Casings", 25) .toolTipFinisher("Good Generator"); return tt; } @@ -218,8 +196,8 @@ public class ExtremeHeatExchanger extends GT_MetaTileEntity_TooltipMultiBlockBas public boolean checkRecipe_EM(ItemStack aStack) { tRunningRecipe = null; if (mHotFluidHatch.getFluid() == null) return true; - MyRecipeAdder.ExtremeHeatExchangerRecipe tRecipe = MyRecipeAdder.mXHeatExchangerFuelMap.get( - mHotFluidHatch.getFluid().getFluid()); + MyRecipeAdder.ExtremeHeatExchangerRecipe tRecipe = MyRecipeAdder.mXHeatExchangerFuelMap + .get(mHotFluidHatch.getFluid().getFluid()); if (tRecipe == null) return false; tRunningRecipe = tRecipe; this.hotName = mHotFluidHatch.getFluid().getFluid().getName(); @@ -306,59 +284,51 @@ public class ExtremeHeatExchanger extends GT_MetaTileEntity_TooltipMultiBlockBas public String[] getInfoData() { int tThreshold = tRunningRecipe != null ? tRunningRecipe.mSpecialValue : 0; return new String[] { - StatCollector.translateToLocal("GT5U.multiblock.Progress") + ": " + EnumChatFormatting.GREEN - + GT_Utility.formatNumbers(mProgresstime / 20) + EnumChatFormatting.RESET + " s / " - + EnumChatFormatting.YELLOW - + GT_Utility.formatNumbers(mMaxProgresstime / 20) + EnumChatFormatting.RESET + " s", - StatCollector.translateToLocal("GT5U.multiblock.problems") + ": " + EnumChatFormatting.RED - + (getIdealStatus() - getRepairStatus()) + EnumChatFormatting.RESET + " " - + StatCollector.translateToLocal("GT5U.multiblock.efficiency") - + ": " + EnumChatFormatting.YELLOW - + mEfficiency / 100.0F + EnumChatFormatting.RESET + " %", - StatCollector.translateToLocal("scanner.info.XHE.0") + " " - + (transformed ? EnumChatFormatting.RED : EnumChatFormatting.YELLOW) - + GT_Utility.formatNumbers(this.mEUt) + EnumChatFormatting.RESET + " EU/t", - StatCollector.translateToLocal("scanner.info.XHE.1") + " " + EnumChatFormatting.GREEN - + GT_Utility.formatNumbers(tThreshold) + EnumChatFormatting.RESET + " L/s" - }; + StatCollector.translateToLocal("GT5U.multiblock.Progress") + ": " + + EnumChatFormatting.GREEN + + GT_Utility.formatNumbers(mProgresstime / 20) + + EnumChatFormatting.RESET + + " s / " + + EnumChatFormatting.YELLOW + + GT_Utility.formatNumbers(mMaxProgresstime / 20) + + EnumChatFormatting.RESET + + " s", + StatCollector.translateToLocal("GT5U.multiblock.problems") + ": " + + EnumChatFormatting.RED + + (getIdealStatus() - getRepairStatus()) + + EnumChatFormatting.RESET + + " " + + StatCollector.translateToLocal("GT5U.multiblock.efficiency") + + ": " + + EnumChatFormatting.YELLOW + + mEfficiency / 100.0F + + EnumChatFormatting.RESET + + " %", + StatCollector.translateToLocal("scanner.info.XHE.0") + " " + + (transformed ? EnumChatFormatting.RED : EnumChatFormatting.YELLOW) + + GT_Utility.formatNumbers(this.mEUt) + + EnumChatFormatting.RESET + + " EU/t", + StatCollector.translateToLocal("scanner.info.XHE.1") + " " + + EnumChatFormatting.GREEN + + GT_Utility.formatNumbers(tThreshold) + + EnumChatFormatting.RESET + + " L/s" }; } @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[] { - casingTexturePages[0][48], - 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[0][48], - TextureFactory.builder() - .addIcon(OVERLAY_FRONT_HEAT_EXCHANGER) - .extFacing() - .build(), - TextureFactory.builder() - .addIcon(OVERLAY_FRONT_HEAT_EXCHANGER_GLOW) - .extFacing() - .glow() - .build() - }; + if (aActive) return new ITexture[] { casingTexturePages[0][48], + 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[0][48], + TextureFactory.builder().addIcon(OVERLAY_FRONT_HEAT_EXCHANGER).extFacing().build(), + TextureFactory.builder().addIcon(OVERLAY_FRONT_HEAT_EXCHANGER_GLOW).extFacing().glow().build() }; } - return new ITexture[] {casingTexturePages[0][48]}; + return new ITexture[] { casingTexturePages[0][48] }; } @Override @@ -368,7 +338,9 @@ public class ExtremeHeatExchanger extends GT_MetaTileEntity_TooltipMultiBlockBas } private enum EHEHatches implements IHatchElement<ExtremeHeatExchanger> { + HotInputHatch(ExtremeHeatExchanger::addHotFluidInputToMachineList, GT_MetaTileEntity_Hatch_Input.class) { + @Override public long count(ExtremeHeatExchanger t) { if (t.mHotFluidHatch == null) return 0; @@ -376,6 +348,7 @@ public class ExtremeHeatExchanger extends GT_MetaTileEntity_TooltipMultiBlockBas } }, ColdOutputHatch(ExtremeHeatExchanger::addColdFluidOutputToMachineList, GT_MetaTileEntity_Hatch_Output.class) { + @Override public long count(ExtremeHeatExchanger t) { if (t.mCooledFluidHatch == null) return 0; diff --git a/src/main/java/goodgenerator/blocks/tileEntity/FuelRefineFactory.java b/src/main/java/goodgenerator/blocks/tileEntity/FuelRefineFactory.java index 1d4e98c4eb..943ca34627 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/FuelRefineFactory.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/FuelRefineFactory.java @@ -5,6 +5,17 @@ import static goodgenerator.util.DescTextLocalization.BLUE_PRINT_INFO; import static gregtech.api.enums.GT_Values.V; import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; +import java.util.ArrayList; +import java.util.List; + +import net.minecraft.block.Block; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.StatCollector; +import net.minecraft.world.World; +import net.minecraftforge.fluids.FluidStack; + import com.github.bartimaeusnek.crossmod.tectech.TecTechEnabledMulti; import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_EnergyMulti; import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_EnergyTunnel; @@ -15,6 +26,7 @@ import com.gtnewhorizon.structurelib.structure.IItemSource; import com.gtnewhorizon.structurelib.structure.IStructureDefinition; import com.gtnewhorizon.structurelib.structure.IStructureElement; import com.gtnewhorizon.structurelib.structure.StructureDefinition; + import goodgenerator.blocks.tileEntity.base.GT_MetaTileEntity_TooltipMultiBlockBase_EM; import goodgenerator.loader.Loaders; import goodgenerator.util.DescTextLocalization; @@ -30,23 +42,14 @@ import gregtech.api.render.TextureFactory; import gregtech.api.util.GT_Multiblock_Tooltip_Builder; import gregtech.api.util.GT_Recipe; import gregtech.api.util.GT_Utility; -import java.util.ArrayList; -import java.util.List; -import net.minecraft.block.Block; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.StatCollector; -import net.minecraft.world.World; -import net.minecraftforge.fluids.FluidStack; public class FuelRefineFactory extends GT_MetaTileEntity_TooltipMultiBlockBase_EM implements TecTechEnabledMulti, IConstructable, ISurvivalConstructable { private IStructureDefinition<FuelRefineFactory> multiDefinition = null; private int Tier = -1; - private int[] cnt = new int[] {0, 0, 0}; - private static final Block[] coils = new Block[] {Loaders.FRF_Coil_1, Loaders.FRF_Coil_2, Loaders.FRF_Coil_3}; + private int[] cnt = new int[] { 0, 0, 0 }; + private static final Block[] coils = new Block[] { Loaders.FRF_Coil_1, Loaders.FRF_Coil_2, Loaders.FRF_Coil_3 }; public FuelRefineFactory(String name) { super(name); @@ -80,23 +83,24 @@ public class FuelRefineFactory extends GT_MetaTileEntity_TooltipMultiBlockBase_E public IStructureDefinition<FuelRefineFactory> getStructure_EM() { if (multiDefinition == null) { multiDefinition = StructureDefinition.<FuelRefineFactory>builder() - .addShape(mName, transpose(new String[][] { - {" ", " CCC ", " "}, - {" XGX ", " CCFFFCC ", " XGX "}, - {" CC CC ", " CFFCCCFFC ", " CC CC "}, - {" C C ", " CFCC CCFC ", " C C "}, - {" C C ", " CFC CFC ", " C C "}, - {" C C ", " CFC CFC ", " C C "}, - {" X X ", "CFC CFC", " X X "}, - {" G G ", "CFC CFC", " G G "}, - {" X X ", "CFC CFC", " X X "}, - {" C C ", " CFC CFC ", " C C "}, - {" C C ", " CFC CFC ", " C C "}, - {" C C ", " CFCC CCFC ", " C C "}, - {" CC CC ", " CFFC~CFFC ", " CC CC "}, - {" XGX ", " CCFFFCC ", " XGX "}, - {" ", " CCC ", " "} - })) + .addShape( + mName, + transpose( + new String[][] { { " ", " CCC ", " " }, + { " XGX ", " CCFFFCC ", " XGX " }, + { " CC CC ", " CFFCCCFFC ", " CC CC " }, + { " C C ", " CFCC CCFC ", " C C " }, + { " C C ", " CFC CFC ", " C C " }, + { " C C ", " CFC CFC ", " C C " }, + { " X X ", "CFC CFC", " X X " }, + { " G G ", "CFC CFC", " G G " }, + { " X X ", "CFC CFC", " X X " }, + { " C C ", " CFC CFC ", " C C " }, + { " C C ", " CFC CFC ", " C C " }, + { " C C ", " CFCC CCFC ", " C C " }, + { " CC CC ", " CFFC~CFFC ", " CC CC " }, + { " XGX ", " CCFFFCC ", " XGX " }, + { " ", " CCC ", " " } })) .addElement( 'X', buildHatchAdder(FuelRefineFactory.class) @@ -106,9 +110,7 @@ public class FuelRefineFactory extends GT_MetaTileEntity_TooltipMultiBlockBase_E GT_HatchElement.InputBus, GT_HatchElement.OutputHatch, HatchElement.EnergyMulti.or(GT_HatchElement.Energy)) - .casingIndex(179) - .dot(1) - .buildAndChain(ofBlock(Loaders.FRF_Casings, 0))) + .casingIndex(179).dot(1).buildAndChain(ofBlock(Loaders.FRF_Casings, 0))) .addElement('C', ofBlock(Loaders.FRF_Casings, 0)) .addElement('G', ofBlock(Loaders.fieldRestrictingGlass, 0)) .addElement( @@ -124,6 +126,7 @@ public class FuelRefineFactory extends GT_MetaTileEntity_TooltipMultiBlockBase_E public static <T> IStructureElement<T> ofFieldCoil(int aIndex) { return new IStructureElement<T>() { + @Override public boolean check(T t, World world, int x, int y, int z) { Block block = world.getBlock(x, y, z); @@ -152,21 +155,15 @@ public class FuelRefineFactory extends GT_MetaTileEntity_TooltipMultiBlockBase_E @Override protected GT_Multiblock_Tooltip_Builder createTooltip() { final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); - tt.addMachineType("Naquadah Fuel Refinery") - .addInfo("Controller block for the Naquadah Fuel Refinery") - .addInfo("But at what cost?") - .addInfo("Produce the endgame naquadah fuel.") + tt.addMachineType("Naquadah Fuel Refinery").addInfo("Controller block for the Naquadah Fuel Refinery") + .addInfo("But at what cost?").addInfo("Produce the endgame naquadah fuel.") .addInfo("Need field restriction coil to control the fatal radiation.") .addInfo("Use higher tier coil to unlock more fuel and reduce the process time.") - .addInfo("The structure is too complex!") - .addInfo(BLUE_PRINT_INFO) - .addSeparator() - .beginStructureBlock(3, 15, 15, false) - .addInputHatch("The casings adjoin the field restriction glass.") + .addInfo("The structure is too complex!").addInfo(BLUE_PRINT_INFO).addSeparator() + .beginStructureBlock(3, 15, 15, false).addInputHatch("The casings adjoin the field restriction glass.") .addInputBus("The casings adjoin the field restriction glass.") .addOutputHatch("The casings adjoin the field restriction glass.") - .addEnergyHatch("The casings adjoin the field restriction glass.") - .toolTipFinisher("Good Generator"); + .addEnergyHatch("The casings adjoin the field restriction glass.").toolTipFinisher("Good Generator"); return tt; } @@ -341,33 +338,18 @@ public class FuelRefineFactory extends GT_MetaTileEntity_TooltipMultiBlockBase_E @Override @SuppressWarnings("ALL") - 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(179), + if (aActive) return new ITexture[] { Textures.BlockIcons.getCasingTextureForId(179), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_ASSEMBLY_LINE_ACTIVE), - TextureFactory.builder() - .addIcon(Textures.BlockIcons.OVERLAY_FRONT_ASSEMBLY_LINE_ACTIVE_GLOW) - .glow() - .build() - }; - return new ITexture[] { - Textures.BlockIcons.getCasingTextureForId(179), - new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_ASSEMBLY_LINE), - TextureFactory.builder() - .addIcon(Textures.BlockIcons.OVERLAY_FRONT_ASSEMBLY_LINE_GLOW) - .glow() - .build() - }; + TextureFactory.builder().addIcon(Textures.BlockIcons.OVERLAY_FRONT_ASSEMBLY_LINE_ACTIVE_GLOW).glow() + .build() }; + return new ITexture[] { Textures.BlockIcons.getCasingTextureForId(179), + new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_ASSEMBLY_LINE), TextureFactory.builder() + .addIcon(Textures.BlockIcons.OVERLAY_FRONT_ASSEMBLY_LINE_GLOW).glow().build() }; } - return new ITexture[] {Textures.BlockIcons.getCasingTextureForId(179)}; + return new ITexture[] { Textures.BlockIcons.getCasingTextureForId(179) }; } @Override diff --git a/src/main/java/goodgenerator/blocks/tileEntity/GTMetaTileEntity/DieselGenerator.java b/src/main/java/goodgenerator/blocks/tileEntity/GTMetaTileEntity/DieselGenerator.java index 9105685742..9f2661b486 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/GTMetaTileEntity/DieselGenerator.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/GTMetaTileEntity/DieselGenerator.java @@ -3,6 +3,8 @@ package goodgenerator.blocks.tileEntity.GTMetaTileEntity; import static gregtech.api.enums.Textures.BlockIcons.*; import static gregtech.api.enums.Textures.BlockIcons.DIESEL_GENERATOR_SIDE_ACTIVE_GLOW; +import net.minecraft.item.ItemStack; + import cpw.mods.fml.common.registry.GameRegistry; import gregtech.GT_Mod; import gregtech.api.enums.ItemList; @@ -15,18 +17,20 @@ import gregtech.api.util.GT_Log; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_Recipe; import gregtech.api.util.GT_Utility; -import net.minecraft.item.ItemStack; public class DieselGenerator extends GT_MetaTileEntity_BasicGenerator { public int mEfficiency; public DieselGenerator(int aID, String aName, String aNameRegional, int aTier) { - super(aID, aName, aNameRegional, aTier, new String[] { - "Requires liquid Fuel", - "Causes " + (int) (GT_Mod.gregtechproxy.mPollutionBaseDieselGeneratorPerSecond * (1.1 - aTier * 0.1)) - + " Pollution per second" - }); + super( + aID, + aName, + aNameRegional, + aTier, + new String[] { "Requires liquid Fuel", "Causes " + + (int) (GT_Mod.gregtechproxy.mPollutionBaseDieselGeneratorPerSecond * (1.1 - aTier * 0.1)) + + " Pollution per second" }); mEfficiency = 100 - aTier * 10; } @@ -77,8 +81,13 @@ public class DieselGenerator extends GT_MetaTileEntity_BasicGenerator { public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) { if (aTick % 100 == 0 && mFluid != null && mFluid.amount > this.getCapacity()) { GT_Log.err.println( - "Dupe Abuse: " + aBaseMetaTileEntity.getOwnerName() + " Coords: " + aBaseMetaTileEntity.getXCoord() - + " " + aBaseMetaTileEntity.getYCoord() + " " + aBaseMetaTileEntity.getZCoord()); + "Dupe Abuse: " + aBaseMetaTileEntity.getOwnerName() + + " Coords: " + + aBaseMetaTileEntity.getXCoord() + + " " + + aBaseMetaTileEntity.getYCoord() + + " " + + aBaseMetaTileEntity.getZCoord()); aBaseMetaTileEntity.setToFire(); } super.onPostTick(aBaseMetaTileEntity, aTick); @@ -86,134 +95,84 @@ public class DieselGenerator extends GT_MetaTileEntity_BasicGenerator { @Override public ITexture[] getFront(byte aColor) { - return new ITexture[] { - super.getFront(aColor)[0], - TextureFactory.of( - TextureFactory.of(DIESEL_GENERATOR_FRONT), - TextureFactory.builder() - .addIcon(DIESEL_GENERATOR_FRONT_GLOW) - .glow() - .build()), - OVERLAYS_ENERGY_OUT[this.mTier] - }; + return new ITexture[] { super.getFront(aColor)[0], + TextureFactory.of( + TextureFactory.of(DIESEL_GENERATOR_FRONT), + TextureFactory.builder().addIcon(DIESEL_GENERATOR_FRONT_GLOW).glow().build()), + OVERLAYS_ENERGY_OUT[this.mTier] }; } @Override public ITexture[] getBack(byte aColor) { - return new ITexture[] { - super.getBack(aColor)[0], - TextureFactory.of( - TextureFactory.of(DIESEL_GENERATOR_BACK), - TextureFactory.builder() - .addIcon(DIESEL_GENERATOR_BACK_GLOW) - .glow() - .build()) - }; + return new ITexture[] { super.getBack(aColor)[0], + TextureFactory.of( + TextureFactory.of(DIESEL_GENERATOR_BACK), + TextureFactory.builder().addIcon(DIESEL_GENERATOR_BACK_GLOW).glow().build()) }; } @Override public ITexture[] getBottom(byte aColor) { - return new ITexture[] { - super.getBottom(aColor)[0], - TextureFactory.of( - TextureFactory.of(DIESEL_GENERATOR_BOTTOM), - TextureFactory.builder() - .addIcon(DIESEL_GENERATOR_BOTTOM_GLOW) - .glow() - .build()) - }; + return new ITexture[] { super.getBottom(aColor)[0], + TextureFactory.of( + TextureFactory.of(DIESEL_GENERATOR_BOTTOM), + TextureFactory.builder().addIcon(DIESEL_GENERATOR_BOTTOM_GLOW).glow().build()) }; } @Override public ITexture[] getTop(byte aColor) { - return new ITexture[] { - super.getTop(aColor)[0], - TextureFactory.of( - TextureFactory.of(DIESEL_GENERATOR_TOP), - TextureFactory.builder() - .addIcon(DIESEL_GENERATOR_TOP_GLOW) - .glow() - .build()) - }; + return new ITexture[] { super.getTop(aColor)[0], + TextureFactory.of( + TextureFactory.of(DIESEL_GENERATOR_TOP), + TextureFactory.builder().addIcon(DIESEL_GENERATOR_TOP_GLOW).glow().build()) }; } @Override public ITexture[] getSides(byte aColor) { - return new ITexture[] { - super.getSides(aColor)[0], - TextureFactory.of( - TextureFactory.of(DIESEL_GENERATOR_SIDE), - TextureFactory.builder() - .addIcon(DIESEL_GENERATOR_SIDE_GLOW) - .glow() - .build()) - }; + return new ITexture[] { super.getSides(aColor)[0], + TextureFactory.of( + TextureFactory.of(DIESEL_GENERATOR_SIDE), + TextureFactory.builder().addIcon(DIESEL_GENERATOR_SIDE_GLOW).glow().build()) }; } @Override public ITexture[] getFrontActive(byte aColor) { - return new ITexture[] { - super.getFrontActive(aColor)[0], - TextureFactory.of( - TextureFactory.of(DIESEL_GENERATOR_FRONT_ACTIVE), - TextureFactory.builder() - .addIcon(DIESEL_GENERATOR_FRONT_ACTIVE_GLOW) - .glow() - .build()), - OVERLAYS_ENERGY_OUT[this.mTier] - }; + return new ITexture[] { super.getFrontActive(aColor)[0], + TextureFactory.of( + TextureFactory.of(DIESEL_GENERATOR_FRONT_ACTIVE), + TextureFactory.builder().addIcon(DIESEL_GENERATOR_FRONT_ACTIVE_GLOW).glow().build()), + OVERLAYS_ENERGY_OUT[this.mTier] }; } @Override public ITexture[] getBackActive(byte aColor) { - return new ITexture[] { - super.getBackActive(aColor)[0], - TextureFactory.of( - TextureFactory.of(DIESEL_GENERATOR_BACK_ACTIVE), - TextureFactory.builder() - .addIcon(DIESEL_GENERATOR_BACK_ACTIVE_GLOW) - .glow() - .build()) - }; + return new ITexture[] { super.getBackActive(aColor)[0], + TextureFactory.of( + TextureFactory.of(DIESEL_GENERATOR_BACK_ACTIVE), + TextureFactory.builder().addIcon(DIESEL_GENERATOR_BACK_ACTIVE_GLOW).glow().build()) }; } @Override public ITexture[] getBottomActive(byte aColor) { - return new ITexture[] { - super.getBottomActive(aColor)[0], - TextureFactory.of( - TextureFactory.of(DIESEL_GENERATOR_BOTTOM_ACTIVE), - TextureFactory.builder() - .addIcon(DIESEL_GENERATOR_BOTTOM_ACTIVE_GLOW) - .glow() - .build()) - }; + return new ITexture[] { super.getBottomActive(aColor)[0], + TextureFactory.of( + TextureFactory.of(DIESEL_GENERATOR_BOTTOM_ACTIVE), + TextureFactory.builder().addIcon(DIESEL_GENERATOR_BOTTOM_ACTIVE_GLOW).glow().build()) }; } @Override public ITexture[] getTopActive(byte aColor) { - return new ITexture[] { - super.getTopActive(aColor)[0], - TextureFactory.of( - TextureFactory.of(DIESEL_GENERATOR_TOP_ACTIVE), - TextureFactory.builder() - .addIcon(DIESEL_GENERATOR_TOP_ACTIVE_GLOW) - .glow() - .build()) - }; + return new ITexture[] { super.getTopActive(aColor)[0], + TextureFactory.of( + TextureFactory.of(DIESEL_GENERATOR_TOP_ACTIVE), + TextureFactory.builder().addIcon(DIESEL_GENERATOR_TOP_ACTIVE_GLOW).glow().build()) }; } @Override public ITexture[] getSidesActive(byte aColor) { - return new ITexture[] { - super.getSidesActive(aColor)[0], - TextureFactory.of( - TextureFactory.of(DIESEL_GENERATOR_SIDE_ACTIVE), - TextureFactory.builder() - .addIcon(DIESEL_GENERATOR_SIDE_ACTIVE_GLOW) - .glow() - .build()) - }; + return new ITexture[] { super.getSidesActive(aColor)[0], + TextureFactory.of( + TextureFactory.of(DIESEL_GENERATOR_SIDE_ACTIVE), + TextureFactory.builder().addIcon(DIESEL_GENERATOR_SIDE_ACTIVE_GLOW).glow().build()) }; } @Override diff --git a/src/main/java/goodgenerator/blocks/tileEntity/GTMetaTileEntity/NeutronAccelerator.java b/src/main/java/goodgenerator/blocks/tileEntity/GTMetaTileEntity/NeutronAccelerator.java index dc049e69c7..2a110b3b67 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/GTMetaTileEntity/NeutronAccelerator.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/GTMetaTileEntity/NeutronAccelerator.java @@ -28,12 +28,9 @@ public class NeutronAccelerator extends GT_MetaTileEntity_Hatch_Energy { @Override public String[] getDescription() { - return new String[] { - "Input EU to Accelerate the Neutron!", - "Max EU input: " + this.maxEUInput(), - "Max EU consumption: " + this.getMaxEUConsume(), - "Every EU can be transformed into 10~20 eV Neutron Kinetic Energy." - }; + return new String[] { "Input EU to Accelerate the Neutron!", "Max EU input: " + this.maxEUInput(), + "Max EU consumption: " + this.getMaxEUConsume(), + "Every EU can be transformed into 10~20 eV Neutron Kinetic Energy." }; } @Override diff --git a/src/main/java/goodgenerator/blocks/tileEntity/GTMetaTileEntity/NeutronSensor.java b/src/main/java/goodgenerator/blocks/tileEntity/GTMetaTileEntity/NeutronSensor.java index e176e103b7..c10c6d962d 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/GTMetaTileEntity/NeutronSensor.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/GTMetaTileEntity/NeutronSensor.java @@ -1,5 +1,10 @@ package goodgenerator.blocks.tileEntity.GTMetaTileEntity; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.StatCollector; + import com.gtnewhorizons.modularui.api.drawable.Text; import com.gtnewhorizons.modularui.api.math.Alignment; import com.gtnewhorizons.modularui.api.math.Color; @@ -7,6 +12,7 @@ import com.gtnewhorizons.modularui.api.screen.ModularWindow; import com.gtnewhorizons.modularui.api.screen.UIBuildContext; import com.gtnewhorizons.modularui.common.widget.TextWidget; import com.gtnewhorizons.modularui.common.widget.textfield.TextFieldWidget; + import goodgenerator.blocks.tileEntity.NeutronActivator; import goodgenerator.util.CharExchanger; import gregtech.api.enums.Textures; @@ -18,16 +24,12 @@ import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch; import gregtech.api.render.TextureFactory; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.StatCollector; public class NeutronSensor extends GT_MetaTileEntity_Hatch { private static final IIconContainer textureFont = new Textures.BlockIcons.CustomIcon("icons/NeutronSensorFont"); - private static final IIconContainer textureFont_Glow = - new Textures.BlockIcons.CustomIcon("icons/NeutronSensorFont_GLOW"); + private static final IIconContainer textureFont_Glow = new Textures.BlockIcons.CustomIcon( + "icons/NeutronSensorFont_GLOW"); protected String texts = ""; boolean isOn = false; @@ -42,11 +44,9 @@ public class NeutronSensor extends GT_MetaTileEntity_Hatch { @Override public String[] getDescription() { - return new String[] { - "Can be installed in Neutron Activator.", - "Output Redstone Signal according to the Neutron Kinetic Energy.", - "Right click to open the GUI and setting." - }; + return new String[] { "Can be installed in Neutron Activator.", + "Output Redstone Signal according to the Neutron Kinetic Energy.", + "Right click to open the GUI and setting." }; } @Override @@ -87,8 +87,8 @@ public class NeutronSensor extends GT_MetaTileEntity_Hatch { } @Override - public boolean onRightclick( - IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer, byte aSide, float aX, float aY, float aZ) { + public boolean onRightclick(IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer, byte aSide, float aX, + float aY, float aZ) { GT_UIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer); return true; } @@ -111,16 +111,13 @@ public class NeutronSensor extends GT_MetaTileEntity_Hatch { @Override public ITexture[] getTexturesActive(ITexture aBaseTexture) { - return new ITexture[] { - aBaseTexture, - TextureFactory.of(textureFont), - TextureFactory.builder().addIcon(textureFont_Glow).glow().build() - }; + return new ITexture[] { aBaseTexture, TextureFactory.of(textureFont), + TextureFactory.builder().addIcon(textureFont_Glow).glow().build() }; } @Override public ITexture[] getTexturesInactive(ITexture aBaseTexture) { - return new ITexture[] {aBaseTexture, TextureFactory.of(textureFont)}; + return new ITexture[] { aBaseTexture, TextureFactory.of(textureFont) }; } @Override @@ -161,33 +158,30 @@ public class NeutronSensor extends GT_MetaTileEntity_Hatch { @Override public void addUIWidgets(ModularWindow.Builder builder, UIBuildContext buildContext) { TextFieldWidget textField = new TextFieldWidget(); - builder.widget(textField - .setGetter(this::getText) - .setSetter(this::setText) - .setValidator(str -> isValidExpression(str) - ? str - : textField.getLastText().size() > 0 - ? textField.getLastText().get(0) - : "") - .setFocusOnGuiOpen(true) - .setTextColor(Color.WHITE.dark(1)) + builder.widget( + textField.setGetter(this::getText).setSetter(this::setText) + .setValidator( + str -> isValidExpression(str) ? str + : textField.getLastText().size() > 0 ? textField.getLastText().get(0) : "") + .setFocusOnGuiOpen(true).setTextColor(Color.WHITE.dark(1)) .setTextAlignment(Alignment.CenterLeft) - .setBackground(GT_UITextures.BACKGROUND_TEXT_FIELD.withOffset(-1, -1, 2, 2)) - .setPos(8, 48) + .setBackground(GT_UITextures.BACKGROUND_TEXT_FIELD.withOffset(-1, -1, 2, 2)).setPos(8, 48) .setSize(100, 18)) - .widget(new TextWidget(StatCollector.translateToLocal("gui.NeutronSensor.0")) - .setDefaultColor(COLOR_TEXT_GRAY.get()) - .setTextAlignment(Alignment.CenterLeft) - .setPos(8, 8)) - .widget(new TextWidget(StatCollector.translateToLocal("gui.NeutronSensor.1")) - .setDefaultColor(COLOR_TEXT_GRAY.get()) - .setPos(8, 32)) - .widget(TextWidget.dynamicText(() -> isValidExpression(textField.getText()) - ? new Text(StatCollector.translateToLocal("gui.NeutronSensor.2")).color(0x077d02) - : new Text(StatCollector.translateToLocal("gui.NeutronSensor.3")) - .color(COLOR_TEXT_RED.get())) - .setSynced(false) - .setPos(120, 53)); + .widget( + new TextWidget(StatCollector.translateToLocal("gui.NeutronSensor.0")) + .setDefaultColor(COLOR_TEXT_GRAY.get()).setTextAlignment(Alignment.CenterLeft) + .setPos(8, 8)) + .widget( + new TextWidget(StatCollector.translateToLocal("gui.NeutronSensor.1")) + .setDefaultColor(COLOR_TEXT_GRAY.get()).setPos(8, 32)) + .widget( + TextWidget.dynamicText( + () -> isValidExpression(textField.getText()) + ? new Text(StatCollector.translateToLocal("gui.NeutronSensor.2")) + .color(0x077d02) + : new Text(StatCollector.translateToLocal("gui.NeutronSensor.3")) + .color(COLOR_TEXT_RED.get())) + .setSynced(false).setPos(120, 53)); } private boolean isValidExpression(String exp) { @@ -204,8 +198,7 @@ public class NeutronSensor extends GT_MetaTileEntity_Hatch { if (exp.charAt(index) != 'E' && exp.charAt(index) != 'e') return false; index = exp.length() - 3; if (index < 0) return false; - return exp.charAt(index) == 'M' - || exp.charAt(index) == 'm' + return exp.charAt(index) == 'M' || exp.charAt(index) == 'm' || exp.charAt(index) == 'K' || exp.charAt(index) == 'k' || Character.isDigit(exp.charAt(index)); diff --git a/src/main/java/goodgenerator/blocks/tileEntity/GTMetaTileEntity/YOTTAHatch.java b/src/main/java/goodgenerator/blocks/tileEntity/GTMetaTileEntity/YOTTAHatch.java index 6ac023a559..a8019611ce 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/GTMetaTileEntity/YOTTAHatch.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/GTMetaTileEntity/YOTTAHatch.java @@ -1,5 +1,17 @@ package goodgenerator.blocks.tileEntity.GTMetaTileEntity; +import java.math.BigInteger; +import java.util.ArrayList; +import java.util.List; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.StatCollector; +import net.minecraftforge.common.util.ForgeDirection; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidTankInfo; + import appeng.api.config.AccessRestriction; import appeng.api.config.Actionable; import appeng.api.networking.GridFlags; @@ -32,46 +44,31 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch; import gregtech.api.render.TextureFactory; import gregtech.api.util.GT_Utility; -import java.math.BigInteger; -import java.util.ArrayList; -import java.util.List; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.StatCollector; -import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.FluidTankInfo; @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.Interface( - iface = "appeng.api.storage.IMEInventory", - modid = "appliedenergistics2", - striprefs = true), - @Optional.Interface( - iface = "appeng.api.storage.IMEInventoryHandler", - modid = "appliedenergistics2", - striprefs = true), - @Optional.Interface( - iface = "appeng.api.storage.ICellContainer", - modid = "appliedenergistics2", - striprefs = true), - }) -public class YOTTAHatch extends GT_MetaTileEntity_Hatch - implements IGridProxyable, - IActionHost, - ICellContainer, - IMEInventory<IAEFluidStack>, - IMEInventoryHandler<IAEFluidStack> { + @Optional.Interface( + iface = "appeng.api.networking.security.IActionHost", + modid = "appliedenergistics2", + striprefs = true), + @Optional.Interface( + iface = "appeng.me.helpers.IGridProxyable", + modid = "appliedenergistics2", + striprefs = true), + @Optional.Interface( + iface = "appeng.api.storage.IMEInventory", + modid = "appliedenergistics2", + striprefs = true), + @Optional.Interface( + iface = "appeng.api.storage.IMEInventoryHandler", + modid = "appliedenergistics2", + striprefs = true), + @Optional.Interface( + iface = "appeng.api.storage.ICellContainer", + modid = "appliedenergistics2", + striprefs = true), }) +public class YOTTAHatch extends GT_MetaTileEntity_Hatch implements IGridProxyable, IActionHost, ICellContainer, + IMEInventory<IAEFluidStack>, IMEInventoryHandler<IAEFluidStack> { private static final IIconContainer textureFont = new Textures.BlockIcons.CustomIcon("icons/YOTTAHatch"); @@ -82,17 +79,18 @@ public class YOTTAHatch extends GT_MetaTileEntity_Hatch private String lastFluid = ""; private BigInteger lastAmt = BigInteger.ZERO; private AccessRestriction readMode = AccessRestriction.READ_WRITE; - private final AccessRestriction[] AEModes = new AccessRestriction[] { - AccessRestriction.NO_ACCESS, AccessRestriction.READ, AccessRestriction.WRITE, AccessRestriction.READ_WRITE - }; + private final AccessRestriction[] AEModes = new AccessRestriction[] { AccessRestriction.NO_ACCESS, + AccessRestriction.READ, AccessRestriction.WRITE, AccessRestriction.READ_WRITE }; public YOTTAHatch(int aID, String aName, String aNameRegional, int aTier) { - super(aID, aName, aNameRegional, aTier, 0, new String[] { - "Special I/O port for EC2.", - "Directly connected YOTTank with AE fluid storage system.", - "Use screwdriver to set storage priority", - "Use soldering iron to set read/write mode" - }); + super( + aID, + aName, + aNameRegional, + aTier, + 0, + new String[] { "Special I/O port for EC2.", "Directly connected YOTTank with AE fluid storage system.", + "Use screwdriver to set storage priority", "Use soldering iron to set read/write mode" }); } public YOTTAHatch(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { @@ -132,15 +130,17 @@ public class YOTTAHatch extends GT_MetaTileEntity_Hatch if (aPlayer.isSneaking()) this.priority -= 10; else this.priority += 10; GT_Utility.sendChatToPlayer( - aPlayer, String.format(StatCollector.translateToLocal("yothatch.chat.0"), this.priority)); + aPlayer, + String.format(StatCollector.translateToLocal("yothatch.chat.0"), this.priority)); } @Override - public boolean onSolderingToolRightClick( - byte aSide, byte aWrenchingSide, EntityPlayer aPlayer, float aX, float aY, float aZ) { + public boolean onSolderingToolRightClick(byte aSide, byte aWrenchingSide, EntityPlayer aPlayer, float aX, float aY, + float aZ) { this.readMode = AEModes[(readMode.ordinal() + 1) % 4]; GT_Utility.sendChatToPlayer( - aPlayer, String.format(StatCollector.translateToLocal("yothatch.chat.1"), this.readMode)); + aPlayer, + String.format(StatCollector.translateToLocal("yothatch.chat.1"), this.readMode)); return true; } @@ -180,12 +180,11 @@ public class YOTTAHatch extends GT_MetaTileEntity_Hatch @Override @Optional.Method(modid = "appliedenergistics2") public IItemList<IAEFluidStack> getAvailableItems(IItemList<IAEFluidStack> out) { - if (host == null - || host.getBaseMetaTileEntity() == null - || !host.getBaseMetaTileEntity().isActive()) return out; - if (host.mFluidName == null - || host.mFluidName.equals("") - || host.mStorageCurrent.compareTo(BigInteger.ZERO) <= 0) return out; + if (host == null || host.getBaseMetaTileEntity() == null || !host.getBaseMetaTileEntity().isActive()) + return out; + if (host.mFluidName == null || host.mFluidName.equals("") + || host.mStorageCurrent.compareTo(BigInteger.ZERO) <= 0) + return out; long ready; if (host.mStorageCurrent.compareTo(BigInteger.valueOf(Long.MAX_VALUE)) > 0) { ready = Long.MAX_VALUE; @@ -240,9 +239,8 @@ public class YOTTAHatch extends GT_MetaTileEntity_Hatch if (storageGrid == null) { node.getGrid().postEvent(new MENetworkStorageEvent(null, StorageChannel.FLUIDS)); } else { - node.getGrid() - .postEvent(new MENetworkStorageEvent( - storageGrid.getFluidInventory(), StorageChannel.FLUIDS)); + node.getGrid().postEvent( + new MENetworkStorageEvent(storageGrid.getFluidInventory(), StorageChannel.FLUIDS)); } node.getGrid().postEvent(new MENetworkCellArrayUpdate()); } @@ -258,9 +256,7 @@ public class YOTTAHatch extends GT_MetaTileEntity_Hatch @Override public int getCapacity() { - if (host == null - || host.getBaseMetaTileEntity() == null - || !host.getBaseMetaTileEntity().isActive()) return 0; + if (host == null || host.getBaseMetaTileEntity() == null || !host.getBaseMetaTileEntity().isActive()) return 0; if (host.mStorage.compareTo(BigInteger.valueOf(Integer.MAX_VALUE)) >= 0) { return Integer.MAX_VALUE; } else return host.mStorage.intValue(); @@ -268,14 +264,11 @@ public class YOTTAHatch extends GT_MetaTileEntity_Hatch @Override public int fill(ForgeDirection from, FluidStack resource, boolean doFill) { - if (host == null - || host.getBaseMetaTileEntity() == null - || !host.getBaseMetaTileEntity().isActive()) return 0; - if (host.mLockedFluidName != null - && !host.mLockedFluidName.equals("") - && !host.mLockedFluidName.equals(resource.getFluid().getName())) return 0; - if (host.mFluidName == null - || host.mFluidName.equals("") + if (host == null || host.getBaseMetaTileEntity() == null || !host.getBaseMetaTileEntity().isActive()) return 0; + if (host.mLockedFluidName != null && !host.mLockedFluidName.equals("") + && !host.mLockedFluidName.equals(resource.getFluid().getName())) + return 0; + if (host.mFluidName == null || host.mFluidName.equals("") || host.mFluidName.equals(resource.getFluid().getName())) { host.mFluidName = resource.getFluid().getName(); if (host.mStorage.subtract(host.mStorageCurrent).compareTo(BigInteger.valueOf(resource.amount)) >= 0) { @@ -291,14 +284,11 @@ public class YOTTAHatch extends GT_MetaTileEntity_Hatch } public long fill(ForgeDirection from, IAEFluidStack resource, boolean doFill) { - if (host == null - || host.getBaseMetaTileEntity() == null - || !host.getBaseMetaTileEntity().isActive()) return 0; - if (host.mLockedFluidName != null - && !host.mLockedFluidName.equals("") - && !host.mLockedFluidName.equals(resource.getFluid().getName())) return 0; - if (host.mFluidName == null - || host.mFluidName.equals("") + if (host == null || host.getBaseMetaTileEntity() == null || !host.getBaseMetaTileEntity().isActive()) return 0; + if (host.mLockedFluidName != null && !host.mLockedFluidName.equals("") + && !host.mLockedFluidName.equals(resource.getFluid().getName())) + return 0; + if (host.mFluidName == null || host.mFluidName.equals("") || host.mFluidName.equals(resource.getFluid().getName())) { host.mFluidName = resource.getFluid().getName(); if (host.mStorage.subtract(host.mStorageCurrent).compareTo(BigInteger.valueOf(resource.getStackSize())) @@ -316,12 +306,11 @@ public class YOTTAHatch extends GT_MetaTileEntity_Hatch @Override public FluidStack drain(ForgeDirection from, FluidStack resource, boolean doDrain) { - if (host == null - || host.getBaseMetaTileEntity() == null - || !host.getBaseMetaTileEntity().isActive()) return null; - if (host.mFluidName == null - || host.mFluidName.equals("") - || !host.mFluidName.equals(resource.getFluid().getName())) return null; + if (host == null || host.getBaseMetaTileEntity() == null || !host.getBaseMetaTileEntity().isActive()) + return null; + if (host.mFluidName == null || host.mFluidName.equals("") + || !host.mFluidName.equals(resource.getFluid().getName())) + return null; int ready; if (host.mStorageCurrent.compareTo(BigInteger.valueOf(Integer.MAX_VALUE)) > 0) { ready = Integer.MAX_VALUE; @@ -334,12 +323,11 @@ public class YOTTAHatch extends GT_MetaTileEntity_Hatch } public IAEFluidStack drain(ForgeDirection from, IAEFluidStack resource, boolean doDrain) { - if (host == null - || host.getBaseMetaTileEntity() == null - || !host.getBaseMetaTileEntity().isActive()) return null; - if (host.mFluidName == null - || host.mFluidName.equals("") - || !host.mFluidName.equals(resource.getFluid().getName())) return null; + if (host == null || host.getBaseMetaTileEntity() == null || !host.getBaseMetaTileEntity().isActive()) + return null; + if (host.mFluidName == null || host.mFluidName.equals("") + || !host.mFluidName.equals(resource.getFluid().getName())) + return null; long ready; if (host.mStorageCurrent.compareTo(BigInteger.valueOf(Long.MAX_VALUE)) > 0) { ready = Long.MAX_VALUE; @@ -355,9 +343,8 @@ public class YOTTAHatch extends GT_MetaTileEntity_Hatch @Override public FluidStack drain(ForgeDirection from, int maxDrain, boolean doDrain) { - if (host == null - || host.getBaseMetaTileEntity() == null - || !host.getBaseMetaTileEntity().isActive()) return null; + if (host == null || host.getBaseMetaTileEntity() == null || !host.getBaseMetaTileEntity().isActive()) + return null; if (host.mFluidName == null || host.mFluidName.equals("")) return null; return this.drain(from, FluidRegistry.getFluidStack(host.mFluidName, maxDrain), doDrain); } @@ -366,9 +353,8 @@ public class YOTTAHatch extends GT_MetaTileEntity_Hatch public FluidTankInfo[] getTankInfo(ForgeDirection from) { FluidTankInfo[] tankInfo = new FluidTankInfo[1]; tankInfo[0] = new FluidTankInfo(null, 0); - if (host == null - || host.getBaseMetaTileEntity() == null - || !host.getBaseMetaTileEntity().isActive()) return tankInfo; + if (host == null || host.getBaseMetaTileEntity() == null || !host.getBaseMetaTileEntity().isActive()) + return tankInfo; FluidStack fluid = null; if (host.mFluidName != null && !host.mFluidName.equals("")) { int camt; @@ -393,16 +379,12 @@ public class YOTTAHatch extends GT_MetaTileEntity_Hatch @Override public ITexture[] getTexturesActive(ITexture aBaseTexture) { - return new ITexture[] { - aBaseTexture, TextureFactory.of(textureFont), - }; + return new ITexture[] { aBaseTexture, TextureFactory.of(textureFont), }; } @Override public ITexture[] getTexturesInactive(ITexture aBaseTexture) { - return new ITexture[] { - aBaseTexture, TextureFactory.of(textureFont), - }; + return new ITexture[] { aBaseTexture, TextureFactory.of(textureFont), }; } @Override diff --git a/src/main/java/goodgenerator/blocks/tileEntity/LargeEssentiaGenerator.java b/src/main/java/goodgenerator/blocks/tileEntity/LargeEssentiaGenerator.java index 080bb188bc..a0ae2d6620 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/LargeEssentiaGenerator.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/LargeEssentiaGenerator.java @@ -4,6 +4,21 @@ import static com.gtnewhorizon.structurelib.structure.StructureUtility.*; import static goodgenerator.util.DescTextLocalization.BLUE_PRINT_INFO; import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; +import java.util.ArrayList; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.StatCollector; +import net.minecraft.world.World; +import net.minecraftforge.fluids.FluidRegistry; + +import thaumcraft.api.aspects.Aspect; +import thaumcraft.api.aspects.AspectList; +import thaumcraft.common.config.ConfigBlocks; + import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader; import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_DynamoMulti; import com.gtnewhorizon.structurelib.alignment.constructable.IConstructable; @@ -11,6 +26,7 @@ import com.gtnewhorizon.structurelib.alignment.constructable.ISurvivalConstructa 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.crossmod.thaumcraft.LargeEssentiaEnergyData; import goodgenerator.items.MyMaterial; @@ -32,18 +48,6 @@ 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.entity.player.EntityPlayerMP; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.StatCollector; -import net.minecraft.world.World; -import net.minecraftforge.fluids.FluidRegistry; -import thaumcraft.api.aspects.Aspect; -import thaumcraft.api.aspects.AspectList; -import thaumcraft.common.config.ConfigBlocks; public class LargeEssentiaGenerator extends GT_MetaTileEntity_TooltipMultiBlockBase_EM implements IConstructable, ISurvivalConstructable { @@ -73,8 +77,7 @@ 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 + return structureCheck_EM(mName, 4, 0, 4) && (mDynamoHatches.size() + eDynamoMulti.size()) == 1 && checkHatchTier() && updateEssentiaHatchState(); } @@ -116,8 +119,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); @@ -131,9 +134,7 @@ public class LargeEssentiaGenerator extends GT_MetaTileEntity_TooltipMultiBlockB if (this.getBaseMetaTileEntity().isServerSide()) { ItemStack tCurrentItem = aPlayer.inventory.getCurrentItem(); if (tCurrentItem != null - && tCurrentItem - .getItem() - .equals(ItemRefer.Essentia_Upgrade_Empty.get(1).getItem())) { + && tCurrentItem.getItem().equals(ItemRefer.Essentia_Upgrade_Empty.get(1).getItem())) { int tMeta = tCurrentItem.getItemDamage(); if ((mUpgrade & (1 << tMeta)) == 0 && tMeta != 0) { tCurrentItem.stackSize--; @@ -155,82 +156,39 @@ public class LargeEssentiaGenerator extends GT_MetaTileEntity_TooltipMultiBlockB 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", - " TCXCT ", - " TCCXCCT ", - "TCCCXCCCT", - "XXXXXXXXX", - "TCCCXCCCT", - " TCCXCCT ", - " TCXCT ", - "T TXT T" - } - })) + .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", " TCXCT ", " TCCXCCT ", "TCCCXCCCT", "XXXXXXXXX", + "TCCCXCCCT", " TCCXCCT ", " TCXCT ", "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)), - onElementPass( - 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)), - onElementPass( - x -> { - x.mStableValue += 10; - x.mTierLimit = Math.max(x.mTierLimit, 7); - }, - ofBlock(Loaders.essentiaCell, 3)))) + .addElement('C', ofBlock(Loaders.magicCasing, 0)).addElement('E', ofChain(onElementPass(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)), onElementPass(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', ofChain( - buildHatchAdder(LargeEssentiaGenerator.class) - .atLeast( - HatchElement.DynamoMulti.or(GT_HatchElement.Dynamo), - GT_HatchElement.Maintenance, - GT_HatchElement.InputHatch) - .casingIndex(1536) - .dot(1) - .build(), + buildHatchAdder(LargeEssentiaGenerator.class).atLeast( + HatchElement.DynamoMulti.or(GT_HatchElement.Dynamo), + GT_HatchElement.Maintenance, + GT_HatchElement.InputHatch).casingIndex(1536).dot(1).build(), ofBlock(Loaders.magicCasing, 0), ofTileAdder(LargeEssentiaGenerator::addEssentiaHatch, Loaders.magicCasing, 0))) .build(); @@ -520,17 +478,12 @@ public class LargeEssentiaGenerator extends GT_MetaTileEntity_TooltipMultiBlockB @Override protected GT_Multiblock_Tooltip_Builder createTooltip() { final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); - tt.addMachineType("Essentia Generator") - .addInfo("Controller block for the Large Essentia Generator") - .addInfo("Maybe some thaumaturages are upset by it. . .") - .addInfo("Transform essentia into energy!") + tt.addMachineType("Essentia Generator").addInfo("Controller block for the Large Essentia Generator") + .addInfo("Maybe some thaumaturages are upset by it. . .").addInfo("Transform essentia into energy!") .addInfo("The Diffusion Cell determines the highest hatch tier that the LEG can accept.") .addInfo("You can find more information about this generator in the Thaumonomicon.") - .addInfo("The structure is too complex!") - .addInfo(BLUE_PRINT_INFO) - .addSeparator() - .addMaintenanceHatch("Hint block with dot 1") - .addInputHatch("Hint block with dot 1") + .addInfo("The structure is too complex!").addInfo(BLUE_PRINT_INFO).addSeparator() + .addMaintenanceHatch("Hint block with dot 1").addInputHatch("Hint block with dot 1") .addDynamoHatch("Hint block with dot 1") .addOtherStructurePart("Essentia Input Hatch", "Hint block with dot 1") .toolTipFinisher("Good Generator"); @@ -539,29 +492,16 @@ 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) { + 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) - }; + 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)}; + return new ITexture[] { Textures.BlockIcons.getCasingTextureForId(1536) }; } public boolean isValidEssentia(Aspect aspect) { diff --git a/src/main/java/goodgenerator/blocks/tileEntity/LargeEssentiaSmeltery.java b/src/main/java/goodgenerator/blocks/tileEntity/LargeEssentiaSmeltery.java index 0c5b28b2f2..829c3d3fe3 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/LargeEssentiaSmeltery.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/LargeEssentiaSmeltery.java @@ -4,6 +4,25 @@ import static com.gtnewhorizon.structurelib.structure.StructureUtility.*; import static goodgenerator.util.DescTextLocalization.BLUE_PRINT_INFO; import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; +import java.util.ArrayList; +import java.util.Map; + +import net.minecraft.block.Block; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagList; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumChatFormatting; +import net.minecraft.world.World; +import net.minecraftforge.common.util.ForgeDirection; + +import thaumcraft.api.aspects.Aspect; +import thaumcraft.api.aspects.AspectList; +import thaumcraft.api.visnet.VisNetHandler; +import thaumcraft.common.config.ConfigBlocks; +import thaumcraft.common.lib.crafting.ThaumcraftCraftingManager; + import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_EnergyMulti; import com.github.technus.tectech.thing.metaTileEntity.multi.base.GT_MetaTileEntity_MultiblockBase_EM; import com.gtnewhorizon.structurelib.alignment.constructable.IConstructable; @@ -11,6 +30,7 @@ import com.gtnewhorizon.structurelib.alignment.constructable.ISurvivalConstructa 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.crossmod.LoadedList; import goodgenerator.loader.Loaders; @@ -25,34 +45,18 @@ import gregtech.api.metatileentity.implementations.*; import gregtech.api.objects.XSTR; import gregtech.api.render.TextureFactory; import gregtech.api.util.GT_Multiblock_Tooltip_Builder; -import java.util.ArrayList; -import java.util.Map; -import net.minecraft.block.Block; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumChatFormatting; -import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; -import thaumcraft.api.aspects.Aspect; -import thaumcraft.api.aspects.AspectList; -import thaumcraft.api.visnet.VisNetHandler; -import thaumcraft.common.config.ConfigBlocks; -import thaumcraft.common.lib.crafting.ThaumcraftCraftingManager; public class LargeEssentiaSmeltery extends GT_MetaTileEntity_TooltipMultiBlockBase_EM implements IConstructable, ISurvivalConstructable { - private static final IIconContainer textureFontOn = - new Textures.BlockIcons.CustomIcon("icons/LargeEssentiaSmeltery_On"); - private static final IIconContainer textureFontOn_Glow = - new Textures.BlockIcons.CustomIcon("icons/LargeEssentiaSmeltery_On_GLOW"); - private static final IIconContainer textureFontOff = - new Textures.BlockIcons.CustomIcon("icons/LargeEssentiaSmeltery_Off"); - private static final IIconContainer textureFontOff_Glow = - new Textures.BlockIcons.CustomIcon("icons/LargeEssentiaSmeltery_Off_GLOW"); + private static final IIconContainer textureFontOn = new Textures.BlockIcons.CustomIcon( + "icons/LargeEssentiaSmeltery_On"); + private static final IIconContainer textureFontOn_Glow = new Textures.BlockIcons.CustomIcon( + "icons/LargeEssentiaSmeltery_On_GLOW"); + private static final IIconContainer textureFontOff = new Textures.BlockIcons.CustomIcon( + "icons/LargeEssentiaSmeltery_Off"); + private static final IIconContainer textureFontOff_Glow = new Textures.BlockIcons.CustomIcon( + "icons/LargeEssentiaSmeltery_Off_GLOW"); private static final String STRUCTURE_PIECE_FIRST = "first"; private static final String STRUCTURE_PIECE_LATER = "later"; private static final String STRUCTURE_PIECE_LAST = "last"; @@ -117,8 +121,7 @@ public class LargeEssentiaSmeltery extends GT_MetaTileEntity_TooltipMultiBlockBa while (structureCheck_EM(STRUCTURE_PIECE_LATER, 2, 2, -len - 1)) len++; if (len > MAX_STRUCTURE_LENGTH - 1 || len < DEFAULT_STRUCTURE_LENGTH) return false; if (!structureCheck_EM(STRUCTURE_PIECE_LAST, 2, 2, -len - 1)) return false; - if (this.mCasing >= 24 - && this.mMaintenanceHatches.size() == 1 + if (this.mCasing >= 24 && this.mMaintenanceHatches.size() == 1 && this.mInputBusses.size() >= 1 && this.mEssentiaOutputHatches.size() >= 1) { this.mParallel = Math.floor(this.mParallel += 1 << this.pTier); @@ -132,16 +135,22 @@ public class LargeEssentiaSmeltery extends GT_MetaTileEntity_TooltipMultiBlockBa if (this.multiDefinition == null) { this.multiDefinition = StructureDefinition.<LargeEssentiaSmeltery>builder() .addShape( - "first", transpose(new String[][] {{" A "}, {" AAA "}, {"AA~AA"}, {" AAA "}, {" A "}})) + "first", + transpose( + new String[][] { { " A " }, { " AAA " }, { "AA~AA" }, { " AAA " }, { " A " } })) + .addShape( + "later", + transpose( + new String[][] { { " ABA " }, { "AECEA" }, { "D---D" }, { "AEFEA" }, { " AAA " } })) .addShape( - "later", transpose(new String[][] {{" ABA "}, {"AECEA"}, {"D---D"}, {"AEFEA"}, {" AAA "}})) - .addShape("last", transpose(new String[][] {{" A "}, {" AAA "}, {"AAAAA"}, {" AAA "}, {" A "}})) + "last", + transpose( + new String[][] { { " A " }, { " AAA " }, { "AAAAA" }, { " AAA " }, { " A " } })) .addElement('C', ofBlock(Loaders.essentiaFilterCasing, 0)) .addElement('D', ofBlock(ConfigBlocks.blockCosmeticOpaque, 2)) .addElement( 'F', - LoadedList.THAUMIC_BASES - ? ofBlock(Block.getBlockFromName("thaumicbases:advAlchFurnace"), 0) + LoadedList.THAUMIC_BASES ? ofBlock(Block.getBlockFromName("thaumicbases:advAlchFurnace"), 0) : ofBlock(ConfigBlocks.blockStoneDevice, 0)) .addElement( 'E', @@ -153,27 +162,21 @@ public class LargeEssentiaSmeltery extends GT_MetaTileEntity_TooltipMultiBlockBa .addElement( 'A', ofChain( - buildHatchAdder(LargeEssentiaSmeltery.class) - .atLeast( - GT_HatchElement.Maintenance, - GT_HatchElement.Energy, - GT_HatchElement.InputBus) - .casingIndex(CASING_INDEX) - .dot(1) - .build(), + buildHatchAdder(LargeEssentiaSmeltery.class).atLeast( + GT_HatchElement.Maintenance, + GT_HatchElement.Energy, + GT_HatchElement.InputBus).casingIndex(CASING_INDEX).dot(1).build(), ofTileAdder( LargeEssentiaSmeltery::addEssentiaOutputHatchToMachineList, Loaders.magicCasing, 0), onElementPass( - LargeEssentiaSmeltery::onCasingFound, ofBlock(Loaders.magicCasing, 0)))) + LargeEssentiaSmeltery::onCasingFound, + ofBlock(Loaders.magicCasing, 0)))) .addElement( 'B', - buildHatchAdder(LargeEssentiaSmeltery.class) - .atLeast(GT_HatchElement.Muffler) - .casingIndex(CASING_INDEX) - .dot(2) - .build()) + buildHatchAdder(LargeEssentiaSmeltery.class).atLeast(GT_HatchElement.Muffler) + .casingIndex(CASING_INDEX).dot(2).build()) .build(); } return this.multiDefinition; @@ -182,26 +185,17 @@ public class LargeEssentiaSmeltery extends GT_MetaTileEntity_TooltipMultiBlockBa @Override protected GT_Multiblock_Tooltip_Builder createTooltip() { final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); - tt.addMachineType("Essentia Smeltery") - .addInfo("Controller block for the Large Essentia Smeltery") - .addInfo("Necessary evil.") - .addInfo("Advanced Essentia smelting technology.") + tt.addMachineType("Essentia Smeltery").addInfo("Controller block for the Large Essentia Smeltery") + .addInfo("Necessary evil.").addInfo("Advanced Essentia smelting technology.") .addInfo("Max parallel dictated by structure size and Essentia Diffusion Cell tier") .addInfo("Energy Hatch tier: HV+") .addInfo("You can find more information about this machine in the Thaumonomicon.") - .addPollutionAmount(getPollutionPerSecond(null)) - .addInfo("The structure is too complex!") - .addInfo(BLUE_PRINT_INFO) - .addSeparator() - .addController("Front center") - .addCasingInfo("Magic Casing", 24) - .addMaintenanceHatch("Hint block with dot 1") - .addInputBus("Hint block with dot 1") - .addInputHatch("Hint block with dot 1") - .addEnergyHatch("Hint block with dot 1") + .addPollutionAmount(getPollutionPerSecond(null)).addInfo("The structure is too complex!") + .addInfo(BLUE_PRINT_INFO).addSeparator().addController("Front center").addCasingInfo("Magic Casing", 24) + .addMaintenanceHatch("Hint block with dot 1").addInputBus("Hint block with dot 1") + .addInputHatch("Hint block with dot 1").addEnergyHatch("Hint block with dot 1") .addOtherStructurePart("Essentia Output Hatch", "Hint block with dot 1") - .addMufflerHatch("Hint block with dot 2") - .toolTipFinisher("Good Generator"); + .addMufflerHatch("Hint block with dot 2").toolTipFinisher("Good Generator"); return tt; } @@ -213,36 +207,34 @@ public class LargeEssentiaSmeltery extends GT_MetaTileEntity_TooltipMultiBlockBa @Override public String[] getInfoData() { String[] info = super.getInfoData(); - info[8] = "Node Power: " + EnumChatFormatting.RED + this.nodePower + EnumChatFormatting.RESET - + " Purification Efficiency: " + EnumChatFormatting.AQUA + this.nodePurificationEfficiency + "%" - + EnumChatFormatting.RESET + " Speed Up: " + EnumChatFormatting.GRAY + this.nodeIncrease + "%" + info[8] = "Node Power: " + EnumChatFormatting.RED + + this.nodePower + + EnumChatFormatting.RESET + + " Purification Efficiency: " + + EnumChatFormatting.AQUA + + this.nodePurificationEfficiency + + "%" + + EnumChatFormatting.RESET + + " Speed Up: " + + EnumChatFormatting.GRAY + + this.nodeIncrease + + "%" + EnumChatFormatting.RESET; return info; } @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(CASING_INDEX), + if (aActive) return new ITexture[] { Textures.BlockIcons.getCasingTextureForId(CASING_INDEX), TextureFactory.of(textureFontOn), - TextureFactory.builder().addIcon(textureFontOn_Glow).glow().build() - }; - else - return new ITexture[] { - Textures.BlockIcons.getCasingTextureForId(CASING_INDEX), + TextureFactory.builder().addIcon(textureFontOn_Glow).glow().build() }; + else return new ITexture[] { Textures.BlockIcons.getCasingTextureForId(CASING_INDEX), TextureFactory.of(textureFontOff), - TextureFactory.builder().addIcon(textureFontOff_Glow).glow().build() - }; + TextureFactory.builder().addIcon(textureFontOff_Glow).glow().build() }; } - return new ITexture[] {Textures.BlockIcons.getCasingTextureForId(CASING_INDEX)}; + return new ITexture[] { Textures.BlockIcons.getCasingTextureForId(CASING_INDEX) }; } protected void onCasingFound() { @@ -292,7 +284,7 @@ public class LargeEssentiaSmeltery extends GT_MetaTileEntity_TooltipMultiBlockBa if (!isFullPower()) return false; ArrayList<ItemStack> tInputList = getStoredInputs(); - // ArrayList<FluidStack> tFluidList = getStoredFluids(); + // ArrayList<FluidStack> tFluidList = getStoredFluids(); if (tInputList.size() == 0) return false; @@ -351,8 +343,7 @@ public class LargeEssentiaSmeltery extends GT_MetaTileEntity_TooltipMultiBlockBa private void fillEssentiaOutputHatch() { for (EssentiaOutputHatch outputHatch : this.mEssentiaOutputHatches) { - for (Map.Entry<Aspect, Integer> entry : - this.mOutputAspects.copy().aspects.entrySet()) { + for (Map.Entry<Aspect, Integer> entry : this.mOutputAspects.copy().aspects.entrySet()) { Aspect aspect = entry.getKey(); int amount = entry.getValue(); this.mOutputAspects.remove(aspect, outputHatch.addEssentia(aspect, amount, null)); @@ -460,14 +451,14 @@ public class LargeEssentiaSmeltery extends GT_MetaTileEntity_TooltipMultiBlockBa if (xstr.nextInt(20) == 0) { if (xstr.nextInt(100) < Math.max(100 - this.nodePurificationEfficiency, 0)) { final World WORLD = this.getBaseMetaTileEntity().getWorld(); - GT_MetaTileEntity_Hatch_Muffler mufflerHatch = - this.mMufflerHatches.get(xstr.nextInt(this.mMufflerHatches.size())); + GT_MetaTileEntity_Hatch_Muffler mufflerHatch = this.mMufflerHatches + .get(xstr.nextInt(this.mMufflerHatches.size())); int x = mufflerHatch.getBaseMetaTileEntity().getXCoord(); int y = mufflerHatch.getBaseMetaTileEntity().getYCoord(); int z = mufflerHatch.getBaseMetaTileEntity().getZCoord(); - ForgeDirection facing = ForgeDirection.getOrientation( - mufflerHatch.getBaseMetaTileEntity().getFrontFacing()); + ForgeDirection facing = ForgeDirection + .getOrientation(mufflerHatch.getBaseMetaTileEntity().getFrontFacing()); switch (facing) { case SOUTH: z += 1; @@ -530,14 +521,41 @@ public class LargeEssentiaSmeltery extends GT_MetaTileEntity_TooltipMultiBlockBa if (mMachine) return -1; int built = 0; built += survivialBuildPiece( - STRUCTURE_PIECE_FIRST, stackSize, 2, 2, 0, elementBudget, source, actor, false, true); + STRUCTURE_PIECE_FIRST, + stackSize, + 2, + 2, + 0, + elementBudget, + source, + actor, + false, + true); int lenght = stackSize.stackSize + 2; if (lenght > MAX_CONFIGURABLE_LENGTH) lenght = MAX_CONFIGURABLE_LENGTH + 2; built += survivialBuildPiece( - STRUCTURE_PIECE_LAST, stackSize, 2, 2, lenght + 1, elementBudget - built, source, actor, false, true); + STRUCTURE_PIECE_LAST, + stackSize, + 2, + 2, + lenght + 1, + elementBudget - built, + source, + actor, + false, + true); while (lenght > 0) { built += survivialBuildPiece( - STRUCTURE_PIECE_LATER, stackSize, 2, 2, lenght, elementBudget - built, source, actor, false, true); + STRUCTURE_PIECE_LATER, + stackSize, + 2, + 2, + lenght, + elementBudget - built, + source, + actor, + false, + true); lenght--; } return built; diff --git a/src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer1.java b/src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer1.java index 5098c5c5ef..71f6600c15 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer1.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer1.java @@ -4,7 +4,12 @@ import static goodgenerator.util.DescTextLocalization.BLUE_PRINT_INFO; import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FUSION1; import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FUSION1_GLOW; +import net.minecraft.block.Block; +import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumChatFormatting; + import com.github.bartimaeusnek.bartworks.common.loaders.ItemRegistry; + import goodgenerator.blocks.tileEntity.base.LargeFusionComputer; import goodgenerator.loader.Loaders; import goodgenerator.util.DescTextLocalization; @@ -15,19 +20,12 @@ import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.render.TextureFactory; import gregtech.api.util.GT_Multiblock_Tooltip_Builder; -import net.minecraft.block.Block; -import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumChatFormatting; public class LargeFusionComputer1 extends LargeFusionComputer { private static final ITexture textureOverlay = TextureFactory.of( TextureFactory.builder().addIcon(OVERLAY_FUSION1).extFacing().build(), - TextureFactory.builder() - .addIcon(OVERLAY_FUSION1_GLOW) - .extFacing() - .glow() - .build()); + TextureFactory.builder().addIcon(OVERLAY_FUSION1_GLOW).extFacing().glow().build()); public LargeFusionComputer1(int id, String name, String nameRegional) { super(id, name, nameRegional); @@ -40,28 +38,26 @@ public class LargeFusionComputer1 extends LargeFusionComputer { @Override protected GT_Multiblock_Tooltip_Builder createTooltip() { final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); - tt.addMachineType("Fusion Reactor") - .addInfo("Millions of nuclear.") + tt.addMachineType("Fusion Reactor").addInfo("Millions of nuclear.") .addInfo("Controller block for the Compact Fusion Reactor MK-I Prototype.") .addInfo("131,072EU/t and 5M EU capacity per Energy Hatch") .addInfo("If the recipe has a startup cost greater than the") .addInfo("number of energy hatches * cap, you can't do it") .addInfo("Make sure the whole structure is built in the 3x3") - .addInfo("chuck area of the ring center (not controller).") - .addInfo("It can run 64x recipes at most.") - .addInfo("Support" + EnumChatFormatting.BLUE + " Tec" + EnumChatFormatting.DARK_BLUE + "Tech" - + EnumChatFormatting.GRAY + " Energy/Laser Hatches!") - .addInfo("The structure is too complex!") - .addInfo(BLUE_PRINT_INFO) - .addSeparator() - .addCasingInfo("LuV Machine Casing", 1664) - .addCasingInfo("Ameliorated Superconduct Coil", 560) + .addInfo("chuck area of the ring center (not controller).").addInfo("It can run 64x recipes at most.") + .addInfo( + "Support" + EnumChatFormatting.BLUE + + " Tec" + + EnumChatFormatting.DARK_BLUE + + "Tech" + + EnumChatFormatting.GRAY + + " Energy/Laser Hatches!") + .addInfo("The structure is too complex!").addInfo(BLUE_PRINT_INFO).addSeparator() + .addCasingInfo("LuV Machine Casing", 1664).addCasingInfo("Ameliorated Superconduct Coil", 560) .addCasingInfo("Naquadah Alloy Frame Boxes", 128) .addCasingInfo("Rhodium-Plated Palladium Reinforced Borosilicate Glass Block", 63) - .addEnergyHatch("1-32, Hint block with dot 3", 3) - .addInputHatch("2-16, Hint block with dot 1", 1) - .addOutputHatch("1-16, Hint block with dot 2", 2) - .addStructureInfo("ALL Hatches must be LuV or better") + .addEnergyHatch("1-32, Hint block with dot 3", 3).addInputHatch("2-16, Hint block with dot 1", 1) + .addOutputHatch("1-16, Hint block with dot 2", 2).addStructureInfo("ALL Hatches must be LuV or better") .toolTipFinisher("Good Generator"); return tt; } diff --git a/src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer2.java b/src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer2.java index 4893789367..e4d3553910 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer2.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer2.java @@ -4,7 +4,12 @@ import static goodgenerator.util.DescTextLocalization.BLUE_PRINT_INFO; import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FUSION2; import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FUSION2_GLOW; +import net.minecraft.block.Block; +import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumChatFormatting; + import com.github.bartimaeusnek.bartworks.common.loaders.ItemRegistry; + import goodgenerator.blocks.tileEntity.base.LargeFusionComputer; import goodgenerator.loader.Loaders; import goodgenerator.util.DescTextLocalization; @@ -15,19 +20,12 @@ import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.render.TextureFactory; import gregtech.api.util.GT_Multiblock_Tooltip_Builder; -import net.minecraft.block.Block; -import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumChatFormatting; public class LargeFusionComputer2 extends LargeFusionComputer { private static final ITexture textureOverlay = TextureFactory.of( TextureFactory.builder().addIcon(OVERLAY_FUSION2).extFacing().build(), - TextureFactory.builder() - .addIcon(OVERLAY_FUSION2_GLOW) - .extFacing() - .glow() - .build()); + TextureFactory.builder().addIcon(OVERLAY_FUSION2_GLOW).extFacing().glow().build()); public LargeFusionComputer2(int id, String name, String nameRegional) { super(id, name, nameRegional); @@ -40,29 +38,27 @@ public class LargeFusionComputer2 extends LargeFusionComputer { @Override protected GT_Multiblock_Tooltip_Builder createTooltip() { final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); - tt.addMachineType("Fusion Reactor") - .addInfo("Millions of nuclear.") + tt.addMachineType("Fusion Reactor").addInfo("Millions of nuclear.") .addInfo("Controller block for the Compact Fusion Reactor MK-II.") .addInfo("524,288EU/t and 10M EU capacity per Energy Hatch") .addInfo("If the recipe has a startup cost greater than the") .addInfo("number of energy hatches * cap, you can't do it") .addInfo("Make sure the whole structure is built in the 3x3") .addInfo("chuck area of the ring center (not controller).") - .addInfo("Startup < 160,000,000 EU: 128x Parallel") - .addInfo("Startup < 320,000,000 EU: 64x Parallel") - .addInfo("Support" + EnumChatFormatting.BLUE + " Tec" + EnumChatFormatting.DARK_BLUE + "Tech" - + EnumChatFormatting.GRAY + " Energy/Laser Hatches!") - .addInfo("The structure is too complex!") - .addInfo(BLUE_PRINT_INFO) - .addSeparator() - .addCasingInfo("Fusion Machine Casing", 1664) - .addCasingInfo("Compact Fusion Coil", 560) + .addInfo("Startup < 160,000,000 EU: 128x Parallel").addInfo("Startup < 320,000,000 EU: 64x Parallel") + .addInfo( + "Support" + EnumChatFormatting.BLUE + + " Tec" + + EnumChatFormatting.DARK_BLUE + + "Tech" + + EnumChatFormatting.GRAY + + " Energy/Laser Hatches!") + .addInfo("The structure is too complex!").addInfo(BLUE_PRINT_INFO).addSeparator() + .addCasingInfo("Fusion Machine Casing", 1664).addCasingInfo("Compact Fusion Coil", 560) .addCasingInfo("Duranium Frame Box", 128) .addCasingInfo("Iridium Reinforced Borosilicate Glass Block", 63) - .addEnergyHatch("1-32, Hint block with dot 3", 3) - .addInputHatch("2-16, Hint block with dot 1", 1) - .addOutputHatch("1-16, Hint block with dot 2", 2) - .addStructureInfo("ALL Hatches must be ZPM or better") + .addEnergyHatch("1-32, Hint block with dot 3", 3).addInputHatch("2-16, Hint block with dot 1", 1) + .addOutputHatch("1-16, Hint block with dot 2", 2).addStructureInfo("ALL Hatches must be ZPM or better") .toolTipFinisher("Good Generator"); return tt; } diff --git a/src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer3.java b/src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer3.java index 4833e4abca..ff85da2303 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer3.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer3.java @@ -4,7 +4,12 @@ import static goodgenerator.util.DescTextLocalization.BLUE_PRINT_INFO; import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FUSION3; import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FUSION3_GLOW; +import net.minecraft.block.Block; +import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumChatFormatting; + import com.github.bartimaeusnek.bartworks.common.loaders.ItemRegistry; + import goodgenerator.blocks.tileEntity.base.LargeFusionComputer; import goodgenerator.loader.Loaders; import goodgenerator.util.DescTextLocalization; @@ -15,19 +20,12 @@ import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.render.TextureFactory; import gregtech.api.util.GT_Multiblock_Tooltip_Builder; -import net.minecraft.block.Block; -import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumChatFormatting; public class LargeFusionComputer3 extends LargeFusionComputer { private static final ITexture textureOverlay = TextureFactory.of( TextureFactory.builder().addIcon(OVERLAY_FUSION3).extFacing().build(), - TextureFactory.builder() - .addIcon(OVERLAY_FUSION3_GLOW) - .extFacing() - .glow() - .build()); + TextureFactory.builder().addIcon(OVERLAY_FUSION3_GLOW).extFacing().glow().build()); public LargeFusionComputer3(int id, String name, String nameRegional) { super(id, name, nameRegional); @@ -40,30 +38,28 @@ public class LargeFusionComputer3 extends LargeFusionComputer { @Override protected GT_Multiblock_Tooltip_Builder createTooltip() { final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); - tt.addMachineType("Fusion Reactor") - .addInfo("Millions of nuclear.") + tt.addMachineType("Fusion Reactor").addInfo("Millions of nuclear.") .addInfo("Controller block for the Compact Fusion Reactor MK-III.") .addInfo("1,572,864EU/t and 20M EU capacity per Energy Hatch") .addInfo("If the recipe has a startup cost greater than the") .addInfo("number of energy hatches * cap, you can't do it") .addInfo("Make sure the whole structure is built in the 3x3") .addInfo("chuck area of the ring center (not controller).") - .addInfo("Startup < 160,000,000 EU: 192x Parallel") - .addInfo("Startup < 320,000,000 EU: 128x Parallel") + .addInfo("Startup < 160,000,000 EU: 192x Parallel").addInfo("Startup < 320,000,000 EU: 128x Parallel") .addInfo("Startup < 640,000,000 EU: 64x Parallel") - .addInfo("Support" + EnumChatFormatting.BLUE + " Tec" + EnumChatFormatting.DARK_BLUE + "Tech" - + EnumChatFormatting.GRAY + " Energy/Laser Hatches!") - .addInfo("The structure is too complex!") - .addInfo(BLUE_PRINT_INFO) - .addSeparator() - .addCasingInfo("Fusion Machine Casing MK II", 1664) - .addCasingInfo("Advanced Compact Fusion Coil", 560) + .addInfo( + "Support" + EnumChatFormatting.BLUE + + " Tec" + + EnumChatFormatting.DARK_BLUE + + "Tech" + + EnumChatFormatting.GRAY + + " Energy/Laser Hatches!") + .addInfo("The structure is too complex!").addInfo(BLUE_PRINT_INFO).addSeparator() + .addCasingInfo("Fusion Machine Casing MK II", 1664).addCasingInfo("Advanced Compact Fusion Coil", 560) .addCasingInfo("Neutronium Frame Box", 128) .addCasingInfo("Osmium Reinforced Borosilicate Glass Block", 63) - .addEnergyHatch("1-32, Hint block with dot 3", 3) - .addInputHatch("2-16, Hint block with dot 1", 1) - .addOutputHatch("1-16, Hint block with dot 2", 2) - .addStructureInfo("ALL Hatches must be UV or better") + .addEnergyHatch("1-32, Hint block with dot 3", 3).addInputHatch("2-16, Hint block with dot 1", 1) + .addOutputHatch("1-16, Hint block with dot 2", 2).addStructureInfo("ALL Hatches must be UV or better") .toolTipFinisher("Good Generator"); return tt; } diff --git a/src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer4.java b/src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer4.java index 40404a3c16..ca38e45940 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer4.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer4.java @@ -3,8 +3,15 @@ package goodgenerator.blocks.tileEntity; import static goodgenerator.util.DescTextLocalization.BLUE_PRINT_INFO; import static gregtech.api.enums.Textures.BlockIcons.MACHINE_CASING_FUSION_GLASS; +import java.lang.reflect.Field; + +import net.minecraft.block.Block; +import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumChatFormatting; + import com.github.bartimaeusnek.bartworks.common.loaders.ItemRegistry; import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_EnergyMulti; + import goodgenerator.blocks.tileEntity.base.LargeFusionComputerPP; import goodgenerator.loader.Loaders; import goodgenerator.util.DescTextLocalization; @@ -21,10 +28,6 @@ import gregtech.api.render.TextureFactory; import gregtech.api.util.GT_Multiblock_Tooltip_Builder; import gtPlusPlus.core.block.ModBlocks; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; -import java.lang.reflect.Field; -import net.minecraft.block.Block; -import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumChatFormatting; public class LargeFusionComputer4 extends LargeFusionComputerPP { @@ -43,32 +46,29 @@ public class LargeFusionComputer4 extends LargeFusionComputerPP { @Override protected GT_Multiblock_Tooltip_Builder createTooltip() { final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); - tt.addMachineType("Fusion Reactor") - .addInfo("Galaxy Collapse.") + tt.addMachineType("Fusion Reactor").addInfo("Galaxy Collapse.") .addInfo("Controller block for the Compact Fusion Reactor MK-IV Prototype.") .addInfo("33,554,432EU/t and 80M EU capacity per Energy Hatch") .addInfo("If the recipe has a startup cost greater than the") .addInfo("number of energy hatches * cap, you can't do it") .addInfo("Make sure the whole structure is built in the 3x3") - .addInfo("chuck area of the ring center (not controller).") - .addInfo("Performs 4/4 overclock.") - .addInfo("Startup < 160,000,000 EU: 256x Parallel") - .addInfo("Startup < 320,000,000 EU: 192x Parallel") - .addInfo("Startup < 640,000,000 EU: 128x Parallel") - .addInfo("Startup < 1,200,000,000 EU: 64x Parallel") - .addInfo("Support" + EnumChatFormatting.BLUE + " Tec" + EnumChatFormatting.DARK_BLUE + "Tech" - + EnumChatFormatting.GRAY + " Energy/Laser Hatches!") - .addInfo("The structure is too complex!") - .addInfo(BLUE_PRINT_INFO) - .addSeparator() + .addInfo("chuck area of the ring center (not controller).").addInfo("Performs 4/4 overclock.") + .addInfo("Startup < 160,000,000 EU: 256x Parallel").addInfo("Startup < 320,000,000 EU: 192x Parallel") + .addInfo("Startup < 640,000,000 EU: 128x Parallel").addInfo("Startup < 1,200,000,000 EU: 64x Parallel") + .addInfo( + "Support" + EnumChatFormatting.BLUE + + " Tec" + + EnumChatFormatting.DARK_BLUE + + "Tech" + + EnumChatFormatting.GRAY + + " Energy/Laser Hatches!") + .addInfo("The structure is too complex!").addInfo(BLUE_PRINT_INFO).addSeparator() .addCasingInfo("Fusion Machine Casing MK III", 1664) .addCasingInfo("Compact Fusion Coil MK-II Prototype", 560) .addCasingInfo("Infinity Catalyst Frame Box", 128) .addCasingInfo("Neutronium Reinforced Borosilicate Glass Block", 63) - .addEnergyHatch("1-32, Hint block with dot 3", 3) - .addInputHatch("2-16, Hint block with dot 1", 1) - .addOutputHatch("1-16, Hint block with dot 2", 2) - .addStructureInfo("ALL Hatches must be UHV or better") + .addEnergyHatch("1-32, Hint block with dot 3", 3).addInputHatch("2-16, Hint block with dot 1", 1) + .addOutputHatch("1-16, Hint block with dot 2", 2).addStructureInfo("ALL Hatches must be UHV or better") .toolTipFinisher("Good Generator"); return tt; } @@ -133,16 +133,10 @@ public class LargeFusionComputer4 extends LargeFusionComputerPP { @Override public ITexture getTextureOverlay() { - if (this.mMaxProgresstime > 0) - return TextureFactory.of(TextureFactory.builder() - .addIcon(TexturesGtBlock.Casing_Machine_Screen_3) - .extFacing() - .build()); - else - return TextureFactory.of(TextureFactory.builder() - .addIcon(TexturesGtBlock.Casing_Machine_Screen_1) - .extFacing() - .build()); + if (this.mMaxProgresstime > 0) return TextureFactory + .of(TextureFactory.builder().addIcon(TexturesGtBlock.Casing_Machine_Screen_3).extFacing().build()); + else return TextureFactory + .of(TextureFactory.builder().addIcon(TexturesGtBlock.Casing_Machine_Screen_1).extFacing().build()); } @Override @@ -199,28 +193,14 @@ public class LargeFusionComputer4 extends LargeFusionComputerPP { } @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) - return new ITexture[] { - TextureFactory.builder() - .addIcon(MACHINE_CASING_FUSION_GLASS) - .extFacing() - .build(), - getTextureOverlay() - }; - if (!aActive) return new ITexture[] {Textures.BlockIcons.getCasingTextureForId(52)}; - return new ITexture[] { - TextureFactory.builder() - .addIcon(TexturesGtBlock.TEXTURE_CASING_FUSION_CASING_ULTRA) - .extFacing() - .build() - }; + return new ITexture[] { TextureFactory.builder().addIcon(MACHINE_CASING_FUSION_GLASS).extFacing().build(), + getTextureOverlay() }; + if (!aActive) return new ITexture[] { Textures.BlockIcons.getCasingTextureForId(52) }; + return new ITexture[] { TextureFactory.builder().addIcon(TexturesGtBlock.TEXTURE_CASING_FUSION_CASING_ULTRA) + .extFacing().build() }; } @Override diff --git a/src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer5.java b/src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer5.java index 5057f6471f..c27270d13b 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer5.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer5.java @@ -3,8 +3,13 @@ package goodgenerator.blocks.tileEntity; import static goodgenerator.util.DescTextLocalization.BLUE_PRINT_INFO; import static gregtech.api.enums.Textures.BlockIcons.MACHINE_CASING_FUSION_GLASS; +import net.minecraft.block.Block; +import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumChatFormatting; + import com.github.bartimaeusnek.bartworks.common.loaders.ItemRegistry; import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_EnergyMulti; + import goodgenerator.blocks.tileEntity.base.LargeFusionComputerPP; import goodgenerator.loader.Loaders; import goodgenerator.util.DescTextLocalization; @@ -21,9 +26,6 @@ import gregtech.api.render.TextureFactory; import gregtech.api.util.GT_Multiblock_Tooltip_Builder; import gtPlusPlus.core.block.ModBlocks; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; -import net.minecraft.block.Block; -import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumChatFormatting; public class LargeFusionComputer5 extends LargeFusionComputerPP { @@ -38,33 +40,29 @@ public class LargeFusionComputer5 extends LargeFusionComputerPP { @Override protected GT_Multiblock_Tooltip_Builder createTooltip() { final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); - tt.addMachineType("Fusion Reactor") - .addInfo("Galaxy Collapse.") + tt.addMachineType("Fusion Reactor").addInfo("Galaxy Collapse.") .addInfo("Controller block for the Compact Fusion Reactor MK-V.") .addInfo("167,772,160EU/t and 320M EU capacity per Energy Hatch") .addInfo("If the recipe has a startup cost greater than the") .addInfo("number of energy hatches * cap, you can't do it") .addInfo("Make sure the whole structure is built in the 3x3") - .addInfo("chuck area of the ring center (not controller).") - .addInfo("Performs 4/4 overclock.") - .addInfo("Startup < 160,000,000 EU: 320x Parallel") - .addInfo("Startup < 320,000,000 EU: 256x Parallel") - .addInfo("Startup < 640,000,000 EU: 192x Parallel") - .addInfo("Startup < 1,200,000,000 EU: 128x Parallel") + .addInfo("chuck area of the ring center (not controller).").addInfo("Performs 4/4 overclock.") + .addInfo("Startup < 160,000,000 EU: 320x Parallel").addInfo("Startup < 320,000,000 EU: 256x Parallel") + .addInfo("Startup < 640,000,000 EU: 192x Parallel").addInfo("Startup < 1,200,000,000 EU: 128x Parallel") .addInfo("Startup < 2,000,000,000 EU: 64x Parallel") - .addInfo("Support" + EnumChatFormatting.BLUE + " Tec" + EnumChatFormatting.DARK_BLUE + "Tech" - + EnumChatFormatting.GRAY + " Energy/Laser Hatches!") - .addInfo("The structure is too complex!") - .addInfo(BLUE_PRINT_INFO) - .addSeparator() + .addInfo( + "Support" + EnumChatFormatting.BLUE + + " Tec" + + EnumChatFormatting.DARK_BLUE + + "Tech" + + EnumChatFormatting.GRAY + + " Energy/Laser Hatches!") + .addInfo("The structure is too complex!").addInfo(BLUE_PRINT_INFO).addSeparator() .addCasingInfo("Fusion Machine Casing MK IV", 1664) - .addCasingInfo("Compact Fusion Coil MK-II Finaltype", 560) - .addCasingInfo("Infinity Frame Box", 128) + .addCasingInfo("Compact Fusion Coil MK-II Finaltype", 560).addCasingInfo("Infinity Frame Box", 128) .addCasingInfo("Cosmic Neutronium Reinforced Borosilicate Glass Block", 63) - .addEnergyHatch("1-32, Hint block with dot 3", 3) - .addInputHatch("2-16, Hint block with dot 1", 1) - .addOutputHatch("1-16, Hint block with dot 2", 2) - .addStructureInfo("ALL Hatches must be UEV or better") + .addEnergyHatch("1-32, Hint block with dot 3", 3).addInputHatch("2-16, Hint block with dot 1", 1) + .addOutputHatch("1-16, Hint block with dot 2", 2).addStructureInfo("ALL Hatches must be UEV or better") .toolTipFinisher("Good Generator"); return tt; } @@ -116,16 +114,10 @@ public class LargeFusionComputer5 extends LargeFusionComputerPP { @Override public ITexture getTextureOverlay() { - if (this.mMaxProgresstime > 0) - return TextureFactory.of(TextureFactory.builder() - .addIcon(TexturesGtBlock.Casing_Machine_Screen_3) - .extFacing() - .build()); - else - return TextureFactory.of(TextureFactory.builder() - .addIcon(TexturesGtBlock.Casing_Machine_Screen_1) - .extFacing() - .build()); + if (this.mMaxProgresstime > 0) return TextureFactory + .of(TextureFactory.builder().addIcon(TexturesGtBlock.Casing_Machine_Screen_3).extFacing().build()); + else return TextureFactory + .of(TextureFactory.builder().addIcon(TexturesGtBlock.Casing_Machine_Screen_1).extFacing().build()); } @Override @@ -140,10 +132,8 @@ public class LargeFusionComputer5 extends LargeFusionComputerPP { @Override public int overclock(int mStartEnergy) { - return (mStartEnergy < 160000000) - ? 256 - : ((mStartEnergy < 320000000) - ? 64 + return (mStartEnergy < 160000000) ? 256 + : ((mStartEnergy < 320000000) ? 64 : ((mStartEnergy < 640000000) ? 16 : ((mStartEnergy < 1200000000) ? 4 : 1))); } @@ -187,28 +177,14 @@ public class LargeFusionComputer5 extends LargeFusionComputerPP { } @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) - return new ITexture[] { - TextureFactory.builder() - .addIcon(MACHINE_CASING_FUSION_GLASS) - .extFacing() - .build(), - getTextureOverlay() - }; - if (!aActive) return new ITexture[] {Textures.BlockIcons.getCasingTextureForId(52)}; - return new ITexture[] { - TextureFactory.builder() - .addIcon(TexturesGtBlock.TEXTURE_CASING_FUSION_CASING_ULTRA) - .extFacing() - .build() - }; + return new ITexture[] { TextureFactory.builder().addIcon(MACHINE_CASING_FUSION_GLASS).extFacing().build(), + getTextureOverlay() }; + if (!aActive) return new ITexture[] { Textures.BlockIcons.getCasingTextureForId(52) }; + return new ITexture[] { TextureFactory.builder().addIcon(TexturesGtBlock.TEXTURE_CASING_FUSION_CASING_ULTRA) + .extFacing().build() }; } @Override diff --git a/src/main/java/goodgenerator/blocks/tileEntity/MegaPlasmaTurbine.java b/src/main/java/goodgenerator/blocks/tileEntity/MegaPlasmaTurbine.java index 86f3e2ac31..364b030b26 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/MegaPlasmaTurbine.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/MegaPlasmaTurbine.java @@ -1,15 +1,18 @@ package goodgenerator.blocks.tileEntity; +import java.util.ArrayList; +import java.util.List; + +import net.minecraft.item.ItemStack; + import com.github.bartimaeusnek.crossmod.tectech.TecTechEnabledMulti; import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_EnergyMulti; import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_EnergyTunnel; import com.gtnewhorizon.structurelib.alignment.constructable.IConstructable; import com.gtnewhorizon.structurelib.structure.IStructureDefinition; + import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Energy; import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_LargeTurbine_Plasma; -import java.util.ArrayList; -import java.util.List; -import net.minecraft.item.ItemStack; public class MegaPlasmaTurbine extends GT_MetaTileEntity_LargeTurbine_Plasma implements TecTechEnabledMulti, IConstructable { diff --git a/src/main/java/goodgenerator/blocks/tileEntity/MultiNqGenerator.java b/src/main/java/goodgenerator/blocks/tileEntity/MultiNqGenerator.java index 1cfc589372..d2fd780a55 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/MultiNqGenerator.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/MultiNqGenerator.java @@ -5,6 +5,17 @@ import static goodgenerator.main.GG_Config_Loader.*; import static goodgenerator.util.DescTextLocalization.BLUE_PRINT_INFO; import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.EnumChatFormatting; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; + import com.github.bartimaeusnek.bartworks.util.Pair; import com.github.bartimaeusnek.crossmod.tectech.TecTechEnabledMulti; import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_DynamoMulti; @@ -15,6 +26,7 @@ import com.gtnewhorizon.structurelib.alignment.constructable.ISurvivalConstructa 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.items.MyMaterial; import goodgenerator.loader.Loaders; @@ -34,15 +46,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_Utility; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.EnumChatFormatting; -import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fluids.FluidStack; public class MultiNqGenerator extends GT_MetaTileEntity_TooltipMultiBlockBase_EM implements TecTechEnabledMulti, IConstructable, ISurvivalConstructable { @@ -112,35 +115,32 @@ public class MultiNqGenerator extends GT_MetaTileEntity_TooltipMultiBlockBase_EM @Override public IStructureDefinition<MultiNqGenerator> getStructure_EM() { if (multiDefinition == null) { - multiDefinition = StructureDefinition.<MultiNqGenerator>builder() - .addShape(mName, transpose(new String[][] { - {"AAAAAAA", "AAAAAAA", "AAAAAAA", "AAAAAAA", "AAAAAAA", "AAAAAAA", "AAAAAAA"}, - {"N N", " ", " CCC ", " CPC ", " CCC ", " ", "N N"}, - {"N N", " ", " CCC ", " CPC ", " CCC ", " ", "N N"}, - {"N N", " ", " CCC ", " CPC ", " CCC ", " ", "N N"}, - {"N N", " ", " CCC ", " CPC ", " CCC ", " ", "N N"}, - {"AAAAAAA", "A A", "A CCC A", "A CPC A", "A CCC A", "A A", "AAAAAAA"}, - {"ANNNNNA", "N N", "N CCC N", "N CPC N", "N CCC N", "N N", "ANNNNNA"}, - {"XXX~XXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX"}, - })) + multiDefinition = StructureDefinition.<MultiNqGenerator>builder().addShape( + mName, + transpose( + new String[][] { + { "AAAAAAA", "AAAAAAA", "AAAAAAA", "AAAAAAA", "AAAAAAA", "AAAAAAA", "AAAAAAA" }, + { "N N", " ", " CCC ", " CPC ", " CCC ", " ", "N N" }, + { "N N", " ", " CCC ", " CPC ", " CCC ", " ", "N N" }, + { "N N", " ", " CCC ", " CPC ", " CCC ", " ", "N N" }, + { "N N", " ", " CCC ", " CPC ", " CCC ", " ", "N N" }, + { "AAAAAAA", "A A", "A CCC A", "A CPC A", "A CCC A", "A A", "AAAAAAA" }, + { "ANNNNNA", "N N", "N CCC N", "N CPC N", "N CCC N", "N N", "ANNNNNA" }, { + "XXX~XXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", + "XXXXXXX" }, })) .addElement( 'X', ofChain( - buildHatchAdder(MultiNqGenerator.class) - .atLeast( - HatchElement.DynamoMulti.or(GT_HatchElement.Dynamo), - GT_HatchElement.InputHatch, - GT_HatchElement.OutputHatch, - GT_HatchElement.Maintenance) - .casingIndex(44) - .dot(1) - .build(), + buildHatchAdder(MultiNqGenerator.class).atLeast( + HatchElement.DynamoMulti.or(GT_HatchElement.Dynamo), + GT_HatchElement.InputHatch, + GT_HatchElement.OutputHatch, + GT_HatchElement.Maintenance).casingIndex(44).dot(1).build(), ofBlock(GregTech_API.sBlockCasings3, 12))) .addElement('A', ofBlock(GregTech_API.sBlockCasings3, 12)) .addElement('N', ofBlock(Loaders.radiationProtectionSteelFrame, 0)) .addElement('C', ofBlock(Loaders.MAR_Casing, 0)) - .addElement('P', ofBlock(GregTech_API.sBlockCasings2, 15)) - .build(); + .addElement('P', ofBlock(GregTech_API.sBlockCasings2, 15)).build(); } return multiDefinition; } @@ -163,9 +163,9 @@ public class MultiNqGenerator extends GT_MetaTileEntity_TooltipMultiBlockBase_EM this.times = aNBT.getInteger("mTimes"); this.leftEnergy = aNBT.getLong("mLeftEnergy"); this.basicOutput = aNBT.getInteger("mbasicOutput"); - if (FluidRegistry.getFluid(aNBT.getString("mLockedFluidName")) != null) - this.lockedFluid = new FluidStack( - FluidRegistry.getFluid(aNBT.getString("mLockedFluidName")), aNBT.getInteger("mLockedFluidAmount")); + if (FluidRegistry.getFluid(aNBT.getString("mLockedFluidName")) != null) this.lockedFluid = new FluidStack( + FluidRegistry.getFluid(aNBT.getString("mLockedFluidName")), + aNBT.getInteger("mLockedFluidAmount")); else this.lockedFluid = null; super.loadNBTData(aNBT); } @@ -200,15 +200,16 @@ public class MultiNqGenerator extends GT_MetaTileEntity_TooltipMultiBlockBase_EM } } - GT_Recipe tRecipe = MyRecipeAdder.instance.NqGFuels.findRecipe( - this.getBaseMetaTileEntity(), true, 1 << 30, tFluids.toArray(new FluidStack[0])); + GT_Recipe tRecipe = MyRecipeAdder.instance.NqGFuels + .findRecipe(this.getBaseMetaTileEntity(), true, 1 << 30, tFluids.toArray(new FluidStack[0])); if (tRecipe != null) { Pair<FluidStack, Integer> excitedInfo = getExcited(tFluids.toArray(new FluidStack[0]), false); int pall = excitedInfo == null ? 1 : excitedInfo.getValue(); if (consumeFuel( CrackRecipeAdder.copyFluidWithAmount(tRecipe.mFluidInputs[0], pall), tFluids.toArray(new FluidStack[0]))) { - mOutputFluids = new FluidStack[] {CrackRecipeAdder.copyFluidWithAmount(tRecipe.mFluidOutputs[0], pall)}; + mOutputFluids = new FluidStack[] { + CrackRecipeAdder.copyFluidWithAmount(tRecipe.mFluidOutputs[0], pall) }; basicOutput = tRecipe.mSpecialValue; times = pall; lockedFluid = excitedInfo == null ? null : excitedInfo.getKey(); @@ -233,8 +234,7 @@ public class MultiNqGenerator extends GT_MetaTileEntity_TooltipMultiBlockBase_EM this.trueOutput = 0; return true; } - if (getCoolant(input, true) != null) - eff = getCoolant(input, false).getValue(); + if (getCoolant(input, true) != null) eff = getCoolant(input, false).getValue(); if (consumeFuel(lockedFluid, input)) time = times; this.mEUt = basicOutput * eff * time / 100; this.trueEff = eff; @@ -248,11 +248,18 @@ public class MultiNqGenerator extends GT_MetaTileEntity_TooltipMultiBlockBase_EM @Override public String[] getInfoData() { String[] info = super.getInfoData(); - info[4] = "Probably makes: " + EnumChatFormatting.RED + Math.abs(this.trueOutput) + EnumChatFormatting.RESET + info[4] = "Probably makes: " + EnumChatFormatting.RED + + Math.abs(this.trueOutput) + + EnumChatFormatting.RESET + " EU/t"; - info[6] = "Problems: " + EnumChatFormatting.RED + (this.getIdealStatus() - this.getRepairStatus()) - + EnumChatFormatting.RESET + " Efficiency: " + EnumChatFormatting.YELLOW + trueEff - + EnumChatFormatting.RESET + " %"; + info[6] = "Problems: " + EnumChatFormatting.RED + + (this.getIdealStatus() - this.getRepairStatus()) + + EnumChatFormatting.RESET + + " Efficiency: " + + EnumChatFormatting.YELLOW + + trueEff + + EnumChatFormatting.RESET + + " %"; return info; } @@ -294,42 +301,39 @@ public class MultiNqGenerator extends GT_MetaTileEntity_TooltipMultiBlockBase_EM } public void addAutoEnergy(long outputPower) { - if (this.eDynamoMulti.size() > 0) - for (GT_MetaTileEntity_Hatch tHatch : this.eDynamoMulti) { - long voltage = tHatch.maxEUOutput(); - long power = voltage * tHatch.maxAmperesOut(); - long outputAmperes; - if (outputPower > power) doExplosion(8 * GT_Utility.getTier(power)); - if (outputPower >= voltage) { - leftEnergy += outputPower; - outputAmperes = leftEnergy / voltage; - leftEnergy -= outputAmperes * voltage; - addEnergyOutput_EM(voltage, outputAmperes); - } else { - addEnergyOutput_EM(outputPower, 1); - } + if (this.eDynamoMulti.size() > 0) for (GT_MetaTileEntity_Hatch tHatch : this.eDynamoMulti) { + long voltage = tHatch.maxEUOutput(); + long power = voltage * tHatch.maxAmperesOut(); + long outputAmperes; + if (outputPower > power) doExplosion(8 * GT_Utility.getTier(power)); + if (outputPower >= voltage) { + leftEnergy += outputPower; + outputAmperes = leftEnergy / voltage; + leftEnergy -= outputAmperes * voltage; + addEnergyOutput_EM(voltage, outputAmperes); + } else { + addEnergyOutput_EM(outputPower, 1); } - if (this.mDynamoHatches.size() > 0) - for (GT_MetaTileEntity_Hatch tHatch : this.mDynamoHatches) { - long voltage = tHatch.maxEUOutput(); - long power = voltage * tHatch.maxAmperesOut(); - long outputAmperes; - if (outputPower > power) doExplosion(8 * GT_Utility.getTier(power)); - if (outputPower >= voltage) { - leftEnergy += outputPower; - outputAmperes = leftEnergy / voltage; - leftEnergy -= outputAmperes * voltage; - addEnergyOutput_EM(voltage, outputAmperes); - } else { - addEnergyOutput_EM(outputPower, 1); - } + } + if (this.mDynamoHatches.size() > 0) for (GT_MetaTileEntity_Hatch tHatch : this.mDynamoHatches) { + long voltage = tHatch.maxEUOutput(); + long power = voltage * tHatch.maxAmperesOut(); + long outputAmperes; + if (outputPower > power) doExplosion(8 * GT_Utility.getTier(power)); + if (outputPower >= voltage) { + leftEnergy += outputPower; + outputAmperes = leftEnergy / voltage; + leftEnergy -= outputAmperes * voltage; + addEnergyOutput_EM(voltage, outputAmperes); + } else { + addEnergyOutput_EM(outputPower, 1); } + } } @Override public boolean checkMachine_EM(IGregTechTileEntity aBaseMetaTileEntity, ItemStack aStack) { - return structureCheck_EM(mName, 3, 7, 0) - && mMaintenanceHatches.size() == 1 + return structureCheck_EM(mName, 3, 7, 0) && mMaintenanceHatches.size() == 1 && mDynamoHatches.size() + eDynamoMulti.size() == 1; } @@ -361,64 +365,54 @@ public class MultiNqGenerator extends GT_MetaTileEntity_TooltipMultiBlockBase_EM @Override protected GT_Multiblock_Tooltip_Builder createTooltip() { final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); - tt.addMachineType("Naquadah Reactor") - .addInfo("Controller block for the Naquadah Reactor") - .addInfo("Environmental Friendly!") - .addInfo("Generate power with the High-energy liquid.") - .addInfo(String.format( - "Consume liquid air %d L/s to keep running, otherwise" + EnumChatFormatting.YELLOW - + " it will void your fuel" + EnumChatFormatting.GRAY + ".", - LiquidAirConsumptionPerSecond)) + tt.addMachineType("Naquadah Reactor").addInfo("Controller block for the Naquadah Reactor") + .addInfo("Environmental Friendly!").addInfo("Generate power with the High-energy liquid.") + .addInfo( + String.format( + "Consume liquid air %d L/s to keep running, otherwise" + EnumChatFormatting.YELLOW + + " it will void your fuel" + + EnumChatFormatting.GRAY + + ".", + LiquidAirConsumptionPerSecond)) .addInfo("Input liquid nuclear fuel or liquid naquadah fuel.") - .addInfo("The reactor will explode when there are more than" + EnumChatFormatting.RED + " ONE" - + EnumChatFormatting.GRAY + " types of fuel in the hatch!") + .addInfo( + "The reactor will explode when there are more than" + EnumChatFormatting.RED + + " ONE" + + EnumChatFormatting.GRAY + + " types of fuel in the hatch!") .addInfo("Consume coolant 1000 L/s to increase the efficiency:") - .addInfo(String.format( - "IC2 Coolant %d%%, Super Coolant %d%%, Cryotheum %d%%", - CoolantEfficiency[2], CoolantEfficiency[1], CoolantEfficiency[0])) + .addInfo( + String.format( + "IC2 Coolant %d%%, Super Coolant %d%%, Cryotheum %d%%", + CoolantEfficiency[2], + CoolantEfficiency[1], + CoolantEfficiency[0])) .addInfo("Consume excited liquid to increase the output power:") .addInfo(String.format("molten caesium | %dx power | 180 L/s ", ExcitedLiquidCoe[3])) .addInfo(String.format("molten uranium-235 | %dx power | 180 L/s", ExcitedLiquidCoe[2])) .addInfo(String.format("molten naquadah | %dx power | 20 L/s", ExcitedLiquidCoe[1])) .addInfo(String.format("molten Atomic Separation Catalyst | %dx power | 20 L/s", ExcitedLiquidCoe[0])) - .addInfo("The structure is too complex!") - .addInfo(BLUE_PRINT_INFO) - .addSeparator() - .beginStructureBlock(7, 8, 7, true) - .addController("Front bottom") - .addDynamoHatch("Any bottom layer casing, only accept ONE!") - .addInputHatch("Any bottom layer casing") - .addOutputHatch("Any bottom layer casing") - .addMaintenanceHatch("Any bottom layer casing") + .addInfo("The structure is too complex!").addInfo(BLUE_PRINT_INFO).addSeparator() + .beginStructureBlock(7, 8, 7, true).addController("Front bottom") + .addDynamoHatch("Any bottom layer casing, only accept ONE!").addInputHatch("Any bottom layer casing") + .addOutputHatch("Any bottom layer casing").addMaintenanceHatch("Any bottom layer casing") .toolTipFinisher("Good Generator"); return tt; } @Override @SuppressWarnings("ALL") - 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(44), + if (aActive) return new ITexture[] { Textures.BlockIcons.getCasingTextureForId(44), new GT_RenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_FRONT_ACTIVE), - TextureFactory.builder() - .addIcon(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_FRONT_ACTIVE_GLOW) - .glow() - .build() - }; - return new ITexture[] { - Textures.BlockIcons.getCasingTextureForId(44), - new GT_RenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_FRONT) - }; + TextureFactory.builder().addIcon(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_FRONT_ACTIVE_GLOW) + .glow().build() }; + return new ITexture[] { Textures.BlockIcons.getCasingTextureForId(44), + new GT_RenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_FRONT) }; } - return new ITexture[] {Textures.BlockIcons.getCasingTextureForId(44)}; + return new ITexture[] { Textures.BlockIcons.getCasingTextureForId(44) }; } @Override diff --git a/src/main/java/goodgenerator/blocks/tileEntity/NeutronActivator.java b/src/main/java/goodgenerator/blocks/tileEntity/NeutronActivator.java index 41e715b65d..72b2a7db52 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/NeutronActivator.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/NeutronActivator.java @@ -5,6 +5,16 @@ import static goodgenerator.util.DescTextLocalization.BLUE_PRINT_INFO; import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; import static gregtech.api.util.GT_StructureUtility.ofFrame; +import java.util.*; + +import net.minecraft.block.Block; +import net.minecraft.entity.player.EntityPlayerMP; +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 com.gtnewhorizon.structurelib.alignment.constructable.IConstructable; import com.gtnewhorizon.structurelib.alignment.constructable.ISurvivalConstructable; import com.gtnewhorizon.structurelib.structure.IItemSource; @@ -14,6 +24,7 @@ import com.gtnewhorizons.modularui.common.widget.DynamicPositionedColumn; import com.gtnewhorizons.modularui.common.widget.FakeSyncWidget; import com.gtnewhorizons.modularui.common.widget.SlotWidget; import com.gtnewhorizons.modularui.common.widget.TextWidget; + import goodgenerator.blocks.tileEntity.GTMetaTileEntity.NeutronAccelerator; import goodgenerator.blocks.tileEntity.GTMetaTileEntity.NeutronSensor; import goodgenerator.blocks.tileEntity.base.GT_MetaTileEntity_TooltipMultiBlockBase_EM; @@ -36,14 +47,6 @@ import gregtech.api.objects.XSTR; import gregtech.api.render.TextureFactory; import gregtech.api.util.*; import ic2.core.Ic2Items; -import java.util.*; -import net.minecraft.block.Block; -import net.minecraft.entity.player.EntityPlayerMP; -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; public class NeutronActivator extends GT_MetaTileEntity_TooltipMultiBlockBase_EM implements IConstructable, ISurvivalConstructable { @@ -57,12 +60,12 @@ public class NeutronActivator extends GT_MetaTileEntity_TooltipMultiBlockBase_EM final XSTR R = new XSTR(); private static final IIconContainer textureFontOn = new Textures.BlockIcons.CustomIcon("icons/NeutronActivator_On"); - private static final IIconContainer textureFontOn_Glow = - new Textures.BlockIcons.CustomIcon("icons/NeutronActivator_On_GLOW"); - private static final IIconContainer textureFontOff = - new Textures.BlockIcons.CustomIcon("icons/NeutronActivator_Off"); - private static final IIconContainer textureFontOff_Glow = - new Textures.BlockIcons.CustomIcon("icons/NeutronActivator_Off_GLOW"); + private static final IIconContainer textureFontOn_Glow = new Textures.BlockIcons.CustomIcon( + "icons/NeutronActivator_On_GLOW"); + private static final IIconContainer textureFontOff = new Textures.BlockIcons.CustomIcon( + "icons/NeutronActivator_Off"); + private static final IIconContainer textureFontOff_Glow = new Textures.BlockIcons.CustomIcon( + "icons/NeutronActivator_Off_GLOW"); protected final String NA_BOTTOM = mName + "buttom"; protected final String NA_MID = mName + "mid"; @@ -126,7 +129,7 @@ public class NeutronActivator extends GT_MetaTileEntity_TooltipMultiBlockBase_EM this.mOutputItems = recipe.mOutputs; } else { this.mOutputFluids = null; - this.mOutputItems = new ItemStack[] {ItemRefer.Radioactive_Waste.get(4)}; + this.mOutputItems = new ItemStack[] { ItemRefer.Radioactive_Waste.get(4) }; } return true; } @@ -164,8 +167,7 @@ public class NeutronActivator extends GT_MetaTileEntity_TooltipMultiBlockBase_EM protected GT_Multiblock_Tooltip_Builder createTooltip() { final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); - tt.addMachineType("Neutron Activator") - .addInfo("Controller block for the Neutron Activator") + tt.addMachineType("Neutron Activator").addInfo("Controller block for the Neutron Activator") .addInfo("Superluminal-velocity Motion.") .addInfo("The minimum height of the Speeding Pipe Casing is 4.") .addInfo("Per extra Speeding Pipe Casing will give time discount.") @@ -174,22 +176,19 @@ public class NeutronActivator extends GT_MetaTileEntity_TooltipMultiBlockBase_EM .addInfo("It will output correct products with Specific Neutron Kinetic Energy.") .addInfo("Otherwise it will output trash.") .addInfo("The Neutron Kinetic Energy will decrease 72KeV/s when no Neutron Accelerator is running.") - .addInfo("It will explode when the Neutron Kinetic Energy is over" + EnumChatFormatting.RED + " 1200MeV" - + EnumChatFormatting.GRAY + ".") + .addInfo( + "It will explode when the Neutron Kinetic Energy is over" + EnumChatFormatting.RED + + " 1200MeV" + + EnumChatFormatting.GRAY + + ".") .addInfo("Inputting Graphite/Beryllium dust can reduce 10MeV per dust immediately.") - .addInfo("The structure is too complex!") - .addInfo(BLUE_PRINT_INFO) - .addSeparator() - .addController("Front bottom") - .addInputHatch("Hint block with dot 1") - .addInputBus("Hint block with dot 1") - .addOutputHatch("Hint block with dot 2") - .addOutputBus("Hint block with dot 2") - .addMaintenanceHatch("Hint block with dot 2") + .addInfo("The structure is too complex!").addInfo(BLUE_PRINT_INFO).addSeparator() + .addController("Front bottom").addInputHatch("Hint block with dot 1") + .addInputBus("Hint block with dot 1").addOutputHatch("Hint block with dot 2") + .addOutputBus("Hint block with dot 2").addMaintenanceHatch("Hint block with dot 2") .addOtherStructurePart("Neutron Accelerator", "Hint block with dot 2") .addOtherStructurePart("Neutron Sensor", "Hint block with dot 2") - .addCasingInfo("Clean Stainless Steel Machine Casing", 7) - .toolTipFinisher("Good Generator"); + .addCasingInfo("Clean Stainless Steel Machine Casing", 7).toolTipFinisher("Good Generator"); return tt; } @@ -197,41 +196,36 @@ public class NeutronActivator extends GT_MetaTileEntity_TooltipMultiBlockBase_EM public IStructureDefinition<NeutronActivator> getStructure_EM() { if (multiDefinition == null) { multiDefinition = StructureDefinition.<NeutronActivator>builder() - .addShape(NA_TOP, transpose(new String[][] {{"CCCCC", "CDDDC", "CDDDC", "CDDDC", "CCCCC"}})) - .addShape(NA_MID, transpose(new String[][] {{"F F", " GGG ", " GPG ", " GGG ", "F F"}})) - .addShape(NA_BOTTOM, transpose(new String[][] {{"XX~XX", "XDDDX", "XDDDX", "XDDDX", "XXXXX"}})) + .addShape(NA_TOP, transpose(new String[][] { { "CCCCC", "CDDDC", "CDDDC", "CDDDC", "CCCCC" } })) + .addShape(NA_MID, transpose(new String[][] { { "F F", " GGG ", " GPG ", " GGG ", "F F" } })) + .addShape(NA_BOTTOM, transpose(new String[][] { { "XX~XX", "XDDDX", "XDDDX", "XDDDX", "XXXXX" } })) .addElement( 'C', ofChain( - buildHatchAdder(NeutronActivator.class) - .atLeast( - GT_HatchElement.InputHatch, - GT_HatchElement.InputBus, - GT_HatchElement.Maintenance) - .casingIndex(49) - .dot(1) - .build(), + buildHatchAdder(NeutronActivator.class).atLeast( + GT_HatchElement.InputHatch, + GT_HatchElement.InputBus, + GT_HatchElement.Maintenance).casingIndex(49).dot(1).build(), onElementPass( - NeutronActivator::onCasingFound, ofBlock(GregTech_API.sBlockCasings4, 1)))) - .addElement('D', ofBlock(GregTech_API.sBlockCasings2, 6)) - .addElement('F', ofFrame(Materials.Steel)) + NeutronActivator::onCasingFound, + ofBlock(GregTech_API.sBlockCasings4, 1)))) + .addElement('D', ofBlock(GregTech_API.sBlockCasings2, 6)).addElement('F', ofFrame(Materials.Steel)) .addElement('G', ofBlock(Block.getBlockFromItem(Ic2Items.reinforcedGlass.getItem()), 0)) - .addElement('P', ofBlock(Loaders.speedingPipe, 0)) + .addElement( + 'P', + ofBlock(Loaders.speedingPipe, 0)) .addElement( 'X', ofChain( - buildHatchAdder(NeutronActivator.class) - .atLeast( - GT_HatchElement.OutputHatch, - GT_HatchElement.OutputBus, - GT_HatchElement.Maintenance, - NeutronHatchElement.NeutronAccelerator, - NeutronHatchElement.NeutronSensor) - .casingIndex(49) - .dot(2) - .build(), + buildHatchAdder(NeutronActivator.class).atLeast( + GT_HatchElement.OutputHatch, + GT_HatchElement.OutputBus, + GT_HatchElement.Maintenance, + NeutronHatchElement.NeutronAccelerator, + NeutronHatchElement.NeutronSensor).casingIndex(49).dot(2).build(), onElementPass( - NeutronActivator::onCasingFound, ofBlock(GregTech_API.sBlockCasings4, 1)))) + NeutronActivator::onCasingFound, + ofBlock(GregTech_API.sBlockCasings4, 1)))) .build(); } return multiDefinition; @@ -299,8 +293,7 @@ public class NeutronActivator extends GT_MetaTileEntity_TooltipMultiBlockBase_EM if (tHatch.getBaseMetaTileEntity().isActive() && this.getRepairStatus() == this.getIdealStatus()) { anyWorking = true; this.eV += Math.max( - (R.nextInt(tHatch.getMaxEUConsume() + 1) + tHatch.getMaxEUConsume()) - * 10 + (R.nextInt(tHatch.getMaxEUConsume() + 1) + tHatch.getMaxEUConsume()) * 10 * Math.pow(0.95, height - 4), 10); } @@ -326,7 +319,7 @@ public class NeutronActivator extends GT_MetaTileEntity_TooltipMultiBlockBase_EM if (mProgresstime < mMaxProgresstime && (eV > mCeil || eV < mFloor)) { this.mOutputFluids = null; - this.mOutputItems = new ItemStack[] {ItemRefer.Radioactive_Waste.get(4)}; + this.mOutputItems = new ItemStack[] { ItemRefer.Radioactive_Waste.get(4) }; } endRecipeProcessing(); } @@ -374,47 +367,43 @@ public class NeutronActivator extends GT_MetaTileEntity_TooltipMultiBlockBase_EM boolean anyWorking = false; for (NeutronAccelerator tHatch : mNeutronAccelerator) { if (tHatch.getBaseMetaTileEntity().isActive()) { - currentNKEInput += (R.nextInt(tHatch.getMaxEUConsume() + 1) + tHatch.getMaxEUConsume()) - * 10 + currentNKEInput += (R.nextInt(tHatch.getMaxEUConsume() + 1) + tHatch.getMaxEUConsume()) * 10 * Math.pow(0.95, height - 4); anyWorking = true; } } if (!anyWorking) currentNKEInput = -72000; - return new String[] { - "Progress:", - EnumChatFormatting.GREEN + Integer.toString(this.mProgresstime / 20) + EnumChatFormatting.RESET + " s / " - + EnumChatFormatting.YELLOW + this.mMaxProgresstime / 20 + EnumChatFormatting.RESET + " s", - "Current Neutron Kinetic Energy Input: " + EnumChatFormatting.GREEN - + GT_Utility.formatNumbers(currentNKEInput) + EnumChatFormatting.RESET + "eV", - StatCollector.translateToLocal("scanner.info.NA") + " " + EnumChatFormatting.LIGHT_PURPLE - + GT_Utility.formatNumbers(getCurrentNeutronKineticEnergy()) + EnumChatFormatting.RESET + "eV" - }; + return new String[] { "Progress:", + EnumChatFormatting.GREEN + Integer.toString(this.mProgresstime / 20) + + EnumChatFormatting.RESET + + " s / " + + EnumChatFormatting.YELLOW + + this.mMaxProgresstime / 20 + + EnumChatFormatting.RESET + + " s", + "Current Neutron Kinetic Energy Input: " + EnumChatFormatting.GREEN + + GT_Utility.formatNumbers(currentNKEInput) + + EnumChatFormatting.RESET + + "eV", + StatCollector.translateToLocal("scanner.info.NA") + " " + + EnumChatFormatting.LIGHT_PURPLE + + GT_Utility.formatNumbers(getCurrentNeutronKineticEnergy()) + + EnumChatFormatting.RESET + + "eV" }; } @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(49), - TextureFactory.of(textureFontOn), - TextureFactory.builder().addIcon(textureFontOn_Glow).glow().build() - }; - else - return new ITexture[] { - Textures.BlockIcons.getCasingTextureForId(49), + return new ITexture[] { Textures.BlockIcons.getCasingTextureForId(49), TextureFactory.of(textureFontOn), + TextureFactory.builder().addIcon(textureFontOn_Glow).glow().build() }; + else return new ITexture[] { Textures.BlockIcons.getCasingTextureForId(49), TextureFactory.of(textureFontOff), - TextureFactory.builder().addIcon(textureFontOff_Glow).glow().build() - }; + TextureFactory.builder().addIcon(textureFontOff_Glow).glow().build() }; } - return new ITexture[] {Textures.BlockIcons.getCasingTextureForId(49)}; + return new ITexture[] { Textures.BlockIcons.getCasingTextureForId(49) }; } @Override @@ -425,10 +414,28 @@ public class NeutronActivator extends GT_MetaTileEntity_TooltipMultiBlockBase_EM built += survivialBuildPiece(NA_BOTTOM, stackSize, 2, 0, 0, elementBudget, source, actor, false, true); int heights = stackSize.stackSize + 3; built += survivialBuildPiece( - NA_TOP, stackSize, 2, heights + 1, 0, elementBudget - built, source, actor, false, true); + NA_TOP, + stackSize, + 2, + heights + 1, + 0, + elementBudget - built, + source, + actor, + false, + true); while (heights > 0) { built += survivialBuildPiece( - NA_MID, stackSize, 2, heights, 0, elementBudget - built, source, actor, false, true); + NA_MID, + stackSize, + 2, + heights, + 0, + elementBudget - built, + source, + actor, + false, + true); heights--; } return built; @@ -443,12 +450,13 @@ public class NeutronActivator extends GT_MetaTileEntity_TooltipMultiBlockBase_EM super.drawTexts(screenElements, inventorySlot); screenElements - .widget(new TextWidget(StatCollector.translateToLocal("gui.NeutronActivator.0")) - .setDefaultColor(COLOR_TEXT_WHITE.get())) - .widget(TextWidget.dynamicString(() -> processNumber(eV) + "eV") - .setSynced(false) - .setDefaultColor(COLOR_TEXT_WHITE.get()) - .setEnabled(widget -> getBaseMetaTileEntity().getErrorDisplayID() == 0)) + .widget( + new TextWidget(StatCollector.translateToLocal("gui.NeutronActivator.0")) + .setDefaultColor(COLOR_TEXT_WHITE.get())) + .widget( + TextWidget.dynamicString(() -> processNumber(eV) + "eV").setSynced(false) + .setDefaultColor(COLOR_TEXT_WHITE.get()) + .setEnabled(widget -> getBaseMetaTileEntity().getErrorDisplayID() == 0)) .widget(new FakeSyncWidget.IntegerSyncer(() -> eV, val -> eV = val)); } @@ -466,18 +474,22 @@ public class NeutronActivator extends GT_MetaTileEntity_TooltipMultiBlockBase_EM } private enum NeutronHatchElement implements IHatchElement<NeutronActivator> { + NeutronSensor(NeutronActivator::addAcceleratorAndSensor, NeutronSensor.class) { + @Override public long count(NeutronActivator t) { return t.mNeutronSensor.size(); } }, NeutronAccelerator(NeutronActivator::addAcceleratorAndSensor, NeutronAccelerator.class) { + @Override public long count(NeutronActivator t) { return t.mNeutronAccelerator.size(); } }; + private final List<Class<? extends IMetaTileEntity>> mteClasses; private final IGT_HatchAdder<NeutronActivator> adder; diff --git a/src/main/java/goodgenerator/blocks/tileEntity/PreciseAssembler.java b/src/main/java/goodgenerator/blocks/tileEntity/PreciseAssembler.java index 7e2f9efbd1..c493efe263 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/PreciseAssembler.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/PreciseAssembler.java @@ -7,6 +7,18 @@ import static goodgenerator.util.DescTextLocalization.BLUE_PRINT_INFO; import static gregtech.api.enums.GT_HatchElement.*; import static gregtech.api.util.GT_StructureUtility.ofFrame; +import java.util.ArrayList; +import java.util.stream.Collectors; +import java.util.stream.IntStream; + +import net.minecraft.block.Block; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.StatCollector; +import net.minecraftforge.fluids.FluidStack; + import com.github.bartimaeusnek.bartworks.util.Pair; import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_EnergyMulti; import com.gtnewhorizon.structurelib.alignment.constructable.IConstructable; @@ -15,6 +27,7 @@ import com.gtnewhorizon.structurelib.structure.IItemSource; import com.gtnewhorizon.structurelib.structure.IStructureDefinition; import com.gtnewhorizon.structurelib.structure.StructureDefinition; import com.gtnewhorizon.structurelib.structure.StructureUtility; + import goodgenerator.blocks.tileEntity.base.GT_MetaTileEntity_LongPowerUsageBase; import goodgenerator.loader.Loaders; import goodgenerator.util.DescTextLocalization; @@ -35,26 +48,16 @@ import gregtech.api.util.GT_Multiblock_Tooltip_Builder; import gregtech.api.util.GT_Recipe; import gregtech.api.util.GT_Utility; import ic2.core.Ic2Items; -import java.util.ArrayList; -import java.util.stream.Collectors; -import java.util.stream.IntStream; -import net.minecraft.block.Block; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.StatCollector; -import net.minecraftforge.fluids.FluidStack; public class PreciseAssembler extends GT_MetaTileEntity_LongPowerUsageBase<PreciseAssembler> implements IConstructable, ISurvivalConstructable { private static final IIconContainer textureFontOn = new Textures.BlockIcons.CustomIcon("iconsets/OVERLAY_QTANK"); - private static final IIconContainer textureFontOn_Glow = - new Textures.BlockIcons.CustomIcon("iconsets/OVERLAY_QTANK_GLOW"); + private static final IIconContainer textureFontOn_Glow = new Textures.BlockIcons.CustomIcon( + "iconsets/OVERLAY_QTANK_GLOW"); private static final IIconContainer textureFontOff = new Textures.BlockIcons.CustomIcon("iconsets/OVERLAY_QCHEST"); - private static final IIconContainer textureFontOff_Glow = - new Textures.BlockIcons.CustomIcon("iconsets/OVERLAY_QCHEST_GLOW"); + private static final IIconContainer textureFontOff_Glow = new Textures.BlockIcons.CustomIcon( + "iconsets/OVERLAY_QCHEST_GLOW"); protected IStructureDefinition<PreciseAssembler> multiDefinition = null; protected int casingAmount; @@ -75,14 +78,14 @@ public class PreciseAssembler extends GT_MetaTileEntity_LongPowerUsageBase<Preci @Override public IStructureDefinition<PreciseAssembler> getStructureDefinition() { if (multiDefinition == null) { - multiDefinition = StructureDefinition.<PreciseAssembler>builder() - .addShape(mName, transpose(new String[][] { - {"CCCCCCCCC", "CCCCCCCCC", "CCCCCCCCC", "CCCCCCCCC", "CCCCCCCCC"}, - {"F F", "CGGGGGGGC", "C-------C", "CGGGGGGGC", "F F"}, - {"F F", "CGGGGGGGC", "C-------C", "CGGGGGGGC", "F F"}, - {"F F", "CGGGGGGGC", "C-------C", "CGGGGGGGC", "F F"}, - {"CCCC~CCCC", "CMMMMMMMC", "CMMMMMMMC", "CMMMMMMMC", "CCCCCCCCC"} - })) + multiDefinition = StructureDefinition.<PreciseAssembler>builder().addShape( + mName, + transpose( + new String[][] { { "CCCCCCCCC", "CCCCCCCCC", "CCCCCCCCC", "CCCCCCCCC", "CCCCCCCCC" }, + { "F F", "CGGGGGGGC", "C-------C", "CGGGGGGGC", "F F" }, + { "F F", "CGGGGGGGC", "C-------C", "CGGGGGGGC", "F F" }, + { "F F", "CGGGGGGGC", "C-------C", "CGGGGGGGC", "F F" }, + { "CCCC~CCCC", "CMMMMMMMC", "CMMMMMMMC", "CMMMMMMMC", "CCCCCCCCC" } })) .addElement( 'C', GT_HatchElementBuilder.<PreciseAssembler>builder() @@ -94,20 +97,19 @@ public class PreciseAssembler extends GT_MetaTileEntity_LongPowerUsageBase<Preci Maintenance, Muffler, ExoticEnergy.or(Energy)) - .adder(PreciseAssembler::addToPAssList) - .casingIndex(1539) - .dot(1) - .buildAndChain(onElementPass( - x -> x.casingAmount++, - StructureUtility.ofBlocksTiered( - (block, meta) -> block == Loaders.preciseUnitCasing ? meta : -2, - IntStream.range(0, 3) - .mapToObj(meta -> org.apache.commons.lang3.tuple.Pair.of( - Loaders.preciseUnitCasing, meta)) - .collect(Collectors.toList()), - -1, - PreciseAssembler::setCasingTier, - PreciseAssembler::getCasingTier)))) + .adder(PreciseAssembler::addToPAssList).casingIndex(1539).dot(1).buildAndChain( + onElementPass( + x -> x.casingAmount++, + StructureUtility.ofBlocksTiered( + (block, meta) -> block == Loaders.preciseUnitCasing ? meta + : -2, + IntStream.range(0, 3).mapToObj( + meta -> org.apache.commons.lang3.tuple.Pair + .of(Loaders.preciseUnitCasing, meta)) + .collect(Collectors.toList()), + -1, + PreciseAssembler::setCasingTier, + PreciseAssembler::getCasingTier)))) .addElement('F', ofFrame(Materials.TungstenSteel)) .addElement('G', ofBlock(Block.getBlockFromItem(Ic2Items.reinforcedGlass.getItem()), 0)) .addElement( @@ -115,8 +117,9 @@ public class PreciseAssembler extends GT_MetaTileEntity_LongPowerUsageBase<Preci StructureUtility.ofBlocksTiered( (block, meta) -> block == GregTech_API.sBlockCasings1 ? meta : -2, IntStream.range(0, 10) - .mapToObj(meta -> org.apache.commons.lang3.tuple.Pair.of( - GregTech_API.sBlockCasings1, meta)) + .mapToObj( + meta -> org.apache.commons.lang3.tuple.Pair + .of(GregTech_API.sBlockCasings1, meta)) .collect(Collectors.toList()), -1, PreciseAssembler::setMachineTier, @@ -198,14 +201,13 @@ public class PreciseAssembler extends GT_MetaTileEntity_LongPowerUsageBase<Preci if (this.mode == 0) { for (GT_MetaTileEntity_Hatch_InputBus bus : mInputBusses) { if (!isValidMetaTileEntity(bus)) continue; - this.lastRecipe = getRecipeMap() - .findRecipe( - this.getBaseMetaTileEntity(), - this.lastRecipe, - false, - Math.min(getMachineVoltageLimit(), getRealVoltage()), - inputFluids, - getStoredItemFromHatch(bus)); + this.lastRecipe = getRecipeMap().findRecipe( + this.getBaseMetaTileEntity(), + this.lastRecipe, + false, + Math.min(getMachineVoltageLimit(), getRealVoltage()), + inputFluids, + getStoredItemFromHatch(bus)); if (this.lastRecipe != null && this.lastRecipe.mSpecialValue <= (casingTier + 1)) { this.mEfficiency = (10000 - (this.getIdealStatus() - this.getRepairStatus()) * 1000); this.mEfficiencyIncrease = 10000; @@ -222,20 +224,22 @@ public class PreciseAssembler extends GT_MetaTileEntity_LongPowerUsageBase<Preci } else { for (GT_MetaTileEntity_Hatch_InputBus bus : mInputBusses) { if (!isValidMetaTileEntity(bus) || getStoredItemFromHatch(bus).length < 1) continue; - this.lastRecipe = getRecipeMap() - .findRecipe( - this.getBaseMetaTileEntity(), - this.lastRecipe, - false, - Math.min(getMachineVoltageLimit(), getRealVoltage()), - inputFluids, - getStoredItemFromHatch(bus)); + this.lastRecipe = getRecipeMap().findRecipe( + this.getBaseMetaTileEntity(), + this.lastRecipe, + false, + Math.min(getMachineVoltageLimit(), getRealVoltage()), + inputFluids, + getStoredItemFromHatch(bus)); if (this.lastRecipe != null) { this.mEfficiency = (10000 - (this.getIdealStatus() - this.getRepairStatus()) * 1000); this.mEfficiencyIncrease = 10000; long fullInput = getRealVoltage(); - int pall = handleParallelRecipe(this.lastRecipe, inputFluids, getStoredItemFromHatch(bus), (int) - Math.min((long) Math.pow(2, 4 + (casingTier + 1)), fullInput / this.lastRecipe.mEUt)); + int pall = handleParallelRecipe( + this.lastRecipe, + inputFluids, + getStoredItemFromHatch(bus), + (int) Math.min((long) Math.pow(2, 4 + (casingTier + 1)), fullInput / this.lastRecipe.mEUt)); if (pall <= 0) continue; Pair<ArrayList<FluidStack>, ArrayList<ItemStack>> Outputs = getMultiOutput(this.lastRecipe, pall); mOutputItems = Outputs.getValue().toArray(new ItemStack[0]); @@ -307,8 +311,7 @@ public class PreciseAssembler extends GT_MetaTileEntity_LongPowerUsageBase<Preci reUpdate(1539 + casingTier); } getBaseMetaTileEntity().sendBlockEvent(GregTechTileClientEvents.CHANGE_CUSTOM_DATA, getUpdateData()); - return casingAmount >= 42 - && machineTier >= 0 + return casingAmount >= 42 && machineTier >= 0 && casingTier >= 0 && mMaintenanceHatches.size() == 1 && !mMufflerHatches.isEmpty(); @@ -319,31 +322,18 @@ public class PreciseAssembler extends GT_MetaTileEntity_LongPowerUsageBase<Preci @Override protected GT_Multiblock_Tooltip_Builder createTooltip() { final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); - tt.addMachineType("Precise Assembler/Assembler") - .addInfo("Controller block for the Precise Assembler") - .addInfo("The error is no more than 7nm.") - .addInfo("Can assemble precise component in Precise Mode.") - .addInfo("Can work like a normal assembler in Normal Mode.") - .addInfo("Use screwdriver to change mode.") + tt.addMachineType("Precise Assembler/Assembler").addInfo("Controller block for the Precise Assembler") + .addInfo("The error is no more than 7nm.").addInfo("Can assemble precise component in Precise Mode.") + .addInfo("Can work like a normal assembler in Normal Mode.").addInfo("Use screwdriver to change mode.") .addInfo("Machine Casing and Energy Hatch limits the voltage tier the machine can work on.") .addInfo("UHV Machine Casing will unlock all voltage, but you still need good Energy Hatch.") .addInfo("Precise Electronic Unit Casing won't limit recipe in Normal Mode.") - .addInfo("But gives more parallel with more advanced one.") - .addInfo("It is 100% faster in Normal Mode.") - .addInfo("MK-I = 32x, MK-II = 64x, MK-III = 128x") - .addPollutionAmount(getPollutionPerSecond(null)) - .addInfo("The structure is too complex!") - .addInfo(BLUE_PRINT_INFO) - .addSeparator() - .addController("Front bottom") - .addInputHatch("Any Casing") - .addInputBus("Any Casing") - .addOutputHatch("Any Casing") - .addOutputBus("Any Casing") - .addEnergyHatch("Any Casing") - .addMufflerHatch("Any Casing") - .addMaintenanceHatch("Any Casing") - .toolTipFinisher("Good Generator"); + .addInfo("But gives more parallel with more advanced one.").addInfo("It is 100% faster in Normal Mode.") + .addInfo("MK-I = 32x, MK-II = 64x, MK-III = 128x").addPollutionAmount(getPollutionPerSecond(null)) + .addInfo("The structure is too complex!").addInfo(BLUE_PRINT_INFO).addSeparator() + .addController("Front bottom").addInputHatch("Any Casing").addInputBus("Any Casing") + .addOutputHatch("Any Casing").addOutputBus("Any Casing").addEnergyHatch("Any Casing") + .addMufflerHatch("Any Casing").addMaintenanceHatch("Any Casing").toolTipFinisher("Good Generator"); return tt; } @@ -444,27 +434,16 @@ public class PreciseAssembler extends GT_MetaTileEntity_LongPowerUsageBase<Preci } @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) { int t = Math.max(getCasingTier(), 0); if (aSide == aFacing) { - if (aActive) - return new ITexture[] { - Textures.BlockIcons.getCasingTextureForId(1539 + t), + if (aActive) return new ITexture[] { Textures.BlockIcons.getCasingTextureForId(1539 + t), TextureFactory.of(textureFontOn), - TextureFactory.builder().addIcon(textureFontOn_Glow).glow().build() - }; - else - return new ITexture[] { - Textures.BlockIcons.getCasingTextureForId(1539 + t), + TextureFactory.builder().addIcon(textureFontOn_Glow).glow().build() }; + else return new ITexture[] { Textures.BlockIcons.getCasingTextureForId(1539 + t), TextureFactory.of(textureFontOff), - TextureFactory.builder().addIcon(textureFontOff_Glow).glow().build() - }; - } else return new ITexture[] {Textures.BlockIcons.getCasingTextureForId(1539 + t)}; + TextureFactory.builder().addIcon(textureFontOff_Glow).glow().build() }; + } else return new ITexture[] { Textures.BlockIcons.getCasingTextureForId(1539 + t) }; } } diff --git a/src/main/java/goodgenerator/blocks/tileEntity/SupercriticalFluidTurbine.java b/src/main/java/goodgenerator/blocks/tileEntity/SupercriticalFluidTurbine.java index a1fddba696..b28f1617d0 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/SupercriticalFluidTurbine.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/SupercriticalFluidTurbine.java @@ -1,5 +1,14 @@ package goodgenerator.blocks.tileEntity; +import java.util.ArrayList; + +import net.minecraft.block.Block; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; + import goodgenerator.blocks.tileEntity.base.GT_MetaTileEntity_LargeTurbineBase; import goodgenerator.loader.Loaders; import gregtech.api.enums.Textures; @@ -12,13 +21,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 java.util.ArrayList; -import net.minecraft.block.Block; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fluids.FluidStack; public class SupercriticalFluidTurbine extends GT_MetaTileEntity_LargeTurbineBase { @@ -54,8 +56,8 @@ public class SupercriticalFluidTurbine extends GT_MetaTileEntity_LargeTurbineBas int tEU = 0; int totalFlow = 0; // Byproducts are based on actual flow int flow = 0; - int remainingFlow = GT_Utility.safeInt((long) (aOptFlow - * 1.25f)); // Allowed to use up to 125% of optimal flow. Variable required outside of loop for + int remainingFlow = GT_Utility.safeInt((long) (aOptFlow * 1.25f)); // Allowed to use up to 125% of optimal flow. + // Variable required outside of loop for // multi-hatch scenarios. this.realOptFlow = aOptFlow; @@ -97,8 +99,7 @@ public class SupercriticalFluidTurbine extends GT_MetaTileEntity_LargeTurbineBas looseFit ^= true; GT_Utility.sendChatToPlayer( aPlayer, - looseFit - ? trans("500", "Fitting: Loose - More Flow") + looseFit ? trans("500", "Fitting: Loose - More Flow") : trans("501", "Fitting: Tight - More Efficiency")); } } @@ -145,23 +146,16 @@ public class SupercriticalFluidTurbine extends GT_MetaTileEntity_LargeTurbineBas @Override protected GT_Multiblock_Tooltip_Builder createTooltip() { final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); - tt.addMachineType("Supercritical Steam Turbine") - .addInfo("Controller block for Supercritical Fluid Turbine") + tt.addMachineType("Supercritical Steam Turbine").addInfo("Controller block for Supercritical Fluid Turbine") .addInfo("Needs a Turbine, place inside controller") .addInfo("Use Supercritical Steam to generate power.") - .addInfo("Outputs Steam as well as producing power") - .addInfo("1L Supercritical Steam = 100 EU") + .addInfo("Outputs Steam as well as producing power").addInfo("1L Supercritical Steam = 100 EU") .addInfo("Extreme Heated Steam will cause more damage to the turbine.") .addInfo("Power output depends on turbine and fitting") - .addInfo("Use screwdriver to adjust fitting of turbine") - .addSeparator() - .beginStructureBlock(3, 3, 4, true) - .addController("Front center") - .addCasingInfo("SC Turbine Casing", 24) - .addDynamoHatch("Back center", 1) - .addMaintenanceHatch("Side centered", 2) - .addInputHatch("Supercritical Fluid, Side centered", 2) - .toolTipFinisher("Good Generator"); + .addInfo("Use screwdriver to adjust fitting of turbine").addSeparator() + .beginStructureBlock(3, 3, 4, true).addController("Front center").addCasingInfo("SC Turbine Casing", 24) + .addDynamoHatch("Back center", 1).addMaintenanceHatch("Side centered", 2) + .addInputHatch("Supercritical Fluid, Side centered", 2).toolTipFinisher("Good Generator"); return tt; } @@ -171,20 +165,12 @@ public class SupercriticalFluidTurbine extends GT_MetaTileEntity_LargeTurbineBas } @Override - public ITexture[] getTexture( - IGregTechTileEntity aBaseMetaTileEntity, - byte aSide, - byte aFacing, - byte aColorIndex, - boolean aActive, - boolean aRedstone) { - return new ITexture[] { - Textures.BlockIcons.getCasingTextureForId(1538), - aFacing == aSide - ? (aActive - ? TextureFactory.of(turbineOn) - : hasTurbine() ? TextureFactory.of(turbineOff) : TextureFactory.of(turbineEmpty)) - : Textures.BlockIcons.getCasingTextureForId(1538) - }; + public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, + boolean aActive, boolean aRedstone) { + return new ITexture[] { Textures.BlockIcons.getCasingTextureForId(1538), + aFacing == aSide + ? (aActive ? TextureFactory.of(turbineOn) + : hasTurbine() ? TextureFactory.of(turbineOff) : TextureFactory.of(turbineEmpty)) + : Textures.BlockIcons.getCasingTextureForId(1538) }; } } diff --git a/src/main/java/goodgenerator/blocks/tileEntity/UniversalChemicalFuelEngine.java b/src/main/java/goodgenerator/blocks/tileEntity/UniversalChemicalFuelEngine.java index a5b3dd4158..ff2c4266ec 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/UniversalChemicalFuelEngine.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/UniversalChemicalFuelEngine.java @@ -6,12 +6,23 @@ import static goodgenerator.util.DescTextLocalization.BLUE_PRINT_INFO; import static gregtech.api.enums.Textures.BlockIcons.*; import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; + +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumChatFormatting; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; + import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_DynamoMulti; 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.crossmod.LoadedList; import goodgenerator.loader.Loaders; @@ -27,14 +38,6 @@ import gregtech.api.util.GTPP_Recipe; import gregtech.api.util.GT_Multiblock_Tooltip_Builder; import gregtech.api.util.GT_Recipe; import gregtech.api.util.GT_Utility; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumChatFormatting; -import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fluids.FluidStack; public class UniversalChemicalFuelEngine extends GT_MetaTileEntity_TooltipMultiBlockBase_EM implements IConstructable, ISurvivalConstructable { @@ -115,47 +118,38 @@ public class UniversalChemicalFuelEngine extends GT_MetaTileEntity_TooltipMultiB @Override public IStructureDefinition<UniversalChemicalFuelEngine> getStructure_EM() { if (multiDefinition == null) { - multiDefinition = StructureDefinition.<UniversalChemicalFuelEngine>builder() - .addShape(mName, transpose(new String[][] { - {"TTTTT", "TTMMT", "TTMMT", "TTMMT", "TTMMT", "TTMMT", "TTMMT", "TTMMT", "TTTTT"}, - {"TTTTT", "SPCCI-", "SPCCI-", "SPCCI-", "SPCCI-", "SPCCI-", "SPCCI-", "SPCCI-", "TTTTT"}, - {"TT~TT", "SPGGI-", "SPGGI-", "SPGGI-", "SPGGI-", "SPGGI-", "SPGGI-", "SPGGI-", "TTETT"}, - {"TTWTT", "TTTTT", "TTTTT", "TTTTT", "TTTTT", "TTTTT", "TTTTT", "TTTTT", "TTTTT"} - })) + multiDefinition = StructureDefinition.<UniversalChemicalFuelEngine>builder().addShape( + mName, + transpose( + new String[][] { + { "TTTTT", "TTMMT", "TTMMT", "TTMMT", "TTMMT", "TTMMT", "TTMMT", "TTMMT", "TTTTT" }, + { "TTTTT", "SPCCI-", "SPCCI-", "SPCCI-", "SPCCI-", "SPCCI-", "SPCCI-", "SPCCI-", + "TTTTT" }, + { "TT~TT", "SPGGI-", "SPGGI-", "SPGGI-", "SPGGI-", "SPGGI-", "SPGGI-", "SPGGI-", + "TTETT" }, + { "TTWTT", "TTTTT", "TTTTT", "TTTTT", "TTTTT", "TTTTT", "TTTTT", "TTTTT", + "TTTTT" } })) .addElement('T', ofBlock(GregTech_API.sBlockCasings4, 2)) .addElement( 'W', - buildHatchAdder(UniversalChemicalFuelEngine.class) - .atLeast(GT_HatchElement.Maintenance) - .casingIndex(50) - .dot(1) - .build()) + buildHatchAdder(UniversalChemicalFuelEngine.class).atLeast(GT_HatchElement.Maintenance) + .casingIndex(50).dot(1).build()) .addElement( 'M', - buildHatchAdder(UniversalChemicalFuelEngine.class) - .atLeast(GT_HatchElement.Muffler) - .casingIndex(50) - .dot(2) - .build()) + buildHatchAdder(UniversalChemicalFuelEngine.class).atLeast(GT_HatchElement.Muffler) + .casingIndex(50).dot(2).build()) .addElement( 'S', - buildHatchAdder(UniversalChemicalFuelEngine.class) - .atLeast(GT_HatchElement.InputHatch) - .casingIndex(50) - .dot(3) - .build()) + buildHatchAdder(UniversalChemicalFuelEngine.class).atLeast(GT_HatchElement.InputHatch) + .casingIndex(50).dot(3).build()) .addElement( 'E', - buildHatchAdder(UniversalChemicalFuelEngine.class) - .atLeast(GT_HatchElement.Dynamo) - .casingIndex(50) - .dot(4) - .build()) + buildHatchAdder(UniversalChemicalFuelEngine.class).atLeast(GT_HatchElement.Dynamo) + .casingIndex(50).dot(4).build()) .addElement('P', ofBlock(GregTech_API.sBlockCasings2, 14)) .addElement('C', ofBlock(Loaders.titaniumPlatedCylinder, 0)) .addElement('G', ofBlock(GregTech_API.sBlockCasings2, 4)) - .addElement('I', ofBlock(GregTech_API.sBlockCasings4, 13)) - .build(); + .addElement('I', ofBlock(GregTech_API.sBlockCasings4, 13)).build(); } return multiDefinition; } @@ -188,26 +182,23 @@ public class UniversalChemicalFuelEngine extends GT_MetaTileEntity_TooltipMultiB @Override protected GT_Multiblock_Tooltip_Builder createTooltip() { final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); - tt.addMachineType("Chemical Engine") - .addInfo("Controller block for the Chemical Engine") - .addInfo("BURNING BURNING BURNING") - .addInfo("Use combustible liquid to generate power.") + tt.addMachineType("Chemical Engine").addInfo("Controller block for the Chemical Engine") + .addInfo("BURNING BURNING BURNING").addInfo("Use combustible liquid to generate power.") .addInfo("You need to supply Combustion Promoter to keep it running.") .addInfo("This engine will consume all the fuel and combustion promoter in the hatch every second.") .addInfo("The efficiency is determined by the proportion of Combustion Promoter to fuel.") .addInfo("The proportion is bigger, and the efficiency will be higher.") .addInfo("It creates sqrt(Current Output Power) pollution every second") - .addInfo("If you forget to supply Combustion Promoter, this engine will swallow all the fuel " - + EnumChatFormatting.YELLOW + "without outputting energy" + EnumChatFormatting.GRAY + ".") - .addInfo("The efficiency is up to 150%.") - .addInfo("The structure is too complex!") - .addInfo(BLUE_PRINT_INFO) - .addSeparator() - .beginStructureBlock(5, 4, 9, false) - .addMaintenanceHatch("Hint block with dot 1") - .addMufflerHatch("Hint block with dot 2") - .addInputHatch("Hint block with dot 3") - .addDynamoHatch("Hint block with dot 4") + .addInfo( + "If you forget to supply Combustion Promoter, this engine will swallow all the fuel " + + EnumChatFormatting.YELLOW + + "without outputting energy" + + EnumChatFormatting.GRAY + + ".") + .addInfo("The efficiency is up to 150%.").addInfo("The structure is too complex!") + .addInfo(BLUE_PRINT_INFO).addSeparator().beginStructureBlock(5, 4, 9, false) + .addMaintenanceHatch("Hint block with dot 1").addMufflerHatch("Hint block with dot 2") + .addInputHatch("Hint block with dot 3").addDynamoHatch("Hint block with dot 4") .toolTipFinisher("Good Generator"); return tt; } @@ -292,9 +283,14 @@ public class UniversalChemicalFuelEngine extends GT_MetaTileEntity_TooltipMultiB public String[] getInfoData() { String[] info = super.getInfoData(); info[4] = "Probably makes: " + EnumChatFormatting.RED + this.lEUt + EnumChatFormatting.RESET + " EU/t"; - info[6] = "Problems: " + EnumChatFormatting.RED + (this.getIdealStatus() - this.getRepairStatus()) - + EnumChatFormatting.RESET + " Efficiency: " + EnumChatFormatting.YELLOW + tEff / 100D - + EnumChatFormatting.RESET + " %"; + info[6] = "Problems: " + EnumChatFormatting.RED + + (this.getIdealStatus() - this.getRepairStatus()) + + EnumChatFormatting.RESET + + " Efficiency: " + + EnumChatFormatting.YELLOW + + tEff / 100D + + EnumChatFormatting.RESET + + " %"; return info; } @@ -303,15 +299,13 @@ public class UniversalChemicalFuelEngine extends GT_MetaTileEntity_TooltipMultiB if (!mDynamoHatches.isEmpty()) { GT_MetaTileEntity_Hatch_Dynamo tHatch = mDynamoHatches.get(0); if (tHatch.maxEUOutput() * tHatch.maxAmperesOut() >= exEU) { - tHatch.setEUVar(Math.min( - tHatch.maxEUStore(), tHatch.getBaseMetaTileEntity().getStoredEU() + exEU)); + tHatch.setEUVar(Math.min(tHatch.maxEUStore(), tHatch.getBaseMetaTileEntity().getStoredEU() + exEU)); } else tHatch.doExplosion(tHatch.maxEUOutput()); } if (!eDynamoMulti.isEmpty()) { GT_MetaTileEntity_Hatch_DynamoMulti tHatch = eDynamoMulti.get(0); if (tHatch.maxEUOutput() * tHatch.maxAmperesOut() >= exEU) { - tHatch.setEUVar(Math.min( - tHatch.maxEUStore(), tHatch.getBaseMetaTileEntity().getStoredEU() + exEU)); + tHatch.setEUVar(Math.min(tHatch.maxEUStore(), tHatch.getBaseMetaTileEntity().getStoredEU() + exEU)); } else tHatch.doExplosion(tHatch.maxEUOutput()); } } @@ -357,33 +351,16 @@ public class UniversalChemicalFuelEngine extends GT_MetaTileEntity_TooltipMultiB } @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[] { - casingTexturePages[0][50], + if (aActive) return new ITexture[] { casingTexturePages[0][50], TextureFactory.of(OVERLAY_FRONT_DIESEL_ENGINE_ACTIVE), - TextureFactory.builder() - .addIcon(OVERLAY_FRONT_DIESEL_ENGINE_ACTIVE_GLOW) - .glow() - .build() - }; - return new ITexture[] { - casingTexturePages[0][50], - TextureFactory.of(OVERLAY_FRONT_DIESEL_ENGINE), - TextureFactory.builder() - .addIcon(OVERLAY_FRONT_DIESEL_ENGINE_GLOW) - .glow() - .build() - }; + TextureFactory.builder().addIcon(OVERLAY_FRONT_DIESEL_ENGINE_ACTIVE_GLOW).glow().build() }; + return new ITexture[] { casingTexturePages[0][50], TextureFactory.of(OVERLAY_FRONT_DIESEL_ENGINE), + TextureFactory.builder().addIcon(OVERLAY_FRONT_DIESEL_ENGINE_GLOW).glow().build() }; } - return new ITexture[] {casingTexturePages[0][50]}; + return new ITexture[] { casingTexturePages[0][50] }; } @Override diff --git a/src/main/java/goodgenerator/blocks/tileEntity/YottaFluidTank.java b/src/main/java/goodgenerator/blocks/tileEntity/YottaFluidTank.java index cfeba833a2..0708ab1bf5 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/YottaFluidTank.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/YottaFluidTank.java @@ -5,6 +5,22 @@ import static goodgenerator.util.DescTextLocalization.BLUE_PRINT_INFO; import static gregtech.api.metatileentity.BaseTileEntity.TOOLTIP_DELAY; import static gregtech.api.util.GT_StructureUtility.*; +import java.math.BigInteger; +import java.util.ArrayList; +import java.util.List; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.ChatComponentTranslation; +import net.minecraft.util.EnumChatFormatting; +import net.minecraft.util.StatCollector; +import net.minecraftforge.common.util.ForgeDirection; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidTankInfo; + import com.github.bartimaeusnek.bartworks.API.BorosilicateGlass; import com.github.technus.tectech.TecTech; import com.github.technus.tectech.thing.gui.TecTechUITextures; @@ -14,6 +30,7 @@ import com.gtnewhorizon.structurelib.structure.*; import com.gtnewhorizons.modularui.api.drawable.IDrawable; import com.gtnewhorizons.modularui.api.drawable.UITexture; import com.gtnewhorizons.modularui.common.widget.*; + import goodgenerator.blocks.tileEntity.GTMetaTileEntity.YOTTAHatch; import goodgenerator.blocks.tileEntity.base.GT_MetaTileEntity_TooltipMultiBlockBase_EM; import goodgenerator.client.GUI.GG_UITextures; @@ -32,30 +49,16 @@ import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Input import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Output; import gregtech.api.render.TextureFactory; import gregtech.api.util.GT_Multiblock_Tooltip_Builder; -import java.math.BigInteger; -import java.util.ArrayList; -import java.util.List; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.ChatComponentTranslation; -import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.StatCollector; -import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.FluidTankInfo; public class YottaFluidTank extends GT_MetaTileEntity_TooltipMultiBlockBase_EM implements IConstructable, ISurvivalConstructable { private static final IIconContainer textureFontOn = new Textures.BlockIcons.CustomIcon("iconsets/OVERLAY_QTANK"); - private static final IIconContainer textureFontOn_Glow = - new Textures.BlockIcons.CustomIcon("iconsets/OVERLAY_QTANK_GLOW"); + private static final IIconContainer textureFontOn_Glow = new Textures.BlockIcons.CustomIcon( + "iconsets/OVERLAY_QTANK_GLOW"); private static final IIconContainer textureFontOff = new Textures.BlockIcons.CustomIcon("iconsets/OVERLAY_QCHEST"); - private static final IIconContainer textureFontOff_Glow = - new Textures.BlockIcons.CustomIcon("iconsets/OVERLAY_QCHEST_GLOW"); + private static final IIconContainer textureFontOff_Glow = new Textures.BlockIcons.CustomIcon( + "iconsets/OVERLAY_QCHEST_GLOW"); protected IStructureDefinition<YottaFluidTank> multiDefinition = null; protected final ArrayList<YOTTAHatch> mYottaHatch = new ArrayList<>(); @@ -105,8 +108,7 @@ public class YottaFluidTank extends GT_MetaTileEntity_TooltipMultiBlockBase_EM public String getLockedFluidName() { if (!isFluidLocked) return StatCollector.translateToLocal("scanner.info.YOTTank.none"); - if (mLockedFluidName == null - || mLockedFluidName.equals("") + if (mLockedFluidName == null || mLockedFluidName.equals("") || FluidRegistry.getFluidStack(mLockedFluidName, 1) == null) return StatCollector.translateToLocal("scanner.info.YOTTank.next"); return FluidRegistry.getFluidStack(mLockedFluidName, 1).getLocalizedName(); @@ -171,10 +173,9 @@ public class YottaFluidTank extends GT_MetaTileEntity_TooltipMultiBlockBase_EM @Override public FluidTankInfo[] getTankInfo(ForgeDirection aSide) { - int fluidSize = mStorageCurrent.compareTo(new BigInteger(Integer.MAX_VALUE + "")) > 0 - ? Integer.MAX_VALUE + int fluidSize = mStorageCurrent.compareTo(new BigInteger(Integer.MAX_VALUE + "")) > 0 ? Integer.MAX_VALUE : mStorageCurrent.intValue(); - return new FluidTankInfo[] {new FluidTankInfo(FluidRegistry.getFluidStack(mFluidName, fluidSize), fluidSize)}; + return new FluidTankInfo[] { new FluidTankInfo(FluidRegistry.getFluidStack(mFluidName, fluidSize), fluidSize) }; } @Override @@ -212,53 +213,50 @@ public class YottaFluidTank extends GT_MetaTileEntity_TooltipMultiBlockBase_EM public IStructureDefinition<YottaFluidTank> getStructure_EM() { if (multiDefinition == null) { multiDefinition = StructureDefinition.<YottaFluidTank>builder() - .addShape(YOTTANK_BOTTOM, transpose(new String[][] { - {"MM~MM", "MCCCM", "MCCCM", "MCCCM", "MMMMM"}, - {" ", " OOO ", " OOO ", " OOO ", " "} - })) - .addShape(YOTTANK_MID, transpose(new String[][] {{"GGGGG", "GRRRG", "GRRRG", "GRRRG", "GGGGG"}})) - .addShape(YOTTANK_TOP, transpose(new String[][] { - {"FFFFF", "F F", "F F", "F F", "FFFFF"}, - {"CCCCC", "CIIIC", "CIIIC", "CIIIC", "CCCCC"} - })) + .addShape( + YOTTANK_BOTTOM, + transpose( + new String[][] { { "MM~MM", "MCCCM", "MCCCM", "MCCCM", "MMMMM" }, + { " ", " OOO ", " OOO ", " OOO ", " " } })) + .addShape( + YOTTANK_MID, + transpose(new String[][] { { "GGGGG", "GRRRG", "GRRRG", "GRRRG", "GGGGG" } })) + .addShape( + YOTTANK_TOP, + transpose( + new String[][] { { "FFFFF", "F F", "F F", "F F", "FFFFF" }, + { "CCCCC", "CIIIC", "CIIIC", "CIIIC", "CCCCC" } })) .addElement('C', ofBlock(Loaders.yottaFluidTankCasing, 0)) .addElement( 'G', withChannel( "glass", BorosilicateGlass.ofBoroGlass( - (byte) 0, (byte) 1, Byte.MAX_VALUE, YottaFluidTank::setMeta, te -> - (byte) te.getMeta()))) - .addElement('R', ofChain(cells(10))) - .addElement('F', ofFrame(Materials.Steel)) + (byte) 0, + (byte) 1, + Byte.MAX_VALUE, + YottaFluidTank::setMeta, + te -> (byte) te.getMeta()))) + .addElement('R', ofChain(cells(10))).addElement( + 'F', + ofFrame(Materials.Steel)) .addElement( 'I', ofChain( - buildHatchAdder(YottaFluidTank.class) - .atLeast(GT_HatchElement.InputHatch) - .adder(YottaFluidTank::addInput) - .casingIndex(1537) - .dot(1) - .build(), + buildHatchAdder(YottaFluidTank.class).atLeast(GT_HatchElement.InputHatch) + .adder(YottaFluidTank::addInput).casingIndex(1537).dot(1).build(), ofBlock(Loaders.yottaFluidTankCasing, 0))) .addElement( 'M', ofChain( - buildHatchAdder(YottaFluidTank.class) - .atLeast(GT_HatchElement.Maintenance) - .casingIndex(1537) - .dot(2) - .build(), + buildHatchAdder(YottaFluidTank.class).atLeast(GT_HatchElement.Maintenance) + .casingIndex(1537).dot(2).build(), ofBlock(Loaders.yottaFluidTankCasing, 0))) .addElement( 'O', ofChain( - buildHatchAdder(YottaFluidTank.class) - .atLeast(GT_HatchElement.OutputHatch) - .adder(YottaFluidTank::addOutput) - .casingIndex(1537) - .dot(1) - .build(), + buildHatchAdder(YottaFluidTank.class).atLeast(GT_HatchElement.OutputHatch) + .adder(YottaFluidTank::addOutput).casingIndex(1537).dot(1).build(), ofBlock(Loaders.yottaFluidTankCasing, 0))) .build(); } @@ -269,12 +267,10 @@ public class YottaFluidTank extends GT_MetaTileEntity_TooltipMultiBlockBase_EM List<IStructureElement<YottaFluidTank>> out = new ArrayList<>(); for (int i = 0; i < num; ++i) { int finalI = i; - out.add(onElementPass( - x -> { - x.mStorage = x.mStorage.add(calStorage(finalI)); - x.maxCell = Math.max(x.maxCell, finalI); - }, - ofBlock(Loaders.yottaFluidTankCell, i))); + out.add(onElementPass(x -> { + x.mStorage = x.mStorage.add(calStorage(finalI)); + x.maxCell = Math.max(x.maxCell, finalI); + }, ofBlock(Loaders.yottaFluidTankCell, i))); } return out; } @@ -321,41 +317,34 @@ public class YottaFluidTank extends GT_MetaTileEntity_TooltipMultiBlockBase_EM @Override public String[] getInfoData() { - return new String[] { - StatCollector.translateToLocal("scanner.info.YOTTank.0"), - StatCollector.translateToLocal( - EnumChatFormatting.GREEN + CharExchanger.formatNumber(getCap()) + EnumChatFormatting.RESET + " L"), - StatCollector.translateToLocal("scanner.info.YOTTank.1"), - StatCollector.translateToLocal( - EnumChatFormatting.YELLOW + CharExchanger.formatNumber(getFluidName()) + EnumChatFormatting.RESET), - StatCollector.translateToLocal("scanner.info.YOTTank.2"), - StatCollector.translateToLocal(EnumChatFormatting.BLUE + CharExchanger.formatNumber(getStored()) - + EnumChatFormatting.RESET + " L"), - StatCollector.translateToLocal("scanner.info.YOTTank.3"), - StatCollector.translateToLocal(EnumChatFormatting.YELLOW - + CharExchanger.formatNumber(getLockedFluidName()) - + EnumChatFormatting.RESET) - }; + return new String[] { StatCollector.translateToLocal("scanner.info.YOTTank.0"), StatCollector.translateToLocal( + EnumChatFormatting.GREEN + CharExchanger.formatNumber(getCap()) + EnumChatFormatting.RESET + " L"), + StatCollector.translateToLocal("scanner.info.YOTTank.1"), + StatCollector.translateToLocal( + EnumChatFormatting.YELLOW + CharExchanger.formatNumber(getFluidName()) + + EnumChatFormatting.RESET), + StatCollector.translateToLocal("scanner.info.YOTTank.2"), + StatCollector.translateToLocal( + EnumChatFormatting.BLUE + CharExchanger.formatNumber(getStored()) + + EnumChatFormatting.RESET + + " L"), + StatCollector.translateToLocal("scanner.info.YOTTank.3"), + StatCollector.translateToLocal( + EnumChatFormatting.YELLOW + CharExchanger.formatNumber(getLockedFluidName()) + + EnumChatFormatting.RESET) }; } @Override protected GT_Multiblock_Tooltip_Builder createTooltip() { final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); - tt.addMachineType("Fluid Tank") - .addInfo("Controller block for the YOTTank.") - .addInfo( - "The max output speed is decided by the amount of stored liquid and the output hatch's capacity.") + tt.addMachineType("Fluid Tank").addInfo("Controller block for the YOTTank.").addInfo( + "The max output speed is decided by the amount of stored liquid and the output hatch's capacity.") .addInfo("The max fluid cell tier is limited by the glass tier.") .addInfo("HV glass for T1, EV glass for T2, IV glass for T3. . .") - .addInfo("The max height of the cell blocks is 15.") - .addInfo("The structure is too complex!") - .addInfo(BLUE_PRINT_INFO) - .addSeparator() - .beginVariableStructureBlock(5, 5, 1, 15, 5, 5, false) - .addController("Front of the second layer") - .addInputHatch("Hint block with dot 1") - .addMaintenanceHatch("Hint block with dot 2") - .addOutputHatch("Hint block with dot 3") + .addInfo("The max height of the cell blocks is 15.").addInfo("The structure is too complex!") + .addInfo(BLUE_PRINT_INFO).addSeparator().beginVariableStructureBlock(5, 5, 1, 15, 5, 5, false) + .addController("Front of the second layer").addInputHatch("Hint block with dot 1") + .addMaintenanceHatch("Hint block with dot 2").addOutputHatch("Hint block with dot 3") .toolTipFinisher("Good Generator"); return tt; } @@ -381,9 +370,7 @@ public class YottaFluidTank extends GT_MetaTileEntity_TooltipMultiBlockBase_EM mLockedFluidName = tFluid.getFluid().getName(); } } - if (mFluidName == null - || mFluidName.equals("") - || tFluid.getFluid().getName().equals(mFluidName)) { + if (mFluidName == null || mFluidName.equals("") || tFluid.getFluid().getName().equals(mFluidName)) { if (mFluidName == null || mFluidName.equals("")) { mFluidName = tFluid.getFluid().getName(); } @@ -447,20 +434,21 @@ public class YottaFluidTank extends GT_MetaTileEntity_TooltipMultiBlockBase_EM } @Override - public boolean onSolderingToolRightClick( - byte aSide, byte aWrenchingSide, EntityPlayer aPlayer, float aX, float aY, float aZ) { + public boolean onSolderingToolRightClick(byte aSide, byte aWrenchingSide, EntityPlayer aPlayer, float aX, float aY, + float aZ) { if (aSide == getBaseMetaTileEntity().getFrontFacing()) { voidExcessEnabled ^= true; - aPlayer.addChatMessage(new ChatComponentTranslation( - voidExcessEnabled ? "yottank.chat.voidExcessEnabled" : "yottank.chat.voidExcessDisabled")); + aPlayer.addChatMessage( + new ChatComponentTranslation( + voidExcessEnabled ? "yottank.chat.voidExcessEnabled" : "yottank.chat.voidExcessDisabled")); return true; } return false; } @Override - public boolean onWireCutterRightClick( - byte aSide, byte aWrenchingSide, EntityPlayer aPlayer, float aX, float aY, float aZ) { + public boolean onWireCutterRightClick(byte aSide, byte aWrenchingSide, EntityPlayer aPlayer, float aX, float aY, + float aZ) { if (aSide == getBaseMetaTileEntity().getFrontFacing()) { if (mLockedFluidName == null || mLockedFluidName.equals("")) { if (mFluidName != null && !mFluidName.equals("")) { @@ -491,27 +479,16 @@ public class YottaFluidTank extends GT_MetaTileEntity_TooltipMultiBlockBase_EM } @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(1537), + if (aActive) return new ITexture[] { Textures.BlockIcons.getCasingTextureForId(1537), TextureFactory.of(textureFontOn), - TextureFactory.builder().addIcon(textureFontOn_Glow).glow().build() - }; - else - return new ITexture[] { - Textures.BlockIcons.getCasingTextureForId(1537), + TextureFactory.builder().addIcon(textureFontOn_Glow).glow().build() }; + else return new ITexture[] { Textures.BlockIcons.getCasingTextureForId(1537), TextureFactory.of(textureFontOff), - TextureFactory.builder().addIcon(textureFontOff_Glow).glow().build() - }; - } else return new ITexture[] {Textures.BlockIcons.getCasingTextureForId(1537)}; + TextureFactory.builder().addIcon(textureFontOff_Glow).glow().build() }; + } else return new ITexture[] { Textures.BlockIcons.getCasingTextureForId(1537) }; } @Override @@ -522,10 +499,28 @@ public class YottaFluidTank extends GT_MetaTileEntity_TooltipMultiBlockBase_EM int height = stackSize.stackSize; if (height > 15) height = 15; built += survivialBuildPiece( - YOTTANK_TOP, stackSize, 2, height + 2, 0, elementBudget - built, source, actor, false, true); + YOTTANK_TOP, + stackSize, + 2, + height + 2, + 0, + elementBudget - built, + source, + actor, + false, + true); while (height > 0) { built += survivialBuildPiece( - YOTTANK_MID, stackSize, 2, height, 0, elementBudget - built, source, actor, false, true); + YOTTANK_MID, + stackSize, + 2, + height, + 0, + elementBudget - built, + source, + actor, + false, + true); height--; } return built; @@ -536,29 +531,36 @@ public class YottaFluidTank extends GT_MetaTileEntity_TooltipMultiBlockBase_EM super.drawTexts(screenElements, inventorySlot); screenElements - .widget(TextWidget.dynamicString(() -> StatCollector.translateToLocal("gui.YOTTank.0") + " " - + CharExchanger.formatNumber(mStorage.toString()) + " L") - .setSynced(false) - .setDefaultColor(COLOR_TEXT_WHITE.get()) - .setEnabled(widget -> getBaseMetaTileEntity().getErrorDisplayID() == 0)) + .widget( + TextWidget + .dynamicString( + () -> StatCollector.translateToLocal("gui.YOTTank.0") + " " + + CharExchanger.formatNumber(mStorage.toString()) + + " L") + .setSynced(false).setDefaultColor(COLOR_TEXT_WHITE.get()) + .setEnabled(widget -> getBaseMetaTileEntity().getErrorDisplayID() == 0)) .widget(new FakeSyncWidget.BigIntegerSyncer(() -> mStorage, val -> mStorage = val)) - .widget(TextWidget.dynamicString( - () -> StatCollector.translateToLocal("gui.YOTTank.1") + " " + getFluidName()) - .setSynced(false) - .setDefaultColor(COLOR_TEXT_WHITE.get()) - .setEnabled(widget -> getBaseMetaTileEntity().getErrorDisplayID() == 0)) + .widget( + TextWidget + .dynamicString( + () -> StatCollector.translateToLocal("gui.YOTTank.1") + " " + getFluidName()) + .setSynced(false).setDefaultColor(COLOR_TEXT_WHITE.get()) + .setEnabled(widget -> getBaseMetaTileEntity().getErrorDisplayID() == 0)) .widget(new FakeSyncWidget.StringSyncer(() -> mFluidName, val -> mFluidName = val)) - .widget(TextWidget.dynamicString(() -> StatCollector.translateToLocal("gui.YOTTank.2") + " " - + CharExchanger.formatNumber(mStorageCurrent.toString()) + " L") - .setSynced(false) - .setDefaultColor(COLOR_TEXT_WHITE.get()) - .setEnabled(widget -> getBaseMetaTileEntity().getErrorDisplayID() == 0)) + .widget( + TextWidget + .dynamicString( + () -> StatCollector.translateToLocal("gui.YOTTank.2") + " " + + CharExchanger.formatNumber(mStorageCurrent.toString()) + + " L") + .setSynced(false).setDefaultColor(COLOR_TEXT_WHITE.get()) + .setEnabled(widget -> getBaseMetaTileEntity().getErrorDisplayID() == 0)) .widget(new FakeSyncWidget.BigIntegerSyncer(() -> mStorageCurrent, val -> mStorageCurrent = val)) - .widget(TextWidget.dynamicString( + .widget( + TextWidget.dynamicString( () -> StatCollector.translateToLocal("gui.YOTTank.3") + " " + getLockedFluidName()) - .setSynced(false) - .setDefaultColor(COLOR_TEXT_WHITE.get()) - .setEnabled(widget -> getBaseMetaTileEntity().getErrorDisplayID() == 0)) + .setSynced(false).setDefaultColor(COLOR_TEXT_WHITE.get()) + .setEnabled(widget -> getBaseMetaTileEntity().getErrorDisplayID() == 0)) .widget(new FakeSyncWidget.StringSyncer(() -> mLockedFluidName, val -> mLockedFluidName = val)) .widget(new FakeSyncWidget.BooleanSyncer(() -> isFluidLocked, val -> isFluidLocked = val)) .widget(new FakeSyncWidget.BooleanSyncer(() -> voidExcessEnabled, val -> voidExcessEnabled = val)); @@ -566,47 +568,33 @@ public class YottaFluidTank extends GT_MetaTileEntity_TooltipMultiBlockBase_EM @Override protected ButtonWidget createSafeVoidButton() { - return (ButtonWidget) new ButtonWidget() - .setOnClick((clickData, widget) -> { - TecTech.proxy.playSound(getBaseMetaTileEntity(), "fx_click"); - voidExcessEnabled = !voidExcessEnabled; - }) - .setPlayClickSound(false) - .setBackground(() -> { - List<UITexture> ret = new ArrayList<>(); - ret.add(TecTechUITextures.BUTTON_STANDARD_16x16); - ret.add( - voidExcessEnabled - ? TecTechUITextures.OVERLAY_BUTTON_SAFE_VOID_ON - : TecTechUITextures.OVERLAY_BUTTON_SAFE_VOID_OFF); - return ret.toArray(new IDrawable[0]); - }) - .setPos(174, doesBindPlayerInventory() ? 132 : 156) - .setSize(16, 16) + return (ButtonWidget) new ButtonWidget().setOnClick((clickData, widget) -> { + TecTech.proxy.playSound(getBaseMetaTileEntity(), "fx_click"); + voidExcessEnabled = !voidExcessEnabled; + }).setPlayClickSound(false).setBackground(() -> { + List<UITexture> ret = new ArrayList<>(); + ret.add(TecTechUITextures.BUTTON_STANDARD_16x16); + ret.add( + voidExcessEnabled ? TecTechUITextures.OVERLAY_BUTTON_SAFE_VOID_ON + : TecTechUITextures.OVERLAY_BUTTON_SAFE_VOID_OFF); + return ret.toArray(new IDrawable[0]); + }).setPos(174, doesBindPlayerInventory() ? 132 : 156).setSize(16, 16) .addTooltip(StatCollector.translateToLocal("gui.YOTTank.button.void")) .setTooltipShowUpDelay(TOOLTIP_DELAY); } @Override protected ButtonWidget createPowerPassButton() { - return (ButtonWidget) new ButtonWidget() - .setOnClick((clickData, widget) -> { - TecTech.proxy.playSound(getBaseMetaTileEntity(), "fx_click"); - isFluidLocked = !isFluidLocked; - if (!widget.getContext().isClient()) mLockedFluidName = isFluidLocked ? mFluidName : ""; - }) - .setPlayClickSound(false) - .setBackground(() -> { - List<UITexture> ret = new ArrayList<>(); - ret.add(TecTechUITextures.BUTTON_STANDARD_16x16); - ret.add( - isFluidLocked - ? GG_UITextures.OVERLAY_BUTTON_LOCK_ON - : GG_UITextures.OVERLAY_BUTTON_LOCK_OFF); - return ret.toArray(new IDrawable[0]); - }) - .setPos(174, doesBindPlayerInventory() ? 116 : 140) - .setSize(16, 16) + return (ButtonWidget) new ButtonWidget().setOnClick((clickData, widget) -> { + TecTech.proxy.playSound(getBaseMetaTileEntity(), "fx_click"); + isFluidLocked = !isFluidLocked; + if (!widget.getContext().isClient()) mLockedFluidName = isFluidLocked ? mFluidName : ""; + }).setPlayClickSound(false).setBackground(() -> { + List<UITexture> ret = new ArrayList<>(); + ret.add(TecTechUITextures.BUTTON_STANDARD_16x16); + ret.add(isFluidLocked ? GG_UITextures.OVERLAY_BUTTON_LOCK_ON : GG_UITextures.OVERLAY_BUTTON_LOCK_OFF); + return ret.toArray(new IDrawable[0]); + }).setPos(174, doesBindPlayerInventory() ? 116 : 140).setSize(16, 16) .addTooltip(StatCollector.translateToLocal("gui.YOTTank.button.locking")) .setTooltipShowUpDelay(TOOLTIP_DELAY); } diff --git a/src/main/java/goodgenerator/blocks/tileEntity/base/GT_MetaTileEntity_LargeTurbineBase.java b/src/main/java/goodgenerator/blocks/tileEntity/base/GT_MetaTileEntity_LargeTurbineBase.java index 41a471e2fd..bb85923c5a 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/base/GT_MetaTileEntity_LargeTurbineBase.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/base/GT_MetaTileEntity_LargeTurbineBase.java @@ -8,11 +8,23 @@ import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose import static gregtech.api.enums.GT_HatchElement.*; import static gregtech.api.util.GT_StructureUtility.*; +import java.util.ArrayList; + +import net.minecraft.block.Block; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumChatFormatting; +import net.minecraft.util.StatCollector; +import net.minecraftforge.fluids.FluidStack; + import com.gtnewhorizon.structurelib.alignment.constructable.ISurvivalConstructable; import com.gtnewhorizon.structurelib.structure.IItemSource; import com.gtnewhorizon.structurelib.structure.IStructureDefinition; import com.gtnewhorizon.structurelib.structure.IStructureElementCheckOnly; import com.gtnewhorizon.structurelib.structure.StructureDefinition; + import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.items.GT_MetaGenerated_Tool; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_EnhancedMultiBlockBase; @@ -20,59 +32,44 @@ import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Dynam import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Muffler; import gregtech.api.util.GT_Utility; import gregtech.common.items.GT_MetaGenerated_Tool_01; -import java.util.ArrayList; -import net.minecraft.block.Block; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.StatCollector; -import net.minecraftforge.fluids.FluidStack; -public abstract class GT_MetaTileEntity_LargeTurbineBase - extends GT_MetaTileEntity_EnhancedMultiBlockBase<GT_MetaTileEntity_LargeTurbineBase> - implements ISurvivalConstructable { +public abstract class GT_MetaTileEntity_LargeTurbineBase extends + GT_MetaTileEntity_EnhancedMultiBlockBase<GT_MetaTileEntity_LargeTurbineBase> implements ISurvivalConstructable { + private static final String STRUCTURE_PIECE_MAIN = "main"; - private static final ClassValue<IStructureDefinition<GT_MetaTileEntity_LargeTurbineBase>> STRUCTURE_DEFINITION = - new ClassValue<IStructureDefinition<GT_MetaTileEntity_LargeTurbineBase>>() { - @Override - protected IStructureDefinition<GT_MetaTileEntity_LargeTurbineBase> computeValue(Class<?> type) { - return StructureDefinition.<GT_MetaTileEntity_LargeTurbineBase>builder() - .addShape(STRUCTURE_PIECE_MAIN, transpose(new String[][] { - { - " ", "xxxxx", "xxxxx", "xxxxx", "xxxxx", - }, - { - " --- ", "xcccx", "xchcx", "xchcx", "xcccx", - }, - { - " --- ", "xc~cx", "xh-hx", "xh-hx", "xcdcx", - }, - { - " --- ", "xcccx", "xchcx", "xchcx", "xcccx", - }, - { - " ", "xxxxx", "xxxxx", "xxxxx", "xxxxx", - }, - })) - .addElement('c', lazy(t -> ofBlock(t.getCasingBlock(), t.getCasingMeta()))) - .addElement('d', lazy(t -> Dynamo.newAny(t.getCasingTextureIndex(), 1))) - .addElement('h', lazy(t -> buildHatchAdder(GT_MetaTileEntity_LargeTurbineBase.class) - .atLeast(Maintenance, InputHatch, OutputHatch, OutputBus, InputBus, Muffler) - .casingIndex(t.getCasingTextureIndex()) - .dot(2) - .buildAndChain(t.getCasingBlock(), t.getCasingMeta()))) - .addElement('x', (IStructureElementCheckOnly<GT_MetaTileEntity_LargeTurbineBase>) - (aContext, aWorld, aX, aY, aZ) -> { - TileEntity tTile = aWorld.getTileEntity(aX, aY, aZ); - return !(tTile instanceof IGregTechTileEntity) - || !(((IGregTechTileEntity) tTile).getMetaTileEntity() - instanceof GT_MetaTileEntity_LargeTurbineBase); - }) - .build(); - } - }; + private static final ClassValue<IStructureDefinition<GT_MetaTileEntity_LargeTurbineBase>> STRUCTURE_DEFINITION = new ClassValue<IStructureDefinition<GT_MetaTileEntity_LargeTurbineBase>>() { + + @Override + protected IStructureDefinition<GT_MetaTileEntity_LargeTurbineBase> computeValue(Class<?> type) { + return StructureDefinition.<GT_MetaTileEntity_LargeTurbineBase>builder() + .addShape( + STRUCTURE_PIECE_MAIN, + transpose( + new String[][] { { " ", "xxxxx", "xxxxx", "xxxxx", "xxxxx", }, + { " --- ", "xcccx", "xchcx", "xchcx", "xcccx", }, + { " --- ", "xc~cx", "xh-hx", "xh-hx", "xcdcx", }, + { " --- ", "xcccx", "xchcx", "xchcx", "xcccx", }, + { " ", "xxxxx", "xxxxx", "xxxxx", "xxxxx", }, })) + .addElement('c', lazy(t -> ofBlock(t.getCasingBlock(), t.getCasingMeta()))) + .addElement('d', lazy(t -> Dynamo.newAny(t.getCasingTextureIndex(), 1))) + .addElement( + 'h', + lazy( + t -> buildHatchAdder(GT_MetaTileEntity_LargeTurbineBase.class) + .atLeast(Maintenance, InputHatch, OutputHatch, OutputBus, InputBus, Muffler) + .casingIndex(t.getCasingTextureIndex()).dot(2) + .buildAndChain(t.getCasingBlock(), t.getCasingMeta()))) + .addElement( + 'x', + (IStructureElementCheckOnly<GT_MetaTileEntity_LargeTurbineBase>) (aContext, aWorld, aX, aY, + aZ) -> { + TileEntity tTile = aWorld.getTileEntity(aX, aY, aZ); + return !(tTile instanceof IGregTechTileEntity) || !(((IGregTechTileEntity) tTile) + .getMetaTileEntity() instanceof GT_MetaTileEntity_LargeTurbineBase); + }) + .build(); + } + }; protected int baseEff = 0; protected int optFlow = 0; @@ -103,8 +100,7 @@ public abstract class GT_MetaTileEntity_LargeTurbineBase @Override public boolean checkMachine(IGregTechTileEntity aBaseMetaTileEntity, ItemStack aStack) { maxPower = 0; - if (checkPiece(STRUCTURE_PIECE_MAIN, 2, 2, 1) - && mMaintenanceHatches.size() == 1 + if (checkPiece(STRUCTURE_PIECE_MAIN, 2, 2, 1) && mMaintenanceHatches.size() == 1 && mMufflerHatches.isEmpty() == (getPollutionPerTick(null) == 0)) { maxPower = getMaximumOutput(); return true; @@ -138,31 +134,27 @@ public abstract class GT_MetaTileEntity_LargeTurbineBase @Override public boolean checkRecipe(ItemStack aStack) { - if ((counter & 7) == 0 - && (aStack == null - || !(aStack.getItem() instanceof GT_MetaGenerated_Tool) - || aStack.getItemDamage() < 170 - || aStack.getItemDamage() > 179)) { + if ((counter & 7) == 0 && (aStack == null || !(aStack.getItem() instanceof GT_MetaGenerated_Tool) + || aStack.getItemDamage() < 170 + || aStack.getItemDamage() > 179)) { stopMachine(); return false; } ArrayList<FluidStack> tFluids = getStoredFluids(); if (tFluids.size() > 0) { - if (baseEff == 0 - || optFlow == 0 + if (baseEff == 0 || optFlow == 0 || counter >= 512 || this.getBaseMetaTileEntity().hasWorkJustBeenEnabled() || this.getBaseMetaTileEntity().hasInventoryBeenModified()) { counter = 0; baseEff = GT_Utility.safeInt( (long) ((5F + ((GT_MetaGenerated_Tool) aStack.getItem()).getToolCombatDamage(aStack)) * 1000F)); - optFlow = GT_Utility.safeInt((long) Math.max( - Float.MIN_NORMAL, - ((GT_MetaGenerated_Tool) aStack.getItem()) - .getToolStats(aStack) - .getSpeedMultiplier() - * GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mToolSpeed - * 50)); + optFlow = GT_Utility.safeInt( + (long) Math.max( + Float.MIN_NORMAL, + ((GT_MetaGenerated_Tool) aStack.getItem()).getToolStats(aStack).getSpeedMultiplier() + * GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mToolSpeed + * 50)); if (optFlow <= 0 || baseEff <= 0) { stopMachine(); // in case the turbine got removed return false; @@ -172,8 +164,8 @@ public abstract class GT_MetaTileEntity_LargeTurbineBase } } - int newPower = - fluidIntoPower(tFluids, optFlow, baseEff); // How much the turbine should be producing with this flow + int newPower = fluidIntoPower(tFluids, optFlow, baseEff); // How much the turbine should be producing with this + // flow int difference = newPower - this.mEUt; // difference between current output and new output // Magic numbers: can always change by at least 10 eu/t, but otherwise by at most 1 percent of the difference in @@ -194,7 +186,7 @@ public abstract class GT_MetaTileEntity_LargeTurbineBase } else { this.mMaxProgresstime = 1; this.mEfficiencyIncrease = 10; - // Overvoltage is handled inside the MultiBlockBase when pushing out to dynamos. no need to do it here. + // Overvoltage is handled inside the MultiBlockBase when pushing out to dynamos. no need to do it here. return true; } } @@ -244,26 +236,21 @@ public abstract class GT_MetaTileEntity_LargeTurbineBase } String tRunning = mMaxProgresstime > 0 - ? EnumChatFormatting.GREEN - + StatCollector.translateToLocal("GT5U.turbine.running.true") + ? EnumChatFormatting.GREEN + StatCollector.translateToLocal("GT5U.turbine.running.true") + EnumChatFormatting.RESET - : EnumChatFormatting.RED - + StatCollector.translateToLocal("GT5U.turbine.running.false") + : EnumChatFormatting.RED + StatCollector.translateToLocal("GT5U.turbine.running.false") + EnumChatFormatting.RESET; String tMaintainance = getIdealStatus() == getRepairStatus() - ? EnumChatFormatting.GREEN - + StatCollector.translateToLocal("GT5U.turbine.maintenance.false") + ? EnumChatFormatting.GREEN + StatCollector.translateToLocal("GT5U.turbine.maintenance.false") + EnumChatFormatting.RESET - : EnumChatFormatting.RED - + StatCollector.translateToLocal("GT5U.turbine.maintenance.true") + : EnumChatFormatting.RED + StatCollector.translateToLocal("GT5U.turbine.maintenance.true") + EnumChatFormatting.RESET; int tDura = 0; if (mInventory[1] != null && mInventory[1].getItem() instanceof GT_MetaGenerated_Tool_01) { - tDura = GT_Utility.safeInt((long) (100.0f - / GT_MetaGenerated_Tool.getToolMaxDamage(mInventory[1]) - * (GT_MetaGenerated_Tool.getToolDamage(mInventory[1])) - + 1)); + tDura = GT_Utility.safeInt( + (long) (100.0f / GT_MetaGenerated_Tool.getToolMaxDamage(mInventory[1]) + * (GT_MetaGenerated_Tool.getToolDamage(mInventory[1])) + 1)); } long storedEnergy = 0; @@ -275,34 +262,59 @@ public abstract class GT_MetaTileEntity_LargeTurbineBase } } String[] ret = new String[] { - // 8 Lines available for information panels - tRunning + ": " + EnumChatFormatting.RED + GT_Utility.formatNumbers(mEUt) + EnumChatFormatting.RESET - + " EU/t", /* 1 */ - tMaintainance, /* 2 */ - StatCollector.translateToLocal("GT5U.turbine.efficiency") + ": " + EnumChatFormatting.YELLOW - + (mEfficiency / 100F) + EnumChatFormatting.RESET + "%", /* 2 */ - StatCollector.translateToLocal("GT5U.multiblock.energy") + ": " + EnumChatFormatting.GREEN - + GT_Utility.formatNumbers(storedEnergy) + EnumChatFormatting.RESET + " EU / " - + /* 3 */ EnumChatFormatting.YELLOW - + GT_Utility.formatNumbers(maxEnergy) + EnumChatFormatting.RESET + " EU", - StatCollector.translateToLocal("GT5U.turbine.flow") + ": " + EnumChatFormatting.YELLOW - + GT_Utility.formatNumbers(GT_Utility.safeInt((long) realOptFlow)) + EnumChatFormatting.RESET - + " L/t" + /* 4 */ EnumChatFormatting.YELLOW - + " (" - + (looseFit - ? StatCollector.translateToLocal("GT5U.turbine.loose") - : StatCollector.translateToLocal("GT5U.turbine.tight")) - + ")", /* 5 */ - StatCollector.translateToLocal("GT5U.turbine.fuel") + ": " + EnumChatFormatting.GOLD - + GT_Utility.formatNumbers(storedFluid) + EnumChatFormatting.RESET + "L", /* 6 */ - StatCollector.translateToLocal("GT5U.turbine.dmg") + ": " + EnumChatFormatting.RED + tDura - + EnumChatFormatting.RESET + "%", /* 7 */ - StatCollector.translateToLocal("GT5U.multiblock.pollution") + ": " + EnumChatFormatting.GREEN - + mPollutionReduction + EnumChatFormatting.RESET + " %" /* 8 */ + // 8 Lines available for information panels + tRunning + ": " + + EnumChatFormatting.RED + + GT_Utility.formatNumbers(mEUt) + + EnumChatFormatting.RESET + + " EU/t", /* 1 */ + tMaintainance, /* 2 */ + StatCollector.translateToLocal("GT5U.turbine.efficiency") + ": " + + EnumChatFormatting.YELLOW + + (mEfficiency / 100F) + + EnumChatFormatting.RESET + + "%", /* 2 */ + StatCollector.translateToLocal("GT5U.multiblock.energy") + ": " + + EnumChatFormatting.GREEN + + GT_Utility.formatNumbers(storedEnergy) + + EnumChatFormatting.RESET + + " EU / " + + /* 3 */ EnumChatFormatting.YELLOW + + GT_Utility.formatNumbers(maxEnergy) + + EnumChatFormatting.RESET + + " EU", + StatCollector.translateToLocal("GT5U.turbine.flow") + ": " + + EnumChatFormatting.YELLOW + + GT_Utility.formatNumbers(GT_Utility.safeInt((long) realOptFlow)) + + EnumChatFormatting.RESET + + " L/t" + + /* 4 */ EnumChatFormatting.YELLOW + + " (" + + (looseFit ? StatCollector.translateToLocal("GT5U.turbine.loose") + : StatCollector.translateToLocal("GT5U.turbine.tight")) + + ")", /* 5 */ + StatCollector.translateToLocal("GT5U.turbine.fuel") + ": " + + EnumChatFormatting.GOLD + + GT_Utility.formatNumbers(storedFluid) + + EnumChatFormatting.RESET + + "L", /* 6 */ + StatCollector.translateToLocal("GT5U.turbine.dmg") + ": " + + EnumChatFormatting.RED + + tDura + + EnumChatFormatting.RESET + + "%", /* 7 */ + StatCollector.translateToLocal("GT5U.multiblock.pollution") + ": " + + EnumChatFormatting.GREEN + + mPollutionReduction + + EnumChatFormatting.RESET + + " %" /* 8 */ }; if (!this.getClass().getName().contains("Steam")) - ret[4] = StatCollector.translateToLocal("GT5U.turbine.flow") + ": " + EnumChatFormatting.YELLOW - + GT_Utility.safeInt((long) realOptFlow) + EnumChatFormatting.RESET + " L/t"; + ret[4] = StatCollector.translateToLocal("GT5U.turbine.flow") + ": " + + EnumChatFormatting.YELLOW + + GT_Utility.safeInt((long) realOptFlow) + + EnumChatFormatting.RESET + + " L/t"; return ret; } diff --git a/src/main/java/goodgenerator/blocks/tileEntity/base/GT_MetaTileEntity_LongPowerUsageBase.java b/src/main/java/goodgenerator/blocks/tileEntity/base/GT_MetaTileEntity_LongPowerUsageBase.java index 5494cdd89a..c36cfd7abc 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/base/GT_MetaTileEntity_LongPowerUsageBase.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/base/GT_MetaTileEntity_LongPowerUsageBase.java @@ -1,14 +1,17 @@ package goodgenerator.blocks.tileEntity.base; +import net.minecraft.util.EnumChatFormatting; +import net.minecraft.util.StatCollector; + import com.github.bartimaeusnek.bartworks.util.BW_Util; import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_EnergyMulti; + import gregtech.api.metatileentity.implementations.*; import gregtech.api.util.GT_Utility; -import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.StatCollector; /** * Base class for multiblocks that supports TT energy hatches. + * * @param <T> */ public abstract class GT_MetaTileEntity_LongPowerUsageBase<T extends GT_MetaTileEntity_LongPowerUsageBase<T>> @@ -114,30 +117,58 @@ public abstract class GT_MetaTileEntity_LongPowerUsageBase<T extends GT_MetaTile if (tName.equals("MAX+")) tName = EnumChatFormatting.OBFUSCATED + "MAX+"; return new String[] { - StatCollector.translateToLocal("GT5U.multiblock.Progress") + ": " + EnumChatFormatting.GREEN - + GT_Utility.formatNumbers(this.mProgresstime / 20) + EnumChatFormatting.RESET + " s / " - + EnumChatFormatting.YELLOW - + GT_Utility.formatNumbers(this.mMaxProgresstime / 20) + EnumChatFormatting.RESET + " s", - StatCollector.translateToLocal("GT5U.multiblock.energy") + ": " + EnumChatFormatting.GREEN - + GT_Utility.formatNumbers(storedEnergy) + EnumChatFormatting.RESET + " EU / " - + EnumChatFormatting.YELLOW - + GT_Utility.formatNumbers(maxEnergy) + EnumChatFormatting.RESET + " EU", - StatCollector.translateToLocal("GT5U.multiblock.usage") + ": " + EnumChatFormatting.RED - + GT_Utility.formatNumbers(-this.lEUt) + EnumChatFormatting.RESET + " EU/t", - StatCollector.translateToLocal("GT5U.multiblock.mei") + ": " + EnumChatFormatting.YELLOW - + GT_Utility.formatNumbers(this.getMaxInputVoltage()) + EnumChatFormatting.RESET + " EU/t(*" - + GT_Utility.formatNumbers(this.getMaxInputAmps()) + "A) = " - + EnumChatFormatting.YELLOW - + GT_Utility.formatNumbers(nominalV) + EnumChatFormatting.RESET, - StatCollector.translateToLocal("GT5U.machines.tier") + ": " + EnumChatFormatting.YELLOW + tName - + EnumChatFormatting.RESET, - StatCollector.translateToLocal("GT5U.multiblock.problems") + ": " + EnumChatFormatting.RED - + (this.getIdealStatus() - this.getRepairStatus()) + EnumChatFormatting.RESET + " " - + StatCollector.translateToLocal("GT5U.multiblock.efficiency") - + ": " + EnumChatFormatting.YELLOW - + (float) this.mEfficiency / 100.0F + EnumChatFormatting.RESET + " %", - StatCollector.translateToLocal("GT5U.multiblock.pollution") + ": " + EnumChatFormatting.GREEN - + mPollutionReduction + EnumChatFormatting.RESET + " %" - }; + StatCollector.translateToLocal("GT5U.multiblock.Progress") + ": " + + EnumChatFormatting.GREEN + + GT_Utility.formatNumbers(this.mProgresstime / 20) + + EnumChatFormatting.RESET + + " s / " + + EnumChatFormatting.YELLOW + + GT_Utility.formatNumbers(this.mMaxProgresstime / 20) + + EnumChatFormatting.RESET + + " s", + StatCollector.translateToLocal("GT5U.multiblock.energy") + ": " + + EnumChatFormatting.GREEN + + GT_Utility.formatNumbers(storedEnergy) + + EnumChatFormatting.RESET + + " EU / " + + EnumChatFormatting.YELLOW + + GT_Utility.formatNumbers(maxEnergy) + + EnumChatFormatting.RESET + + " EU", + StatCollector.translateToLocal("GT5U.multiblock.usage") + ": " + + EnumChatFormatting.RED + + GT_Utility.formatNumbers(-this.lEUt) + + EnumChatFormatting.RESET + + " EU/t", + StatCollector.translateToLocal("GT5U.multiblock.mei") + ": " + + EnumChatFormatting.YELLOW + + GT_Utility.formatNumbers(this.getMaxInputVoltage()) + + EnumChatFormatting.RESET + + " EU/t(*" + + GT_Utility.formatNumbers(this.getMaxInputAmps()) + + "A) = " + + EnumChatFormatting.YELLOW + + GT_Utility.formatNumbers(nominalV) + + EnumChatFormatting.RESET, + StatCollector.translateToLocal("GT5U.machines.tier") + ": " + + EnumChatFormatting.YELLOW + + tName + + EnumChatFormatting.RESET, + StatCollector.translateToLocal("GT5U.multiblock.problems") + ": " + + EnumChatFormatting.RED + + (this.getIdealStatus() - this.getRepairStatus()) + + EnumChatFormatting.RESET + + " " + + StatCollector.translateToLocal("GT5U.multiblock.efficiency") + + ": " + + EnumChatFormatting.YELLOW + + (float) this.mEfficiency / 100.0F + + EnumChatFormatting.RESET + + " %", + StatCollector.translateToLocal("GT5U.multiblock.pollution") + ": " + + EnumChatFormatting.GREEN + + mPollutionReduction + + EnumChatFormatting.RESET + + " %" }; } } diff --git a/src/main/java/goodgenerator/blocks/tileEntity/base/GT_MetaTileEntity_TooltipMultiBlockBase_EM.java b/src/main/java/goodgenerator/blocks/tileEntity/base/GT_MetaTileEntity_TooltipMultiBlockBase_EM.java index 30640c088d..70d92540e4 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/base/GT_MetaTileEntity_TooltipMultiBlockBase_EM.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/base/GT_MetaTileEntity_TooltipMultiBlockBase_EM.java @@ -1,15 +1,20 @@ package goodgenerator.blocks.tileEntity.base; -import com.github.technus.tectech.thing.metaTileEntity.multi.base.GT_MetaTileEntity_MultiblockBase_EM; -import gregtech.api.interfaces.ISecondaryDescribable; -import gregtech.api.util.GT_Multiblock_Tooltip_Builder; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; + import net.minecraft.item.ItemStack; + import org.lwjgl.input.Keyboard; +import com.github.technus.tectech.thing.metaTileEntity.multi.base.GT_MetaTileEntity_MultiblockBase_EM; + +import gregtech.api.interfaces.ISecondaryDescribable; +import gregtech.api.util.GT_Multiblock_Tooltip_Builder; + public abstract class GT_MetaTileEntity_TooltipMultiBlockBase_EM extends GT_MetaTileEntity_MultiblockBase_EM implements ISecondaryDescribable { + private static final Map<Integer, GT_Multiblock_Tooltip_Builder> tooltips = new ConcurrentHashMap<>(); protected GT_MetaTileEntity_TooltipMultiBlockBase_EM(int aID, String aName, String aNameRegional) { diff --git a/src/main/java/goodgenerator/blocks/tileEntity/base/LargeFusionComputer.java b/src/main/java/goodgenerator/blocks/tileEntity/base/LargeFusionComputer.java index ac80569904..cbefc01a45 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/base/LargeFusionComputer.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/base/LargeFusionComputer.java @@ -6,6 +6,18 @@ import static com.gtnewhorizon.structurelib.structure.StructureUtility.*; import static gregtech.api.enums.Textures.BlockIcons.*; import static gregtech.api.util.GT_StructureUtility.ofFrame; +import java.util.ArrayList; + +import net.minecraft.block.Block; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumChatFormatting; +import net.minecraft.util.StatCollector; +import net.minecraft.world.ChunkCoordIntPair; +import net.minecraftforge.common.util.ForgeDirection; +import net.minecraftforge.fluids.FluidStack; + import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_EnergyMulti; import com.gtnewhorizon.structurelib.alignment.constructable.IConstructable; import com.gtnewhorizon.structurelib.alignment.constructable.ISurvivalConstructable; @@ -16,6 +28,7 @@ import com.gtnewhorizons.modularui.common.widget.DynamicPositionedColumn; import com.gtnewhorizons.modularui.common.widget.FakeSyncWidget; import com.gtnewhorizons.modularui.common.widget.SlotWidget; import com.gtnewhorizons.modularui.common.widget.TextWidget; + import gregtech.api.enums.GT_HatchElement; import gregtech.api.enums.Materials; import gregtech.api.enums.Textures; @@ -31,16 +44,6 @@ import gregtech.api.render.TextureFactory; import gregtech.api.util.GT_HatchElementBuilder; import gregtech.api.util.GT_Recipe; import gregtech.api.util.GT_Utility; -import java.util.ArrayList; -import net.minecraft.block.Block; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.StatCollector; -import net.minecraft.world.ChunkCoordIntPair; -import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.fluids.FluidStack; public abstract class LargeFusionComputer extends GT_MetaTileEntity_TooltipMultiBlockBase_EM implements IConstructable, ISurvivalConstructable { @@ -50,50 +53,46 @@ public abstract class LargeFusionComputer extends GT_MetaTileEntity_TooltipMulti public GT_Recipe mLastRecipe; public int para; public int mEUStore; - private static final ClassValue<IStructureDefinition<LargeFusionComputer>> STRUCTURE_DEFINITION = - new ClassValue<IStructureDefinition<LargeFusionComputer>>() { - @Override - protected IStructureDefinition<LargeFusionComputer> computeValue(Class<?> type) { - return StructureDefinition.<LargeFusionComputer>builder() - .addShape(MAIN_NAME, transpose(new String[][] {L0, L1, L2, L3, L2, L1, L0})) - .addElement('H', lazy(x -> ofBlock(x.getCoilBlock(), x.getCoilMeta()))) - .addElement('C', lazy(x -> ofBlock(x.getCasingBlock(), x.getCasingMeta()))) - .addElement('B', lazy(x -> ofBlock(x.getGlassBlock(), x.getGlassMeta()))) - .addElement('I', lazy(x -> GT_HatchElementBuilder.<LargeFusionComputer>builder() - .atLeast(GT_HatchElement.InputHatch) - .adder(LargeFusionComputer::addInjector) - .casingIndex(x.textureIndex()) - .dot(1) - .buildAndChain(x.getGlassBlock(), x.getGlassMeta()))) - .addElement('O', lazy(x -> GT_HatchElementBuilder.<LargeFusionComputer>builder() - .atLeast(GT_HatchElement.OutputHatch) - .adder(LargeFusionComputer::addExtractor) - .casingIndex(x.textureIndex()) - .dot(2) - .buildAndChain(x.getGlassBlock(), x.getGlassMeta()))) - .addElement('E', lazy(x -> GT_HatchElementBuilder.<LargeFusionComputer>builder() - .atLeast(HatchElement.EnergyMulti.or(GT_HatchElement.Energy)) - .adder(LargeFusionComputer::addEnergyInjector) - .casingIndex(x.textureIndex()) - .dot(3) - .buildAndChain(x.getCasingBlock(), x.getCasingMeta()))) - .addElement('F', lazy(x -> ofFrame(x.getFrameBox()))) - .build(); - } - }; + private static final ClassValue<IStructureDefinition<LargeFusionComputer>> STRUCTURE_DEFINITION = new ClassValue<IStructureDefinition<LargeFusionComputer>>() { + + @Override + protected IStructureDefinition<LargeFusionComputer> computeValue(Class<?> type) { + return StructureDefinition.<LargeFusionComputer>builder() + .addShape(MAIN_NAME, transpose(new String[][] { L0, L1, L2, L3, L2, L1, L0 })) + .addElement('H', lazy(x -> ofBlock(x.getCoilBlock(), x.getCoilMeta()))) + .addElement('C', lazy(x -> ofBlock(x.getCasingBlock(), x.getCasingMeta()))) + .addElement('B', lazy(x -> ofBlock(x.getGlassBlock(), x.getGlassMeta()))) + .addElement( + 'I', + lazy( + x -> GT_HatchElementBuilder.<LargeFusionComputer>builder() + .atLeast(GT_HatchElement.InputHatch).adder(LargeFusionComputer::addInjector) + .casingIndex(x.textureIndex()).dot(1) + .buildAndChain(x.getGlassBlock(), x.getGlassMeta()))) + .addElement( + 'O', + lazy( + x -> GT_HatchElementBuilder.<LargeFusionComputer>builder() + .atLeast(GT_HatchElement.OutputHatch) + .adder(LargeFusionComputer::addExtractor).casingIndex(x.textureIndex()) + .dot(2).buildAndChain(x.getGlassBlock(), x.getGlassMeta()))) + .addElement( + 'E', + lazy( + x -> GT_HatchElementBuilder.<LargeFusionComputer>builder() + .atLeast(HatchElement.EnergyMulti.or(GT_HatchElement.Energy)) + .adder(LargeFusionComputer::addEnergyInjector).casingIndex(x.textureIndex()) + .dot(3).buildAndChain(x.getCasingBlock(), x.getCasingMeta()))) + .addElement('F', lazy(x -> ofFrame(x.getFrameBox()))).build(); + } + }; static { Textures.BlockIcons.setCasingTextureForId( 52, TextureFactory.of( - TextureFactory.builder() - .addIcon(MACHINE_CASING_FUSION_GLASS_YELLOW) - .extFacing() - .build(), - TextureFactory.builder() - .addIcon(MACHINE_CASING_FUSION_GLASS_YELLOW_GLOW) - .extFacing() - .glow() + TextureFactory.builder().addIcon(MACHINE_CASING_FUSION_GLASS_YELLOW).extFacing().build(), + TextureFactory.builder().addIcon(MACHINE_CASING_FUSION_GLASS_YELLOW_GLOW).extFacing().glow() .build())); } @@ -142,8 +141,7 @@ public abstract class LargeFusionComputer extends GT_MetaTileEntity_TooltipMulti @Override public boolean checkMachine_EM(IGregTechTileEntity aBaseMetaTileEntity, ItemStack aStack) { this.eEnergyMulti.clear(); - if (structureCheck_EM(MAIN_NAME, 23, 3, 40) - && mInputHatches.size() > 1 + if (structureCheck_EM(MAIN_NAME, 23, 3, 40) && mInputHatches.size() > 1 && !mOutputHatches.isEmpty() && (mEnergyHatches.size() + eEnergyMulti.size()) != 0) { fixAllIssue(); @@ -197,7 +195,8 @@ public abstract class LargeFusionComputer extends GT_MetaTileEntity_TooltipMulti int offX = ForgeDirection.getOrientation(aBaseMetaTileEntity.getFrontFacing()).offsetX; int offZ = ForgeDirection.getOrientation(aBaseMetaTileEntity.getFrontFacing()).offsetZ; GT_ChunkManager.requestChunkLoad( - (TileEntity) aBaseMetaTileEntity, new ChunkCoordIntPair(getChunkX() + offX, getChunkZ() + offZ)); + (TileEntity) aBaseMetaTileEntity, + new ChunkCoordIntPair(getChunkX() + offX, getChunkZ() + offZ)); GT_ChunkManager.requestChunkLoad( (TileEntity) aBaseMetaTileEntity, new ChunkCoordIntPair(getChunkX() + 1 + offX, getChunkZ() + 1 + offZ)); @@ -236,8 +235,7 @@ public abstract class LargeFusionComputer extends GT_MetaTileEntity_TooltipMulti mUpdate = 50; mUpdated = false; } - if (--mUpdate == 0 - || --mStartUpCheck == 0 + if (--mUpdate == 0 || --mStartUpCheck == 0 || cyclicUpdate_EM() || aBaseMetaTileEntity.hasWorkJustBeenEnabled()) { if (mUpdate <= -1000) { @@ -251,38 +249,38 @@ public abstract class LargeFusionComputer extends GT_MetaTileEntity_TooltipMulti for (GT_MetaTileEntity_Hatch_Energy tHatch : mEnergyHatches) if (isValidMetaTileEntity(tHatch)) { if (aBaseMetaTileEntity.getStoredEU() - + (2048L * tierOverclock() * getMaxPara() * extraPara(100)) - < maxEUStore() - && tHatch.getBaseMetaTileEntity() - .decreaseStoredEnergyUnits( - 2048L * tierOverclock() * getMaxPara() * extraPara(100), - false)) { + + (2048L * tierOverclock() * getMaxPara() * extraPara(100)) < maxEUStore() + && tHatch.getBaseMetaTileEntity().decreaseStoredEnergyUnits( + 2048L * tierOverclock() * getMaxPara() * extraPara(100), + false)) { aBaseMetaTileEntity.increaseStoredEnergyUnits( - 2048L * tierOverclock() * getMaxPara() * extraPara(100), true); + 2048L * tierOverclock() * getMaxPara() * extraPara(100), + true); } else if (aBaseMetaTileEntity.getStoredEU() + (2048L * tierOverclock()) < maxEUStore() && tHatch.getBaseMetaTileEntity() .decreaseStoredEnergyUnits(2048L * tierOverclock(), false)) { - aBaseMetaTileEntity.increaseStoredEnergyUnits(2048L * tierOverclock(), true); - } + aBaseMetaTileEntity + .increaseStoredEnergyUnits(2048L * tierOverclock(), true); + } } } if (this.eEnergyMulti != null) { for (GT_MetaTileEntity_Hatch_EnergyMulti tHatch : eEnergyMulti) if (isValidMetaTileEntity(tHatch)) { if (aBaseMetaTileEntity.getStoredEU() - + (2048L * tierOverclock() * getMaxPara() * extraPara(100)) - < maxEUStore() - && tHatch.getBaseMetaTileEntity() - .decreaseStoredEnergyUnits( - 2048L * tierOverclock() * getMaxPara() * extraPara(100), - false)) { + + (2048L * tierOverclock() * getMaxPara() * extraPara(100)) < maxEUStore() + && tHatch.getBaseMetaTileEntity().decreaseStoredEnergyUnits( + 2048L * tierOverclock() * getMaxPara() * extraPara(100), + false)) { aBaseMetaTileEntity.increaseStoredEnergyUnits( - 2048L * tierOverclock() * getMaxPara() * extraPara(100), true); + 2048L * tierOverclock() * getMaxPara() * extraPara(100), + true); } else if (aBaseMetaTileEntity.getStoredEU() + (2048L * tierOverclock()) < maxEUStore() && tHatch.getBaseMetaTileEntity() .decreaseStoredEnergyUnits(2048L * tierOverclock(), false)) { - aBaseMetaTileEntity.increaseStoredEnergyUnits(2048L * tierOverclock(), true); - } + aBaseMetaTileEntity + .increaseStoredEnergyUnits(2048L * tierOverclock(), true); + } } } if (this.mEUStore <= 0 && mMaxProgresstime > 0) { @@ -296,7 +294,8 @@ public abstract class LargeFusionComputer extends GT_MetaTileEntity_TooltipMulti if (mOutputFluids != null) for (FluidStack tStack : mOutputFluids) if (tStack != null) addOutput(tStack); mEfficiency = Math.max( - 0, Math.min(mEfficiency + mEfficiencyIncrease, getMaxEfficiency(mInventory[1]))); + 0, + Math.min(mEfficiency + mEfficiencyIncrease, getMaxEfficiency(mInventory[1]))); mOutputItems = null; mProgresstime = 0; mMaxProgresstime = 0; @@ -305,8 +304,7 @@ public abstract class LargeFusionComputer extends GT_MetaTileEntity_TooltipMulti if (aBaseMetaTileEntity.isAllowedToWork()) checkRecipe(mInventory[1]); } } else { - if (aTick % 100 == 0 - || aBaseMetaTileEntity.hasWorkJustBeenEnabled() + if (aTick % 100 == 0 || aBaseMetaTileEntity.hasWorkJustBeenEnabled() || aBaseMetaTileEntity.hasInventoryBeenModified()) { turnCasingActive(mMaxProgresstime > 0); if (aBaseMetaTileEntity.isAllowedToWork()) { @@ -316,9 +314,9 @@ public abstract class LargeFusionComputer extends GT_MetaTileEntity_TooltipMulti mMaxProgresstime = 0; turnCasingActive(false); } - getBaseMetaTileEntity() - .decreaseStoredEnergyUnits( - this.mLastRecipe.mSpecialValue - this.mEUt, false); + getBaseMetaTileEntity().decreaseStoredEnergyUnits( + this.mLastRecipe.mSpecialValue - this.mEUt, + false); } } if (mMaxProgresstime <= 0) mEfficiency = Math.max(0, mEfficiency - 1000); @@ -330,8 +328,8 @@ public abstract class LargeFusionComputer extends GT_MetaTileEntity_TooltipMulti stopMachine(); } } - aBaseMetaTileEntity.setErrorDisplayID( - (aBaseMetaTileEntity.getErrorDisplayID() & ~127) | (mMachine ? 0 : 64)); + aBaseMetaTileEntity + .setErrorDisplayID((aBaseMetaTileEntity.getErrorDisplayID() & ~127) | (mMachine ? 0 : 64)); aBaseMetaTileEntity.setActive(mMaxProgresstime > 0); } } @@ -361,28 +359,13 @@ public abstract class LargeFusionComputer extends GT_MetaTileEntity_TooltipMulti } @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) - return new ITexture[] { - TextureFactory.builder() - .addIcon(MACHINE_CASING_FUSION_GLASS) - .extFacing() - .build(), - getTextureOverlay() - }; - if (aActive) return new ITexture[] {Textures.BlockIcons.getCasingTextureForId(52)}; - return new ITexture[] { - TextureFactory.builder() - .addIcon(MACHINE_CASING_FUSION_GLASS) - .extFacing() - .build() - }; + return new ITexture[] { TextureFactory.builder().addIcon(MACHINE_CASING_FUSION_GLASS).extFacing().build(), + getTextureOverlay() }; + if (aActive) return new ITexture[] { Textures.BlockIcons.getCasingTextureForId(52) }; + return new ITexture[] { TextureFactory.builder().addIcon(MACHINE_CASING_FUSION_GLASS).extFacing().build() }; } @Override @@ -427,14 +410,11 @@ public abstract class LargeFusionComputer extends GT_MetaTileEntity_TooltipMulti return (mStartEnergy < 160000000 ? 4 : (mStartEnergy < 320000000 ? 2 : 1)); } if (tierOverclock() == 8) { - return (mStartEnergy < 160000000) - ? 8 + return (mStartEnergy < 160000000) ? 8 : ((mStartEnergy < 320000000) ? 4 : (mStartEnergy < 640000000) ? 2 : 1); } - return (mStartEnergy < 160000000) - ? 16 - : ((mStartEnergy < 320000000) - ? 8 + return (mStartEnergy < 160000000) ? 16 + : ((mStartEnergy < 320000000) ? 8 : ((mStartEnergy < 640000000) ? 4 : (mStartEnergy < 1280000000) ? 2 : 1)); } @@ -444,22 +424,26 @@ public abstract class LargeFusionComputer extends GT_MetaTileEntity_TooltipMulti if (tFluidList.size() > 1) { FluidStack[] tFluids = tFluidList.toArray(new FluidStack[0]); - GT_Recipe tRecipe = GT_Recipe.GT_Recipe_Map.sFusionRecipes.findRecipe( - this.getBaseMetaTileEntity(), this.mLastRecipe, false, Integer.MAX_VALUE, tFluids); + GT_Recipe tRecipe = GT_Recipe.GT_Recipe_Map.sFusionRecipes + .findRecipe(this.getBaseMetaTileEntity(), this.mLastRecipe, false, Integer.MAX_VALUE, tFluids); if ((tRecipe == null && !mRunningOnLoad) || (maxEUStore() < tRecipe.mSpecialValue)) { turnCasingActive(false); this.mLastRecipe = null; return false; } int pall = handleParallelRecipe( - tRecipe, tFluids, null, Math.min(getMaxPara() * extraPara(tRecipe.mSpecialValue), (int) - (getMaxEUInput() / tRecipe.mEUt / overclock(tRecipe.mSpecialValue)))); + tRecipe, + tFluids, + null, + Math.min( + getMaxPara() * extraPara(tRecipe.mSpecialValue), + (int) (getMaxEUInput() / tRecipe.mEUt / overclock(tRecipe.mSpecialValue)))); this.para = pall; if (mRunningOnLoad || pall > 0) { this.mLastRecipe = tRecipe; this.mEUt = (this.mLastRecipe.mEUt * overclock(this.mLastRecipe.mSpecialValue) * pall); - this.mMaxProgresstime = - Math.max(this.mLastRecipe.mDuration / overclock(this.mLastRecipe.mSpecialValue), 1); + this.mMaxProgresstime = Math + .max(this.mLastRecipe.mDuration / overclock(this.mLastRecipe.mSpecialValue), 1); this.mEfficiencyIncrease = 10000; this.mOutputFluids = getMultiOutput(mLastRecipe, pall).getKey().toArray(new FluidStack[0]); turnCasingActive(true); @@ -569,35 +553,43 @@ public abstract class LargeFusionComputer extends GT_MetaTileEntity_TooltipMulti @Override public String[] getInfoData() { - String tier = hatchTier() == 6 - ? EnumChatFormatting.RED + "I" + EnumChatFormatting.RESET - : hatchTier() == 7 - ? EnumChatFormatting.YELLOW + "II" + EnumChatFormatting.RESET + String tier = hatchTier() == 6 ? EnumChatFormatting.RED + "I" + EnumChatFormatting.RESET + : hatchTier() == 7 ? EnumChatFormatting.YELLOW + "II" + EnumChatFormatting.RESET : hatchTier() == 8 ? EnumChatFormatting.GRAY + "III" + EnumChatFormatting.RESET : "IV"; float plasmaOut = 0; int powerRequired = 0; if (this.mLastRecipe != null) { powerRequired = this.mLastRecipe.mEUt * this.para * overclock(this.mLastRecipe.mSpecialValue); if (this.mLastRecipe.getFluidOutput(0) != null) { - plasmaOut = (float) this.mLastRecipe.getFluidOutput(0).amount - / (float) this.mLastRecipe.mDuration + plasmaOut = (float) this.mLastRecipe.getFluidOutput(0).amount / (float) this.mLastRecipe.mDuration * this.para; } } - return new String[] { - EnumChatFormatting.BLUE + "Fusion Reactor MK " + EnumChatFormatting.RESET + tier, - StatCollector.translateToLocal("scanner.info.UX.0") + ": " + EnumChatFormatting.LIGHT_PURPLE - + GT_Utility.formatNumbers(this.para) + EnumChatFormatting.RESET, - StatCollector.translateToLocal("GT5U.fusion.req") + ": " + EnumChatFormatting.RED - + GT_Utility.formatNumbers(powerRequired) + EnumChatFormatting.RESET + "EU/t", - StatCollector.translateToLocal("GT5U.multiblock.energy") + ": " + EnumChatFormatting.GREEN - + GT_Utility.formatNumbers(mEUStore) + EnumChatFormatting.RESET + " EU / " - + EnumChatFormatting.YELLOW - + GT_Utility.formatNumbers(maxEUStore()) + EnumChatFormatting.RESET + " EU", - StatCollector.translateToLocal("GT5U.fusion.plasma") + ": " + EnumChatFormatting.YELLOW - + GT_Utility.formatNumbers(plasmaOut) + EnumChatFormatting.RESET + "L/t" - }; + return new String[] { EnumChatFormatting.BLUE + "Fusion Reactor MK " + EnumChatFormatting.RESET + tier, + StatCollector.translateToLocal("scanner.info.UX.0") + ": " + + EnumChatFormatting.LIGHT_PURPLE + + GT_Utility.formatNumbers(this.para) + + EnumChatFormatting.RESET, + StatCollector.translateToLocal("GT5U.fusion.req") + ": " + + EnumChatFormatting.RED + + GT_Utility.formatNumbers(powerRequired) + + EnumChatFormatting.RESET + + "EU/t", + StatCollector.translateToLocal("GT5U.multiblock.energy") + ": " + + EnumChatFormatting.GREEN + + GT_Utility.formatNumbers(mEUStore) + + EnumChatFormatting.RESET + + " EU / " + + EnumChatFormatting.YELLOW + + GT_Utility.formatNumbers(maxEUStore()) + + EnumChatFormatting.RESET + + " EU", + StatCollector.translateToLocal("GT5U.fusion.plasma") + ": " + + EnumChatFormatting.YELLOW + + GT_Utility.formatNumbers(plasmaOut) + + EnumChatFormatting.RESET + + "L/t" }; } protected long energyStorageCache; @@ -607,217 +599,123 @@ public abstract class LargeFusionComputer extends GT_MetaTileEntity_TooltipMulti super.drawTexts(screenElements, inventorySlot); screenElements - .widget(TextWidget.dynamicString(() -> StatCollector.translateToLocal("gui.LargeFusion.0") + " " - + GT_Utility.formatNumbers(energyStorageCache) + " EU") - .setSynced(false) - .setDefaultColor(COLOR_TEXT_WHITE.get()) - .setEnabled(widget -> getBaseMetaTileEntity().getErrorDisplayID() == 0)) + .widget( + TextWidget + .dynamicString( + () -> StatCollector.translateToLocal("gui.LargeFusion.0") + " " + + GT_Utility.formatNumbers(energyStorageCache) + + " EU") + .setSynced(false).setDefaultColor(COLOR_TEXT_WHITE.get()) + .setEnabled(widget -> getBaseMetaTileEntity().getErrorDisplayID() == 0)) .widget(new FakeSyncWidget.LongSyncer(this::maxEUStore, val -> energyStorageCache = val)) - .widget(TextWidget.dynamicString(() -> StatCollector.translateToLocal("gui.LargeFusion.1") + " " - + GT_Utility.formatNumbers(getEUVar()) + " EU") - .setSynced(false) - .setDefaultColor(COLOR_TEXT_WHITE.get()) - .setEnabled(widget -> getBaseMetaTileEntity().getErrorDisplayID() == 0)) + .widget( + TextWidget + .dynamicString( + () -> StatCollector.translateToLocal("gui.LargeFusion.1") + " " + + GT_Utility.formatNumbers(getEUVar()) + + " EU") + .setSynced(false).setDefaultColor(COLOR_TEXT_WHITE.get()) + .setEnabled(widget -> getBaseMetaTileEntity().getErrorDisplayID() == 0)) .widget(new FakeSyncWidget.LongSyncer(this::getEUVar, this::setEUVar)); } - public static final String[] L0 = { - " ", - " ", - " FCCCCCF ", - " FCIBICF ", - " FCCCCCF ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " FFF FFF ", - " CCC CCC ", - " CIC CIC ", - " CBC CBC ", - " CIC CIC ", - " CCC CCC ", - " FFF FFF ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " FCCCCCF ", - " FCIBICF ", - " FCCCCCF ", - " ", - " ", - }; - - public static final String[] L1 = { - " ", - " FCBBBCF ", - " CC CC ", - " CCCCC CCCCC ", - " CCCCCCC CCCCCCC ", - " CCCCCCC FCBBBCF CCCCCCC ", - " CCCCC CCCCC ", - " CCCC CCCC ", - " CCC CCC ", - " CCC CCC ", - " CCC CCC ", - " CCC CCC ", - " CCC CCC ", - " CCC CCC ", - " CCC CCC ", - " CCC CCC ", - " CCC CCC ", - " CCC CCC ", - " CCC CCC ", - " CCC CCC ", - " FCCCF FCCCF ", - " C C C C ", - " B B B B ", - " B B B B ", - " B B B B ", - " C C C C ", - " FCCCF FCCCF ", - " CCC CCC ", - " CCC CCC ", - " CCC CCC ", - " CCC CCC ", - " CCC CCC ", - " CCC CCC ", - " CCC CCC ", - " CCC CCC ", - " CCC CCC ", - " CCC CCC ", - " CCC CCC ", - " CCC CCC ", - " CCCC CCCC ", - " CCCCC CCCCC ", - " CCCCCCC FCBBBCF CCCCCCC ", - " CCCCCCC CCCCCCC ", - " CCCCC CCCCC ", - " CC CC ", - " FCBBBCF ", - " ", - }; - - public static final String[] L2 = { - " FCCCCCF ", - " CC CC ", - " CCCCC CCCCC ", - " CCCCCHHHHHHHHHCCCCC ", - " CCCCHHHCC CCHHHCCCC ", - " CCCHHCCCCC CCCCCHHCCC ", - " ECHHCCCCC FCCCCCF CCCCCHHCE ", - " CCHCCCC CCCCHCC ", - " CCHCCC CCCHCC ", - " CCHCE ECHCC ", - " ECHCC CCHCE ", - " CCHCE ECHCC ", - " CCHCC CCHCC ", - " CCHCC CCHCC ", - " CCHCC CCHCC ", - " CCHCC CCHCC ", - " CCHCC CCHCC ", - " CCHCC CCHCC ", - " CCHCC CCHCC ", - " CCHCC CCHCC ", - "FCCHCCF FCCHCCF", - "C H C C H C", - "C H C C H C", - "C H C C H C", - "C H C C H C", - "C H C C H C", - "FCCHCCF FCCHCCF", - " CCHCC CCHCC ", - " CCHCC CCHCC ", - " CCHCC CCHCC ", - " CCHCC CCHCC ", - " CCHCC CCHCC ", - " CCHCC CCHCC ", - " CCHCC CCHCC ", - " CCHCC CCHCC ", - " CCHCE ECHCC ", - " ECHCC CCHCE ", - " CCHCE ECHCC ", - " CCHCCC CCCHCC ", - " CCHCCCC CCCCHCC ", - " ECHHCCCCC FCCCCCF CCCCCHHCE ", - " CCCHHCCCCC CCCCCHHCCC ", - " CCCCHHHCC CCHHHCCCC ", - " CCCCCHHHHHHHHHCCCCC ", - " CCCCC CCCCC ", - " CC CC ", - " FCCCCCF ", - }; - - public static final String[] L3 = { - " FCOBOCF ", - " CC CC ", - " CCCHHHHHHHHHCCC ", - " CCHHHHHHHHHHHHHHHCC ", - " CCHHHHHHHHHHHHHHHHHHHCC ", - " CHHHHHHHCC CCHHHHHHHC ", - " CHHHHHCCC FCOBOCF CCCHHHHHC ", - " CHHHHCC CCHHHHC ", - " CHHHCC CCHHHC ", - " CHHHC CHHHC ", - " CHHHC CHHHC ", - " CHHHC CHHHC ", - " CHHHC CHHHC ", - " CHHHC CHHHC ", - " CHHHC CHHHC ", - " CHHHC CHHHC ", - " CHHHC CHHHC ", - " CHHHC CHHHC ", - " CHHHC CHHHC ", - " CHHHC CHHHC ", - "FCHHHCF FCHHHCF", - "C HHH C C HHH C", - "O HHH O O HHH O", - "B HHH B B HHH B", - "O HHH O O HHH O", - "C HHH C C HHH C", - "FCHHHCF FCHHHCF", - " CHHHC CHHHC ", - " CHHHC CHHHC ", - " CHHHC CHHHC ", - " CHHHC CHHHC ", - " CHHHC CHHHC ", - " CHHHC CHHHC ", - " CHHHC CHHHC ", - " CHHHC CHHHC ", - " CHHHC CHHHC ", - " CHHHC CHHHC ", - " CHHHC CHHHC ", - " CHHHCC CCHHHC ", - " CHHHHCC CCHHHHC ", - " CHHHHHCCC FCO~OCF CCCHHHHHC ", - " CHHHHHHHCC CCHHHHHHHC ", - " CCHHHHHHHHHHHHHHHHHHHCC ", - " CCHHHHHHHHHHHHHHHCC ", - " CCCHHHHHHHHHCCC ", - " CC CC ", - " FCOBOCF ", - }; + public static final String[] L0 = { " ", + " ", " FCCCCCF ", + " FCIBICF ", " FCCCCCF ", + " ", " ", + " ", " ", + " ", " ", + " ", " ", + " ", " ", + " ", " ", + " ", " ", + " ", " FFF FFF ", + " CCC CCC ", " CIC CIC ", + " CBC CBC ", " CIC CIC ", + " CCC CCC ", " FFF FFF ", + " ", " ", + " ", " ", + " ", " ", + " ", " ", + " ", " ", + " ", " ", + " ", " ", + " ", " FCCCCCF ", + " FCIBICF ", " FCCCCCF ", + " ", " ", }; + + public static final String[] L1 = { " ", + " FCBBBCF ", " CC CC ", + " CCCCC CCCCC ", " CCCCCCC CCCCCCC ", + " CCCCCCC FCBBBCF CCCCCCC ", " CCCCC CCCCC ", + " CCCC CCCC ", " CCC CCC ", + " CCC CCC ", " CCC CCC ", + " CCC CCC ", " CCC CCC ", + " CCC CCC ", " CCC CCC ", + " CCC CCC ", " CCC CCC ", + " CCC CCC ", " CCC CCC ", + " CCC CCC ", " FCCCF FCCCF ", + " C C C C ", " B B B B ", + " B B B B ", " B B B B ", + " C C C C ", " FCCCF FCCCF ", + " CCC CCC ", " CCC CCC ", + " CCC CCC ", " CCC CCC ", + " CCC CCC ", " CCC CCC ", + " CCC CCC ", " CCC CCC ", + " CCC CCC ", " CCC CCC ", + " CCC CCC ", " CCC CCC ", + " CCCC CCCC ", " CCCCC CCCCC ", + " CCCCCCC FCBBBCF CCCCCCC ", " CCCCCCC CCCCCCC ", + " CCCCC CCCCC ", " CC CC ", + " FCBBBCF ", " ", }; + + public static final String[] L2 = { " FCCCCCF ", + " CC CC ", " CCCCC CCCCC ", + " CCCCCHHHHHHHHHCCCCC ", " CCCCHHHCC CCHHHCCCC ", + " CCCHHCCCCC CCCCCHHCCC ", " ECHHCCCCC FCCCCCF CCCCCHHCE ", + " CCHCCCC CCCCHCC ", " CCHCCC CCCHCC ", + " CCHCE ECHCC ", " ECHCC CCHCE ", + " CCHCE ECHCC ", " CCHCC CCHCC ", + " CCHCC CCHCC ", " CCHCC CCHCC ", + " CCHCC CCHCC ", " CCHCC CCHCC ", + " CCHCC CCHCC ", " CCHCC CCHCC ", + " CCHCC CCHCC ", "FCCHCCF FCCHCCF", + "C H C C H C", "C H C C H C", + "C H C C H C", "C H C C H C", + "C H C C H C", "FCCHCCF FCCHCCF", + " CCHCC CCHCC ", " CCHCC CCHCC ", + " CCHCC CCHCC ", " CCHCC CCHCC ", + " CCHCC CCHCC ", " CCHCC CCHCC ", + " CCHCC CCHCC ", " CCHCC CCHCC ", + " CCHCE ECHCC ", " ECHCC CCHCE ", + " CCHCE ECHCC ", " CCHCCC CCCHCC ", + " CCHCCCC CCCCHCC ", " ECHHCCCCC FCCCCCF CCCCCHHCE ", + " CCCHHCCCCC CCCCCHHCCC ", " CCCCHHHCC CCHHHCCCC ", + " CCCCCHHHHHHHHHCCCCC ", " CCCCC CCCCC ", + " CC CC ", " FCCCCCF ", }; + + public static final String[] L3 = { " FCOBOCF ", + " CC CC ", " CCCHHHHHHHHHCCC ", + " CCHHHHHHHHHHHHHHHCC ", " CCHHHHHHHHHHHHHHHHHHHCC ", + " CHHHHHHHCC CCHHHHHHHC ", " CHHHHHCCC FCOBOCF CCCHHHHHC ", + " CHHHHCC CCHHHHC ", " CHHHCC CCHHHC ", + " CHHHC CHHHC ", " CHHHC CHHHC ", + " CHHHC CHHHC ", " CHHHC CHHHC ", + " CHHHC CHHHC ", " CHHHC CHHHC ", + " CHHHC CHHHC ", " CHHHC CHHHC ", + " CHHHC CHHHC ", " CHHHC CHHHC ", + " CHHHC CHHHC ", "FCHHHCF FCHHHCF", + "C HHH C C HHH C", "O HHH O O HHH O", + "B HHH B B HHH B", "O HHH O O HHH O", + "C HHH C C HHH C", "FCHHHCF FCHHHCF", + " CHHHC CHHHC ", " CHHHC CHHHC ", + " CHHHC CHHHC ", " CHHHC CHHHC ", + " CHHHC CHHHC ", " CHHHC CHHHC ", + " CHHHC CHHHC ", " CHHHC CHHHC ", + " CHHHC CHHHC ", " CHHHC CHHHC ", + " CHHHC CHHHC ", " CHHHCC CCHHHC ", + " CHHHHCC CCHHHHC ", " CHHHHHCCC FCO~OCF CCCHHHHHC ", + " CHHHHHHHCC CCHHHHHHHC ", " CCHHHHHHHHHHHHHHHHHHHCC ", + " CCHHHHHHHHHHHHHHHCC ", " CCCHHHHHHHHHCCC ", + " CC CC ", " FCOBOCF ", }; } diff --git a/src/main/java/goodgenerator/blocks/tileEntity/base/LargeFusionComputerPP.java b/src/main/java/goodgenerator/blocks/tileEntity/base/LargeFusionComputerPP.java index b1d6a1c3e9..36b2f48b5f 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/base/LargeFusionComputerPP.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/base/LargeFusionComputerPP.java @@ -6,6 +6,18 @@ import static com.gtnewhorizon.structurelib.structure.StructureUtility.*; import static gregtech.api.enums.Textures.BlockIcons.*; import static gregtech.api.util.GT_StructureUtility.ofFrame; +import java.util.ArrayList; + +import net.minecraft.block.Block; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumChatFormatting; +import net.minecraft.util.StatCollector; +import net.minecraft.world.ChunkCoordIntPair; +import net.minecraftforge.common.util.ForgeDirection; +import net.minecraftforge.fluids.FluidStack; + import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_EnergyMulti; import com.gtnewhorizon.structurelib.alignment.constructable.IConstructable; import com.gtnewhorizon.structurelib.alignment.constructable.ISurvivalConstructable; @@ -16,6 +28,7 @@ import com.gtnewhorizons.modularui.common.widget.DynamicPositionedColumn; import com.gtnewhorizons.modularui.common.widget.FakeSyncWidget; import com.gtnewhorizons.modularui.common.widget.SlotWidget; import com.gtnewhorizons.modularui.common.widget.TextWidget; + import gregtech.api.enums.GT_HatchElement; import gregtech.api.enums.Materials; import gregtech.api.enums.Textures; @@ -31,16 +44,6 @@ import gregtech.api.render.TextureFactory; import gregtech.api.util.GT_HatchElementBuilder; import gregtech.api.util.GT_Recipe; import gregtech.api.util.GT_Utility; -import java.util.ArrayList; -import net.minecraft.block.Block; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.StatCollector; -import net.minecraft.world.ChunkCoordIntPair; -import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.fluids.FluidStack; public abstract class LargeFusionComputerPP extends GT_MetaTileEntity_TooltipMultiBlockBase_EM implements IConstructable, ISurvivalConstructable { @@ -50,50 +53,47 @@ public abstract class LargeFusionComputerPP extends GT_MetaTileEntity_TooltipMul public GT_Recipe mLastRecipe; public int para; public long mEUStore; - private static final ClassValue<IStructureDefinition<LargeFusionComputerPP>> STRUCTURE_DEFINITION = - new ClassValue<IStructureDefinition<LargeFusionComputerPP>>() { - @Override - protected IStructureDefinition<LargeFusionComputerPP> computeValue(Class<?> type) { - return StructureDefinition.<LargeFusionComputerPP>builder() - .addShape(MAIN_NAME, transpose(new String[][] {L0, L1, L2, L3, L2, L1, L0})) - .addElement('H', lazy(x -> ofBlock(x.getCoilBlock(), x.getCoilMeta()))) - .addElement('C', lazy(x -> ofBlock(x.getCasingBlock(), x.getCasingMeta()))) - .addElement('B', lazy(x -> ofBlock(x.getGlassBlock(), x.getGlassMeta()))) - .addElement('I', lazy(x -> GT_HatchElementBuilder.<LargeFusionComputerPP>builder() - .atLeast(GT_HatchElement.InputHatch) - .adder(LargeFusionComputerPP::addInjector) - .casingIndex(x.textureIndex()) - .dot(1) - .buildAndChain(x.getGlassBlock(), x.getGlassMeta()))) - .addElement('O', lazy(x -> GT_HatchElementBuilder.<LargeFusionComputerPP>builder() - .atLeast(GT_HatchElement.OutputHatch) - .adder(LargeFusionComputerPP::addExtractor) - .casingIndex(x.textureIndex()) - .dot(2) - .buildAndChain(x.getGlassBlock(), x.getGlassMeta()))) - .addElement('E', lazy(x -> GT_HatchElementBuilder.<LargeFusionComputerPP>builder() - .atLeast(HatchElement.EnergyMulti.or(GT_HatchElement.Energy)) - .adder(LargeFusionComputerPP::addEnergyInjector) - .casingIndex(x.textureIndex()) - .dot(3) - .buildAndChain(x.getCasingBlock(), x.getCasingMeta()))) - .addElement('F', lazy(x -> ofFrame(x.getFrameBox()))) - .build(); - } - }; + private static final ClassValue<IStructureDefinition<LargeFusionComputerPP>> STRUCTURE_DEFINITION = new ClassValue<IStructureDefinition<LargeFusionComputerPP>>() { + + @Override + protected IStructureDefinition<LargeFusionComputerPP> computeValue(Class<?> type) { + return StructureDefinition.<LargeFusionComputerPP>builder() + .addShape(MAIN_NAME, transpose(new String[][] { L0, L1, L2, L3, L2, L1, L0 })) + .addElement('H', lazy(x -> ofBlock(x.getCoilBlock(), x.getCoilMeta()))) + .addElement('C', lazy(x -> ofBlock(x.getCasingBlock(), x.getCasingMeta()))) + .addElement('B', lazy(x -> ofBlock(x.getGlassBlock(), x.getGlassMeta()))) + .addElement( + 'I', + lazy( + x -> GT_HatchElementBuilder.<LargeFusionComputerPP>builder() + .atLeast(GT_HatchElement.InputHatch) + .adder(LargeFusionComputerPP::addInjector).casingIndex(x.textureIndex()) + .dot(1).buildAndChain(x.getGlassBlock(), x.getGlassMeta()))) + .addElement( + 'O', + lazy( + x -> GT_HatchElementBuilder.<LargeFusionComputerPP>builder() + .atLeast(GT_HatchElement.OutputHatch) + .adder(LargeFusionComputerPP::addExtractor).casingIndex(x.textureIndex()) + .dot(2).buildAndChain(x.getGlassBlock(), x.getGlassMeta()))) + .addElement( + 'E', + lazy( + x -> GT_HatchElementBuilder.<LargeFusionComputerPP>builder() + .atLeast(HatchElement.EnergyMulti.or(GT_HatchElement.Energy)) + .adder(LargeFusionComputerPP::addEnergyInjector) + .casingIndex(x.textureIndex()).dot(3) + .buildAndChain(x.getCasingBlock(), x.getCasingMeta()))) + .addElement('F', lazy(x -> ofFrame(x.getFrameBox()))).build(); + } + }; static { Textures.BlockIcons.setCasingTextureForId( 52, TextureFactory.of( - TextureFactory.builder() - .addIcon(MACHINE_CASING_FUSION_GLASS_YELLOW) - .extFacing() - .build(), - TextureFactory.builder() - .addIcon(MACHINE_CASING_FUSION_GLASS_YELLOW_GLOW) - .extFacing() - .glow() + TextureFactory.builder().addIcon(MACHINE_CASING_FUSION_GLASS_YELLOW).extFacing().build(), + TextureFactory.builder().addIcon(MACHINE_CASING_FUSION_GLASS_YELLOW_GLOW).extFacing().glow() .build())); } @@ -126,8 +126,7 @@ public abstract class LargeFusionComputerPP extends GT_MetaTileEntity_TooltipMul public int textureIndex() { return 53; - } - ; + }; public abstract ITexture getTextureOverlay(); @@ -141,8 +140,7 @@ public abstract class LargeFusionComputerPP extends GT_MetaTileEntity_TooltipMul @Override public boolean checkMachine_EM(IGregTechTileEntity aBaseMetaTileEntity, ItemStack aStack) { this.eEnergyMulti.clear(); - if (structureCheck_EM(MAIN_NAME, 23, 3, 40) - && mInputHatches.size() > 1 + if (structureCheck_EM(MAIN_NAME, 23, 3, 40) && mInputHatches.size() > 1 && !mOutputHatches.isEmpty() && (mEnergyHatches.size() + eEnergyMulti.size()) != 0) { fixAllIssue(); @@ -196,7 +194,8 @@ public abstract class LargeFusionComputerPP extends GT_MetaTileEntity_TooltipMul int offX = ForgeDirection.getOrientation(aBaseMetaTileEntity.getFrontFacing()).offsetX; int offZ = ForgeDirection.getOrientation(aBaseMetaTileEntity.getFrontFacing()).offsetZ; GT_ChunkManager.requestChunkLoad( - (TileEntity) aBaseMetaTileEntity, new ChunkCoordIntPair(getChunkX() + offX, getChunkZ() + offZ)); + (TileEntity) aBaseMetaTileEntity, + new ChunkCoordIntPair(getChunkX() + offX, getChunkZ() + offZ)); GT_ChunkManager.requestChunkLoad( (TileEntity) aBaseMetaTileEntity, new ChunkCoordIntPair(getChunkX() + 1 + offX, getChunkZ() + 1 + offZ)); @@ -235,8 +234,7 @@ public abstract class LargeFusionComputerPP extends GT_MetaTileEntity_TooltipMul mUpdate = 50; mUpdated = false; } - if (--mUpdate == 0 - || --mStartUpCheck == 0 + if (--mUpdate == 0 || --mStartUpCheck == 0 || cyclicUpdate_EM() || aBaseMetaTileEntity.hasWorkJustBeenEnabled()) { if (mUpdate <= -1000) { @@ -250,38 +248,38 @@ public abstract class LargeFusionComputerPP extends GT_MetaTileEntity_TooltipMul for (GT_MetaTileEntity_Hatch_Energy tHatch : mEnergyHatches) if (isValidMetaTileEntity(tHatch)) { if (aBaseMetaTileEntity.getStoredEU() - + (2048L * tierOverclock() * getMaxPara() * extraPara(100)) - < maxEUStore() - && tHatch.getBaseMetaTileEntity() - .decreaseStoredEnergyUnits( - 2048L * tierOverclock() * getMaxPara() * extraPara(100), - false)) { + + (2048L * tierOverclock() * getMaxPara() * extraPara(100)) < maxEUStore() + && tHatch.getBaseMetaTileEntity().decreaseStoredEnergyUnits( + 2048L * tierOverclock() * getMaxPara() * extraPara(100), + false)) { aBaseMetaTileEntity.increaseStoredEnergyUnits( - 2048L * tierOverclock() * getMaxPara() * extraPara(100), true); + 2048L * tierOverclock() * getMaxPara() * extraPara(100), + true); } else if (aBaseMetaTileEntity.getStoredEU() + (2048L * tierOverclock()) < maxEUStore() && tHatch.getBaseMetaTileEntity() .decreaseStoredEnergyUnits(2048L * tierOverclock(), false)) { - aBaseMetaTileEntity.increaseStoredEnergyUnits(2048L * tierOverclock(), true); - } + aBaseMetaTileEntity + .increaseStoredEnergyUnits(2048L * tierOverclock(), true); + } } } if (this.eEnergyMulti != null) { for (GT_MetaTileEntity_Hatch_EnergyMulti tHatch : eEnergyMulti) if (isValidMetaTileEntity(tHatch)) { if (aBaseMetaTileEntity.getStoredEU() - + (2048L * tierOverclock() * getMaxPara() * extraPara(100)) - < maxEUStore() - && tHatch.getBaseMetaTileEntity() - .decreaseStoredEnergyUnits( - 2048L * tierOverclock() * getMaxPara() * extraPara(100), - false)) { + + (2048L * tierOverclock() * getMaxPara() * extraPara(100)) < maxEUStore() + && tHatch.getBaseMetaTileEntity().decreaseStoredEnergyUnits( + 2048L * tierOverclock() * getMaxPara() * extraPara(100), + false)) { aBaseMetaTileEntity.increaseStoredEnergyUnits( - 2048L * tierOverclock() * getMaxPara() * extraPara(100), true); + 2048L * tierOverclock() * getMaxPara() * extraPara(100), + true); } else if (aBaseMetaTileEntity.getStoredEU() + (2048L * tierOverclock()) < maxEUStore() && tHatch.getBaseMetaTileEntity() .decreaseStoredEnergyUnits(2048L * tierOverclock(), false)) { - aBaseMetaTileEntity.increaseStoredEnergyUnits(2048L * tierOverclock(), true); - } + aBaseMetaTileEntity + .increaseStoredEnergyUnits(2048L * tierOverclock(), true); + } } } if (this.mEUStore <= 0 && mMaxProgresstime > 0) { @@ -295,7 +293,8 @@ public abstract class LargeFusionComputerPP extends GT_MetaTileEntity_TooltipMul if (mOutputFluids != null) for (FluidStack tStack : mOutputFluids) if (tStack != null) addOutput(tStack); mEfficiency = Math.max( - 0, Math.min(mEfficiency + mEfficiencyIncrease, getMaxEfficiency(mInventory[1]))); + 0, + Math.min(mEfficiency + mEfficiencyIncrease, getMaxEfficiency(mInventory[1]))); mOutputItems = null; mProgresstime = 0; mMaxProgresstime = 0; @@ -304,8 +303,7 @@ public abstract class LargeFusionComputerPP extends GT_MetaTileEntity_TooltipMul if (aBaseMetaTileEntity.isAllowedToWork()) checkRecipe(mInventory[1]); } } else { - if (aTick % 100 == 0 - || aBaseMetaTileEntity.hasWorkJustBeenEnabled() + if (aTick % 100 == 0 || aBaseMetaTileEntity.hasWorkJustBeenEnabled() || aBaseMetaTileEntity.hasInventoryBeenModified()) { turnCasingActive(mMaxProgresstime > 0); if (aBaseMetaTileEntity.isAllowedToWork()) { @@ -315,9 +313,9 @@ public abstract class LargeFusionComputerPP extends GT_MetaTileEntity_TooltipMul mMaxProgresstime = 0; turnCasingActive(false); } - getBaseMetaTileEntity() - .decreaseStoredEnergyUnits( - this.mLastRecipe.mSpecialValue - this.mEUt, false); + getBaseMetaTileEntity().decreaseStoredEnergyUnits( + this.mLastRecipe.mSpecialValue - this.mEUt, + false); } } if (mMaxProgresstime <= 0) mEfficiency = Math.max(0, mEfficiency - 1000); @@ -329,8 +327,8 @@ public abstract class LargeFusionComputerPP extends GT_MetaTileEntity_TooltipMul stopMachine(); } } - aBaseMetaTileEntity.setErrorDisplayID( - (aBaseMetaTileEntity.getErrorDisplayID() & ~127) | (mMachine ? 0 : 64)); + aBaseMetaTileEntity + .setErrorDisplayID((aBaseMetaTileEntity.getErrorDisplayID() & ~127) | (mMachine ? 0 : 64)); aBaseMetaTileEntity.setActive(mMaxProgresstime > 0); } } @@ -360,28 +358,13 @@ public abstract class LargeFusionComputerPP extends GT_MetaTileEntity_TooltipMul } @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) - return new ITexture[] { - TextureFactory.builder() - .addIcon(MACHINE_CASING_FUSION_GLASS) - .extFacing() - .build(), - getTextureOverlay() - }; - if (aActive) return new ITexture[] {Textures.BlockIcons.getCasingTextureForId(52)}; - return new ITexture[] { - TextureFactory.builder() - .addIcon(MACHINE_CASING_FUSION_GLASS) - .extFacing() - .build() - }; + return new ITexture[] { TextureFactory.builder().addIcon(MACHINE_CASING_FUSION_GLASS).extFacing().build(), + getTextureOverlay() }; + if (aActive) return new ITexture[] { Textures.BlockIcons.getCasingTextureForId(52) }; + return new ITexture[] { TextureFactory.builder().addIcon(MACHINE_CASING_FUSION_GLASS).extFacing().build() }; } @Override @@ -425,22 +408,26 @@ public abstract class LargeFusionComputerPP extends GT_MetaTileEntity_TooltipMul if (tFluidList.size() > 1) { FluidStack[] tFluids = tFluidList.toArray(new FluidStack[0]); - GT_Recipe tRecipe = GT_Recipe.GT_Recipe_Map.sFusionRecipes.findRecipe( - this.getBaseMetaTileEntity(), this.mLastRecipe, false, Integer.MAX_VALUE, tFluids); + GT_Recipe tRecipe = GT_Recipe.GT_Recipe_Map.sFusionRecipes + .findRecipe(this.getBaseMetaTileEntity(), this.mLastRecipe, false, Integer.MAX_VALUE, tFluids); if ((tRecipe == null && !mRunningOnLoad) || (maxEUStore() < tRecipe.mSpecialValue)) { turnCasingActive(false); this.mLastRecipe = null; return false; } int pall = handleParallelRecipe( - tRecipe, tFluids, null, Math.min(getMaxPara() * extraPara(tRecipe.mSpecialValue), (int) - (getMaxEUInput() / tRecipe.mEUt / overclock(tRecipe.mSpecialValue)))); + tRecipe, + tFluids, + null, + Math.min( + getMaxPara() * extraPara(tRecipe.mSpecialValue), + (int) (getMaxEUInput() / tRecipe.mEUt / overclock(tRecipe.mSpecialValue)))); this.para = pall; if (mRunningOnLoad || pall > 0) { this.mLastRecipe = tRecipe; this.mEUt = (this.mLastRecipe.mEUt * overclock(this.mLastRecipe.mSpecialValue) * pall); - this.mMaxProgresstime = - Math.max(this.mLastRecipe.mDuration / overclock(this.mLastRecipe.mSpecialValue), 1); + this.mMaxProgresstime = Math + .max(this.mLastRecipe.mDuration / overclock(this.mLastRecipe.mSpecialValue), 1); this.mEfficiencyIncrease = 10000; this.mOutputFluids = getMultiOutput(mLastRecipe, pall).getKey().toArray(new FluidStack[0]); turnCasingActive(true); @@ -550,33 +537,42 @@ public abstract class LargeFusionComputerPP extends GT_MetaTileEntity_TooltipMul @Override public String[] getInfoData() { - String tier = hatchTier() == 9 - ? EnumChatFormatting.BLUE + "IV" + EnumChatFormatting.RESET + String tier = hatchTier() == 9 ? EnumChatFormatting.BLUE + "IV" + EnumChatFormatting.RESET : EnumChatFormatting.GOLD + "V" + EnumChatFormatting.RESET; float plasmaOut = 0; int powerRequired = 0; if (this.mLastRecipe != null) { powerRequired = this.mLastRecipe.mEUt * this.para; if (this.mLastRecipe.getFluidOutput(0) != null) { - plasmaOut = (float) this.mLastRecipe.getFluidOutput(0).amount - / (float) this.mLastRecipe.mDuration + plasmaOut = (float) this.mLastRecipe.getFluidOutput(0).amount / (float) this.mLastRecipe.mDuration * this.para; } } - return new String[] { - EnumChatFormatting.BLUE + "Fusion Reactor MK " + EnumChatFormatting.RESET + tier, - StatCollector.translateToLocal("scanner.info.UX.0") + ": " + EnumChatFormatting.LIGHT_PURPLE - + GT_Utility.formatNumbers(this.para) + EnumChatFormatting.RESET, - StatCollector.translateToLocal("GT5U.fusion.req") + ": " + EnumChatFormatting.RED - + GT_Utility.formatNumbers(powerRequired) + EnumChatFormatting.RESET + "EU/t", - StatCollector.translateToLocal("GT5U.multiblock.energy") + ": " + EnumChatFormatting.GREEN - + GT_Utility.formatNumbers(mEUStore) + EnumChatFormatting.RESET + " EU / " - + EnumChatFormatting.YELLOW - + GT_Utility.formatNumbers(maxEUStore()) + EnumChatFormatting.RESET + " EU", - StatCollector.translateToLocal("GT5U.fusion.plasma") + ": " + EnumChatFormatting.YELLOW - + GT_Utility.formatNumbers(plasmaOut) + EnumChatFormatting.RESET + "L/t" - }; + return new String[] { EnumChatFormatting.BLUE + "Fusion Reactor MK " + EnumChatFormatting.RESET + tier, + StatCollector.translateToLocal("scanner.info.UX.0") + ": " + + EnumChatFormatting.LIGHT_PURPLE + + GT_Utility.formatNumbers(this.para) + + EnumChatFormatting.RESET, + StatCollector.translateToLocal("GT5U.fusion.req") + ": " + + EnumChatFormatting.RED + + GT_Utility.formatNumbers(powerRequired) + + EnumChatFormatting.RESET + + "EU/t", + StatCollector.translateToLocal("GT5U.multiblock.energy") + ": " + + EnumChatFormatting.GREEN + + GT_Utility.formatNumbers(mEUStore) + + EnumChatFormatting.RESET + + " EU / " + + EnumChatFormatting.YELLOW + + GT_Utility.formatNumbers(maxEUStore()) + + EnumChatFormatting.RESET + + " EU", + StatCollector.translateToLocal("GT5U.fusion.plasma") + ": " + + EnumChatFormatting.YELLOW + + GT_Utility.formatNumbers(plasmaOut) + + EnumChatFormatting.RESET + + "L/t" }; } protected long energyStorageCache; @@ -586,217 +582,123 @@ public abstract class LargeFusionComputerPP extends GT_MetaTileEntity_TooltipMul super.drawTexts(screenElements, inventorySlot); screenElements - .widget(TextWidget.dynamicString(() -> StatCollector.translateToLocal("gui.LargeFusion.0") + " " - + GT_Utility.formatNumbers(energyStorageCache) + " EU") - .setSynced(false) - .setDefaultColor(COLOR_TEXT_WHITE.get()) - .setEnabled(widget -> getBaseMetaTileEntity().getErrorDisplayID() == 0)) + .widget( + TextWidget + .dynamicString( + () -> StatCollector.translateToLocal("gui.LargeFusion.0") + " " + + GT_Utility.formatNumbers(energyStorageCache) + + " EU") + .setSynced(false).setDefaultColor(COLOR_TEXT_WHITE.get()) + .setEnabled(widget -> getBaseMetaTileEntity().getErrorDisplayID() == 0)) .widget(new FakeSyncWidget.LongSyncer(this::maxEUStore, val -> energyStorageCache = val)) - .widget(TextWidget.dynamicString(() -> StatCollector.translateToLocal("gui.LargeFusion.1") + " " - + GT_Utility.formatNumbers(getEUVar()) + " EU") - .setSynced(false) - .setDefaultColor(COLOR_TEXT_WHITE.get()) - .setEnabled(widget -> getBaseMetaTileEntity().getErrorDisplayID() == 0)) + .widget( + TextWidget + .dynamicString( + () -> StatCollector.translateToLocal("gui.LargeFusion.1") + " " + + GT_Utility.formatNumbers(getEUVar()) + + " EU") + .setSynced(false).setDefaultColor(COLOR_TEXT_WHITE.get()) + .setEnabled(widget -> getBaseMetaTileEntity().getErrorDisplayID() == 0)) .widget(new FakeSyncWidget.LongSyncer(this::getEUVar, this::setEUVar)); } - public static final String[] L0 = { - " ", - " ", - " FCCCCCF ", - " FCIBICF ", - " FCCCCCF ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " FFF FFF ", - " CCC CCC ", - " CIC CIC ", - " CBC CBC ", - " CIC CIC ", - " CCC CCC ", - " FFF FFF ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " FCCCCCF ", - " FCIBICF ", - " FCCCCCF ", - " ", - " ", - }; - - public static final String[] L1 = { - " ", - " FCBBBCF ", - " CC CC ", - " CCCCC CCCCC ", - " CCCCCCC CCCCCCC ", - " CCCCCCC FCBBBCF CCCCCCC ", - " CCCCC CCCCC ", - " CCCC CCCC ", - " CCC CCC ", - " CCC CCC ", - " CCC CCC ", - " CCC CCC ", - " CCC CCC ", - " CCC CCC ", - " CCC CCC ", - " CCC CCC ", - " CCC CCC ", - " CCC CCC ", - " CCC CCC ", - " CCC CCC ", - " FCCCF FCCCF ", - " C C C C ", - " B B B B ", - " B B B B ", - " B B B B ", - " C C C C ", - " FCCCF FCCCF ", - " CCC CCC ", - " CCC CCC ", - " CCC CCC ", - " CCC CCC ", - " CCC CCC ", - " CCC CCC ", - " CCC CCC ", - " CCC CCC ", - " CCC CCC ", - " CCC CCC ", - " CCC CCC ", - " CCC CCC ", - " CCCC CCCC ", - " CCCCC CCCCC ", - " CCCCCCC FCBBBCF CCCCCCC ", - " CCCCCCC CCCCCCC ", - " CCCCC CCCCC ", - " CC CC ", - " FCBBBCF ", - " ", - }; - - public static final String[] L2 = { - " FCCCCCF ", - " CC CC ", - " CCCCC CCCCC ", - " CCCCCHHHHHHHHHCCCCC ", - " CCCCHHHCC CCHHHCCCC ", - " CCCHHCCCCC CCCCCHHCCC ", - " ECHHCCCCC FCCCCCF CCCCCHHCE ", - " CCHCCCC CCCCHCC ", - " CCHCCC CCCHCC ", - " CCHCE ECHCC ", - " ECHCC CCHCE ", - " CCHCE ECHCC ", - " CCHCC CCHCC ", - " CCHCC CCHCC ", - " CCHCC CCHCC ", - " CCHCC CCHCC ", - " CCHCC CCHCC ", - " CCHCC CCHCC ", - " CCHCC CCHCC ", - " CCHCC CCHCC ", - "FCCHCCF FCCHCCF", - "C H C C H C", - "C H C C H C", - "C H C C H C", - "C H C C H C", - "C H C C H C", - "FCCHCCF FCCHCCF", - " CCHCC CCHCC ", - " CCHCC CCHCC ", - " CCHCC CCHCC ", - " CCHCC CCHCC ", - " CCHCC CCHCC ", - " CCHCC CCHCC ", - " CCHCC CCHCC ", - " CCHCC CCHCC ", - " CCHCE ECHCC ", - " ECHCC CCHCE ", - " CCHCE ECHCC ", - " CCHCCC CCCHCC ", - " CCHCCCC CCCCHCC ", - " ECHHCCCCC FCCCCCF CCCCCHHCE ", - " CCCHHCCCCC CCCCCHHCCC ", - " CCCCHHHCC CCHHHCCCC ", - " CCCCCHHHHHHHHHCCCCC ", - " CCCCC CCCCC ", - " CC CC ", - " FCCCCCF ", - }; - - public static final String[] L3 = { - " FCOBOCF ", - " CC CC ", - " CCCHHHHHHHHHCCC ", - " CCHHHHHHHHHHHHHHHCC ", - " CCHHHHHHHHHHHHHHHHHHHCC ", - " CHHHHHHHCC CCHHHHHHHC ", - " CHHHHHCCC FCOBOCF CCCHHHHHC ", - " CHHHHCC CCHHHHC ", - " CHHHCC CCHHHC ", - " CHHHC CHHHC ", - " CHHHC CHHHC ", - " CHHHC CHHHC ", - " CHHHC CHHHC ", - " CHHHC CHHHC ", - " CHHHC CHHHC ", - " CHHHC CHHHC ", - " CHHHC CHHHC ", - " CHHHC CHHHC ", - " CHHHC CHHHC ", - " CHHHC CHHHC ", - "FCHHHCF FCHHHCF", - "C HHH C C HHH C", - "O HHH O O HHH O", - "B HHH B B HHH B", - "O HHH O O HHH O", - "C HHH C C HHH C", - "FCHHHCF FCHHHCF", - " CHHHC CHHHC ", - " CHHHC CHHHC ", - " CHHHC CHHHC ", - " CHHHC CHHHC ", - " CHHHC CHHHC ", - " CHHHC CHHHC ", - " CHHHC CHHHC ", - " CHHHC CHHHC ", - " CHHHC CHHHC ", - " CHHHC CHHHC ", - " CHHHC CHHHC ", - " CHHHCC CCHHHC ", - " CHHHHCC CCHHHHC ", - " CHHHHHCCC FCO~OCF CCCHHHHHC ", - " CHHHHHHHCC CCHHHHHHHC ", - " CCHHHHHHHHHHHHHHHHHHHCC ", - " CCHHHHHHHHHHHHHHHCC ", - " CCCHHHHHHHHHCCC ", - " CC CC ", - " FCOBOCF ", - }; + public static final String[] L0 = { " ", + " ", " FCCCCCF ", + " FCIBICF ", " FCCCCCF ", + " ", " ", + " ", " ", + " ", " ", + " ", " ", + " ", " ", + " ", " ", + " ", " ", + " ", " FFF FFF ", + " CCC CCC ", " CIC CIC ", + " CBC CBC ", " CIC CIC ", + " CCC CCC ", " FFF FFF ", + " ", " ", + " ", " ", + " ", " ", + " ", " ", + " ", " ", + " ", " ", + " ", " ", + " ", " FCCCCCF ", + " FCIBICF ", " FCCCCCF ", + " ", " ", }; + + public static final String[] L1 = { " ", + " FCBBBCF ", " CC CC ", + " CCCCC CCCCC ", " CCCCCCC CCCCCCC ", + " CCCCCCC FCBBBCF CCCCCCC ", " CCCCC CCCCC ", + " CCCC CCCC ", " CCC CCC ", + " CCC CCC ", " CCC CCC ", + " CCC CCC ", " CCC CCC ", + " CCC CCC ", " CCC CCC ", + " CCC CCC ", " CCC CCC ", + " CCC CCC ", " CCC CCC ", + " CCC CCC ", " FCCCF FCCCF ", + " C C C C ", " B B B B ", + " B B B B ", " B B B B ", + " C C C C ", " FCCCF FCCCF ", + " CCC CCC ", " CCC CCC ", + " CCC CCC ", " CCC CCC ", + " CCC CCC ", " CCC CCC ", + " CCC CCC ", " CCC CCC ", + " CCC CCC ", " CCC CCC ", + " CCC CCC ", " CCC CCC ", + " CCCC CCCC ", " CCCCC CCCCC ", + " CCCCCCC FCBBBCF CCCCCCC ", " CCCCCCC CCCCCCC ", + " CCCCC CCCCC ", " CC CC ", + " FCBBBCF ", " ", }; + + public static final String[] L2 = { " FCCCCCF ", + " CC CC ", " CCCCC CCCCC ", + " CCCCCHHHHHHHHHCCCCC ", " CCCCHHHCC CCHHHCCCC ", + " CCCHHCCCCC CCCCCHHCCC ", " ECHHCCCCC FCCCCCF CCCCCHHCE ", + " CCHCCCC CCCCHCC ", " CCHCCC CCCHCC ", + " CCHCE ECHCC ", " ECHCC CCHCE ", + " CCHCE ECHCC ", " CCHCC CCHCC ", + " CCHCC CCHCC ", " CCHCC CCHCC ", + " CCHCC CCHCC ", " CCHCC CCHCC ", + " CCHCC CCHCC ", " CCHCC CCHCC ", + " CCHCC CCHCC ", "FCCHCCF FCCHCCF", + "C H C C H C", "C H C C H C", + "C H C C H C", "C H C C H C", + "C H C C H C", "FCCHCCF FCCHCCF", + " CCHCC CCHCC ", " CCHCC CCHCC ", + " CCHCC CCHCC ", " CCHCC CCHCC ", + " CCHCC CCHCC ", " CCHCC CCHCC ", + " CCHCC CCHCC ", " CCHCC CCHCC ", + " CCHCE ECHCC ", " ECHCC CCHCE ", + " CCHCE ECHCC ", " CCHCCC CCCHCC ", + " CCHCCCC CCCCHCC ", " ECHHCCCCC FCCCCCF CCCCCHHCE ", + " CCCHHCCCCC CCCCCHHCCC ", " CCCCHHHCC CCHHHCCCC ", + " CCCCCHHHHHHHHHCCCCC ", " CCCCC CCCCC ", + " CC CC ", " FCCCCCF ", }; + + public static final String[] L3 = { " FCOBOCF ", + " CC CC ", " CCCHHHHHHHHHCCC ", + " CCHHHHHHHHHHHHHHHCC ", " CCHHHHHHHHHHHHHHHHHHHCC ", + " CHHHHHHHCC CCHHHHHHHC ", " CHHHHHCCC FCOBOCF CCCHHHHHC ", + " CHHHHCC CCHHHHC ", " CHHHCC CCHHHC ", + " CHHHC CHHHC ", " CHHHC CHHHC ", + " CHHHC CHHHC ", " CHHHC CHHHC ", + " CHHHC CHHHC ", " CHHHC CHHHC ", + " CHHHC CHHHC ", " CHHHC CHHHC ", + " CHHHC CHHHC ", " CHHHC CHHHC ", + " CHHHC CHHHC ", "FCHHHCF FCHHHCF", + "C HHH C C HHH C", "O HHH O O HHH O", + "B HHH B B HHH B", "O HHH O O HHH O", + "C HHH C C HHH C", "FCHHHCF FCHHHCF", + " CHHHC CHHHC ", " CHHHC CHHHC ", + " CHHHC CHHHC ", " CHHHC CHHHC ", + " CHHHC CHHHC ", " CHHHC CHHHC ", + " CHHHC CHHHC ", " CHHHC CHHHC ", + " CHHHC CHHHC ", " CHHHC CHHHC ", + " CHHHC CHHHC ", " CHHHCC CCHHHC ", + " CHHHHCC CCHHHHC ", " CHHHHHCCC FCO~OCF CCCHHHHHC ", + " CHHHHHHHCC CCHHHHHHHC ", " CCHHHHHHHHHHHHHHHHHHHCC ", + " CCHHHHHHHHHHHHHHHCC ", " CCCHHHHHHHHHCCC ", + " CC CC ", " FCOBOCF ", }; } diff --git a/src/main/java/goodgenerator/client/ClientProxy.java b/src/main/java/goodgenerator/client/ClientProxy.java index df6c962106..b8a885cab6 100644 --- a/src/main/java/goodgenerator/client/ClientProxy.java +++ b/src/main/java/goodgenerator/client/ClientProxy.java @@ -6,6 +6,7 @@ import cpw.mods.fml.common.event.FMLPreInitializationEvent; import goodgenerator.common.CommonProxy; public class ClientProxy extends CommonProxy { + @Override public void preInit(FMLPreInitializationEvent event) { super.preInit(event); diff --git a/src/main/java/goodgenerator/client/GUI/GG_UITextures.java b/src/main/java/goodgenerator/client/GUI/GG_UITextures.java index 0dcc2f7743..bf51238575 100644 --- a/src/main/java/goodgenerator/client/GUI/GG_UITextures.java +++ b/src/main/java/goodgenerator/client/GUI/GG_UITextures.java @@ -7,12 +7,12 @@ public class GG_UITextures { private static final String MODID = "goodgenerator"; public static final UITexture PICTURE_NAQUADAH_REACTOR = UITexture.fullImage(MODID, "gui/picture/naquadah_reactor"); - public static final UITexture PICTURE_NEUTRON_ACTIVATOR = - UITexture.fullImage(MODID, "gui/picture/neutron_activator"); - public static final UITexture PICTURE_EXTREME_HEAT_EXCHANGER = - UITexture.fullImage(MODID, "gui/picture/extreme_heat_exchanger"); - public static final UITexture PICTURE_COMPONENT_ASSLINE = - UITexture.fullImage(MODID, "gui/picture/component_assline"); + public static final UITexture PICTURE_NEUTRON_ACTIVATOR = UITexture + .fullImage(MODID, "gui/picture/neutron_activator"); + public static final UITexture PICTURE_EXTREME_HEAT_EXCHANGER = UITexture + .fullImage(MODID, "gui/picture/extreme_heat_exchanger"); + public static final UITexture PICTURE_COMPONENT_ASSLINE = UITexture + .fullImage(MODID, "gui/picture/component_assline"); public static final UITexture OVERLAY_BUTTON_LOCK_OFF = UITexture.fullImage(MODID, "gui/overlay_button/lock_off"); public static final UITexture OVERLAY_BUTTON_LOCK_ON = UITexture.fullImage(MODID, "gui/overlay_button/lock_on"); } diff --git a/src/main/java/goodgenerator/client/render/BlockRenderHandler.java b/src/main/java/goodgenerator/client/render/BlockRenderHandler.java index d9ddd62d97..ac5c41bf83 100644 --- a/src/main/java/goodgenerator/client/render/BlockRenderHandler.java +++ b/src/main/java/goodgenerator/client/render/BlockRenderHandler.java @@ -4,16 +4,18 @@ import static gregtech.common.render.GT_Renderer_Block.*; import static net.minecraftforge.common.util.ForgeDirection.*; import static net.minecraftforge.common.util.ForgeDirection.EAST; -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; -import cpw.mods.fml.client.registry.RenderingRegistry; -import goodgenerator.blocks.regularBlock.ITextureBlock; -import gregtech.GT_Mod; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.world.IBlockAccess; + import org.lwjgl.opengl.GL11; +import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; +import cpw.mods.fml.client.registry.RenderingRegistry; +import goodgenerator.blocks.regularBlock.ITextureBlock; +import gregtech.GT_Mod; + public class BlockRenderHandler implements ISimpleBlockRenderingHandler { public static final float blockMin = 0.0F; @@ -40,17 +42,59 @@ public class BlockRenderHandler implements ISimpleBlockRenderingHandler { aBlock.setBlockBoundsForItemRender(); aRenderer.setRenderBoundsFromBlock(aBlock); renderNegativeYFacing( - null, aRenderer, aBlock, 0, 0, 0, tc.getTexture(aBlock, metadata, (byte) DOWN.ordinal()), true); + null, + aRenderer, + aBlock, + 0, + 0, + 0, + tc.getTexture(aBlock, metadata, (byte) DOWN.ordinal()), + true); renderPositiveYFacing( - null, aRenderer, aBlock, 0, 0, 0, tc.getTexture(aBlock, metadata, (byte) UP.ordinal()), true); + null, + aRenderer, + aBlock, + 0, + 0, + 0, + tc.getTexture(aBlock, metadata, (byte) UP.ordinal()), + true); renderNegativeZFacing( - null, aRenderer, aBlock, 0, 0, 0, tc.getTexture(aBlock, metadata, (byte) NORTH.ordinal()), true); + null, + aRenderer, + aBlock, + 0, + 0, + 0, + tc.getTexture(aBlock, metadata, (byte) NORTH.ordinal()), + true); renderPositiveZFacing( - null, aRenderer, aBlock, 0, 0, 0, tc.getTexture(aBlock, metadata, (byte) SOUTH.ordinal()), true); + null, + aRenderer, + aBlock, + 0, + 0, + 0, + tc.getTexture(aBlock, metadata, (byte) SOUTH.ordinal()), + true); renderNegativeXFacing( - null, aRenderer, aBlock, 0, 0, 0, tc.getTexture(aBlock, metadata, (byte) WEST.ordinal()), true); + null, + aRenderer, + aBlock, + 0, + 0, + 0, + tc.getTexture(aBlock, metadata, (byte) WEST.ordinal()), + true); renderPositiveXFacing( - null, aRenderer, aBlock, 0, 0, 0, tc.getTexture(aBlock, metadata, (byte) EAST.ordinal()), true); + null, + aRenderer, + aBlock, + 0, + 0, + 0, + tc.getTexture(aBlock, metadata, (byte) EAST.ordinal()), + true); } aBlock.setBlockBounds(blockMin, blockMin, blockMin, blockMax, blockMax, blockMax); @@ -61,8 +105,8 @@ public class BlockRenderHandler implements ISimpleBlockRenderingHandler { } @Override - public boolean renderWorldBlock( - IBlockAccess aWorld, int aX, int aY, int aZ, Block aBlock, int aModelID, RenderBlocks aRenderer) { + public boolean renderWorldBlock(IBlockAccess aWorld, int aX, int aY, int aZ, Block aBlock, int aModelID, + RenderBlocks aRenderer) { aRenderer.enableAO = Minecraft.isAmbientOcclusionEnabled() && GT_Mod.gregtechproxy.mRenderTileAmbientOcclusion; aRenderer.useInventoryTint = false; if (aBlock instanceof ITextureBlock) { diff --git a/src/main/java/goodgenerator/common/CommonProxy.java b/src/main/java/goodgenerator/common/CommonProxy.java index 528e165bb4..05bf053bb7 100644 --- a/src/main/java/goodgenerator/common/CommonProxy.java +++ b/src/main/java/goodgenerator/common/CommonProxy.java @@ -5,6 +5,7 @@ import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; public class CommonProxy { + public void preInit(FMLPreInitializationEvent event) {} public void init(FMLInitializationEvent event) {} diff --git a/src/main/java/goodgenerator/crossmod/ic2/GGCropsSaltyRoot.java b/src/main/java/goodgenerator/crossmod/ic2/GGCropsSaltyRoot.java index 030b30b270..c3686a6eb3 100644 --- a/src/main/java/goodgenerator/crossmod/ic2/GGCropsSaltyRoot.java +++ b/src/main/java/goodgenerator/crossmod/ic2/GGCropsSaltyRoot.java @@ -1,18 +1,20 @@ package goodgenerator.crossmod.ic2; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import goodgenerator.main.GoodGenerator; -import goodgenerator.util.ItemRefer; -import ic2.api.crops.CropCard; -import ic2.api.crops.ICropTile; import java.util.Arrays; import java.util.List; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.util.StatCollector; + import speiger.src.crops.api.ICropCardInfo; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import goodgenerator.main.GoodGenerator; +import goodgenerator.util.ItemRefer; +import ic2.api.crops.CropCard; +import ic2.api.crops.ICropTile; public class GGCropsSaltyRoot extends CropCard implements ICropCardInfo { @@ -39,7 +41,7 @@ public class GGCropsSaltyRoot extends CropCard implements ICropCardInfo { @Override public String[] attributes() { - return new String[] {"Salt", "Gray", "Root", "Hydrophobic"}; + return new String[] { "Salt", "Gray", "Root", "Hydrophobic" }; } @Override diff --git a/src/main/java/goodgenerator/crossmod/nei/IMCForNEI.java b/src/main/java/goodgenerator/crossmod/nei/IMCForNEI.java index bd397cb271..8035e6db8c 100644 --- a/src/main/java/goodgenerator/crossmod/nei/IMCForNEI.java +++ b/src/main/java/goodgenerator/crossmod/nei/IMCForNEI.java @@ -1,10 +1,12 @@ package goodgenerator.crossmod.nei; +import net.minecraft.nbt.NBTTagCompound; + import cpw.mods.fml.common.event.FMLInterModComms; import goodgenerator.crossmod.LoadedList; -import net.minecraft.nbt.NBTTagCompound; public class IMCForNEI { + public static void IMCSender() { sendHandler("gg.recipe.neutron_activator", "gregtech:gt.blockmachines:32013"); sendCatalyst("gg.recipe.neutron_activator", "gregtech:gt.blockmachines:32013"); @@ -22,7 +24,7 @@ public class IMCForNEI { if (LoadedList.GTPP) { sendCatalyst("gt.recipe.fusionreactor", "gregtech:gt.blockmachines:32022", -10); } - // sendCatalyst("gt.recipe.fusionreactor", "gregtech:gt.blockmachines:32023", -10); // Compact Fusion + // sendCatalyst("gt.recipe.fusionreactor", "gregtech:gt.blockmachines:32023", -10); // Compact Fusion // MK-V sendCatalyst("gt.recipe.complexfusionreactor", "gregtech:gt.blockmachines:32019", -10); @@ -31,7 +33,7 @@ public class IMCForNEI { if (LoadedList.GTPP) { sendCatalyst("gt.recipe.complexfusionreactor", "gregtech:gt.blockmachines:32022", -10); } - // sendCatalyst("gt.recipe.complexfusionreactor", "gregtech:gt.blockmachines:32023", -10); // Compact + // sendCatalyst("gt.recipe.complexfusionreactor", "gregtech:gt.blockmachines:32023", -10); // Compact // Fusion MK-V sendHandler("gg.recipe.componentassemblyline", "gregtech:gt.blockmachines:32026", 2); diff --git a/src/main/java/goodgenerator/crossmod/nei/NEI_Config.java b/src/main/java/goodgenerator/crossmod/nei/NEI_Config.java index d6d4abac78..e28f09885e 100644 --- a/src/main/java/goodgenerator/crossmod/nei/NEI_Config.java +++ b/src/main/java/goodgenerator/crossmod/nei/NEI_Config.java @@ -1,13 +1,15 @@ package goodgenerator.crossmod.nei; -import codechicken.nei.api.API; -import codechicken.nei.api.IConfigureNEI; -import goodgenerator.main.GoodGenerator; import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import codechicken.nei.api.API; +import codechicken.nei.api.IConfigureNEI; +import goodgenerator.main.GoodGenerator; + public class NEI_Config implements IConfigureNEI { + public static boolean isAdded = true; @Override diff --git a/src/main/java/goodgenerator/crossmod/thaumcraft/LargeEssentiaEnergyData.java b/src/main/java/goodgenerator/crossmod/thaumcraft/LargeEssentiaEnergyData.java index a55ddd9dd0..a259f77cbf 100644 --- a/src/main/java/goodgenerator/crossmod/thaumcraft/LargeEssentiaEnergyData.java +++ b/src/main/java/goodgenerator/crossmod/thaumcraft/LargeEssentiaEnergyData.java @@ -1,23 +1,24 @@ package goodgenerator.crossmod.thaumcraft; -import com.google.gson.JsonArray; -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; -import com.google.gson.JsonParser; import java.io.*; import java.net.URL; import java.nio.charset.StandardCharsets; import java.util.HashMap; + import thaumcraft.api.aspects.Aspect; +import com.google.gson.JsonArray; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import com.google.gson.JsonParser; + public class LargeEssentiaEnergyData { public static final HashMap<Aspect, FuelData> ASPECT_FUEL_DATA = new HashMap<>(); public static String readJsonFile() { try { - URL url = Thread.currentThread() - .getContextClassLoader() + URL url = Thread.currentThread().getContextClassLoader() .getResource("assets/goodgenerator/data/essentia.json"); assert url != null; BufferedReader in = new BufferedReader(new InputStreamReader(url.openStream(), StandardCharsets.UTF_8)); @@ -81,6 +82,7 @@ public class LargeEssentiaEnergyData { } class FuelData { + private final int fuelValue; private final String category; private final float consumeSpeed; diff --git a/src/main/java/goodgenerator/crossmod/thaumcraft/Research.java b/src/main/java/goodgenerator/crossmod/thaumcraft/Research.java index 4a6de90abe..575b06edf0 100644 --- a/src/main/java/goodgenerator/crossmod/thaumcraft/Research.java +++ b/src/main/java/goodgenerator/crossmod/thaumcraft/Research.java @@ -2,8 +2,21 @@ package goodgenerator.crossmod.thaumcraft; import static thaumcraft.api.ThaumcraftApi.addArcaneCraftingRecipe; +import java.util.Arrays; +import java.util.Collections; + +import net.minecraft.block.Block; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; + +import thaumcraft.api.aspects.Aspect; +import thaumcraft.api.aspects.AspectList; +import thaumcraft.common.config.ConfigBlocks; +import thaumcraft.common.config.ConfigItems; + import com.github.bartimaeusnek.bartworks.common.loaders.ItemRegistry; import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader; + import goodgenerator.crossmod.LoadedList; import goodgenerator.util.DescTextLocalization; import goodgenerator.util.ItemRefer; @@ -15,15 +28,6 @@ import gregtech.api.enums.TC_Aspects; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; import ic2.core.Ic2Items; -import java.util.Arrays; -import java.util.Collections; -import net.minecraft.block.Block; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import thaumcraft.api.aspects.Aspect; -import thaumcraft.api.aspects.AspectList; -import thaumcraft.common.config.ConfigBlocks; -import thaumcraft.common.config.ConfigItems; public class Research { @@ -44,7 +48,7 @@ public class Research { "ESSENTIA_GENERATOR", "Combustion Engine in Magic World", "Will it cause Flux pollution?", - new String[] {"INFUSION"}, + new String[] { "INFUSION" }, "ARTIFICE", ItemRefer.Large_Essentia_Generator.get(1), 3, @@ -58,88 +62,74 @@ public class Research { new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 10L), new TC_Aspects.TC_AspectStack(TC_Aspects.PERMUTATIO, 10L)), null, - new Object[] { - "research.ESSENTIA_GENERATOR.page.0", - GregTech_API.sThaumcraftCompat.addInfusionRecipe( - "ESSENTIA_GENERATOR", - ItemList.Hull_HV.get(1), - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Advanced, 1L), - new ItemStack(ConfigBlocks.blockJar, 1), - GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.Thaumium, 1L), - GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Emerald, 1L), - new ItemStack(ConfigBlocks.blockWoodenDevice, 1), - GT_OreDictUnificator.get(OrePrefixes.spring, Materials.Manyullyn, 1L), - Ic2Items.teslaCoil, - ItemList.Sensor_MV.get(1) - }, - ItemRefer.Large_Essentia_Generator.get(1), - 6, - Arrays.asList( - new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 64L), - new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 64L), - new TC_Aspects.TC_AspectStack(TC_Aspects.PRAECANTATIO, 32), - new TC_Aspects.TC_AspectStack(TC_Aspects.PERMUTATIO, 32))), - GregTech_API.sThaumcraftCompat.addInfusionRecipe( - "ESSENTIA_GENERATOR", - ItemList.Hatch_Input_HV.get(1), - new ItemStack[] { - new ItemStack(ConfigBlocks.blockJar, 1), + new Object[] { "research.ESSENTIA_GENERATOR.page.0", + GregTech_API.sThaumcraftCompat.addInfusionRecipe( + "ESSENTIA_GENERATOR", + ItemList.Hull_HV.get(1), + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Advanced, 1L), + new ItemStack(ConfigBlocks.blockJar, 1), + GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.Thaumium, 1L), + GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Emerald, 1L), + new ItemStack(ConfigBlocks.blockWoodenDevice, 1), + GT_OreDictUnificator.get(OrePrefixes.spring, Materials.Manyullyn, 1L), + Ic2Items.teslaCoil, ItemList.Sensor_MV.get(1) }, + ItemRefer.Large_Essentia_Generator.get(1), + 6, + Arrays.asList( + new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 64L), + new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 64L), + new TC_Aspects.TC_AspectStack(TC_Aspects.PRAECANTATIO, 32), + new TC_Aspects.TC_AspectStack(TC_Aspects.PERMUTATIO, 32))), + GregTech_API.sThaumcraftCompat.addInfusionRecipe( + "ESSENTIA_GENERATOR", + ItemList.Hatch_Input_HV.get(1), + new ItemStack[] { new ItemStack(ConfigBlocks.blockJar, 1), + ItemRefer.Magic_Casing.get(1), new ItemStack(ConfigBlocks.blockTube, 1), + ItemList.Electric_Pump_MV.get(1L) }, + ItemRefer.Essentia_Hatch.get(1), + 6, + Arrays.asList( + new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 128), + new TC_Aspects.TC_AspectStack(TC_Aspects.VACUOS, 64), + new TC_Aspects.TC_AspectStack(TC_Aspects.PERMUTATIO, 32), + new TC_Aspects.TC_AspectStack(TC_Aspects.COGNITIO, 32))), + GregTech_API.sThaumcraftCompat.addInfusionRecipe( + "ESSENTIA_GENERATOR", + GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Thaumium, 1), + new ItemStack[] { + GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.StainlessSteel, 1), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.ElectricalSteel, 1), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.ElectricalSteel, 1), + ItemList.Electric_Pump_HV.get(1L), new ItemStack(ConfigBlocks.blockTube, 1, 4), + new ItemStack(ConfigBlocks.blockCosmeticOpaque, 1, 2), }, + ItemRefer.Essentia_Cell_T1.get(1), + 4, + Arrays.asList( + new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 32), + new TC_Aspects.TC_AspectStack(TC_Aspects.VACUOS, 32), + new TC_Aspects.TC_AspectStack(TC_Aspects.PERMUTATIO, 16))), + addArcaneCraftingRecipe( + "ESSENTIA_GENERATOR", ItemRefer.Magic_Casing.get(1), - new ItemStack(ConfigBlocks.blockTube, 1), - ItemList.Electric_Pump_MV.get(1L) - }, - ItemRefer.Essentia_Hatch.get(1), - 6, - Arrays.asList( - new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 128), - new TC_Aspects.TC_AspectStack(TC_Aspects.VACUOS, 64), - new TC_Aspects.TC_AspectStack(TC_Aspects.PERMUTATIO, 32), - new TC_Aspects.TC_AspectStack(TC_Aspects.COGNITIO, 32))), - GregTech_API.sThaumcraftCompat.addInfusionRecipe( - "ESSENTIA_GENERATOR", - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Thaumium, 1), - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.StainlessSteel, 1), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.ElectricalSteel, 1), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.ElectricalSteel, 1), - ItemList.Electric_Pump_HV.get(1L), - new ItemStack(ConfigBlocks.blockTube, 1, 4), - new ItemStack(ConfigBlocks.blockCosmeticOpaque, 1, 2), - }, - ItemRefer.Essentia_Cell_T1.get(1), - 4, - Arrays.asList( - new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 32), - new TC_Aspects.TC_AspectStack(TC_Aspects.VACUOS, 32), - new TC_Aspects.TC_AspectStack(TC_Aspects.PERMUTATIO, 16))), - addArcaneCraftingRecipe( - "ESSENTIA_GENERATOR", - ItemRefer.Magic_Casing.get(1), - new AspectList() - .add(Aspect.AIR, 50) - .add(Aspect.FIRE, 50) - .add(Aspect.ORDER, 50), - "SCS", - "GAG", - "SCS", - 'S', - new ItemStack(ConfigItems.itemResource, 1, 14), - 'C', - GT_OreDictUnificator.get(OrePrefixes.itemCasing, Materials.Thaumium, 1), - 'G', - Ic2Items.reinforcedGlass, - 'A', - Ic2Items.advancedMachine), - "research.ESSENTIA_GENERATOR.page.1", - "research.ESSENTIA_GENERATOR.page.2", - "research.ESSENTIA_GENERATOR.page.3" - }); + new AspectList().add(Aspect.AIR, 50).add(Aspect.FIRE, 50).add(Aspect.ORDER, 50), + "SCS", + "GAG", + "SCS", + 'S', + new ItemStack(ConfigItems.itemResource, 1, 14), + 'C', + GT_OreDictUnificator.get(OrePrefixes.itemCasing, Materials.Thaumium, 1), + 'G', + Ic2Items.reinforcedGlass, + 'A', + Ic2Items.advancedMachine), + "research.ESSENTIA_GENERATOR.page.1", "research.ESSENTIA_GENERATOR.page.2", + "research.ESSENTIA_GENERATOR.page.3" }); GregTech_API.sThaumcraftCompat.addResearch( "ESSENTIA_CELL", "Better Cells", "And higher efficiency.", - new String[] {"ESSENTIA_GENERATOR"}, + new String[] { "ESSENTIA_GENERATOR" }, "ARTIFICE", ItemRefer.Essentia_Cell_T4.get(1), 2, @@ -153,116 +143,100 @@ public class Research { new TC_Aspects.TC_AspectStack(TC_Aspects.PRAECANTATIO, 10L), new TC_Aspects.TC_AspectStack(TC_Aspects.PERMUTATIO, 10L)), null, - new Object[] { - "research.ESSENTIA_CELL.page.0", - GregTech_API.sThaumcraftCompat.addInfusionRecipe( - "ESSENTIA_CELL", - ItemRefer.Essentia_Cell_T1.get(1), - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iridium, 1), - ItemList.Electric_Pump_IV.get(1L), - ItemList.QuantumStar.get(1L), - new ItemStack(ConfigBlocks.blockMetalDevice, 1, 3), - ItemList.Reactor_Coolant_Sp_1.get(1L), - GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Plutonium241, 1), - }, - ItemRefer.Essentia_Cell_T2.get(1), - 6, - Arrays.asList( - new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 64), - new TC_Aspects.TC_AspectStack(TC_Aspects.VACUOS, 64), - new TC_Aspects.TC_AspectStack(TC_Aspects.PERMUTATIO, 32))), - GregTech_API.sThaumcraftCompat.addInfusionRecipe( - "ESSENTIA_CELL", - ItemRefer.Essentia_Cell_T2.get(1), - new ItemStack[] { - ItemList.Field_Generator_IV.get(1L), - ItemList.Electric_Pump_LuV.get(1L), - new ItemStack(ConfigItems.itemResource, 1, 14), - Ic2Items.fluidregulator, - new ItemStack(ConfigBlocks.blockJar, 1, 0), - GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Ichorium, 1) - }, - ItemRefer.Essentia_Cell_T3.get(1), - 8, - Arrays.asList( - new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 128), - new TC_Aspects.TC_AspectStack(TC_Aspects.VACUOS, 128), - new TC_Aspects.TC_AspectStack(TC_Aspects.PERMUTATIO, 64))), - GregTech_API.sThaumcraftCompat.addInfusionRecipe( - "ESSENTIA_CELL", - ItemRefer.Essentia_Cell_T3.get(1), - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.ring, Materials.Europium, 1), - ItemList.Emitter_LuV.get(1L), - new ItemStack(ItemRegistry.bw_realglas, 1, 4), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.StellarAlloy, 1), - GT_OreDictUnificator.get(OrePrefixes.cellPlasma, Materials.Helium, 1), - new ItemStack(ConfigItems.itemShard, 1, 6), - }, - ItemRefer.Essentia_Cell_T4.get(1), - 10, - Arrays.asList( - new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 256), - new TC_Aspects.TC_AspectStack(TC_Aspects.VACUOS, 256), - new TC_Aspects.TC_AspectStack(TC_Aspects.PERMUTATIO, 128))) - }); + new Object[] { "research.ESSENTIA_CELL.page.0", + GregTech_API.sThaumcraftCompat.addInfusionRecipe( + "ESSENTIA_CELL", + ItemRefer.Essentia_Cell_T1.get(1), + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iridium, 1), + ItemList.Electric_Pump_IV.get(1L), ItemList.QuantumStar.get(1L), + new ItemStack(ConfigBlocks.blockMetalDevice, 1, 3), + ItemList.Reactor_Coolant_Sp_1.get(1L), + GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Plutonium241, 1), }, + ItemRefer.Essentia_Cell_T2.get(1), + 6, + Arrays.asList( + new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 64), + new TC_Aspects.TC_AspectStack(TC_Aspects.VACUOS, 64), + new TC_Aspects.TC_AspectStack(TC_Aspects.PERMUTATIO, 32))), + GregTech_API.sThaumcraftCompat.addInfusionRecipe( + "ESSENTIA_CELL", + ItemRefer.Essentia_Cell_T2.get(1), + new ItemStack[] { ItemList.Field_Generator_IV.get(1L), + ItemList.Electric_Pump_LuV.get(1L), + new ItemStack(ConfigItems.itemResource, 1, 14), Ic2Items.fluidregulator, + new ItemStack(ConfigBlocks.blockJar, 1, 0), + GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Ichorium, 1) }, + ItemRefer.Essentia_Cell_T3.get(1), + 8, + Arrays.asList( + new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 128), + new TC_Aspects.TC_AspectStack(TC_Aspects.VACUOS, 128), + new TC_Aspects.TC_AspectStack(TC_Aspects.PERMUTATIO, 64))), + GregTech_API.sThaumcraftCompat.addInfusionRecipe( + "ESSENTIA_CELL", + ItemRefer.Essentia_Cell_T3.get(1), + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.ring, Materials.Europium, 1), + ItemList.Emitter_LuV.get(1L), new ItemStack(ItemRegistry.bw_realglas, 1, 4), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.StellarAlloy, 1), + GT_OreDictUnificator.get(OrePrefixes.cellPlasma, Materials.Helium, 1), + new ItemStack(ConfigItems.itemShard, 1, 6), }, + ItemRefer.Essentia_Cell_T4.get(1), + 10, + Arrays.asList( + new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 256), + new TC_Aspects.TC_AspectStack(TC_Aspects.VACUOS, 256), + new TC_Aspects.TC_AspectStack(TC_Aspects.PERMUTATIO, 128))) }); ItemStack broad = new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 6); if (LoadedList.GTNH_CORE) broad = GT_ModHandler.getModItem("dreamcraft", "item.ArcaneSlate", 1); - GregTech_API.sThaumcraftCompat.addResearch( - "ESSENTIA_UPGRADE_BLANK", - "Upgrade your generator", - "Let's try some more dangerous essentia.", - new String[] {"ESSENTIA_GENERATOR"}, - "ARTIFICE", - ItemRefer.Essentia_Upgrade_Empty.get(1), - 2, - 0, - -9, - 4, - Arrays.asList( - new TC_Aspects.TC_AspectStack(TC_Aspects.AURAM, 10L), - new TC_Aspects.TC_AspectStack(TC_Aspects.PERMUTATIO, 10L), - new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 10L), - new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 10L)), - null, - new Object[] { - "research.ESSENTIA_UPGRADE_BLANK.page.0", - addArcaneCraftingRecipe( - "ESSENTIA_UPGRADE_BLANK", - ItemRefer.Essentia_Upgrade_Empty.get(1), - new AspectList() - .add(Aspect.AIR, 80) - .add(Aspect.ENTROPY, 50) - .add(Aspect.ORDER, 50) - .add(Aspect.WATER, 80), - "AMB", - "CZD", - "EIF", - 'A', - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.InfusedAir, 1), - 'B', - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.InfusedEarth, 1), - 'C', - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.InfusedFire, 1), - 'D', - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.InfusedWater, 1), - 'E', - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.InfusedOrder, 1), - 'F', - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.InfusedEntropy, 1), - 'M', - new ItemStack(ConfigItems.itemResource, 1, 10), - 'Z', - broad, - 'I', - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.PulsatingIron, 1)), - }); + GregTech_API.sThaumcraftCompat + .addResearch( + "ESSENTIA_UPGRADE_BLANK", + "Upgrade your generator", + "Let's try some more dangerous essentia.", + new String[] { "ESSENTIA_GENERATOR" }, + "ARTIFICE", + ItemRefer.Essentia_Upgrade_Empty.get(1), + 2, + 0, + -9, + 4, + Arrays.asList( + new TC_Aspects.TC_AspectStack(TC_Aspects.AURAM, 10L), + new TC_Aspects.TC_AspectStack(TC_Aspects.PERMUTATIO, 10L), + new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 10L), + new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 10L)), + null, + new Object[] { "research.ESSENTIA_UPGRADE_BLANK.page.0", addArcaneCraftingRecipe( + "ESSENTIA_UPGRADE_BLANK", + ItemRefer.Essentia_Upgrade_Empty.get(1), + new AspectList().add(Aspect.AIR, 80).add(Aspect.ENTROPY, 50).add(Aspect.ORDER, 50) + .add(Aspect.WATER, 80), + "AMB", + "CZD", + "EIF", + 'A', + GT_OreDictUnificator.get(OrePrefixes.screw, Materials.InfusedAir, 1), + 'B', + GT_OreDictUnificator.get(OrePrefixes.screw, Materials.InfusedEarth, 1), + 'C', + GT_OreDictUnificator.get(OrePrefixes.screw, Materials.InfusedFire, 1), + 'D', + GT_OreDictUnificator.get(OrePrefixes.screw, Materials.InfusedWater, 1), + 'E', + GT_OreDictUnificator.get(OrePrefixes.screw, Materials.InfusedOrder, 1), + 'F', + GT_OreDictUnificator.get(OrePrefixes.screw, Materials.InfusedEntropy, 1), + 'M', + new ItemStack(ConfigItems.itemResource, 1, 10), + 'Z', + broad, + 'I', + GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.PulsatingIron, 1)), }); GregTech_API.sThaumcraftCompat.addResearch( "ESSENTIA_UPGRADE_AIR", "Essentia: AIR", "I can feel it on the wind.", - new String[] {"ESSENTIA_UPGRADE_BLANK"}, + new String[] { "ESSENTIA_UPGRADE_BLANK" }, "ARTIFICE", ItemRefer.Essentia_Upgrade_Air.get(1), 1, @@ -275,33 +249,29 @@ public class Research { new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 10L), new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 10L)), null, - new Object[] { - "research.ESSENTIA_UPGRADE_AIR.page.0", - GregTech_API.sThaumcraftCompat.addInfusionRecipe( - "ESSENTIA_UPGRADE_AIR", - ItemRefer.Essentia_Upgrade_Empty.get(1), - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.LiquidAir, 1), - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Hydrogen, 1), - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Helium, 1), - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Argon, 1), - WerkstoffLoader.Neon.get(OrePrefixes.cell, 1), - WerkstoffLoader.Krypton.get(OrePrefixes.cell, 1), - }, - ItemRefer.Essentia_Upgrade_Air.get(1), - 5, - Arrays.asList( - new TC_Aspects.TC_AspectStack(TC_Aspects.AER, 128), - new TC_Aspects.TC_AspectStack(TC_Aspects.VOLATUS, 128), - new TC_Aspects.TC_AspectStack(TC_Aspects.MOTUS, 128), - new TC_Aspects.TC_AspectStack(TC_Aspects.AURAM, 128))), - "research.ESSENTIA_UPGRADE_AIR.page.1" - }); + new Object[] { "research.ESSENTIA_UPGRADE_AIR.page.0", + GregTech_API.sThaumcraftCompat.addInfusionRecipe( + "ESSENTIA_UPGRADE_AIR", + ItemRefer.Essentia_Upgrade_Empty.get(1), + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.cell, Materials.LiquidAir, 1), + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Hydrogen, 1), + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Helium, 1), + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Argon, 1), + WerkstoffLoader.Neon.get(OrePrefixes.cell, 1), + WerkstoffLoader.Krypton.get(OrePrefixes.cell, 1), }, + ItemRefer.Essentia_Upgrade_Air.get(1), + 5, + Arrays.asList( + new TC_Aspects.TC_AspectStack(TC_Aspects.AER, 128), + new TC_Aspects.TC_AspectStack(TC_Aspects.VOLATUS, 128), + new TC_Aspects.TC_AspectStack(TC_Aspects.MOTUS, 128), + new TC_Aspects.TC_AspectStack(TC_Aspects.AURAM, 128))), + "research.ESSENTIA_UPGRADE_AIR.page.1" }); GregTech_API.sThaumcraftCompat.addResearch( "ESSENTIA_UPGRADE_THERMAL", "Essentia: THERMAL", "Melting down.", - new String[] {"ESSENTIA_UPGRADE_BLANK"}, + new String[] { "ESSENTIA_UPGRADE_BLANK" }, "ARTIFICE", ItemRefer.Essentia_Upgrade_Thermal.get(1), 1, @@ -314,30 +284,24 @@ public class Research { new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 10L), new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 10L)), null, - new Object[] { - "research.ESSENTIA_UPGRADE_THERMAL.page.0", - GregTech_API.sThaumcraftCompat.addInfusionRecipe( - "ESSENTIA_UPGRADE_THERMAL", - ItemRefer.Essentia_Upgrade_Empty.get(1), - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Firestone, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Netherrack, 1), - Ic2Items.reactorPlatingHeat, - ItemList.Casing_Coil_Nichrome.get(1), - new ItemStack(ConfigItems.itemResource, 1, 1), - new ItemStack(ConfigItems.itemResource, 1, 0), - }, - ItemRefer.Essentia_Upgrade_Thermal.get(1), - 5, - Collections.singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1024))), - "research.ESSENTIA_UPGRADE_THERMAL.page.1", - "research.ESSENTIA_UPGRADE_THERMAL.page.2" - }); + new Object[] { "research.ESSENTIA_UPGRADE_THERMAL.page.0", + GregTech_API.sThaumcraftCompat.addInfusionRecipe( + "ESSENTIA_UPGRADE_THERMAL", + ItemRefer.Essentia_Upgrade_Empty.get(1), + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Firestone, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Netherrack, 1), + Ic2Items.reactorPlatingHeat, ItemList.Casing_Coil_Nichrome.get(1), + new ItemStack(ConfigItems.itemResource, 1, 1), + new ItemStack(ConfigItems.itemResource, 1, 0), }, + ItemRefer.Essentia_Upgrade_Thermal.get(1), + 5, + Collections.singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1024))), + "research.ESSENTIA_UPGRADE_THERMAL.page.1", "research.ESSENTIA_UPGRADE_THERMAL.page.2" }); GregTech_API.sThaumcraftCompat.addResearch( "ESSENTIA_UPGRADE_UNSTABLE", "Essentia: UNSTABLE", "Heart of chaos.", - new String[] {"ESSENTIA_UPGRADE_BLANK"}, + new String[] { "ESSENTIA_UPGRADE_BLANK" }, "ARTIFICE", ItemRefer.Essentia_Upgrade_Unstable.get(1), 1, @@ -350,36 +314,31 @@ public class Research { new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 10L), new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 10L)), null, - new Object[] { - "research.ESSENTIA_UPGRADE_UNSTABLE.page.0", - GregTech_API.sThaumcraftCompat.addInfusionRecipe( - "ESSENTIA_UPGRADE_UNSTABLE", - ItemRefer.Essentia_Upgrade_Empty.get(1), - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.GasolinePremium, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Unstable, 1), - GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.Void, 1), - GT_OreDictUnificator.get(OrePrefixes.gem, Materials.InfusedEntropy, 1), - Ic2Items.industrialTnt, - new ItemStack(ItemRegistry.DESTRUCTOPACK) - }, - ItemRefer.Essentia_Upgrade_Unstable.get(1), - 6, - Arrays.asList( - new TC_Aspects.TC_AspectStack(TC_Aspects.PERDITIO, 128), - new TC_Aspects.TC_AspectStack(TC_Aspects.VACUOS, 128), - new TC_Aspects.TC_AspectStack(TC_Aspects.VENENUM, 128), - new TC_Aspects.TC_AspectStack(TC_Aspects.TELUM, 128))), - "research.ESSENTIA_UPGRADE_UNSTABLE.page.1", - "research.ESSENTIA_UPGRADE_UNSTABLE.page.2" - }); + new Object[] { "research.ESSENTIA_UPGRADE_UNSTABLE.page.0", + GregTech_API.sThaumcraftCompat.addInfusionRecipe( + "ESSENTIA_UPGRADE_UNSTABLE", + ItemRefer.Essentia_Upgrade_Empty.get(1), + new ItemStack[] { + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.GasolinePremium, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Unstable, 1), + GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.Void, 1), + GT_OreDictUnificator.get(OrePrefixes.gem, Materials.InfusedEntropy, 1), + Ic2Items.industrialTnt, new ItemStack(ItemRegistry.DESTRUCTOPACK) }, + ItemRefer.Essentia_Upgrade_Unstable.get(1), + 6, + Arrays.asList( + new TC_Aspects.TC_AspectStack(TC_Aspects.PERDITIO, 128), + new TC_Aspects.TC_AspectStack(TC_Aspects.VACUOS, 128), + new TC_Aspects.TC_AspectStack(TC_Aspects.VENENUM, 128), + new TC_Aspects.TC_AspectStack(TC_Aspects.TELUM, 128))), + "research.ESSENTIA_UPGRADE_UNSTABLE.page.1", "research.ESSENTIA_UPGRADE_UNSTABLE.page.2" }); ItemStack meatDust = GT_OreDictUnificator.get(OrePrefixes.dust, Materials.MeatRaw, 1); if (LoadedList.GTNH_CORE) meatDust = GT_ModHandler.getModItem("dreamcraft", "GTNHBioItems", 1, 2); GregTech_API.sThaumcraftCompat.addResearch( "ESSENTIA_UPGRADE_VICTUS", "Essentia: VICTUS", "Will it bleed?", - new String[] {"ESSENTIA_UPGRADE_BLANK"}, + new String[] { "ESSENTIA_UPGRADE_BLANK" }, "ARTIFICE", ItemRefer.Essentia_Upgrade_Victus.get(1), 1, @@ -392,35 +351,29 @@ public class Research { new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 10L), new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 10L)), null, - new Object[] { - "research.ESSENTIA_UPGRADE_VICTUS.page.0", - GregTech_API.sThaumcraftCompat.addInfusionRecipe( - "ESSENTIA_UPGRADE_VICTUS", - ItemRefer.Essentia_Upgrade_Empty.get(1), - new ItemStack[] { - meatDust, - ItemList.Food_Dough_Sugar.get(1), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Calcium, 1), - new ItemStack(Item.getItemById(367), 1), - new ItemStack(ConfigItems.itemResource, 1, 4), - new ItemStack(ConfigBlocks.blockMetalDevice, 1, 8), - }, - ItemRefer.Essentia_Upgrade_Victus.get(1), - 5, - Arrays.asList( - new TC_Aspects.TC_AspectStack(TC_Aspects.VICTUS, 128), - new TC_Aspects.TC_AspectStack(TC_Aspects.SPIRITUS, 128), - new TC_Aspects.TC_AspectStack(TC_Aspects.SANO, 128), - new TC_Aspects.TC_AspectStack(TC_Aspects.CORPUS, 128), - new TC_Aspects.TC_AspectStack(TC_Aspects.HUMANUS, 128))), - "research.ESSENTIA_UPGRADE_VICTUS.page.1", - "research.ESSENTIA_UPGRADE_VICTUS.page.2" - }); + new Object[] { "research.ESSENTIA_UPGRADE_VICTUS.page.0", + GregTech_API.sThaumcraftCompat.addInfusionRecipe( + "ESSENTIA_UPGRADE_VICTUS", + ItemRefer.Essentia_Upgrade_Empty.get(1), + new ItemStack[] { meatDust, ItemList.Food_Dough_Sugar.get(1), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Calcium, 1), + new ItemStack(Item.getItemById(367), 1), + new ItemStack(ConfigItems.itemResource, 1, 4), + new ItemStack(ConfigBlocks.blockMetalDevice, 1, 8), }, + ItemRefer.Essentia_Upgrade_Victus.get(1), + 5, + Arrays.asList( + new TC_Aspects.TC_AspectStack(TC_Aspects.VICTUS, 128), + new TC_Aspects.TC_AspectStack(TC_Aspects.SPIRITUS, 128), + new TC_Aspects.TC_AspectStack(TC_Aspects.SANO, 128), + new TC_Aspects.TC_AspectStack(TC_Aspects.CORPUS, 128), + new TC_Aspects.TC_AspectStack(TC_Aspects.HUMANUS, 128))), + "research.ESSENTIA_UPGRADE_VICTUS.page.1", "research.ESSENTIA_UPGRADE_VICTUS.page.2" }); GregTech_API.sThaumcraftCompat.addResearch( "ESSENTIA_UPGRADE_TAINTED", "Essentia: TAINTED", "Dirty Deeds Done Dirt Cheap", - new String[] {"ESSENTIA_UPGRADE_BLANK"}, + new String[] { "ESSENTIA_UPGRADE_BLANK" }, "ARTIFICE", ItemRefer.Essentia_Upgrade_Tainted.get(1), 1, @@ -433,35 +386,29 @@ public class Research { new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 10L), new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 10L)), null, - new Object[] { - "research.ESSENTIA_UPGRADE_TAINTED.page.0", - "research.ESSENTIA_UPGRADE_TAINTED.page.1", - GregTech_API.sThaumcraftCompat.addInfusionRecipe( - "ESSENTIA_UPGRADE_TAINTED", - ItemRefer.Essentia_Upgrade_Empty.get(1), - new ItemStack[] { - new ItemStack(ConfigBlocks.blockTaintFibres, 1, 0), - new ItemStack(ConfigBlocks.blockTaintFibres, 1, 2), - new ItemStack(ConfigItems.itemResource, 1, 11), - GT_OreDictUnificator.get(OrePrefixes.spring, Materials.NaquadahEnriched, 1), - GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.EndSteel, 1), - new ItemStack(Block.getBlockById(138), 1), - }, - ItemRefer.Essentia_Upgrade_Tainted.get(1), - 7, - Arrays.asList( - new TC_Aspects.TC_AspectStack(TC_Aspects.MORTUUS, 128), - new TC_Aspects.TC_AspectStack(TC_Aspects.ALIENIS, 128), - new TC_Aspects.TC_AspectStack(TC_Aspects.EXANIMIS, 128), - new TC_Aspects.TC_AspectStack(TC_Aspects.VITIUM, 128))), - "research.ESSENTIA_UPGRADE_TAINTED.page.2", - "research.ESSENTIA_UPGRADE_TAINTED.page.3" - }); + new Object[] { "research.ESSENTIA_UPGRADE_TAINTED.page.0", "research.ESSENTIA_UPGRADE_TAINTED.page.1", + GregTech_API.sThaumcraftCompat.addInfusionRecipe( + "ESSENTIA_UPGRADE_TAINTED", + ItemRefer.Essentia_Upgrade_Empty.get(1), + new ItemStack[] { new ItemStack(ConfigBlocks.blockTaintFibres, 1, 0), + new ItemStack(ConfigBlocks.blockTaintFibres, 1, 2), + new ItemStack(ConfigItems.itemResource, 1, 11), + GT_OreDictUnificator.get(OrePrefixes.spring, Materials.NaquadahEnriched, 1), + GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.EndSteel, 1), + new ItemStack(Block.getBlockById(138), 1), }, + ItemRefer.Essentia_Upgrade_Tainted.get(1), + 7, + Arrays.asList( + new TC_Aspects.TC_AspectStack(TC_Aspects.MORTUUS, 128), + new TC_Aspects.TC_AspectStack(TC_Aspects.ALIENIS, 128), + new TC_Aspects.TC_AspectStack(TC_Aspects.EXANIMIS, 128), + new TC_Aspects.TC_AspectStack(TC_Aspects.VITIUM, 128))), + "research.ESSENTIA_UPGRADE_TAINTED.page.2", "research.ESSENTIA_UPGRADE_TAINTED.page.3" }); GregTech_API.sThaumcraftCompat.addResearch( "ESSENTIA_UPGRADE_MECHANICS", "Essentia: MECHANICS", "Driven by Ether.", - new String[] {"ESSENTIA_UPGRADE_BLANK"}, + new String[] { "ESSENTIA_UPGRADE_BLANK" }, "ARTIFICE", ItemRefer.Essentia_Upgrade_Mechanics.get(1), 1, @@ -474,33 +421,28 @@ public class Research { new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 10L), new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 10L)), null, - new Object[] { - "research.ESSENTIA_UPGRADE_MECHANICS.page.0", - GregTech_API.sThaumcraftCompat.addInfusionRecipe( - "ESSENTIA_UPGRADE_MECHANICS", - ItemRefer.Essentia_Upgrade_Empty.get(1), - new ItemStack[] { - new ItemStack(ConfigBlocks.blockTube, 1, 4), - new ItemStack(ConfigBlocks.blockTube, 1, 2), - GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.VividAlloy, 1), - GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Polybenzimidazole, 1), - ItemList.Electric_Motor_IV.get(1), - ItemList.Electric_Pump_IV.get(1), - }, - ItemRefer.Essentia_Upgrade_Mechanics.get(1), - 5, - Arrays.asList( - new TC_Aspects.TC_AspectStack(TC_Aspects.ITER, 128), - new TC_Aspects.TC_AspectStack(TC_Aspects.LIMUS, 128), - new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 128))), - "research.ESSENTIA_UPGRADE_MECHANICS.page.1", - "research.ESSENTIA_UPGRADE_MECHANICS.page.2" - }); + new Object[] { "research.ESSENTIA_UPGRADE_MECHANICS.page.0", + GregTech_API.sThaumcraftCompat.addInfusionRecipe( + "ESSENTIA_UPGRADE_MECHANICS", + ItemRefer.Essentia_Upgrade_Empty.get(1), + new ItemStack[] { new ItemStack(ConfigBlocks.blockTube, 1, 4), + new ItemStack(ConfigBlocks.blockTube, 1, 2), + GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.VividAlloy, 1), + GT_OreDictUnificator + .get(OrePrefixes.pipeMedium, Materials.Polybenzimidazole, 1), + ItemList.Electric_Motor_IV.get(1), ItemList.Electric_Pump_IV.get(1), }, + ItemRefer.Essentia_Upgrade_Mechanics.get(1), + 5, + Arrays.asList( + new TC_Aspects.TC_AspectStack(TC_Aspects.ITER, 128), + new TC_Aspects.TC_AspectStack(TC_Aspects.LIMUS, 128), + new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 128))), + "research.ESSENTIA_UPGRADE_MECHANICS.page.1", "research.ESSENTIA_UPGRADE_MECHANICS.page.2" }); GregTech_API.sThaumcraftCompat.addResearch( "ESSENTIA_UPGRADE_SPRITE", "Essentia: SPRITE", "Brain in a Machine.", - new String[] {"ESSENTIA_UPGRADE_BLANK"}, + new String[] { "ESSENTIA_UPGRADE_BLANK" }, "ARTIFICE", ItemRefer.Essentia_Upgrade_Spirit.get(1), 1, @@ -513,35 +455,30 @@ public class Research { new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 10L), new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 10L)), null, - new Object[] { - "research.ESSENTIA_UPGRADE_SPRITE.page.0", - GregTech_API.sThaumcraftCompat.addInfusionRecipe( - "ESSENTIA_UPGRADE_SPRITE", - ItemRefer.Essentia_Upgrade_Empty.get(1), - new ItemStack[] { - new ItemStack(ConfigBlocks.blockJar, 1, 1), - GT_OreDictUnificator.get(OrePrefixes.food, Materials.Cheese, 1), - GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.Shadow, 1), - GT_OreDictUnificator.get(OrePrefixes.spring, Materials.FierySteel, 1), - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Milk, 1), - ItemList.Machine_EV_Scanner.get(1) - }, - ItemRefer.Essentia_Upgrade_Spirit.get(1), - 5, - Arrays.asList( - new TC_Aspects.TC_AspectStack(TC_Aspects.COGNITIO, 128), - new TC_Aspects.TC_AspectStack(TC_Aspects.SENSUS, 128), - new TC_Aspects.TC_AspectStack(TC_Aspects.LUCRUM, 128), - new TC_Aspects.TC_AspectStack(TC_Aspects.STRONTIO, 128), - new TC_Aspects.TC_AspectStack(TC_Aspects.NEBRISUM, 128))), - "research.ESSENTIA_UPGRADE_SPRITE.page.1", - "research.ESSENTIA_UPGRADE_SPRITE.page.2" - }); + new Object[] { "research.ESSENTIA_UPGRADE_SPRITE.page.0", + GregTech_API.sThaumcraftCompat.addInfusionRecipe( + "ESSENTIA_UPGRADE_SPRITE", + ItemRefer.Essentia_Upgrade_Empty.get(1), + new ItemStack[] { new ItemStack(ConfigBlocks.blockJar, 1, 1), + GT_OreDictUnificator.get(OrePrefixes.food, Materials.Cheese, 1), + GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.Shadow, 1), + GT_OreDictUnificator.get(OrePrefixes.spring, Materials.FierySteel, 1), + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Milk, 1), + ItemList.Machine_EV_Scanner.get(1) }, + ItemRefer.Essentia_Upgrade_Spirit.get(1), + 5, + Arrays.asList( + new TC_Aspects.TC_AspectStack(TC_Aspects.COGNITIO, 128), + new TC_Aspects.TC_AspectStack(TC_Aspects.SENSUS, 128), + new TC_Aspects.TC_AspectStack(TC_Aspects.LUCRUM, 128), + new TC_Aspects.TC_AspectStack(TC_Aspects.STRONTIO, 128), + new TC_Aspects.TC_AspectStack(TC_Aspects.NEBRISUM, 128))), + "research.ESSENTIA_UPGRADE_SPRITE.page.1", "research.ESSENTIA_UPGRADE_SPRITE.page.2" }); GregTech_API.sThaumcraftCompat.addResearch( "ESSENTIA_UPGRADE_RADIATION", "Essentia: RADIATION", "Atomic Heart", - new String[] {"ESSENTIA_UPGRADE_BLANK"}, + new String[] { "ESSENTIA_UPGRADE_BLANK" }, "ARTIFICE", ItemRefer.Essentia_Upgrade_Radiation.get(1), 1, @@ -554,39 +491,25 @@ public class Research { new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 10L), new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 10L)), null, - new Object[] { - "research.ESSENTIA_UPGRADE_RADIATION.page.0", - GregTech_API.sThaumcraftCompat.addInfusionRecipe( - "ESSENTIA_UPGRADE_RADIATION", - ItemRefer.Essentia_Upgrade_Empty.get(1), - new ItemStack[] { - ItemRefer.High_Density_Plutonium.get(1), - ItemRefer.High_Density_Uranium.get(1), - ItemRefer.High_Density_Thorium.get(1), - Ic2Items.UranFuel, - Ic2Items.MOXFuel, - WerkstoffLoader.Tiberium.get(OrePrefixes.gem, 1) - }, - ItemRefer.Essentia_Upgrade_Radiation.get(1), - 8, - Collections.singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.RADIO, 1024))), - "research.ESSENTIA_UPGRADE_RADIATION.page.1", - "research.ESSENTIA_UPGRADE_RADIATION.page.2" - }); + new Object[] { "research.ESSENTIA_UPGRADE_RADIATION.page.0", + GregTech_API.sThaumcraftCompat.addInfusionRecipe( + "ESSENTIA_UPGRADE_RADIATION", + ItemRefer.Essentia_Upgrade_Empty.get(1), + new ItemStack[] { ItemRefer.High_Density_Plutonium.get(1), + ItemRefer.High_Density_Uranium.get(1), ItemRefer.High_Density_Thorium.get(1), + Ic2Items.UranFuel, Ic2Items.MOXFuel, + WerkstoffLoader.Tiberium.get(OrePrefixes.gem, 1) }, + ItemRefer.Essentia_Upgrade_Radiation.get(1), + 8, + Collections.singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.RADIO, 1024))), + "research.ESSENTIA_UPGRADE_RADIATION.page.1", "research.ESSENTIA_UPGRADE_RADIATION.page.2" }); GregTech_API.sThaumcraftCompat.addResearch( "ESSENTIA_UPGRADE_ELECTRIC", "Essentia: ELECTRIC", "Get electricity from... electricity?", - new String[] { - "ESSENTIA_UPGRADE_AIR", - "ESSENTIA_UPGRADE_THERMAL", - "ESSENTIA_UPGRADE_UNSTABLE", - "ESSENTIA_UPGRADE_VICTUS", - "ESSENTIA_UPGRADE_TAINTED", - "ESSENTIA_UPGRADE_MECHANICS", - "ESSENTIA_UPGRADE_SPRITE", - "ESSENTIA_UPGRADE_RADIATION" - }, + new String[] { "ESSENTIA_UPGRADE_AIR", "ESSENTIA_UPGRADE_THERMAL", "ESSENTIA_UPGRADE_UNSTABLE", + "ESSENTIA_UPGRADE_VICTUS", "ESSENTIA_UPGRADE_TAINTED", "ESSENTIA_UPGRADE_MECHANICS", + "ESSENTIA_UPGRADE_SPRITE", "ESSENTIA_UPGRADE_RADIATION" }, "ARTIFICE", ItemRefer.Essentia_Upgrade_Electric.get(1), 1, @@ -598,24 +521,22 @@ public class Research { new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 10L), new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 10L)), null, - new Object[] { - "research.ESSENTIA_UPGRADE_ELECTRIC.page.0", - GregTech_API.sThaumcraftCompat.addInfusionRecipe( - "ESSENTIA_UPGRADE_RADIATION", - ItemRefer.Essentia_Upgrade_Empty.get(1), - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorMV, 1), - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorHV, 1), - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorEV, 1), - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorIV, 1), - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorLuV, 1), - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorZPM, 1) - }, - ItemRefer.Essentia_Upgrade_Electric.get(1), - 10, - Collections.singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 32768))), - "research.ESSENTIA_UPGRADE_ELECTRIC.page.1" - }); + new Object[] { "research.ESSENTIA_UPGRADE_ELECTRIC.page.0", + GregTech_API.sThaumcraftCompat.addInfusionRecipe( + "ESSENTIA_UPGRADE_RADIATION", + ItemRefer.Essentia_Upgrade_Empty.get(1), + new ItemStack[] { + GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorMV, 1), + GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorHV, 1), + GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorEV, 1), + GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorIV, 1), + GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorLuV, 1), + GT_OreDictUnificator + .get(OrePrefixes.wireGt01, Materials.SuperconductorZPM, 1) }, + ItemRefer.Essentia_Upgrade_Electric.get(1), + 10, + Collections.singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 32768))), + "research.ESSENTIA_UPGRADE_ELECTRIC.page.1" }); ItemStack nodeLinkDevice = LoadedList.THAUMIC_BASES ? GT_ModHandler.getModItem("thaumicbases", "nodeLinker", 1, 0) @@ -623,14 +544,11 @@ public class Research { ItemStack alchemicalFurnace = LoadedList.THAUMIC_BASES ? GT_ModHandler.getModItem("thaumicbases", "advAlchFurnace", 1, 0) : new ItemStack(ConfigBlocks.blockStoneDevice, 1, 0); - ItemStack nitor = LoadedList.THAUMIC_TINKERER - ? GT_ModHandler.getModItem("ThaumicTinkerer", "brightNitor", 1, 0) + ItemStack nitor = LoadedList.THAUMIC_TINKERER ? GT_ModHandler.getModItem("ThaumicTinkerer", "brightNitor", 1, 0) : new ItemStack(ConfigItems.itemResource, 1, 1); - ItemStack alchemicalBoiler = LoadedList.AUTOMAGY - ? GT_ModHandler.getModItem("Automagy", "blockBoiler", 1, 0) + ItemStack alchemicalBoiler = LoadedList.AUTOMAGY ? GT_ModHandler.getModItem("Automagy", "blockBoiler", 1, 0) : new ItemStack(ConfigBlocks.blockStoneDevice, 1, 1); - ItemStack essentiaLocus = LoadedList.AUTOMAGY - ? GT_ModHandler.getModItem("Automagy", "blockEssentiaLocus", 1, 0) + ItemStack essentiaLocus = LoadedList.AUTOMAGY ? GT_ModHandler.getModItem("Automagy", "blockEssentiaLocus", 1, 0) : new ItemStack(ConfigBlocks.blockJar, 1, 1); ItemStack thauminiteBlock = LoadedList.THAUMIC_BASES ? GT_ModHandler.getModItem("thaumicbases", "thauminiteBlock", 1, 0) @@ -639,7 +557,7 @@ public class Research { "ESSENTIA_SMELTERY", "Large Essentia Smeltery", "You need a bigger boat.", - new String[] {"INFUSION"}, + new String[] { "INFUSION" }, "ARTIFICE", ItemRefer.Large_Essentia_Smeltery.get(1), 4, @@ -654,79 +572,61 @@ public class Research { new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 10), new TC_Aspects.TC_AspectStack(TC_Aspects.LIMUS, 10)), null, - new Object[] { - "research.ESSENTIA_SMELTERY.page.0", - GregTech_API.sThaumcraftCompat.addInfusionRecipe( - "ESSENTIA_SMELTERY", - ItemList.Casing_Firebox_TungstenSteel.get(1), - new ItemStack[] { - nodeLinkDevice, - nitor, - alchemicalFurnace, - essentiaLocus, - alchemicalBoiler, + new Object[] { "research.ESSENTIA_SMELTERY.page.0", GregTech_API.sThaumcraftCompat.addInfusionRecipe( + "ESSENTIA_SMELTERY", + ItemList.Casing_Firebox_TungstenSteel.get(1), + new ItemStack[] { nodeLinkDevice, nitor, alchemicalFurnace, essentiaLocus, alchemicalBoiler, new ItemStack(ConfigBlocks.blockCrystal, 1, 1), - new ItemStack(ConfigBlocks.blockMetalDevice, 1, 3), - ItemList.Electric_Piston_IV.get(1), + new ItemStack(ConfigBlocks.blockMetalDevice, 1, 3), ItemList.Electric_Piston_IV.get(1), GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.FierySteel, 1L), GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Elite, 1L), GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Elite, 1L), GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Elite, 1L), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Elite, 1L) - }, - ItemRefer.Large_Essentia_Smeltery.get(1), - 16, - Arrays.asList( - new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 256), - new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 256), - new TC_Aspects.TC_AspectStack(TC_Aspects.PERDITIO, 256), - new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 256), - new TC_Aspects.TC_AspectStack(TC_Aspects.LUCRUM, 256), - new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 256))), - "research.ESSENTIA_SMELTERY.page.1", - GregTech_API.sThaumcraftCompat.addInfusionRecipe( - "ESSENTIA_GENERATOR", - ItemList.Hatch_Output_HV.get(1), - new ItemStack[] { - new ItemStack(ConfigBlocks.blockJar, 1), - ItemRefer.Magic_Casing.get(1), - new ItemStack(ConfigBlocks.blockTube, 1), - ItemList.Electric_Pump_MV.get(1L) - }, - ItemRefer.Essentia_Output_Hatch.get(1), - 6, - Arrays.asList( - new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 128), - new TC_Aspects.TC_AspectStack(TC_Aspects.VACUOS, 64), - new TC_Aspects.TC_AspectStack(TC_Aspects.PERMUTATIO, 32), - new TC_Aspects.TC_AspectStack(TC_Aspects.COGNITIO, 32))), - "research.ESSENTIA_SMELTERY.page.2", - addArcaneCraftingRecipe( - "ESSENTIA_SMELTERY", - ItemRefer.Essentia_Filter_Casing.get(1), - new AspectList() - .add(Aspect.AIR, 70) - .add(Aspect.EARTH, 70) - .add(Aspect.FIRE, 70) - .add(Aspect.WATER, 70) - .add(Aspect.ORDER, 70) - .add(Aspect.ENTROPY, 70), - "ABA", - "CDC", - "EFE", - 'A', - new ItemStack(ConfigBlocks.blockTube, 1, 3), - 'B', - new ItemStack(ConfigBlocks.blockStoneDevice, 1, 14), - 'C', - GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.Void, 1), - 'D', - new ItemStack(GregTech_API.sBlockCasings3, 1, 11), - 'E', - GT_OreDictUnificator.get(OrePrefixes.pipeSmall, Materials.NetherStar, 1), - 'F', - thauminiteBlock) - }); + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Elite, 1L) }, + ItemRefer.Large_Essentia_Smeltery.get(1), + 16, + Arrays.asList( + new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 256), + new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 256), + new TC_Aspects.TC_AspectStack(TC_Aspects.PERDITIO, 256), + new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 256), + new TC_Aspects.TC_AspectStack(TC_Aspects.LUCRUM, 256), + new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 256))), + "research.ESSENTIA_SMELTERY.page.1", + GregTech_API.sThaumcraftCompat.addInfusionRecipe( + "ESSENTIA_GENERATOR", + ItemList.Hatch_Output_HV.get(1), + new ItemStack[] { new ItemStack(ConfigBlocks.blockJar, 1), + ItemRefer.Magic_Casing.get(1), new ItemStack(ConfigBlocks.blockTube, 1), + ItemList.Electric_Pump_MV.get(1L) }, + ItemRefer.Essentia_Output_Hatch.get(1), + 6, + Arrays.asList( + new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 128), + new TC_Aspects.TC_AspectStack(TC_Aspects.VACUOS, 64), + new TC_Aspects.TC_AspectStack(TC_Aspects.PERMUTATIO, 32), + new TC_Aspects.TC_AspectStack(TC_Aspects.COGNITIO, 32))), + "research.ESSENTIA_SMELTERY.page.2", + addArcaneCraftingRecipe( + "ESSENTIA_SMELTERY", + ItemRefer.Essentia_Filter_Casing.get(1), + new AspectList().add(Aspect.AIR, 70).add(Aspect.EARTH, 70).add(Aspect.FIRE, 70) + .add(Aspect.WATER, 70).add(Aspect.ORDER, 70).add(Aspect.ENTROPY, 70), + "ABA", + "CDC", + "EFE", + 'A', + new ItemStack(ConfigBlocks.blockTube, 1, 3), + 'B', + new ItemStack(ConfigBlocks.blockStoneDevice, 1, 14), + 'C', + GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.Void, 1), + 'D', + new ItemStack(GregTech_API.sBlockCasings3, 1, 11), + 'E', + GT_OreDictUnificator.get(OrePrefixes.pipeSmall, Materials.NetherStar, 1), + 'F', + thauminiteBlock) }); if (LoadedList.THAUMIC_ENERGISTICS) { ItemStack essentiaPump = LoadedList.WITCHING_GADGETS @@ -739,7 +639,7 @@ public class Research { "ESSENTIA_OUTPUT_HATCH_ME", "Essentia Output Hatch (ME)", "It must exist.", - new String[] {"INFUSION"}, + new String[] { "INFUSION" }, "ARTIFICE", ItemRefer.Essentia_Output_Hatch_ME.get(1), 3, @@ -753,26 +653,24 @@ public class Research { new TC_Aspects.TC_AspectStack(TC_Aspects.VACUOS, 10), new TC_Aspects.TC_AspectStack(TC_Aspects.PERMUTATIO, 10)), null, - new Object[] { - "research.ESSENTIA_OUTPUT_HATCH_ME.page.0", - GregTech_API.sThaumcraftCompat.addInfusionRecipe( - "ESSENTIA_OUTPUT_HATCH_ME", - ItemRefer.Essentia_Output_Hatch.get(1), - new ItemStack[] { - GT_ModHandler.getModItem( - "thaumicenergistics", "thaumicenergistics.block.essentia.provider", 1), - new ItemStack(ConfigBlocks.blockEssentiaReservoir, 1, 0), - essentiaPump, - inter, - }, - ItemRefer.Essentia_Output_Hatch_ME.get(1), - 8, - Arrays.asList( - new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 256), - new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 256), - new TC_Aspects.TC_AspectStack(TC_Aspects.ALIENIS, 256), - new TC_Aspects.TC_AspectStack(TC_Aspects.STRONTIO, 256))) - }); + new Object[] { "research.ESSENTIA_OUTPUT_HATCH_ME.page.0", + GregTech_API.sThaumcraftCompat.addInfusionRecipe( + "ESSENTIA_OUTPUT_HATCH_ME", + ItemRefer.Essentia_Output_Hatch.get(1), + new ItemStack[] { + GT_ModHandler.getModItem( + "thaumicenergistics", + "thaumicenergistics.block.essentia.provider", + 1), + new ItemStack(ConfigBlocks.blockEssentiaReservoir, 1, 0), essentiaPump, + inter, }, + ItemRefer.Essentia_Output_Hatch_ME.get(1), + 8, + Arrays.asList( + new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 256), + new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 256), + new TC_Aspects.TC_AspectStack(TC_Aspects.ALIENIS, 256), + new TC_Aspects.TC_AspectStack(TC_Aspects.STRONTIO, 256))) }); } } } diff --git a/src/main/java/goodgenerator/items/DepletedFuelRod.java b/src/main/java/goodgenerator/items/DepletedFuelRod.java index 1ae3d0be97..62d863adc9 100644 --- a/src/main/java/goodgenerator/items/DepletedFuelRod.java +++ b/src/main/java/goodgenerator/items/DepletedFuelRod.java @@ -1,10 +1,11 @@ package goodgenerator.items; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.ItemStack; + import ic2.api.item.IBoxable; import ic2.api.reactor.IReactor; import ic2.api.reactor.IReactorComponent; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.ItemStack; public class DepletedFuelRod extends RadioactiveItem implements IReactorComponent, IBoxable { @@ -21,8 +22,8 @@ public class DepletedFuelRod extends RadioactiveItem implements IReactorComponen public void processChamber(IReactor iReactor, ItemStack itemStack, int i, int i1, boolean b) {} @Override - public boolean acceptUraniumPulse( - IReactor iReactor, ItemStack itemStack, ItemStack itemStack1, int i, int i1, int i2, int i3, boolean b) { + public boolean acceptUraniumPulse(IReactor iReactor, ItemStack itemStack, ItemStack itemStack1, int i, int i1, + int i2, int i3, boolean b) { return false; } diff --git a/src/main/java/goodgenerator/items/FuelRod.java b/src/main/java/goodgenerator/items/FuelRod.java index 52bf8f111a..5f22826e15 100644 --- a/src/main/java/goodgenerator/items/FuelRod.java +++ b/src/main/java/goodgenerator/items/FuelRod.java @@ -2,16 +2,9 @@ package goodgenerator.items; import static goodgenerator.util.DescTextLocalization.addText; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import gregtech.api.util.GT_Utility; -import ic2.api.item.IBoxable; -import ic2.api.reactor.IReactor; -import ic2.api.reactor.IReactorComponent; -import ic2.core.util.StackUtil; -import ic2.core.util.Util; import java.util.ArrayList; import java.util.List; + import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -19,7 +12,17 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.StatCollector; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import gregtech.api.util.GT_Utility; +import ic2.api.item.IBoxable; +import ic2.api.reactor.IReactor; +import ic2.api.reactor.IReactorComponent; +import ic2.core.util.StackUtil; +import ic2.core.util.Util; + public class FuelRod extends RadioactiveItem implements IReactorComponent, IBoxable { + private final int numberOfCells; private final int maxDmg; private final float Power; @@ -27,14 +30,7 @@ public class FuelRod extends RadioactiveItem implements IReactorComponent, IBoxa private float HeatBonus = 0; private final ItemStack result; - public FuelRod( - String aName, - int aCells, - int aEUt, - int aHeat, - int aRads, - int aDuration, - ItemStack aResult, + public FuelRod(String aName, int aCells, int aEUt, int aHeat, int aRads, int aDuration, ItemStack aResult, CreativeTabs Tab) { super(aName, Tab, aRads); this.setMaxStackSize(64); @@ -46,16 +42,8 @@ public class FuelRod extends RadioactiveItem implements IReactorComponent, IBoxa setMaxDamage(100); } - public FuelRod( - String aName, - int aCells, - int aEUt, - int aHeat, - int aRads, - int aDuration, - float aHeatBonus, - ItemStack aResult, - CreativeTabs Tab) { + public FuelRod(String aName, int aCells, int aEUt, int aHeat, int aRads, int aDuration, float aHeatBonus, + ItemStack aResult, CreativeTabs Tab) { super(aName, Tab, aRads); this.setMaxStackSize(64); this.numberOfCells = aCells; @@ -95,13 +83,12 @@ public class FuelRod extends RadioactiveItem implements IReactorComponent, IBoxa while (heatAcceptors.size() > 0 && heat > 0) { int dheat = heat / heatAcceptors.size(); heat -= dheat; - dheat = ((IReactorComponent) heatAcceptors.get(0).stack.getItem()) - .alterHeat( - reactor, - heatAcceptors.get(0).stack, - heatAcceptors.get(0).x, - heatAcceptors.get(0).y, - dheat); + dheat = ((IReactorComponent) heatAcceptors.get(0).stack.getItem()).alterHeat( + reactor, + heatAcceptors.get(0).stack, + heatAcceptors.get(0).x, + heatAcceptors.get(0).y, + dheat); heat += dheat; heatAcceptors.remove(0); } @@ -121,12 +108,10 @@ public class FuelRod extends RadioactiveItem implements IReactorComponent, IBoxa private static int checkPulseable(IReactor reactor, int x, int y, ItemStack me, int mex, int mey, boolean heatrun) { ItemStack other = reactor.getItemAt(x, y); - return other != null - && other.getItem() instanceof IReactorComponent - && ((IReactorComponent) other.getItem()) - .acceptUraniumPulse(reactor, other, me, x, y, mex, mey, heatrun) - ? 1 - : 0; + return other != null && other.getItem() instanceof IReactorComponent + && ((IReactorComponent) other.getItem()).acceptUraniumPulse(reactor, other, me, x, y, mex, mey, heatrun) + ? 1 + : 0; } private static int sumUp(int x) { @@ -135,22 +120,14 @@ public class FuelRod extends RadioactiveItem implements IReactorComponent, IBoxa private void checkHeatAcceptor(IReactor reactor, int x, int y, ArrayList<FuelRod.ItemStackCoord> heatAcceptors) { ItemStack thing = reactor.getItemAt(x, y); - if (thing != null - && thing.getItem() instanceof IReactorComponent + if (thing != null && thing.getItem() instanceof IReactorComponent && ((IReactorComponent) thing.getItem()).canStoreHeat(reactor, thing, x, y)) { heatAcceptors.add(new ItemStackCoord(thing, x, y)); } } - public boolean acceptUraniumPulse( - IReactor reactor, - ItemStack yourStack, - ItemStack pulsingStack, - int youX, - int youY, - int pulseX, - int pulseY, - boolean heatrun) { + public boolean acceptUraniumPulse(IReactor reactor, ItemStack yourStack, ItemStack pulsingStack, int youX, int youY, + int pulseX, int pulseY, boolean heatrun) { if (!heatrun) { reactor.addOutput(Power * (1 + HeatBonus * ((float) reactor.getHeat() / (float) reactor.getMaxHeat()))); } @@ -183,6 +160,7 @@ public class FuelRod extends RadioactiveItem implements IReactorComponent, IBoxa } private static class ItemStackCoord { + public ItemStack stack; public int x; public int y; @@ -222,10 +200,11 @@ public class FuelRod extends RadioactiveItem implements IReactorComponent, IBoxa @Override public void addInformation(ItemStack item, EntityPlayer player, List tooltip, boolean p_77624_4_) { super.addInformation(item, player, tooltip, p_77624_4_); - tooltip.add(String.format( - addText("fuelrod.tooltip", 1)[0], - getMaxCustomDamage(item) - getCustomDamage(item), - getMaxCustomDamage(item))); + tooltip.add( + String.format( + addText("fuelrod.tooltip", 1)[0], + getMaxCustomDamage(item) - getCustomDamage(item), + getMaxCustomDamage(item))); double tMut = this.Heat / 4.0; if (this.Heat == 4) { tooltip.add(StatCollector.translateToLocal("fuelrodheat.tooltip.0")); diff --git a/src/main/java/goodgenerator/items/MyItemBlocks.java b/src/main/java/goodgenerator/items/MyItemBlocks.java index f778444058..12a1ab488e 100644 --- a/src/main/java/goodgenerator/items/MyItemBlocks.java +++ b/src/main/java/goodgenerator/items/MyItemBlocks.java @@ -4,16 +4,9 @@ import static goodgenerator.loader.Loaders.essentiaCell; import static goodgenerator.loader.Loaders.yottaFluidTankCell; import static goodgenerator.util.CharExchanger.tierName; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import goodgenerator.blocks.regularBlock.TEBlock; -import goodgenerator.blocks.tileEntity.EssentiaOutputHatch; -import goodgenerator.main.GoodGenerator; -import goodgenerator.util.CharExchanger; -import goodgenerator.util.DescTextLocalization; -import gregtech.api.util.GT_LanguageManager; import java.util.Arrays; import java.util.List; + import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemBlock; @@ -21,11 +14,21 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.util.StatCollector; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import goodgenerator.blocks.regularBlock.TEBlock; +import goodgenerator.blocks.tileEntity.EssentiaOutputHatch; +import goodgenerator.main.GoodGenerator; +import goodgenerator.util.CharExchanger; +import goodgenerator.util.DescTextLocalization; +import gregtech.api.util.GT_LanguageManager; + public class MyItemBlocks extends ItemBlock { - private final String mNoMobsToolTip = - GT_LanguageManager.addStringLocalization("gt.nomobspawnsonthisblock", "Mobs cannot Spawn on this Block"); - private final String mNoTileEntityToolTip = - GT_LanguageManager.addStringLocalization("gt.notileentityinthisblock", "This is NOT a TileEntity!"); + + private final String mNoMobsToolTip = GT_LanguageManager + .addStringLocalization("gt.nomobspawnsonthisblock", "Mobs cannot Spawn on this Block"); + private final String mNoTileEntityToolTip = GT_LanguageManager + .addStringLocalization("gt.notileentityinthisblock", "This is NOT a TileEntity!"); public MyItemBlocks(Block block) { super(block); @@ -63,7 +66,7 @@ public class MyItemBlocks extends ItemBlock { } @Override - @SuppressWarnings({"unchecked"}) + @SuppressWarnings({ "unchecked" }) @SideOnly(Side.CLIENT) public void addInformation(ItemStack p_77624_1_, EntityPlayer p_77624_2_, List p_77624_3_, boolean p_77624_4_) { if (p_77624_1_ == null) return; @@ -74,8 +77,9 @@ public class MyItemBlocks extends ItemBlock { p_77624_3_.addAll(Arrays.asList(DescTextLocalization.addText("EssentiaHatch.tooltip", 2))); if (tile.getIndex() == 2) { p_77624_3_.add(StatCollector.translateToLocal("EssentiaOutputHatch.tooltip.0")); - p_77624_3_.add(StatCollector.translateToLocal("EssentiaOutputHatch.tooltip.1") + " " - + EssentiaOutputHatch.CAPACITY); + p_77624_3_.add( + StatCollector.translateToLocal("EssentiaOutputHatch.tooltip.1") + " " + + EssentiaOutputHatch.CAPACITY); } } else p_77624_3_.add(mNoTileEntityToolTip); @@ -84,13 +88,15 @@ public class MyItemBlocks extends ItemBlock { cap.append(" 1000000"); for (int i = 0; i < p_77624_1_.getItemDamage(); i++) cap.append("00"); cap.append(" L"); - p_77624_3_.add(StatCollector.translateToLocal("YOTTankCell.tooltip.0") - + CharExchanger.formatNumber(cap.toString())); + p_77624_3_.add( + StatCollector.translateToLocal("YOTTankCell.tooltip.0") + + CharExchanger.formatNumber(cap.toString())); } if (Block.getBlockFromItem(p_77624_1_.getItem()).equals(essentiaCell)) { - p_77624_3_.add(StatCollector.translateToLocal("hatchTier.tooltip.0") + " " - + tierName[p_77624_1_.getItemDamage() + 4]); + p_77624_3_.add( + StatCollector.translateToLocal("hatchTier.tooltip.0") + " " + + tierName[p_77624_1_.getItemDamage() + 4]); } } } diff --git a/src/main/java/goodgenerator/items/MyItems.java b/src/main/java/goodgenerator/items/MyItems.java index 68ae8e3357..71a67d4fd6 100644 --- a/src/main/java/goodgenerator/items/MyItems.java +++ b/src/main/java/goodgenerator/items/MyItems.java @@ -1,11 +1,9 @@ package goodgenerator.items; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import goodgenerator.main.GoodGenerator; import java.util.ArrayList; import java.util.Arrays; import java.util.List; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; @@ -13,6 +11,10 @@ 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; +import goodgenerator.main.GoodGenerator; + public class MyItems extends Item { @SideOnly(Side.CLIENT) @@ -111,7 +113,7 @@ public class MyItems extends Item { } @SideOnly(Side.CLIENT) - @SuppressWarnings({"unchecked"}) + @SuppressWarnings({ "unchecked" }) public void addInformation(ItemStack p_77624_1_, EntityPlayer p_77624_2_, List p_77624_3_, boolean p_77624_4_) { if (tooltips.size() > 0) { p_77624_3_.addAll(tooltips); diff --git a/src/main/java/goodgenerator/items/MyMaterial.java b/src/main/java/goodgenerator/items/MyMaterial.java index 164b736486..bbdf2ee289 100644 --- a/src/main/java/goodgenerator/items/MyMaterial.java +++ b/src/main/java/goodgenerator/items/MyMaterial.java @@ -6,17 +6,18 @@ import static gregtech.api.enums.Materials.*; import com.github.bartimaeusnek.bartworks.system.material.Werkstoff; import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader; import com.github.bartimaeusnek.bartworks.util.Pair; + import goodgenerator.util.CharExchanger; import gregtech.api.enums.TextureSet; -@SuppressWarnings({"unchecked"}) +@SuppressWarnings({ "unchecked" }) public class MyMaterial implements Runnable { protected static final int OffsetID = 10001; // Uranium Based Fuel Line public static final Werkstoff graphiteUraniumMixture = new Werkstoff( - new short[] {0x3a, 0x77, 0x3d}, + new short[] { 0x3a, 0x77, 0x3d }, "Graphite-Uranium Mixture", subscriptNumbers("C3U"), new Werkstoff.Stats(), @@ -28,7 +29,7 @@ public class MyMaterial implements Runnable { new Pair<>(Uranium, 1)); public static final Werkstoff uraniumBasedLiquidFuel = new Werkstoff( - new short[] {0x00, 0xff, 0x00}, + new short[] { 0x00, 0xff, 0x00 }, "Uranium Based Liquid Fuel", subscriptNumbers("U36K8Qt4Rn"), new Werkstoff.Stats().setRadioactive(true), @@ -38,7 +39,7 @@ public class MyMaterial implements Runnable { TextureSet.SET_FLUID); public static final Werkstoff uraniumBasedLiquidFuelExcited = new Werkstoff( - new short[] {0x00, 0xff, 0x00}, + new short[] { 0x00, 0xff, 0x00 }, "Uranium Based Liquid Fuel (Excited State)", subscriptNumbers("*(U36K8Qt4Rn)*"), new Werkstoff.Stats().setRadioactive(true), @@ -48,7 +49,7 @@ public class MyMaterial implements Runnable { TextureSet.SET_FLUID); public static final Werkstoff uraniumBasedLiquidFuelDepleted = new Werkstoff( - new short[] {0x6e, 0x8b, 0x3d}, + new short[] { 0x6e, 0x8b, 0x3d }, "Uranium Based Liquid Fuel (Depleted)", subscriptNumbers("Pb?Bi?Ba?Xe?"), new Werkstoff.Stats().setToxic(true), @@ -59,7 +60,7 @@ public class MyMaterial implements Runnable { // Thorium Based Fuel public static final Werkstoff uraniumCarbideThoriumMixture = new Werkstoff( - new short[] {0x16, 0x32, 0x07}, + new short[] { 0x16, 0x32, 0x07 }, "Uranium Carbide-Thorium Mixture", Werkstoff.Types.MIXTURE, new Werkstoff.GenerationFeatures().disable().addMixerRecipes().onlyDust(), @@ -71,7 +72,7 @@ public class MyMaterial implements Runnable { new Pair<>(Carbon, 3)); public static final Werkstoff thoriumBasedLiquidFuel = new Werkstoff( - new short[] {0x50, 0x32, 0x66}, + new short[] { 0x50, 0x32, 0x66 }, "Thorium Based Liquid Fuel", subscriptNumbers("Th432Li4D2Hg"), new Werkstoff.Stats().setRadioactive(true), @@ -81,7 +82,7 @@ public class MyMaterial implements Runnable { TextureSet.SET_FLUID); public static final Werkstoff thoriumBasedLiquidFuelExcited = new Werkstoff( - new short[] {0x50, 0x32, 0x66}, + new short[] { 0x50, 0x32, 0x66 }, "Thorium Based Liquid Fuel (Excited State)", subscriptNumbers("*(Th432Li4D2Hg)*"), new Werkstoff.Stats().setRadioactive(true), @@ -91,7 +92,7 @@ public class MyMaterial implements Runnable { TextureSet.SET_FLUID); public static final Werkstoff thoriumBasedLiquidFuelDepleted = new Werkstoff( - new short[] {0x7d, 0x6c, 0x8a}, + new short[] { 0x7d, 0x6c, 0x8a }, "Thorium Based Liquid Fuel (Depleted)", subscriptNumbers("Th?Pr?B?In?"), new Werkstoff.Stats().setToxic(true), @@ -102,7 +103,7 @@ public class MyMaterial implements Runnable { // Plutonium Based Fuel public static final Werkstoff plutoniumOxideUraniumMixture = new Werkstoff( - new short[] {0xd1, 0x1f, 0x4a}, + new short[] { 0xd1, 0x1f, 0x4a }, "Plutonium Oxide-Uranium Mixture", Werkstoff.Types.MIXTURE, new Werkstoff.GenerationFeatures().disable().addMixerRecipes().onlyDust(), @@ -114,7 +115,7 @@ public class MyMaterial implements Runnable { new Pair<>(Carbon, 8)); public static final Werkstoff plutoniumBasedLiquidFuel = new Werkstoff( - new short[] {0xef, 0x15, 0x15}, + new short[] { 0xef, 0x15, 0x15 }, "Plutonium Based Liquid Fuel", subscriptNumbers("Pu45Nt8Cs16Nq2"), new Werkstoff.Stats().setRadioactive(true), @@ -124,7 +125,7 @@ public class MyMaterial implements Runnable { TextureSet.SET_FLUID); public static final Werkstoff plutoniumBasedLiquidFuelExcited = new Werkstoff( - new short[] {0xef, 0x15, 0x15}, + new short[] { 0xef, 0x15, 0x15 }, "Plutonium Based Liquid Fuel (Excited State)", subscriptNumbers("*(Pu45Nt8Cs16Nq2)*"), new Werkstoff.Stats().setRadioactive(true), @@ -134,7 +135,7 @@ public class MyMaterial implements Runnable { TextureSet.SET_FLUID); public static final Werkstoff plutoniumBasedLiquidFuelDepleted = new Werkstoff( - new short[] {0x67, 0x19, 0x19}, + new short[] { 0x67, 0x19, 0x19 }, "Plutonium Based Liquid Fuel (Depleted)", subscriptNumbers("Tn?Ce?Au?Kr?"), new Werkstoff.Stats().setToxic(true), @@ -145,7 +146,7 @@ public class MyMaterial implements Runnable { // Thorium-233 public static final Werkstoff oxalate = new Werkstoff( - new short[] {0x79, 0xd8, 0x55}, + new short[] { 0x79, 0xd8, 0x55 }, "Oxalate", Werkstoff.Types.BIOLOGICAL, new Werkstoff.GenerationFeatures().disable().addCells(), @@ -156,7 +157,7 @@ public class MyMaterial implements Runnable { new Pair<>(Oxygen, 4)); public static final Werkstoff vanadiumPentoxide = new Werkstoff( - new short[] {0xde, 0x8d, 0x12}, + new short[] { 0xde, 0x8d, 0x12 }, "Vanadium Pentoxide", Werkstoff.Types.COMPOUND, new Werkstoff.GenerationFeatures().disable().onlyDust(), @@ -166,7 +167,7 @@ public class MyMaterial implements Runnable { new Pair<>(Oxygen, 5)); public static final Werkstoff thoriumNitrate = new Werkstoff( - new short[] {0xba, 0xe8, 0x26}, + new short[] { 0xba, 0xe8, 0x26 }, "Thorium Nitrate", subscriptNumbers("Th(NO3)4"), new Werkstoff.Stats(), @@ -176,7 +177,7 @@ public class MyMaterial implements Runnable { TextureSet.SET_DULL); public static final Werkstoff thoriumOxalate = new Werkstoff( - new short[] {0x50, 0x63, 0x13}, + new short[] { 0x50, 0x63, 0x13 }, "Thorium Oxalate", subscriptNumbers("Th(C2O4)2"), new Werkstoff.Stats(), @@ -186,7 +187,7 @@ public class MyMaterial implements Runnable { TextureSet.SET_DULL); public static final Werkstoff thoriumHydroxide = new Werkstoff( - new short[] {0x92, 0xae, 0x89}, + new short[] { 0x92, 0xae, 0x89 }, "Thorium Hydroxide", subscriptNumbers("Th(OH)4"), new Werkstoff.Stats(), @@ -196,7 +197,7 @@ public class MyMaterial implements Runnable { TextureSet.SET_SHINY); public static final Werkstoff sodiumOxalate = new Werkstoff( - new short[] {0xe4, 0xf8, 0x9b}, + new short[] { 0xe4, 0xf8, 0x9b }, "Sodium Oxalate", subscriptNumbers("Na2C2O4"), new Werkstoff.Stats(), @@ -206,7 +207,7 @@ public class MyMaterial implements Runnable { TextureSet.SET_DULL); public static final Werkstoff thoriumTetrachloride = new Werkstoff( - new short[] {0x13, 0x7c, 0x16}, + new short[] { 0x13, 0x7c, 0x16 }, "Thorium Tetrachloride", subscriptNumbers("ThCl4"), new Werkstoff.Stats(), @@ -216,7 +217,7 @@ public class MyMaterial implements Runnable { TextureSet.SET_FLUID); public static final Werkstoff thoriumTetrafluoride = new Werkstoff( - new short[] {0x15, 0x6a, 0x6a}, + new short[] { 0x15, 0x6a, 0x6a }, "Thorium Tetrafluoride", subscriptNumbers("ThF4"), new Werkstoff.Stats(), @@ -226,7 +227,7 @@ public class MyMaterial implements Runnable { TextureSet.SET_FLUID); public static final Werkstoff thorium232Tetrafluoride = new Werkstoff( - new short[] {0x15, 0x6a, 0x6a}, + new short[] { 0x15, 0x6a, 0x6a }, "Thorium-232 Tetrafluoride", new Werkstoff.Stats(), Werkstoff.Types.COMPOUND, @@ -238,7 +239,7 @@ public class MyMaterial implements Runnable { // Atomic Separation Catalyst public static final Werkstoff orundum = new Werkstoff( - new short[] {0xcd, 0x26, 0x26}, + new short[] { 0xcd, 0x26, 0x26 }, "Orundum", "Or", new Werkstoff.Stats().setProtons(120).setMass(300), @@ -248,19 +249,13 @@ public class MyMaterial implements Runnable { TextureSet.SET_DIAMOND); public static final Werkstoff atomicSeparationCatalyst = new Werkstoff( - new short[] {0xe8, 0x5e, 0x0c}, + new short[] { 0xe8, 0x5e, 0x0c }, "Atomic Separation Catalyst", "the melting core...", new Werkstoff.Stats().setMeltingPoint(5000).setBlastFurnace(true), Werkstoff.Types.COMPOUND, - new Werkstoff.GenerationFeatures() - .disable() - .onlyDust() - .addMolten() - .addMetalItems() - .addSimpleMetalWorkingItems() - .addCraftingMetalWorkingItems() - .addMultipleIngotMetalWorkingItems(), + new Werkstoff.GenerationFeatures().disable().onlyDust().addMolten().addMetalItems() + .addSimpleMetalWorkingItems().addCraftingMetalWorkingItems().addMultipleIngotMetalWorkingItems(), OffsetID + 21, TextureSet.SET_SHINY, new Pair<>(MyMaterial.orundum, 2), @@ -269,29 +264,19 @@ public class MyMaterial implements Runnable { // Naquadah Fuel Rework public static final Werkstoff extremelyUnstableNaquadah = new Werkstoff( - new short[] {0x06, 0x26, 0x05}, + new short[] { 0x06, 0x26, 0x05 }, "Extremely Unstable Naquadah", "Nq" + CharExchanger.shifter(9734), - new Werkstoff.Stats() - .setMeltingPoint(7000) - .setBlastFurnace(true) - .setProtons(200) - .setMass(450) + new Werkstoff.Stats().setMeltingPoint(7000).setBlastFurnace(true).setProtons(200).setMass(450) .setRadioactive(true), Werkstoff.Types.ELEMENT, - new Werkstoff.GenerationFeatures() - .disable() - .onlyDust() - .addMolten() - .addMetalItems() - .addSimpleMetalWorkingItems() - .addCraftingMetalWorkingItems() - .addMultipleIngotMetalWorkingItems(), + new Werkstoff.GenerationFeatures().disable().onlyDust().addMolten().addMetalItems() + .addSimpleMetalWorkingItems().addCraftingMetalWorkingItems().addMultipleIngotMetalWorkingItems(), OffsetID + 23, TextureSet.SET_SHINY); public static final Werkstoff lightNaquadahFuel = new Werkstoff( - new short[] {92, 203, 92}, + new short[] { 92, 203, 92 }, "Light Naquadah Fuel", "far from enough", new Werkstoff.Stats().setToxic(true).setRadioactive(true), @@ -301,7 +286,7 @@ public class MyMaterial implements Runnable { TextureSet.SET_FLUID); public static final Werkstoff heavyNaquadahFuel = new Werkstoff( - new short[] {54, 255, 54}, + new short[] { 54, 255, 54 }, "Heavy Naquadah Fuel", "still need processing", new Werkstoff.Stats().setToxic(true).setRadioactive(true), @@ -311,7 +296,7 @@ public class MyMaterial implements Runnable { TextureSet.SET_FLUID); public static final Werkstoff naquadahGas = new Werkstoff( - new short[] {93, 219, 0}, + new short[] { 93, 219, 0 }, "Naquadah Gas", "Who need it?", new Werkstoff.Stats().setToxic(true).setRadioactive(true).setGas(true), @@ -321,7 +306,7 @@ public class MyMaterial implements Runnable { TextureSet.SET_FLUID); public static final Werkstoff naquadahAsphalt = new Werkstoff( - new short[] {5, 37, 5}, + new short[] { 5, 37, 5 }, "Naquadah Asphalt", "It will damage the reactor.", new Werkstoff.Stats().setToxic(true).setRadioactive(true), @@ -331,7 +316,7 @@ public class MyMaterial implements Runnable { TextureSet.SET_FLUID); public static final Werkstoff ether = new Werkstoff( - new short[] {0xeb, 0xbc, 0x2f}, + new short[] { 0xeb, 0xbc, 0x2f }, "Ether", subscriptNumbers("CH3CH2OCH2CH3"), new Werkstoff.Stats().setElektrolysis(true), @@ -344,7 +329,7 @@ public class MyMaterial implements Runnable { new Pair<>(Oxygen, 1)); public static final Werkstoff antimonyTrichloride = new Werkstoff( - new short[] {0x0f, 0xdc, 0x34}, + new short[] { 0x0f, 0xdc, 0x34 }, "Antimony Trichloride Solution", subscriptNumbers("SbCl3"), new Werkstoff.Stats(), @@ -354,7 +339,7 @@ public class MyMaterial implements Runnable { TextureSet.SET_FLUID); public static final Werkstoff antimonyPentachlorideSolution = new Werkstoff( - new short[] {0x15, 0x93, 0x2c}, + new short[] { 0x15, 0x93, 0x2c }, "Antimony Pentachloride Solution", subscriptNumbers("SbCl5"), new Werkstoff.Stats(), @@ -364,7 +349,7 @@ public class MyMaterial implements Runnable { TextureSet.SET_FLUID); public static final Werkstoff antimonyPentachloride = new Werkstoff( - new short[] {0x15, 0x93, 0x2c}, + new short[] { 0x15, 0x93, 0x2c }, "Antimony Pentachloride", subscriptNumbers("SbCl5"), new Werkstoff.Stats(), @@ -374,7 +359,7 @@ public class MyMaterial implements Runnable { TextureSet.SET_FLUID); public static final Werkstoff antimonyPentafluoride = new Werkstoff( - new short[] {0x16, 0xd5, 0xe2}, + new short[] { 0x16, 0xd5, 0xe2 }, "Antimony Pentafluoride", subscriptNumbers("SbF5"), new Werkstoff.Stats(), @@ -384,7 +369,7 @@ public class MyMaterial implements Runnable { TextureSet.SET_FLUID); public static final Werkstoff fluoroantimonicAcid = new Werkstoff( - new short[] {0x16, 0xd5, 0xe2}, + new short[] { 0x16, 0xd5, 0xe2 }, "Fluoroantimonic Acid", subscriptNumbers("HSbF6"), new Werkstoff.Stats(), @@ -394,7 +379,7 @@ public class MyMaterial implements Runnable { TextureSet.SET_FLUID); public static final Werkstoff radioactiveSludge = new Werkstoff( - new short[] {0xb3, 0x49, 0x1e}, + new short[] { 0xb3, 0x49, 0x1e }, "Radioactive Sludge", ">>> DANGER <<<", new Werkstoff.Stats().setRadioactive(true), @@ -404,7 +389,7 @@ public class MyMaterial implements Runnable { TextureSet.SET_DULL); public static final Werkstoff acidNaquadahEmulsion = new Werkstoff( - new short[] {0x25, 0x22, 0x22}, + new short[] { 0x25, 0x22, 0x22 }, "Acid Naquadah Emulsion", "??Nq??H" + CharExchanger.shifter(8314), new Werkstoff.Stats().setRadioactive(true), @@ -414,7 +399,7 @@ public class MyMaterial implements Runnable { TextureSet.SET_FLUID); public static final Werkstoff naquadahEmulsion = new Werkstoff( - new short[] {0x4a, 0x46, 0x45}, + new short[] { 0x4a, 0x46, 0x45 }, "Naquadah Emulsion", "??Nq??", new Werkstoff.Stats().setRadioactive(true), @@ -424,7 +409,7 @@ public class MyMaterial implements Runnable { TextureSet.SET_FLUID); public static final Werkstoff naquadahSolution = new Werkstoff( - new short[] {0x84, 0x81, 0x80}, + new short[] { 0x84, 0x81, 0x80 }, "Naquadah Solution", "~Nq~", new Werkstoff.Stats().setRadioactive(true), @@ -434,7 +419,7 @@ public class MyMaterial implements Runnable { TextureSet.SET_FLUID); public static final Werkstoff naquadahBasedFuelMkI = new Werkstoff( - new short[] {0x62, 0x5c, 0x5b}, + new short[] { 0x62, 0x5c, 0x5b }, "Naquadah Based Liquid Fuel MkI", new Werkstoff.Stats().setRadioactive(true), Werkstoff.Types.MIXTURE, @@ -443,7 +428,7 @@ public class MyMaterial implements Runnable { TextureSet.SET_FLUID); public static final Werkstoff naquadahBasedFuelMkIDepleted = new Werkstoff( - new short[] {0xcb, 0xc3, 0xc1}, + new short[] { 0xcb, 0xc3, 0xc1 }, "Naquadah Based Liquid Fuel MkI (Depleted)", new Werkstoff.Stats().setToxic(true), Werkstoff.Types.MIXTURE, @@ -452,7 +437,7 @@ public class MyMaterial implements Runnable { TextureSet.SET_FLUID); public static final Werkstoff naquadahBasedFuelMkII = new Werkstoff( - new short[] {0x52, 0x4e, 0x4d}, + new short[] { 0x52, 0x4e, 0x4d }, "Naquadah Based Liquid Fuel MkII", new Werkstoff.Stats().setRadioactive(true), Werkstoff.Types.MIXTURE, @@ -461,50 +446,28 @@ public class MyMaterial implements Runnable { TextureSet.SET_FLUID); public static final Werkstoff naquadahBasedFuelMkIIDepleted = new Werkstoff( - new short[] {0xb5, 0xb0, 0xae}, + new short[] { 0xb5, 0xb0, 0xae }, "Naquadah Based Liquid Fuel MkII (Depleted)", new Werkstoff.Stats().setToxic(true), Werkstoff.Types.MIXTURE, new Werkstoff.GenerationFeatures().disable().addCells(), OffsetID + 41, TextureSet.SET_FLUID); - /*These materials will be enable when they are removed in GregTech*/ + /* These materials will be enable when they are removed in GregTech */ /* - public static final Werkstoff praseodymium = new Werkstoff( - new short[]{0xff,0xff,0xff}, - "praseodymium", - "Pr", - new Werkstoff.Stats(), - Werkstoff.Types.ELEMENT, - new Werkstoff.GenerationFeatures().disable().onlyDust().addMolten().addMetalItems(), - OffsetID + 42, - TextureSet.SET_METALLIC - ); - - public static final Werkstoff rubidium = new Werkstoff( - new short[]{0xff,0x2a,0x00}, - "rubidium", - "Rb", - new Werkstoff.Stats(), - Werkstoff.Types.ELEMENT, - new Werkstoff.GenerationFeatures().disable().onlyDust().addMolten().addMetalItems(), - OffsetID + 43, - TextureSet.SET_SHINY - ); - - public static final Werkstoff thulium = new Werkstoff( - new short[]{0xff,0xff,0xff}, - "Thulium", - "Tm", - new Werkstoff.Stats(), - Werkstoff.Types.ELEMENT, - new Werkstoff.GenerationFeatures().disable().onlyDust().addMolten().addMetalItems(), - OffsetID + 44, - TextureSet.SET_METALLIC - ); - */ + * public static final Werkstoff praseodymium = new Werkstoff( new short[]{0xff,0xff,0xff}, "praseodymium", "Pr", + * new Werkstoff.Stats(), Werkstoff.Types.ELEMENT, new + * Werkstoff.GenerationFeatures().disable().onlyDust().addMolten().addMetalItems(), OffsetID + 42, + * TextureSet.SET_METALLIC ); public static final Werkstoff rubidium = new Werkstoff( new short[]{0xff,0x2a,0x00}, + * "rubidium", "Rb", new Werkstoff.Stats(), Werkstoff.Types.ELEMENT, new + * Werkstoff.GenerationFeatures().disable().onlyDust().addMolten().addMetalItems(), OffsetID + 43, + * TextureSet.SET_SHINY ); public static final Werkstoff thulium = new Werkstoff( new short[]{0xff,0xff,0xff}, + * "Thulium", "Tm", new Werkstoff.Stats(), Werkstoff.Types.ELEMENT, new + * Werkstoff.GenerationFeatures().disable().onlyDust().addMolten().addMetalItems(), OffsetID + 44, + * TextureSet.SET_METALLIC ); + */ public static final Werkstoff naquadahBasedFuelMkIII = new Werkstoff( - new short[] {0x29, 0x22, 0x21}, + new short[] { 0x29, 0x22, 0x21 }, "Naquadah Based Liquid Fuel MkIII", new Werkstoff.Stats().setRadioactive(true), Werkstoff.Types.MIXTURE, @@ -513,7 +476,7 @@ public class MyMaterial implements Runnable { TextureSet.SET_FLUID); public static final Werkstoff naquadahBasedFuelMkIIIDepleted = new Werkstoff( - new short[] {0x66, 0x40, 0x38}, + new short[] { 0x66, 0x40, 0x38 }, "Naquadah Based Liquid Fuel MkIII (Depleted)", new Werkstoff.Stats().setToxic(true), Werkstoff.Types.MIXTURE, @@ -522,7 +485,7 @@ public class MyMaterial implements Runnable { TextureSet.SET_FLUID); public static final Werkstoff naquadahBasedFuelMkIV = new Werkstoff( - new short[] {0x0e, 0x0c, 0x0c}, + new short[] { 0x0e, 0x0c, 0x0c }, "Naquadah Based Liquid Fuel MkIV", new Werkstoff.Stats().setRadioactive(true), Werkstoff.Types.MIXTURE, @@ -531,7 +494,7 @@ public class MyMaterial implements Runnable { TextureSet.SET_FLUID); public static final Werkstoff naquadahBasedFuelMkIVDepleted = new Werkstoff( - new short[] {0x8e, 0x34, 0x22}, + new short[] { 0x8e, 0x34, 0x22 }, "Naquadah Based Liquid Fuel MkIV (Depleted)", new Werkstoff.Stats().setToxic(true), Werkstoff.Types.MIXTURE, @@ -540,7 +503,7 @@ public class MyMaterial implements Runnable { TextureSet.SET_FLUID); public static final Werkstoff naquadahBasedFuelMkV = new Werkstoff( - new short[] {0x00, 0x00, 0x00}, + new short[] { 0x00, 0x00, 0x00 }, "Naquadah Based Liquid Fuel MkV", "THE END", new Werkstoff.Stats().setRadioactive(true), @@ -550,7 +513,7 @@ public class MyMaterial implements Runnable { TextureSet.SET_FLUID); public static final Werkstoff naquadahBasedFuelMkVDepleted = new Werkstoff( - new short[] {0xff, 0xff, 0xff}, + new short[] { 0xff, 0xff, 0xff }, "Naquadah Based Liquid Fuel MkV (Depleted)", "THE END (literally)", new Werkstoff.Stats().setToxic(true), @@ -560,7 +523,7 @@ public class MyMaterial implements Runnable { TextureSet.SET_FLUID); public static final Werkstoff zincChloride = new Werkstoff( - new short[] {0x73, 0xa5, 0xfc}, + new short[] { 0x73, 0xa5, 0xfc }, "Zinc Chloride", subscriptNumbers("ZnCl2"), new Werkstoff.Stats().setElektrolysis(true), @@ -572,7 +535,7 @@ public class MyMaterial implements Runnable { new Pair<>(Chlorine, 2)); public static final Werkstoff zincThoriumAlloy = new Werkstoff( - new short[] {0x12, 0x34, 0x56}, + new short[] { 0x12, 0x34, 0x56 }, "Zn-Th Alloy", subscriptNumbers("ZnTh"), new Werkstoff.Stats(), @@ -585,7 +548,7 @@ public class MyMaterial implements Runnable { // Naquadah Rework Materials public static final Werkstoff naquadahEarth = new Werkstoff( - new short[] {0x4c, 0x4c, 0x4c}, + new short[] { 0x4c, 0x4c, 0x4c }, "Naquadah Oxide Mixture", subscriptNumbers("??NqTiGaAd??"), new Werkstoff.Stats(), @@ -595,7 +558,7 @@ public class MyMaterial implements Runnable { TextureSet.SET_METALLIC); public static final Werkstoff titaniumTrifluoride = new Werkstoff( - new short[] {0xc0, 0x92, 0xa8}, + new short[] { 0xc0, 0x92, 0xa8 }, "Titanium Trifluoride", subscriptNumbers("TiF3"), new Werkstoff.Stats().setElektrolysis(false), @@ -607,7 +570,7 @@ public class MyMaterial implements Runnable { new Pair<>(Fluorine, 3)); public static final Werkstoff lowQualityNaquadahEmulsion = new Werkstoff( - new short[] {0x4c, 0x4c, 0x4c}, + new short[] { 0x4c, 0x4c, 0x4c }, "Low Quality Naquadah Emulsion", subscriptNumbers("??NqGaAd??"), new Werkstoff.Stats(), @@ -617,7 +580,7 @@ public class MyMaterial implements Runnable { TextureSet.SET_FLUID); public static final Werkstoff galliumHydroxide = new Werkstoff( - new short[] {0xa6, 0xa6, 0xa6}, + new short[] { 0xa6, 0xa6, 0xa6 }, "Gallium Hydroxide", subscriptNumbers("Ga(OH)3"), new Werkstoff.Stats().setElektrolysis(false), @@ -630,7 +593,7 @@ public class MyMaterial implements Runnable { new Pair<>(Hydrogen, 3)); public static final Werkstoff lowQualityNaquadahSolution = new Werkstoff( - new short[] {0x71, 0x62, 0x62}, + new short[] { 0x71, 0x62, 0x62 }, "Low Quality Naquadah Solution", subscriptNumbers("~??NqAd??~"), new Werkstoff.Stats(), @@ -640,7 +603,7 @@ public class MyMaterial implements Runnable { TextureSet.SET_FLUID); public static final Werkstoff towEthyl1Hexanol = new Werkstoff( - new short[] {0x80, 0xb5, 0x57}, + new short[] { 0x80, 0xb5, 0x57 }, "2-Ethyl-1-Hexanol", subscriptNumbers("C8H18O"), new Werkstoff.Stats().setElektrolysis(true), @@ -653,7 +616,7 @@ public class MyMaterial implements Runnable { new Pair<>(Hydrogen, 18)); public static final Werkstoff P507 = new Werkstoff( - new short[] {0x29, 0xc2, 0x2a}, + new short[] { 0x29, 0xc2, 0x2a }, "P-507", subscriptNumbers("(C8H17)2PO3H"), new Werkstoff.Stats().setElektrolysis(true), @@ -667,7 +630,7 @@ public class MyMaterial implements Runnable { new Pair<>(Hydrogen, 35)); public static final Werkstoff naquadahAdamantiumSolution = new Werkstoff( - new short[] {0x3d, 0x38, 0x38}, + new short[] { 0x3d, 0x38, 0x38 }, "Naquadah-Adamantium Solution", subscriptNumbers("~NqAd~"), new Werkstoff.Stats(), @@ -677,7 +640,7 @@ public class MyMaterial implements Runnable { TextureSet.SET_FLUID); public static final Werkstoff naquadahRichSolution = new Werkstoff( - new short[] {0x33, 0x33, 0x33}, + new short[] { 0x33, 0x33, 0x33 }, "Naquadah-Rich Solution", subscriptNumbers("~?Nq?~"), new Werkstoff.Stats(), @@ -687,7 +650,7 @@ public class MyMaterial implements Runnable { TextureSet.SET_FLUID); public static final Werkstoff naquadahine = new Werkstoff( - new short[] {0x33, 0x33, 0x33}, + new short[] { 0x33, 0x33, 0x33 }, "Naquadahine", subscriptNumbers("NqO2"), new Werkstoff.Stats().setElektrolysis(false), @@ -699,7 +662,7 @@ public class MyMaterial implements Runnable { new Pair<>(Oxygen, 2)); public static final Werkstoff fluorineRichWasteLiquid = new Werkstoff( - new short[] {0x13, 0x68, 0x62}, + new short[] { 0x13, 0x68, 0x62 }, "Fluorine-Rich Waste Liquid", new Werkstoff.Stats().setToxic(true), Werkstoff.Types.MIXTURE, @@ -708,7 +671,7 @@ public class MyMaterial implements Runnable { TextureSet.SET_FLUID); public static final Werkstoff wasteLiquid = new Werkstoff( - new short[] {0x14, 0x1c, 0x68}, + new short[] { 0x14, 0x1c, 0x68 }, "Waste Liquid", new Werkstoff.Stats().setToxic(true), Werkstoff.Types.MIXTURE, @@ -717,7 +680,7 @@ public class MyMaterial implements Runnable { TextureSet.SET_FLUID); public static final Werkstoff adamantine = new Werkstoff( - new short[] {0xb7, 0xb7, 0xb7}, + new short[] { 0xb7, 0xb7, 0xb7 }, "Adamantine", subscriptNumbers("Ad2O3"), new Werkstoff.Stats().setElektrolysis(true), @@ -729,7 +692,7 @@ public class MyMaterial implements Runnable { new Pair<>(Oxygen, 3)); public static final Werkstoff enrichedNaquadahEarth = new Werkstoff( - new short[] {0x82, 0x68, 0x68}, + new short[] { 0x82, 0x68, 0x68 }, "Enriched-Naquadah Oxide Mixture", subscriptNumbers("??KeNq") + CharExchanger.shifter(8314) + "??", new Werkstoff.Stats().setRadioactive(true), @@ -739,7 +702,7 @@ public class MyMaterial implements Runnable { TextureSet.SET_METALLIC); public static final Werkstoff triniumSulphate = new Werkstoff( - new short[] {0xda, 0xda, 0xda}, + new short[] { 0xda, 0xda, 0xda }, "Trinium Sulphate", subscriptNumbers("KeSO4"), new Werkstoff.Stats().setElektrolysis(false), @@ -752,7 +715,7 @@ public class MyMaterial implements Runnable { new Pair<>(Oxygen, 4)); public static final Werkstoff enrichedNaquadahRichSolution = new Werkstoff( - new short[] {0x52, 0x39, 0x39}, + new short[] { 0x52, 0x39, 0x39 }, "Enriched-Naquadah-Rich Solution", subscriptNumbers("~?Nq") + CharExchanger.shifter(8314) + "?~", new Werkstoff.Stats().setRadioactive(true), @@ -762,7 +725,7 @@ public class MyMaterial implements Runnable { TextureSet.SET_FLUID); public static final Werkstoff concentratedEnrichedNaquadahSludge = new Werkstoff( - new short[] {0x52, 0x39, 0x39}, + new short[] { 0x52, 0x39, 0x39 }, "Concentrated Enriched-Naquadah Sludge", subscriptNumbers("?Nq") + CharExchanger.shifter(8314) + "?", new Werkstoff.Stats().setRadioactive(true), @@ -772,7 +735,7 @@ public class MyMaterial implements Runnable { TextureSet.SET_METALLIC); public static final Werkstoff enrichedNaquadahSulphate = new Werkstoff( - new short[] {0x52, 0x39, 0x39}, + new short[] { 0x52, 0x39, 0x39 }, "Enriched-Naquadah Sulphate", "Nq" + CharExchanger.shifter(8314) + subscriptNumbers("(SO4)2"), new Werkstoff.Stats().setRadioactive(true).setElektrolysis(true), @@ -785,7 +748,7 @@ public class MyMaterial implements Runnable { new Pair<>(Oxygen, 8)); public static final Werkstoff naquadriaEarth = new Werkstoff( - new short[] {0x4d, 0x4d, 0x55}, + new short[] { 0x4d, 0x4d, 0x55 }, "Naquadria Oxide Mixture", subscriptNumbers("??Nq*BaIn??"), new Werkstoff.Stats().setRadioactive(true).setToxic(true), @@ -795,7 +758,7 @@ public class MyMaterial implements Runnable { TextureSet.SET_METALLIC); public static final Werkstoff indiumPhosphate = new Werkstoff( - new short[] {0x2b, 0x2e, 0x70}, + new short[] { 0x2b, 0x2e, 0x70 }, "Indium Phosphate", subscriptNumbers("InPO4"), new Werkstoff.Stats().setToxic(true).setElektrolysis(false), @@ -808,7 +771,7 @@ public class MyMaterial implements Runnable { new Pair<>(Oxygen, 4)); public static final Werkstoff lowQualityNaquadriaPhosphate = new Werkstoff( - new short[] {0x4d, 0x4d, 0x55}, + new short[] { 0x4d, 0x4d, 0x55 }, "Low Quality Naquadria Phosphate", subscriptNumbers("??Nq*3(PO4)4??"), new Werkstoff.Stats().setRadioactive(true).setToxic(true), @@ -818,7 +781,7 @@ public class MyMaterial implements Runnable { TextureSet.SET_DULL); public static final Werkstoff naquadriaRichSolution = new Werkstoff( - new short[] {0x1f, 0x1e, 0x33}, + new short[] { 0x1f, 0x1e, 0x33 }, "Naquadria-Rich Solution", subscriptNumbers("~?Nq*?~"), new Werkstoff.Stats().setRadioactive(true).setToxic(true), @@ -828,7 +791,7 @@ public class MyMaterial implements Runnable { TextureSet.SET_FLUID); public static final Werkstoff lowQualityNaquadriaSulphate = new Werkstoff( - new short[] {0x73, 0x72, 0x84}, + new short[] { 0x73, 0x72, 0x84 }, "Low Quality Naquadria Sulphate", subscriptNumbers("??Nq*(SO4)2??"), new Werkstoff.Stats().setRadioactive(true).setToxic(true), @@ -838,7 +801,7 @@ public class MyMaterial implements Runnable { TextureSet.SET_METALLIC); public static final Werkstoff lowQualityNaquadriaSolution = new Werkstoff( - new short[] {0x73, 0x72, 0x84}, + new short[] { 0x73, 0x72, 0x84 }, "Low Quality Naquadria Sulphate", subscriptNumbers("~??Nq*??~"), new Werkstoff.Stats().setRadioactive(true).setToxic(true), @@ -848,7 +811,7 @@ public class MyMaterial implements Runnable { TextureSet.SET_FLUID); public static final Werkstoff naquadriaSulphate = new Werkstoff( - new short[] {0x1f, 0x1e, 0x33}, + new short[] { 0x1f, 0x1e, 0x33 }, "Naquadria Sulphate", subscriptNumbers("Nq*(SO4)2"), new Werkstoff.Stats().setRadioactive(true).setToxic(true).setElektrolysis(true), @@ -861,7 +824,7 @@ public class MyMaterial implements Runnable { new Pair<>(Oxygen, 8)); public static final Werkstoff naquadahGoo = new Werkstoff( - new short[] {0x4c, 0x4c, 0x4c}, + new short[] { 0x4c, 0x4c, 0x4c }, "Naquadah Goo", subscriptNumbers("??NqTiGaAd??"), new Werkstoff.Stats(), @@ -871,7 +834,7 @@ public class MyMaterial implements Runnable { TextureSet.SET_FLUID); public static final Werkstoff enrichedNaquadahGoo = new Werkstoff( - new short[] {0x82, 0x68, 0x68}, + new short[] { 0x82, 0x68, 0x68 }, "Enriched Naquadah Goo", subscriptNumbers("??KeNq") + CharExchanger.shifter(8314) + "??", new Werkstoff.Stats().setRadioactive(true), @@ -881,7 +844,7 @@ public class MyMaterial implements Runnable { TextureSet.SET_FLUID); public static final Werkstoff naquadriaGoo = new Werkstoff( - new short[] {0x4d, 0x4d, 0x55}, + new short[] { 0x4d, 0x4d, 0x55 }, "Naquadria Goo", subscriptNumbers("??Nq*BaIn??"), new Werkstoff.Stats().setRadioactive(true).setToxic(true), @@ -892,16 +855,12 @@ public class MyMaterial implements Runnable { // material for reactor stuff public static final Werkstoff zircaloy4 = new Werkstoff( - new short[] {0x8a, 0x6e, 0x68}, + new short[] { 0x8a, 0x6e, 0x68 }, "Zircaloy-4", subscriptNumbers("Zr34Sn5Fe2Cr"), new Werkstoff.Stats().setCentrifuge(true).setBlastFurnace(true).setMeltingPoint(2800), Werkstoff.Types.MIXTURE, - new Werkstoff.GenerationFeatures() - .onlyDust() - .addMolten() - .addMetalItems() - .addCraftingMetalWorkingItems() + new Werkstoff.GenerationFeatures().onlyDust().addMolten().addMetalItems().addCraftingMetalWorkingItems() .addMixerRecipes((short) 4), OffsetID + 81, TextureSet.SET_METALLIC, @@ -911,16 +870,12 @@ public class MyMaterial implements Runnable { new Pair<>(Chrome, 1)); public static final Werkstoff zircaloy2 = new Werkstoff( - new short[] {0xa4, 0x8f, 0x8b}, + new short[] { 0xa4, 0x8f, 0x8b }, "Zircaloy-2", subscriptNumbers("Zr34Sn4FeCrNi"), new Werkstoff.Stats().setCentrifuge(true).setBlastFurnace(true).setMeltingPoint(2800), Werkstoff.Types.MIXTURE, - new Werkstoff.GenerationFeatures() - .onlyDust() - .addMolten() - .addMetalItems() - .addCraftingMetalWorkingItems() + new Werkstoff.GenerationFeatures().onlyDust().addMolten().addMetalItems().addCraftingMetalWorkingItems() .addMixerRecipes((short) 2), OffsetID + 82, TextureSet.SET_METALLIC, @@ -931,18 +886,13 @@ public class MyMaterial implements Runnable { new Pair<>(Nickel, 1)); public static final Werkstoff incoloy903 = new Werkstoff( - new short[] {0xa4, 0x8f, 0x8b}, + new short[] { 0xa4, 0x8f, 0x8b }, "Incoloy-903", subscriptNumbers("Fe12Ni10Co8Ti4Mo2Al"), new Werkstoff.Stats().setCentrifuge(true).setBlastFurnace(true).setMeltingPoint(3700), Werkstoff.Types.MIXTURE, - new Werkstoff.GenerationFeatures() - .onlyDust() - .addMolten() - .addMetalItems() - .addCraftingMetalWorkingItems() - .addSimpleMetalWorkingItems() - .addMixerRecipes((short) 6), + new Werkstoff.GenerationFeatures().onlyDust().addMolten().addMetalItems().addCraftingMetalWorkingItems() + .addSimpleMetalWorkingItems().addMixerRecipes((short) 6), OffsetID + 83, TextureSet.SET_METALLIC, new Pair<>(Iron, 12), @@ -953,24 +903,14 @@ public class MyMaterial implements Runnable { new Pair<>(Aluminium, 1)); public static final Werkstoff adamantiumAlloy = new Werkstoff( - new short[] {0xa0, 0xa0, 0xa0}, + new short[] { 0xa0, 0xa0, 0xa0 }, "Adamantium Alloy", subscriptNumbers("Ad5Nq2La3"), - new Werkstoff.Stats() - .setCentrifuge(true) - .setBlastFurnace(true) - .setMeltingPoint(5500) - .setSpeedOverride(191.2F) - .setDurOverride(102400), + new Werkstoff.Stats().setCentrifuge(true).setBlastFurnace(true).setMeltingPoint(5500) + .setSpeedOverride(191.2F).setDurOverride(102400), Werkstoff.Types.MIXTURE, - new Werkstoff.GenerationFeatures() - .onlyDust() - .addMolten() - .addMetalItems() - .addCraftingMetalWorkingItems() - .addSimpleMetalWorkingItems() - .addMultipleIngotMetalWorkingItems() - .addMixerRecipes((short) 3), + new Werkstoff.GenerationFeatures().onlyDust().addMolten().addMetalItems().addCraftingMetalWorkingItems() + .addSimpleMetalWorkingItems().addMultipleIngotMetalWorkingItems().addMixerRecipes((short) 3), OffsetID + 84, TextureSet.SET_SHINY, new Pair<>(Adamantium, 5), @@ -978,7 +918,7 @@ public class MyMaterial implements Runnable { new Pair<>(Lanthanum, 3)); public static final Werkstoff ethanolGasoline = new Werkstoff( - new short[] {0xe4, 0xc6, 0x61}, + new short[] { 0xe4, 0xc6, 0x61 }, "Ethanol Gasoline", new Werkstoff.Stats(), Werkstoff.Types.MIXTURE, @@ -987,7 +927,7 @@ public class MyMaterial implements Runnable { TextureSet.SET_FLUID); public static final Werkstoff cyclopentadiene = new Werkstoff( - new short[] {0xff, 0xf6, 0xbd}, + new short[] { 0xff, 0xf6, 0xbd }, "Cyclopentadiene", subscriptNumbers("C5H6"), new Werkstoff.Stats(), @@ -997,7 +937,7 @@ public class MyMaterial implements Runnable { TextureSet.SET_FLUID); public static final Werkstoff ferrousChloride = new Werkstoff( - new short[] {0x5b, 0x5b, 0x5b}, + new short[] { 0x5b, 0x5b, 0x5b }, "Iron II Chloride", subscriptNumbers("FeCl2"), new Werkstoff.Stats(), @@ -1007,7 +947,7 @@ public class MyMaterial implements Runnable { TextureSet.SET_FLUID); public static final Werkstoff diethylamine = new Werkstoff( - new short[] {0x69, 0x77, 0xca}, + new short[] { 0x69, 0x77, 0xca }, "Diethylamine", subscriptNumbers("C4H11N"), new Werkstoff.Stats(), @@ -1017,7 +957,7 @@ public class MyMaterial implements Runnable { TextureSet.SET_FLUID); public static final Werkstoff impureFerroceneMixture = new Werkstoff( - new short[] {0x79, 0x55, 0x08}, + new short[] { 0x79, 0x55, 0x08 }, "Impure Ferrocene Mixture", new Werkstoff.Stats(), Werkstoff.Types.MIXTURE, @@ -1026,7 +966,7 @@ public class MyMaterial implements Runnable { TextureSet.SET_FLUID); public static final Werkstoff ferroceneSolution = new Werkstoff( - new short[] {0xde, 0x7e, 0x1c}, + new short[] { 0xde, 0x7e, 0x1c }, "Ferrocene Solution", new Werkstoff.Stats(), Werkstoff.Types.MIXTURE, @@ -1035,7 +975,7 @@ public class MyMaterial implements Runnable { TextureSet.SET_FLUID); public static final Werkstoff ferroceneWaste = new Werkstoff( - new short[] {0x35, 0x1d, 0x03}, + new short[] { 0x35, 0x1d, 0x03 }, "Ferrocene Waste", new Werkstoff.Stats(), Werkstoff.Types.MIXTURE, @@ -1044,7 +984,7 @@ public class MyMaterial implements Runnable { TextureSet.SET_FLUID); public static final Werkstoff ferrocene = new Werkstoff( - new short[] {0xf1, 0x8f, 0x2b}, + new short[] { 0xf1, 0x8f, 0x2b }, "Ferrocene", subscriptNumbers("Fe(C5H5)2"), new Werkstoff.Stats(), @@ -1054,7 +994,7 @@ public class MyMaterial implements Runnable { TextureSet.SET_SHINY); public static final Werkstoff ironedKerosene = new Werkstoff( - new short[] {0x97, 0x00, 0x61}, + new short[] { 0x97, 0x00, 0x61 }, "Jet Fuel No.3", new Werkstoff.Stats(), Werkstoff.Types.MIXTURE, @@ -1063,7 +1003,7 @@ public class MyMaterial implements Runnable { TextureSet.SET_FLUID); public static final Werkstoff ironedFuel = new Werkstoff( - new short[] {0xff, 0x98, 0x00}, + new short[] { 0xff, 0x98, 0x00 }, "Jet Fuel A", new Werkstoff.Stats(), Werkstoff.Types.MIXTURE, @@ -1072,18 +1012,12 @@ public class MyMaterial implements Runnable { TextureSet.SET_FLUID); public static final Werkstoff marM200 = new Werkstoff( - new short[] {0x51, 0x51, 0x51}, + new short[] { 0x51, 0x51, 0x51 }, "MAR-M200 Steel", new Werkstoff.Stats().setCentrifuge(true).setBlastFurnace(true).setMeltingPoint(5000), Werkstoff.Types.MIXTURE, - new Werkstoff.GenerationFeatures() - .onlyDust() - .addMolten() - .addMetalItems() - .addCraftingMetalWorkingItems() - .addSimpleMetalWorkingItems() - .addMultipleIngotMetalWorkingItems() - .addMixerRecipes((short) 7), + new Werkstoff.GenerationFeatures().onlyDust().addMolten().addMetalItems().addCraftingMetalWorkingItems() + .addSimpleMetalWorkingItems().addMultipleIngotMetalWorkingItems().addMixerRecipes((short) 7), OffsetID + 95, TextureSet.SET_SHINY, new Pair<>(Niobium, 2), @@ -1095,54 +1029,35 @@ public class MyMaterial implements Runnable { new Pair<>(Nickel, 18)); public static final Werkstoff marCeM200 = new Werkstoff( - new short[] {0x38, 0x30, 0x30}, + new short[] { 0x38, 0x30, 0x30 }, "MAR-Ce-M200 Steel", - new Werkstoff.Stats() - .setCentrifuge(true) - .setBlastFurnace(true) - .setMeltingPoint(5000) - .setMass(1200) - .setProtons(1000) - .setSpeedOverride(150F) - .setDurOverride(204800), + new Werkstoff.Stats().setCentrifuge(true).setBlastFurnace(true).setMeltingPoint(5000).setMass(1200) + .setProtons(1000).setSpeedOverride(150F).setDurOverride(204800), Werkstoff.Types.MIXTURE, - new Werkstoff.GenerationFeatures() - .onlyDust() - .addMolten() - .addMetalItems() - .addCraftingMetalWorkingItems() - .addSimpleMetalWorkingItems() - .addMultipleIngotMetalWorkingItems(), + new Werkstoff.GenerationFeatures().onlyDust().addMolten().addMetalItems().addCraftingMetalWorkingItems() + .addSimpleMetalWorkingItems().addMultipleIngotMetalWorkingItems(), OffsetID + 96, TextureSet.SET_METALLIC, new Pair<>(marM200, 18), new Pair<>(Cerium, 1)); public static final Werkstoff lithiumChloride = new Werkstoff( - new short[] {0xb7, 0xe2, 0xce}, + new short[] { 0xb7, 0xe2, 0xce }, "Lithium Chloride", new Werkstoff.Stats(), Werkstoff.Types.MIXTURE, - new Werkstoff.GenerationFeatures() - .onlyDust() - .addMolten() - .addMetalItems() - .enforceUnification(), + new Werkstoff.GenerationFeatures().onlyDust().addMolten().addMetalItems().enforceUnification(), OffsetID + 97, TextureSet.SET_DULL, new Pair<>(Lithium, 1), new Pair<>(Chlorine, 1)); public static final Werkstoff signalium = new Werkstoff( - new short[] {0xd4, 0x40, 0x00}, + new short[] { 0xd4, 0x40, 0x00 }, "Signalium", new Werkstoff.Stats().setBlastFurnace(true).setMeltingPoint(4000), Werkstoff.Types.MIXTURE, - new Werkstoff.GenerationFeatures() - .onlyDust() - .addMolten() - .addMetalItems() - .addCraftingMetalWorkingItems(), + new Werkstoff.GenerationFeatures().onlyDust().addMolten().addMetalItems().addCraftingMetalWorkingItems(), OffsetID + 98, TextureSet.SET_SHINY, new Pair<>(AnnealedCopper, 4), @@ -1150,7 +1065,7 @@ public class MyMaterial implements Runnable { new Pair<>(RedAlloy, 2)); public static final Werkstoff lumiinessence = new Werkstoff( - new short[] {0xe8, 0xf2, 0x24}, + new short[] { 0xe8, 0xf2, 0x24 }, "Lumiinessence", subscriptNumbers("(Al??)2(PO4)4"), new Werkstoff.Stats(), @@ -1160,15 +1075,11 @@ public class MyMaterial implements Runnable { TextureSet.SET_DULL); public static final Werkstoff lumiium = new Werkstoff( - new short[] {0xe8, 0xf2, 0x24}, + new short[] { 0xe8, 0xf2, 0x24 }, "Lumiium", new Werkstoff.Stats().setBlastFurnace(true).setMeltingPoint(4000), Werkstoff.Types.MIXTURE, - new Werkstoff.GenerationFeatures() - .onlyDust() - .addMolten() - .addMetalItems() - .addCraftingMetalWorkingItems(), + new Werkstoff.GenerationFeatures().onlyDust().addMolten().addMetalItems().addCraftingMetalWorkingItems(), OffsetID + 100, TextureSet.SET_SHINY, new Pair<>(TinAlloy, 4), @@ -1176,15 +1087,11 @@ public class MyMaterial implements Runnable { new Pair<>(lumiinessence, 2)); public static final Werkstoff artheriumSn = new Werkstoff( - new short[] {0x60, 0x36, 0xf7}, + new short[] { 0x60, 0x36, 0xf7 }, "Artherium-Sn", new Werkstoff.Stats().setBlastFurnace(true).setMeltingPoint(6500).setCentrifuge(true), Werkstoff.Types.MIXTURE, - new Werkstoff.GenerationFeatures() - .onlyDust() - .addMolten() - .addMetalItems() - .addCraftingMetalWorkingItems() + new Werkstoff.GenerationFeatures().onlyDust().addMolten().addMetalItems().addCraftingMetalWorkingItems() .addMixerRecipes((short) 6), OffsetID + 101, TextureSet.SET_SHINY, @@ -1196,15 +1103,11 @@ public class MyMaterial implements Runnable { new Pair<>(Osmiridium, 3)); public static final Werkstoff titaniumBetaC = new Werkstoff( - new short[] {0xc7, 0x2f, 0xcc}, + new short[] { 0xc7, 0x2f, 0xcc }, "Tanmolyium Beta-C", new Werkstoff.Stats().setBlastFurnace(true).setMeltingPoint(5300).setCentrifuge(true), Werkstoff.Types.MIXTURE, - new Werkstoff.GenerationFeatures() - .onlyDust() - .addMolten() - .addMetalItems() - .addCraftingMetalWorkingItems() + new Werkstoff.GenerationFeatures().onlyDust().addMolten().addMetalItems().addCraftingMetalWorkingItems() .addMixerRecipes((short) 5), OffsetID + 102, TextureSet.SET_METALLIC, @@ -1215,15 +1118,11 @@ public class MyMaterial implements Runnable { new Pair<>(Aluminium, 1)); public static final Werkstoff dalisenite = new Werkstoff( - new short[] {0xb0, 0xb8, 0x12}, + new short[] { 0xb0, 0xb8, 0x12 }, "Dalisenite", new Werkstoff.Stats().setMeltingPoint(8700).setCentrifuge(true), Werkstoff.Types.MIXTURE, - new Werkstoff.GenerationFeatures() - .onlyDust() - .addMolten() - .addMetalItems() - .addCraftingMetalWorkingItems() + new Werkstoff.GenerationFeatures().onlyDust().addMolten().addMetalItems().addCraftingMetalWorkingItems() .addMixerRecipes((short) 6), OffsetID + 103, TextureSet.SET_SHINY, @@ -1235,15 +1134,11 @@ public class MyMaterial implements Runnable { new Pair<>(Erbium, 3)); public static final Werkstoff hikarium = new Werkstoff( - new short[] {0xff, 0xd6, 0xfb}, + new short[] { 0xff, 0xd6, 0xfb }, "Hikarium", new Werkstoff.Stats().setBlastFurnace(true).setMeltingPoint(5400).setCentrifuge(true), Werkstoff.Types.MIXTURE, - new Werkstoff.GenerationFeatures() - .onlyDust() - .addMolten() - .addMetalItems() - .addCraftingMetalWorkingItems() + new Werkstoff.GenerationFeatures().onlyDust().addMolten().addMetalItems().addCraftingMetalWorkingItems() .addMixerRecipes((short) 3), OffsetID + 104, TextureSet.SET_SHINY, @@ -1252,15 +1147,11 @@ public class MyMaterial implements Runnable { new Pair<>(Sunnarium, 4)); public static final Werkstoff tairitsu = new Werkstoff( - new short[] {0x36, 0x36, 0x36}, + new short[] { 0x36, 0x36, 0x36 }, "Tairitsu", new Werkstoff.Stats().setBlastFurnace(true).setMeltingPoint(7400).setCentrifuge(true), Werkstoff.Types.MIXTURE, - new Werkstoff.GenerationFeatures() - .onlyDust() - .addMolten() - .addMetalItems() - .addCraftingMetalWorkingItems() + new Werkstoff.GenerationFeatures().onlyDust().addMolten().addMetalItems().addCraftingMetalWorkingItems() .addMixerRecipes((short) 6), OffsetID + 105, TextureSet.SET_SHINY, @@ -1272,7 +1163,7 @@ public class MyMaterial implements Runnable { new Pair<>(BlackPlutonium, 1)); public static final Werkstoff antimonyPentafluorideSolution = new Werkstoff( - new short[] {0x16, 0xd5, 0xe2}, + new short[] { 0x16, 0xd5, 0xe2 }, "Antimony Pentafluoride Solution", subscriptNumbers("SbF5"), new Werkstoff.Stats(), @@ -1282,7 +1173,7 @@ public class MyMaterial implements Runnable { TextureSet.SET_FLUID); public static final Werkstoff magnesiumSulphate = new Werkstoff( - new short[] {0x87, 0x74, 0x91}, + new short[] { 0x87, 0x74, 0x91 }, "Magnesium Sulphate", subscriptNumbers("MgSO4"), new Werkstoff.Stats().setElektrolysis(true), @@ -1295,21 +1186,13 @@ public class MyMaterial implements Runnable { new Pair<>(Oxygen, 4)); public static final Werkstoff preciousMetalAlloy = new Werkstoff( - new short[] {0x9d, 0x90, 0xc6}, + new short[] { 0x9d, 0x90, 0xc6 }, "Precious Metals Alloy", - new Werkstoff.Stats() - .setBlastFurnace(true) - .setMeltingPoint(10000) - .setCentrifuge(true) + new Werkstoff.Stats().setBlastFurnace(true).setMeltingPoint(10000).setCentrifuge(true) .setSpeedOverride(100F), Werkstoff.Types.MIXTURE, - new Werkstoff.GenerationFeatures() - .onlyDust() - .addMolten() - .addMetalItems() - .addCraftingMetalWorkingItems() - .addMultipleIngotMetalWorkingItems() - .addMixerRecipes((short) 6), + new Werkstoff.GenerationFeatures().onlyDust().addMolten().addMetalItems().addCraftingMetalWorkingItems() + .addMultipleIngotMetalWorkingItems().addMixerRecipes((short) 6), OffsetID + 108, TextureSet.SET_SHINY, new Pair<>(WerkstoffLoader.Ruthenium, 1), @@ -1320,22 +1203,13 @@ public class MyMaterial implements Runnable { new Pair<>(Iridium, 1)); public static final Werkstoff enrichedNaquadahAlloy = new Werkstoff( - new short[] {0x16, 0x07, 0x40}, + new short[] { 0x16, 0x07, 0x40 }, "Enriched Naquadah Alloy", - new Werkstoff.Stats() - .setBlastFurnace(true) - .setMeltingPoint(11000) - .setCentrifuge(true) + new Werkstoff.Stats().setBlastFurnace(true).setMeltingPoint(11000).setCentrifuge(true) .setSpeedOverride(180F), Werkstoff.Types.MIXTURE, - new Werkstoff.GenerationFeatures() - .onlyDust() - .addMolten() - .addMetalItems() - .addCraftingMetalWorkingItems() - .addSimpleMetalWorkingItems() - .addMultipleIngotMetalWorkingItems() - .addMixerRecipes((short) 4), + new Werkstoff.GenerationFeatures().onlyDust().addMolten().addMetalItems().addCraftingMetalWorkingItems() + .addSimpleMetalWorkingItems().addMultipleIngotMetalWorkingItems().addMixerRecipes((short) 4), OffsetID + 109, TextureSet.SET_METALLIC, new Pair<>(NaquadahEnriched, 8), @@ -1344,49 +1218,30 @@ public class MyMaterial implements Runnable { new Pair<>(BlackPlutonium, 2)); public static final Werkstoff metastableOganesson = new Werkstoff( - new short[] {0x14, 0x39, 0x7f}, + new short[] { 0x14, 0x39, 0x7f }, "Metastable Oganesson", "Og*", - new Werkstoff.Stats() - .setBlastFurnace(true) - .setProtons(118) - .setMass(294) - .setMeltingPoint(11000), + new Werkstoff.Stats().setBlastFurnace(true).setProtons(118).setMass(294).setMeltingPoint(11000), Werkstoff.Types.ELEMENT, - new Werkstoff.GenerationFeatures() - .onlyDust() - .addMolten() - .addMetalItems() - .addCraftingMetalWorkingItems() + new Werkstoff.GenerationFeatures().onlyDust().addMolten().addMetalItems().addCraftingMetalWorkingItems() .addMultipleIngotMetalWorkingItems(), OffsetID + 110, TextureSet.SET_SHINY); public static final Werkstoff shirabon = new Werkstoff( - new short[] {0xe0, 0x15, 0x6d}, + new short[] { 0xe0, 0x15, 0x6d }, "Shirabon", "Sh" + CharExchanger.shifter(9191), - new Werkstoff.Stats() - .setBlastFurnace(true) - .setProtons(500) - .setMass(750) - .setMeltingPoint(13000) - .setSpeedOverride(640.0F) - .setDurOverride(15728640) - .setQualityOverride((byte) 26), + new Werkstoff.Stats().setBlastFurnace(true).setProtons(500).setMass(750).setMeltingPoint(13000) + .setSpeedOverride(640.0F).setDurOverride(15728640).setQualityOverride((byte) 26), Werkstoff.Types.ELEMENT, - new Werkstoff.GenerationFeatures() - .onlyDust() - .addMolten() - .addMetalItems() - .addCraftingMetalWorkingItems() - .addSimpleMetalWorkingItems() - .addMultipleIngotMetalWorkingItems(), + new Werkstoff.GenerationFeatures().onlyDust().addMolten().addMetalItems().addCraftingMetalWorkingItems() + .addSimpleMetalWorkingItems().addMultipleIngotMetalWorkingItems(), OffsetID + 111, TextureSet.SET_SHINY); public static final Werkstoff inertNaquadah = new Werkstoff( - new short[] {0x3b, 0x3b, 0x3b}, + new short[] { 0x3b, 0x3b, 0x3b }, "Inert Naquadah", new Werkstoff.Stats(), Werkstoff.Types.MATERIAL, @@ -1396,7 +1251,7 @@ public class MyMaterial implements Runnable { new Pair<>(Naquadah, 1)); public static final Werkstoff inertEnrichedNaquadah = new Werkstoff( - new short[] {0x61, 0x44, 0x44}, + new short[] { 0x61, 0x44, 0x44 }, "Inert Enriched Naquadah", new Werkstoff.Stats().setRadioactive(true), Werkstoff.Types.MATERIAL, @@ -1406,7 +1261,7 @@ public class MyMaterial implements Runnable { new Pair<>(NaquadahEnriched, 1)); public static final Werkstoff inertNaquadria = new Werkstoff( - new short[] {0x00, 0x00, 0x00}, + new short[] { 0x00, 0x00, 0x00 }, "Inert Naquadria", new Werkstoff.Stats().setRadioactive(true), Werkstoff.Types.MATERIAL, diff --git a/src/main/java/goodgenerator/items/RadioactiveItem.java b/src/main/java/goodgenerator/items/RadioactiveItem.java index 3d085c421c..ab6c003268 100644 --- a/src/main/java/goodgenerator/items/RadioactiveItem.java +++ b/src/main/java/goodgenerator/items/RadioactiveItem.java @@ -1,7 +1,5 @@ package goodgenerator.items; -import gregtech.api.util.GT_Utility; -import ic2.core.IC2Potion; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; @@ -10,6 +8,9 @@ import net.minecraft.item.ItemStack; import net.minecraft.potion.PotionEffect; import net.minecraft.world.World; +import gregtech.api.util.GT_Utility; +import ic2.core.IC2Potion; + public class RadioactiveItem extends MyItems { protected final int mRadio; diff --git a/src/main/java/goodgenerator/items/nuclear/IsotopeMaterial.java b/src/main/java/goodgenerator/items/nuclear/IsotopeMaterial.java index 1fef61888c..593a663a71 100644 --- a/src/main/java/goodgenerator/items/nuclear/IsotopeMaterial.java +++ b/src/main/java/goodgenerator/items/nuclear/IsotopeMaterial.java @@ -8,53 +8,53 @@ // // public class IsotopeMaterial { // -// public static final HashSet<IsotopeMaterial> mIsotopeMaterial = new HashSet<>(); -// public static final HashMap<Integer, IsotopeMaterial> mIDMap = new HashMap<>(); -// public static final HashMap<String, IsotopeMaterial> mNameMap = new HashMap<>(); -// -// public final int mID; -// public final int mNeutron; -// public final String mName; -// public final String mLocalizedName; -// public final String mMaterialName; -// public final short[] mRGB; -// public final short[] mRGBO; -// public final NuclearTextures mTexture; -// -// public IsotopeMaterial(int aID, String aName, String aMaterialName, String aLocalizedName, NuclearTextures +// public static final HashSet<IsotopeMaterial> mIsotopeMaterial = new HashSet<>(); +// public static final HashMap<Integer, IsotopeMaterial> mIDMap = new HashMap<>(); +// public static final HashMap<String, IsotopeMaterial> mNameMap = new HashMap<>(); +// +// public final int mID; +// public final int mNeutron; +// public final String mName; +// public final String mLocalizedName; +// public final String mMaterialName; +// public final short[] mRGB; +// public final short[] mRGBO; +// public final NuclearTextures mTexture; +// +// public IsotopeMaterial(int aID, String aName, String aMaterialName, String aLocalizedName, NuclearTextures // aTexture, int aR, int aG, int aB, int aNeutron) { -// if (mIDMap.get(aID) != null) -// throw new UnsupportedOperationException("ID:" + aID + " is already used!"); -// this.mID = aID; -// this.mNeutron = aNeutron; -// this.mName = aName; -// this.mMaterialName = aMaterialName; -// this.mLocalizedName = aLocalizedName; -// this.mRGB = new short[] {(short) (aR * 0.6), (short) (aG * 0.6), (short) (aB * 0.6), 0}; -// this.mRGBO = new short[] {(short) aR, (short) aG, (short) aB, 0}; -// this.mTexture = aTexture; -// mIsotopeMaterial.add(this); -// mIDMap.put(this.mID, this); -// mNameMap.put(this.mName, this); -// } -// -// public ItemStack getFull(int aAmount) { -// if (aAmount > 64) aAmount = 64; -// return new ItemStack(Loaders.Isotope, aAmount, mID + 1000); -// } -// -// public ItemStack getTiny(int aAmount) { -// if (aAmount > 64) aAmount = 64; -// return new ItemStack(Loaders.Isotope, aAmount, mID + 2000); -// } -// -// public ItemStack getFullOxide(int aAmount) { -// if (aAmount > 64) aAmount = 64; -// return new ItemStack(Loaders.Isotope, aAmount, mID + 3000); -// } -// -// public ItemStack getTinyOxide(int aAmount) { -// if (aAmount > 64) aAmount = 64; -// return new ItemStack(Loaders.Isotope, aAmount, mID + 4000); -// } +// if (mIDMap.get(aID) != null) +// throw new UnsupportedOperationException("ID:" + aID + " is already used!"); +// this.mID = aID; +// this.mNeutron = aNeutron; +// this.mName = aName; +// this.mMaterialName = aMaterialName; +// this.mLocalizedName = aLocalizedName; +// this.mRGB = new short[] {(short) (aR * 0.6), (short) (aG * 0.6), (short) (aB * 0.6), 0}; +// this.mRGBO = new short[] {(short) aR, (short) aG, (short) aB, 0}; +// this.mTexture = aTexture; +// mIsotopeMaterial.add(this); +// mIDMap.put(this.mID, this); +// mNameMap.put(this.mName, this); +// } +// +// public ItemStack getFull(int aAmount) { +// if (aAmount > 64) aAmount = 64; +// return new ItemStack(Loaders.Isotope, aAmount, mID + 1000); +// } +// +// public ItemStack getTiny(int aAmount) { +// if (aAmount > 64) aAmount = 64; +// return new ItemStack(Loaders.Isotope, aAmount, mID + 2000); +// } +// +// public ItemStack getFullOxide(int aAmount) { +// if (aAmount > 64) aAmount = 64; +// return new ItemStack(Loaders.Isotope, aAmount, mID + 3000); +// } +// +// public ItemStack getTinyOxide(int aAmount) { +// if (aAmount > 64) aAmount = 64; +// return new ItemStack(Loaders.Isotope, aAmount, mID + 4000); +// } // } diff --git a/src/main/java/goodgenerator/items/nuclear/IsotopeMaterialLoader.java b/src/main/java/goodgenerator/items/nuclear/IsotopeMaterialLoader.java index 5bd5ee3938..a014abaa32 100644 --- a/src/main/java/goodgenerator/items/nuclear/IsotopeMaterialLoader.java +++ b/src/main/java/goodgenerator/items/nuclear/IsotopeMaterialLoader.java @@ -2,176 +2,176 @@ // // public class IsotopeMaterialLoader implements Runnable { // -// protected static final int OffsetID = 0; -// -// public static final IsotopeMaterial Thorium232 = new IsotopeMaterial( -// OffsetID, -// "Thorium232", "Thorium", "Thorium-232", -// NuclearTextures.STABLE1, 59, 59, 59, -// 232 -// ); -// -// public static final IsotopeMaterial Thorium230 = new IsotopeMaterial( -// OffsetID + 1, -// "Thorium232", "Thorium", "Thorium-230", -// NuclearTextures.STABLE2, 59, 59, 59, -// 230 -// ); -// -// public static final IsotopeMaterial Uranium233 = new IsotopeMaterial( -// OffsetID + 2, -// "Uranium233", "Uranium", "Uranium-233", -// NuclearTextures.UNSTABLE4, 60, 167, 85, -// 233 -// ); -// -// public static final IsotopeMaterial Uranium235 = new IsotopeMaterial( -// OffsetID + 3, -// "Uranium235", "Uranium", "Uranium-235", -// NuclearTextures.UNSTABLE3, 60, 167, 85, -// 235 -// ); -// -// public static final IsotopeMaterial Uranium238 = new IsotopeMaterial( -// OffsetID + 4, -// "Uranium238", "Uranium", "Uranium-238", -// NuclearTextures.STABLE2, 60, 167, 85, -// 238 -// ); -// -// public static final IsotopeMaterial Neptunium236 = new IsotopeMaterial( -// OffsetID + 5, -// "Neptunium236", "Neptunium", "Neptunium-236", -// NuclearTextures.UNSTABLE1, 60, 170, 176, -// 236 -// ); -// -// public static final IsotopeMaterial Neptunium237 = new IsotopeMaterial( -// OffsetID + 6, -// "Neptunium237", "Neptunium", "Neptunium-237", -// NuclearTextures.STABLE2, 60, 170, 176, -// 237 -// ); -// -// public static final IsotopeMaterial Plutonium238 = new IsotopeMaterial( -// OffsetID + 7, -// "Plutonium238", "Plutonium", "Plutonium-238", -// NuclearTextures.STABLE1, 169, 169, 169, -// 238 -// ); -// -// public static final IsotopeMaterial Plutonium239 = new IsotopeMaterial( -// OffsetID + 8, -// "Plutonium239", "Plutonium", "Plutonium-239", -// NuclearTextures.UNSTABLE1, 169, 169, 169, -// 239 -// ); -// -// public static final IsotopeMaterial Plutonium241 = new IsotopeMaterial( -// OffsetID + 9, -// "Plutonium241", "Plutonium", "Plutonium-241", -// NuclearTextures.UNSTABLE2, 169, 169, 169, -// 241 -// ); -// -// public static final IsotopeMaterial Plutonium242 = new IsotopeMaterial( -// OffsetID + 10, -// "Plutonium242", "Plutonium", "Plutonium-242", -// NuclearTextures.STABLE2, 169, 169, 169, -// 242 -// ); -// -// public static final IsotopeMaterial Americium241 = new IsotopeMaterial( -// OffsetID + 11, -// "Americium241", "Americium", "Americium-241", -// NuclearTextures.STABLE1, 150, 120, 22, -// 241 -// ); -// -// public static final IsotopeMaterial Americium242 = new IsotopeMaterial( -// OffsetID + 12, -// "Americium242", "Americium", "Americium-242", -// NuclearTextures.UNSTABLE4, 150, 120, 22, -// 242 -// ); -// -// public static final IsotopeMaterial Americium243 = new IsotopeMaterial( -// OffsetID + 13, -// "Americium243", "Americium", "Americium-243", -// NuclearTextures.STABLE2, 150, 120, 22, -// 243 -// ); -// -// public static final IsotopeMaterial Curium243 = new IsotopeMaterial( -// OffsetID + 14, -// "Curium243", "Curium", "Curium-243", -// NuclearTextures.UNSTABLE1, 107, 6, 105, -// 243 -// ); -// -// public static final IsotopeMaterial Curium245 = new IsotopeMaterial( -// OffsetID + 15, -// "Curium245", "Curium", "Curium-245", -// NuclearTextures.UNSTABLE3, 107, 6, 105, -// 245 -// ); -// -// public static final IsotopeMaterial Curium246 = new IsotopeMaterial( -// OffsetID + 16, -// "Curium246", "Curium", "Curium-246", -// NuclearTextures.STABLE2, 107, 6, 105, -// 246 -// ); -// -// public static final IsotopeMaterial Curium247 = new IsotopeMaterial( -// OffsetID + 17, -// "Curium247", "Curium", "Curium-247", -// NuclearTextures.UNSTABLE4, 107, 6, 105, -// 247 -// ); -// -// public static final IsotopeMaterial Berkelium247 = new IsotopeMaterial( -// OffsetID + 18, -// "Berkelium247", "Berkelium", "Berkelium-247", -// NuclearTextures.STABLE2, 130, 54, 29, -// 247 -// ); -// -// public static final IsotopeMaterial Berkelium248 = new IsotopeMaterial( -// OffsetID + 19, -// "Berkelium248", "Berkelium", "Berkelium-248", -// NuclearTextures.UNSTABLE1, 130, 54, 29, -// 248 -// ); -// -// public static final IsotopeMaterial Californium249 = new IsotopeMaterial( -// OffsetID + 20, -// "Californium249", "Californium", "Californium-249", -// NuclearTextures.UNSTABLE2, 186, 55, 11, -// 249 -// ); -// -// public static final IsotopeMaterial Californium250 = new IsotopeMaterial( -// OffsetID + 21, -// "Californium250", "Californium", "Californium-250", -// NuclearTextures.STABLE1, 186, 55, 11, -// 250 -// ); -// -// public static final IsotopeMaterial Californium251 = new IsotopeMaterial( -// OffsetID + 22, -// "Californium251", "Californium", "Californium-251", -// NuclearTextures.UNSTABLE4, 186, 55, 11, -// 251 -// ); -// -// public static final IsotopeMaterial Californium252 = new IsotopeMaterial( -// OffsetID + 23, -// "Californium252", "Californium", "Californium-252", -// NuclearTextures.UNSTABLE1, 186, 55, 11, -// 252 -// ); -// -// @Override -// public void run() { } +// protected static final int OffsetID = 0; +// +// public static final IsotopeMaterial Thorium232 = new IsotopeMaterial( +// OffsetID, +// "Thorium232", "Thorium", "Thorium-232", +// NuclearTextures.STABLE1, 59, 59, 59, +// 232 +// ); +// +// public static final IsotopeMaterial Thorium230 = new IsotopeMaterial( +// OffsetID + 1, +// "Thorium232", "Thorium", "Thorium-230", +// NuclearTextures.STABLE2, 59, 59, 59, +// 230 +// ); +// +// public static final IsotopeMaterial Uranium233 = new IsotopeMaterial( +// OffsetID + 2, +// "Uranium233", "Uranium", "Uranium-233", +// NuclearTextures.UNSTABLE4, 60, 167, 85, +// 233 +// ); +// +// public static final IsotopeMaterial Uranium235 = new IsotopeMaterial( +// OffsetID + 3, +// "Uranium235", "Uranium", "Uranium-235", +// NuclearTextures.UNSTABLE3, 60, 167, 85, +// 235 +// ); +// +// public static final IsotopeMaterial Uranium238 = new IsotopeMaterial( +// OffsetID + 4, +// "Uranium238", "Uranium", "Uranium-238", +// NuclearTextures.STABLE2, 60, 167, 85, +// 238 +// ); +// +// public static final IsotopeMaterial Neptunium236 = new IsotopeMaterial( +// OffsetID + 5, +// "Neptunium236", "Neptunium", "Neptunium-236", +// NuclearTextures.UNSTABLE1, 60, 170, 176, +// 236 +// ); +// +// public static final IsotopeMaterial Neptunium237 = new IsotopeMaterial( +// OffsetID + 6, +// "Neptunium237", "Neptunium", "Neptunium-237", +// NuclearTextures.STABLE2, 60, 170, 176, +// 237 +// ); +// +// public static final IsotopeMaterial Plutonium238 = new IsotopeMaterial( +// OffsetID + 7, +// "Plutonium238", "Plutonium", "Plutonium-238", +// NuclearTextures.STABLE1, 169, 169, 169, +// 238 +// ); +// +// public static final IsotopeMaterial Plutonium239 = new IsotopeMaterial( +// OffsetID + 8, +// "Plutonium239", "Plutonium", "Plutonium-239", +// NuclearTextures.UNSTABLE1, 169, 169, 169, +// 239 +// ); +// +// public static final IsotopeMaterial Plutonium241 = new IsotopeMaterial( +// OffsetID + 9, +// "Plutonium241", "Plutonium", "Plutonium-241", +// NuclearTextures.UNSTABLE2, 169, 169, 169, +// 241 +// ); +// +// public static final IsotopeMaterial Plutonium242 = new IsotopeMaterial( +// OffsetID + 10, +// "Plutonium242", "Plutonium", "Plutonium-242", +// NuclearTextures.STABLE2, 169, 169, 169, +// 242 +// ); +// +// public static final IsotopeMaterial Americium241 = new IsotopeMaterial( +// OffsetID + 11, +// "Americium241", "Americium", "Americium-241", +// NuclearTextures.STABLE1, 150, 120, 22, +// 241 +// ); +// +// public static final IsotopeMaterial Americium242 = new IsotopeMaterial( +// OffsetID + 12, +// "Americium242", "Americium", "Americium-242", +// NuclearTextures.UNSTABLE4, 150, 120, 22, +// 242 +// ); +// +// public static final IsotopeMaterial Americium243 = new IsotopeMaterial( +// OffsetID + 13, +// "Americium243", "Americium", "Americium-243", +// NuclearTextures.STABLE2, 150, 120, 22, +// 243 +// ); +// +// public static final IsotopeMaterial Curium243 = new IsotopeMaterial( +// OffsetID + 14, +// "Curium243", "Curium", "Curium-243", +// NuclearTextures.UNSTABLE1, 107, 6, 105, +// 243 +// ); +// +// public static final IsotopeMaterial Curium245 = new IsotopeMaterial( +// OffsetID + 15, +// "Curium245", "Curium", "Curium-245", +// NuclearTextures.UNSTABLE3, 107, 6, 105, +// 245 +// ); +// +// public static final IsotopeMaterial Curium246 = new IsotopeMaterial( +// OffsetID + 16, +// "Curium246", "Curium", "Curium-246", +// NuclearTextures.STABLE2, 107, 6, 105, +// 246 +// ); +// +// public static final IsotopeMaterial Curium247 = new IsotopeMaterial( +// OffsetID + 17, +// "Curium247", "Curium", "Curium-247", +// NuclearTextures.UNSTABLE4, 107, 6, 105, +// 247 +// ); +// +// public static final IsotopeMaterial Berkelium247 = new IsotopeMaterial( +// OffsetID + 18, +// "Berkelium247", "Berkelium", "Berkelium-247", +// NuclearTextures.STABLE2, 130, 54, 29, +// 247 +// ); +// +// public static final IsotopeMaterial Berkelium248 = new IsotopeMaterial( +// OffsetID + 19, +// "Berkelium248", "Berkelium", "Berkelium-248", +// NuclearTextures.UNSTABLE1, 130, 54, 29, +// 248 +// ); +// +// public static final IsotopeMaterial Californium249 = new IsotopeMaterial( +// OffsetID + 20, +// "Californium249", "Californium", "Californium-249", +// NuclearTextures.UNSTABLE2, 186, 55, 11, +// 249 +// ); +// +// public static final IsotopeMaterial Californium250 = new IsotopeMaterial( +// OffsetID + 21, +// "Californium250", "Californium", "Californium-250", +// NuclearTextures.STABLE1, 186, 55, 11, +// 250 +// ); +// +// public static final IsotopeMaterial Californium251 = new IsotopeMaterial( +// OffsetID + 22, +// "Californium251", "Californium", "Californium-251", +// NuclearTextures.UNSTABLE4, 186, 55, 11, +// 251 +// ); +// +// public static final IsotopeMaterial Californium252 = new IsotopeMaterial( +// OffsetID + 23, +// "Californium252", "Californium", "Californium-252", +// NuclearTextures.UNSTABLE1, 186, 55, 11, +// 252 +// ); +// +// @Override +// public void run() { } // } diff --git a/src/main/java/goodgenerator/items/nuclear/NuclearMetaItemGenerator.java b/src/main/java/goodgenerator/items/nuclear/NuclearMetaItemGenerator.java index dbd2dd184f..a0b71b52e5 100644 --- a/src/main/java/goodgenerator/items/nuclear/NuclearMetaItemGenerator.java +++ b/src/main/java/goodgenerator/items/nuclear/NuclearMetaItemGenerator.java @@ -21,90 +21,90 @@ // // public class NuclearMetaItemGenerator extends GT_MetaGenerated_Item { // -// /** -// * <p>Full ingot - 1000 -// * <p>Tiny ingot - 2000 -// * <p>Full-Oxide - 3000 -// * <p>Tiny-Oxide - 4000 -// */ -// public static final Pair<Integer, String>[] TYPE_OFFSET = new Pair[] { -// new Pair<>(1000, "%s"), -// new Pair<>(2000, "Tiny of %s"), -// new Pair<>(3000, "%s Oxide"), -// new Pair<>(4000, "Tiny of %s Oxide"), -// }; -// public static final Pair<Integer, String>[] OREPREFIX = new Pair[] { -// new Pair<>(1000, "item%s"), -// new Pair<>(2000, "itemTiny%s"), -// new Pair<>(3000, "item%sOxide"), -// new Pair<>(4000, "itemTiny%sOxide"), -// }; +// /** +// * <p>Full ingot - 1000 +// * <p>Tiny ingot - 2000 +// * <p>Full-Oxide - 3000 +// * <p>Tiny-Oxide - 4000 +// */ +// public static final Pair<Integer, String>[] TYPE_OFFSET = new Pair[] { +// new Pair<>(1000, "%s"), +// new Pair<>(2000, "Tiny of %s"), +// new Pair<>(3000, "%s Oxide"), +// new Pair<>(4000, "Tiny of %s Oxide"), +// }; +// public static final Pair<Integer, String>[] OREPREFIX = new Pair[] { +// new Pair<>(1000, "item%s"), +// new Pair<>(2000, "itemTiny%s"), +// new Pair<>(3000, "item%sOxide"), +// new Pair<>(4000, "itemTiny%sOxide"), +// }; // -// public NuclearMetaItemGenerator() { -// super("nuclearIsotopeMaterial", (short) 32766, (short) 0); -// this.setCreativeTab(GoodGenerator.GG); -// for (IsotopeMaterial tIsotope : mIsotopeMaterial) { -// for (Pair<Integer, String> tType : TYPE_OFFSET) { -// int tOffset = tType.getKey(); -// String tOreName = tType.getValue(); -// ItemStack tStack = new ItemStack(this, 1, tIsotope.mID + tOffset); -// GT_LanguageManager.addStringLocalization(this.getUnlocalizedName(tStack) + ".name", +// public NuclearMetaItemGenerator() { +// super("nuclearIsotopeMaterial", (short) 32766, (short) 0); +// this.setCreativeTab(GoodGenerator.GG); +// for (IsotopeMaterial tIsotope : mIsotopeMaterial) { +// for (Pair<Integer, String> tType : TYPE_OFFSET) { +// int tOffset = tType.getKey(); +// String tOreName = tType.getValue(); +// ItemStack tStack = new ItemStack(this, 1, tIsotope.mID + tOffset); +// GT_LanguageManager.addStringLocalization(this.getUnlocalizedName(tStack) + ".name", // String.format(tOreName, tIsotope.mLocalizedName)); -// GT_LanguageManager.addStringLocalization(this.getUnlocalizedName(tStack) + ".tooltip", +// GT_LanguageManager.addStringLocalization(this.getUnlocalizedName(tStack) + ".tooltip", // EnumChatFormatting.AQUA + String.format("%s's Isotope.", tIsotope.mMaterialName) + EnumChatFormatting.RESET); -// } -// for (Pair<Integer, String> tOreDict : OREPREFIX) { -// int tOffset = tOreDict.getKey(); -// String tOreName = tOreDict.getValue(); -// ItemStack tStack = new ItemStack(this, 1, tIsotope.mID + tOffset); -// GT_OreDictUnificator.registerOre(String.format(tOreName, tIsotope.mName), tStack); -// } -// } -// } +// } +// for (Pair<Integer, String> tOreDict : OREPREFIX) { +// int tOffset = tOreDict.getKey(); +// String tOreName = tOreDict.getValue(); +// ItemStack tStack = new ItemStack(this, 1, tIsotope.mID + tOffset); +// GT_OreDictUnificator.registerOre(String.format(tOreName, tIsotope.mName), tStack); +// } +// } +// } // -// @Override -// public String getItemStackDisplayName(ItemStack aStack) { -// return GT_LanguageManager.getTranslation(this.getUnlocalizedName(aStack) + ".name"); -// } +// @Override +// public String getItemStackDisplayName(ItemStack aStack) { +// return GT_LanguageManager.getTranslation(this.getUnlocalizedName(aStack) + ".name"); +// } // -// @Override -// public IIconContainer getIconContainer(int aMetaData) { -// int tID = aMetaData % 1000; -// int tType = aMetaData / 1000 - 1; -// IsotopeMaterial tMaterial = mIDMap.get(tID); -// if (tMaterial != null) { -// return tMaterial.mTexture.mTextures[tType]; -// } -// return null; -// } +// @Override +// public IIconContainer getIconContainer(int aMetaData) { +// int tID = aMetaData % 1000; +// int tType = aMetaData / 1000 - 1; +// IsotopeMaterial tMaterial = mIDMap.get(tID); +// if (tMaterial != null) { +// return tMaterial.mTexture.mTextures[tType]; +// } +// return null; +// } // -// @Override -// @SideOnly(Side.CLIENT) -// public void getSubItems(Item var1, CreativeTabs aCreativeTab, List aList) { -// for (IsotopeMaterial tIsotope : mIsotopeMaterial) { -// for (int i = 1; i <= 4; i ++) { -// ItemStack tStack = new ItemStack(this, 1, tIsotope.mID + i * 1000); -// aList.add(tStack); -// } -// } -// } +// @Override +// @SideOnly(Side.CLIENT) +// public void getSubItems(Item var1, CreativeTabs aCreativeTab, List aList) { +// for (IsotopeMaterial tIsotope : mIsotopeMaterial) { +// for (int i = 1; i <= 4; i ++) { +// ItemStack tStack = new ItemStack(this, 1, tIsotope.mID + i * 1000); +// aList.add(tStack); +// } +// } +// } // -// @Override -// public short[] getRGBa(ItemStack aStack) { -// int tID = aStack.getItemDamage() % 1000; -// int tType = aStack.getItemDamage() / 1000; -// IsotopeMaterial tMaterial = mIDMap.get(tID); -// if (tMaterial != null) { -// if (tType == 1 || tType == 2) -// return tMaterial.mRGB; -// else -// return tMaterial.mRGBO; -// } -// return null; -// } +// @Override +// public short[] getRGBa(ItemStack aStack) { +// int tID = aStack.getItemDamage() % 1000; +// int tType = aStack.getItemDamage() / 1000; +// IsotopeMaterial tMaterial = mIDMap.get(tID); +// if (tMaterial != null) { +// if (tType == 1 || tType == 2) +// return tMaterial.mRGB; +// else +// return tMaterial.mRGBO; +// } +// return null; +// } // -// @Override -// public final IIcon getIconFromDamage(int aMetaData) { -// return this.getIconContainer(aMetaData).getIcon(); -// } +// @Override +// public final IIcon getIconFromDamage(int aMetaData) { +// return this.getIconContainer(aMetaData).getIcon(); +// } // } diff --git a/src/main/java/goodgenerator/items/nuclear/NuclearTextures.java b/src/main/java/goodgenerator/items/nuclear/NuclearTextures.java index 5828932e5c..63314044cf 100644 --- a/src/main/java/goodgenerator/items/nuclear/NuclearTextures.java +++ b/src/main/java/goodgenerator/items/nuclear/NuclearTextures.java @@ -4,28 +4,28 @@ // import gregtech.api.interfaces.IIconContainer; // // public class NuclearTextures { -// public static final NuclearTextures -// STABLE1 = new NuclearTextures("stable1"), -// STABLE2 = new NuclearTextures("stable2"), -// UNSTABLE1 = new NuclearTextures("unstable1"), -// UNSTABLE2 = new NuclearTextures("unstable2"), -// UNSTABLE3 = new NuclearTextures("unstable3"), -// UNSTABLE4 = new NuclearTextures("unstable4"); +// public static final NuclearTextures +// STABLE1 = new NuclearTextures("stable1"), +// STABLE2 = new NuclearTextures("stable2"), +// UNSTABLE1 = new NuclearTextures("unstable1"), +// UNSTABLE2 = new NuclearTextures("unstable2"), +// UNSTABLE3 = new NuclearTextures("unstable3"), +// UNSTABLE4 = new NuclearTextures("unstable4"); // -// public final IIconContainer[] mTextures = new IIconContainer[4]; -// public final String mSetName; -// public static final String mTextureDir = "icons/isotope/"; -// public static final int -// FULL = 0, -// TINY = 1, -// FULL_OXIDE = 2, -// TINY_OXIDE = 3; +// public final IIconContainer[] mTextures = new IIconContainer[4]; +// public final String mSetName; +// public static final String mTextureDir = "icons/isotope/"; +// public static final int +// FULL = 0, +// TINY = 1, +// FULL_OXIDE = 2, +// TINY_OXIDE = 3; // -// public NuclearTextures(String aName) { -// mSetName = aName; -// mTextures[0] = new Textures.ItemIcons.CustomIcon(mTextureDir + aName); -// mTextures[1] = new Textures.ItemIcons.CustomIcon(mTextureDir + aName + "tiny"); -// mTextures[2] = new Textures.ItemIcons.CustomIcon(mTextureDir + aName); -// mTextures[3] = new Textures.ItemIcons.CustomIcon(mTextureDir + aName + "tiny"); -// } +// public NuclearTextures(String aName) { +// mSetName = aName; +// mTextures[0] = new Textures.ItemIcons.CustomIcon(mTextureDir + aName); +// mTextures[1] = new Textures.ItemIcons.CustomIcon(mTextureDir + aName + "tiny"); +// mTextures[2] = new Textures.ItemIcons.CustomIcon(mTextureDir + aName); +// mTextures[3] = new Textures.ItemIcons.CustomIcon(mTextureDir + aName + "tiny"); +// } // } diff --git a/src/main/java/goodgenerator/loader/AchievementLoader.java b/src/main/java/goodgenerator/loader/AchievementLoader.java index 13d9048092..2df30c8752 100644 --- a/src/main/java/goodgenerator/loader/AchievementLoader.java +++ b/src/main/java/goodgenerator/loader/AchievementLoader.java @@ -1,3 +1,4 @@ package goodgenerator.loader; -public class AchievementLoader {} +public class AchievementLoader { +} diff --git a/src/main/java/goodgenerator/loader/ComponentAssemblyLineMiscRecipes.java b/src/main/java/goodgenerator/loader/ComponentAssemblyLineMiscRecipes.java index f754ac1064..37c22fd31f 100644 --- a/src/main/java/goodgenerator/loader/ComponentAssemblyLineMiscRecipes.java +++ b/src/main/java/goodgenerator/loader/ComponentAssemblyLineMiscRecipes.java @@ -3,9 +3,19 @@ package goodgenerator.loader; import static goodgenerator.util.ItemRefer.*; import static goodgenerator.util.Log.LOGGER; +import javax.annotation.Nullable; + +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; + +import org.apache.logging.log4j.Level; + import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader; import com.github.technus.tectech.recipe.TT_recipeAdder; import com.google.common.collect.HashBiMap; + import cpw.mods.fml.common.registry.GameRegistry; import goodgenerator.util.StackUtils; import gregtech.api.enums.GT_Values; @@ -15,32 +25,12 @@ import gregtech.api.enums.OrePrefixes; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; import gtPlusPlus.core.recipe.common.CI; -import javax.annotation.Nullable; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fluids.FluidStack; -import org.apache.logging.log4j.Level; public class ComponentAssemblyLineMiscRecipes { @SuppressWarnings("deprecation") - public static final String[] circuitTierMaterials = { - "Primitive", - "Basic", - "Good", - "Advanced", - "Data", - "Elite", - "Master", - "Ultimate", - "Superconductor", - "Infinite", - "Bio", - "Optical", - "Piko", - "Quantum" - }; + public static final String[] circuitTierMaterials = { "Primitive", "Basic", "Good", "Advanced", "Data", "Elite", + "Master", "Ultimate", "Superconductor", "Infinite", "Bio", "Optical", "Piko", "Quantum" }; static final HashBiMap<String, Integer> NameToTier = HashBiMap.create(); @@ -54,8 +44,8 @@ public class ComponentAssemblyLineMiscRecipes { try { Class<?> c = Class.forName("com.dreammaster.gthandler.CustomItemList"); Object maybeSolidifier = c.getMethod("valueOf", String.class).invoke(null, "FluidSolidifierZPM"); - solidifier = - (ItemStack) (c.getMethod("get", long.class, Object[].class).invoke(maybeSolidifier, 16L, null)); + solidifier = (ItemStack) (c.getMethod("get", long.class, Object[].class) + .invoke(maybeSolidifier, 16L, null)); if (GT_Utility.isStackValid(solidifier)) LOGGER.log(Level.INFO, "ZPM Fluid Solidifier found."); else throw new NullPointerException(); } catch (Exception e) { @@ -67,25 +57,15 @@ public class ComponentAssemblyLineMiscRecipes { GT_Values.RA.addAssemblylineRecipe( Compassline_Casing_EV.get(1), 3600 * 20, - new Object[] { - ItemList.Machine_Multi_Assemblyline.get(16L), - ItemList.Casing_Assembler.get(16L), - ItemList.Casing_Gearbox_TungstenSteel.get(32L), - ComponentType.Robot_Arm.getComponent(8).get(16), - ComponentType.Conveyor_Module.getComponent(8).get(32), - ComponentType.Electric_Motor.getComponent(7).get(32), - GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Polybenzimidazole, 16), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Iridium, 32), - solidifier, - getALCircuit(8, 16), - getALCircuit(7, 20), - getALCircuit(6, 24) - }, - new FluidStack[] { - new FluidStack(FluidRegistry.getFluid("molten.indalloy140"), 144 * 12), - Materials.Naquadria.getMolten(144 * 16), - Materials.Lubricant.getFluid(5000) - }, + new Object[] { ItemList.Machine_Multi_Assemblyline.get(16L), ItemList.Casing_Assembler.get(16L), + ItemList.Casing_Gearbox_TungstenSteel.get(32L), ComponentType.Robot_Arm.getComponent(8).get(16), + ComponentType.Conveyor_Module.getComponent(8).get(32), + ComponentType.Electric_Motor.getComponent(7).get(32), + GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Polybenzimidazole, 16), + GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Iridium, 32), solidifier, + getALCircuit(8, 16), getALCircuit(7, 20), getALCircuit(6, 24) }, + new FluidStack[] { new FluidStack(FluidRegistry.getFluid("molten.indalloy140"), 144 * 12), + Materials.Naquadria.getMolten(144 * 16), Materials.Lubricant.getFluid(5000) }, Component_Assembly_Line.get(1), 30 * 20, getV(8) * 2); @@ -96,16 +76,13 @@ public class ComponentAssemblyLineMiscRecipes { int t = 1; // lv 1 GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Steel, 1), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Steel, 4), - ComponentType.Robot_Arm.getComponent(t).get(4), - ComponentType.Electric_Piston.getComponent(t).get(8), - ComponentType.Electric_Motor.getComponent(t).get(10), - GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.Steel, 4), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Tin, 6), - getCircuit(t, 16), - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Steel, 1), + GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Steel, 4), + ComponentType.Robot_Arm.getComponent(t).get(4), + ComponentType.Electric_Piston.getComponent(t).get(8), + ComponentType.Electric_Motor.getComponent(t).get(10), + GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.Steel, 4), + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Tin, 6), getCircuit(t, 16), }, Materials.SolderingAlloy.getMolten(144 * (t + 3)), Compassline_Casing_LV.get(1), 16 * 20, @@ -113,17 +90,14 @@ public class ComponentAssemblyLineMiscRecipes { // mv 2 t++; GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Aluminium, 1), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Aluminium, 4), - ComponentType.Robot_Arm.getComponent(t).get(4), - ComponentType.Electric_Piston.getComponent(t).get(8), - ComponentType.Electric_Motor.getComponent(t).get(10), - GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.Aluminium, 4), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.AnyCopper, 6), - getCircuit(t, 8), - getCircuit(t - 1, 16) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Aluminium, 1), + GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Aluminium, 4), + ComponentType.Robot_Arm.getComponent(t).get(4), + ComponentType.Electric_Piston.getComponent(t).get(8), + ComponentType.Electric_Motor.getComponent(t).get(10), + GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.Aluminium, 4), + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.AnyCopper, 6), getCircuit(t, 8), + getCircuit(t - 1, 16) }, Materials.SolderingAlloy.getMolten(144 * (t + 1)), Compassline_Casing_MV.get(1), 16 * 20, @@ -131,17 +105,14 @@ public class ComponentAssemblyLineMiscRecipes { // hv 3 t++; GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.StainlessSteel, 1), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.StainlessSteel, 4), - ComponentType.Robot_Arm.getComponent(t).get(4), - ComponentType.Electric_Piston.getComponent(t).get(8), - ComponentType.Electric_Motor.getComponent(t).get(10), - GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.StainlessSteel, 4), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Gold, 6), - getCircuit(t, 8), - getCircuit(t - 1, 16) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.StainlessSteel, 1), + GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.StainlessSteel, 4), + ComponentType.Robot_Arm.getComponent(t).get(4), + ComponentType.Electric_Piston.getComponent(t).get(8), + ComponentType.Electric_Motor.getComponent(t).get(10), + GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.StainlessSteel, 4), + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Gold, 6), getCircuit(t, 8), + getCircuit(t - 1, 16) }, Materials.SolderingAlloy.getMolten(144 * (t + 1)), Compassline_Casing_HV.get(1), 16 * 20, @@ -149,17 +120,14 @@ public class ComponentAssemblyLineMiscRecipes { // ev 4 t++; GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Titanium, 1), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Titanium, 4), - ComponentType.Robot_Arm.getComponent(t).get(4), - ComponentType.Electric_Piston.getComponent(t).get(8), - ComponentType.Electric_Motor.getComponent(t).get(10), - GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.Titanium, 4), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Aluminium, 6), - getCircuit(t, 8), - getCircuit(t - 1, 16) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Titanium, 1), + GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Titanium, 4), + ComponentType.Robot_Arm.getComponent(t).get(4), + ComponentType.Electric_Piston.getComponent(t).get(8), + ComponentType.Electric_Motor.getComponent(t).get(10), + GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.Titanium, 4), + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Aluminium, 6), getCircuit(t, 8), + getCircuit(t - 1, 16) }, Materials.SolderingAlloy.getMolten(144 * (t + 1)), Compassline_Casing_EV.get(1), 16 * 20, @@ -167,17 +135,14 @@ public class ComponentAssemblyLineMiscRecipes { // iv 5 t++; GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.TungstenSteel, 1), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.TungstenSteel, 4), - ComponentType.Robot_Arm.getComponent(t).get(4), - ComponentType.Electric_Piston.getComponent(t).get(8), - ComponentType.Electric_Motor.getComponent(t).get(10), - GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.TungstenSteel, 4), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Tungsten, 6), - getCircuit(t, 8), - getCircuit(t - 1, 16) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.TungstenSteel, 1), + GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.TungstenSteel, 4), + ComponentType.Robot_Arm.getComponent(t).get(4), + ComponentType.Electric_Piston.getComponent(t).get(8), + ComponentType.Electric_Motor.getComponent(t).get(10), + GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.TungstenSteel, 4), + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Tungsten, 6), getCircuit(t, 8), + getCircuit(t - 1, 16) }, Materials.SolderingAlloy.getMolten(144 * (t + 1)), Compassline_Casing_IV.get(1), 16 * 20, @@ -190,24 +155,17 @@ public class ComponentAssemblyLineMiscRecipes { GT_Values.RA.addAssemblylineRecipe( Compassline_Casing_IV.get(1), 2250 << t, - new Object[] { - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Europium, 1), - WerkstoffLoader.LuVTierMaterial.get(OrePrefixes.plateDense, 6), - ComponentType.Robot_Arm.getComponent(t).get(8), - ComponentType.Electric_Piston.getComponent(t).get(10), - ComponentType.Electric_Motor.getComponent(t).get(16), - WerkstoffLoader.LuVTierMaterial.get(OrePrefixes.gearGt, 4), - WerkstoffLoader.LuVTierMaterial.get(OrePrefixes.gearGtSmall, 16), - GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.VanadiumGallium, 8), - getALCircuit(t, 8), - getALCircuit(t - 1, 16) - }, - new FluidStack[] { - new FluidStack(sold, 144 * t * 4), - CI.getTieredFluid(t, 144 * t * 2), - StackUtils.getTieredFluid(t, 144 * t), - Materials.Lubricant.getFluid(1000 * (t - 2)) - }, + new Object[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Europium, 1), + WerkstoffLoader.LuVTierMaterial.get(OrePrefixes.plateDense, 6), + ComponentType.Robot_Arm.getComponent(t).get(8), + ComponentType.Electric_Piston.getComponent(t).get(10), + ComponentType.Electric_Motor.getComponent(t).get(16), + WerkstoffLoader.LuVTierMaterial.get(OrePrefixes.gearGt, 4), + WerkstoffLoader.LuVTierMaterial.get(OrePrefixes.gearGtSmall, 16), + GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.VanadiumGallium, 8), + getALCircuit(t, 8), getALCircuit(t - 1, 16) }, + new FluidStack[] { new FluidStack(sold, 144 * t * 4), CI.getTieredFluid(t, 144 * t * 2), + StackUtils.getTieredFluid(t, 144 * t), Materials.Lubricant.getFluid(1000 * (t - 2)) }, Compassline_Casing_LuV.get(1), 30 * 20, 6000); @@ -216,24 +174,17 @@ public class ComponentAssemblyLineMiscRecipes { GT_Values.RA.addAssemblylineRecipe( Compassline_Casing_LuV.get(1), 2250 << t, - new Object[] { - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Iridium, 1), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Iridium, 6), - ComponentType.Robot_Arm.getComponent(t).get(8), - ComponentType.Electric_Piston.getComponent(t).get(10), - ComponentType.Electric_Motor.getComponent(t).get(16), - GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.Iridium, 4), - GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Iridium, 16), - GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.Naquadah, 8), - getALCircuit(t, 8), - getALCircuit(t - 1, 16) - }, - new FluidStack[] { - new FluidStack(sold, 144 * t * 4), - CI.getTieredFluid(t, 144 * t * 2), - StackUtils.getTieredFluid(t, 144 * t), - Materials.Lubricant.getFluid(1000 * (t - 2)) - }, + new Object[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Iridium, 1), + GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Iridium, 6), + ComponentType.Robot_Arm.getComponent(t).get(8), + ComponentType.Electric_Piston.getComponent(t).get(10), + ComponentType.Electric_Motor.getComponent(t).get(16), + GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.Iridium, 4), + GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Iridium, 16), + GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.Naquadah, 8), getALCircuit(t, 8), + getALCircuit(t - 1, 16) }, + new FluidStack[] { new FluidStack(sold, 144 * t * 4), CI.getTieredFluid(t, 144 * t * 2), + StackUtils.getTieredFluid(t, 144 * t), Materials.Lubricant.getFluid(1000 * (t - 2)) }, Compassline_Casing_ZPM.get(1), 30 * 20, 24000); @@ -242,24 +193,17 @@ public class ComponentAssemblyLineMiscRecipes { GT_Values.RA.addAssemblylineRecipe( Compassline_Casing_ZPM.get(1), 2250 << t, - new Object[] { - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Osmium, 1), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Osmium, 6), - ComponentType.Robot_Arm.getComponent(t).get(8), - ComponentType.Electric_Piston.getComponent(t).get(10), - ComponentType.Electric_Motor.getComponent(t).get(16), - GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.Osmium, 4), - GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Osmium, 16), - GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.NaquadahAlloy, 8), - getALCircuit(t, 8), - getALCircuit(t - 1, 16) - }, - new FluidStack[] { - new FluidStack(sold, 144 * t * 4), - CI.getTieredFluid(t, 144 * t * 2), - StackUtils.getTieredFluid(t, 144 * t), - Materials.Lubricant.getFluid(1000 * (t - 2)) - }, + new Object[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Osmium, 1), + GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Osmium, 6), + ComponentType.Robot_Arm.getComponent(t).get(8), + ComponentType.Electric_Piston.getComponent(t).get(10), + ComponentType.Electric_Motor.getComponent(t).get(16), + GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.Osmium, 4), + GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Osmium, 16), + GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.NaquadahAlloy, 8), getALCircuit(t, 8), + getALCircuit(t - 1, 16) }, + new FluidStack[] { new FluidStack(sold, 144 * t * 4), CI.getTieredFluid(t, 144 * t * 2), + StackUtils.getTieredFluid(t, 144 * t), Materials.Lubricant.getFluid(1000 * (t - 2)) }, Compassline_Casing_UV.get(1), 30 * 20, 100000); @@ -271,24 +215,17 @@ public class ComponentAssemblyLineMiscRecipes { 1 << (t - 3), 500000, 1, - new Object[] { - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.CosmicNeutronium, 1), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.CosmicNeutronium, 6), - ComponentType.Robot_Arm.getComponent(t).get(8), - ComponentType.Electric_Piston.getComponent(t).get(10), - ComponentType.Electric_Motor.getComponent(t).get(16), - GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.CosmicNeutronium, 4), - GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.CosmicNeutronium, 16), - GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.Bedrockium, 8), - getALCircuit(t, 8), - getALCircuit(t - 1, 16) - }, - new FluidStack[] { - new FluidStack(sold, 144 * t * 4), - CI.getTieredFluid(t, 144 * t * 2), - StackUtils.getTieredFluid(t, 144 * t), - Materials.Lubricant.getFluid(1000 * (t - 2)) - }, + new Object[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.CosmicNeutronium, 1), + GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.CosmicNeutronium, 6), + ComponentType.Robot_Arm.getComponent(t).get(8), + ComponentType.Electric_Piston.getComponent(t).get(10), + ComponentType.Electric_Motor.getComponent(t).get(16), + GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.CosmicNeutronium, 4), + GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.CosmicNeutronium, 16), + GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.Bedrockium, 8), getALCircuit(t, 8), + getALCircuit(t - 1, 16) }, + new FluidStack[] { new FluidStack(sold, 144 * t * 4), CI.getTieredFluid(t, 144 * t * 2), + StackUtils.getTieredFluid(t, 144 * t), Materials.Lubricant.getFluid(1000 * (t - 2)) }, Compassline_Casing_UHV.get(1), 50 * 20, 500000); @@ -301,24 +238,17 @@ public class ComponentAssemblyLineMiscRecipes { 1 << (t - 3), 2000000, 1, - new Object[] { - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Infinity, 1), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Infinity, 6), - ComponentType.Robot_Arm.getComponent(t).get(8), - ComponentType.Electric_Piston.getComponent(t).get(10), - ComponentType.Electric_Motor.getComponent(t).get(16), - GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.Infinity, 4), - GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Infinity, 16), - GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.Draconium, 8), - getALCircuit(t, 8), - getALCircuit(t - 1, 16) - }, - new FluidStack[] { - new FluidStack(sold, 144 * t * 4), - CI.getTieredFluid(t, 144 * t * 2), - StackUtils.getTieredFluid(t, 144 * t), - Materials.Lubricant.getFluid(1000 * (t - 2)) - }, + new Object[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Infinity, 1), + GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Infinity, 6), + ComponentType.Robot_Arm.getComponent(t).get(8), + ComponentType.Electric_Piston.getComponent(t).get(10), + ComponentType.Electric_Motor.getComponent(t).get(16), + GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.Infinity, 4), + GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Infinity, 16), + GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.Draconium, 8), getALCircuit(t, 8), + getALCircuit(t - 1, 16) }, + new FluidStack[] { new FluidStack(sold, 144 * t * 4), CI.getTieredFluid(t, 144 * t * 2), + StackUtils.getTieredFluid(t, 144 * t), Materials.Lubricant.getFluid(1000 * (t - 2)) }, Compassline_Casing_UEV.get(1), 50 * 20, 2000000); @@ -330,24 +260,17 @@ public class ComponentAssemblyLineMiscRecipes { 1 << (t - 3), 8000000, 1, - new Object[] { - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.TranscendentMetal, 1), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.TranscendentMetal, 6), - ComponentType.Robot_Arm.getComponent(t).get(8), - ComponentType.Electric_Piston.getComponent(t).get(10), - ComponentType.Electric_Motor.getComponent(t).get(16), - GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.TranscendentMetal, 4), - GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.TranscendentMetal, 16), - GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.NetherStar, 8), - getALCircuit(t, 8), - getALCircuit(t - 1, 16) - }, - new FluidStack[] { - new FluidStack(sold, 144 * t * 4), - CI.getTieredFluid(t, 144 * t * 2), - StackUtils.getTieredFluid(t, 144 * t), - Materials.Lubricant.getFluid(1000 * (t - 2)) - }, + new Object[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.TranscendentMetal, 1), + GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.TranscendentMetal, 6), + ComponentType.Robot_Arm.getComponent(t).get(8), + ComponentType.Electric_Piston.getComponent(t).get(10), + ComponentType.Electric_Motor.getComponent(t).get(16), + GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.TranscendentMetal, 4), + GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.TranscendentMetal, 16), + GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.NetherStar, 8), getALCircuit(t, 8), + getALCircuit(t - 1, 16) }, + new FluidStack[] { new FluidStack(sold, 144 * t * 4), CI.getTieredFluid(t, 144 * t * 2), + StackUtils.getTieredFluid(t, 144 * t), Materials.Lubricant.getFluid(1000 * (t - 2)) }, Compassline_Casing_UIV.get(1), 50 * 20, 8000000); @@ -359,24 +282,17 @@ public class ComponentAssemblyLineMiscRecipes { 1 << (t - 3), 32000000, 1, - new Object[] { - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.SpaceTime, 1), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.SpaceTime, 6), - ComponentType.Robot_Arm.getComponent(t).get(8), - ComponentType.Electric_Piston.getComponent(t).get(10), - ComponentType.Electric_Motor.getComponent(t).get(16), - GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.SpaceTime, 4), - GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.SpaceTime, 16), - GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.Quantium, 8), - getALCircuit(t, 8), - getALCircuit(t - 1, 16) - }, - new FluidStack[] { - new FluidStack(sold, 144 * t * 4), - CI.getTieredFluid(t - 1, 144 * t * 2), - StackUtils.getTieredFluid(t, 144 * t), - Materials.Lubricant.getFluid(1000 * (t - 2)) - }, + new Object[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.SpaceTime, 1), + GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.SpaceTime, 6), + ComponentType.Robot_Arm.getComponent(t).get(8), + ComponentType.Electric_Piston.getComponent(t).get(10), + ComponentType.Electric_Motor.getComponent(t).get(16), + GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.SpaceTime, 4), + GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.SpaceTime, 16), + GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.Quantium, 8), getALCircuit(t, 8), + getALCircuit(t - 1, 16) }, + new FluidStack[] { new FluidStack(sold, 144 * t * 4), CI.getTieredFluid(t - 1, 144 * t * 2), + StackUtils.getTieredFluid(t, 144 * t), Materials.Lubricant.getFluid(1000 * (t - 2)) }, Compassline_Casing_UMV.get(1), 50 * 20, 32000000); @@ -389,26 +305,22 @@ public class ComponentAssemblyLineMiscRecipes { private static void generateWrapRecipes() { for (int i = 0; i <= 11; i++) { GT_Values.RA.addAssemblerRecipe( - new ItemStack[] {getCircuit(i, 16), GT_Utility.getIntegratedCircuit(16)}, + new ItemStack[] { getCircuit(i, 16), GT_Utility.getIntegratedCircuit(16) }, Materials.SolderingAlloy.getMolten(72L), new ItemStack(Loaders.circuitWrap, 1, i), 30 * 20, 30); } GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GameRegistry.findItemStack("dreamcraft", "item.PikoCircuit", 16), - GT_Utility.getIntegratedCircuit(16) - }, + new ItemStack[] { GameRegistry.findItemStack("dreamcraft", "item.PikoCircuit", 16), + GT_Utility.getIntegratedCircuit(16) }, Materials.SolderingAlloy.getMolten(72L), new ItemStack(Loaders.circuitWrap, 1, 12), 30 * 20, 30); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GameRegistry.findItemStack("dreamcraft", "item.QuantumCircuit", 16), - GT_Utility.getIntegratedCircuit(16) - }, + new ItemStack[] { GameRegistry.findItemStack("dreamcraft", "item.QuantumCircuit", 16), + GT_Utility.getIntegratedCircuit(16) }, Materials.SolderingAlloy.getMolten(72L), new ItemStack(Loaders.circuitWrap, 1, 13), 30 * 20, @@ -417,6 +329,7 @@ public class ComponentAssemblyLineMiscRecipes { @SuppressWarnings("unused") private enum ComponentType { + Electric_Motor, Electric_Piston, Robot_Arm, @@ -437,7 +350,7 @@ public class ComponentAssemblyLineMiscRecipes { } private static Object[] getALCircuit(int tier, int amount) { - return new Object[] {OrePrefixes.circuit.get(getCircuitMaterial(tier)), amount}; + return new Object[] { OrePrefixes.circuit.get(getCircuitMaterial(tier)), amount }; } @Nullable diff --git a/src/main/java/goodgenerator/loader/ComponentAssemblyLineRecipeLoader.java b/src/main/java/goodgenerator/loader/ComponentAssemblyLineRecipeLoader.java index 8cef4a492d..ced594689e 100644 --- a/src/main/java/goodgenerator/loader/ComponentAssemblyLineRecipeLoader.java +++ b/src/main/java/goodgenerator/loader/ComponentAssemblyLineRecipeLoader.java @@ -2,6 +2,18 @@ package goodgenerator.loader; import static goodgenerator.util.StackUtils.*; +import java.util.*; +import java.util.stream.Collectors; + +import javax.annotation.Nullable; + +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.oredict.OreDictionary; + +import org.apache.commons.lang3.tuple.Pair; + import goodgenerator.util.MyRecipeAdder; import gregtech.api.enums.GT_Values; import gregtech.api.enums.ItemList; @@ -12,28 +24,13 @@ import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Recipe; import gregtech.api.util.GT_Utility; import gregtech.common.items.GT_IntegratedCircuit_Item; -import java.util.*; -import java.util.stream.Collectors; -import javax.annotation.Nullable; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.oredict.OreDictionary; -import org.apache.commons.lang3.tuple.Pair; public class ComponentAssemblyLineRecipeLoader { - private static final String[] compPrefixes = { - "Electric_Motor_", - "Electric_Piston_", - "Electric_Pump_", - "Robot_Arm_", - "Conveyor_Module_", - "Emitter_", - "Sensor_", - "Field_Generator_", - }; - private static final String[] blacklistedDictPrefixes = {"circuit"}; - private static final String[] softBlacklistedDictPrefixes = {"Any", "crafting"}; + + private static final String[] compPrefixes = { "Electric_Motor_", "Electric_Piston_", "Electric_Pump_", + "Robot_Arm_", "Conveyor_Module_", "Emitter_", "Sensor_", "Field_Generator_", }; + private static final String[] blacklistedDictPrefixes = { "circuit" }; + private static final String[] softBlacklistedDictPrefixes = { "Any", "crafting" }; private static LinkedHashMap<List<GT_Recipe>, Pair<ItemList, Integer>> allAssemblerRecipes; private static LinkedHashMap<List<GT_Recipe.GT_Recipe_AssemblyLine>, Pair<ItemList, Integer>> allAsslineRecipes; @@ -94,6 +91,7 @@ public class ComponentAssemblyLineRecipeLoader { } }); } + /** Assembly Line Recipes (LuV+) **/ private static void generateAsslineRecipes() { allAsslineRecipes.forEach((recipeList, info) -> { @@ -103,8 +101,7 @@ public class ComponentAssemblyLineRecipeLoader { for (int i = 0; i < compPrefixes.length; i++) if (info.getLeft().toString().startsWith(compPrefixes[i])) componentCircuit = i + 1; if (componentCircuit == -1) { - throw new NullPointerException( - "Wrong circuit. Comp: " + info.getLeft().toString()); + throw new NullPointerException("Wrong circuit. Comp: " + info.getLeft().toString()); } final boolean addProgrammedCircuit = componentCircuit <= 7; // Arrays of the item and fluid inputs, that are updated to be multiplied and/or condensed in the @@ -129,10 +126,10 @@ public class ComponentAssemblyLineRecipeLoader { ItemData data = GT_OreDictUnificator.getAssociation(input); // trying to fix some circuit oredicting issues - if (data != null && data.mPrefix == OrePrefixes.circuit) - fixedInputs.addAll(multiplyAndSplitIntoStacks( - GT_OreDictUnificator.get(data.mPrefix, data.mMaterial.mMaterial, count), - INPUT_MULTIPLIER)); + if (data != null && data.mPrefix == OrePrefixes.circuit) fixedInputs.addAll( + multiplyAndSplitIntoStacks( + GT_OreDictUnificator.get(data.mPrefix, data.mMaterial.mMaterial, count), + INPUT_MULTIPLIER)); else fixedInputs.addAll(multiplyAndSplitIntoStacks(input, INPUT_MULTIPLIER)); } } @@ -199,18 +196,18 @@ public class ComponentAssemblyLineRecipeLoader { inputs.addAll(newInputs); } - /** Tries to convert {@code input} into its molten form. - * Because the internal names for material fluids in GT5u, GT++, and BartWorks follow the same naming scheme, - * this method should work for any {@code ItemStack} from any of the 3 material systems. - * */ + /** + * Tries to convert {@code input} into its molten form. Because the internal names for material fluids in GT5u, + * GT++, and BartWorks follow the same naming scheme, this method should work for any {@code ItemStack} from any of + * the 3 material systems. + */ @Nullable private static FluidStack tryConvertItemStackToFluidMaterial(ItemStack input) { ArrayList<String> oreDicts = new ArrayList<>(); for (int id : OreDictionary.getOreIDs(input)) { oreDicts.add(OreDictionary.getOreName(id)); } - oreDictLoop: - for (String dict : oreDicts) { + oreDictLoop: for (String dict : oreDicts) { for (String blacklistedPrefix : blacklistedDictPrefixes) { if (dict.startsWith(blacklistedPrefix)) { return null; @@ -232,19 +229,22 @@ public class ComponentAssemblyLineRecipeLoader { // Prevents things like AnyCopper or AnyIron from messing the search up. if (strippedOreDict.contains("Any")) continue; - if (strippedOreDict.contains("PTMEG")) - return FluidRegistry.getFluidStack( - "molten.silicone", (int) (orePrefix.mMaterialAmount / (GT_Values.M / 144)) * input.stackSize); + if (strippedOreDict.contains("PTMEG")) return FluidRegistry.getFluidStack( + "molten.silicone", + (int) (orePrefix.mMaterialAmount / (GT_Values.M / 144)) * input.stackSize); return FluidRegistry.getFluidStack( "molten." + strippedOreDict.toLowerCase(), (int) (orePrefix.mMaterialAmount / (GT_Values.M / 144)) * input.stackSize); } return null; } + /** * Gives the longest Ore Prefix that the OreDictionary string starts with. This makes it the most accurate prefix. * For example: If your OreDictionary is something like {@code gearGtSmallSpaceTime}, a conventional search would - * return something like {@code gearGt} instead of {@code gearGtSmall}. This makes the longer String the most accurate. + * return something like {@code gearGt} instead of {@code gearGtSmall}. This makes the longer String the most + * accurate. + * * @param oreDict The Ore Dictionary entry * @return The longest ore prefix that the OreDict string starts with. This makes it the most accurate prefix. */ @@ -262,11 +262,12 @@ public class ComponentAssemblyLineRecipeLoader { } return matchingPrefix; } + /** - * Transforms each {@code ItemStack}, if possible, into a more compact form. - * For example, a stack of 16 1x cables, when passed into the {@code items} array, - * will be converted into a single 16x cable. Also handles GraviStar conversion. - * */ + * Transforms each {@code ItemStack}, if possible, into a more compact form. For example, a stack of 16 1x cables, + * when passed into the {@code items} array, will be converted into a single 16x cable. Also handles GraviStar + * conversion. + */ private static ArrayList<ItemStack> compactItems(List<ItemStack> items, int tier) { ArrayList<ItemStack> stacks = new ArrayList<>(); HashMap<ItemStack, Integer> totals = getTotalItems(items); @@ -275,8 +276,7 @@ public class ComponentAssemblyLineRecipeLoader { ItemData data = GT_OreDictUnificator.getAssociation(itemstack); boolean isCompacted = false; - for (String dict : Arrays.stream(OreDictionary.getOreIDs(itemstack)) - .mapToObj(OreDictionary::getOreName) + for (String dict : Arrays.stream(OreDictionary.getOreIDs(itemstack)).mapToObj(OreDictionary::getOreName) .collect(Collectors.toList())) { if (dict.startsWith("circuit")) { stacks.addAll(getWrappedCircuits(itemstack, totalItems, dict)); @@ -300,12 +300,15 @@ public class ComponentAssemblyLineRecipeLoader { stacks = mergeStacks(stacks); return stacks; } + /** A helper method for compacting items */ - private static void compactorHelper( - ItemData data, OrePrefixes compactInto, ArrayList<ItemStack> output, int total) { + private static void compactorHelper(ItemData data, OrePrefixes compactInto, ArrayList<ItemStack> output, + int total) { int materialRatio = (int) ((double) compactInto.mMaterialAmount / data.mPrefix.mMaterialAmount); - output.addAll(multiplyAndSplitIntoStacks( - GT_OreDictUnificator.get(compactInto, data.mMaterial.mMaterial, 1), total / materialRatio)); + output.addAll( + multiplyAndSplitIntoStacks( + GT_OreDictUnificator.get(compactInto, data.mMaterial.mMaterial, 1), + total / materialRatio)); } /** @@ -329,8 +332,7 @@ public class ComponentAssemblyLineRecipeLoader { allAssemblerRecipes.put(foundRecipes, Pair.of(currentComponent, t)); } else { ArrayList<GT_Recipe.GT_Recipe_AssemblyLine> foundRecipes = new ArrayList<>(); - for (GT_Recipe.GT_Recipe_AssemblyLine recipe : - GT_Recipe.GT_Recipe_AssemblyLine.sAssemblylineRecipes) { + for (GT_Recipe.GT_Recipe_AssemblyLine recipe : GT_Recipe.GT_Recipe_AssemblyLine.sAssemblylineRecipes) { if (GT_Utility.areStacksEqual(currentComponent.get(1), recipe.mOutput)) { foundRecipes.add(recipe); } diff --git a/src/main/java/goodgenerator/loader/FuelRecipeLoader.java b/src/main/java/goodgenerator/loader/FuelRecipeLoader.java index 8cf7e37902..bd102bc310 100644 --- a/src/main/java/goodgenerator/loader/FuelRecipeLoader.java +++ b/src/main/java/goodgenerator/loader/FuelRecipeLoader.java @@ -3,18 +3,21 @@ package goodgenerator.loader; import static goodgenerator.main.GG_Config_Loader.NaquadahFuelTime; import static goodgenerator.main.GG_Config_Loader.NaquadahFuelVoltage; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; + import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader; + import goodgenerator.items.MyMaterial; import goodgenerator.util.ItemRefer; import goodgenerator.util.MyRecipeAdder; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.util.GT_OreDictUnificator; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fluids.FluidStack; public class FuelRecipeLoader { + public static void RegisterFuel() { // MyRecipeAdder.instance.addLiquidMentalFuel(Materials.NaquadahEnriched.getMolten(1L),Materials.Naquadah.getMolten(1L),32768,100); // MyRecipeAdder.instance.addLiquidMentalFuel(Materials.Naquadria.getMolten(1L),Materials.Naquadah.getMolten(1L),262144,120); @@ -60,30 +63,23 @@ public class FuelRecipeLoader { NaquadahFuelTime[7]); MyRecipeAdder.instance.addNaquadahFuelRefineRecipe( - new FluidStack[] { - MyMaterial.heavyNaquadahFuel.getFluidOrGas(800), MyMaterial.lightNaquadahFuel.getFluidOrGas(1000), - }, - new ItemStack[] { - MyMaterial.extremelyUnstableNaquadah.get(OrePrefixes.dust, 4), - WerkstoffLoader.Tiberium.get(OrePrefixes.dust, 27), - ItemRefer.High_Density_Uranium.get(2), - ItemRefer.High_Density_Plutonium.get(1), - }, + new FluidStack[] { MyMaterial.heavyNaquadahFuel.getFluidOrGas(800), + MyMaterial.lightNaquadahFuel.getFluidOrGas(1000), }, + new ItemStack[] { MyMaterial.extremelyUnstableNaquadah.get(OrePrefixes.dust, 4), + WerkstoffLoader.Tiberium.get(OrePrefixes.dust, 27), ItemRefer.High_Density_Uranium.get(2), + ItemRefer.High_Density_Plutonium.get(1), }, MyMaterial.naquadahBasedFuelMkIII.getFluidOrGas(100), 1100000, 100, 1); MyRecipeAdder.instance.addNaquadahFuelRefineRecipe( - new FluidStack[] { - MyMaterial.naquadahBasedFuelMkIII.getFluidOrGas(2000), Materials.Praseodymium.getMolten(9216L) - }, - new ItemStack[] { - MyMaterial.extremelyUnstableNaquadah.get(OrePrefixes.dust, 27), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.NetherStar, 64), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.DraconiumAwakened, 64), - MyMaterial.orundum.get(OrePrefixes.dust, 32), - }, + new FluidStack[] { MyMaterial.naquadahBasedFuelMkIII.getFluidOrGas(2000), + Materials.Praseodymium.getMolten(9216L) }, + new ItemStack[] { MyMaterial.extremelyUnstableNaquadah.get(OrePrefixes.dust, 27), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.NetherStar, 64), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.DraconiumAwakened, 64), + MyMaterial.orundum.get(OrePrefixes.dust, 32), }, MyMaterial.naquadahBasedFuelMkIV.getFluidOrGas(250), 46000000, 160, @@ -91,30 +87,22 @@ public class FuelRecipeLoader { // Alternate higher tier recipe MyRecipeAdder.instance.addNaquadahFuelRefineRecipe( - new FluidStack[] { - MyMaterial.naquadahBasedFuelMkIII.getFluidOrGas(2000), - new FluidStack(FluidRegistry.getFluid("molten.hypogen"), 1440) - }, - new ItemStack[] { - MyMaterial.extremelyUnstableNaquadah.get(OrePrefixes.dust, 27), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Bedrockium, 64), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.DraconiumAwakened, 64), - MyMaterial.orundum.get(OrePrefixes.dust, 64), - }, + new FluidStack[] { MyMaterial.naquadahBasedFuelMkIII.getFluidOrGas(2000), + new FluidStack(FluidRegistry.getFluid("molten.hypogen"), 1440) }, + new ItemStack[] { MyMaterial.extremelyUnstableNaquadah.get(OrePrefixes.dust, 27), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Bedrockium, 64), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.DraconiumAwakened, 64), + MyMaterial.orundum.get(OrePrefixes.dust, 64), }, MyMaterial.naquadahBasedFuelMkIV.getFluidOrGas(500), 75000000, 160, 2); MyRecipeAdder.instance.addNaquadahFuelRefineRecipe( - new FluidStack[] { - MyMaterial.naquadahBasedFuelMkIV.getFluidOrGas(2000), - FluidRegistry.getFluidStack("heavyradox", 1000), - }, - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Infinity, 16), - MyMaterial.atomicSeparationCatalyst.get(OrePrefixes.dust, 32), - }, + new FluidStack[] { MyMaterial.naquadahBasedFuelMkIV.getFluidOrGas(2000), + FluidRegistry.getFluidStack("heavyradox", 1000), }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Infinity, 16), + MyMaterial.atomicSeparationCatalyst.get(OrePrefixes.dust, 32), }, MyMaterial.naquadahBasedFuelMkV.getFluidOrGas(500), 100000000, 200, @@ -122,15 +110,11 @@ public class FuelRecipeLoader { // Alternate higher tier recipe MyRecipeAdder.instance.addNaquadahFuelRefineRecipe( - new FluidStack[] { - MyMaterial.naquadahBasedFuelMkIV.getFluidOrGas(2000), - FluidRegistry.getFluidStack("heavyradox", 1000), - }, - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SpaceTime, 8), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.TranscendentMetal, 16), - MyMaterial.atomicSeparationCatalyst.get(OrePrefixes.dust, 48), - }, + new FluidStack[] { MyMaterial.naquadahBasedFuelMkIV.getFluidOrGas(2000), + FluidRegistry.getFluidStack("heavyradox", 1000), }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SpaceTime, 8), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.TranscendentMetal, 16), + MyMaterial.atomicSeparationCatalyst.get(OrePrefixes.dust, 48), }, MyMaterial.naquadahBasedFuelMkV.getFluidOrGas(750), 300000000, 200, diff --git a/src/main/java/goodgenerator/loader/FuelRodLoader.java b/src/main/java/goodgenerator/loader/FuelRodLoader.java index 93555a834d..6c88509c6c 100644 --- a/src/main/java/goodgenerator/loader/FuelRodLoader.java +++ b/src/main/java/goodgenerator/loader/FuelRodLoader.java @@ -2,12 +2,13 @@ package goodgenerator.loader; import static goodgenerator.util.DescTextLocalization.addText; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; + import cpw.mods.fml.common.registry.GameRegistry; import goodgenerator.items.DepletedFuelRod; import goodgenerator.items.FuelRod; import goodgenerator.main.GoodGenerator; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; public class FuelRodLoader { @@ -38,41 +39,81 @@ public class FuelRodLoader { public static void RegisterRod() { rodCompressedUraniumDepleted = new DepletedFuelRod( - "rodCompressedUraniumDepleted", addText("depletedfuelrod.tooltip", 1), GoodGenerator.GG, 100); + "rodCompressedUraniumDepleted", + addText("depletedfuelrod.tooltip", 1), + GoodGenerator.GG, + 100); rodCompressedUraniumDepleted_2 = new DepletedFuelRod( - "rodCompressedUraniumDepleted2", addText("depletedfuelrod.tooltip", 1), GoodGenerator.GG, 200); + "rodCompressedUraniumDepleted2", + addText("depletedfuelrod.tooltip", 1), + GoodGenerator.GG, + 200); rodCompressedUraniumDepleted_4 = new DepletedFuelRod( - "rodCompressedUraniumDepleted4", addText("depletedfuelrod.tooltip", 1), GoodGenerator.GG, 400); + "rodCompressedUraniumDepleted4", + addText("depletedfuelrod.tooltip", 1), + GoodGenerator.GG, + 400); rodCompressedPlutoniumDepleted = new DepletedFuelRod( - "rodCompressedPlutoniumDepleted", addText("depletedfuelrod.tooltip", 1), GoodGenerator.GG, 120); + "rodCompressedPlutoniumDepleted", + addText("depletedfuelrod.tooltip", 1), + GoodGenerator.GG, + 120); rodCompressedPlutoniumDepleted_2 = new DepletedFuelRod( - "rodCompressedPlutoniumDepleted2", addText("depletedfuelrod.tooltip", 1), GoodGenerator.GG, 240); + "rodCompressedPlutoniumDepleted2", + addText("depletedfuelrod.tooltip", 1), + GoodGenerator.GG, + 240); rodCompressedPlutoniumDepleted_4 = new DepletedFuelRod( - "rodCompressedPlutoniumDepleted4", addText("depletedfuelrod.tooltip", 1), GoodGenerator.GG, 480); + "rodCompressedPlutoniumDepleted4", + addText("depletedfuelrod.tooltip", 1), + GoodGenerator.GG, + 480); rodLiquidUraniumDepleted = new DepletedFuelRod( - "rodLiquidUraniumDepleted", addText("depletedfuelrod.tooltip", 1), GoodGenerator.GG, 800); + "rodLiquidUraniumDepleted", + addText("depletedfuelrod.tooltip", 1), + GoodGenerator.GG, + 800); rodLiquidUraniumDepleted_2 = new DepletedFuelRod( - "rodLiquidUraniumDepleted2", addText("depletedfuelrod.tooltip", 1), GoodGenerator.GG, 1600); + "rodLiquidUraniumDepleted2", + addText("depletedfuelrod.tooltip", 1), + GoodGenerator.GG, + 1600); rodLiquidUraniumDepleted_4 = new DepletedFuelRod( - "rodLiquidUraniumDepleted4", addText("depletedfuelrod.tooltip", 1), GoodGenerator.GG, 3200); + "rodLiquidUraniumDepleted4", + addText("depletedfuelrod.tooltip", 1), + GoodGenerator.GG, + 3200); rodLiquidPlutoniumDepleted = new DepletedFuelRod( - "rodLiquidPlutoniumDepleted", addText("depletedfuelrod.tooltip", 1), GoodGenerator.GG, 1000); + "rodLiquidPlutoniumDepleted", + addText("depletedfuelrod.tooltip", 1), + GoodGenerator.GG, + 1000); rodLiquidPlutoniumDepleted_2 = new DepletedFuelRod( - "rodLiquidPlutoniumDepleted2", addText("depletedfuelrod.tooltip", 1), GoodGenerator.GG, 2000); + "rodLiquidPlutoniumDepleted2", + addText("depletedfuelrod.tooltip", 1), + GoodGenerator.GG, + 2000); rodLiquidPlutoniumDepleted_4 = new DepletedFuelRod( - "rodLiquidPlutoniumDepleted4", addText("depletedfuelrod.tooltip", 1), GoodGenerator.GG, 4000); + "rodLiquidPlutoniumDepleted4", + addText("depletedfuelrod.tooltip", 1), + GoodGenerator.GG, + 4000); GameRegistry.registerItem(rodCompressedUraniumDepleted, "rodCompressedUraniumDepleted", GoodGenerator.MOD_ID); + GameRegistry + .registerItem(rodCompressedUraniumDepleted_2, "rodCompressedUraniumDepleted2", GoodGenerator.MOD_ID); + GameRegistry + .registerItem(rodCompressedUraniumDepleted_4, "rodCompressedUraniumDepleted4", GoodGenerator.MOD_ID); + GameRegistry + .registerItem(rodCompressedPlutoniumDepleted, "rodCompressedPlutoniumDepleted", GoodGenerator.MOD_ID); GameRegistry.registerItem( - rodCompressedUraniumDepleted_2, "rodCompressedUraniumDepleted2", GoodGenerator.MOD_ID); - GameRegistry.registerItem( - rodCompressedUraniumDepleted_4, "rodCompressedUraniumDepleted4", GoodGenerator.MOD_ID); - GameRegistry.registerItem( - rodCompressedPlutoniumDepleted, "rodCompressedPlutoniumDepleted", GoodGenerator.MOD_ID); - GameRegistry.registerItem( - rodCompressedPlutoniumDepleted_2, "rodCompressedPlutoniumDepleted2", GoodGenerator.MOD_ID); + rodCompressedPlutoniumDepleted_2, + "rodCompressedPlutoniumDepleted2", + GoodGenerator.MOD_ID); GameRegistry.registerItem( - rodCompressedPlutoniumDepleted_4, "rodCompressedPlutoniumDepleted4", GoodGenerator.MOD_ID); + rodCompressedPlutoniumDepleted_4, + "rodCompressedPlutoniumDepleted4", + GoodGenerator.MOD_ID); GameRegistry.registerItem(rodLiquidUraniumDepleted, "rodLiquidUraniumDepleted", GoodGenerator.MOD_ID); GameRegistry.registerItem(rodLiquidUraniumDepleted_2, "rodLiquidUraniumDepleted2", GoodGenerator.MOD_ID); GameRegistry.registerItem(rodLiquidUraniumDepleted_4, "rodLiquidUraniumDepleted4", GoodGenerator.MOD_ID); diff --git a/src/main/java/goodgenerator/loader/Loaders.java b/src/main/java/goodgenerator/loader/Loaders.java index 0251c6753b..5867109135 100644 --- a/src/main/java/goodgenerator/loader/Loaders.java +++ b/src/main/java/goodgenerator/loader/Loaders.java @@ -2,6 +2,11 @@ package goodgenerator.loader; import static goodgenerator.util.DescTextLocalization.addText; +import net.minecraft.block.Block; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraftforge.oredict.OreDictionary; + import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.registry.GameRegistry; @@ -30,10 +35,6 @@ import gregtech.api.enums.GT_Values; import gregtech.api.enums.Textures; import gregtech.api.interfaces.ITexture; import gregtech.api.render.TextureFactory; -import net.minecraft.block.Block; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraftforge.oredict.OreDictionary; public class Loaders { @@ -44,20 +45,27 @@ public class Loaders { public static final Item radiationProtectionPlate = new MyItems("radiationProtectionPlate", GoodGenerator.GG); public static final Item wrappedUraniumIngot = new MyItems("wrappedUraniumIngot", GoodGenerator.GG); - public static final Item highDensityUraniumNugget = - new RadioactiveItem("highDensityUraniumNugget", GoodGenerator.GG, 200); + public static final Item highDensityUraniumNugget = new RadioactiveItem( + "highDensityUraniumNugget", + GoodGenerator.GG, + 200); public static final Item highDensityUranium = new RadioactiveItem("highDensityUranium", GoodGenerator.GG, 1800); public static final Item wrappedThoriumIngot = new MyItems("wrappedThoriumIngot", GoodGenerator.GG); - public static final Item highDensityThoriumNugget = - new RadioactiveItem("highDensityThoriumNugget", GoodGenerator.GG, 50); + public static final Item highDensityThoriumNugget = new RadioactiveItem( + "highDensityThoriumNugget", + GoodGenerator.GG, + 50); public static final Item highDensityThorium = new RadioactiveItem("highDensityThorium", GoodGenerator.GG, 450); public static final Item wrappedPlutoniumIngot = new MyItems("wrappedPlutoniumIngot", GoodGenerator.GG); - public static final Item highDensityPlutoniumNugget = - new RadioactiveItem("highDensityPlutoniumNugget", GoodGenerator.GG, 450); + public static final Item highDensityPlutoniumNugget = new RadioactiveItem( + "highDensityPlutoniumNugget", + GoodGenerator.GG, + 450); public static final Item highDensityPlutonium = new RadioactiveItem("highDensityPlutonium", GoodGenerator.GG, 4050); public static final Item rawAtomicSeparationCatalyst = new MyItems("rawAtomicSeparationCatalyst", GoodGenerator.GG); - public static final Item advancedRadiationProtectionPlate = - new MyItems("advancedRadiationProtectionPlate", GoodGenerator.GG); + public static final Item advancedRadiationProtectionPlate = new MyItems( + "advancedRadiationProtectionPlate", + GoodGenerator.GG); public static final Item aluminumNitride = new MyItems("aluminumNitride", "AlN", GoodGenerator.GG); public static final Item specialCeramics = new MyItems("specialCeramics", GoodGenerator.GG); public static final Item specialCeramicsPlate = new MyItems("specialCeramicsPlate", GoodGenerator.GG); @@ -68,151 +76,154 @@ public class Loaders { public static final Item quartzCrystalResonator = new MyItems("quartzCrystalResonator", GoodGenerator.GG); public static final Item inverter = new MyItems("inverter", addText("inverter.tooltip", 1), GoodGenerator.GG); public static final Item neutronSource = new MyItems("neutronSource", GoodGenerator.GG); - public static final Item naquadahMass = - new MyItems("naquadahMass", addText("naquadahMass.tooltip", 1), GoodGenerator.GG); - public static final Item enrichedNaquadahMass = - new MyItems("enrichedNaquadahMass", addText("enrichedNaquadahMass.tooltip", 1), GoodGenerator.GG); - public static final Item naquadriaMass = - new MyItems("naquadriaMass", addText("naquadriaMass.tooltip", 1), GoodGenerator.GG); + public static final Item naquadahMass = new MyItems( + "naquadahMass", + addText("naquadahMass.tooltip", 1), + GoodGenerator.GG); + public static final Item enrichedNaquadahMass = new MyItems( + "enrichedNaquadahMass", + addText("enrichedNaquadahMass.tooltip", 1), + GoodGenerator.GG); + public static final Item naquadriaMass = new MyItems( + "naquadriaMass", + addText("naquadriaMass.tooltip", 1), + GoodGenerator.GG); public static final Item advancedFuelRod = new MyItems("advancedFuelRod", GoodGenerator.GG); - public static final Item fluidCore = new MyItems("fluidCore", GoodGenerator.GG, new String[] { - GoodGenerator.MOD_ID + ":fluidCore/1", - GoodGenerator.MOD_ID + ":fluidCore/2", - GoodGenerator.MOD_ID + ":fluidCore/3", - GoodGenerator.MOD_ID + ":fluidCore/4", - GoodGenerator.MOD_ID + ":fluidCore/5", - GoodGenerator.MOD_ID + ":fluidCore/6", - GoodGenerator.MOD_ID + ":fluidCore/7", - GoodGenerator.MOD_ID + ":fluidCore/8", - GoodGenerator.MOD_ID + ":fluidCore/9", - GoodGenerator.MOD_ID + ":fluidCore/10" - }); - public static final Item upgradeEssentia = new MyItems("upgradeEssentia", GoodGenerator.GG, new String[] { - GoodGenerator.MOD_ID + ":upgradeEssentia/null", - GoodGenerator.MOD_ID + ":upgradeEssentia/air", - GoodGenerator.MOD_ID + ":upgradeEssentia/thermal", - GoodGenerator.MOD_ID + ":upgradeEssentia/unstable", - GoodGenerator.MOD_ID + ":upgradeEssentia/victus", - GoodGenerator.MOD_ID + ":upgradeEssentia/tainted", - GoodGenerator.MOD_ID + ":upgradeEssentia/mechanics", - GoodGenerator.MOD_ID + ":upgradeEssentia/spirit", - GoodGenerator.MOD_ID + ":upgradeEssentia/radiation", - GoodGenerator.MOD_ID + ":upgradeEssentia/electric" - }); + public static final Item fluidCore = new MyItems( + "fluidCore", + GoodGenerator.GG, + new String[] { GoodGenerator.MOD_ID + ":fluidCore/1", GoodGenerator.MOD_ID + ":fluidCore/2", + GoodGenerator.MOD_ID + ":fluidCore/3", GoodGenerator.MOD_ID + ":fluidCore/4", + GoodGenerator.MOD_ID + ":fluidCore/5", GoodGenerator.MOD_ID + ":fluidCore/6", + GoodGenerator.MOD_ID + ":fluidCore/7", GoodGenerator.MOD_ID + ":fluidCore/8", + GoodGenerator.MOD_ID + ":fluidCore/9", GoodGenerator.MOD_ID + ":fluidCore/10" }); + public static final Item upgradeEssentia = new MyItems( + "upgradeEssentia", + GoodGenerator.GG, + new String[] { GoodGenerator.MOD_ID + ":upgradeEssentia/null", + GoodGenerator.MOD_ID + ":upgradeEssentia/air", GoodGenerator.MOD_ID + ":upgradeEssentia/thermal", + GoodGenerator.MOD_ID + ":upgradeEssentia/unstable", + GoodGenerator.MOD_ID + ":upgradeEssentia/victus", GoodGenerator.MOD_ID + ":upgradeEssentia/tainted", + GoodGenerator.MOD_ID + ":upgradeEssentia/mechanics", + GoodGenerator.MOD_ID + ":upgradeEssentia/spirit", + GoodGenerator.MOD_ID + ":upgradeEssentia/radiation", + GoodGenerator.MOD_ID + ":upgradeEssentia/electric" }); public static final Item highEnergyMixture = new MyItems( - "highEnergyMixture", GoodGenerator.GG, new String[] {GoodGenerator.MOD_ID + ":highEnergyMixture"}); - public static final Item saltyRoot = - new MyItems("saltyRoot", GoodGenerator.GG, new String[] {GoodGenerator.MOD_ID + ":saltyRoot"}); - public static final Item huiCircuit = - new MyItems("huiCircuit", addText("huiCircuit.tooltip", 5), GoodGenerator.GG, new String[] { - GoodGenerator.MOD_ID + ":ciruits/1", - GoodGenerator.MOD_ID + ":ciruits/2", - GoodGenerator.MOD_ID + ":ciruits/3", - GoodGenerator.MOD_ID + ":ciruits/4", - GoodGenerator.MOD_ID + ":ciruits/5", - }); + "highEnergyMixture", + GoodGenerator.GG, + new String[] { GoodGenerator.MOD_ID + ":highEnergyMixture" }); + public static final Item saltyRoot = new MyItems( + "saltyRoot", + GoodGenerator.GG, + new String[] { GoodGenerator.MOD_ID + ":saltyRoot" }); + public static final Item huiCircuit = new MyItems( + "huiCircuit", + addText("huiCircuit.tooltip", 5), + GoodGenerator.GG, + new String[] { GoodGenerator.MOD_ID + ":ciruits/1", GoodGenerator.MOD_ID + ":ciruits/2", + GoodGenerator.MOD_ID + ":ciruits/3", GoodGenerator.MOD_ID + ":ciruits/4", + GoodGenerator.MOD_ID + ":ciruits/5", }); - public static final Item circuitWrap = new MyItems("circuitWrap", GoodGenerator.GG, new String[] { - GoodGenerator.MOD_ID + ":wraps/0", - GoodGenerator.MOD_ID + ":wraps/1", - GoodGenerator.MOD_ID + ":wraps/2", - GoodGenerator.MOD_ID + ":wraps/3", - GoodGenerator.MOD_ID + ":wraps/4", - GoodGenerator.MOD_ID + ":wraps/5", - GoodGenerator.MOD_ID + ":wraps/6", - GoodGenerator.MOD_ID + ":wraps/7", - GoodGenerator.MOD_ID + ":wraps/8", - GoodGenerator.MOD_ID + ":wraps/9", - GoodGenerator.MOD_ID + ":wraps/10", - GoodGenerator.MOD_ID + ":wraps/11", - GoodGenerator.MOD_ID + ":wraps/12", - GoodGenerator.MOD_ID + ":wraps/13", - GoodGenerator.MOD_ID + ":wraps/14" - }); + public static final Item circuitWrap = new MyItems( + "circuitWrap", + GoodGenerator.GG, + new String[] { GoodGenerator.MOD_ID + ":wraps/0", GoodGenerator.MOD_ID + ":wraps/1", + GoodGenerator.MOD_ID + ":wraps/2", GoodGenerator.MOD_ID + ":wraps/3", + GoodGenerator.MOD_ID + ":wraps/4", GoodGenerator.MOD_ID + ":wraps/5", + GoodGenerator.MOD_ID + ":wraps/6", GoodGenerator.MOD_ID + ":wraps/7", + GoodGenerator.MOD_ID + ":wraps/8", GoodGenerator.MOD_ID + ":wraps/9", + GoodGenerator.MOD_ID + ":wraps/10", GoodGenerator.MOD_ID + ":wraps/11", + GoodGenerator.MOD_ID + ":wraps/12", GoodGenerator.MOD_ID + ":wraps/13", + GoodGenerator.MOD_ID + ":wraps/14" }); - public static final Block MAR_Casing = - new Casing("MAR_Casing", new String[] {GoodGenerator.MOD_ID + ":MAR_Casing"}); - public static final Block FRF_Casings = - new Casing("FRF_Casing", new String[] {"gregtech:iconsets/MACHINE_CASING_MINING_BLACKPLUTONIUM"}); - public static final Block FRF_Coil_1 = - new Casing("FRF_Coil_1", new String[] {GoodGenerator.MOD_ID + ":FRF_Coils/1"}); - public static final Block FRF_Coil_2 = - new Casing("FRF_Coil_2", new String[] {GoodGenerator.MOD_ID + ":FRF_Coils/2"}); - public static final Block FRF_Coil_3 = - new Casing("FRF_Coil_3", new String[] {GoodGenerator.MOD_ID + ":FRF_Coils/3"}); + public static final Block MAR_Casing = new Casing( + "MAR_Casing", + new String[] { GoodGenerator.MOD_ID + ":MAR_Casing" }); + public static final Block FRF_Casings = new Casing( + "FRF_Casing", + new String[] { "gregtech:iconsets/MACHINE_CASING_MINING_BLACKPLUTONIUM" }); + public static final Block FRF_Coil_1 = new Casing( + "FRF_Coil_1", + new String[] { GoodGenerator.MOD_ID + ":FRF_Coils/1" }); + public static final Block FRF_Coil_2 = new Casing( + "FRF_Coil_2", + new String[] { GoodGenerator.MOD_ID + ":FRF_Coils/2" }); + public static final Block FRF_Coil_3 = new Casing( + "FRF_Coil_3", + new String[] { GoodGenerator.MOD_ID + ":FRF_Coils/3" }); public static final Block radiationProtectionSteelFrame = new Frame( - "radiationProtectionSteelFrame", new String[] {GoodGenerator.MOD_ID + ":radiationProtectionSteelFrame"}); - public static final Block fieldRestrictingGlass = - new Frame("fieldRestrictingGlass", new String[] {GoodGenerator.MOD_ID + ":fieldRestrictingGlass"}); - public static final Block rawCylinder = - new Casing("rawCylinder", new String[] {GoodGenerator.MOD_ID + ":rawCylinder"}); - public static final Block titaniumPlatedCylinder = - new Casing("titaniumPlatedCylinder", new String[] {GoodGenerator.MOD_ID + ":titaniumPlatedCylinder"}); - public static final Block magicCasing = - new Casing("magicCasing", new String[] {GoodGenerator.MOD_ID + ":MagicCasing"}); - public static final Block essentiaCell = new Casing("essentiaCell", new String[] { - GoodGenerator.MOD_ID + ":essentiaCell/1", - GoodGenerator.MOD_ID + ":essentiaCell/2", - GoodGenerator.MOD_ID + ":essentiaCell/3", - GoodGenerator.MOD_ID + ":essentiaCell/4" - }); + "radiationProtectionSteelFrame", + new String[] { GoodGenerator.MOD_ID + ":radiationProtectionSteelFrame" }); + public static final Block fieldRestrictingGlass = new Frame( + "fieldRestrictingGlass", + new String[] { GoodGenerator.MOD_ID + ":fieldRestrictingGlass" }); + public static final Block rawCylinder = new Casing( + "rawCylinder", + new String[] { GoodGenerator.MOD_ID + ":rawCylinder" }); + public static final Block titaniumPlatedCylinder = new Casing( + "titaniumPlatedCylinder", + new String[] { GoodGenerator.MOD_ID + ":titaniumPlatedCylinder" }); + public static final Block magicCasing = new Casing( + "magicCasing", + new String[] { GoodGenerator.MOD_ID + ":MagicCasing" }); + public static final Block essentiaCell = new Casing( + "essentiaCell", + new String[] { GoodGenerator.MOD_ID + ":essentiaCell/1", GoodGenerator.MOD_ID + ":essentiaCell/2", + GoodGenerator.MOD_ID + ":essentiaCell/3", GoodGenerator.MOD_ID + ":essentiaCell/4" }); public static final Block speedingPipe = new ComplexTextureCasing( "speedingPipe", - new String[] {GoodGenerator.MOD_ID + ":speedingPipe_SIDE"}, - new String[] {GoodGenerator.MOD_ID + ":speedingPipe_TOP"}); - public static final Block yottaFluidTankCell = new Casing("yottaFluidTankCell", new String[] { - GoodGenerator.MOD_ID + ":yottaFluidTankCell/1", - GoodGenerator.MOD_ID + ":yottaFluidTankCell/2", - GoodGenerator.MOD_ID + ":yottaFluidTankCell/3", - GoodGenerator.MOD_ID + ":yottaFluidTankCell/4", - GoodGenerator.MOD_ID + ":yottaFluidTankCell/5", - GoodGenerator.MOD_ID + ":yottaFluidTankCell/6", - GoodGenerator.MOD_ID + ":yottaFluidTankCell/7", - GoodGenerator.MOD_ID + ":yottaFluidTankCell/8", - GoodGenerator.MOD_ID + ":yottaFluidTankCell/9", - GoodGenerator.MOD_ID + ":yottaFluidTankCell/10", - }); + new String[] { GoodGenerator.MOD_ID + ":speedingPipe_SIDE" }, + new String[] { GoodGenerator.MOD_ID + ":speedingPipe_TOP" }); + public static final Block yottaFluidTankCell = new Casing( + "yottaFluidTankCell", + new String[] { GoodGenerator.MOD_ID + ":yottaFluidTankCell/1", + GoodGenerator.MOD_ID + ":yottaFluidTankCell/2", GoodGenerator.MOD_ID + ":yottaFluidTankCell/3", + GoodGenerator.MOD_ID + ":yottaFluidTankCell/4", GoodGenerator.MOD_ID + ":yottaFluidTankCell/5", + GoodGenerator.MOD_ID + ":yottaFluidTankCell/6", GoodGenerator.MOD_ID + ":yottaFluidTankCell/7", + GoodGenerator.MOD_ID + ":yottaFluidTankCell/8", GoodGenerator.MOD_ID + ":yottaFluidTankCell/9", + GoodGenerator.MOD_ID + ":yottaFluidTankCell/10", }); public static final Block yottaFluidTankCasing = new ComplexTextureCasing( "yottaFluidTankCasing", - new String[] {GoodGenerator.MOD_ID + ":yottaFluidTankCasing_SIDE"}, - new String[] {GoodGenerator.MOD_ID + ":yottaFluidTankCasing_TOP"}); - public static final Block supercriticalFluidTurbineCasing = - new TurbineCasing("supercriticalFluidTurbineCasing", "supercriticalFluidTurbineCasing"); - public static final Block pressureResistantWalls = - new Casing("pressureResistantWalls", new String[] {GoodGenerator.MOD_ID + ":pressureResistantWalls"}); - public static final Block preciseUnitCasing = new Casing("preciseUnitCasing", new String[] { - GoodGenerator.MOD_ID + ":preciseUnitCasing/1", - GoodGenerator.MOD_ID + ":preciseUnitCasing/2", - GoodGenerator.MOD_ID + ":preciseUnitCasing/3" - }); - public static final Block compactFusionCoil = new Casing("compactFusionCoil", new String[] { - GoodGenerator.MOD_ID + ":fuison/1", - GoodGenerator.MOD_ID + ":fuison/2", - GoodGenerator.MOD_ID + ":fuison/3", - GoodGenerator.MOD_ID + ":fuison/4", - GoodGenerator.MOD_ID + ":fuison/5" - }); - public static final Block essentiaFilterCasing = - new Casing("essentiaFilterCasing", new String[] {GoodGenerator.MOD_ID + ":essentiaFilterCasing"}); + new String[] { GoodGenerator.MOD_ID + ":yottaFluidTankCasing_SIDE" }, + new String[] { GoodGenerator.MOD_ID + ":yottaFluidTankCasing_TOP" }); + public static final Block supercriticalFluidTurbineCasing = new TurbineCasing( + "supercriticalFluidTurbineCasing", + "supercriticalFluidTurbineCasing"); + public static final Block pressureResistantWalls = new Casing( + "pressureResistantWalls", + new String[] { GoodGenerator.MOD_ID + ":pressureResistantWalls" }); + public static final Block preciseUnitCasing = new Casing( + "preciseUnitCasing", + new String[] { GoodGenerator.MOD_ID + ":preciseUnitCasing/1", GoodGenerator.MOD_ID + ":preciseUnitCasing/2", + GoodGenerator.MOD_ID + ":preciseUnitCasing/3" }); + public static final Block compactFusionCoil = new Casing( + "compactFusionCoil", + new String[] { GoodGenerator.MOD_ID + ":fuison/1", GoodGenerator.MOD_ID + ":fuison/2", + GoodGenerator.MOD_ID + ":fuison/3", GoodGenerator.MOD_ID + ":fuison/4", + GoodGenerator.MOD_ID + ":fuison/5" }); + public static final Block essentiaFilterCasing = new Casing( + "essentiaFilterCasing", + new String[] { GoodGenerator.MOD_ID + ":essentiaFilterCasing" }); public static Block essentiaHatch; public static Block essentiaOutputHatch; public static Block essentiaOutputHatch_ME; - public static final Block componentAssemblylineCasing = new Casing("componentAssemblyLineCasing", new String[] { - GoodGenerator.MOD_ID + ":compAsslineCasing/0", // LV - GoodGenerator.MOD_ID + ":compAsslineCasing/1", // MV - GoodGenerator.MOD_ID + ":compAsslineCasing/2", // HV - GoodGenerator.MOD_ID + ":compAsslineCasing/3", // EV - GoodGenerator.MOD_ID + ":compAsslineCasing/4", // IV - GoodGenerator.MOD_ID + ":compAsslineCasing/5", // LuV - GoodGenerator.MOD_ID + ":compAsslineCasing/6", // ZPM - GoodGenerator.MOD_ID + ":compAsslineCasing/7", // UV - GoodGenerator.MOD_ID + ":compAsslineCasing/8", // UHV - GoodGenerator.MOD_ID + ":compAsslineCasing/9", // UEV - GoodGenerator.MOD_ID + ":compAsslineCasing/10", // UIV - GoodGenerator.MOD_ID + ":compAsslineCasing/11", // UMV - GoodGenerator.MOD_ID + ":compAsslineCasing/12", // UXV - GoodGenerator.MOD_ID + ":compAsslineCasing/13" // MAX - }); + public static final Block componentAssemblylineCasing = new Casing( + "componentAssemblyLineCasing", + new String[] { GoodGenerator.MOD_ID + ":compAsslineCasing/0", // LV + GoodGenerator.MOD_ID + ":compAsslineCasing/1", // MV + GoodGenerator.MOD_ID + ":compAsslineCasing/2", // HV + GoodGenerator.MOD_ID + ":compAsslineCasing/3", // EV + GoodGenerator.MOD_ID + ":compAsslineCasing/4", // IV + GoodGenerator.MOD_ID + ":compAsslineCasing/5", // LuV + GoodGenerator.MOD_ID + ":compAsslineCasing/6", // ZPM + GoodGenerator.MOD_ID + ":compAsslineCasing/7", // UV + GoodGenerator.MOD_ID + ":compAsslineCasing/8", // UHV + GoodGenerator.MOD_ID + ":compAsslineCasing/9", // UEV + GoodGenerator.MOD_ID + ":compAsslineCasing/10", // UIV + GoodGenerator.MOD_ID + ":compAsslineCasing/11", // UMV + GoodGenerator.MOD_ID + ":compAsslineCasing/12", // UXV + GoodGenerator.MOD_ID + ":compAsslineCasing/13" // MAX + }); public static ItemStack MAR; public static ItemStack FRF; public static ItemStack UCFE; @@ -238,54 +249,65 @@ public class Loaders { Loaders.MAR = new MultiNqGenerator(12732, "NaG", "Large Naquadah Reactor").getStackForm(1L); Loaders.FRF = new FuelRefineFactory(16999, "FRF", "Naquadah Fuel Refinery").getStackForm(1L); Loaders.UCFE = new UniversalChemicalFuelEngine( - IDOffset, "UniversalChemicalFuelEngine", "Universal Chemical Fuel Engine") - .getStackForm(1L); + IDOffset, + "UniversalChemicalFuelEngine", + "Universal Chemical Fuel Engine").getStackForm(1L); for (int i = 0; i < 9; i++) { Loaders.NeutronAccelerators[i] = new NeutronAccelerator( - IDOffset + 2 + i, - "Neutron Accelerator " + GT_Values.VN[i], - "Neutron Accelerator " + GT_Values.VN[i], - i) - .getStackForm(1L); + IDOffset + 2 + i, + "Neutron Accelerator " + GT_Values.VN[i], + "Neutron Accelerator " + GT_Values.VN[i], + i).getStackForm(1L); } Loaders.NS = new NeutronSensor(IDOffset + 11, "Neutron Sensor", "Neutron Sensor", 5).getStackForm(1L); Loaders.NA = new NeutronActivator(IDOffset + 12, "NeutronActivator", "Neutron Activator").getStackForm(1L); Loaders.YFT = new YottaFluidTank(IDOffset + 13, "YottaFluidTank", "YOTTank").getStackForm(1L); Loaders.YFH = new YOTTAHatch(IDOffset + 14, "YottaFluidTankHatch", "YOTHatch", 5).getStackForm(1L); Loaders.SCTurbine = new SupercriticalFluidTurbine( - IDOffset + 15, "SupercriticalSteamTurbine", "SC Steam Turbine") - .getStackForm(1L); + IDOffset + 15, + "SupercriticalSteamTurbine", + "SC Steam Turbine").getStackForm(1L); Loaders.XHE = new ExtremeHeatExchanger(IDOffset + 16, "ExtremeHeatExchanger", "Extreme Heat Exchanger") .getStackForm(1L); Loaders.PA = new PreciseAssembler(IDOffset + 17, "PreciseAssembler", "Precise Auto-Assembler MT-3662") .getStackForm(1L); Loaders.LFC[0] = new LargeFusionComputer1( - IDOffset + 18, "LargeFusionComputer1", "Compact Fusion Computer MK-I Prototype") - .getStackForm(1); + IDOffset + 18, + "LargeFusionComputer1", + "Compact Fusion Computer MK-I Prototype").getStackForm(1); Loaders.LFC[1] = new LargeFusionComputer2( - IDOffset + 19, "LargeFusionComputer2", "Compact Fusion Computer MK-II") - .getStackForm(1L); + IDOffset + 19, + "LargeFusionComputer2", + "Compact Fusion Computer MK-II").getStackForm(1L); Loaders.LFC[2] = new LargeFusionComputer3( - IDOffset + 20, "LargeFusionComputer3", "Compact Fusion Computer MK-III") - .getStackForm(1L); + IDOffset + 20, + "LargeFusionComputer3", + "Compact Fusion Computer MK-III").getStackForm(1L); if (LoadedList.GTPP) { Loaders.LFC[3] = new LargeFusionComputer4( - IDOffset + 21, "LargeFusionComputer4", "Compact Fusion Computer MK-IV Prototype") - .getStackForm(1L); + IDOffset + 21, + "LargeFusionComputer4", + "Compact Fusion Computer MK-IV Prototype").getStackForm(1L); Loaders.LFC[4] = new LargeFusionComputer5( - IDOffset + 22, "LargeFusionComputer5", "Compact Fusion Computer MK-V") - .getStackForm(1L); + IDOffset + 22, + "LargeFusionComputer5", + "Compact Fusion Computer MK-V").getStackForm(1L); } Loaders.Generator_Diesel[0] = new DieselGenerator( - 1113, "basicgenerator.diesel.tier.04", "Turbo Supercharging Combustion Generator", 4) - .getStackForm(1L); + 1113, + "basicgenerator.diesel.tier.04", + "Turbo Supercharging Combustion Generator", + 4).getStackForm(1L); Loaders.Generator_Diesel[1] = new DieselGenerator( - 1114, "basicgenerator.diesel.tier.05", "Ultimate Chemical Energy Releaser", 5) - .getStackForm(1L); + 1114, + "basicgenerator.diesel.tier.05", + "Ultimate Chemical Energy Releaser", + 5).getStackForm(1L); Loaders.CT = new CoolantTower(IDOffset + 24, "CoolantTower", "Coolant Tower").getStackForm(1L); Loaders.CompAssline = new ComponentAssemblyLine( - IDOffset + 25, "ComponentAssemblyLine", "Component Assembly Line") - .getStackForm(1L); + IDOffset + 25, + "ComponentAssemblyLine", + "Component Assembly Line").getStackForm(1L); CrackRecipeAdder.registerPipe(30995, MyMaterial.incoloy903, 15000, 8000, true); CrackRecipeAdder.registerWire(32749, MyMaterial.signalium, 12, 131072, 16, true); CrackRecipeAdder.registerWire(32737, MyMaterial.lumiium, 8, 524288, 64, true); @@ -308,8 +330,8 @@ public class Loaders { GameRegistry.registerBlock(speedingPipe, MyItemBlocks.class, "speedingPipe"); GameRegistry.registerBlock(yottaFluidTankCell, MyItemBlocks.class, "yottaFluidTankCells"); GameRegistry.registerBlock(yottaFluidTankCasing, MyItemBlocks.class, "yottaFluidTankCasing"); - GameRegistry.registerBlock( - supercriticalFluidTurbineCasing, MyItemBlocks.class, "supercriticalFluidTurbineCasing"); + GameRegistry + .registerBlock(supercriticalFluidTurbineCasing, MyItemBlocks.class, "supercriticalFluidTurbineCasing"); GameRegistry.registerBlock(componentAssemblylineCasing, MyItemBlocks.class, "componentAssemblylineCasing"); GameRegistry.registerBlock(pressureResistantWalls, MyItemBlocks.class, "pressureResistantWalls"); GameRegistry.registerBlock(preciseUnitCasing, MyItemBlocks.class, "preciseUnitCasing"); @@ -326,7 +348,9 @@ public class Loaders { GameRegistry.registerItem(highDensityPlutonium, "highDensityPlutonium", GoodGenerator.MOD_ID); GameRegistry.registerItem(rawAtomicSeparationCatalyst, "rawAtomicSeparationCatalyst", GoodGenerator.MOD_ID); GameRegistry.registerItem( - advancedRadiationProtectionPlate, "advancedRadiationProtectionPlate", GoodGenerator.MOD_ID); + advancedRadiationProtectionPlate, + "advancedRadiationProtectionPlate", + GoodGenerator.MOD_ID); GameRegistry.registerItem(aluminumNitride, "aluminumNitride", GoodGenerator.MOD_ID); GameRegistry.registerItem(specialCeramics, "specialCeramics", GoodGenerator.MOD_ID); GameRegistry.registerItem(specialCeramicsPlate, "specialCeramicsPlate", GoodGenerator.MOD_ID); @@ -359,11 +383,15 @@ public class Loaders { .getStackForm(1L); Loaders.LES = new LargeEssentiaSmeltery(IDOffset + 23, "LargeEssentiaSmeltery", "Large Essentia Smeltery") .getStackForm(1L); - essentiaHatch = new TEBlock("essentiaHatch", new String[] {GoodGenerator.MOD_ID + ":essentiaHatch"}, 1); - essentiaOutputHatch = - new TEBlock("essentiaOutputHatch", new String[] {GoodGenerator.MOD_ID + ":essentiaOutputHatch"}, 2); + essentiaHatch = new TEBlock("essentiaHatch", new String[] { GoodGenerator.MOD_ID + ":essentiaHatch" }, 1); + essentiaOutputHatch = new TEBlock( + "essentiaOutputHatch", + new String[] { GoodGenerator.MOD_ID + ":essentiaOutputHatch" }, + 2); essentiaOutputHatch_ME = new TEBlock( - "essentiaOutputHatch_ME", new String[] {GoodGenerator.MOD_ID + ":essentiaOutputHatch_ME"}, 3); + "essentiaOutputHatch_ME", + new String[] { GoodGenerator.MOD_ID + ":essentiaOutputHatch_ME" }, + 3); GameRegistry.registerBlock(magicCasing, MyItemBlocks.class, "magicCasing"); GameRegistry.registerBlock(essentiaCell, MyItemBlocks.class, "essentiaCell"); GameRegistry.registerBlock(essentiaHatch, MyItemBlocks.class, "essentiaHatch"); @@ -382,18 +410,18 @@ public class Loaders { public static void addTexturePage() { if (Textures.BlockIcons.casingTexturePages[GoodGeneratorTexturePage] == null) { Textures.BlockIcons.casingTexturePages[GoodGeneratorTexturePage] = new ITexture[128]; - Textures.BlockIcons.casingTexturePages[GoodGeneratorTexturePage][1] = - TextureFactory.of(yottaFluidTankCasing); - Textures.BlockIcons.casingTexturePages[GoodGeneratorTexturePage][2] = - TextureFactory.of(supercriticalFluidTurbineCasing); - Textures.BlockIcons.casingTexturePages[GoodGeneratorTexturePage][3] = - TextureFactory.of(preciseUnitCasing, 0); - Textures.BlockIcons.casingTexturePages[GoodGeneratorTexturePage][4] = - TextureFactory.of(preciseUnitCasing, 1); - Textures.BlockIcons.casingTexturePages[GoodGeneratorTexturePage][5] = - TextureFactory.of(preciseUnitCasing, 2); - Textures.BlockIcons.casingTexturePages[GoodGeneratorTexturePage][6] = - TextureFactory.of(GregTech_API.sBlockConcretes, 8); + Textures.BlockIcons.casingTexturePages[GoodGeneratorTexturePage][1] = TextureFactory + .of(yottaFluidTankCasing); + Textures.BlockIcons.casingTexturePages[GoodGeneratorTexturePage][2] = TextureFactory + .of(supercriticalFluidTurbineCasing); + Textures.BlockIcons.casingTexturePages[GoodGeneratorTexturePage][3] = TextureFactory + .of(preciseUnitCasing, 0); + Textures.BlockIcons.casingTexturePages[GoodGeneratorTexturePage][4] = TextureFactory + .of(preciseUnitCasing, 1); + Textures.BlockIcons.casingTexturePages[GoodGeneratorTexturePage][5] = TextureFactory + .of(preciseUnitCasing, 2); + Textures.BlockIcons.casingTexturePages[GoodGeneratorTexturePage][6] = TextureFactory + .of(GregTech_API.sBlockConcretes, 8); } } diff --git a/src/main/java/goodgenerator/loader/NaquadahReworkRecipeLoader.java b/src/main/java/goodgenerator/loader/NaquadahReworkRecipeLoader.java index b0d984b116..2288bdb31c 100644 --- a/src/main/java/goodgenerator/loader/NaquadahReworkRecipeLoader.java +++ b/src/main/java/goodgenerator/loader/NaquadahReworkRecipeLoader.java @@ -4,8 +4,25 @@ import static goodgenerator.items.MyMaterial.*; import static goodgenerator.main.GG_Config_Loader.EnableNaquadahRework; import static gregtech.common.items.GT_MetaGenerated_Item_01.registerCauldronCleaningFor; +import java.lang.reflect.*; +import java.util.HashSet; + +import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.CraftingManager; +import net.minecraft.item.crafting.IRecipe; +import net.minecraft.item.crafting.ShapedRecipes; +import net.minecraft.item.crafting.ShapelessRecipes; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.oredict.OreDictionary; +import net.minecraftforge.oredict.ShapedOreRecipe; +import net.minecraftforge.oredict.ShapelessOreRecipe; + +import org.apache.commons.lang3.reflect.FieldUtils; + import com.github.bartimaeusnek.bartworks.system.material.GT_Enhancement.PlatinumSludgeOverHaul; import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader; + import goodgenerator.crossmod.LoadedList; import goodgenerator.main.GoodGenerator; import goodgenerator.util.ItemRefer; @@ -19,19 +36,6 @@ import gregtech.common.items.CombType; import gregtech.loaders.misc.GT_Bees; import gtPlusPlus.core.item.chemistry.GenericChem; import gtPlusPlus.core.lib.CORE; -import java.lang.reflect.*; -import java.util.HashSet; -import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.CraftingManager; -import net.minecraft.item.crafting.IRecipe; -import net.minecraft.item.crafting.ShapedRecipes; -import net.minecraft.item.crafting.ShapelessRecipes; -import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.oredict.OreDictionary; -import net.minecraftforge.oredict.ShapedOreRecipe; -import net.minecraftforge.oredict.ShapelessOreRecipe; -import org.apache.commons.lang3.reflect.FieldUtils; @SuppressWarnings("deprecation") public class NaquadahReworkRecipeLoader { @@ -44,97 +48,69 @@ public class NaquadahReworkRecipeLoader { try { // Naquadah (UEV) CORE.RA.addQuantumTransformerRecipe( - new ItemStack[] { - naquadahEarth.get(OrePrefixes.dust, 32), - Materials.Sodium.getDust(64), - Materials.Carbon.getDust(1), - GT_Utility.copyAmount(0, GenericChem.mSimpleNaquadahCatalyst) - }, - new FluidStack[] { - Materials.Hydrogen.getGas(64000L), - Materials.Fluorine.getGas(64000L), - Materials.Oxygen.getGas(100L) - }, + new ItemStack[] { naquadahEarth.get(OrePrefixes.dust, 32), Materials.Sodium.getDust(64), + Materials.Carbon.getDust(1), + GT_Utility.copyAmount(0, GenericChem.mSimpleNaquadahCatalyst) }, + new FluidStack[] { Materials.Hydrogen.getGas(64000L), Materials.Fluorine.getGas(64000L), + Materials.Oxygen.getGas(100L) }, new FluidStack[] {}, - new ItemStack[] { - inertNaquadah.get(OrePrefixes.dust, 1), - Materials.Titanium.getDust(64), - Materials.Adamantium.getDust(64), - Materials.Gallium.getDust(64) - }, - new int[] {2500, 2500, 2500, 2500}, + new ItemStack[] { inertNaquadah.get(OrePrefixes.dust, 1), Materials.Titanium.getDust(64), + Materials.Adamantium.getDust(64), Materials.Gallium.getDust(64) }, + new int[] { 2500, 2500, 2500, 2500 }, 10 * 20, (int) GT_Values.VP[10], 2); // Enriched Naquadah (UIV) CORE.RA.addQuantumTransformerRecipe( - new ItemStack[] { - enrichedNaquadahEarth.get(OrePrefixes.dust, 32), - Materials.Zinc.getDust(64), - Materials.Carbon.getDust(1), - GT_Utility.copyAmount(0, GenericChem.mSimpleNaquadahCatalyst) - }, - new FluidStack[] {Materials.SulfuricAcid.getFluid(16000), Materials.Oxygen.getGas(100L)}, - new FluidStack[] {wasteLiquid.getFluidOrGas(32000)}, - new ItemStack[] { - inertEnrichedNaquadah.get(OrePrefixes.dust, 1), Materials.Trinium.getDust(64), - }, - new int[] {3300, 3300, 3300}, + new ItemStack[] { enrichedNaquadahEarth.get(OrePrefixes.dust, 32), Materials.Zinc.getDust(64), + Materials.Carbon.getDust(1), + GT_Utility.copyAmount(0, GenericChem.mSimpleNaquadahCatalyst) }, + new FluidStack[] { Materials.SulfuricAcid.getFluid(16000), Materials.Oxygen.getGas(100L) }, + new FluidStack[] { wasteLiquid.getFluidOrGas(32000) }, + new ItemStack[] { inertEnrichedNaquadah.get(OrePrefixes.dust, 1), + Materials.Trinium.getDust(64), }, + new int[] { 3300, 3300, 3300 }, 10 * 20, (int) GT_Values.VP[11], 2); // Naquadria (UMV) CORE.RA.addQuantumTransformerRecipe( - new ItemStack[] { - naquadriaEarth.get(OrePrefixes.dust, 32), - Materials.Magnesium.getDust(64), - GT_Utility.copyAmount(0, GenericChem.mAdvancedNaquadahCatalyst) - }, - new FluidStack[] { - Materials.PhosphoricAcid.getFluid(16000), - Materials.SulfuricAcid.getFluid(16000), - Materials.Oxygen.getGas(100L) - }, + new ItemStack[] { naquadriaEarth.get(OrePrefixes.dust, 32), Materials.Magnesium.getDust(64), + GT_Utility.copyAmount(0, GenericChem.mAdvancedNaquadahCatalyst) }, + new FluidStack[] { Materials.PhosphoricAcid.getFluid(16000), + Materials.SulfuricAcid.getFluid(16000), Materials.Oxygen.getGas(100L) }, new FluidStack[] {}, - new ItemStack[] { - inertNaquadria.get(OrePrefixes.dust, 1), - Materials.Barium.getDust(64), - Materials.Indium.getDust(64), - ItemList.NaquadriaSupersolid.get(1) - }, - new int[] {2500, 2500, 2500, 2500}, + new ItemStack[] { inertNaquadria.get(OrePrefixes.dust, 1), Materials.Barium.getDust(64), + Materials.Indium.getDust(64), ItemList.NaquadriaSupersolid.get(1) }, + new int[] { 2500, 2500, 2500, 2500 }, 5 * 20, (int) GT_Values.VP[12], 3); // Activate Them MyRecipeAdder.instance.addNeutronActivatorRecipe( - new FluidStack[] {Materials.Nickel.getPlasma(144 * 16)}, - new ItemStack[] { - inertNaquadah.get(OrePrefixes.dust, 64), inertNaquadah.get(OrePrefixes.dust, 32) - }, - new FluidStack[] {Materials.Naquadah.getMolten(144 * 9216)}, - new ItemStack[] {Materials.Nickel.getDust(16)}, + new FluidStack[] { Materials.Nickel.getPlasma(144 * 16) }, + new ItemStack[] { inertNaquadah.get(OrePrefixes.dust, 64), + inertNaquadah.get(OrePrefixes.dust, 32) }, + new FluidStack[] { Materials.Naquadah.getMolten(144 * 9216) }, + new ItemStack[] { Materials.Nickel.getDust(16) }, 2000, 600, 500); MyRecipeAdder.instance.addNeutronActivatorRecipe( - new FluidStack[] {Materials.Titanium.getPlasma(16 * 144)}, - new ItemStack[] { - inertEnrichedNaquadah.get(OrePrefixes.dust, 64), - inertEnrichedNaquadah.get(OrePrefixes.dust, 32) - }, - new FluidStack[] {Materials.NaquadahEnriched.getMolten(144 * 9216)}, - new ItemStack[] {Materials.Titanium.getDust(16)}, + new FluidStack[] { Materials.Titanium.getPlasma(16 * 144) }, + new ItemStack[] { inertEnrichedNaquadah.get(OrePrefixes.dust, 64), + inertEnrichedNaquadah.get(OrePrefixes.dust, 32) }, + new FluidStack[] { Materials.NaquadahEnriched.getMolten(144 * 9216) }, + new ItemStack[] { Materials.Titanium.getDust(16) }, 2000, 900, 850); MyRecipeAdder.instance.addNeutronActivatorRecipe( - new FluidStack[] {Materials.Americium.getPlasma(144 * 16)}, - new ItemStack[] { - inertNaquadria.get(OrePrefixes.dust, 64), inertNaquadria.get(OrePrefixes.dust, 32) - }, - new FluidStack[] {Materials.Naquadria.getMolten(144 * 9216)}, - new ItemStack[] {Materials.Americium.getDust(16)}, + new FluidStack[] { Materials.Americium.getPlasma(144 * 16) }, + new ItemStack[] { inertNaquadria.get(OrePrefixes.dust, 64), + inertNaquadria.get(OrePrefixes.dust, 32) }, + new FluidStack[] { Materials.Naquadria.getMolten(144 * 9216) }, + new ItemStack[] { Materials.Americium.getDust(16) }, 2000, 1100, 1080); @@ -146,8 +122,8 @@ public class NaquadahReworkRecipeLoader { // Fix shit GT_Values.RA.addPulveriserRecipe( lowQualityNaquadriaSolution.get(OrePrefixes.cell, 1), - new ItemStack[] {Materials.Tin.getDust(2)}, - new int[] {10000}, + new ItemStack[] { Materials.Tin.getDust(2) }, + new int[] { 10000 }, 334, 4); @@ -186,13 +162,10 @@ public class NaquadahReworkRecipeLoader { // 2C8H18O + H3PO4 =Na,C2H6O= C16H35O3P + 2H2O GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] {GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sodium, 2)}, - new FluidStack[] { - towEthyl1Hexanol.getFluidOrGas(2000), - Materials.PhosphoricAcid.getFluid(1000), - Materials.Ethanol.getFluid(2000) - }, - new FluidStack[] {P507.getFluidOrGas(1000)}, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sodium, 2) }, + new FluidStack[] { towEthyl1Hexanol.getFluidOrGas(2000), Materials.PhosphoricAcid.getFluid(1000), + Materials.Ethanol.getFluid(2000) }, + new FluidStack[] { P507.getFluidOrGas(1000) }, null, 1200, 1920); @@ -209,12 +182,9 @@ public class NaquadahReworkRecipeLoader { GT_Values.RA.addMultiblockChemicalRecipe( null, - new FluidStack[] { - P507.getFluidOrGas(4000), lowQualityNaquadahSolution.getFluidOrGas(36000), - }, - new FluidStack[] { - fluorineRichWasteLiquid.getFluidOrGas(10000), naquadahAdamantiumSolution.getFluidOrGas(30000) - }, + new FluidStack[] { P507.getFluidOrGas(4000), lowQualityNaquadahSolution.getFluidOrGas(36000), }, + new FluidStack[] { fluorineRichWasteLiquid.getFluidOrGas(10000), + naquadahAdamantiumSolution.getFluidOrGas(30000) }, null, 4000, 1920); @@ -230,24 +200,18 @@ public class NaquadahReworkRecipeLoader { GT_Values.RA.addUniversalDistillationRecipe( wasteLiquid.getFluidOrGas(10000), - new FluidStack[] { - Materials.SaltWater.getFluid(3000), - FluidRegistry.getFluidStack("phenol", 2000), - Materials.HydrochloricAcid.getFluid(5000) - }, + new FluidStack[] { Materials.SaltWater.getFluid(3000), FluidRegistry.getFluidStack("phenol", 2000), + Materials.HydrochloricAcid.getFluid(5000) }, GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Chrome, 3), 300, 480); MyRecipeAdder.instance.addNeutronActivatorRecipe( - new FluidStack[] {naquadahAdamantiumSolution.getFluidOrGas(3000)}, + new FluidStack[] { naquadahAdamantiumSolution.getFluidOrGas(3000) }, null, - new FluidStack[] {naquadahRichSolution.getFluidOrGas(2000)}, - new ItemStack[] { - adamantine.get(OrePrefixes.dust, 4), - naquadahEarth.get(OrePrefixes.dust, 2), - concentratedEnrichedNaquadahSludge.get(OrePrefixes.dust, 1) - }, + new FluidStack[] { naquadahRichSolution.getFluidOrGas(2000) }, + new ItemStack[] { adamantine.get(OrePrefixes.dust, 4), naquadahEarth.get(OrePrefixes.dust, 2), + concentratedEnrichedNaquadahSludge.get(OrePrefixes.dust, 1) }, 100, 230, 200); @@ -286,17 +250,15 @@ public class NaquadahReworkRecipeLoader { null, null, null, - new int[] {6250, 6250, 10000}, + new int[] { 6250, 6250, 10000 }, 1000, 1920); GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] { - enrichedNaquadahEarth.get(OrePrefixes.dust, 4), - }, - new FluidStack[] {P507.getFluidOrGas(1000), Materials.SulfuricAcid.getFluid(18000)}, - new FluidStack[] {enrichedNaquadahRichSolution.getFluidOrGas(4000), wasteLiquid.getFluidOrGas(1000)}, - new ItemStack[] {naquadahEarth.get(OrePrefixes.dust, 1), triniumSulphate.get(OrePrefixes.dust, 1)}, + new ItemStack[] { enrichedNaquadahEarth.get(OrePrefixes.dust, 4), }, + new FluidStack[] { P507.getFluidOrGas(1000), Materials.SulfuricAcid.getFluid(18000) }, + new FluidStack[] { enrichedNaquadahRichSolution.getFluidOrGas(4000), wasteLiquid.getFluidOrGas(1000) }, + new ItemStack[] { naquadahEarth.get(OrePrefixes.dust, 1), triniumSulphate.get(OrePrefixes.dust, 1) }, 400, 1920); @@ -323,19 +285,15 @@ public class NaquadahReworkRecipeLoader { MyRecipeAdder.instance.addNeutronActivatorRecipe( null, - new ItemStack[] { - concentratedEnrichedNaquadahSludge.get(OrePrefixes.dust, 16), - }, + new ItemStack[] { concentratedEnrichedNaquadahSludge.get(OrePrefixes.dust, 16), }, null, - new ItemStack[] { - enrichedNaquadahSulphate.get(OrePrefixes.dust, 64), - enrichedNaquadahSulphate.get(OrePrefixes.dust, 64), - enrichedNaquadahSulphate.get(OrePrefixes.dust, 37), - WerkstoffLoader.Sodiumsulfate.get(OrePrefixes.dust, 64), - WerkstoffLoader.Sodiumsulfate.get(OrePrefixes.dust, 64), - WerkstoffLoader.Sodiumsulfate.get(OrePrefixes.dust, 12), - lowQualityNaquadriaSulphate.get(OrePrefixes.dust, 2), - }, + new ItemStack[] { enrichedNaquadahSulphate.get(OrePrefixes.dust, 64), + enrichedNaquadahSulphate.get(OrePrefixes.dust, 64), + enrichedNaquadahSulphate.get(OrePrefixes.dust, 37), + WerkstoffLoader.Sodiumsulfate.get(OrePrefixes.dust, 64), + WerkstoffLoader.Sodiumsulfate.get(OrePrefixes.dust, 64), + WerkstoffLoader.Sodiumsulfate.get(OrePrefixes.dust, 12), + lowQualityNaquadriaSulphate.get(OrePrefixes.dust, 2), }, 120, 480, 460); @@ -354,14 +312,10 @@ public class NaquadahReworkRecipeLoader { // KeSO4 + 2H = Ke + H2SO4 GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] { - triniumSulphate.get(OrePrefixes.dust, 6), - }, - new FluidStack[] {Materials.Hydrogen.getGas(2000)}, - new FluidStack[] {Materials.SulfuricAcid.getFluid(1000)}, - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Trinium, 1), - }, + new ItemStack[] { triniumSulphate.get(OrePrefixes.dust, 6), }, + new FluidStack[] { Materials.Hydrogen.getGas(2000) }, + new FluidStack[] { Materials.SulfuricAcid.getFluid(1000) }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Trinium, 1), }, 120, 480); @@ -376,7 +330,7 @@ public class NaquadahReworkRecipeLoader { null, null, null, - new int[] {2000, 10000}, + new int[] { 2000, 10000 }, 400, 122880); @@ -413,12 +367,11 @@ public class NaquadahReworkRecipeLoader { 7680); MyRecipeAdder.instance.addNeutronActivatorRecipe( - new FluidStack[] {naquadriaRichSolution.getFluidOrGas(9000)}, + new FluidStack[] { naquadriaRichSolution.getFluidOrGas(9000) }, null, null, - new ItemStack[] { - naquadriaSulphate.get(OrePrefixes.dust, 44), lowQualityNaquadriaSulphate.get(OrePrefixes.dust, 6) - }, + new ItemStack[] { naquadriaSulphate.get(OrePrefixes.dust, 44), + lowQualityNaquadriaSulphate.get(OrePrefixes.dust, 6) }, 100, 1100, 1050); @@ -434,11 +387,8 @@ public class NaquadahReworkRecipeLoader { GT_Values.RA.addUniversalDistillationRecipe( lowQualityNaquadriaSolution.getFluidOrGas(7000), - new FluidStack[] { - P507.getFluidOrGas(1000), - naquadriaRichSolution.getFluidOrGas(5400), - Materials.DilutedSulfuricAcid.getFluid(12000) - }, + new FluidStack[] { P507.getFluidOrGas(1000), naquadriaRichSolution.getFluidOrGas(5400), + Materials.DilutedSulfuricAcid.getFluid(12000) }, enrichedNaquadahEarth.get(OrePrefixes.dust, 2), 500, 7680); @@ -490,24 +440,24 @@ public class NaquadahReworkRecipeLoader { GT_Values.RA.addPulveriserRecipe( ItemRefer.Naquadah_Mass.get(1), - new ItemStack[] {naquadahEarth.get(OrePrefixes.dust, 1), enrichedNaquadahEarth.get(OrePrefixes.dust, 1) - }, - new int[] {10000, 100}, + new ItemStack[] { naquadahEarth.get(OrePrefixes.dust, 1), + enrichedNaquadahEarth.get(OrePrefixes.dust, 1) }, + new int[] { 10000, 100 }, 100, 2); GT_Values.RA.addPulveriserRecipe( ItemRefer.Enriched_Naquadah_Mass.get(1), - new ItemStack[] {enrichedNaquadahEarth.get(OrePrefixes.dust, 1), naquadriaEarth.get(OrePrefixes.dust, 1) - }, - new int[] {10000, 100}, + new ItemStack[] { enrichedNaquadahEarth.get(OrePrefixes.dust, 1), + naquadriaEarth.get(OrePrefixes.dust, 1) }, + new int[] { 10000, 100 }, 100, 2); GT_Values.RA.addPulveriserRecipe( ItemRefer.Naquadria_Mass.get(1), - new ItemStack[] {naquadriaEarth.get(OrePrefixes.dust, 1), naquadriaEarth.get(OrePrefixes.dust, 1)}, - new int[] {10000, 100}, + new ItemStack[] { naquadriaEarth.get(OrePrefixes.dust, 1), naquadriaEarth.get(OrePrefixes.dust, 1) }, + new int[] { 10000, 100 }, 100, 2); @@ -550,9 +500,9 @@ public class NaquadahReworkRecipeLoader { // C2H4 + H2O(g) = C2H6O GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] {GT_Utility.getIntegratedCircuit(24)}, - new FluidStack[] {Materials.Ethylene.getGas(1000), FluidRegistry.getFluidStack("steam", 2000)}, - new FluidStack[] {Materials.Ethanol.getFluid(1000)}, + new ItemStack[] { GT_Utility.getIntegratedCircuit(24) }, + new FluidStack[] { Materials.Ethylene.getGas(1000), FluidRegistry.getFluidStack("steam", 2000) }, + new FluidStack[] { Materials.Ethanol.getFluid(1000) }, null, 400, 480); @@ -582,15 +532,14 @@ public class NaquadahReworkRecipeLoader { null, false, 1 << 30, - new FluidStack[] {Materials.SulfuricAcid.getFluid(500)}, + new FluidStack[] { Materials.SulfuricAcid.getFluid(500) }, GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Platinum, 16), ItemList.Empty_Board_Elite.get(2)); if (tRecipe != null) { GT_Recipe.GT_Recipe_Map.sChemicalRecipes.mRecipeList.remove(tRecipe); GT_Recipe tRecipe2 = tRecipe.copy(); - tRecipe2.mInputs = new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Naquadah, 8), ItemList.Empty_Board_Elite.get(2) - }; + tRecipe2.mInputs = new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Naquadah, 8), + ItemList.Empty_Board_Elite.get(2) }; GT_Recipe.GT_Recipe_Map.sChemicalRecipes.mRecipeList.add(tRecipe2); GT_Recipe.GT_Recipe_Map.sChemicalRecipes.reInit(); } @@ -599,15 +548,14 @@ public class NaquadahReworkRecipeLoader { null, false, 1 << 30, - new FluidStack[] {Materials.SulfuricAcid.getFluid(500)}, + new FluidStack[] { Materials.SulfuricAcid.getFluid(500) }, GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Platinum, 16), ItemList.Empty_Board_Elite.get(2)); if (tRecipe != null) { GT_Recipe.GT_Recipe_Map.sMultiblockChemicalRecipes.mRecipeList.remove(tRecipe); GT_Recipe tRecipe2 = tRecipe.copy(); - tRecipe2.mInputs = new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Naquadah, 8), ItemList.Empty_Board_Elite.get(2) - }; + tRecipe2.mInputs = new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Naquadah, 8), + ItemList.Empty_Board_Elite.get(2) }; GT_Recipe.GT_Recipe_Map.sMultiblockChemicalRecipes.mRecipeList.add(tRecipe2); GT_Recipe.GT_Recipe_Map.sMultiblockChemicalRecipes.reInit(); } @@ -616,7 +564,7 @@ public class NaquadahReworkRecipeLoader { null, false, 1 << 30, - new FluidStack[] {Materials.Polybenzimidazole.getMolten(36)}, + new FluidStack[] { Materials.Polybenzimidazole.getMolten(36) }, GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Polybenzimidazole, 2), GT_OreDictUnificator.get(OrePrefixes.foil, Materials.HSSS, 1), GT_Utility.getIntegratedCircuit(1)); @@ -624,9 +572,8 @@ public class NaquadahReworkRecipeLoader { GT_Recipe.GT_Recipe_Map.sAssemblerRecipes.mRecipeList.remove(tRecipe); GT_Recipe tRecipe2 = tRecipe.copy(); tRecipe2.mInputs = new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Polybenzimidazole, 2), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.NaquadahEnriched, 1) - }; + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Polybenzimidazole, 2), + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.NaquadahEnriched, 1) }; GT_Recipe.GT_Recipe_Map.sAssemblerRecipes.mRecipeList.add(tRecipe2); GT_Recipe.GT_Recipe_Map.sAssemblerRecipes.reInit(); } @@ -648,7 +595,7 @@ public class NaquadahReworkRecipeLoader { int[] oreDict = OreDictionary.getOreIDs(input); for (int oreDictID : oreDict) { if ((OreDictionary.getOreName(oreDictID).startsWith("ore") - || OreDictionary.getOreName(oreDictID).startsWith("crushed")) + || OreDictionary.getOreName(oreDictID).startsWith("crushed")) && OreDictionary.getOreName(oreDictID).contains("Naq")) { GT_Recipe tRecipe = recipe.copy(); boolean modified = false; @@ -656,7 +603,8 @@ public class NaquadahReworkRecipeLoader { if (!GT_Utility.isStackValid(tRecipe.mOutputs[i])) continue; if (tRecipe.mOutputs[i].isItemEqual(Materials.Naquadah.getDust(1))) { tRecipe.mOutputs[i] = GT_Utility.copyAmount( - tRecipe.mOutputs[i].stackSize * 2, naquadahEarth.get(OrePrefixes.dust, 1)); + tRecipe.mOutputs[i].stackSize * 2, + naquadahEarth.get(OrePrefixes.dust, 1)); modified = true; } else if (tRecipe.mOutputs[i].isItemEqual(Materials.NaquadahEnriched.getDust(1))) { tRecipe.mOutputs[i] = GT_Utility.copyAmount( @@ -665,7 +613,8 @@ public class NaquadahReworkRecipeLoader { modified = true; } else if (tRecipe.mOutputs[i].isItemEqual(Materials.Naquadria.getDust(1))) { tRecipe.mOutputs[i] = GT_Utility.copyAmount( - tRecipe.mOutputs[i].stackSize * 2, naquadriaEarth.get(OrePrefixes.dust, 1)); + tRecipe.mOutputs[i].stackSize * 2, + naquadriaEarth.get(OrePrefixes.dust, 1)); modified = true; } } @@ -703,7 +652,8 @@ public class NaquadahReworkRecipeLoader { if (!GT_Utility.isStackValid(tRecipe.mOutputs[i])) continue; if (tRecipe.mOutputs[i].isItemEqual(Materials.Naquadah.getDust(1))) { tRecipe.mOutputs[i] = GT_Utility.copyAmount( - tRecipe.mOutputs[i].stackSize * 2, naquadahEarth.get(OrePrefixes.dust, 1)); + tRecipe.mOutputs[i].stackSize * 2, + naquadahEarth.get(OrePrefixes.dust, 1)); modified = true; } else if (tRecipe.mOutputs[i].isItemEqual(Materials.NaquadahEnriched.getDust(1))) { tRecipe.mOutputs[i] = GT_Utility.copyAmount( @@ -712,7 +662,8 @@ public class NaquadahReworkRecipeLoader { modified = true; } else if (tRecipe.mOutputs[i].isItemEqual(Materials.Naquadria.getDust(1))) { tRecipe.mOutputs[i] = GT_Utility.copyAmount( - tRecipe.mOutputs[i].stackSize * 2, naquadriaEarth.get(OrePrefixes.dust, 1)); + tRecipe.mOutputs[i].stackSize * 2, + naquadriaEarth.get(OrePrefixes.dust, 1)); modified = true; } } @@ -750,7 +701,8 @@ public class NaquadahReworkRecipeLoader { if (!GT_Utility.isStackValid(tRecipe.mOutputs[i])) continue; if (tRecipe.mOutputs[i].isItemEqual(Materials.Naquadah.getDust(1))) { tRecipe.mOutputs[i] = GT_Utility.copyAmount( - tRecipe.mOutputs[i].stackSize * 2, naquadahEarth.get(OrePrefixes.dust, 1)); + tRecipe.mOutputs[i].stackSize * 2, + naquadahEarth.get(OrePrefixes.dust, 1)); modified = true; } else if (tRecipe.mOutputs[i].isItemEqual(Materials.NaquadahEnriched.getDust(1))) { tRecipe.mOutputs[i] = GT_Utility.copyAmount( @@ -759,7 +711,8 @@ public class NaquadahReworkRecipeLoader { modified = true; } else if (tRecipe.mOutputs[i].isItemEqual(Materials.Naquadria.getDust(1))) { tRecipe.mOutputs[i] = GT_Utility.copyAmount( - tRecipe.mOutputs[i].stackSize * 2, naquadriaEarth.get(OrePrefixes.dust, 1)); + tRecipe.mOutputs[i].stackSize * 2, + naquadriaEarth.get(OrePrefixes.dust, 1)); modified = true; } } @@ -796,7 +749,8 @@ public class NaquadahReworkRecipeLoader { if (!GT_Utility.isStackValid(tRecipe.mOutputs[i])) continue; if (tRecipe.mOutputs[i].isItemEqual(Materials.Naquadah.getDustTiny(1))) { tRecipe.mOutputs[i] = GT_Utility.copyAmount( - tRecipe.mOutputs[i].stackSize * 2L, naquadahEarth.get(OrePrefixes.dustTiny, 1)); + tRecipe.mOutputs[i].stackSize * 2L, + naquadahEarth.get(OrePrefixes.dustTiny, 1)); modified = true; } } @@ -804,69 +758,69 @@ public class NaquadahReworkRecipeLoader { reAdd.add(tRecipe); remove.add(recipe); } - } else - for (int oreDictID : oreDict) { - if (OreDictionary.getOreName(oreDictID).startsWith("dustPureNaq") - || OreDictionary.getOreName(oreDictID).startsWith("dustImpureNaq") - || OreDictionary.getOreName(oreDictID).startsWith("dustSpace") - || OreDictionary.getOreName(oreDictID).startsWith("dustNaq")) { - GT_Recipe tRecipe = recipe.copy(); - boolean modified = false; - for (int i = 0; i < tRecipe.mOutputs.length; i++) { - if (!GT_Utility.isStackValid(tRecipe.mOutputs[i])) continue; - if (tRecipe.mOutputs[i].isItemEqual(Materials.Naquadah.getDustTiny(1))) { - tRecipe.mOutputs[i] = GT_Utility.copyAmount( - tRecipe.mOutputs[i].stackSize * 2, - naquadahEarth.get(OrePrefixes.dustTiny, 1)); - modified = true; - } else if (tRecipe.mOutputs[i].isItemEqual(Materials.NaquadahEnriched.getDustTiny(1))) { - tRecipe.mOutputs[i] = GT_Utility.copyAmount( - tRecipe.mOutputs[i].stackSize * 2, - enrichedNaquadahEarth.get(OrePrefixes.dustTiny, 1)); - modified = true; - } else if (tRecipe.mOutputs[i].isItemEqual(Materials.Naquadria.getDustTiny(1))) { - tRecipe.mOutputs[i] = GT_Utility.copyAmount( - tRecipe.mOutputs[i].stackSize * 2, - naquadriaEarth.get(OrePrefixes.dustTiny, 1)); - modified = true; - } else if (tRecipe.mOutputs[i].isItemEqual(Materials.Naquadah.getDust(1))) { - tRecipe.mOutputs[i] = GT_Utility.copyAmount( - tRecipe.mOutputs[i].stackSize * 2, naquadahEarth.get(OrePrefixes.dust, 1)); - modified = true; - } else if (tRecipe.mOutputs[i].isItemEqual(Materials.NaquadahEnriched.getDust(1))) { - tRecipe.mOutputs[i] = GT_Utility.copyAmount( - tRecipe.mOutputs[i].stackSize * 2, - enrichedNaquadahEarth.get(OrePrefixes.dust, 1)); - modified = true; - } else if (tRecipe.mOutputs[i].isItemEqual(Materials.Naquadria.getDust(1))) { - tRecipe.mOutputs[i] = GT_Utility.copyAmount( - tRecipe.mOutputs[i].stackSize * 2, naquadriaEarth.get(OrePrefixes.dust, 1)); - modified = true; - } else if (tRecipe.mOutputs[i].isItemEqual(Materials.Naquadah.getDustSmall(1))) { - tRecipe.mOutputs[i] = GT_Utility.copyAmount( - tRecipe.mOutputs[i].stackSize * 2, - naquadahEarth.get(OrePrefixes.dustSmall, 1)); - modified = true; - } else if (tRecipe.mOutputs[i].isItemEqual( - Materials.NaquadahEnriched.getDustSmall(1))) { - tRecipe.mOutputs[i] = GT_Utility.copyAmount( - tRecipe.mOutputs[i].stackSize * 2, - enrichedNaquadahEarth.get(OrePrefixes.dustSmall, 1)); - modified = true; - } else if (tRecipe.mOutputs[i].isItemEqual(Materials.Naquadria.getDustSmall(1))) { - tRecipe.mOutputs[i] = GT_Utility.copyAmount( - tRecipe.mOutputs[i].stackSize * 2, - naquadriaEarth.get(OrePrefixes.dustSmall, 1)); - modified = true; - } - } - if (modified) { - reAdd.add(tRecipe); - remove.add(recipe); + } else for (int oreDictID : oreDict) { + if (OreDictionary.getOreName(oreDictID).startsWith("dustPureNaq") + || OreDictionary.getOreName(oreDictID).startsWith("dustImpureNaq") + || OreDictionary.getOreName(oreDictID).startsWith("dustSpace") + || OreDictionary.getOreName(oreDictID).startsWith("dustNaq")) { + GT_Recipe tRecipe = recipe.copy(); + boolean modified = false; + for (int i = 0; i < tRecipe.mOutputs.length; i++) { + if (!GT_Utility.isStackValid(tRecipe.mOutputs[i])) continue; + if (tRecipe.mOutputs[i].isItemEqual(Materials.Naquadah.getDustTiny(1))) { + tRecipe.mOutputs[i] = GT_Utility.copyAmount( + tRecipe.mOutputs[i].stackSize * 2, + naquadahEarth.get(OrePrefixes.dustTiny, 1)); + modified = true; + } else if (tRecipe.mOutputs[i].isItemEqual(Materials.NaquadahEnriched.getDustTiny(1))) { + tRecipe.mOutputs[i] = GT_Utility.copyAmount( + tRecipe.mOutputs[i].stackSize * 2, + enrichedNaquadahEarth.get(OrePrefixes.dustTiny, 1)); + modified = true; + } else if (tRecipe.mOutputs[i].isItemEqual(Materials.Naquadria.getDustTiny(1))) { + tRecipe.mOutputs[i] = GT_Utility.copyAmount( + tRecipe.mOutputs[i].stackSize * 2, + naquadriaEarth.get(OrePrefixes.dustTiny, 1)); + modified = true; + } else if (tRecipe.mOutputs[i].isItemEqual(Materials.Naquadah.getDust(1))) { + tRecipe.mOutputs[i] = GT_Utility.copyAmount( + tRecipe.mOutputs[i].stackSize * 2, + naquadahEarth.get(OrePrefixes.dust, 1)); + modified = true; + } else if (tRecipe.mOutputs[i].isItemEqual(Materials.NaquadahEnriched.getDust(1))) { + tRecipe.mOutputs[i] = GT_Utility.copyAmount( + tRecipe.mOutputs[i].stackSize * 2, + enrichedNaquadahEarth.get(OrePrefixes.dust, 1)); + modified = true; + } else if (tRecipe.mOutputs[i].isItemEqual(Materials.Naquadria.getDust(1))) { + tRecipe.mOutputs[i] = GT_Utility.copyAmount( + tRecipe.mOutputs[i].stackSize * 2, + naquadriaEarth.get(OrePrefixes.dust, 1)); + modified = true; + } else if (tRecipe.mOutputs[i].isItemEqual(Materials.Naquadah.getDustSmall(1))) { + tRecipe.mOutputs[i] = GT_Utility.copyAmount( + tRecipe.mOutputs[i].stackSize * 2, + naquadahEarth.get(OrePrefixes.dustSmall, 1)); + modified = true; + } else if (tRecipe.mOutputs[i].isItemEqual(Materials.NaquadahEnriched.getDustSmall(1))) { + tRecipe.mOutputs[i] = GT_Utility.copyAmount( + tRecipe.mOutputs[i].stackSize * 2, + enrichedNaquadahEarth.get(OrePrefixes.dustSmall, 1)); + modified = true; + } else if (tRecipe.mOutputs[i].isItemEqual(Materials.Naquadria.getDustSmall(1))) { + tRecipe.mOutputs[i] = GT_Utility.copyAmount( + tRecipe.mOutputs[i].stackSize * 2, + naquadriaEarth.get(OrePrefixes.dustSmall, 1)); + modified = true; } - break; } + if (modified) { + reAdd.add(tRecipe); + remove.add(recipe); + } + break; } + } } } GT_Recipe.GT_Recipe_Map.sCentrifugeRecipes.mRecipeList.removeAll(remove); @@ -894,7 +848,8 @@ public class NaquadahReworkRecipeLoader { if (!GT_Utility.isStackValid(tRecipe.mOutputs[i])) continue; if (tRecipe.mOutputs[i].isItemEqual(Materials.Naquadah.getDust(1))) { tRecipe.mOutputs[i] = GT_Utility.copyAmount( - tRecipe.mOutputs[i].stackSize * 2, naquadahEarth.get(OrePrefixes.dust, 1)); + tRecipe.mOutputs[i].stackSize * 2, + naquadahEarth.get(OrePrefixes.dust, 1)); modified = true; } else if (tRecipe.mOutputs[i].isItemEqual(Materials.NaquadahEnriched.getDust(1))) { tRecipe.mOutputs[i] = GT_Utility.copyAmount( @@ -903,7 +858,8 @@ public class NaquadahReworkRecipeLoader { modified = true; } else if (tRecipe.mOutputs[i].isItemEqual(Materials.Naquadria.getDust(1))) { tRecipe.mOutputs[i] = GT_Utility.copyAmount( - tRecipe.mOutputs[i].stackSize * 2, naquadriaEarth.get(OrePrefixes.dust, 1)); + tRecipe.mOutputs[i].stackSize * 2, + naquadriaEarth.get(OrePrefixes.dust, 1)); modified = true; } } @@ -1020,11 +976,11 @@ public class NaquadahReworkRecipeLoader { if (LoadedList.GTPP) { // For Multi Centrifuge // Blame alk. She made some shit in it, NEI will break down if anyone modify the hash list directly. - // GTPP_Recipe.GTPP_Recipe_Map.sMultiblockCentrifugeRecipes_GT.mRecipeList.clear(); - // RecipeGen_MultisUsingFluidInsteadOfCells.generateRecipesNotUsingCells( - // GT_Recipe.GT_Recipe_Map.sCentrifugeRecipes, - // GTPP_Recipe.GTPP_Recipe_Map.sMultiblockCentrifugeRecipes_GT); - // GTPP_Recipe.GTPP_Recipe_Map.sMultiblockCentrifugeRecipes_GT.reInit(); + // GTPP_Recipe.GTPP_Recipe_Map.sMultiblockCentrifugeRecipes_GT.mRecipeList.clear(); + // RecipeGen_MultisUsingFluidInsteadOfCells.generateRecipesNotUsingCells( + // GT_Recipe.GT_Recipe_Map.sCentrifugeRecipes, + // GTPP_Recipe.GTPP_Recipe_Map.sMultiblockCentrifugeRecipes_GT); + // GTPP_Recipe.GTPP_Recipe_Map.sMultiblockCentrifugeRecipes_GT.reInit(); // For Simple Washer for (GT_Recipe recipe : GTPP_Recipe.GTPP_Recipe_Map.sSimpleWasherRecipes.mRecipeList) { @@ -1039,7 +995,8 @@ public class NaquadahReworkRecipeLoader { if (!GT_Utility.isStackValid(tRecipe.mOutputs[i])) continue; if (tRecipe.mOutputs[i].isItemEqual(Materials.Naquadah.getDust(1))) { tRecipe.mOutputs[i] = GT_Utility.copyAmount( - tRecipe.mOutputs[i].stackSize, naquadahEarth.get(OrePrefixes.dust, 1)); + tRecipe.mOutputs[i].stackSize, + naquadahEarth.get(OrePrefixes.dust, 1)); modified = true; } else if (tRecipe.mOutputs[i].isItemEqual(Materials.NaquadahEnriched.getDust(1))) { tRecipe.mOutputs[i] = GT_Utility.copyAmount( @@ -1048,7 +1005,8 @@ public class NaquadahReworkRecipeLoader { modified = true; } else if (tRecipe.mOutputs[i].isItemEqual(Materials.Naquadria.getDust(1))) { tRecipe.mOutputs[i] = GT_Utility.copyAmount( - tRecipe.mOutputs[i].stackSize, naquadriaEarth.get(OrePrefixes.dust, 1)); + tRecipe.mOutputs[i].stackSize, + naquadriaEarth.get(OrePrefixes.dust, 1)); modified = true; } } @@ -1087,15 +1045,18 @@ public class NaquadahReworkRecipeLoader { if (!GT_Utility.isStackValid(tRecipe.mOutputs[i])) continue; if (tRecipe.mOutputs[i].isItemEqual(Materials.Naquadah.getDust(1))) { tRecipe.mOutputs[i] = GT_Utility.copyAmount( - tRecipe.mOutputs[i].stackSize, naquadahEarth.get(OrePrefixes.dust, 1)); + tRecipe.mOutputs[i].stackSize, + naquadahEarth.get(OrePrefixes.dust, 1)); modified = true; } else if (tRecipe.mOutputs[i].isItemEqual(Materials.NaquadahEnriched.getDust(1))) { tRecipe.mOutputs[i] = GT_Utility.copyAmount( - tRecipe.mOutputs[i].stackSize, enrichedNaquadahEarth.get(OrePrefixes.dust, 1)); + tRecipe.mOutputs[i].stackSize, + enrichedNaquadahEarth.get(OrePrefixes.dust, 1)); modified = true; } else if (tRecipe.mOutputs[i].isItemEqual(Materials.Naquadria.getDust(1))) { tRecipe.mOutputs[i] = GT_Utility.copyAmount( - tRecipe.mOutputs[i].stackSize, naquadriaEarth.get(OrePrefixes.dust, 1)); + tRecipe.mOutputs[i].stackSize, + naquadriaEarth.get(OrePrefixes.dust, 1)); modified = true; } } @@ -1137,25 +1098,16 @@ public class NaquadahReworkRecipeLoader { // I use and copy some private methods in Bartworks because his system runs well. // Bartworks is under MIT License /* - * Copyright (c) 2018-2020 bartimaeusnek - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. + * Copyright (c) 2018-2020 bartimaeusnek Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, + * sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY + * KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A + * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY + * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR + * IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ public static void replaceInCraftTable(Object obj) { @@ -1244,8 +1196,7 @@ public class NaquadahReworkRecipeLoader { try { isOk = (boolean) recipeCheck.invoke(BartObj, input, Materials.Naquadah); - } catch (InvocationTargetException | IllegalAccessException ignored) { - } + } catch (InvocationTargetException | IllegalAccessException ignored) {} if (isOk) return; try { @@ -1260,8 +1211,7 @@ public class NaquadahReworkRecipeLoader { try { isOk = (boolean) recipeCheck.invoke(BartObj, input, Materials.NaquadahEnriched); - } catch (InvocationTargetException | IllegalAccessException ignored) { - } + } catch (InvocationTargetException | IllegalAccessException ignored) {} if (isOk) return; try { @@ -1276,8 +1226,7 @@ public class NaquadahReworkRecipeLoader { try { isOk = (boolean) recipeCheck.invoke(BartObj, input, Materials.Naquadria); - } catch (InvocationTargetException | IllegalAccessException ignored) { - } + } catch (InvocationTargetException | IllegalAccessException ignored) {} if (isOk) return; try { diff --git a/src/main/java/goodgenerator/loader/NeutronActivatorLoader.java b/src/main/java/goodgenerator/loader/NeutronActivatorLoader.java index 4b8e7bfd9a..881904ab3f 100644 --- a/src/main/java/goodgenerator/loader/NeutronActivatorLoader.java +++ b/src/main/java/goodgenerator/loader/NeutronActivatorLoader.java @@ -2,42 +2,42 @@ package goodgenerator.loader; import static goodgenerator.items.MyMaterial.*; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidStack; + import goodgenerator.util.MyRecipeAdder; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidStack; public class NeutronActivatorLoader { + public static void NARecipeLoad() { MyRecipeAdder.instance.addNeutronActivatorRecipe( - new FluidStack[] {thoriumBasedLiquidFuelExcited.getFluidOrGas(200)}, + new FluidStack[] { thoriumBasedLiquidFuelExcited.getFluidOrGas(200) }, null, - new FluidStack[] {thoriumBasedLiquidFuelDepleted.getFluidOrGas(200)}, + new FluidStack[] { thoriumBasedLiquidFuelDepleted.getFluidOrGas(200) }, null, 10000, 700, 500); MyRecipeAdder.instance.addNeutronActivatorRecipe( - new FluidStack[] {uraniumBasedLiquidFuel.getFluidOrGas(100)}, + new FluidStack[] { uraniumBasedLiquidFuel.getFluidOrGas(100) }, new ItemStack[] { - GT_Utility.copyAmount(0, GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Tungsten, 1)) - }, - new FluidStack[] {uraniumBasedLiquidFuelExcited.getFluidOrGas(100)}, + GT_Utility.copyAmount(0, GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Tungsten, 1)) }, + new FluidStack[] { uraniumBasedLiquidFuelExcited.getFluidOrGas(100) }, null, 80, 550, 450); MyRecipeAdder.instance.addNeutronActivatorRecipe( - new FluidStack[] {plutoniumBasedLiquidFuel.getFluidOrGas(100)}, + new FluidStack[] { plutoniumBasedLiquidFuel.getFluidOrGas(100) }, new ItemStack[] { - GT_Utility.copyAmount(0, GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Tritanium, 1)) - }, - new FluidStack[] {plutoniumBasedLiquidFuelExcited.getFluidOrGas(100)}, + GT_Utility.copyAmount(0, GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Tritanium, 1)) }, + new FluidStack[] { plutoniumBasedLiquidFuelExcited.getFluidOrGas(100) }, null, 80, 600, diff --git a/src/main/java/goodgenerator/loader/RecipeLoader.java b/src/main/java/goodgenerator/loader/RecipeLoader.java index bd6545ff59..3998f53e45 100644 --- a/src/main/java/goodgenerator/loader/RecipeLoader.java +++ b/src/main/java/goodgenerator/loader/RecipeLoader.java @@ -1,6 +1,12 @@ package goodgenerator.loader; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; + import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader; + import goodgenerator.crossmod.LoadedList; import goodgenerator.items.MyMaterial; import goodgenerator.util.CrackRecipeAdder; @@ -11,32 +17,25 @@ import gregtech.api.enums.*; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fluids.FluidStack; public class RecipeLoader { + public static void RecipeLoad() { // Radiation Protection Plate GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Iridium, 8L), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.NaquadahAlloy, 8L), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Iridium, 8L), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.NaquadahAlloy, 8L), + GT_Utility.getIntegratedCircuit(1) }, Materials.Lead.getMolten(1152), ItemRefer.Radiation_Protection_Plate.get(1), 400, 1920); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Lanthanum, 4L), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.NaquadahAlloy, 8L), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Lanthanum, 4L), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.NaquadahAlloy, 8L), + GT_Utility.getIntegratedCircuit(1) }, Materials.Lead.getMolten(1152), ItemRefer.Radiation_Protection_Plate.get(1), 400, @@ -50,34 +49,25 @@ public class RecipeLoader { GT_Values.RA.addAssemblylineRecipe( ItemList.Generator_Naquadah_Mark_III.get(1).copy(), 100000, - new Object[] { - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Adamantium, 8), - ItemRefer.Radiation_Protection_Plate.get(16), - ItemList.Field_Generator_ZPM.get(2), - ItemList.Electric_Pump_ZPM.get(8), - new Object[] {OrePrefixes.circuit.get(Materials.Superconductor), 4}, - GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.SuperconductorLuV, 8), - GT_OreDictUnificator.get(OrePrefixes.pipeHuge, Materials.Naquadah, 4), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.NaquadahAlloy, 8), - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Osmium, 16) - }, - new FluidStack[] { - Materials.Trinium.getMolten(576), - new FluidStack(solderIndalloy, 4608), - Materials.Lubricant.getFluid(8000) - }, + new Object[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Adamantium, 8), + ItemRefer.Radiation_Protection_Plate.get(16), ItemList.Field_Generator_ZPM.get(2), + ItemList.Electric_Pump_ZPM.get(8), + new Object[] { OrePrefixes.circuit.get(Materials.Superconductor), 4 }, + GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.SuperconductorLuV, 8), + GT_OreDictUnificator.get(OrePrefixes.pipeHuge, Materials.Naquadah, 4), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.NaquadahAlloy, 8), + GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Osmium, 16) }, + new FluidStack[] { Materials.Trinium.getMolten(576), new FluidStack(solderIndalloy, 4608), + Materials.Lubricant.getFluid(8000) }, ItemRefer.Large_Naquadah_Reactor.get(1), 16200, 122880); // LNR Casing GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemRefer.Radiation_Protection_Plate.get(6), - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Europium, 1), - ItemList.Field_Generator_MV.get(1), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { ItemRefer.Radiation_Protection_Plate.get(6), + GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Europium, 1), + ItemList.Field_Generator_MV.get(1), GT_Utility.getIntegratedCircuit(1) }, null, ItemRefer.Field_Restriction_Casing.get(1), 400, @@ -85,11 +75,9 @@ public class RecipeLoader { // LNR Frame GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.NaquadahAlloy, 8), - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.HSSE, 4), - GT_Utility.getIntegratedCircuit(24) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.NaquadahAlloy, 8), + GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.HSSE, 4), + GT_Utility.getIntegratedCircuit(24) }, null, ItemRefer.Radiation_Proof_Steel_Frame_Box.get(1), 320, @@ -97,11 +85,9 @@ public class RecipeLoader { // Uranium Liquid Fuel Process Line GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - MyMaterial.graphiteUraniumMixture.get(OrePrefixes.dust, 4), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.TungstenCarbide, 2), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { MyMaterial.graphiteUraniumMixture.get(OrePrefixes.dust, 4), + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.TungstenCarbide, 2), + GT_Utility.getIntegratedCircuit(1) }, null, ItemRefer.Wrapped_Uranium_Ingot.get(1), 1400, @@ -114,7 +100,10 @@ public class RecipeLoader { GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.TungstenCarbide, 8)); GT_Values.RA.addCompressorRecipe( - ItemRefer.High_Density_Uranium_Nugget.get(9), ItemRefer.High_Density_Uranium.get(1), 600, 480); + ItemRefer.High_Density_Uranium_Nugget.get(9), + ItemRefer.High_Density_Uranium.get(1), + 600, + 480); GT_Values.RA.addMixerRecipe( ItemRefer.High_Density_Uranium.get(1), @@ -137,11 +126,9 @@ public class RecipeLoader { // Thorium Liquid Process Line GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - MyMaterial.uraniumCarbideThoriumMixture.get(OrePrefixes.dust, 64), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.TungstenSteel, 4), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { MyMaterial.uraniumCarbideThoriumMixture.get(OrePrefixes.dust, 64), + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.TungstenSteel, 4), + GT_Utility.getIntegratedCircuit(1) }, null, ItemRefer.Wrapped_Thorium_Ingot.get(1), 300, @@ -154,7 +141,10 @@ public class RecipeLoader { GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.TungstenSteel, 8)); GT_Values.RA.addCompressorRecipe( - ItemRefer.High_Density_Thorium_Nugget.get(9), ItemRefer.High_Density_Thorium.get(1), 200, 120); + ItemRefer.High_Density_Thorium_Nugget.get(9), + ItemRefer.High_Density_Thorium.get(1), + 200, + 120); GT_Values.RA.addMixerRecipe( ItemRefer.High_Density_Thorium.get(1), @@ -180,11 +170,9 @@ public class RecipeLoader { // Liquid Plutonium Process Line GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - MyMaterial.plutoniumOxideUraniumMixture.get(OrePrefixes.dust, 8), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.HSSS, 4), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { MyMaterial.plutoniumOxideUraniumMixture.get(OrePrefixes.dust, 8), + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.HSSS, 4), + GT_Utility.getIntegratedCircuit(1) }, null, ItemRefer.Wrapped_Plutonium_Ingot.get(1), 1800, @@ -197,7 +185,10 @@ public class RecipeLoader { GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.HSSS, 8)); GT_Values.RA.addCompressorRecipe( - ItemRefer.High_Density_Plutonium_Nugget.get(9), ItemRefer.High_Density_Plutonium.get(1), 1200, 120); + ItemRefer.High_Density_Plutonium_Nugget.get(9), + ItemRefer.High_Density_Plutonium.get(1), + 1200, + 120); GT_Values.RA.addMixerRecipe( ItemRefer.High_Density_Plutonium.get(1), @@ -222,13 +213,10 @@ public class RecipeLoader { // Th-232 GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sugar, 24), - MyMaterial.vanadiumPentoxide.get(OrePrefixes.dust, 0), - GT_Utility.getIntegratedCircuit(1) - }, - new FluidStack[] {FluidRegistry.getFluidStack("nitricacid", 6000)}, - new FluidStack[] {MyMaterial.oxalate.getFluidOrGas(3000), Materials.NitricOxide.getGas(6000)}, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sugar, 24), + MyMaterial.vanadiumPentoxide.get(OrePrefixes.dust, 0), GT_Utility.getIntegratedCircuit(1) }, + new FluidStack[] { FluidRegistry.getFluidStack("nitricacid", 6000) }, + new FluidStack[] { MyMaterial.oxalate.getFluidOrGas(3000), Materials.NitricOxide.getGas(6000) }, null, 600, 120); @@ -247,14 +235,11 @@ public class RecipeLoader { // Th + 8HNO3 =HF= Th(NO3)4 + 4NO2 + 4H2O GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] { - Materials.Thorium.getDust(1), - }, - new FluidStack[] { - Materials.HydrofluoricAcid.getFluid(100), FluidRegistry.getFluidStack("nitricacid", 8000) - }, - new FluidStack[] {MyMaterial.thoriumNitrate.getFluidOrGas(1000), Materials.NitrogenDioxide.getGas(4000) - }, + new ItemStack[] { Materials.Thorium.getDust(1), }, + new FluidStack[] { Materials.HydrofluoricAcid.getFluid(100), + FluidRegistry.getFluidStack("nitricacid", 8000) }, + new FluidStack[] { MyMaterial.thoriumNitrate.getFluidOrGas(1000), + Materials.NitrogenDioxide.getGas(4000) }, null, 40, 120); @@ -338,18 +323,12 @@ public class RecipeLoader { 2500); // Atomic Separation Catalyst - ItemStack[] mat1 = new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Blaze, 32), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Firestone, 4) - }; - ItemStack[] mat2 = new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Draconium, 4), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Quantium, 4), - }; - ItemStack[] mat3 = new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ardite, 4), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Manyullyn, 4) - }; + ItemStack[] mat1 = new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Blaze, 32), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Firestone, 4) }; + ItemStack[] mat2 = new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Draconium, 4), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Quantium, 4), }; + ItemStack[] mat3 = new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ardite, 4), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Manyullyn, 4) }; for (ItemStack m1 : mat1) { for (ItemStack m2 : mat2) { @@ -395,14 +374,9 @@ public class RecipeLoader { CrackRecipeAdder.crackerAdder( MyMaterial.naquadahGas.getFluidOrGas(1000), MyMaterial.atomicSeparationCatalyst.getMolten(4), - new FluidStack[] { - Materials.Helium.getGas(300), - WerkstoffLoader.Neon.getFluidOrGas(50), - Materials.Argon.getGas(80), - WerkstoffLoader.Krypton.getFluidOrGas(20), - WerkstoffLoader.Xenon.getFluidOrGas(40), - Materials.Radon.getGas(14000) - }, + new FluidStack[] { Materials.Helium.getGas(300), WerkstoffLoader.Neon.getFluidOrGas(50), + Materials.Argon.getGas(80), WerkstoffLoader.Krypton.getFluidOrGas(20), + WerkstoffLoader.Xenon.getFluidOrGas(40), Materials.Radon.getGas(14000) }, GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Naquadah, 1), 6, 4020, @@ -411,14 +385,9 @@ public class RecipeLoader { CrackRecipeAdder.crackerAdder( MyMaterial.lightNaquadahFuel.getFluidOrGas(1000), MyMaterial.atomicSeparationCatalyst.getMolten(4), - new FluidStack[] { - Materials.Radon.getGas(1400), - MyMaterial.naquadahGas.getFluidOrGas(400), - Materials.Uranium.getMolten(648), - MyMaterial.heavyNaquadahFuel.getFluidOrGas(280), - Materials.Plutonium.getMolten(576), - MyMaterial.naquadahAsphalt.getFluidOrGas(140) - }, + new FluidStack[] { Materials.Radon.getGas(1400), MyMaterial.naquadahGas.getFluidOrGas(400), + Materials.Uranium.getMolten(648), MyMaterial.heavyNaquadahFuel.getFluidOrGas(280), + Materials.Plutonium.getMolten(576), MyMaterial.naquadahAsphalt.getFluidOrGas(140) }, GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Uranium235, 1), 6, 4020, @@ -427,14 +396,9 @@ public class RecipeLoader { CrackRecipeAdder.crackerAdder( MyMaterial.heavyNaquadahFuel.getFluidOrGas(1000), MyMaterial.atomicSeparationCatalyst.getMolten(6), - new FluidStack[] { - Materials.Radon.getGas(1000), - MyMaterial.naquadahGas.getFluidOrGas(450), - MyMaterial.lightNaquadahFuel.getFluidOrGas(560), - Materials.Uranium.getMolten(720), - Materials.Lutetium.getMolten(648), - MyMaterial.naquadahAsphalt.getFluidOrGas(240) - }, + new FluidStack[] { Materials.Radon.getGas(1000), MyMaterial.naquadahGas.getFluidOrGas(450), + MyMaterial.lightNaquadahFuel.getFluidOrGas(560), Materials.Uranium.getMolten(720), + Materials.Lutetium.getMolten(648), MyMaterial.naquadahAsphalt.getFluidOrGas(240) }, GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Plutonium, 1), 6, 4020, @@ -443,14 +407,9 @@ public class RecipeLoader { CrackRecipeAdder.crackerAdder( MyMaterial.naquadahAsphalt.getFluidOrGas(1000), MyMaterial.atomicSeparationCatalyst.getMolten(12), - new FluidStack[] { - MyMaterial.lightNaquadahFuel.getFluidOrGas(600), - Materials.Uranium.getMolten(1152), - Materials.Thorium.getMolten(864), - Materials.Plutonium.getMolten(792), - Materials.Thulium.getMolten(216), - MyMaterial.heavyNaquadahFuel.getFluidOrGas(350) - }, + new FluidStack[] { MyMaterial.lightNaquadahFuel.getFluidOrGas(600), Materials.Uranium.getMolten(1152), + Materials.Thorium.getMolten(864), Materials.Plutonium.getMolten(792), + Materials.Thulium.getMolten(216), MyMaterial.heavyNaquadahFuel.getFluidOrGas(350) }, GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Naquadria, 1), 6, 4020, @@ -458,9 +417,9 @@ public class RecipeLoader { // 2C2H6O =H2SO4= C4H10O + H2O GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] {GT_Utility.getIntegratedCircuit(2)}, - new FluidStack[] {Materials.Ethanol.getFluid(1000), Materials.SulfuricAcid.getFluid(1000)}, - new FluidStack[] {MyMaterial.ether.getFluidOrGas(500), Materials.DilutedSulfuricAcid.getFluid(1500)}, + new ItemStack[] { GT_Utility.getIntegratedCircuit(2) }, + new FluidStack[] { Materials.Ethanol.getFluid(1000), Materials.SulfuricAcid.getFluid(1000) }, + new FluidStack[] { MyMaterial.ether.getFluidOrGas(500), Materials.DilutedSulfuricAcid.getFluid(1500) }, null, 510, 120); @@ -481,62 +440,49 @@ public class RecipeLoader { // Sb + 3Cl = SbCl3 GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] { - GT_Utility.getIntegratedCircuit(1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Antimony, 1), - }, - new FluidStack[] {MyMaterial.ether.getFluidOrGas(1000), Materials.Chlorine.getGas(3000)}, - new FluidStack[] {MyMaterial.antimonyTrichloride.getFluidOrGas(1000)}, + new ItemStack[] { GT_Utility.getIntegratedCircuit(1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Antimony, 1), }, + new FluidStack[] { MyMaterial.ether.getFluidOrGas(1000), Materials.Chlorine.getGas(3000) }, + new FluidStack[] { MyMaterial.antimonyTrichloride.getFluidOrGas(1000) }, null, 60, 30); // SbCl3 + 2Cl = SbCl5 GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] { - GT_Utility.getIntegratedCircuit(1), - }, - new FluidStack[] {MyMaterial.antimonyTrichloride.getFluidOrGas(1000), Materials.Chlorine.getGas(2000)}, - new FluidStack[] {MyMaterial.antimonyPentachlorideSolution.getFluidOrGas(1000)}, + new ItemStack[] { GT_Utility.getIntegratedCircuit(1), }, + new FluidStack[] { MyMaterial.antimonyTrichloride.getFluidOrGas(1000), + Materials.Chlorine.getGas(2000) }, + new FluidStack[] { MyMaterial.antimonyPentachlorideSolution.getFluidOrGas(1000) }, null, 180, 480); GT_Values.RA.addUniversalDistillationRecipe( MyMaterial.antimonyPentachlorideSolution.getFluidOrGas(1000), - new FluidStack[] { - MyMaterial.ether.getFluidOrGas(1000), MyMaterial.antimonyPentachloride.getFluidOrGas(1000) - }, + new FluidStack[] { MyMaterial.ether.getFluidOrGas(1000), + MyMaterial.antimonyPentachloride.getFluidOrGas(1000) }, null, 600, 120); // SbCl5 + 5HF = SbF5 + 5HCl GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] { - GT_Utility.getIntegratedCircuit(1), - }, - new FluidStack[] { - MyMaterial.antimonyPentachloride.getFluidOrGas(1000), Materials.HydrofluoricAcid.getFluid(5000) - }, - new FluidStack[] { - MyMaterial.antimonyPentafluoride.getFluidOrGas(1000), Materials.HydrochloricAcid.getFluid(5000) - }, + new ItemStack[] { GT_Utility.getIntegratedCircuit(1), }, + new FluidStack[] { MyMaterial.antimonyPentachloride.getFluidOrGas(1000), + Materials.HydrofluoricAcid.getFluid(5000) }, + new FluidStack[] { MyMaterial.antimonyPentafluoride.getFluidOrGas(1000), + Materials.HydrochloricAcid.getFluid(5000) }, null, 420, 30); // SbH5 + HF = HSbF6 GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] { - GT_Utility.getIntegratedCircuit(1), - }, - new FluidStack[] { - MyMaterial.antimonyPentafluoride.getFluidOrGas(1000), Materials.HydrofluoricAcid.getFluid(1000) - }, - new FluidStack[] { - MyMaterial.fluoroantimonicAcid.getFluidOrGas(1000), - }, + new ItemStack[] { GT_Utility.getIntegratedCircuit(1), }, + new FluidStack[] { MyMaterial.antimonyPentafluoride.getFluidOrGas(1000), + Materials.HydrofluoricAcid.getFluid(1000) }, + new FluidStack[] { MyMaterial.fluoroantimonicAcid.getFluidOrGas(1000), }, null, 840, 2040); @@ -553,32 +499,20 @@ public class RecipeLoader { 3400); GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] { - GT_Utility.getIntegratedCircuit(3), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Quicklime, 8) - }, - new FluidStack[] { - MyMaterial.acidNaquadahEmulsion.getFluidOrGas(1000), - }, - new FluidStack[] { - MyMaterial.naquadahEmulsion.getFluidOrGas(1000), - }, - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.AntimonyTrioxide, 1), - WerkstoffLoader.Fluorspar.get(OrePrefixes.dust, 4) - }, + new ItemStack[] { GT_Utility.getIntegratedCircuit(3), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Quicklime, 8) }, + new FluidStack[] { MyMaterial.acidNaquadahEmulsion.getFluidOrGas(1000), }, + new FluidStack[] { MyMaterial.naquadahEmulsion.getFluidOrGas(1000), }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.AntimonyTrioxide, 1), + WerkstoffLoader.Fluorspar.get(OrePrefixes.dust, 4) }, 240, 30); GT_Values.RA.addUniversalDistillationRecipe( MyMaterial.naquadahSolution.getFluidOrGas(20), - new FluidStack[] { - MyMaterial.naquadahAsphalt.getFluidOrGas(2), - MyMaterial.heavyNaquadahFuel.getFluidOrGas(5), - MyMaterial.lightNaquadahFuel.getFluidOrGas(10), - FluidRegistry.getFluidStack("water", 10), - MyMaterial.naquadahGas.getFluidOrGas(60) - }, + new FluidStack[] { MyMaterial.naquadahAsphalt.getFluidOrGas(2), + MyMaterial.heavyNaquadahFuel.getFluidOrGas(5), MyMaterial.lightNaquadahFuel.getFluidOrGas(10), + FluidRegistry.getFluidStack("water", 10), MyMaterial.naquadahGas.getFluidOrGas(60) }, null, 20, 2040); @@ -594,15 +528,12 @@ public class RecipeLoader { 320000000); GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] { - GT_Utility.getIntegratedCircuit(1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.NetherStar, 4), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.ElectrumFlux, 32), - }, - new FluidStack[] { - MyMaterial.naquadahBasedFuelMkI.getFluidOrGas(100), MyMaterial.naquadahGas.getFluidOrGas(1500) - }, - new FluidStack[] {MyMaterial.naquadahBasedFuelMkII.getFluidOrGas(100)}, + new ItemStack[] { GT_Utility.getIntegratedCircuit(1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.NetherStar, 4), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.ElectrumFlux, 32), }, + new FluidStack[] { MyMaterial.naquadahBasedFuelMkI.getFluidOrGas(100), + MyMaterial.naquadahGas.getFluidOrGas(1500) }, + new FluidStack[] { MyMaterial.naquadahBasedFuelMkII.getFluidOrGas(100) }, null, 500, 525000); @@ -621,24 +552,15 @@ public class RecipeLoader { GT_Values.RA.addAssemblylineRecipe( ItemList.Generator_Naquadah_Mark_V.get(1).copy(), 500000, - new Object[] { - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Osmiridium, 8), - ItemRefer.Advanced_Radiation_Protection_Plate.get(64), - ItemList.Field_Generator_UV.get(8), - ItemList.Electric_Pump_UHV.get(2), - new Object[] {OrePrefixes.circuit.get(Materials.Bio), 4}, - GT_OreDictUnificator.get(OrePrefixes.pipeHuge, Materials.MysteriousCrystal, 8), - ItemList.Circuit_Wafer_NPIC.get(16), - ItemList.UHV_Coil.get(64), - new Object[] {"craftingLensYellow", 16}, - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Thulium, 64) - }, - new FluidStack[] { - Materials.Quantium.getMolten(9216L), - Materials.DraconiumAwakened.getMolten(4608L), - MyMaterial.extremelyUnstableNaquadah.getMolten(1440), - new FluidStack(solderIndalloy, 14400) - }, + new Object[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Osmiridium, 8), + ItemRefer.Advanced_Radiation_Protection_Plate.get(64), ItemList.Field_Generator_UV.get(8), + ItemList.Electric_Pump_UHV.get(2), new Object[] { OrePrefixes.circuit.get(Materials.Bio), 4 }, + GT_OreDictUnificator.get(OrePrefixes.pipeHuge, Materials.MysteriousCrystal, 8), + ItemList.Circuit_Wafer_NPIC.get(16), ItemList.UHV_Coil.get(64), + new Object[] { "craftingLensYellow", 16 }, + GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Thulium, 64) }, + new FluidStack[] { Materials.Quantium.getMolten(9216L), Materials.DraconiumAwakened.getMolten(4608L), + MyMaterial.extremelyUnstableNaquadah.getMolten(1440), new FluidStack(solderIndalloy, 14400) }, ItemRefer.Naquadah_Fuel_Refinery.get(1), 36000, 1919810); @@ -646,16 +568,14 @@ public class RecipeLoader { GT_Values.RA.addAssemblylineRecipe( ItemRefer.Radiation_Protection_Plate.get(1), 80000, - new Object[] { - ItemRefer.Radiation_Protection_Plate.get(1), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.ElectrumFlux, 4), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Trinium, 4), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.NaquadahAlloy, 4), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Osmiridium, 4), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.VibrantAlloy, 4), - ItemRefer.Radiation_Protection_Plate.get(1), - }, - new FluidStack[] {new FluidStack(solderIndalloy, 1152)}, + new Object[] { ItemRefer.Radiation_Protection_Plate.get(1), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.ElectrumFlux, 4), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Trinium, 4), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.NaquadahAlloy, 4), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Osmiridium, 4), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.VibrantAlloy, 4), + ItemRefer.Radiation_Protection_Plate.get(1), }, + new FluidStack[] { new FluidStack(solderIndalloy, 1152) }, ItemRefer.Advanced_Radiation_Protection_Plate.get(1), 1000, 65536); @@ -663,18 +583,15 @@ public class RecipeLoader { GT_Values.RA.addAssemblylineRecipe( ItemRefer.Field_Restriction_Casing.get(1), 250000, - new Object[] { - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Thulium, 1), - ItemRefer.Advanced_Radiation_Protection_Plate.get(6), - ItemList.Field_Generator_IV.get(2), - GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.Naquadah, 16), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.NaquadahAlloy, 32), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.NaquadahAlloy, 32), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Manyullyn, 32), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Manyullyn, 32), - MyMaterial.orundum.get(OrePrefixes.plate, 4) - }, - new FluidStack[] {Materials.TungstenSteel.getMolten(1152), new FluidStack(solderIndalloy, 2304)}, + new Object[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Thulium, 1), + ItemRefer.Advanced_Radiation_Protection_Plate.get(6), ItemList.Field_Generator_IV.get(2), + GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.Naquadah, 16), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.NaquadahAlloy, 32), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.NaquadahAlloy, 32), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Manyullyn, 32), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Manyullyn, 32), + MyMaterial.orundum.get(OrePrefixes.plate, 4) }, + new FluidStack[] { Materials.TungstenSteel.getMolten(1152), new FluidStack(solderIndalloy, 2304) }, ItemRefer.Naquadah_Fuel_Refinery_Casing.get(1), 500, 65536); @@ -683,22 +600,16 @@ public class RecipeLoader { GT_Values.RA.addAssemblylineRecipe( MyMaterial.extremelyUnstableNaquadah.get(OrePrefixes.ingot), 300000, - new Object[] { - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Osmium, 1), - ItemList.Field_Generator_UV.get(2), - ItemList.Electric_Pump_UV.get(8), - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorZPM, 64), - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorZPM, 64), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Americium, 8), - GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.BlackPlutonium, 16), - ItemList.Circuit_Wafer_PPIC.get(32), - new Object[] {OrePrefixes.circuit.get(Materials.Infinite), 1L}, - }, - new FluidStack[] { - WerkstoffLoader.Krypton.getFluidOrGas(1000), - Materials.ElectrumFlux.getMolten(9216), - Materials.Lubricant.getFluid(128000) - }, + new Object[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Osmium, 1), + ItemList.Field_Generator_UV.get(2), ItemList.Electric_Pump_UV.get(8), + GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorZPM, 64), + GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorZPM, 64), + GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Americium, 8), + GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.BlackPlutonium, 16), + ItemList.Circuit_Wafer_PPIC.get(32), + new Object[] { OrePrefixes.circuit.get(Materials.Infinite), 1L }, }, + new FluidStack[] { WerkstoffLoader.Krypton.getFluidOrGas(1000), + Materials.ElectrumFlux.getMolten(9216), Materials.Lubricant.getFluid(128000) }, ItemRefer.Field_Restriction_Coil_T1.get(1), 18000, 114514); @@ -706,22 +617,16 @@ public class RecipeLoader { GT_Values.RA.addAssemblylineRecipe( ItemRefer.Field_Restriction_Coil_T1.get(1), 350000, - new Object[] { - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.CosmicNeutronium, 1), - ItemList.Field_Generator_UHV.get(2), - ItemList.Electric_Pump_UHV.get(8), - GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.SuperconductorUV, 64), - GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.SuperconductorUV, 64), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Infinity, 8), - GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Neutronium, 16), - ItemList.Circuit_Wafer_PPIC.get(48), - new Object[] {OrePrefixes.circuit.get(Materials.Bio), 1L}, - }, - new FluidStack[] { - Materials.Radon.getPlasma(1000), - Materials.DraconiumAwakened.getMolten(9216), - Materials.Lubricant.getFluid(128000), - }, + new Object[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.CosmicNeutronium, 1), + ItemList.Field_Generator_UHV.get(2), ItemList.Electric_Pump_UHV.get(8), + GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.SuperconductorUV, 64), + GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.SuperconductorUV, 64), + GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Infinity, 8), + GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Neutronium, 16), + ItemList.Circuit_Wafer_PPIC.get(48), + new Object[] { OrePrefixes.circuit.get(Materials.Bio), 1L }, }, + new FluidStack[] { Materials.Radon.getPlasma(1000), Materials.DraconiumAwakened.getMolten(9216), + Materials.Lubricant.getFluid(128000), }, ItemRefer.Field_Restriction_Coil_T2.get(1), 36000, 114514); @@ -729,22 +634,16 @@ public class RecipeLoader { GT_Values.RA.addAssemblylineRecipe( ItemRefer.Field_Restriction_Coil_T2.get(1), 400000, - new Object[] { - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Infinity, 1), - ItemList.Field_Generator_UEV.get(2), - ItemList.Electric_Pump_UEV.get(8), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.SuperconductorUHV, 64), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.SuperconductorUHV, 64), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.TranscendentMetal, 8), - GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Infinity, 16), - ItemList.Circuit_Wafer_PPIC.get(64), - new Object[] {OrePrefixes.circuit.get(Materials.Optical), 1L}, - }, - new FluidStack[] { - WerkstoffLoader.Oganesson.getFluidOrGas(1000), - Materials.Neutronium.getMolten(9216), - Materials.Lubricant.getFluid(128000), - }, + new Object[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Infinity, 1), + ItemList.Field_Generator_UEV.get(2), ItemList.Electric_Pump_UEV.get(8), + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.SuperconductorUHV, 64), + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.SuperconductorUHV, 64), + GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.TranscendentMetal, 8), + GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Infinity, 16), + ItemList.Circuit_Wafer_PPIC.get(64), + new Object[] { OrePrefixes.circuit.get(Materials.Optical), 1L }, }, + new FluidStack[] { WerkstoffLoader.Oganesson.getFluidOrGas(1000), + Materials.Neutronium.getMolten(9216), Materials.Lubricant.getFluid(128000), }, ItemRefer.Field_Restriction_Coil_T3.get(1), 72000, 114514); @@ -752,29 +651,23 @@ public class RecipeLoader { GT_Values.RA.addAssemblylineRecipe( MyMaterial.extremelyUnstableNaquadah.get(OrePrefixes.ingot), 300000, - new Object[] { - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.VanadiumGallium, 1), - GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.SuperconductorIV, 64), - GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.SuperconductorLuV, 32), - GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.SuperconductorZPM, 16), - ItemList.Neutron_Reflector.get(4), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Gallium, 32), - GT_OreDictUnificator.get(OrePrefixes.spring, Materials.Indium, 16), - GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.Osmiridium, 16), - ItemRefer.IC2_Ir_Plate.get(32), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.CrystallineAlloy, 64), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.CrystallineAlloy, 64), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.CrystallineAlloy, 64), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.CrystallineAlloy, 64), - ItemList.Tool_DataStick.get(16), - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Cobalt, 32) - }, - new FluidStack[] { - Materials.Trinium.getMolten(2304), - Materials.Platinum.getMolten(4608), - new FluidStack(solderIndalloy, 9216), - FluidRegistry.getFluidStack("ic2coolant", 8000) - }, + new Object[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.VanadiumGallium, 1), + GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.SuperconductorIV, 64), + GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.SuperconductorLuV, 32), + GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.SuperconductorZPM, 16), + ItemList.Neutron_Reflector.get(4), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Gallium, 32), + GT_OreDictUnificator.get(OrePrefixes.spring, Materials.Indium, 16), + GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.Osmiridium, 16), + ItemRefer.IC2_Ir_Plate.get(32), + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.CrystallineAlloy, 64), + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.CrystallineAlloy, 64), + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.CrystallineAlloy, 64), + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.CrystallineAlloy, 64), + ItemList.Tool_DataStick.get(16), + GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Cobalt, 32) }, + new FluidStack[] { Materials.Trinium.getMolten(2304), Materials.Platinum.getMolten(4608), + new FluidStack(solderIndalloy, 9216), FluidRegistry.getFluidStack("ic2coolant", 8000) }, ItemRefer.Field_Restriction_Coil_T1.get(1), 900, 114514); @@ -782,29 +675,23 @@ public class RecipeLoader { GT_Values.RA.addAssemblylineRecipe( ItemRefer.Field_Restriction_Coil_T1.get(1), 350000, - new Object[] { - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Molybdenum, 1), - GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.SuperconductorLuV, 64), - GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.SuperconductorZPM, 32), - GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.SuperconductorUV, 16), - ItemList.Field_Generator_LuV.get(4), - GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.NiobiumTitanium, 16), - GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.Enderium, 16), - WerkstoffLoader.LuVTierMaterial.get(OrePrefixes.gearGt, 8), - ItemList.Circuit_Wafer_QPIC.get(16), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.CrystallineAlloy, 64), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Indium, 64), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Indium, 64), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Indium, 64), - ItemList.Energy_LapotronicOrb.get(4), - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.BlackPlutonium, 32) - }, - new FluidStack[] { - Materials.Tritanium.getMolten(2304), - Materials.Palladium.getMolten(4608), - new FluidStack(solderIndalloy, 9216), - FluidRegistry.getFluidStack("ic2coolant", 8000) - }, + new Object[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Molybdenum, 1), + GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.SuperconductorLuV, 64), + GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.SuperconductorZPM, 32), + GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.SuperconductorUV, 16), + ItemList.Field_Generator_LuV.get(4), + GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.NiobiumTitanium, 16), + GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.Enderium, 16), + WerkstoffLoader.LuVTierMaterial.get(OrePrefixes.gearGt, 8), + ItemList.Circuit_Wafer_QPIC.get(16), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.CrystallineAlloy, 64), + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Indium, 64), + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Indium, 64), + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Indium, 64), + ItemList.Energy_LapotronicOrb.get(4), + GT_OreDictUnificator.get(OrePrefixes.screw, Materials.BlackPlutonium, 32) }, + new FluidStack[] { Materials.Tritanium.getMolten(2304), Materials.Palladium.getMolten(4608), + new FluidStack(solderIndalloy, 9216), FluidRegistry.getFluidStack("ic2coolant", 8000) }, ItemRefer.Field_Restriction_Coil_T2.get(1), 2700, 114514); @@ -812,42 +699,33 @@ public class RecipeLoader { GT_Values.RA.addAssemblylineRecipe( ItemRefer.Field_Restriction_Coil_T2.get(1), 400000, - new Object[] { - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.CosmicNeutronium, 1), - GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.SuperconductorZPM, 64), - GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.SuperconductorUV, 32), - GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.SuperconductorUHV, 16), - ItemList.Sensor_UV.get(4), - GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.NetherStar, 16), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.SamariumMagnetic, 4), - GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.BlackPlutonium, 16), - ItemList.Circuit_Chip_CrystalSoC2.get(32), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.CrystallineAlloy, 64), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Indium, 32), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.VibrantAlloy, 64), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.VibrantAlloy, 64), - ItemList.Energy_LapotronicOrb2.get(4), - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Infinity, 16) - }, - new FluidStack[] { - Materials.Americium.getMolten(2304), - Materials.Osmium.getMolten(4608), - new FluidStack(solderIndalloy, 9216), - FluidRegistry.getFluidStack("ic2coolant", 8000) - }, + new Object[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.CosmicNeutronium, 1), + GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.SuperconductorZPM, 64), + GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.SuperconductorUV, 32), + GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.SuperconductorUHV, 16), + ItemList.Sensor_UV.get(4), + GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.NetherStar, 16), + GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.SamariumMagnetic, 4), + GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.BlackPlutonium, 16), + ItemList.Circuit_Chip_CrystalSoC2.get(32), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.CrystallineAlloy, 64), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Indium, 32), + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.VibrantAlloy, 64), + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.VibrantAlloy, 64), + ItemList.Energy_LapotronicOrb2.get(4), + GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Infinity, 16) }, + new FluidStack[] { Materials.Americium.getMolten(2304), Materials.Osmium.getMolten(4608), + new FluidStack(solderIndalloy, 9216), FluidRegistry.getFluidStack("ic2coolant", 8000) }, ItemRefer.Field_Restriction_Coil_T3.get(1), 8100, 114514); } GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.BorosilicateGlass, 1), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.ReinforceGlass, 6), - GT_OreDictUnificator.get(OrePrefixes.ring, Materials.NaquadahAlloy, 32), - ItemList.Field_Generator_HV.get(4), - GT_Utility.getIntegratedCircuit(6) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.BorosilicateGlass, 1), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.ReinforceGlass, 6), + GT_OreDictUnificator.get(OrePrefixes.ring, Materials.NaquadahAlloy, 32), + ItemList.Field_Generator_HV.get(4), GT_Utility.getIntegratedCircuit(6) }, Materials.Naquadria.getMolten(288), ItemRefer.Field_Restriction_Glass.get(1), 300, @@ -875,7 +753,7 @@ public class RecipeLoader { null, null, null, - new int[] {10000}, + new int[] { 10000 }, 100, 120); @@ -911,78 +789,57 @@ public class RecipeLoader { GT_ModHandler.addCraftingRecipe( ItemRefer.Raw_Cylinder.get(1), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.REVERSIBLE, - new Object[] { - "PPP", - "PFP", - "PPP", - 'P', - ItemRefer.Special_Ceramics_Plate.get(1), - 'F', - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.StainlessSteel, 1) - }); + new Object[] { "PPP", "PFP", "PPP", 'P', ItemRefer.Special_Ceramics_Plate.get(1), 'F', + GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.StainlessSteel, 1) }); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemRefer.Raw_Cylinder.get(1), - GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.Titanium, 1), - GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Titanium, 4), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Titanium, 6), - GT_Utility.getIntegratedCircuit(4) - }, + new ItemStack[] { ItemRefer.Raw_Cylinder.get(1), + GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.Titanium, 1), + GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Titanium, 4), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Titanium, 6), + GT_Utility.getIntegratedCircuit(4) }, null, ItemRefer.Titanium_Plated_Cylinder.get(1), 300, 1920); GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] { - GT_Utility.getIntegratedCircuit(16), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Saltpeter, 2) - }, - new FluidStack[] { - FluidRegistry.getFluidStack("liquidoxygen", 1000), Materials.NitrogenDioxide.getGas(1000) - }, - new FluidStack[] {FluidRegistry.getFluidStack("combustionpromotor", 500)}, + new ItemStack[] { GT_Utility.getIntegratedCircuit(16), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Saltpeter, 2) }, + new FluidStack[] { FluidRegistry.getFluidStack("liquidoxygen", 1000), + Materials.NitrogenDioxide.getGas(1000) }, + new FluidStack[] { FluidRegistry.getFluidStack("combustionpromotor", 500) }, null, 200, 120); GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] { - GT_Utility.getIntegratedCircuit(16), WerkstoffLoader.SodiumNitrate.get(OrePrefixes.dust, 2) - }, - new FluidStack[] { - FluidRegistry.getFluidStack("liquidoxygen", 1000), Materials.NitrogenDioxide.getGas(1000) - }, - new FluidStack[] {FluidRegistry.getFluidStack("combustionpromotor", 500)}, + new ItemStack[] { GT_Utility.getIntegratedCircuit(16), + WerkstoffLoader.SodiumNitrate.get(OrePrefixes.dust, 2) }, + new FluidStack[] { FluidRegistry.getFluidStack("liquidoxygen", 1000), + Materials.NitrogenDioxide.getGas(1000) }, + new FluidStack[] { FluidRegistry.getFluidStack("combustionpromotor", 500) }, null, 200, 120); if (FluidRegistry.getFluidStack("fluid.hydrogenperoxide", 1000) != null) { GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] { - GT_Utility.getIntegratedCircuit(16), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Saltpeter, 2) - }, - new FluidStack[] { - FluidRegistry.getFluidStack("fluid.hydrogenperoxide", 1000), - Materials.NitrogenDioxide.getGas(1000) - }, - new FluidStack[] {FluidRegistry.getFluidStack("combustionpromotor", 2000)}, + new ItemStack[] { GT_Utility.getIntegratedCircuit(16), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Saltpeter, 2) }, + new FluidStack[] { FluidRegistry.getFluidStack("fluid.hydrogenperoxide", 1000), + Materials.NitrogenDioxide.getGas(1000) }, + new FluidStack[] { FluidRegistry.getFluidStack("combustionpromotor", 2000) }, null, 200, 120); GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] { - GT_Utility.getIntegratedCircuit(16), WerkstoffLoader.SodiumNitrate.get(OrePrefixes.dust, 2) - }, - new FluidStack[] { - FluidRegistry.getFluidStack("fluid.hydrogenperoxide", 1000), - Materials.NitrogenDioxide.getGas(1000) - }, - new FluidStack[] {FluidRegistry.getFluidStack("combustionpromotor", 2000)}, + new ItemStack[] { GT_Utility.getIntegratedCircuit(16), + WerkstoffLoader.SodiumNitrate.get(OrePrefixes.dust, 2) }, + new FluidStack[] { FluidRegistry.getFluidStack("fluid.hydrogenperoxide", 1000), + Materials.NitrogenDioxide.getGas(1000) }, + new FluidStack[] { FluidRegistry.getFluidStack("combustionpromotor", 2000) }, null, 200, 120); @@ -990,26 +847,21 @@ public class RecipeLoader { if (FluidRegistry.getFluidStack("hydrogen peroxide", 1000) != null) { GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] { - GT_Utility.getIntegratedCircuit(16), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Saltpeter, 2) - }, - new FluidStack[] { - FluidRegistry.getFluidStack("hydrogen peroxide", 1000), Materials.NitrogenDioxide.getGas(1000) - }, - new FluidStack[] {FluidRegistry.getFluidStack("combustionpromotor", 2000)}, + new ItemStack[] { GT_Utility.getIntegratedCircuit(16), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Saltpeter, 2) }, + new FluidStack[] { FluidRegistry.getFluidStack("hydrogen peroxide", 1000), + Materials.NitrogenDioxide.getGas(1000) }, + new FluidStack[] { FluidRegistry.getFluidStack("combustionpromotor", 2000) }, null, 200, 120); GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] { - GT_Utility.getIntegratedCircuit(16), WerkstoffLoader.SodiumNitrate.get(OrePrefixes.dust, 2) - }, - new FluidStack[] { - FluidRegistry.getFluidStack("hydrogen peroxide", 1000), Materials.NitrogenDioxide.getGas(1000) - }, - new FluidStack[] {FluidRegistry.getFluidStack("combustionpromotor", 2000)}, + new ItemStack[] { GT_Utility.getIntegratedCircuit(16), + WerkstoffLoader.SodiumNitrate.get(OrePrefixes.dust, 2) }, + new FluidStack[] { FluidRegistry.getFluidStack("hydrogen peroxide", 1000), + Materials.NitrogenDioxide.getGas(1000) }, + new FluidStack[] { FluidRegistry.getFluidStack("combustionpromotor", 2000) }, null, 200, 120); @@ -1018,69 +870,42 @@ public class RecipeLoader { GT_ModHandler.addCraftingRecipe( ItemRefer.Universal_Chemical_Fuel_Engine.get(1), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.REVERSIBLE, - new Object[] { - "TZT", - "ALB", - "WGW", - 'T', - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Titanium, 1), - 'Z', - "circuitUltimate", - 'A', - ItemList.Machine_Multi_DieselEngine.get(1), - 'B', - ItemList.Machine_Multi_ExtremeDieselEngine.get(1), - 'L', - ItemList.Hull_LuV, - 'W', - GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Naquadah, 1), - 'G', - GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.Osmium, 1), - }); + new Object[] { "TZT", "ALB", "WGW", 'T', + GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Titanium, 1), 'Z', "circuitUltimate", + 'A', ItemList.Machine_Multi_DieselEngine.get(1), 'B', + ItemList.Machine_Multi_ExtremeDieselEngine.get(1), 'L', ItemList.Hull_LuV, 'W', + GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Naquadah, 1), 'G', + GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.Osmium, 1), }); // neutron activator GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.PolyvinylChloride, 4), - GT_OreDictUnificator.get(OrePrefixes.itemCasing, Materials.Plastic, 4), - GT_Utility.getIntegratedCircuit(8) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.stick, Materials.PolyvinylChloride, 4), + GT_OreDictUnificator.get(OrePrefixes.itemCasing, Materials.Plastic, 4), + GT_Utility.getIntegratedCircuit(8) }, FluidRegistry.getFluidStack("dye.chemical.dyecyan", 144), ItemRefer.Plastic_Case.get(1), 100, 28); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.PolyvinylChloride, 4), - GT_OreDictUnificator.get(OrePrefixes.itemCasing, Materials.Plastic, 4), - GT_Utility.getIntegratedCircuit(8) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.stick, Materials.PolyvinylChloride, 4), + GT_OreDictUnificator.get(OrePrefixes.itemCasing, Materials.Plastic, 4), + GT_Utility.getIntegratedCircuit(8) }, FluidRegistry.getFluidStack("dye.watermixed.dyecyan", 144), ItemRefer.Plastic_Case.get(1), 100, 28); - GT_ModHandler.addCraftingRecipe(ItemRefer.Plastic_Case.get(1), new Object[] { - "PCP", - "CDC", - "PCP", - 'P', - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.PolyvinylChloride, 1), - 'C', - GT_OreDictUnificator.get(OrePrefixes.itemCasing, Materials.Plastic, 1), - 'D', - "dyeCyan" - }); + GT_ModHandler.addCraftingRecipe( + ItemRefer.Plastic_Case.get(1), + new Object[] { "PCP", "CDC", "PCP", 'P', + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.PolyvinylChloride, 1), 'C', + GT_OreDictUnificator.get(OrePrefixes.itemCasing, Materials.Plastic, 1), 'D', "dyeCyan" }); MyRecipeAdder.instance.addPreciseAssemblerRecipe( - new ItemStack[] { - ItemList.Circuit_Board_Coated_Basic.get(1), - ItemList.Circuit_Chip_ULPIC.get(1), - ItemList.ULV_Coil.get(2), - ItemList.Battery_RE_ULV_Tantalum.get(1) - }, - new FluidStack[] {Materials.RedAlloy.getMolten(144), Materials.Aluminium.getMolten(144)}, + new ItemStack[] { ItemList.Circuit_Board_Coated_Basic.get(1), ItemList.Circuit_Chip_ULPIC.get(1), + ItemList.ULV_Coil.get(2), ItemList.Battery_RE_ULV_Tantalum.get(1) }, + new FluidStack[] { Materials.RedAlloy.getMolten(144), Materials.Aluminium.getMolten(144) }, ItemRefer.Micro_Heater.get(1), 120, 40, @@ -1107,27 +932,19 @@ public class RecipeLoader { true); MyRecipeAdder.instance.addPreciseAssemblerRecipe( - new ItemStack[] { - ItemRefer.Quartz_Wafer.get(1), - ItemRefer.Special_Ceramics_Plate.get(2), - ItemRefer.Micro_Heater.get(1), - ItemList.Circuit_Chip_ILC.get(4) - }, - new FluidStack[] {Materials.EnergeticAlloy.getMolten(72), Materials.Silver.getMolten(18)}, + new ItemStack[] { ItemRefer.Quartz_Wafer.get(1), ItemRefer.Special_Ceramics_Plate.get(2), + ItemRefer.Micro_Heater.get(1), ItemList.Circuit_Chip_ILC.get(4) }, + new FluidStack[] { Materials.EnergeticAlloy.getMolten(72), Materials.Silver.getMolten(18) }, ItemRefer.Quartz_Crystal_Resonator.get(1), 480, 40, 1); CrackRecipeAdder.addUniversalAssemblerRecipe( - new ItemStack[] { - ItemRefer.Quartz_Crystal_Resonator.get(2), - ItemRefer.Plastic_Case.get(1), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Good, 1), - ItemList.Cover_Screen.get(1), - ItemList.Circuit_Parts_Diode.get(16), - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Aluminium, 8), - }, + new ItemStack[] { ItemRefer.Quartz_Crystal_Resonator.get(2), ItemRefer.Plastic_Case.get(1), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Good, 1), ItemList.Cover_Screen.get(1), + ItemList.Circuit_Parts_Diode.get(16), + GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Aluminium, 8), }, ItemRefer.Inverter.get(1), 144, 240, @@ -1135,14 +952,10 @@ public class RecipeLoader { false); CrackRecipeAdder.addUniversalAssemblerRecipe( - new ItemStack[] { - ItemRefer.Quartz_Crystal_Resonator.get(2), - ItemRefer.Plastic_Case.get(1), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Good, 1), - ItemList.Cover_Screen.get(1), - ItemList.Circuit_Parts_DiodeSMD.get(16), - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Aluminium, 8), - }, + new ItemStack[] { ItemRefer.Quartz_Crystal_Resonator.get(2), ItemRefer.Plastic_Case.get(1), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Good, 1), ItemList.Cover_Screen.get(1), + ItemList.Circuit_Parts_DiodeSMD.get(16), + GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Aluminium, 8), }, ItemRefer.Inverter.get(1), 144, 240, @@ -1150,14 +963,10 @@ public class RecipeLoader { false); CrackRecipeAdder.addUniversalAssemblerRecipe( - new ItemStack[] { - ItemRefer.Quartz_Crystal_Resonator.get(2), - ItemRefer.Plastic_Case.get(1), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Good, 1), - ItemList.Cover_Screen.get(1), - ItemList.Circuit_Parts_DiodeASMD.get(4), - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Aluminium, 8), - }, + new ItemStack[] { ItemRefer.Quartz_Crystal_Resonator.get(2), ItemRefer.Plastic_Case.get(1), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Good, 1), ItemList.Cover_Screen.get(1), + ItemList.Circuit_Parts_DiodeASMD.get(4), + GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Aluminium, 8), }, ItemRefer.Inverter.get(1), 144, 240, @@ -1167,68 +976,39 @@ public class RecipeLoader { GT_ModHandler.addCraftingRecipe( Loaders.NeutronAccelerators[0].copy(), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.REVERSIBLE, - new Object[] { - "WPM", - "CHI", - "WPM", - 'W', - GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Lead, 1), - 'P', - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Lead, 1), - 'M', - GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.Lead, 1), - 'C', - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Wood, 1), - 'H', - ItemList.Hull_ULV, - 'I', - ItemRefer.Inverter.get(1), - }); + new Object[] { "WPM", "CHI", "WPM", 'W', + GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Lead, 1), 'P', + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Lead, 1), 'M', + GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.Lead, 1), 'C', + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Wood, 1), 'H', ItemList.Hull_ULV, 'I', + ItemRefer.Inverter.get(1), }); GT_ModHandler.addCraftingRecipe( Loaders.NeutronAccelerators[1].copy(), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.REVERSIBLE, - new Object[] { - "WPM", - "CHI", - "WPM", - 'W', - GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Tin, 1), - 'P', - GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Lead, 1), - 'M', - ItemList.Electric_Motor_LV, - 'C', - "plateAnyRubber", - 'H', - ItemList.Hull_LV, - 'I', - ItemRefer.Inverter.get(1), - }); + new Object[] { "WPM", "CHI", "WPM", 'W', + GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Tin, 1), 'P', + GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Lead, 1), 'M', + ItemList.Electric_Motor_LV, 'C', "plateAnyRubber", 'H', ItemList.Hull_LV, 'I', + ItemRefer.Inverter.get(1), }); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemRefer.Inverter.get(1), - ItemList.Hull_MV.get(1L), - GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.AnyCopper, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Plastic, 1), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Beryllium, 2), - ItemList.Electric_Motor_MV.get(2), - }, + new ItemStack[] { ItemRefer.Inverter.get(1), ItemList.Hull_MV.get(1L), + GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.AnyCopper, 2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Plastic, 1), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Beryllium, 2), + ItemList.Electric_Motor_MV.get(2), }, null, Loaders.NeutronAccelerators[2].copy(), 300, 120); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemRefer.Inverter.get(1), - ItemList.Hull_HV.get(1L), - GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Gold, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.PolyvinylChloride, 1), - GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Beryllium, 2), - ItemList.Electric_Motor_HV.get(2), - }, + new ItemStack[] { ItemRefer.Inverter.get(1), ItemList.Hull_HV.get(1L), + GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Gold, 2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.PolyvinylChloride, 1), + GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Beryllium, 2), + ItemList.Electric_Motor_HV.get(2), }, null, Loaders.NeutronAccelerators[3].copy(), 300, @@ -1237,18 +1017,15 @@ public class RecipeLoader { GT_Values.RA.addAssemblylineRecipe( Loaders.NeutronAccelerators[5].copy(), 20000, - new Object[] { - ItemRefer.Inverter.get(2), - ItemList.Hull_LuV.get(1L), - GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.YttriumBariumCuprate, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.NetherStar, 1), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Polybenzimidazole, 4), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.NeodymiumMagnetic, 4), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.NeodymiumMagnetic, 4), - ItemList.Electric_Motor_LuV.get(2), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.SuperconductorMV, 4), - }, - new FluidStack[] {Materials.Argon.getGas(3000)}, + new Object[] { ItemRefer.Inverter.get(2), ItemList.Hull_LuV.get(1L), + GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.YttriumBariumCuprate, 2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.NetherStar, 1), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Polybenzimidazole, 4), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.NeodymiumMagnetic, 4), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.NeodymiumMagnetic, 4), + ItemList.Electric_Motor_LuV.get(2), + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.SuperconductorMV, 4), }, + new FluidStack[] { Materials.Argon.getGas(3000) }, Loaders.NeutronAccelerators[6].copy(), 300, 30720); @@ -1256,18 +1033,15 @@ public class RecipeLoader { GT_Values.RA.addAssemblylineRecipe( Loaders.NeutronAccelerators[6].copy(), 20000, - new Object[] { - ItemRefer.Inverter.get(2), - ItemList.Hull_ZPM.get(1L), - GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.VanadiumGallium, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.NetherStar, 1), - GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Polybenzimidazole, 4), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.SamariumMagnetic, 4), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.SamariumMagnetic, 4), - ItemList.Electric_Motor_ZPM.get(2), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.SuperconductorEV, 4), - }, - new FluidStack[] {WerkstoffLoader.Xenon.getFluidOrGas(3000)}, + new Object[] { ItemRefer.Inverter.get(2), ItemList.Hull_ZPM.get(1L), + GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.VanadiumGallium, 2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.NetherStar, 1), + GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Polybenzimidazole, 4), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.SamariumMagnetic, 4), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.SamariumMagnetic, 4), + ItemList.Electric_Motor_ZPM.get(2), + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.SuperconductorEV, 4), }, + new FluidStack[] { WerkstoffLoader.Xenon.getFluidOrGas(3000) }, Loaders.NeutronAccelerators[7].copy(), 300, 122880); @@ -1275,33 +1049,25 @@ public class RecipeLoader { GT_Values.RA.addAssemblylineRecipe( Loaders.NeutronAccelerators[7].copy(), 20000, - new Object[] { - ItemRefer.Inverter.get(4), - ItemList.Hull_UV.get(1L), - GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.NaquadahAlloy, 4), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.NetherStar, 2), - GT_OreDictUnificator.get(OrePrefixes.plateTriple, Materials.Polybenzimidazole, 4), - ItemList.ZPM_Coil.get(4), - GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.NickelZincFerrite, 16), - ItemList.ZPM_Coil.get(4), - ItemList.Electric_Motor_UV.get(2), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.SuperconductorLuV, 4), - }, - new FluidStack[] {WerkstoffLoader.Oganesson.getFluidOrGas(3000)}, + new Object[] { ItemRefer.Inverter.get(4), ItemList.Hull_UV.get(1L), + GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.NaquadahAlloy, 4), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.NetherStar, 2), + GT_OreDictUnificator.get(OrePrefixes.plateTriple, Materials.Polybenzimidazole, 4), + ItemList.ZPM_Coil.get(4), + GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.NickelZincFerrite, 16), + ItemList.ZPM_Coil.get(4), ItemList.Electric_Motor_UV.get(2), + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.SuperconductorLuV, 4), }, + new FluidStack[] { WerkstoffLoader.Oganesson.getFluidOrGas(3000) }, Loaders.NeutronAccelerators[8].copy(), 300, 491520); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Casing_IV.get(1L), - ItemList.Cover_ActivityDetector.get(1L), - ItemList.Cover_Screen.get(1L), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.VibrantAlloy, 4), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Data, 1), - ItemList.Sensor_HV.get(2), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { ItemList.Casing_IV.get(1L), ItemList.Cover_ActivityDetector.get(1L), + ItemList.Cover_Screen.get(1L), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.VibrantAlloy, 4), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Data, 1), ItemList.Sensor_HV.get(2), + GT_Utility.getIntegratedCircuit(1) }, Materials.Helium.getGas(1000), Loaders.NS.copy(), 200, @@ -1310,19 +1076,14 @@ public class RecipeLoader { GT_ModHandler.addCraftingRecipe( ItemRefer.Neutron_Source.get(1), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.REVERSIBLE, - new Object[] { - " P ", - "PUP", - " P ", - 'P', - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Steel, 1), - 'U', - ItemRefer.High_Density_Uranium.get(1) - }); + new Object[] { " P ", "PUP", " P ", 'P', + GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Steel, 1), 'U', + ItemRefer.High_Density_Uranium.get(1) }); MyRecipeAdder.instance.addPreciseAssemblerRecipe( - new ItemStack[] {ItemRefer.HiC_T2.get(2), ItemList.Emitter_EV.get(2), ItemRefer.Neutron_Source.get(1)}, - new FluidStack[] {Materials.StainlessSteel.getMolten(576), Materials.TungstenCarbide.getMolten(144)}, + new ItemStack[] { ItemRefer.HiC_T2.get(2), ItemList.Emitter_EV.get(2), + ItemRefer.Neutron_Source.get(1) }, + new FluidStack[] { Materials.StainlessSteel.getMolten(576), Materials.TungstenCarbide.getMolten(144) }, Loaders.NA.copy(), 7680, 100, @@ -1332,30 +1093,24 @@ public class RecipeLoader { public static void InitLoadRecipe() { GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemRefer.Inverter.get(1), - ItemList.Hull_EV.get(1L), - GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Aluminium, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.StyreneButadieneRubber, 1), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.IronMagnetic, 4), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.TungstenCarbide, 2), - ItemList.Electric_Motor_EV.get(2), - }, + new ItemStack[] { ItemRefer.Inverter.get(1), ItemList.Hull_EV.get(1L), + GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Aluminium, 2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.StyreneButadieneRubber, 1), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.IronMagnetic, 4), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.TungstenCarbide, 2), + ItemList.Electric_Motor_EV.get(2), }, null, Loaders.NeutronAccelerators[4].copy(), 300, 1920); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemRefer.Inverter.get(1), - ItemList.Hull_IV.get(1L), - GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Tungsten, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Silicone, 1), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.SteelMagnetic, 4), - GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.TungstenCarbide, 2), - ItemList.Electric_Motor_IV.get(2), - }, + new ItemStack[] { ItemRefer.Inverter.get(1), ItemList.Hull_IV.get(1L), + GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Tungsten, 2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Silicone, 1), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.SteelMagnetic, 4), + GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.TungstenCarbide, 2), + ItemList.Electric_Motor_IV.get(2), }, null, Loaders.NeutronAccelerators[5].copy(), 300, @@ -1429,7 +1184,7 @@ public class RecipeLoader { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Naquadah, 1), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Naquadah, 1), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Naquadah, 1), - new int[] {1000, 500, 400, 50, 20, 5}, + new int[] { 1000, 500, 400, 50, 20, 5 }, 100, 30); @@ -1444,7 +1199,7 @@ public class RecipeLoader { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Naquadah, 64), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sunnarium, 32), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sunnarium, 32), - new int[] {9900, 9500, 9000, 8000, 5000, 3000}, + new int[] { 9900, 9500, 9000, 8000, 5000, 3000 }, 2500, 30000); @@ -1459,7 +1214,7 @@ public class RecipeLoader { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Bedrockium, 32), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Bedrockium, 32), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Bedrockium, 32), - new int[] {9500, 9000, 8000, 7000, 5000, 4000}, + new int[] { 9500, 9000, 8000, 7000, 5000, 4000 }, 2000, 30000); @@ -1474,7 +1229,7 @@ public class RecipeLoader { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Americium, 32), WerkstoffLoader.Californium.get(OrePrefixes.dust, 32), null, - new int[] {9000, 8500, 5000, 4000, 2000}, + new int[] { 9000, 8500, 5000, 4000, 2000 }, 8000, 2040); @@ -1489,7 +1244,7 @@ public class RecipeLoader { null, null, null, - new int[] {6000, 1000, 5000}, + new int[] { 6000, 1000, 5000 }, 1000, 1040); @@ -1504,7 +1259,7 @@ public class RecipeLoader { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Praseodymium, 32), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Boron, 2), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Indium, 4), - new int[] {10000, 8000, 10000, 8000, 3000, 5000}, + new int[] { 10000, 8000, 10000, 8000, 3000, 5000 }, 1500, 1040); @@ -1519,7 +1274,7 @@ public class RecipeLoader { null, null, null, - new int[] {5000, 8000, 7500}, + new int[] { 5000, 8000, 7500 }, 2500, 7680); @@ -1549,7 +1304,7 @@ public class RecipeLoader { MyMaterial.radioactiveSludge.get(OrePrefixes.dust, 1), MyMaterial.radioactiveSludge.get(OrePrefixes.dust, 1), MyMaterial.radioactiveSludge.get(OrePrefixes.dust, 1), - new int[] {8000, 7500, 5000, 2000, 500, 100}, + new int[] { 8000, 7500, 5000, 2000, 500, 100 }, 800, 120); @@ -1564,7 +1319,7 @@ public class RecipeLoader { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Neodymium, 32), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Europium, 32), null, - new int[] {9000, 8500, 5000, 4000, 2000}, + new int[] { 9000, 8500, 5000, 4000, 2000 }, 6000, 2040); @@ -1579,7 +1334,7 @@ public class RecipeLoader { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Uranium, 1), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Plutonium, 1), WerkstoffLoader.Tiberium.get(OrePrefixes.dust, 1), - new int[] {10000, 9500, 8000, 2500, 2000, 2000}, + new int[] { 10000, 9500, 8000, 2500, 2000, 2000 }, 900, 120); } diff --git a/src/main/java/goodgenerator/loader/RecipeLoader_02.java b/src/main/java/goodgenerator/loader/RecipeLoader_02.java index 8ef8c405d9..db95a8a0de 100644 --- a/src/main/java/goodgenerator/loader/RecipeLoader_02.java +++ b/src/main/java/goodgenerator/loader/RecipeLoader_02.java @@ -1,6 +1,13 @@ package goodgenerator.loader; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.oredict.OreDictionary; + import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader; + import goodgenerator.crossmod.LoadedList; import goodgenerator.items.MyMaterial; import goodgenerator.util.CrackRecipeAdder; @@ -15,11 +22,6 @@ import gregtech.api.util.*; import gregtech.api.util.GT_ModHandler; import gregtech.common.tileentities.machines.basic.GT_MetaTileEntity_Disassembler; import ic2.core.Ic2Items; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.oredict.OreDictionary; @SuppressWarnings("deprecation") public class RecipeLoader_02 { @@ -32,13 +34,11 @@ public class RecipeLoader_02 { GT_MetaTileEntity_Disassembler.getBlackList().add(new GT_ItemStack(ItemList.Casing_Fusion_Coil.get(1))); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.StainlessSteel, 1), - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.BlueAlloy, 1), - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorHV, 32), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Beryllium, 32), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Elite, 1) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.StainlessSteel, 1), + GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.BlueAlloy, 1), + GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorHV, 32), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Beryllium, 32), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Elite, 1) }, null, ItemRefer.Speeding_Pipe.get(1), 300, @@ -46,7 +46,7 @@ public class RecipeLoader_02 { // Compact MK1 Fusion Disassembly Recipe GT_Values.RA.addAssemblerRecipe( - new ItemStack[] {ItemRefer.Compact_Fusion_Coil_T0.get(1)}, + new ItemStack[] { ItemRefer.Compact_Fusion_Coil_T0.get(1) }, null, ItemList.Casing_Coil_Superconductor.get(3), 600, @@ -54,9 +54,7 @@ public class RecipeLoader_02 { // Compact MK2 Fusion Disassembly Recipe GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemRefer.Compact_Fusion_Coil_T1.get(1), - }, + new ItemStack[] { ItemRefer.Compact_Fusion_Coil_T1.get(1), }, null, ItemList.Casing_Fusion_Coil.get(3), 600, @@ -64,9 +62,7 @@ public class RecipeLoader_02 { // Compact MK3 Fusion Disassembly Recipe GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemRefer.Compact_Fusion_Coil_T2.get(1), - }, + new ItemStack[] { ItemRefer.Compact_Fusion_Coil_T2.get(1), }, null, ItemList.Casing_Fusion_Coil.get(3), 600, @@ -107,11 +103,8 @@ public class RecipeLoader_02 { 1966080); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - MyMaterial.zircaloy4.get(OrePrefixes.plate, 4), - MyMaterial.zircaloy2.get(OrePrefixes.ring, 2), - GT_Utility.getIntegratedCircuit(2) - }, + new ItemStack[] { MyMaterial.zircaloy4.get(OrePrefixes.plate, 4), + MyMaterial.zircaloy2.get(OrePrefixes.ring, 2), GT_Utility.getIntegratedCircuit(2) }, null, ItemRefer.Advanced_Fuel_Rod.get(1), 200, @@ -126,33 +119,24 @@ public class RecipeLoader_02 { 120); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemRefer.Fuel_Rod_U_1.get(2), - MyMaterial.zircaloy2.get(OrePrefixes.stick, 4), - GT_Utility.getIntegratedCircuit(2) - }, + new ItemStack[] { ItemRefer.Fuel_Rod_U_1.get(2), MyMaterial.zircaloy2.get(OrePrefixes.stick, 4), + GT_Utility.getIntegratedCircuit(2) }, null, ItemRefer.Fuel_Rod_U_2.get(1), 200, 1920); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemRefer.Fuel_Rod_U_2.get(2), - MyMaterial.zircaloy2.get(OrePrefixes.stick, 4), - GT_Utility.getIntegratedCircuit(5) - }, + new ItemStack[] { ItemRefer.Fuel_Rod_U_2.get(2), MyMaterial.zircaloy2.get(OrePrefixes.stick, 4), + GT_Utility.getIntegratedCircuit(5) }, null, ItemRefer.Fuel_Rod_U_4.get(1), 200, 1920); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemRefer.Fuel_Rod_U_1.get(4), - MyMaterial.zircaloy2.get(OrePrefixes.stickLong, 6), - GT_Utility.getIntegratedCircuit(4) - }, + new ItemStack[] { ItemRefer.Fuel_Rod_U_1.get(4), MyMaterial.zircaloy2.get(OrePrefixes.stickLong, 6), + GT_Utility.getIntegratedCircuit(4) }, null, ItemRefer.Fuel_Rod_U_4.get(1), 220, @@ -167,33 +151,24 @@ public class RecipeLoader_02 { 120); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemRefer.Fuel_Rod_Pu_1.get(2), - MyMaterial.zircaloy2.get(OrePrefixes.stick, 4), - GT_Utility.getIntegratedCircuit(2) - }, + new ItemStack[] { ItemRefer.Fuel_Rod_Pu_1.get(2), MyMaterial.zircaloy2.get(OrePrefixes.stick, 4), + GT_Utility.getIntegratedCircuit(2) }, null, ItemRefer.Fuel_Rod_Pu_2.get(1), 200, 1920); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemRefer.Fuel_Rod_Pu_2.get(2), - MyMaterial.zircaloy2.get(OrePrefixes.stick, 4), - GT_Utility.getIntegratedCircuit(5) - }, + new ItemStack[] { ItemRefer.Fuel_Rod_Pu_2.get(2), MyMaterial.zircaloy2.get(OrePrefixes.stick, 4), + GT_Utility.getIntegratedCircuit(5) }, null, ItemRefer.Fuel_Rod_Pu_4.get(1), 200, 1920); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemRefer.Fuel_Rod_Pu_1.get(4), - MyMaterial.zircaloy2.get(OrePrefixes.stickLong, 6), - GT_Utility.getIntegratedCircuit(4) - }, + new ItemStack[] { ItemRefer.Fuel_Rod_Pu_1.get(4), MyMaterial.zircaloy2.get(OrePrefixes.stickLong, 6), + GT_Utility.getIntegratedCircuit(4) }, null, ItemRefer.Fuel_Rod_Pu_4.get(1), 220, @@ -202,47 +177,27 @@ public class RecipeLoader_02 { GT_ModHandler.addCraftingRecipe( ItemRefer.YOTTank_Casing.get(1), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.REVERSIBLE, - new Object[] { - "BPB", - "FOF", - "BPB", - 'B', - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.BlackSteel, 1), - 'P', - GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.StainlessSteel, 1), - 'F', - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Polytetrafluoroethylene, 1), - 'O', - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.BlackSteel, 1), - }); + new Object[] { "BPB", "FOF", "BPB", 'B', + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.BlackSteel, 1), 'P', + GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.StainlessSteel, 1), 'F', + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Polytetrafluoroethylene, 1), 'O', + GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.BlackSteel, 1), }); GT_ModHandler.addCraftingRecipe( ItemRefer.YOTTank.get(1), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.REVERSIBLE, - new Object[] { - "SPS", - "ECE", - "SLS", - 'S', - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.BlueSteel, 1), - 'P', - ItemList.Cover_Screen.get(1), - 'E', - "circuitData", - 'L', - GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Enderium, 1), - 'C', - ItemRefer.YOTTank_Casing.get(1) - }); + new Object[] { "SPS", "ECE", "SLS", 'S', + GT_OreDictUnificator.get(OrePrefixes.screw, Materials.BlueSteel, 1), 'P', + ItemList.Cover_Screen.get(1), 'E', "circuitData", 'L', + GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Enderium, 1), 'C', + ItemRefer.YOTTank_Casing.get(1) }); if (LoadedList.EXTRA_CELLS) { GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hatch_Output_IV.get(1), - GT_ModHandler.getModItem("appliedenergistics2", "item.ItemMultiPart", 1, 440), - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.CertusQuartz, 8), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { ItemList.Hatch_Output_IV.get(1), + GT_ModHandler.getModItem("appliedenergistics2", "item.ItemMultiPart", 1, 440), + GT_OreDictUnificator.get(OrePrefixes.screw, Materials.CertusQuartz, 8), + GT_Utility.getIntegratedCircuit(1) }, Materials.Plastic.getMolten(144), Loaders.YFH, 200, @@ -250,79 +205,64 @@ public class RecipeLoader_02 { } GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Large_Fluid_Cell_Steel.get(12L), - GT_OreDictUnificator.get(OrePrefixes.plateQuadruple, Materials.Tin, 4), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { ItemList.Large_Fluid_Cell_Steel.get(12L), + GT_OreDictUnificator.get(OrePrefixes.plateQuadruple, Materials.Tin, 4), + GT_Utility.getIntegratedCircuit(1) }, Materials.Plastic.getMolten(144), ItemRefer.Fluid_Storage_Core_T1.get(1), 200, 480); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Large_Fluid_Cell_Aluminium.get(3L), - GT_OreDictUnificator.get(OrePrefixes.plateQuadruple, Materials.Tin, 4), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { ItemList.Large_Fluid_Cell_Aluminium.get(3L), + GT_OreDictUnificator.get(OrePrefixes.plateQuadruple, Materials.Tin, 4), + GT_Utility.getIntegratedCircuit(1) }, Materials.Plastic.getMolten(144), ItemRefer.Fluid_Storage_Core_T1.get(1), 200, 480); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Large_Fluid_Cell_StainlessSteel.get(2L), - GT_OreDictUnificator.get(OrePrefixes.plateQuadruple, Materials.Tin, 4), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { ItemList.Large_Fluid_Cell_StainlessSteel.get(2L), + GT_OreDictUnificator.get(OrePrefixes.plateQuadruple, Materials.Tin, 4), + GT_Utility.getIntegratedCircuit(1) }, Materials.Plastic.getMolten(144), ItemRefer.Fluid_Storage_Core_T1.get(1), 200, 480); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Large_Fluid_Cell_Titanium.get(64L), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Titanium, 8), - GT_OreDictUnificator.get(OrePrefixes.plateQuadruple, Materials.BlackSteel, 4), - GT_Utility.getIntegratedCircuit(2) - }, + new ItemStack[] { ItemList.Large_Fluid_Cell_Titanium.get(64L), + GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Titanium, 8), + GT_OreDictUnificator.get(OrePrefixes.plateQuadruple, Materials.BlackSteel, 4), + GT_Utility.getIntegratedCircuit(2) }, Materials.Polytetrafluoroethylene.getMolten(2304), ItemRefer.Fluid_Storage_Core_T2.get(1), 200, 7680); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Large_Fluid_Cell_TungstenSteel.get(18L), - GT_OreDictUnificator.get(OrePrefixes.plateQuadruple, Materials.BlackSteel, 4), - GT_Utility.getIntegratedCircuit(2) - }, + new ItemStack[] { ItemList.Large_Fluid_Cell_TungstenSteel.get(18L), + GT_OreDictUnificator.get(OrePrefixes.plateQuadruple, Materials.BlackSteel, 4), + GT_Utility.getIntegratedCircuit(2) }, Materials.Polytetrafluoroethylene.getMolten(2304), ItemRefer.Fluid_Storage_Core_T2.get(1), 200, 7680); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Large_Fluid_Cell_Chrome.get(4L), - GT_OreDictUnificator.get(OrePrefixes.plateQuadruple, Materials.BlackSteel, 4), - GT_Utility.getIntegratedCircuit(2) - }, + new ItemStack[] { ItemList.Large_Fluid_Cell_Chrome.get(4L), + GT_OreDictUnificator.get(OrePrefixes.plateQuadruple, Materials.BlackSteel, 4), + GT_Utility.getIntegratedCircuit(2) }, Materials.Polytetrafluoroethylene.getMolten(2304), ItemRefer.Fluid_Storage_Core_T2.get(1), 200, 7680); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemRefer.Fluid_Storage_Core_T1.get(32), - ItemRefer.Fluid_Storage_Core_T1.get(32), - GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.BlackSteel, 16), - GT_Utility.getIntegratedCircuit(10) - }, + new ItemStack[] { ItemRefer.Fluid_Storage_Core_T1.get(32), ItemRefer.Fluid_Storage_Core_T1.get(32), + GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.BlackSteel, 16), + GT_Utility.getIntegratedCircuit(10) }, Materials.Polytetrafluoroethylene.getMolten(2304), ItemRefer.Fluid_Storage_Core_T2.get(1), 200, @@ -335,16 +275,13 @@ public class RecipeLoader_02 { GT_Values.RA.addAssemblylineRecipe( ItemRefer.Fluid_Storage_Core_T2.get(1), 20000, - new Object[] { - GT_OreDictUnificator.get(OrePrefixes.pipeNonuple, Materials.StainlessSteel, 4), - ItemList.Electric_Pump_HV.get(8), - ItemList.Quantum_Tank_LV.get(1), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Osmium, 8), - GT_ModHandler.getModItem("GalacticraftMars", "item.null", 1L, 6), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Polycaprolactam, 16), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Polycaprolactam, 16) - }, - new FluidStack[] {new FluidStack(solderIndalloy, 2304), Materials.Lubricant.getFluid(4000)}, + new Object[] { GT_OreDictUnificator.get(OrePrefixes.pipeNonuple, Materials.StainlessSteel, 4), + ItemList.Electric_Pump_HV.get(8), ItemList.Quantum_Tank_LV.get(1), + GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Osmium, 8), + GT_ModHandler.getModItem("GalacticraftMars", "item.null", 1L, 6), + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Polycaprolactam, 16), + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Polycaprolactam, 16) }, + new FluidStack[] { new FluidStack(solderIndalloy, 2304), Materials.Lubricant.getFluid(4000) }, ItemRefer.Fluid_Storage_Core_T3.get(1), 400, 32000); @@ -352,17 +289,14 @@ public class RecipeLoader_02 { GT_Values.RA.addAssemblylineRecipe( ItemRefer.Fluid_Storage_Core_T3.get(1), 40000, - new Object[] { - GT_OreDictUnificator.get(OrePrefixes.pipeNonuple, Materials.Titanium, 4), - ItemList.Electric_Pump_EV.get(8), - ItemList.Quantum_Tank_LV.get(4), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Europium, 8), - GT_ModHandler.getModItem("GalacticraftMars", "item.null", 4L, 6), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.StyreneButadieneRubber, 32), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.StyreneButadieneRubber, 32), - GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.TungstenSteel, 64) - }, - new FluidStack[] {new FluidStack(solderIndalloy, 18432), Materials.Lubricant.getFluid(16000)}, + new Object[] { GT_OreDictUnificator.get(OrePrefixes.pipeNonuple, Materials.Titanium, 4), + ItemList.Electric_Pump_EV.get(8), ItemList.Quantum_Tank_LV.get(4), + GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Europium, 8), + GT_ModHandler.getModItem("GalacticraftMars", "item.null", 4L, 6), + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.StyreneButadieneRubber, 32), + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.StyreneButadieneRubber, 32), + GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.TungstenSteel, 64) }, + new FluidStack[] { new FluidStack(solderIndalloy, 18432), Materials.Lubricant.getFluid(16000) }, ItemRefer.Fluid_Storage_Core_T4.get(1), 400, 128000); @@ -370,162 +304,123 @@ public class RecipeLoader_02 { GT_Values.RA.addAssemblylineRecipe( ItemRefer.Fluid_Storage_Core_T4.get(1), 80000, - new Object[] { - GT_OreDictUnificator.get(OrePrefixes.pipeNonuple, Materials.MysteriousCrystal, 4), - ItemList.Electric_Pump_IV.get(8), - ItemList.Quantum_Tank_HV.get(8), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Neutronium, 8), - GT_ModHandler.getModItem("GalacticraftMars", "item.null", 16L, 6), - GT_OreDictUnificator.get(OrePrefixes.plateQuintuple, Materials.Polycaprolactam, 12), - GT_OreDictUnificator.get(OrePrefixes.plateQuintuple, Materials.Polycaprolactam, 12), - GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Titanium, 64), - GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Titanium, 64) - }, - new FluidStack[] { - Materials.Draconium.getMolten(2304), - Materials.Titanium.getMolten(288), - Materials.Lubricant.getFluid(64000) - }, + new Object[] { GT_OreDictUnificator.get(OrePrefixes.pipeNonuple, Materials.MysteriousCrystal, 4), + ItemList.Electric_Pump_IV.get(8), ItemList.Quantum_Tank_HV.get(8), + GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Neutronium, 8), + GT_ModHandler.getModItem("GalacticraftMars", "item.null", 16L, 6), + GT_OreDictUnificator.get(OrePrefixes.plateQuintuple, Materials.Polycaprolactam, 12), + GT_OreDictUnificator.get(OrePrefixes.plateQuintuple, Materials.Polycaprolactam, 12), + GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Titanium, 64), + GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Titanium, 64) }, + new FluidStack[] { Materials.Draconium.getMolten(2304), Materials.Titanium.getMolten(288), + Materials.Lubricant.getFluid(64000) }, ItemRefer.Fluid_Storage_Core_T5.get(1), 400, 520000); GT_Values.RA.addAssemblylineRecipe( ItemRefer.Fluid_Storage_Core_T5.get(1), 160000, - new Object[] { - GT_OreDictUnificator.get(OrePrefixes.pipeNonuple, Materials.Infinity, 4), - ItemList.Electric_Pump_LuV.get(8), - ItemList.Quantum_Tank_EV.get(16), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Infinity, 8), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Infinity, 8), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.DraconiumAwakened, 8), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.DraconiumAwakened, 8), - GT_ModHandler.getModItem("GalacticraftMars", "item.null", 64L, 6), - ItemList.Machine_IV_Compressor.get(64) - }, - new FluidStack[] { - Materials.Draconium.getMolten(2304), - Materials.Titanium.getMolten(288), - Materials.Lubricant.getFluid(64000) - }, + new Object[] { GT_OreDictUnificator.get(OrePrefixes.pipeNonuple, Materials.Infinity, 4), + ItemList.Electric_Pump_LuV.get(8), ItemList.Quantum_Tank_EV.get(16), + GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Infinity, 8), + GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Infinity, 8), + GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.DraconiumAwakened, 8), + GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.DraconiumAwakened, 8), + GT_ModHandler.getModItem("GalacticraftMars", "item.null", 64L, 6), + ItemList.Machine_IV_Compressor.get(64) }, + new FluidStack[] { Materials.Draconium.getMolten(2304), Materials.Titanium.getMolten(288), + Materials.Lubricant.getFluid(64000) }, ItemRefer.Fluid_Storage_Core_T6.get(1), 400, 2090000); GT_Values.RA.addAssemblylineRecipe( ItemRefer.Fluid_Storage_Core_T6.get(1), 320000, - new Object[] { - GT_ModHandler.getModItem("GalacticraftMars", "item.null", 64L, 6), - ItemList.Electric_Pump_ZPM.get(8), - GT_ModHandler.getModItem("Avaritia", "Neutronium_Compressor", 1L, 0), - ItemList.Quantum_Tank_EV.get(32), - GT_OreDictUnificator.get(OrePrefixes.pipeNonuple, Materials.Infinity, 8), - GT_OreDictUnificator.get(OrePrefixes.plateQuintuple, Materials.InfinityCatalyst, 8), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.DraconiumAwakened, 8), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.DraconiumAwakened, 8) - }, - new FluidStack[] { - Materials.Draconium.getMolten(23040), - new FluidStack(solderIndalloy, 2304), - Materials.InfinityCatalyst.getMolten(1140) - }, + new Object[] { GT_ModHandler.getModItem("GalacticraftMars", "item.null", 64L, 6), + ItemList.Electric_Pump_ZPM.get(8), + GT_ModHandler.getModItem("Avaritia", "Neutronium_Compressor", 1L, 0), + ItemList.Quantum_Tank_EV.get(32), + GT_OreDictUnificator.get(OrePrefixes.pipeNonuple, Materials.Infinity, 8), + GT_OreDictUnificator.get(OrePrefixes.plateQuintuple, Materials.InfinityCatalyst, 8), + GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.DraconiumAwakened, 8), + GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.DraconiumAwakened, 8) }, + new FluidStack[] { Materials.Draconium.getMolten(23040), new FluidStack(solderIndalloy, 2304), + Materials.InfinityCatalyst.getMolten(1140) }, ItemRefer.Fluid_Storage_Core_T7.get(1), 400, 8300000); GT_Values.RA.addAssemblylineRecipe( ItemRefer.Fluid_Storage_Core_T7.get(1), 640000, - new Object[] { - GT_ModHandler.getModItem("GalacticraftMars", "item.null", 64L, 6), - ItemList.Electric_Pump_UV.get(8), - GT_ModHandler.getModItem("Avaritia", "Neutronium_Compressor", 2L, 0), - ItemList.Quantum_Tank_EV.get(64), - GT_OreDictUnificator.get(OrePrefixes.pipeNonuple, Materials.Infinity, 16), - GT_OreDictUnificator.get(OrePrefixes.plateQuintuple, Materials.Infinity, 12), - GT_OreDictUnificator.get(OrePrefixes.plateQuintuple, Materials.Infinity, 12), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.DraconiumAwakened, 8), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.DraconiumAwakened, 8) - }, - new FluidStack[] { - Materials.Draconium.getMolten(36864), - new FluidStack(solderIndalloy, 30240), - Materials.InfinityCatalyst.getMolten(5670) - }, + new Object[] { GT_ModHandler.getModItem("GalacticraftMars", "item.null", 64L, 6), + ItemList.Electric_Pump_UV.get(8), + GT_ModHandler.getModItem("Avaritia", "Neutronium_Compressor", 2L, 0), + ItemList.Quantum_Tank_EV.get(64), + GT_OreDictUnificator.get(OrePrefixes.pipeNonuple, Materials.Infinity, 16), + GT_OreDictUnificator.get(OrePrefixes.plateQuintuple, Materials.Infinity, 12), + GT_OreDictUnificator.get(OrePrefixes.plateQuintuple, Materials.Infinity, 12), + GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.DraconiumAwakened, 8), + GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.DraconiumAwakened, 8) }, + new FluidStack[] { Materials.Draconium.getMolten(36864), new FluidStack(solderIndalloy, 30240), + Materials.InfinityCatalyst.getMolten(5670) }, ItemRefer.Fluid_Storage_Core_T8.get(1), 400, 33554000); GT_Values.RA.addAssemblylineRecipe( ItemRefer.Fluid_Storage_Core_T8.get(1), 12800000, - new Object[] { - GT_ModHandler.getModItem("GalacticraftMars", "item.null", 64L, 6), - ItemList.Electric_Pump_UHV.get(8), - GT_ModHandler.getModItem("Avaritia", "Neutronium_Compressor", 2L, 0), - ItemList.Quantum_Tank_IV.get(8), - GT_OreDictUnificator.get(OrePrefixes.pipeNonuple, Materials.Infinity, 32), - GT_OreDictUnificator.get(OrePrefixes.plateQuintuple, Materials.Infinity, 12), - GT_OreDictUnificator.get(OrePrefixes.plateQuintuple, Materials.Infinity, 12), - GT_OreDictUnificator.get(OrePrefixes.plateQuintuple, Materials.Infinity, 12), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.DraconiumAwakened, 8) - }, - new FluidStack[] { - Materials.Draconium.getMolten(36864), - new FluidStack(solderIndalloy, 30240), - Materials.TranscendentMetal.getMolten(1440), - Materials.InfinityCatalyst.getMolten(5670) - }, + new Object[] { GT_ModHandler.getModItem("GalacticraftMars", "item.null", 64L, 6), + ItemList.Electric_Pump_UHV.get(8), + GT_ModHandler.getModItem("Avaritia", "Neutronium_Compressor", 2L, 0), + ItemList.Quantum_Tank_IV.get(8), + GT_OreDictUnificator.get(OrePrefixes.pipeNonuple, Materials.Infinity, 32), + GT_OreDictUnificator.get(OrePrefixes.plateQuintuple, Materials.Infinity, 12), + GT_OreDictUnificator.get(OrePrefixes.plateQuintuple, Materials.Infinity, 12), + GT_OreDictUnificator.get(OrePrefixes.plateQuintuple, Materials.Infinity, 12), + GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.DraconiumAwakened, 8) }, + new FluidStack[] { Materials.Draconium.getMolten(36864), new FluidStack(solderIndalloy, 30240), + Materials.TranscendentMetal.getMolten(1440), Materials.InfinityCatalyst.getMolten(5670) }, ItemRefer.Fluid_Storage_Core_T9.get(1), 400, 134217000); GT_Values.RA.addAssemblylineRecipe( ItemRefer.Fluid_Storage_Core_T9.get(1), 25600000, - new Object[] { - GT_ModHandler.getModItem("GalacticraftMars", "item.null", 64L, 6), - ItemList.Electric_Pump_UEV.get(8), - GT_ModHandler.getModItem("Avaritia", "Neutronium_Compressor", 4L, 0), - ItemList.Quantum_Tank_IV.get(16), - GT_OreDictUnificator.get(OrePrefixes.pipeNonuple, Materials.Infinity, 32), - GT_OreDictUnificator.get(OrePrefixes.plateQuintuple, Materials.CosmicNeutronium, 12), - GT_OreDictUnificator.get(OrePrefixes.plateQuintuple, Materials.CosmicNeutronium, 12), - GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.SpaceTime, 1), - GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.SpaceTime, 1), - GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.SpaceTime, 1), - GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.SpaceTime, 1) - }, - new FluidStack[] { - Materials.Draconium.getMolten(36864), - new FluidStack(solderIndalloy, 46080), - Materials.TranscendentMetal.getMolten(4320), - Materials.InfinityCatalyst.getMolten(17010) - }, + new Object[] { GT_ModHandler.getModItem("GalacticraftMars", "item.null", 64L, 6), + ItemList.Electric_Pump_UEV.get(8), + GT_ModHandler.getModItem("Avaritia", "Neutronium_Compressor", 4L, 0), + ItemList.Quantum_Tank_IV.get(16), + GT_OreDictUnificator.get(OrePrefixes.pipeNonuple, Materials.Infinity, 32), + GT_OreDictUnificator.get(OrePrefixes.plateQuintuple, Materials.CosmicNeutronium, 12), + GT_OreDictUnificator.get(OrePrefixes.plateQuintuple, Materials.CosmicNeutronium, 12), + GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.SpaceTime, 1), + GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.SpaceTime, 1), + GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.SpaceTime, 1), + GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.SpaceTime, 1) }, + new FluidStack[] { Materials.Draconium.getMolten(36864), new FluidStack(solderIndalloy, 46080), + Materials.TranscendentMetal.getMolten(4320), Materials.InfinityCatalyst.getMolten(17010) }, ItemRefer.Fluid_Storage_Core_T10.get(1), 400, 536800000); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.BlackSteel, 1), - ItemRefer.Fluid_Storage_Core_T1.get(10), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Steel, 4), - ItemList.Electric_Pump_HV.get(8), - GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.StainlessSteel, 4), - GT_Utility.getIntegratedCircuit(5) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.BlackSteel, 1), + ItemRefer.Fluid_Storage_Core_T1.get(10), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Steel, 4), + ItemList.Electric_Pump_HV.get(8), + GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.StainlessSteel, 4), + GT_Utility.getIntegratedCircuit(5) }, Materials.Plastic.getMolten(144), ItemRefer.YOTTank_Cell_T1.get(1), 400, 480); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.TungstenSteel, 1), - ItemRefer.Fluid_Storage_Core_T2.get(10), - WerkstoffLoader.LuVTierMaterial.get(OrePrefixes.plate, 4), - ItemList.Electric_Pump_EV.get(8), - GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Enderium, 4), - GT_Utility.getIntegratedCircuit(5) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.TungstenSteel, 1), + ItemRefer.Fluid_Storage_Core_T2.get(10), + WerkstoffLoader.LuVTierMaterial.get(OrePrefixes.plate, 4), ItemList.Electric_Pump_EV.get(8), + GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Enderium, 4), + GT_Utility.getIntegratedCircuit(5) }, Materials.Polytetrafluoroethylene.getMolten(144), ItemRefer.YOTTank_Cell_T2.get(1), 1000, @@ -534,23 +429,16 @@ public class RecipeLoader_02 { GT_Values.RA.addAssemblylineRecipe( ItemRefer.YOTTank_Cell_T2.get(1), 20000, - new Object[] { - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Naquadah, 1), - ItemRefer.Fluid_Storage_Core_T3.get(5), - ItemRefer.Fluid_Storage_Core_T3.get(5), - new Object[] {OrePrefixes.circuit.get(Materials.Master), 4}, - new Object[] {OrePrefixes.circuit.get(Materials.Master), 4}, - ItemList.Electric_Pump_IV.get(8), - GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.NiobiumTitanium, 4), - GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.NiobiumTitanium, 4), - MyMaterial.adamantiumAlloy.get(OrePrefixes.plate, 16), - MyMaterial.adamantiumAlloy.get(OrePrefixes.plate, 16) - }, - new FluidStack[] { - Materials.Quantium.getMolten(1440), - FluidRegistry.getFluidStack("ic2coolant", 8000), - Materials.Lubricant.getFluid(8000) - }, + new Object[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Naquadah, 1), + ItemRefer.Fluid_Storage_Core_T3.get(5), ItemRefer.Fluid_Storage_Core_T3.get(5), + new Object[] { OrePrefixes.circuit.get(Materials.Master), 4 }, + new Object[] { OrePrefixes.circuit.get(Materials.Master), 4 }, ItemList.Electric_Pump_IV.get(8), + GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.NiobiumTitanium, 4), + GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.NiobiumTitanium, 4), + MyMaterial.adamantiumAlloy.get(OrePrefixes.plate, 16), + MyMaterial.adamantiumAlloy.get(OrePrefixes.plate, 16) }, + new FluidStack[] { Materials.Quantium.getMolten(1440), FluidRegistry.getFluidStack("ic2coolant", 8000), + Materials.Lubricant.getFluid(8000) }, ItemRefer.YOTTank_Cell_T3.get(1), 1000, 32000); @@ -558,23 +446,17 @@ public class RecipeLoader_02 { GT_Values.RA.addAssemblylineRecipe( ItemRefer.YOTTank_Cell_T3.get(1), 40000, - new Object[] { - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Neutronium, 1), - ItemRefer.Fluid_Storage_Core_T4.get(5), - ItemRefer.Fluid_Storage_Core_T4.get(5), - new Object[] {OrePrefixes.circuit.get(Materials.Ultimate), 4}, - new Object[] {OrePrefixes.circuit.get(Materials.Ultimate), 4}, - ItemList.Electric_Pump_LuV.get(8), - GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.MysteriousCrystal, 4), - GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.MysteriousCrystal, 4), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.ElectrumFlux, 16), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.ElectrumFlux, 16) - }, - new FluidStack[] { - Materials.Draconium.getMolten(1440), - FluidRegistry.getFluidStack("ic2coolant", 16000), - Materials.Lubricant.getFluid(16000) - }, + new Object[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Neutronium, 1), + ItemRefer.Fluid_Storage_Core_T4.get(5), ItemRefer.Fluid_Storage_Core_T4.get(5), + new Object[] { OrePrefixes.circuit.get(Materials.Ultimate), 4 }, + new Object[] { OrePrefixes.circuit.get(Materials.Ultimate), 4 }, + ItemList.Electric_Pump_LuV.get(8), + GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.MysteriousCrystal, 4), + GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.MysteriousCrystal, 4), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.ElectrumFlux, 16), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.ElectrumFlux, 16) }, + new FluidStack[] { Materials.Draconium.getMolten(1440), + FluidRegistry.getFluidStack("ic2coolant", 16000), Materials.Lubricant.getFluid(16000) }, ItemRefer.YOTTank_Cell_T4.get(1), 1000, 128000); @@ -582,25 +464,19 @@ public class RecipeLoader_02 { GT_Values.RA.addAssemblylineRecipe( ItemRefer.YOTTank_Cell_T4.get(1), 80000, - new Object[] { - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.CosmicNeutronium, 1), - ItemRefer.Fluid_Storage_Core_T5.get(5), - ItemRefer.Fluid_Storage_Core_T5.get(5), - new Object[] {OrePrefixes.circuit.get(Materials.Superconductor), 4}, - new Object[] {OrePrefixes.circuit.get(Materials.Superconductor), 4}, - ItemList.Electric_Pump_ZPM.get(8), - GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.DraconiumAwakened, 4), - GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.DraconiumAwakened, 4), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 16), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 16), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 16), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 16) - }, - new FluidStack[] { - Materials.Draconium.getMolten(1440), - FluidRegistry.getFluidStack("ic2coolant", 16000), - Materials.Lubricant.getFluid(16000) - }, + new Object[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.CosmicNeutronium, 1), + ItemRefer.Fluid_Storage_Core_T5.get(5), ItemRefer.Fluid_Storage_Core_T5.get(5), + new Object[] { OrePrefixes.circuit.get(Materials.Superconductor), 4 }, + new Object[] { OrePrefixes.circuit.get(Materials.Superconductor), 4 }, + ItemList.Electric_Pump_ZPM.get(8), + GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.DraconiumAwakened, 4), + GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.DraconiumAwakened, 4), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 16), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 16), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 16), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 16) }, + new FluidStack[] { Materials.Draconium.getMolten(1440), + FluidRegistry.getFluidStack("ic2coolant", 16000), Materials.Lubricant.getFluid(16000) }, ItemRefer.YOTTank_Cell_T5.get(1), 1000, 520000); @@ -608,159 +484,120 @@ public class RecipeLoader_02 { GT_Values.RA.addAssemblylineRecipe( ItemRefer.YOTTank_Cell_T5.get(1), 160000, - new Object[] { - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Infinity, 1), - ItemRefer.Fluid_Storage_Core_T6.get(2), - new Object[] {OrePrefixes.circuit.get(Materials.Infinite), 4L}, - new Object[] {OrePrefixes.circuit.get(Materials.Infinite), 4L}, - ItemList.Electric_Pump_UV.get(8), - GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.NetherStar, 4), - GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.NetherStar, 4), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Infinity, 16), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Infinity, 16), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Infinity, 16), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Infinity, 16) - }, - new FluidStack[] { - Materials.DraconiumAwakened.getMolten(1440), - FluidRegistry.getFluidStack("ic2coolant", 46080), - Materials.Lubricant.getFluid(32000) - }, + new Object[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Infinity, 1), + ItemRefer.Fluid_Storage_Core_T6.get(2), + new Object[] { OrePrefixes.circuit.get(Materials.Infinite), 4L }, + new Object[] { OrePrefixes.circuit.get(Materials.Infinite), 4L }, + ItemList.Electric_Pump_UV.get(8), + GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.NetherStar, 4), + GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.NetherStar, 4), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Infinity, 16), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Infinity, 16), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Infinity, 16), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Infinity, 16) }, + new FluidStack[] { Materials.DraconiumAwakened.getMolten(1440), + FluidRegistry.getFluidStack("ic2coolant", 46080), Materials.Lubricant.getFluid(32000) }, ItemRefer.YOTTank_Cell_T6.get(1), 1000, 2090000); GT_Values.RA.addAssemblylineRecipe( ItemRefer.YOTTank_Cell_T6.get(1), 160000, - new Object[] { - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Infinity, 1), - ItemRefer.Fluid_Storage_Core_T7.get(2), - new Object[] {OrePrefixes.circuit.get(Materials.Bio), 4L}, - new Object[] {OrePrefixes.circuit.get(Materials.Bio), 4L}, - ItemList.Electric_Pump_UHV.get(8), - GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.NetherStar, 8), - GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.NetherStar, 8), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.CosmicNeutronium, 16), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.CosmicNeutronium, 16), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Infinity, 16), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Infinity, 16) - }, - new FluidStack[] { - Materials.DraconiumAwakened.getMolten(14400), - FluidRegistry.getFluidStack("supercoolant", 46080), - Materials.Lubricant.getFluid(46080) - }, + new Object[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Infinity, 1), + ItemRefer.Fluid_Storage_Core_T7.get(2), + new Object[] { OrePrefixes.circuit.get(Materials.Bio), 4L }, + new Object[] { OrePrefixes.circuit.get(Materials.Bio), 4L }, ItemList.Electric_Pump_UHV.get(8), + GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.NetherStar, 8), + GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.NetherStar, 8), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.CosmicNeutronium, 16), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.CosmicNeutronium, 16), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Infinity, 16), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Infinity, 16) }, + new FluidStack[] { Materials.DraconiumAwakened.getMolten(14400), + FluidRegistry.getFluidStack("supercoolant", 46080), Materials.Lubricant.getFluid(46080) }, ItemRefer.YOTTank_Cell_T7.get(1), 1000, 8300000); GT_Values.RA.addAssemblylineRecipe( ItemRefer.YOTTank_Cell_T7.get(1), 160000, - new Object[] { - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Infinity, 1), - ItemRefer.Fluid_Storage_Core_T8.get(2), - new Object[] {OrePrefixes.circuit.get(Materials.Optical), 4L}, - new Object[] {OrePrefixes.circuit.get(Materials.Optical), 4L}, - ItemList.Electric_Pump_UEV.get(8), - GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.NetherStar, 12), - GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.CosmicNeutronium, 12), - GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.DraconiumAwakened, 12), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Infinity, 32), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Infinity, 32) - }, - new FluidStack[] { - Materials.DraconiumAwakened.getMolten(14400), - FluidRegistry.getFluidStack("supercoolant", 46080), - Materials.Lubricant.getFluid(46080) - }, + new Object[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Infinity, 1), + ItemRefer.Fluid_Storage_Core_T8.get(2), + new Object[] { OrePrefixes.circuit.get(Materials.Optical), 4L }, + new Object[] { OrePrefixes.circuit.get(Materials.Optical), 4L }, + ItemList.Electric_Pump_UEV.get(8), + GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.NetherStar, 12), + GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.CosmicNeutronium, 12), + GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.DraconiumAwakened, 12), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Infinity, 32), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Infinity, 32) }, + new FluidStack[] { Materials.DraconiumAwakened.getMolten(14400), + FluidRegistry.getFluidStack("supercoolant", 46080), Materials.Lubricant.getFluid(46080) }, ItemRefer.YOTTank_Cell_T8.get(1), 1000, 33554000); GT_Values.RA.addAssemblylineRecipe( ItemRefer.YOTTank_Cell_T8.get(1), 200000, - new Object[] { - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Infinity, 2), - ItemRefer.Fluid_Storage_Core_T9.get(2), - new Object[] {OrePrefixes.circuit.get(Materials.Piko), 4L}, - new Object[] {OrePrefixes.circuit.get(Materials.Piko), 4L}, - ItemList.Electric_Pump_UIV.get(8), - GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.NetherStar, 12), - GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.CosmicNeutronium, 12), - GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.DraconiumAwakened, 12), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Infinity, 32), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Infinity, 32) - }, - new FluidStack[] { - Materials.DraconiumAwakened.getMolten(14400), - FluidRegistry.getFluidStack("supercoolant", 46080), - Materials.Lubricant.getFluid(46080) - }, + new Object[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Infinity, 2), + ItemRefer.Fluid_Storage_Core_T9.get(2), + new Object[] { OrePrefixes.circuit.get(Materials.Piko), 4L }, + new Object[] { OrePrefixes.circuit.get(Materials.Piko), 4L }, ItemList.Electric_Pump_UIV.get(8), + GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.NetherStar, 12), + GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.CosmicNeutronium, 12), + GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.DraconiumAwakened, 12), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Infinity, 32), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Infinity, 32) }, + new FluidStack[] { Materials.DraconiumAwakened.getMolten(14400), + FluidRegistry.getFluidStack("supercoolant", 46080), Materials.Lubricant.getFluid(46080) }, ItemRefer.YOTTank_Cell_T9.get(1), 1000, 134217000); GT_Values.RA.addAssemblylineRecipe( ItemRefer.YOTTank_Cell_T9.get(1), 240000, - new Object[] { - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.SpaceTime, 2), - ItemRefer.Fluid_Storage_Core_T10.get(2), - new Object[] {OrePrefixes.circuit.get(Materials.Quantum), 6L}, - new Object[] {OrePrefixes.circuit.get(Materials.Quantum), 6L}, - ItemList.Electric_Pump_UMV.get(8), - GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.NetherStar, 64), - GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.CosmicNeutronium, 12), - GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.DraconiumAwakened, 12), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.SpaceTime, 5), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.SpaceTime, 5) - }, - new FluidStack[] { - Materials.DraconiumAwakened.getMolten(14400), - Materials.TranscendentMetal.getMolten(1440), - FluidRegistry.getFluidStack("supercoolant", 46080), - Materials.Lubricant.getFluid(46080) - }, + new Object[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.SpaceTime, 2), + ItemRefer.Fluid_Storage_Core_T10.get(2), + new Object[] { OrePrefixes.circuit.get(Materials.Quantum), 6L }, + new Object[] { OrePrefixes.circuit.get(Materials.Quantum), 6L }, + ItemList.Electric_Pump_UMV.get(8), + GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.NetherStar, 64), + GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.CosmicNeutronium, 12), + GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.DraconiumAwakened, 12), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.SpaceTime, 5), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.SpaceTime, 5) }, + new FluidStack[] { Materials.DraconiumAwakened.getMolten(14400), + Materials.TranscendentMetal.getMolten(1440), FluidRegistry.getFluidStack("supercoolant", 46080), + Materials.Lubricant.getFluid(46080) }, ItemRefer.YOTTank_Cell_T10.get(1), 1000, 536800000); // Craft 2x64X Tier to 1X+1 Tier GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemRefer.Fluid_Storage_Core_T6.get(64), - ItemRefer.Fluid_Storage_Core_T6.get(64), - GT_Utility.getIntegratedCircuit(2) - }, + new ItemStack[] { ItemRefer.Fluid_Storage_Core_T6.get(64), ItemRefer.Fluid_Storage_Core_T6.get(64), + GT_Utility.getIntegratedCircuit(2) }, GT_Values.NF, ItemRefer.Fluid_Storage_Core_T7.get(1), 200, 7680); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemRefer.Fluid_Storage_Core_T7.get(64), - ItemRefer.Fluid_Storage_Core_T7.get(64), - GT_Utility.getIntegratedCircuit(2) - }, + new ItemStack[] { ItemRefer.Fluid_Storage_Core_T7.get(64), ItemRefer.Fluid_Storage_Core_T7.get(64), + GT_Utility.getIntegratedCircuit(2) }, GT_Values.NF, ItemRefer.Fluid_Storage_Core_T8.get(1), 200, 7680); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemRefer.Fluid_Storage_Core_T8.get(64), - ItemRefer.Fluid_Storage_Core_T8.get(64), - GT_Utility.getIntegratedCircuit(2) - }, + new ItemStack[] { ItemRefer.Fluid_Storage_Core_T8.get(64), ItemRefer.Fluid_Storage_Core_T8.get(64), + GT_Utility.getIntegratedCircuit(2) }, GT_Values.NF, ItemRefer.Fluid_Storage_Core_T9.get(1), 200, 7680); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemRefer.Fluid_Storage_Core_T9.get(64), - ItemRefer.Fluid_Storage_Core_T9.get(64), - GT_Utility.getIntegratedCircuit(2) - }, + new ItemStack[] { ItemRefer.Fluid_Storage_Core_T9.get(64), ItemRefer.Fluid_Storage_Core_T9.get(64), + GT_Utility.getIntegratedCircuit(2) }, GT_Values.NF, ItemRefer.Fluid_Storage_Core_T10.get(1), 200, @@ -846,7 +683,7 @@ public class RecipeLoader_02 { WerkstoffLoader.Tiberium.get(OrePrefixes.gem, 1), null, null, - new int[] {10000}, + new int[] { 10000 }, 400, 1980); @@ -856,15 +693,14 @@ public class RecipeLoader_02 { WerkstoffLoader.Tiberium.get(OrePrefixes.gem, 1), null, null, - new int[] {10000}, + new int[] { 10000 }, 400, 1980); GT_Values.RA.addDistillationTowerRecipe( Materials.HeavyFuel.getFluid(1000), - new FluidStack[] { - Materials.Toluene.getFluid(400), Materials.Benzene.getFluid(400), Materials.Phenol.getFluid(250) - }, + new FluidStack[] { Materials.Toluene.getFluid(400), Materials.Benzene.getFluid(400), + Materials.Phenol.getFluid(250) }, null, 120, 480); @@ -906,7 +742,12 @@ public class RecipeLoader_02 { } GT_Values.RA.addDistilleryRecipe( - 24, Materials.WoodTar.getFluid(500), MyMaterial.cyclopentadiene.getFluidOrGas(20), 100, 120, false); + 24, + Materials.WoodTar.getFluid(500), + MyMaterial.cyclopentadiene.getFluidOrGas(20), + 100, + 120, + false); // FeCl2 + Cl = FeCl3 GT_Values.RA.addChemicalRecipe( @@ -938,14 +779,11 @@ public class RecipeLoader_02 { 120); GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] {GT_Utility.getIntegratedCircuit(2)}, - new FluidStack[] { - MyMaterial.cyclopentadiene.getFluidOrGas(2000), - MyMaterial.ferrousChloride.getFluidOrGas(1000), - MyMaterial.diethylamine.getFluidOrGas(8000), - Materials.Ice.getSolid(4000) - }, - new FluidStack[] {MyMaterial.impureFerroceneMixture.getFluidOrGas(15000)}, + new ItemStack[] { GT_Utility.getIntegratedCircuit(2) }, + new FluidStack[] { MyMaterial.cyclopentadiene.getFluidOrGas(2000), + MyMaterial.ferrousChloride.getFluidOrGas(1000), MyMaterial.diethylamine.getFluidOrGas(8000), + Materials.Ice.getSolid(4000) }, + new FluidStack[] { MyMaterial.impureFerroceneMixture.getFluidOrGas(15000) }, null, 2400, 120); @@ -963,49 +801,37 @@ public class RecipeLoader_02 { GT_Values.RA.addUniversalDistillationRecipe( MyMaterial.ferroceneWaste.getFluidOrGas(1000), - new FluidStack[] { - Materials.Water.getFluid(400), - MyMaterial.diethylamine.getFluidOrGas(800), - MyMaterial.ether.getFluidOrGas(500) - }, + new FluidStack[] { Materials.Water.getFluid(400), MyMaterial.diethylamine.getFluidOrGas(800), + MyMaterial.ether.getFluidOrGas(500) }, null, 600, 120); GT_Values.RA.addUniversalDistillationRecipe( MyMaterial.ferroceneSolution.getFluidOrGas(2000), - new FluidStack[] {MyMaterial.ether.getFluidOrGas(1000)}, + new FluidStack[] { MyMaterial.ether.getFluidOrGas(1000) }, MyMaterial.ferrocene.get(OrePrefixes.dust, 1), 600, 120); if (LoadedList.GTPP) { GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] {MyMaterial.ferrocene.get(OrePrefixes.dust, 4), Materials.SodiumHydroxide.getDust(8) - }, - new FluidStack[] { - FluidRegistry.getFluidStack("fluid.kerosene", 40000), - Materials.Naphtha.getFluid(3000), - MyMaterial.diethylamine.getFluidOrGas(1000) - }, - new FluidStack[] {MyMaterial.ironedKerosene.getFluidOrGas(44000)}, + new ItemStack[] { MyMaterial.ferrocene.get(OrePrefixes.dust, 4), + Materials.SodiumHydroxide.getDust(8) }, + new FluidStack[] { FluidRegistry.getFluidStack("fluid.kerosene", 40000), + Materials.Naphtha.getFluid(3000), MyMaterial.diethylamine.getFluidOrGas(1000) }, + new FluidStack[] { MyMaterial.ironedKerosene.getFluidOrGas(44000) }, null, 2400, 1920); } GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] { - MyMaterial.ferrocene.get(OrePrefixes.dust, 4), - }, - new FluidStack[] { - FluidRegistry.getFluidStack("combustionpromotor", 4000), - Materials.Naphtha.getFluid(40000), - Materials.LightFuel.getFluid(3000), - Materials.LPG.getFluid(1000), - Materials.Tetranitromethane.getFluid(2000), - }, - new FluidStack[] {MyMaterial.ironedFuel.getFluidOrGas(50000)}, + new ItemStack[] { MyMaterial.ferrocene.get(OrePrefixes.dust, 4), }, + new FluidStack[] { FluidRegistry.getFluidStack("combustionpromotor", 4000), + Materials.Naphtha.getFluid(40000), Materials.LightFuel.getFluid(3000), + Materials.LPG.getFluid(1000), Materials.Tetranitromethane.getFluid(2000), }, + new FluidStack[] { MyMaterial.ironedFuel.getFluidOrGas(50000) }, null, 2400, 7680); @@ -1013,44 +839,18 @@ public class RecipeLoader_02 { GT_ModHandler.addCraftingRecipe( ItemRefer.Combustion_Generator_EV.get(1), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.REVERSIBLE, - new Object[] { - "PCP", - "MHM", - "GWG", - 'G', - GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.Titanium, 1), - 'C', - "circuitData", - 'W', - GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Aluminium, 1), - 'P', - ItemList.Electric_Piston_EV, - 'H', - ItemList.Hull_EV, - 'M', - ItemList.Electric_Motor_EV - }); + new Object[] { "PCP", "MHM", "GWG", 'G', + GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.Titanium, 1), 'C', "circuitData", 'W', + GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Aluminium, 1), 'P', + ItemList.Electric_Piston_EV, 'H', ItemList.Hull_EV, 'M', ItemList.Electric_Motor_EV }); GT_ModHandler.addCraftingRecipe( ItemRefer.Combustion_Generator_IV.get(1), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.REVERSIBLE, - new Object[] { - "PCP", - "MHM", - "GWG", - 'G', - GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.TungstenSteel, 1), - 'C', - "circuitElite", - 'W', - GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Tungsten, 1), - 'P', - ItemList.Electric_Piston_IV, - 'H', - ItemList.Hull_IV, - 'M', - ItemList.Electric_Motor_IV - }); + new Object[] { "PCP", "MHM", "GWG", 'G', + GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.TungstenSteel, 1), 'C', "circuitElite", + 'W', GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Tungsten, 1), 'P', + ItemList.Electric_Piston_IV, 'H', ItemList.Hull_IV, 'M', ItemList.Electric_Motor_IV }); GT_Values.RA.addFluidCannerRecipe( ItemRefer.Advanced_Fuel_Rod.get(1), @@ -1069,66 +869,48 @@ public class RecipeLoader_02 { 1920); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemRefer.Fuel_Rod_LPu_1.get(2), - MyMaterial.zircaloy2.get(OrePrefixes.stick, 4), - GT_Utility.getIntegratedCircuit(2) - }, + new ItemStack[] { ItemRefer.Fuel_Rod_LPu_1.get(2), MyMaterial.zircaloy2.get(OrePrefixes.stick, 4), + GT_Utility.getIntegratedCircuit(2) }, null, ItemRefer.Fuel_Rod_LPu_2.get(1), 200, 7680); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemRefer.Fuel_Rod_LPu_2.get(2), - MyMaterial.zircaloy2.get(OrePrefixes.stick, 4), - GT_Utility.getIntegratedCircuit(5) - }, + new ItemStack[] { ItemRefer.Fuel_Rod_LPu_2.get(2), MyMaterial.zircaloy2.get(OrePrefixes.stick, 4), + GT_Utility.getIntegratedCircuit(5) }, null, ItemRefer.Fuel_Rod_LPu_4.get(1), 200, 7680); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemRefer.Fuel_Rod_LPu_1.get(4), - MyMaterial.zircaloy2.get(OrePrefixes.stickLong, 6), - GT_Utility.getIntegratedCircuit(4) - }, + new ItemStack[] { ItemRefer.Fuel_Rod_LPu_1.get(4), MyMaterial.zircaloy2.get(OrePrefixes.stickLong, 6), + GT_Utility.getIntegratedCircuit(4) }, null, ItemRefer.Fuel_Rod_LPu_4.get(1), 220, 7680); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemRefer.Fuel_Rod_LU_1.get(2), - MyMaterial.zircaloy2.get(OrePrefixes.stick, 4), - GT_Utility.getIntegratedCircuit(2) - }, + new ItemStack[] { ItemRefer.Fuel_Rod_LU_1.get(2), MyMaterial.zircaloy2.get(OrePrefixes.stick, 4), + GT_Utility.getIntegratedCircuit(2) }, null, ItemRefer.Fuel_Rod_LU_2.get(1), 200, 7680); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemRefer.Fuel_Rod_LU_2.get(2), - MyMaterial.zircaloy2.get(OrePrefixes.stick, 4), - GT_Utility.getIntegratedCircuit(5) - }, + new ItemStack[] { ItemRefer.Fuel_Rod_LU_2.get(2), MyMaterial.zircaloy2.get(OrePrefixes.stick, 4), + GT_Utility.getIntegratedCircuit(5) }, null, ItemRefer.Fuel_Rod_LU_4.get(1), 200, 7680); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemRefer.Fuel_Rod_LU_1.get(4), - MyMaterial.zircaloy2.get(OrePrefixes.stickLong, 6), - GT_Utility.getIntegratedCircuit(4) - }, + new ItemStack[] { ItemRefer.Fuel_Rod_LU_1.get(4), MyMaterial.zircaloy2.get(OrePrefixes.stickLong, 6), + GT_Utility.getIntegratedCircuit(4) }, null, ItemRefer.Fuel_Rod_LU_4.get(1), 220, @@ -1156,7 +938,7 @@ public class RecipeLoader_02 { Materials.RockSalt.getDust(1), MyMaterial.lithiumChloride.get(OrePrefixes.dust, 3), Materials.Cryolite.getDust(4), - new int[] {8000, 8000, 8000}, + new int[] { 8000, 8000, 8000 }, 140, 120); @@ -1174,24 +956,12 @@ public class RecipeLoader_02 { GT_ModHandler.addCraftingRecipe( ItemRefer.SC_Turbine_Casing.get(1), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.REVERSIBLE, - new Object[] { - "PhP", - "GCG", - "PwP", - 'G', - MyMaterial.marM200.get(OrePrefixes.gearGt, 1), - 'C', - ItemList.Casing_Turbine.get(1), - 'P', - MyMaterial.marCeM200.get(OrePrefixes.plate, 1), - }); + new Object[] { "PhP", "GCG", "PwP", 'G', MyMaterial.marM200.get(OrePrefixes.gearGt, 1), 'C', + ItemList.Casing_Turbine.get(1), 'P', MyMaterial.marCeM200.get(OrePrefixes.plate, 1), }); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - MyMaterial.marM200.get(OrePrefixes.gearGt, 2), - MyMaterial.marCeM200.get(OrePrefixes.plate, 4), - ItemList.Casing_Turbine.get(1) - }, + new ItemStack[] { MyMaterial.marM200.get(OrePrefixes.gearGt, 2), + MyMaterial.marCeM200.get(OrePrefixes.plate, 4), ItemList.Casing_Turbine.get(1) }, null, ItemRefer.SC_Turbine_Casing.get(1), 300, @@ -1200,42 +970,26 @@ public class RecipeLoader_02 { GT_ModHandler.addCraftingRecipe( ItemRefer.SC_Fluid_Turbine.get(1), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.REVERSIBLE, - new Object[] { - "NPN", - "GHG", - "IPI", - 'N', - "circuitMaster", - 'P', - MyMaterial.marM200.get(OrePrefixes.plate, 1), - 'H', - ItemList.Hull_IV.get(1), - 'G', - MyMaterial.marCeM200.get(OrePrefixes.gearGt, 1), - 'I', - MyMaterial.incoloy903.get(OrePrefixes.pipeLarge, 1) - }); + new Object[] { "NPN", "GHG", "IPI", 'N', "circuitMaster", 'P', + MyMaterial.marM200.get(OrePrefixes.plate, 1), 'H', ItemList.Hull_IV.get(1), 'G', + MyMaterial.marCeM200.get(OrePrefixes.gearGt, 1), 'I', + MyMaterial.incoloy903.get(OrePrefixes.pipeLarge, 1) }); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - MyMaterial.marM200.get(OrePrefixes.plate, 2), - MyMaterial.marCeM200.get(OrePrefixes.gearGt, 2), - MyMaterial.incoloy903.get(OrePrefixes.pipeLarge, 2), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Master, 2), - ItemList.Hull_IV.get(1) - }, + new ItemStack[] { MyMaterial.marM200.get(OrePrefixes.plate, 2), + MyMaterial.marCeM200.get(OrePrefixes.gearGt, 2), + MyMaterial.incoloy903.get(OrePrefixes.pipeLarge, 2), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Master, 2), ItemList.Hull_IV.get(1) }, null, ItemRefer.SC_Fluid_Turbine.get(1), 300, 480); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - MyMaterial.incoloy903.get(OrePrefixes.plate, 4), - MyMaterial.marCeM200.get(OrePrefixes.plate, 4), - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.NiobiumTitanium, 1), - GT_Utility.getIntegratedCircuit(8) - }, + new ItemStack[] { MyMaterial.incoloy903.get(OrePrefixes.plate, 4), + MyMaterial.marCeM200.get(OrePrefixes.plate, 4), + GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.NiobiumTitanium, 1), + GT_Utility.getIntegratedCircuit(8) }, null, ItemRefer.Pressure_Resistant_Wall.get(1), 1000, @@ -1244,19 +998,10 @@ public class RecipeLoader_02 { GT_ModHandler.addCraftingRecipe( ItemRefer.Extreme_Heat_Exchanger.get(1), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.REVERSIBLE, - new Object[] { - "EPE", - "PHP", - "SPS", - 'P', - GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.TungstenSteel, 1), - 'H', - ItemList.Hull_IV.get(1), - 'S', - MyMaterial.marM200.get(OrePrefixes.plate, 1), - 'E', - GT_ModHandler.getIC2Item("reactorHeatSwitchDiamond", 1L, 1) - }); + new Object[] { "EPE", "PHP", "SPS", 'P', + GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.TungstenSteel, 1), 'H', + ItemList.Hull_IV.get(1), 'S', MyMaterial.marM200.get(OrePrefixes.plate, 1), 'E', + GT_ModHandler.getIC2Item("reactorHeatSwitchDiamond", 1L, 1) }); GT_Values.RA.addChemicalBathRecipe( ItemRefer.Salty_Root.get(1), @@ -1264,21 +1009,18 @@ public class RecipeLoader_02 { Materials.Salt.getDust(1), Materials.RockSalt.getDust(1), Materials.Saltpeter.getDust(1), - new int[] {9500, 8000, 5000}, + new int[] { 9500, 8000, 5000 }, 100, 30); if (LoadedList.GTNH_CORE) { CrackRecipeAdder.addUniversalAssemblerRecipe( - new ItemStack[] { - ItemList.Circuit_Board_Multifiberglass_Elite.get(1), - GT_ModHandler.getModItem("dreamcraft", "item.EngravedGoldChip", 16), - ItemList.Circuit_Chip_SoC2.get(8), - ItemList.Circuit_Chip_NOR.get(32), - MyMaterial.signalium.get(OrePrefixes.bolt, 32), - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Aluminium, 8), - GT_ModHandler.getIC2Item("reactorVent", 1L, 1) - }, + new ItemStack[] { ItemList.Circuit_Board_Multifiberglass_Elite.get(1), + GT_ModHandler.getModItem("dreamcraft", "item.EngravedGoldChip", 16), + ItemList.Circuit_Chip_SoC2.get(8), ItemList.Circuit_Chip_NOR.get(32), + MyMaterial.signalium.get(OrePrefixes.bolt, 32), + GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Aluminium, 8), + GT_ModHandler.getIC2Item("reactorVent", 1L, 1) }, ItemRefer.HiC_T1.get(1), 288, 1200, @@ -1286,135 +1028,94 @@ public class RecipeLoader_02 { false); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Robot_Arm_IV.get(4), - ItemRefer.HiC_T1.get(4), - ItemList.Tool_DataOrb.get(3), - GT_OreDictUnificator.get(OrePrefixes.cableGt08, Materials.Titanium, 4), - MyMaterial.hikarium.get(OrePrefixes.gearGt, 4), - MyMaterial.marM200.get(OrePrefixes.plateDouble, 2), - ItemRefer.IC2_Ir_Plate.get(2), - MyMaterial.lumiium.get(OrePrefixes.bolt, 48), - }, + new ItemStack[] { ItemList.Robot_Arm_IV.get(4), ItemRefer.HiC_T1.get(4), + ItemList.Tool_DataOrb.get(3), + GT_OreDictUnificator.get(OrePrefixes.cableGt08, Materials.Titanium, 4), + MyMaterial.hikarium.get(OrePrefixes.gearGt, 4), + MyMaterial.marM200.get(OrePrefixes.plateDouble, 2), ItemRefer.IC2_Ir_Plate.get(2), + MyMaterial.lumiium.get(OrePrefixes.bolt, 48), }, Materials.Palladium.getMolten(1152), ItemRefer.Precise_Assembler.get(1), 1800, 7680, false); - GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Casing_ZPM.get(3), - ItemList.Robot_Arm_EV.get(2), - GT_OreDictUnificator.get(OrePrefixes.cableGt04, MyMaterial.lumiium.getBridgeMaterial(), 2), - MyMaterial.marCeM200.get(OrePrefixes.plateDouble, 2), - ItemRefer.HiC_T1.get(1), - MyMaterial.signalium.get(OrePrefixes.bolt, 32), - MyMaterial.titaniumBetaC.get(OrePrefixes.gearGtSmall, 8) - }, - Materials.BlackSteel.getMolten(576), - ItemRefer.Precise_Electronic_Unit_T1.get(2), - 800, - 7680, - false); + GT_Values.RA + .addAssemblerRecipe( + new ItemStack[] { ItemList.Casing_ZPM.get(3), ItemList.Robot_Arm_EV.get(2), + GT_OreDictUnificator + .get(OrePrefixes.cableGt04, MyMaterial.lumiium.getBridgeMaterial(), 2), + MyMaterial.marCeM200.get(OrePrefixes.plateDouble, 2), ItemRefer.HiC_T1.get(1), + MyMaterial.signalium.get(OrePrefixes.bolt, 32), + MyMaterial.titaniumBetaC.get(OrePrefixes.gearGtSmall, 8) }, + Materials.BlackSteel.getMolten(576), + ItemRefer.Precise_Electronic_Unit_T1.get(2), + 800, + 7680, + false); MyRecipeAdder.instance.addPreciseAssemblerRecipe( - new ItemStack[] { - ItemRefer.HiC_T1.get(2), - GT_ModHandler.getModItem("dreamcraft", "item.EngravedDiamondCrystalChip", 8), - ItemList.Circuit_Chip_NAND.get(16), - GT_ModHandler.getIC2Item("reactorVentCore", 1L, 1) - }, - new FluidStack[] { - Materials.Plastic.getMolten(288), - MyMaterial.signalium.getMolten(144), - MyMaterial.lumiium.getMolten(72), - Materials.Enderium.getMolten(72) - }, + new ItemStack[] { ItemRefer.HiC_T1.get(2), + GT_ModHandler.getModItem("dreamcraft", "item.EngravedDiamondCrystalChip", 8), + ItemList.Circuit_Chip_NAND.get(16), GT_ModHandler.getIC2Item("reactorVentCore", 1L, 1) }, + new FluidStack[] { Materials.Plastic.getMolten(288), MyMaterial.signalium.getMolten(144), + MyMaterial.lumiium.getMolten(72), Materials.Enderium.getMolten(72) }, ItemRefer.HiC_T2.get(1), 30720, 100, 1); MyRecipeAdder.instance.addPreciseAssemblerRecipe( - new ItemStack[] { - ItemRefer.HiC_T2.get(2), - ItemList.Circuit_Parts_Crystal_Chip_Master.get(8), - ItemList.Circuit_Chip_CrystalSoC2.get(1), - GT_ModHandler.getIC2Item("reactorVentDiamond", 1L, 1) - }, - new FluidStack[] { - MyMaterial.adamantiumAlloy.getMolten(576), - MyMaterial.signalium.getMolten(288), - MyMaterial.lumiium.getMolten(144), - Materials.TungstenCarbide.getMolten(72) - }, + new ItemStack[] { ItemRefer.HiC_T2.get(2), ItemList.Circuit_Parts_Crystal_Chip_Master.get(8), + ItemList.Circuit_Chip_CrystalSoC2.get(1), + GT_ModHandler.getIC2Item("reactorVentDiamond", 1L, 1) }, + new FluidStack[] { MyMaterial.adamantiumAlloy.getMolten(576), MyMaterial.signalium.getMolten(288), + MyMaterial.lumiium.getMolten(144), Materials.TungstenCarbide.getMolten(72) }, ItemRefer.HiC_T3.get(1), 122880, 100, 2); MyRecipeAdder.instance.addPreciseAssemblerRecipe( - new ItemStack[] { - ItemRefer.HiC_T3.get(2), - GT_ModHandler.getModItem("dreamcraft", "item.EngravedEnergyChip", 8), - ItemList.Circuit_Chip_QuantumCPU.get(16), - GT_ModHandler.getIC2Item("reactorVentGold", 1L, 1) - }, - new FluidStack[] { - MyMaterial.marM200.getMolten(1152), - MyMaterial.signalium.getMolten(576), - MyMaterial.lumiium.getMolten(288), - MyMaterial.artheriumSn.getMolten(144) - }, + new ItemStack[] { ItemRefer.HiC_T3.get(2), + GT_ModHandler.getModItem("dreamcraft", "item.EngravedEnergyChip", 8), + ItemList.Circuit_Chip_QuantumCPU.get(16), + GT_ModHandler.getIC2Item("reactorVentGold", 1L, 1) }, + new FluidStack[] { MyMaterial.marM200.getMolten(1152), MyMaterial.signalium.getMolten(576), + MyMaterial.lumiium.getMolten(288), MyMaterial.artheriumSn.getMolten(144) }, ItemRefer.HiC_T4.get(1), 491520, 100, 3); MyRecipeAdder.instance.addPreciseAssemblerRecipe( - new ItemStack[] { - ItemRefer.HiC_T4.get(2), - GT_ModHandler.getModItem("dreamcraft", "item.EngravedManyullynCrystalChip", 8), - ItemList.Circuit_Chip_BioCPU.get(1), - Ic2Items.reactorVentSpread - }, - new FluidStack[] { - MyMaterial.titaniumBetaC.getMolten(1728), - MyMaterial.signalium.getMolten(1152), - MyMaterial.lumiium.getMolten(576), - MyMaterial.dalisenite.getMolten(288) - }, + new ItemStack[] { ItemRefer.HiC_T4.get(2), + GT_ModHandler.getModItem("dreamcraft", "item.EngravedManyullynCrystalChip", 8), + ItemList.Circuit_Chip_BioCPU.get(1), Ic2Items.reactorVentSpread }, + new FluidStack[] { MyMaterial.titaniumBetaC.getMolten(1728), MyMaterial.signalium.getMolten(1152), + MyMaterial.lumiium.getMolten(576), MyMaterial.dalisenite.getMolten(288) }, ItemRefer.HiC_T5.get(1), 1966080, 100, 3); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Casing_UV.get(3), - ItemList.Robot_Arm_LuV.get(2), - GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.ElectrumFlux, 4), - ItemRefer.HiC_T2.get(1), - ItemRefer.Precise_Electronic_Unit_T1.get(1), - MyMaterial.marCeM200.get(OrePrefixes.bolt, 32), - MyMaterial.artheriumSn.get(OrePrefixes.gearGtSmall, 8), - }, + new ItemStack[] { ItemList.Casing_UV.get(3), ItemList.Robot_Arm_LuV.get(2), + GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.ElectrumFlux, 4), + ItemRefer.HiC_T2.get(1), ItemRefer.Precise_Electronic_Unit_T1.get(1), + MyMaterial.marCeM200.get(OrePrefixes.bolt, 32), + MyMaterial.artheriumSn.get(OrePrefixes.gearGtSmall, 8), }, MyMaterial.adamantiumAlloy.getMolten(1152), ItemRefer.Precise_Electronic_Unit_T2.get(4), 4800, 122880); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Casing_MAX.get(3), - ItemList.Field_Generator_ZPM.get(2), - GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.Bedrockium, 4), - ItemRefer.HiC_T3.get(1), - ItemRefer.Precise_Electronic_Unit_T2.get(1), - MyMaterial.titaniumBetaC.get(OrePrefixes.bolt, 32), - MyMaterial.dalisenite.get(OrePrefixes.gearGtSmall, 8), - }, + new ItemStack[] { ItemList.Casing_MAX.get(3), ItemList.Field_Generator_ZPM.get(2), + GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.Bedrockium, 4), + ItemRefer.HiC_T3.get(1), ItemRefer.Precise_Electronic_Unit_T2.get(1), + MyMaterial.titaniumBetaC.get(OrePrefixes.bolt, 32), + MyMaterial.dalisenite.get(OrePrefixes.gearGtSmall, 8), }, MyMaterial.artheriumSn.getMolten(1152), ItemRefer.Precise_Electronic_Unit_T3.get(4), 4800, @@ -1423,12 +1124,9 @@ public class RecipeLoader_02 { // Compact MK1 Fusion Coil MyRecipeAdder.instance.addPreciseAssemblerRecipe( - new ItemStack[] { - ItemList.Casing_Coil_Superconductor.get(3), - ItemRefer.HiC_T2.get(1), - ItemRefer.Special_Ceramics_Plate.get(2) - }, - new FluidStack[] {MyMaterial.marM200.getMolten(1152), MyMaterial.zircaloy4.getMolten(288)}, + new ItemStack[] { ItemList.Casing_Coil_Superconductor.get(3), ItemRefer.HiC_T2.get(1), + ItemRefer.Special_Ceramics_Plate.get(2) }, + new FluidStack[] { MyMaterial.marM200.getMolten(1152), MyMaterial.zircaloy4.getMolten(288) }, ItemRefer.Compact_Fusion_Coil_T0.get(1), 9001, 1200, @@ -1436,12 +1134,9 @@ public class RecipeLoader_02 { // Compact MK2 Fusion Coil MyRecipeAdder.instance.addPreciseAssemblerRecipe( - new ItemStack[] { - ItemList.Casing_Fusion_Coil.get(3), - ItemRefer.Quartz_Crystal_Resonator.get(2), - ItemRefer.HiC_T3.get(1), - }, - new FluidStack[] {MyMaterial.artheriumSn.getMolten(576), MyMaterial.titaniumBetaC.getMolten(144)}, + new ItemStack[] { ItemList.Casing_Fusion_Coil.get(3), ItemRefer.Quartz_Crystal_Resonator.get(2), + ItemRefer.HiC_T3.get(1), }, + new FluidStack[] { MyMaterial.artheriumSn.getMolten(576), MyMaterial.titaniumBetaC.getMolten(144) }, ItemRefer.Compact_Fusion_Coil_T1.get(1), 14000, 800, @@ -1449,28 +1144,20 @@ public class RecipeLoader_02 { // Compact MK3 Fusion Coil MyRecipeAdder.instance.addPreciseAssemblerRecipe( - new ItemStack[] { - ItemList.Casing_Fusion_Coil.get(3), - ItemRefer.Radiation_Protection_Plate.get(2), - ItemList.QuantumStar.get(4), - ItemRefer.HiC_T4.get(1) - }, - new FluidStack[] {MyMaterial.dalisenite.getMolten(576), MyMaterial.hikarium.getMolten(144)}, + new ItemStack[] { ItemList.Casing_Fusion_Coil.get(3), ItemRefer.Radiation_Protection_Plate.get(2), + ItemList.QuantumStar.get(4), ItemRefer.HiC_T4.get(1) }, + new FluidStack[] { MyMaterial.dalisenite.getMolten(576), MyMaterial.hikarium.getMolten(144) }, ItemRefer.Compact_Fusion_Coil_T2.get(1), 114514, 800, 3); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.FusionComputer_LuV.get(48), - ItemRefer.HiC_T1.get(8), - MyMaterial.marCeM200.get(OrePrefixes.plate, 32), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Master, 8), - ItemList.Circuit_Wafer_HPIC.get(16), - ItemList.Field_Generator_LuV.get(4), - MyMaterial.marM200.get(OrePrefixes.stickLong, 8) - }, + new ItemStack[] { ItemList.FusionComputer_LuV.get(48), ItemRefer.HiC_T1.get(8), + MyMaterial.marCeM200.get(OrePrefixes.plate, 32), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Master, 8), + ItemList.Circuit_Wafer_HPIC.get(16), ItemList.Field_Generator_LuV.get(4), + MyMaterial.marM200.get(OrePrefixes.stickLong, 8) }, MyMaterial.adamantiumAlloy.getMolten(9216), ItemRefer.Compact_Fusion_MK1.get(1), 1200, @@ -1479,24 +1166,13 @@ public class RecipeLoader_02 { GT_Values.RA.addAssemblylineRecipe( ItemRefer.Compact_Fusion_MK1.get(1), 24000, - new Object[] { - ItemList.FusionComputer_ZPMV.get(48), - new Object[] {"circuitUltimate", 1}, - new Object[] {"circuitUltimate", 1}, - new Object[] {"circuitUltimate", 1}, - new Object[] {"circuitUltimate", 1}, - ItemList.Circuit_Wafer_UHPIC.get(32), - ItemList.ZPM_Coil.get(16), - ItemList.Neutron_Reflector.get(4), - ItemRefer.HiC_T2.get(8), - ItemList.Field_Generator_ZPM.get(8), - MyMaterial.artheriumSn.get(OrePrefixes.gearGtSmall, 32) - }, - new FluidStack[] { - MyMaterial.marCeM200.getMolten(2304), - WerkstoffLoader.HDCS.getMolten(1152), - MyMaterial.artheriumSn.getMolten(288) - }, + new Object[] { ItemList.FusionComputer_ZPMV.get(48), new Object[] { "circuitUltimate", 1 }, + new Object[] { "circuitUltimate", 1 }, new Object[] { "circuitUltimate", 1 }, + new Object[] { "circuitUltimate", 1 }, ItemList.Circuit_Wafer_UHPIC.get(32), + ItemList.ZPM_Coil.get(16), ItemList.Neutron_Reflector.get(4), ItemRefer.HiC_T2.get(8), + ItemList.Field_Generator_ZPM.get(8), MyMaterial.artheriumSn.get(OrePrefixes.gearGtSmall, 32) }, + new FluidStack[] { MyMaterial.marCeM200.getMolten(2304), WerkstoffLoader.HDCS.getMolten(1152), + MyMaterial.artheriumSn.getMolten(288) }, ItemRefer.Compact_Fusion_MK2.get(1), 6000, 60000); @@ -1504,24 +1180,14 @@ public class RecipeLoader_02 { GT_Values.RA.addAssemblylineRecipe( ItemRefer.Compact_Fusion_MK2.get(1), 24000, - new Object[] { - ItemList.FusionComputer_UV.get(48), - new Object[] {"circuitSuperconductor", 1}, - new Object[] {"circuitSuperconductor", 1}, - new Object[] {"circuitSuperconductor", 1}, - new Object[] {"circuitSuperconductor", 1}, - ItemList.Circuit_Wafer_NPIC.get(64), - ItemList.UV_Coil.get(16), - ItemRefer.Advanced_Radiation_Protection_Plate.get(8), - ItemRefer.HiC_T3.get(8), - ItemList.Field_Generator_UV.get(8), - WerkstoffLoader.HDCS.get(OrePrefixes.gearGtSmall, 64) - }, - new FluidStack[] { - MyMaterial.titaniumBetaC.getMolten(2304), - MyMaterial.dalisenite.getMolten(1152), - Materials.Americium.getMolten(288) - }, + new Object[] { ItemList.FusionComputer_UV.get(48), new Object[] { "circuitSuperconductor", 1 }, + new Object[] { "circuitSuperconductor", 1 }, new Object[] { "circuitSuperconductor", 1 }, + new Object[] { "circuitSuperconductor", 1 }, ItemList.Circuit_Wafer_NPIC.get(64), + ItemList.UV_Coil.get(16), ItemRefer.Advanced_Radiation_Protection_Plate.get(8), + ItemRefer.HiC_T3.get(8), ItemList.Field_Generator_UV.get(8), + WerkstoffLoader.HDCS.get(OrePrefixes.gearGtSmall, 64) }, + new FluidStack[] { MyMaterial.titaniumBetaC.getMolten(2304), MyMaterial.dalisenite.getMolten(1152), + Materials.Americium.getMolten(288) }, ItemRefer.Compact_Fusion_MK3.get(1), 6000, 90000); @@ -1529,15 +1195,11 @@ public class RecipeLoader_02 { // Compact MK4 Fusion Coil if (LoadedList.GTPP) { MyRecipeAdder.instance.addPreciseAssemblerRecipe( - new ItemStack[] { - GT_ModHandler.getModItem("miscutils", "gtplusplus.blockcasings.3", 3, 13), - ItemRefer.HiC_T5.get(1), - GT_ModHandler.getModItem("miscutils", "item.itemBufferCore4", 1), - }, - new FluidStack[] { - FluidRegistry.getFluidStack("molten.energycrystal", 1152), - FluidRegistry.getFluidStack("molten.laurenium", 144) - }, + new ItemStack[] { GT_ModHandler.getModItem("miscutils", "gtplusplus.blockcasings.3", 3, 13), + ItemRefer.HiC_T5.get(1), + GT_ModHandler.getModItem("miscutils", "item.itemBufferCore4", 1), }, + new FluidStack[] { FluidRegistry.getFluidStack("molten.energycrystal", 1152), + FluidRegistry.getFluidStack("molten.laurenium", 144) }, ItemRefer.Compact_Fusion_Coil_T3.get(1), 520000, 2000, @@ -1545,9 +1207,7 @@ public class RecipeLoader_02 { // Compact MK4 Fusion Disassembly Recipe GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemRefer.Compact_Fusion_Coil_T3.get(1), - }, + new ItemStack[] { ItemRefer.Compact_Fusion_Coil_T3.get(1), }, null, GT_ModHandler.getModItem("miscutils", "gtplusplus.blockcasings.3", 3, 13), 600, @@ -1556,88 +1216,77 @@ public class RecipeLoader_02 { GT_Values.RA.addAssemblylineRecipe( ItemRefer.Compact_Fusion_MK3.get(1), 24000, - new Object[] { - GT_ModHandler.getModItem("gregtech", "gt.blockmachines", 48, 965), - GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.SuperconductorLuV, 32), - ItemList.Circuit_Wafer_PPIC.get(64), - ItemList.UHV_Coil.get(16), - ItemRefer.Compact_Fusion_Coil_T2.get(8), - ItemRefer.HiC_T4.get(8) - }, - new FluidStack[] { - FluidRegistry.getFluidStack("molten.teflon", 1152), - MyMaterial.dalisenite.getMolten(576), - FluidRegistry.getFluidStack("molten.botmium", 288) - }, + new Object[] { GT_ModHandler.getModItem("gregtech", "gt.blockmachines", 48, 965), + GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.SuperconductorLuV, 32), + ItemList.Circuit_Wafer_PPIC.get(64), ItemList.UHV_Coil.get(16), + ItemRefer.Compact_Fusion_Coil_T2.get(8), ItemRefer.HiC_T4.get(8) }, + new FluidStack[] { FluidRegistry.getFluidStack("molten.teflon", 1152), + MyMaterial.dalisenite.getMolten(576), FluidRegistry.getFluidStack("molten.botmium", 288) }, ItemRefer.Compact_Fusion_MK4.get(1), 6000, 520000); - // MyRecipeAdder.instance.addPreciseAssemblerRecipe( - // new ItemStack[] { - // ItemRefer.Compact_Fusion_Coil_T3.get(1), - // GT_ModHandler.getModItem("miscutils", "gtplusplus.blockcasings.3", 1, 13), - // ItemRefer.HiC_T5.get(4), - // GT_ModHandler.getModItem("miscutils", "item.itemBufferCore6", 1), - // }, - // new FluidStack[] { - // FluidRegistry.getFluidStack("molten.laurenium", 1152), - // MyMaterial.hikarium.getMolten(576) - // }, - // ItemRefer.Compact_Fusion_Coil_T4.get(1), - // 1100000, - // 1919, - // 3 - // ); + // MyRecipeAdder.instance.addPreciseAssemblerRecipe( + // new ItemStack[] { + // ItemRefer.Compact_Fusion_Coil_T3.get(1), + // GT_ModHandler.getModItem("miscutils", "gtplusplus.blockcasings.3", 1, 13), + // ItemRefer.HiC_T5.get(4), + // GT_ModHandler.getModItem("miscutils", "item.itemBufferCore6", 1), + // }, + // new FluidStack[] { + // FluidRegistry.getFluidStack("molten.laurenium", 1152), + // MyMaterial.hikarium.getMolten(576) + // }, + // ItemRefer.Compact_Fusion_Coil_T4.get(1), + // 1100000, + // 1919, + // 3 + // ); // Compact MK5 Computer - // GT_Values.RA.addAssemblylineRecipe( - // ItemRefer.Compact_Fusion_MK4.get(1), - // 24000, - // new Object[] { - // GT_ModHandler.getModItem("gregtech", "gt.blockmachines", 48, 965), - // GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.SuperconductorUV, 32), - // ItemList.Circuit_Wafer_QPIC.get(64), - // ItemList.UHV_Coil.get(64), - // ItemRefer.Compact_Fusion_Coil_T3.get(8), - // ItemRefer.HiC_T5.get(8) - // }, - // new FluidStack[] { - // MyMaterial.tairitsu.getMolten( 1152), - // MyMaterial.artheriumSn.getMolten(576), - // FluidRegistry.getFluidStack("molten.rhugnor", 288) - // }, - // ItemRefer.Compact_Fusion_MK5.get(1), - // 6000, - // 1100000 - // ); + // GT_Values.RA.addAssemblylineRecipe( + // ItemRefer.Compact_Fusion_MK4.get(1), + // 24000, + // new Object[] { + // GT_ModHandler.getModItem("gregtech", "gt.blockmachines", 48, 965), + // GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.SuperconductorUV, 32), + // ItemList.Circuit_Wafer_QPIC.get(64), + // ItemList.UHV_Coil.get(64), + // ItemRefer.Compact_Fusion_Coil_T3.get(8), + // ItemRefer.HiC_T5.get(8) + // }, + // new FluidStack[] { + // MyMaterial.tairitsu.getMolten( 1152), + // MyMaterial.artheriumSn.getMolten(576), + // FluidRegistry.getFluidStack("molten.rhugnor", 288) + // }, + // ItemRefer.Compact_Fusion_MK5.get(1), + // 6000, + // 1100000 + // ); } GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] {Materials.Antimony.getDust(8), GT_Utility.getIntegratedCircuit(24)}, - new FluidStack[] { - MyMaterial.ether.getFluidOrGas(1000), Materials.Fluorine.getGas(40000), Materials.Ice.getSolid(8000) - }, - new FluidStack[] {MyMaterial.antimonyPentafluorideSolution.getFluidOrGas(8000)}, + new ItemStack[] { Materials.Antimony.getDust(8), GT_Utility.getIntegratedCircuit(24) }, + new FluidStack[] { MyMaterial.ether.getFluidOrGas(1000), Materials.Fluorine.getGas(40000), + Materials.Ice.getSolid(8000) }, + new FluidStack[] { MyMaterial.antimonyPentafluorideSolution.getFluidOrGas(8000) }, null, 800, 7680); GT_Values.RA.addUniversalDistillationRecipe( MyMaterial.antimonyPentafluorideSolution.getFluidOrGas(4000), - new FluidStack[] { - MyMaterial.antimonyPentafluoride.getFluidOrGas(4000), MyMaterial.ether.getFluidOrGas(500) - }, + new FluidStack[] { MyMaterial.antimonyPentafluoride.getFluidOrGas(4000), + MyMaterial.ether.getFluidOrGas(500) }, null, 100, 120); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.pipeHuge, Materials.Plastic, 2), - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Steel, 1), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.pipeHuge, Materials.Plastic, 2), + GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Steel, 1), + GT_Utility.getIntegratedCircuit(1) }, Materials.Concrete.getMolten(2304), ItemRefer.Coolant_Tower.get(1), 200, @@ -1656,7 +1305,7 @@ public class RecipeLoader_02 { Materials.Graphite.getDust(8), Materials.Uranium235.getDust(1), Materials.Plutonium241.getDust(1), - new int[] {10000, 10000, 10000, 9000, 5000, 3000}, + new int[] { 10000, 10000, 10000, 9000, 5000, 3000 }, 200, 1920); @@ -1671,7 +1320,7 @@ public class RecipeLoader_02 { Materials.Graphite.getDust(16), Materials.Uranium235.getDust(2), Materials.Plutonium241.getDust(2), - new int[] {10000, 10000, 10000, 9000, 5000, 3000}, + new int[] { 10000, 10000, 10000, 9000, 5000, 3000 }, 200, 1920); @@ -1686,7 +1335,7 @@ public class RecipeLoader_02 { Materials.Graphite.getDust(32), Materials.Uranium235.getDust(4), Materials.Plutonium241.getDust(4), - new int[] {10000, 10000, 10000, 9000, 5000, 3000}, + new int[] { 10000, 10000, 10000, 9000, 5000, 3000 }, 200, 1920); @@ -1701,7 +1350,7 @@ public class RecipeLoader_02 { Materials.Carbon.getDust(2), Materials.Uranium.getDust(1), Materials.Uranium235.getDust(1), - new int[] {10000, 10000, 10000, 9000, 5000, 3000}, + new int[] { 10000, 10000, 10000, 9000, 5000, 3000 }, 200, 1920); @@ -1716,7 +1365,7 @@ public class RecipeLoader_02 { Materials.Carbon.getDust(4), Materials.Uranium.getDust(2), Materials.Uranium235.getDust(2), - new int[] {10000, 10000, 10000, 9000, 5000, 3000}, + new int[] { 10000, 10000, 10000, 9000, 5000, 3000 }, 200, 1920); @@ -1731,7 +1380,7 @@ public class RecipeLoader_02 { Materials.Carbon.getDust(8), Materials.Uranium.getDust(4), Materials.Uranium235.getDust(4), - new int[] {10000, 10000, 10000, 9000, 5000, 3000}, + new int[] { 10000, 10000, 10000, 9000, 5000, 3000 }, 200, 1920); @@ -1746,7 +1395,7 @@ public class RecipeLoader_02 { null, null, null, - new int[] {10000}, + new int[] { 10000 }, 200, 7680); @@ -1761,7 +1410,7 @@ public class RecipeLoader_02 { null, null, null, - new int[] {10000}, + new int[] { 10000 }, 200, 7680); @@ -1776,7 +1425,7 @@ public class RecipeLoader_02 { null, null, null, - new int[] {10000}, + new int[] { 10000 }, 200, 7680); @@ -1791,7 +1440,7 @@ public class RecipeLoader_02 { null, null, null, - new int[] {10000}, + new int[] { 10000 }, 200, 7680); @@ -1806,7 +1455,7 @@ public class RecipeLoader_02 { null, null, null, - new int[] {10000}, + new int[] { 10000 }, 200, 7680); @@ -1821,7 +1470,7 @@ public class RecipeLoader_02 { null, null, null, - new int[] {10000}, + new int[] { 10000 }, 200, 7680); @@ -1875,23 +1524,20 @@ public class RecipeLoader_02 { MyRecipeAdder.instance.addNeutronActivatorRecipe( null, - new ItemStack[] {MyMaterial.metastableOganesson.get(OrePrefixes.dust)}, - new FluidStack[] {WerkstoffLoader.Oganesson.getFluidOrGas(250)}, + new ItemStack[] { MyMaterial.metastableOganesson.get(OrePrefixes.dust) }, + new FluidStack[] { WerkstoffLoader.Oganesson.getFluidOrGas(250) }, null, 2000, 1100, 1000); GT_Values.RA.addPlasmaForgeRecipe( - new ItemStack[] {ItemRefer.HiC_T5.get(0)}, - new FluidStack[] { - MyMaterial.metastableOganesson.getMolten(1152), - MyMaterial.preciousMetalAlloy.getMolten(2304), - Materials.SpaceTime.getMolten(288), - Materials.DimensionallyTranscendentResidue.getFluid(5000) - }, + new ItemStack[] { ItemRefer.HiC_T5.get(0) }, + new FluidStack[] { MyMaterial.metastableOganesson.getMolten(1152), + MyMaterial.preciousMetalAlloy.getMolten(2304), Materials.SpaceTime.getMolten(288), + Materials.DimensionallyTranscendentResidue.getFluid(5000) }, new ItemStack[] {}, - new FluidStack[] {MyMaterial.shirabon.getMolten(144)}, + new FluidStack[] { MyMaterial.shirabon.getMolten(144) }, 200, 1500000000, 13500); diff --git a/src/main/java/goodgenerator/main/GG_Config_Loader.java b/src/main/java/goodgenerator/main/GG_Config_Loader.java index ee21d85a33..fdbcda4be1 100644 --- a/src/main/java/goodgenerator/main/GG_Config_Loader.java +++ b/src/main/java/goodgenerator/main/GG_Config_Loader.java @@ -1,22 +1,22 @@ package goodgenerator.main; -import cpw.mods.fml.relauncher.FMLInjectionData; import java.io.File; + import net.minecraftforge.common.config.Configuration; +import cpw.mods.fml.relauncher.FMLInjectionData; + public class GG_Config_Loader { - public static final Configuration GG_Config = - new Configuration(new File(new File((File) FMLInjectionData.data()[6], "config"), "GoodGenerator.cfg")); + public static final Configuration GG_Config = new Configuration( + new File(new File((File) FMLInjectionData.data()[6], "config"), "GoodGenerator.cfg")); public static int LiquidAirConsumptionPerSecond = 2400; - public static int[] NaquadahFuelVoltage = new int[] { - 12960, 2200, 32400, 975000, - 2300000, 9511000, 88540000, 399576000 - }; - public static int[] NaquadahFuelTime = new int[] {100, 500, 150, 20, 20, 80, 100, 160}; - public static int[] CoolantEfficiency = new int[] {275, 150, 105}; - public static int[] ExcitedLiquidCoe = new int[] {16, 4, 3, 2}; + public static int[] NaquadahFuelVoltage = new int[] { 12960, 2200, 32400, 975000, 2300000, 9511000, 88540000, + 399576000 }; + public static int[] NaquadahFuelTime = new int[] { 100, 500, 150, 20, 20, 80, 100, 160 }; + public static int[] CoolantEfficiency = new int[] { 275, 150, 105 }; + public static int[] ExcitedLiquidCoe = new int[] { 16, 4, 3, 2 }; public static boolean EnableNaquadahRework = true; public static void run() { @@ -25,69 +25,52 @@ public class GG_Config_Loader { } private static void loadProperty() { - NaquadahFuelVoltage[0] = GG_Config.get( - "LargeNaquadahReactor", - "Uranium Based Liquid Fuel Basic Output Voltage", - NaquadahFuelVoltage[0]) - .getInt(); - NaquadahFuelTime[0] = GG_Config.get( - "LargeNaquadahReactor", "Uranium Based Liquid Fuel Burning Time", NaquadahFuelTime[0]) - .getInt(); - NaquadahFuelVoltage[1] = GG_Config.get( - "LargeNaquadahReactor", - "Thorium Based Liquid Fuel Basic Output Voltage", - NaquadahFuelVoltage[1]) - .getInt(); - NaquadahFuelTime[1] = GG_Config.get( - "LargeNaquadahReactor", "Thorium Based Liquid Fuel Burning Time", NaquadahFuelTime[1]) - .getInt(); - NaquadahFuelVoltage[2] = GG_Config.get( - "LargeNaquadahReactor", - "Plutonium Based Liquid Fuel Basic Output Voltage", - NaquadahFuelVoltage[2]) - .getInt(); - NaquadahFuelTime[2] = GG_Config.get( - "LargeNaquadahReactor", "Plutonium Based Liquid Fuel Burning Time", NaquadahFuelTime[2]) - .getInt(); - NaquadahFuelVoltage[3] = GG_Config.get( - "LargeNaquadahReactor", "Naquadah Fuel MkI Basic Output Voltage", NaquadahFuelVoltage[3]) - .getInt(); - NaquadahFuelTime[3] = GG_Config.get( - "LargeNaquadahReactor", "Naquadah Fuel MkI Burning Time", NaquadahFuelTime[3]) - .getInt(); - NaquadahFuelVoltage[4] = GG_Config.get( - "LargeNaquadahReactor", "Naquadah Fuel MkII Basic Output Voltage", NaquadahFuelVoltage[4]) - .getInt(); - NaquadahFuelTime[4] = GG_Config.get( - "LargeNaquadahReactor", "Naquadah Fuel MkII Burning Time", NaquadahFuelTime[4]) - .getInt(); - NaquadahFuelVoltage[5] = GG_Config.get( - "LargeNaquadahReactor", "Naquadah Fuel MkIII Basic Output Voltage", NaquadahFuelVoltage[5]) - .getInt(); - NaquadahFuelTime[5] = GG_Config.get( - "LargeNaquadahReactor", "Naquadah Fuel MkIII Burning Time", NaquadahFuelTime[5]) - .getInt(); - NaquadahFuelVoltage[6] = GG_Config.get( - "LargeNaquadahReactor", "Naquadah Fuel MkIV Basic Output Voltage", NaquadahFuelVoltage[6]) - .getInt(); - NaquadahFuelTime[6] = GG_Config.get( - "LargeNaquadahReactor", "Naquadah Fuel MkIV Burning Time", NaquadahFuelTime[6]) - .getInt(); - NaquadahFuelVoltage[7] = GG_Config.get( - "LargeNaquadahReactor", "Naquadah Fuel MkV Basic Output Voltage", NaquadahFuelVoltage[7]) - .getInt(); - NaquadahFuelTime[7] = GG_Config.get( - "LargeNaquadahReactor", "Naquadah Fuel MkV Burning Time", NaquadahFuelTime[7]) - .getInt(); + NaquadahFuelVoltage[0] = GG_Config + .get("LargeNaquadahReactor", "Uranium Based Liquid Fuel Basic Output Voltage", NaquadahFuelVoltage[0]) + .getInt(); + NaquadahFuelTime[0] = GG_Config + .get("LargeNaquadahReactor", "Uranium Based Liquid Fuel Burning Time", NaquadahFuelTime[0]).getInt(); + NaquadahFuelVoltage[1] = GG_Config + .get("LargeNaquadahReactor", "Thorium Based Liquid Fuel Basic Output Voltage", NaquadahFuelVoltage[1]) + .getInt(); + NaquadahFuelTime[1] = GG_Config + .get("LargeNaquadahReactor", "Thorium Based Liquid Fuel Burning Time", NaquadahFuelTime[1]).getInt(); + NaquadahFuelVoltage[2] = GG_Config + .get("LargeNaquadahReactor", "Plutonium Based Liquid Fuel Basic Output Voltage", NaquadahFuelVoltage[2]) + .getInt(); + NaquadahFuelTime[2] = GG_Config + .get("LargeNaquadahReactor", "Plutonium Based Liquid Fuel Burning Time", NaquadahFuelTime[2]).getInt(); + NaquadahFuelVoltage[3] = GG_Config + .get("LargeNaquadahReactor", "Naquadah Fuel MkI Basic Output Voltage", NaquadahFuelVoltage[3]).getInt(); + NaquadahFuelTime[3] = GG_Config + .get("LargeNaquadahReactor", "Naquadah Fuel MkI Burning Time", NaquadahFuelTime[3]).getInt(); + NaquadahFuelVoltage[4] = GG_Config + .get("LargeNaquadahReactor", "Naquadah Fuel MkII Basic Output Voltage", NaquadahFuelVoltage[4]) + .getInt(); + NaquadahFuelTime[4] = GG_Config + .get("LargeNaquadahReactor", "Naquadah Fuel MkII Burning Time", NaquadahFuelTime[4]).getInt(); + NaquadahFuelVoltage[5] = GG_Config + .get("LargeNaquadahReactor", "Naquadah Fuel MkIII Basic Output Voltage", NaquadahFuelVoltage[5]) + .getInt(); + NaquadahFuelTime[5] = GG_Config + .get("LargeNaquadahReactor", "Naquadah Fuel MkIII Burning Time", NaquadahFuelTime[5]).getInt(); + NaquadahFuelVoltage[6] = GG_Config + .get("LargeNaquadahReactor", "Naquadah Fuel MkIV Basic Output Voltage", NaquadahFuelVoltage[6]) + .getInt(); + NaquadahFuelTime[6] = GG_Config + .get("LargeNaquadahReactor", "Naquadah Fuel MkIV Burning Time", NaquadahFuelTime[6]).getInt(); + NaquadahFuelVoltage[7] = GG_Config + .get("LargeNaquadahReactor", "Naquadah Fuel MkV Basic Output Voltage", NaquadahFuelVoltage[7]).getInt(); + NaquadahFuelTime[7] = GG_Config + .get("LargeNaquadahReactor", "Naquadah Fuel MkV Burning Time", NaquadahFuelTime[7]).getInt(); CoolantEfficiency[0] = GG_Config.get("LargeNaquadahReactor", "Cryotheum Efficiency", CoolantEfficiency[0]) .getInt(); CoolantEfficiency[1] = GG_Config.get("LargeNaquadahReactor", "Super Coolant Efficiency", CoolantEfficiency[1]) .getInt(); CoolantEfficiency[2] = GG_Config.get("LargeNaquadahReactor", "IC2 Coolant Efficiency", CoolantEfficiency[2]) .getInt(); - ExcitedLiquidCoe[0] = GG_Config.get( - "LargeNaquadahReactor", "Atomic Separation Catalyst Magnification", ExcitedLiquidCoe[0]) - .getInt(); + ExcitedLiquidCoe[0] = GG_Config + .get("LargeNaquadahReactor", "Atomic Separation Catalyst Magnification", ExcitedLiquidCoe[0]).getInt(); ExcitedLiquidCoe[1] = GG_Config.get("LargeNaquadahReactor", "Naquadah Magnification", ExcitedLiquidCoe[1]) .getInt(); ExcitedLiquidCoe[2] = GG_Config.get("LargeNaquadahReactor", "Uranium-235 Magnification", ExcitedLiquidCoe[2]) @@ -95,10 +78,8 @@ public class GG_Config_Loader { ExcitedLiquidCoe[3] = GG_Config.get("LargeNaquadahReactor", "Caesium Magnification", ExcitedLiquidCoe[3]) .getInt(); LiquidAirConsumptionPerSecond = Math.max( - GG_Config.get( - "LargeNaquadahReactor", - "Liquid Air Consumption Per Second", - LiquidAirConsumptionPerSecond) + GG_Config + .get("LargeNaquadahReactor", "Liquid Air Consumption Per Second", LiquidAirConsumptionPerSecond) .getInt(), 0); @@ -110,7 +91,8 @@ public class GG_Config_Loader { private static void loadCategory() { GG_Config.addCustomCategoryComment( - "LargeNaquadahReactor", "Set fuel value, coolant or excited liquid property."); + "LargeNaquadahReactor", + "Set fuel value, coolant or excited liquid property."); GG_Config.addCustomCategoryComment("NaquadahRework", "About the naquadah line"); } } diff --git a/src/main/java/goodgenerator/main/GoodGenerator.java b/src/main/java/goodgenerator/main/GoodGenerator.java index 475c3909b2..8705b58669 100644 --- a/src/main/java/goodgenerator/main/GoodGenerator.java +++ b/src/main/java/goodgenerator/main/GoodGenerator.java @@ -1,6 +1,9 @@ package goodgenerator.main; +import net.minecraft.creativetab.CreativeTabs; + import com.github.bartimaeusnek.bartworks.API.WerkstoffAdderRegistry; + import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.SidedProxy; @@ -16,20 +19,19 @@ import goodgenerator.items.MyMaterial; import goodgenerator.loader.Loaders; import goodgenerator.loader.NaquadahReworkRecipeLoader; import goodgenerator.tabs.MyTabs; -import net.minecraft.creativetab.CreativeTabs; @SuppressWarnings("ALL") @Mod( modid = GoodGenerator.MOD_ID, version = GoodGenerator.VERSION, - dependencies = "required-after:IC2; " - + "required-after:gregtech; " + dependencies = "required-after:IC2; " + "required-after:gregtech; " + "required-after:bartworks; " + "required-after:tectech; " + "required-after:structurelib; " + "before:miscutils; " + "after:dreamcraft;") public final class GoodGenerator { + public static final String MOD_ID = "GRADLETOKEN_MODID"; public static final String MOD_NAME = "GRADLETOKEN_MODNAME"; public static final String VERSION = "GRADLETOKEN_VERSION"; @@ -41,8 +43,7 @@ public final class GoodGenerator { public static SimpleNetworkWrapper CHANNEL = NetworkRegistry.INSTANCE.newSimpleChannel(MOD_ID); - static { - } + static {} @Mod.Instance(GoodGenerator.MOD_ID) public static GoodGenerator instance; diff --git a/src/main/java/goodgenerator/network/MessageMTEBase.java b/src/main/java/goodgenerator/network/MessageMTEBase.java index aad0128742..e888c42349 100644 --- a/src/main/java/goodgenerator/network/MessageMTEBase.java +++ b/src/main/java/goodgenerator/network/MessageMTEBase.java @@ -1,29 +1,23 @@ /* - * MIT License - * - * Copyright (c) 2021 Glease - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. + * MIT License Copyright (c) 2021 Glease Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in the Software without restriction, + * including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following + * conditions: The above copyright notice and this permission notice shall be included in all copies or substantial + * portions of the Software. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, + * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN + * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. */ package goodgenerator.network; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; +import net.minecraftforge.common.DimensionManager; + import com.github.technus.tectech.TecTech; + import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; @@ -31,11 +25,9 @@ import cpw.mods.fml.relauncher.Side; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import io.netty.buffer.ByteBuf; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; -import net.minecraftforge.common.DimensionManager; public abstract class MessageMTEBase implements IMessage { + protected int w; protected int x; protected short y; @@ -68,6 +60,7 @@ public abstract class MessageMTEBase implements IMessage { public abstract static class Handler<REQ extends MessageMTEBase, REPLY extends IMessage> implements IMessageHandler<REQ, REPLY> { + protected abstract REPLY onError(REQ message, MessageContext ctx); protected abstract REPLY onSuccess(REQ message, MessageContext ctx, IMetaTileEntity mte); diff --git a/src/main/java/goodgenerator/tabs/MyTabs.java b/src/main/java/goodgenerator/tabs/MyTabs.java index 1084f11a85..3493abbe3b 100644 --- a/src/main/java/goodgenerator/tabs/MyTabs.java +++ b/src/main/java/goodgenerator/tabs/MyTabs.java @@ -1,10 +1,12 @@ package goodgenerator.tabs; -import goodgenerator.loader.Loaders; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; +import goodgenerator.loader.Loaders; + public class MyTabs extends CreativeTabs { + public MyTabs(String name) { super(name); } diff --git a/src/main/java/goodgenerator/util/CharExchanger.java b/src/main/java/goodgenerator/util/CharExchanger.java index 2677e3fa69..f080678d66 100644 --- a/src/main/java/goodgenerator/util/CharExchanger.java +++ b/src/main/java/goodgenerator/util/CharExchanger.java @@ -4,19 +4,17 @@ import net.minecraft.util.EnumChatFormatting; public class CharExchanger { - public static final String[] tierName = new String[] { - EnumChatFormatting.RED + "ULV" + EnumChatFormatting.RESET, - EnumChatFormatting.GRAY + "LV" + EnumChatFormatting.RESET, - EnumChatFormatting.AQUA + "MV" + EnumChatFormatting.RESET, - EnumChatFormatting.GOLD + "HV" + EnumChatFormatting.RESET, - EnumChatFormatting.DARK_PURPLE + "EV" + EnumChatFormatting.RESET, - EnumChatFormatting.DARK_BLUE + "IV" + EnumChatFormatting.RESET, - EnumChatFormatting.LIGHT_PURPLE + "LuV" + EnumChatFormatting.RESET, - EnumChatFormatting.WHITE + "ZPM" + EnumChatFormatting.RESET, - EnumChatFormatting.DARK_AQUA + "UV" + EnumChatFormatting.RESET, - EnumChatFormatting.DARK_RED + "UHV" + EnumChatFormatting.RESET, - EnumChatFormatting.GREEN + "UEV" + EnumChatFormatting.RESET, - }; + public static final String[] tierName = new String[] { EnumChatFormatting.RED + "ULV" + EnumChatFormatting.RESET, + EnumChatFormatting.GRAY + "LV" + EnumChatFormatting.RESET, + EnumChatFormatting.AQUA + "MV" + EnumChatFormatting.RESET, + EnumChatFormatting.GOLD + "HV" + EnumChatFormatting.RESET, + EnumChatFormatting.DARK_PURPLE + "EV" + EnumChatFormatting.RESET, + EnumChatFormatting.DARK_BLUE + "IV" + EnumChatFormatting.RESET, + EnumChatFormatting.LIGHT_PURPLE + "LuV" + EnumChatFormatting.RESET, + EnumChatFormatting.WHITE + "ZPM" + EnumChatFormatting.RESET, + EnumChatFormatting.DARK_AQUA + "UV" + EnumChatFormatting.RESET, + EnumChatFormatting.DARK_RED + "UHV" + EnumChatFormatting.RESET, + EnumChatFormatting.GREEN + "UEV" + EnumChatFormatting.RESET, }; public static char shifter(int unicode) { return (char) unicode; @@ -51,13 +49,13 @@ public class CharExchanger { } /** - * ">" : 1 <BR> - * "<" : 2 <BR> - * "==" : 13 <BR> - * "!=" : 14 <BR> - * ">=" : 11 <BR> - * "<=" : 12 <BR> - * INVALID : -1 + * ">" : 1 <BR> + * "<" : 2 <BR> + * "==" : 13 <BR> + * "!=" : 14 <BR> + * ">=" : 11 <BR> + * "<=" : 12 <BR> + * INVALID : -1 */ public static int getOperator(String exp) { char c1, c2; @@ -91,7 +89,7 @@ public class CharExchanger { public static boolean compareExpression(String exp, int num) { int op = getOperator(exp); String NumExp = exp; - String[] opChar = new String[] {">", "<", "=", "!"}; + String[] opChar = new String[] { ">", "<", "=", "!" }; if (op == -1) throw new IllegalArgumentException(); for (String re : opChar) NumExp = NumExp.replace(re, ""); long num2 = 0; diff --git a/src/main/java/goodgenerator/util/CrackRecipeAdder.java b/src/main/java/goodgenerator/util/CrackRecipeAdder.java index 5af5773a7e..bf2779b64d 100644 --- a/src/main/java/goodgenerator/util/CrackRecipeAdder.java +++ b/src/main/java/goodgenerator/util/CrackRecipeAdder.java @@ -1,6 +1,12 @@ package goodgenerator.util; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; + import com.github.bartimaeusnek.bartworks.system.material.Werkstoff; + import gregtech.api.enums.GT_Values; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; @@ -9,24 +15,15 @@ import gregtech.api.metatileentity.implementations.GT_MetaPipeEntity_Cable; import gregtech.api.metatileentity.implementations.GT_MetaPipeEntity_Fluid; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fluids.FluidStack; public class CrackRecipeAdder { - static float[] coe1 = {1.25f, 1.2f, 1.1f, 0.9f, 0.85f, 0.8f, 0.75f}; - static float[] coe2 = {1.4f, 1.25f, 1.2f, 0.8f, 0.75f, 0.7f, 0.65f}; - static float[] coe3 = {1.6f, 1.5f, 1.45f, 0.7f, 0.6f, 0.55f, 0.45f}; - public static void crackerAdder( - FluidStack inputFluid, - FluidStack cracker, - FluidStack[] outputFluids, - ItemStack outputItem, - int num, - int EUt, - int Duration) { + static float[] coe1 = { 1.25f, 1.2f, 1.1f, 0.9f, 0.85f, 0.8f, 0.75f }; + static float[] coe2 = { 1.4f, 1.25f, 1.2f, 0.8f, 0.75f, 0.7f, 0.65f }; + static float[] coe3 = { 1.6f, 1.5f, 1.45f, 0.7f, 0.6f, 0.55f, 0.45f }; + + public static void crackerAdder(FluidStack inputFluid, FluidStack cracker, FluidStack[] outputFluids, + ItemStack outputItem, int num, int EUt, int Duration) { String name; FluidStack[] actOutput = new FluidStack[num]; @@ -40,7 +37,12 @@ public class CrackRecipeAdder { (int) (Duration * 0.8), EUt); GT_Values.RA.addCrackingRecipe( - 2, inputFluid, cracker, FluidRegistry.getFluidStack("moderatelycracked" + name, 1000), Duration, EUt); + 2, + inputFluid, + cracker, + FluidRegistry.getFluidStack("moderatelycracked" + name, 1000), + Duration, + EUt); GT_Values.RA.addCrackingRecipe( 3, inputFluid, @@ -89,20 +91,40 @@ public class CrackRecipeAdder { EUt / 3); } - public static void addUniversalCircuitAssemblerRecipe( - ItemStack[] inputs, ItemStack output, int solders, int duration, int EUt, boolean isClean) { + public static void addUniversalCircuitAssemblerRecipe(ItemStack[] inputs, ItemStack output, int solders, + int duration, int EUt, boolean isClean) { GT_Values.RA.addCircuitAssemblerRecipe( - inputs, Materials.SolderingAlloy.getMolten(solders), output, duration, EUt, isClean); + inputs, + Materials.SolderingAlloy.getMolten(solders), + output, + duration, + EUt, + isClean); GT_Values.RA.addCircuitAssemblerRecipe( - inputs, Materials.Tin.getMolten(solders * 2), output, duration, EUt, isClean); + inputs, + Materials.Tin.getMolten(solders * 2), + output, + duration, + EUt, + isClean); GT_Values.RA.addCircuitAssemblerRecipe( - inputs, Materials.Lead.getMolten(solders * 4), output, duration, EUt, isClean); + inputs, + Materials.Lead.getMolten(solders * 4), + output, + duration, + EUt, + isClean); } - public static void addUniversalAssemblerRecipe( - ItemStack[] inputs, ItemStack output, int solders, int duration, int EUt, boolean isClean) { + public static void addUniversalAssemblerRecipe(ItemStack[] inputs, ItemStack output, int solders, int duration, + int EUt, boolean isClean) { GT_Values.RA.addAssemblerRecipe( - inputs, Materials.SolderingAlloy.getMolten(solders), output, duration, EUt, isClean); + inputs, + Materials.SolderingAlloy.getMolten(solders), + output, + duration, + EUt, + isClean); GT_Values.RA.addAssemblerRecipe(inputs, Materials.Tin.getMolten(solders * 2), output, duration, EUt, isClean); GT_Values.RA.addAssemblerRecipe(inputs, Materials.Lead.getMolten(solders * 4), output, duration, EUt, isClean); } @@ -123,7 +145,15 @@ public class CrackRecipeAdder { level); } else { GT_Values.RA.addBlastRecipe( - input, GT_Utility.getIntegratedCircuit(1), null, null, output, null, duration, EUt, level); + input, + GT_Utility.getIntegratedCircuit(1), + null, + null, + output, + null, + duration, + EUt, + level); } } @@ -138,63 +168,58 @@ public class CrackRecipeAdder { GT_OreDictUnificator.registerOre( OrePrefixes.pipeTiny.get(material.getBridgeMaterial()), new GT_MetaPipeEntity_Fluid( - ID, - "GT_Pipe_" + unName + "_Tiny", - "Tiny " + Name + " Fluid Pipe", - 0.25F, - material.getBridgeMaterial(), - flow / 6, - temp, - gas) - .getStackForm(1L)); + ID, + "GT_Pipe_" + unName + "_Tiny", + "Tiny " + Name + " Fluid Pipe", + 0.25F, + material.getBridgeMaterial(), + flow / 6, + temp, + gas).getStackForm(1L)); GT_OreDictUnificator.registerOre( OrePrefixes.pipeSmall.get(material.getBridgeMaterial()), new GT_MetaPipeEntity_Fluid( - ID + 1, - "GT_Pipe_" + unName + "_Small", - "Small " + Name + " Fluid Pipe", - 0.375F, - material.getBridgeMaterial(), - flow / 3, - temp, - gas) - .getStackForm(1L)); + ID + 1, + "GT_Pipe_" + unName + "_Small", + "Small " + Name + " Fluid Pipe", + 0.375F, + material.getBridgeMaterial(), + flow / 3, + temp, + gas).getStackForm(1L)); GT_OreDictUnificator.registerOre( OrePrefixes.pipeMedium.get(material.getBridgeMaterial()), new GT_MetaPipeEntity_Fluid( - ID + 2, - "GT_Pipe_" + unName, - Name + " Fluid Pipe", - 0.5F, - material.getBridgeMaterial(), - flow, - temp, - gas) - .getStackForm(1L)); + ID + 2, + "GT_Pipe_" + unName, + Name + " Fluid Pipe", + 0.5F, + material.getBridgeMaterial(), + flow, + temp, + gas).getStackForm(1L)); GT_OreDictUnificator.registerOre( OrePrefixes.pipeLarge.get(material.getBridgeMaterial()), new GT_MetaPipeEntity_Fluid( - ID + 3, - "GT_Pipe_" + unName + "_Large", - "Large " + Name + " Fluid Pipe", - 0.75F, - material.getBridgeMaterial(), - flow * 2, - temp, - gas) - .getStackForm(1L)); + ID + 3, + "GT_Pipe_" + unName + "_Large", + "Large " + Name + " Fluid Pipe", + 0.75F, + material.getBridgeMaterial(), + flow * 2, + temp, + gas).getStackForm(1L)); GT_OreDictUnificator.registerOre( OrePrefixes.pipeHuge.get(material.getBridgeMaterial()), new GT_MetaPipeEntity_Fluid( - ID + 4, - "GT_Pipe_" + unName + "_Huge", - "Huge " + Name + " Fluid Pipe", - 0.875F, - material.getBridgeMaterial(), - flow * 4, - temp, - gas) - .getStackForm(1L)); + ID + 4, + "GT_Pipe_" + unName + "_Huge", + "Huge " + Name + " Fluid Pipe", + 0.875F, + material.getBridgeMaterial(), + flow * 4, + temp, + gas).getStackForm(1L)); GT_Values.RA.addExtruderRecipe( material.get(OrePrefixes.ingot, 1), ItemList.Shape_Extruder_Pipe_Tiny.get(0), @@ -269,183 +294,171 @@ public class CrackRecipeAdder { OrePrefixes.wireGt01, material.getBridgeMaterial(), new GT_MetaPipeEntity_Cable( - ID + 0, - aTextWire1 + unName + ".01", - "1x " + Name + aTextWire2, - 0.125F, - material.getBridgeMaterial(), - aLoss, - 1L * aAmperage, - aVoltage, - false, - true) - .getStackForm(1L)); + ID + 0, + aTextWire1 + unName + ".01", + "1x " + Name + aTextWire2, + 0.125F, + material.getBridgeMaterial(), + aLoss, + 1L * aAmperage, + aVoltage, + false, + true).getStackForm(1L)); GT_OreDictUnificator.registerOre( OrePrefixes.wireGt02, material.getBridgeMaterial(), new GT_MetaPipeEntity_Cable( - ID + 1, - aTextWire1 + unName + ".02", - "2x " + Name + aTextWire2, - 0.25F, - material.getBridgeMaterial(), - aLoss, - 2L * aAmperage, - aVoltage, - false, - true) - .getStackForm(1L)); + ID + 1, + aTextWire1 + unName + ".02", + "2x " + Name + aTextWire2, + 0.25F, + material.getBridgeMaterial(), + aLoss, + 2L * aAmperage, + aVoltage, + false, + true).getStackForm(1L)); GT_OreDictUnificator.registerOre( OrePrefixes.wireGt04, material.getBridgeMaterial(), new GT_MetaPipeEntity_Cable( - ID + 2, - aTextWire1 + unName + ".04", - "4x " + Name + aTextWire2, - 0.375F, - material.getBridgeMaterial(), - aLoss, - 4L * aAmperage, - aVoltage, - false, - true) - .getStackForm(1L)); + ID + 2, + aTextWire1 + unName + ".04", + "4x " + Name + aTextWire2, + 0.375F, + material.getBridgeMaterial(), + aLoss, + 4L * aAmperage, + aVoltage, + false, + true).getStackForm(1L)); GT_OreDictUnificator.registerOre( OrePrefixes.wireGt08, material.getBridgeMaterial(), new GT_MetaPipeEntity_Cable( - ID + 3, - aTextWire1 + unName + ".08", - "8x " + Name + aTextWire2, - 0.5F, - material.getBridgeMaterial(), - aLoss, - 8L * aAmperage, - aVoltage, - false, - true) - .getStackForm(1L)); + ID + 3, + aTextWire1 + unName + ".08", + "8x " + Name + aTextWire2, + 0.5F, + material.getBridgeMaterial(), + aLoss, + 8L * aAmperage, + aVoltage, + false, + true).getStackForm(1L)); GT_OreDictUnificator.registerOre( OrePrefixes.wireGt12, material.getBridgeMaterial(), new GT_MetaPipeEntity_Cable( - ID + 4, - aTextWire1 + unName + ".12", - "12x " + Name + aTextWire2, - 0.625F, - material.getBridgeMaterial(), - aLoss, - 12L * aAmperage, - aVoltage, - false, - true) - .getStackForm(1L)); + ID + 4, + aTextWire1 + unName + ".12", + "12x " + Name + aTextWire2, + 0.625F, + material.getBridgeMaterial(), + aLoss, + 12L * aAmperage, + aVoltage, + false, + true).getStackForm(1L)); GT_OreDictUnificator.registerOre( OrePrefixes.wireGt16, material.getBridgeMaterial(), new GT_MetaPipeEntity_Cable( - ID + 5, - aTextWire1 + unName + ".16", - "16x " + Name + aTextWire2, - 0.75F, - material.getBridgeMaterial(), - aLoss, - 16L * aAmperage, - aVoltage, - false, - true) - .getStackForm(1L)); + ID + 5, + aTextWire1 + unName + ".16", + "16x " + Name + aTextWire2, + 0.75F, + material.getBridgeMaterial(), + aLoss, + 16L * aAmperage, + aVoltage, + false, + true).getStackForm(1L)); if (cover) { GT_OreDictUnificator.registerOre( OrePrefixes.cableGt01, material.getBridgeMaterial(), new GT_MetaPipeEntity_Cable( - ID + 6, - aTextCable1 + unName + ".01", - "1x " + Name + aTextCable2, - 0.25F, - material.getBridgeMaterial(), - aLossInsulated, - 1L * aAmperage, - aVoltage, - true, - false) - .getStackForm(1L)); + ID + 6, + aTextCable1 + unName + ".01", + "1x " + Name + aTextCable2, + 0.25F, + material.getBridgeMaterial(), + aLossInsulated, + 1L * aAmperage, + aVoltage, + true, + false).getStackForm(1L)); GT_OreDictUnificator.registerOre( OrePrefixes.cableGt02, material.getBridgeMaterial(), new GT_MetaPipeEntity_Cable( - ID + 7, - aTextCable1 + unName + ".02", - "2x " + Name + aTextCable2, - 0.375F, - material.getBridgeMaterial(), - aLossInsulated, - 2L * aAmperage, - aVoltage, - true, - false) - .getStackForm(1L)); + ID + 7, + aTextCable1 + unName + ".02", + "2x " + Name + aTextCable2, + 0.375F, + material.getBridgeMaterial(), + aLossInsulated, + 2L * aAmperage, + aVoltage, + true, + false).getStackForm(1L)); GT_OreDictUnificator.registerOre( OrePrefixes.cableGt04, material.getBridgeMaterial(), new GT_MetaPipeEntity_Cable( - ID + 8, - aTextCable1 + unName + ".04", - "4x " + Name + aTextCable2, - 0.5F, - material.getBridgeMaterial(), - aLossInsulated, - 4L * aAmperage, - aVoltage, - true, - false) - .getStackForm(1L)); + ID + 8, + aTextCable1 + unName + ".04", + "4x " + Name + aTextCable2, + 0.5F, + material.getBridgeMaterial(), + aLossInsulated, + 4L * aAmperage, + aVoltage, + true, + false).getStackForm(1L)); GT_OreDictUnificator.registerOre( OrePrefixes.cableGt08, material.getBridgeMaterial(), new GT_MetaPipeEntity_Cable( - ID + 9, - aTextCable1 + unName + ".08", - "8x " + Name + aTextCable2, - 0.625F, - material.getBridgeMaterial(), - aLossInsulated, - 8L * aAmperage, - aVoltage, - true, - false) - .getStackForm(1L)); + ID + 9, + aTextCable1 + unName + ".08", + "8x " + Name + aTextCable2, + 0.625F, + material.getBridgeMaterial(), + aLossInsulated, + 8L * aAmperage, + aVoltage, + true, + false).getStackForm(1L)); GT_OreDictUnificator.registerOre( OrePrefixes.cableGt12, material.getBridgeMaterial(), new GT_MetaPipeEntity_Cable( - ID + 10, - aTextCable1 + unName + ".12", - "12x " + Name + aTextCable2, - 0.75F, - material.getBridgeMaterial(), - aLossInsulated, - 12L * aAmperage, - aVoltage, - true, - false) - .getStackForm(1L)); + ID + 10, + aTextCable1 + unName + ".12", + "12x " + Name + aTextCable2, + 0.75F, + material.getBridgeMaterial(), + aLossInsulated, + 12L * aAmperage, + aVoltage, + true, + false).getStackForm(1L)); GT_OreDictUnificator.registerOre( OrePrefixes.cableGt16, material.getBridgeMaterial(), new GT_MetaPipeEntity_Cable( - ID + 11, - aTextCable1 + unName + ".16", - "16x " + Name + aTextCable2, - 0.875F, - material.getBridgeMaterial(), - aLossInsulated, - 16L * aAmperage, - aVoltage, - true, - false) - .getStackForm(1L)); + ID + 11, + aTextCable1 + unName + ".16", + "16x " + Name + aTextCable2, + 0.875F, + material.getBridgeMaterial(), + aLossInsulated, + 16L * aAmperage, + aVoltage, + true, + false).getStackForm(1L)); } GT_Values.RA.addWiremillRecipe( material.get(OrePrefixes.ingot, 1), diff --git a/src/main/java/goodgenerator/util/DescTextLocalization.java b/src/main/java/goodgenerator/util/DescTextLocalization.java index b65f529475..cb015a25c9 100644 --- a/src/main/java/goodgenerator/util/DescTextLocalization.java +++ b/src/main/java/goodgenerator/util/DescTextLocalization.java @@ -5,9 +5,12 @@ import net.minecraft.util.StatCollector; public class DescTextLocalization { - public static final String BLUE_PRINT_INFO = - "Follow the" + EnumChatFormatting.BLUE + " Structure" + EnumChatFormatting.DARK_BLUE + "Lib" - + EnumChatFormatting.GRAY + " hologram projector to build the main structure."; + public static final String BLUE_PRINT_INFO = "Follow the" + EnumChatFormatting.BLUE + + " Structure" + + EnumChatFormatting.DARK_BLUE + + "Lib" + + EnumChatFormatting.GRAY + + " hologram projector to build the main structure."; public static String[] addText(String preFix, int length) { String[] text = new String[length]; diff --git a/src/main/java/goodgenerator/util/ItemRefer.java b/src/main/java/goodgenerator/util/ItemRefer.java index 86ac3db64d..98baad7d94 100644 --- a/src/main/java/goodgenerator/util/ItemRefer.java +++ b/src/main/java/goodgenerator/util/ItemRefer.java @@ -3,12 +3,13 @@ package goodgenerator.util; import static goodgenerator.loader.FuelRodLoader.*; import static goodgenerator.loader.Loaders.*; -import gregtech.api.util.GT_Utility; -import ic2.core.Ic2Items; import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import gregtech.api.util.GT_Utility; +import ic2.core.Ic2Items; + public final class ItemRefer { public static ItemRefer NULL = getItemStack(_null_); diff --git a/src/main/java/goodgenerator/util/Log.java b/src/main/java/goodgenerator/util/Log.java index 8b88ddf5f1..4cf9e40484 100644 --- a/src/main/java/goodgenerator/util/Log.java +++ b/src/main/java/goodgenerator/util/Log.java @@ -4,5 +4,6 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; public class Log { + public static final Logger LOGGER = LogManager.getLogger("GoodGenerator"); } diff --git a/src/main/java/goodgenerator/util/MaterialFix.java b/src/main/java/goodgenerator/util/MaterialFix.java index 795686f676..d3a0548aca 100644 --- a/src/main/java/goodgenerator/util/MaterialFix.java +++ b/src/main/java/goodgenerator/util/MaterialFix.java @@ -1,6 +1,7 @@ package goodgenerator.util; import com.github.bartimaeusnek.bartworks.system.material.Werkstoff; + import gregtech.api.enums.GT_Values; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; @@ -10,75 +11,72 @@ import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; public class MaterialFix { + public static void MaterialFluidExtractionFix(Werkstoff material) { if (material.hasItemType(OrePrefixes.ingot)) { - GT_Values.RA.addFluidExtractionRecipe( - material.get(OrePrefixes.ingot), null, material.getMolten(144), 0, 32, 8); + GT_Values.RA + .addFluidExtractionRecipe(material.get(OrePrefixes.ingot), null, material.getMolten(144), 0, 32, 8); GT_Values.RA.addFluidSolidifierRecipe( - ItemList.Shape_Mold_Ingot.get(0), material.getMolten(144), material.get(OrePrefixes.ingot), 32, 48); + ItemList.Shape_Mold_Ingot.get(0), + material.getMolten(144), + material.get(OrePrefixes.ingot), + 32, + 48); } if (material.hasItemType(OrePrefixes.plate)) { - GT_Values.RA.addFluidExtractionRecipe( - material.get(OrePrefixes.plate), null, material.getMolten(144), 0, 32, 8); + GT_Values.RA + .addFluidExtractionRecipe(material.get(OrePrefixes.plate), null, material.getMolten(144), 0, 32, 8); GT_Values.RA.addFluidSolidifierRecipe( - ItemList.Shape_Mold_Plate.get(0), material.getMolten(144), material.get(OrePrefixes.plate), 32, 48); + ItemList.Shape_Mold_Plate.get(0), + material.getMolten(144), + material.get(OrePrefixes.plate), + 32, + 48); } - if (material.hasItemType(OrePrefixes.gearGtSmall)) - GT_Values.RA.addFluidExtractionRecipe( - material.get(OrePrefixes.gearGtSmall), null, material.getMolten(144), 0, 32, 8); - if (material.hasItemType(OrePrefixes.stickLong)) - GT_Values.RA.addFluidExtractionRecipe( - material.get(OrePrefixes.stickLong), null, material.getMolten(144), 0, 32, 8); - if (material.hasItemType(OrePrefixes.spring)) - GT_Values.RA.addFluidExtractionRecipe( - material.get(OrePrefixes.spring), null, material.getMolten(144), 0, 32, 8); - if (material.hasItemType(OrePrefixes.stick)) - GT_Values.RA.addFluidExtractionRecipe( - material.get(OrePrefixes.stick), null, material.getMolten(72), 0, 16, 8); - if (material.hasItemType(OrePrefixes.itemCasing)) - GT_Values.RA.addFluidExtractionRecipe( - material.get(OrePrefixes.itemCasing), null, material.getMolten(72), 0, 16, 8); - if (material.hasItemType(OrePrefixes.wireGt01)) - GT_Values.RA.addFluidExtractionRecipe( - material.get(OrePrefixes.wireGt01), null, material.getMolten(72), 0, 16, 8); - if (material.hasItemType(OrePrefixes.cableGt01)) - GT_Values.RA.addFluidExtractionRecipe( - material.get(OrePrefixes.cableGt01), - GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Ash, 2), - material.getMolten(72), - 10000, - 16, - 8); - if (material.hasItemType(OrePrefixes.foil)) - GT_Values.RA.addFluidExtractionRecipe( - material.get(OrePrefixes.foil), null, material.getMolten(36), 0, 8, 8); - if (material.hasItemType(OrePrefixes.springSmall)) - GT_Values.RA.addFluidExtractionRecipe( - material.get(OrePrefixes.springSmall), null, material.getMolten(36), 0, 8, 8); - if (material.hasItemType(OrePrefixes.ring)) - GT_Values.RA.addFluidExtractionRecipe( - material.get(OrePrefixes.ring), null, material.getMolten(36), 0, 8, 8); - if (material.hasItemType(OrePrefixes.bolt)) - GT_Values.RA.addFluidExtractionRecipe( - material.get(OrePrefixes.bolt), null, material.getMolten(18), 0, 4, 8); - if (material.hasItemType(OrePrefixes.wireFine)) - GT_Values.RA.addFluidExtractionRecipe( - material.get(OrePrefixes.wireFine), null, material.getMolten(18), 0, 4, 8); - if (material.hasItemType(OrePrefixes.round)) - GT_Values.RA.addFluidExtractionRecipe( - material.get(OrePrefixes.round), null, material.getMolten(16), 0, 4, 8); - if (material.hasItemType(OrePrefixes.screw)) - GT_Values.RA.addFluidExtractionRecipe( - material.get(OrePrefixes.screw), null, material.getMolten(16), 0, 4, 8); - if (material.hasItemType(OrePrefixes.nugget)) - GT_Values.RA.addFluidExtractionRecipe( - material.get(OrePrefixes.nugget), null, material.getMolten(16), 0, 4, 8); - if (material.hasItemType(OrePrefixes.rotor)) - GT_Values.RA.addFluidExtractionRecipe( - material.get(OrePrefixes.rotor), null, material.getMolten(612), 0, 136, 8); - if (material.hasItemType(OrePrefixes.gearGt)) - GT_Values.RA.addFluidExtractionRecipe( - material.get(OrePrefixes.gearGt), null, material.getMolten(576), 0, 128, 8); + if (material.hasItemType(OrePrefixes.gearGtSmall)) GT_Values.RA.addFluidExtractionRecipe( + material.get(OrePrefixes.gearGtSmall), + null, + material.getMolten(144), + 0, + 32, + 8); + if (material.hasItemType(OrePrefixes.stickLong)) GT_Values.RA + .addFluidExtractionRecipe(material.get(OrePrefixes.stickLong), null, material.getMolten(144), 0, 32, 8); + if (material.hasItemType(OrePrefixes.spring)) GT_Values.RA + .addFluidExtractionRecipe(material.get(OrePrefixes.spring), null, material.getMolten(144), 0, 32, 8); + if (material.hasItemType(OrePrefixes.stick)) GT_Values.RA + .addFluidExtractionRecipe(material.get(OrePrefixes.stick), null, material.getMolten(72), 0, 16, 8); + if (material.hasItemType(OrePrefixes.itemCasing)) GT_Values.RA + .addFluidExtractionRecipe(material.get(OrePrefixes.itemCasing), null, material.getMolten(72), 0, 16, 8); + if (material.hasItemType(OrePrefixes.wireGt01)) GT_Values.RA + .addFluidExtractionRecipe(material.get(OrePrefixes.wireGt01), null, material.getMolten(72), 0, 16, 8); + if (material.hasItemType(OrePrefixes.cableGt01)) GT_Values.RA.addFluidExtractionRecipe( + material.get(OrePrefixes.cableGt01), + GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Ash, 2), + material.getMolten(72), + 10000, + 16, + 8); + if (material.hasItemType(OrePrefixes.foil)) GT_Values.RA + .addFluidExtractionRecipe(material.get(OrePrefixes.foil), null, material.getMolten(36), 0, 8, 8); + if (material.hasItemType(OrePrefixes.springSmall)) GT_Values.RA + .addFluidExtractionRecipe(material.get(OrePrefixes.springSmall), null, material.getMolten(36), 0, 8, 8); + if (material.hasItemType(OrePrefixes.ring)) GT_Values.RA + .addFluidExtractionRecipe(material.get(OrePrefixes.ring), null, material.getMolten(36), 0, 8, 8); + if (material.hasItemType(OrePrefixes.bolt)) GT_Values.RA + .addFluidExtractionRecipe(material.get(OrePrefixes.bolt), null, material.getMolten(18), 0, 4, 8); + if (material.hasItemType(OrePrefixes.wireFine)) GT_Values.RA + .addFluidExtractionRecipe(material.get(OrePrefixes.wireFine), null, material.getMolten(18), 0, 4, 8); + if (material.hasItemType(OrePrefixes.round)) GT_Values.RA + .addFluidExtractionRecipe(material.get(OrePrefixes.round), null, material.getMolten(16), 0, 4, 8); + if (material.hasItemType(OrePrefixes.screw)) GT_Values.RA + .addFluidExtractionRecipe(material.get(OrePrefixes.screw), null, material.getMolten(16), 0, 4, 8); + if (material.hasItemType(OrePrefixes.nugget)) GT_Values.RA + .addFluidExtractionRecipe(material.get(OrePrefixes.nugget), null, material.getMolten(16), 0, 4, 8); + if (material.hasItemType(OrePrefixes.rotor)) GT_Values.RA + .addFluidExtractionRecipe(material.get(OrePrefixes.rotor), null, material.getMolten(612), 0, 136, 8); + if (material.hasItemType(OrePrefixes.gearGt)) GT_Values.RA + .addFluidExtractionRecipe(material.get(OrePrefixes.gearGt), null, material.getMolten(576), 0, 128, 8); } public static void addRecipeForMultiItems() { @@ -99,10 +97,10 @@ public class MaterialFix { 60); GT_ModHandler.addCraftingRecipe( tMaterial.get(OrePrefixes.plateDouble, 1), - new Object[] {"P", "P", "h", 'P', tMaterial.get(OrePrefixes.plate, 1)}); + new Object[] { "P", "P", "h", 'P', tMaterial.get(OrePrefixes.plate, 1) }); GT_ModHandler.addCraftingRecipe( tMaterial.get(OrePrefixes.ingotDouble, 1), - new Object[] {"P", "P", "h", 'P', tMaterial.get(OrePrefixes.ingot, 1)}); + new Object[] { "P", "P", "h", 'P', tMaterial.get(OrePrefixes.ingot, 1) }); } if (tMaterial.hasItemType(OrePrefixes.plateTriple) && tMaterial.hasItemType(OrePrefixes.ingotTriple)) { GT_Values.RA.addBenderRecipe( @@ -123,24 +121,14 @@ public class MaterialFix { tMaterial.get(OrePrefixes.plateTriple, 1), (int) Math.max(tMaterial.getStats().getMass(), 1L), 60); - GT_ModHandler.addCraftingRecipe(tMaterial.get(OrePrefixes.plateTriple, 1), new Object[] { - "B", - "P", - "h", - 'P', - tMaterial.get(OrePrefixes.plate, 1), - 'B', - tMaterial.get(OrePrefixes.plateDouble, 1) - }); - GT_ModHandler.addCraftingRecipe(tMaterial.get(OrePrefixes.ingotTriple, 1), new Object[] { - "B", - "P", - "h", - 'P', - tMaterial.get(OrePrefixes.ingot, 1), - 'B', - tMaterial.get(OrePrefixes.ingotDouble, 1) - }); + GT_ModHandler.addCraftingRecipe( + tMaterial.get(OrePrefixes.plateTriple, 1), + new Object[] { "B", "P", "h", 'P', tMaterial.get(OrePrefixes.plate, 1), 'B', + tMaterial.get(OrePrefixes.plateDouble, 1) }); + GT_ModHandler.addCraftingRecipe( + tMaterial.get(OrePrefixes.ingotTriple, 1), + new Object[] { "B", "P", "h", 'P', tMaterial.get(OrePrefixes.ingot, 1), 'B', + tMaterial.get(OrePrefixes.ingotDouble, 1) }); } if (tMaterial.hasItemType(OrePrefixes.plateDense)) { GT_Values.RA.addBenderRecipe( @@ -192,7 +180,7 @@ public class MaterialFix { if (tMaterial.hasItemType(OrePrefixes.stick)) { GT_ModHandler.addCraftingRecipe( tMaterial.get(OrePrefixes.stickLong, 1), - new Object[] {"PhP", 'P', tMaterial.get(OrePrefixes.stick, 1)}); + new Object[] { "PhP", 'P', tMaterial.get(OrePrefixes.stick, 1) }); GT_Values.RA.addForgeHammerRecipe( tMaterial.get(OrePrefixes.stick, 2), tMaterial.get(OrePrefixes.stickLong, 1), @@ -203,7 +191,7 @@ public class MaterialFix { if (tMaterial.hasItemType(OrePrefixes.spring)) { GT_ModHandler.addCraftingRecipe( tMaterial.get(OrePrefixes.spring, 1), - new Object[] {" s ", "fPx", " P ", 'P', tMaterial.get(OrePrefixes.stickLong, 1)}); + new Object[] { " s ", "fPx", " P ", 'P', tMaterial.get(OrePrefixes.stickLong, 1) }); GT_Values.RA.addBenderRecipe( tMaterial.get(OrePrefixes.stickLong, 1), GT_Utility.getIntegratedCircuit(1), @@ -214,7 +202,7 @@ public class MaterialFix { if (tMaterial.hasItemType(OrePrefixes.springSmall)) { GT_ModHandler.addCraftingRecipe( tMaterial.get(OrePrefixes.springSmall, 1), - new Object[] {" s ", "fPx", 'P', tMaterial.get(OrePrefixes.stick, 1)}); + new Object[] { " s ", "fPx", 'P', tMaterial.get(OrePrefixes.stick, 1) }); GT_Values.RA.addBenderRecipe( tMaterial.get(OrePrefixes.stick, 1), GT_Utility.getIntegratedCircuit(1), diff --git a/src/main/java/goodgenerator/util/MyRecipeAdder.java b/src/main/java/goodgenerator/util/MyRecipeAdder.java index 548e3ef296..ce63af69ae 100644 --- a/src/main/java/goodgenerator/util/MyRecipeAdder.java +++ b/src/main/java/goodgenerator/util/MyRecipeAdder.java @@ -1,14 +1,5 @@ package goodgenerator.util; -import com.gtnewhorizons.modularui.api.math.Pos2d; -import com.gtnewhorizons.modularui.api.screen.ModularWindow; -import com.gtnewhorizons.modularui.common.widget.DrawableWidget; -import goodgenerator.client.GUI.GG_UITextures; -import gregtech.api.enums.GT_Values; -import gregtech.api.gui.modularui.GT_UITextures; -import gregtech.api.util.GT_Recipe; -import gregtech.api.util.GT_Utility; -import gregtech.common.gui.modularui.UIHelper; import java.awt.*; import java.util.Arrays; import java.util.Collection; @@ -17,41 +8,52 @@ import java.util.HashMap; import java.util.HashSet; import java.util.List; import java.util.function.Supplier; + import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; +import com.gtnewhorizons.modularui.api.math.Pos2d; +import com.gtnewhorizons.modularui.api.screen.ModularWindow; +import com.gtnewhorizons.modularui.common.widget.DrawableWidget; + +import goodgenerator.client.GUI.GG_UITextures; +import gregtech.api.enums.GT_Values; +import gregtech.api.gui.modularui.GT_UITextures; +import gregtech.api.util.GT_Recipe; +import gregtech.api.util.GT_Utility; +import gregtech.common.gui.modularui.UIHelper; + public class MyRecipeAdder { public static final MyRecipeAdder instance = new MyRecipeAdder(); - public final liquidMentalFuelMapper NqGFuels = (liquidMentalFuelMapper) - new liquidMentalFuelMapper( - new HashSet<>(50), - "gg.recipe.naquadah_reactor", - StatCollector.translateToLocal("tile.recipe.naquadah_reactor"), - null, - "goodgenerator:textures/gui/naquadah_reactor", - 0, - 0, - 0, - 1, - 1, - StatCollector.translateToLocal("value.naquadah_reactor") + " ", - 1, - " EU/t", - false, - true) { - @Override - public void addProgressBarUI( - ModularWindow.Builder builder, Supplier<Float> progressSupplier, Pos2d windowOffset) { - builder.widget(new DrawableWidget() - .setDrawable(GG_UITextures.PICTURE_NAQUADAH_REACTOR) - .setPos(new Pos2d(59, 20).add(windowOffset)) - .setSize(58, 42)); - } - }.useModularUI(true); + public final liquidMentalFuelMapper NqGFuels = (liquidMentalFuelMapper) new liquidMentalFuelMapper( + new HashSet<>(50), + "gg.recipe.naquadah_reactor", + StatCollector.translateToLocal("tile.recipe.naquadah_reactor"), + null, + "goodgenerator:textures/gui/naquadah_reactor", + 0, + 0, + 0, + 1, + 1, + StatCollector.translateToLocal("value.naquadah_reactor") + " ", + 1, + " EU/t", + false, + true) { + + @Override + public void addProgressBarUI(ModularWindow.Builder builder, Supplier<Float> progressSupplier, + Pos2d windowOffset) { + builder.widget( + new DrawableWidget().setDrawable(GG_UITextures.PICTURE_NAQUADAH_REACTOR) + .setPos(new Pos2d(59, 20).add(windowOffset)).setSize(58, 42)); + } + }.useModularUI(true); public final NaqFuelRefineMapper FRF = new NaqFuelRefineMapper( new HashSet<>(50), @@ -71,56 +73,53 @@ public class MyRecipeAdder { true); public final NeutronActivatorMapper NA = (NeutronActivatorMapper) new NeutronActivatorMapper( - new HashSet<>(150), - "gg.recipe.neutron_activator", - StatCollector.translateToLocal("tile.neutron_activator"), - null, - "goodgenerator:textures/gui/neutron_activator", - 9, - 9, - 0, - 0, - 0, - null, - 0, - null, - false, - true) - .setNEISpecialInfoFormatter((recipeInfo, applyPrefixAndSuffix) -> { + new HashSet<>(150), + "gg.recipe.neutron_activator", + StatCollector.translateToLocal("tile.neutron_activator"), + null, + "goodgenerator:textures/gui/neutron_activator", + 9, + 9, + 0, + 0, + 0, + null, + 0, + null, + false, + true).setNEISpecialInfoFormatter((recipeInfo, applyPrefixAndSuffix) -> { int minNKE = recipeInfo.recipe.mSpecialValue % 10000; int maxNKE = recipeInfo.recipe.mSpecialValue / 10000; return Arrays.asList( StatCollector.translateToLocal("value.neutron_activator.0"), - GT_Utility.formatNumbers(minNKE) - + StatCollector.translateToLocal("value.neutron_activator.2"), + GT_Utility.formatNumbers(minNKE) + StatCollector.translateToLocal("value.neutron_activator.2"), StatCollector.translateToLocal("value.neutron_activator.1"), - GT_Utility.formatNumbers(maxNKE) - + StatCollector.translateToLocal("value.neutron_activator.2")); + GT_Utility.formatNumbers(maxNKE) + StatCollector.translateToLocal("value.neutron_activator.2")); }); public final ExtremeHeatExchangerMapper XHE = (ExtremeHeatExchangerMapper) new ExtremeHeatExchangerMapper( - new HashSet<>(50), - "gg.recipe.extreme_heat_exchanger", - StatCollector.translateToLocal("tile.extreme_heat_exchanger"), - null, - "goodgenerator:textures/gui/extreme_heat_exchanger", - 0, - 0, - 0, - 0, - 0, - null, - 0, - null, - false, - true) - .setNEISpecialInfoFormatter((recipeInfo, applyPrefixAndSuffix) -> { + new HashSet<>(50), + "gg.recipe.extreme_heat_exchanger", + StatCollector.translateToLocal("tile.extreme_heat_exchanger"), + null, + "goodgenerator:textures/gui/extreme_heat_exchanger", + 0, + 0, + 0, + 0, + 0, + null, + 0, + null, + false, + true).setNEISpecialInfoFormatter((recipeInfo, applyPrefixAndSuffix) -> { FluidStack[] Inputs = recipeInfo.recipe.mFluidInputs; FluidStack[] Outputs = recipeInfo.recipe.mFluidOutputs; int threshold = recipeInfo.recipe.mSpecialValue; return Arrays.asList( StatCollector.translateToLocal("value.extreme_heat_exchanger.0") + " " - + GT_Utility.formatNumbers(Inputs[0].amount) + " L/s", + + GT_Utility.formatNumbers(Inputs[0].amount) + + " L/s", StatCollector.translateToLocal("value.extreme_heat_exchanger.1"), GT_Utility.formatNumbers(Outputs[0].amount / 160) + " L/s", StatCollector.translateToLocal("value.extreme_heat_exchanger.2"), @@ -146,21 +145,11 @@ public class MyRecipeAdder { true); public static class liquidMentalFuelMapper extends GT_Recipe.GT_Recipe_Map_Fuel { - public liquidMentalFuelMapper( - Collection<GT_Recipe> aRecipeList, - String aUnlocalizedName, - String aLocalName, - String aNEIName, - String aNEIGUIPath, - int aUsualInputCount, - int aUsualOutputCount, - int aMinimalInputItems, - int aMinimalInputFluids, - int aAmperage, - String aNEISpecialValuePre, - int aNEISpecialValueMultiplier, - String aNEISpecialValuePost, - boolean aShowVoltageAmperageInNEI, + + public liquidMentalFuelMapper(Collection<GT_Recipe> aRecipeList, String aUnlocalizedName, String aLocalName, + String aNEIName, String aNEIGUIPath, int aUsualInputCount, int aUsualOutputCount, + int aMinimalInputItems, int aMinimalInputFluids, int aAmperage, String aNEISpecialValuePre, + int aNEISpecialValueMultiplier, String aNEISpecialValuePost, boolean aShowVoltageAmperageInNEI, boolean aNEIAllowed) { super( aRecipeList, @@ -181,7 +170,16 @@ public class MyRecipeAdder { } public void addFuel(FluidStack input, FluidStack output, int EUt, int ticks) { - super.addRecipe(true, null, null, null, new FluidStack[] {input}, new FluidStack[] {output}, ticks, 0, EUt); + super.addRecipe( + true, + null, + null, + null, + new FluidStack[] { input }, + new FluidStack[] { output }, + ticks, + 0, + EUt); } } @@ -190,21 +188,11 @@ public class MyRecipeAdder { } public static class NaqFuelRefineMapper extends GT_Recipe.GT_Recipe_Map { - public NaqFuelRefineMapper( - Collection<GT_Recipe> aRecipeList, - String aUnlocalizedName, - String aLocalName, - String aNEIName, - String aNEIGUIPath, - int aUsualInputCount, - int aUsualOutputCount, - int aMinimalInputItems, - int aMinimalInputFluids, - int aAmperage, - String aNEISpecialValuePre, - int aNEISpecialValueMultiplier, - String aNEISpecialValuePost, - boolean aShowVoltageAmperageInNEI, + + public NaqFuelRefineMapper(Collection<GT_Recipe> aRecipeList, String aUnlocalizedName, String aLocalName, + String aNEIName, String aNEIGUIPath, int aUsualInputCount, int aUsualOutputCount, + int aMinimalInputItems, int aMinimalInputFluids, int aAmperage, String aNEISpecialValuePre, + int aNEISpecialValueMultiplier, String aNEISpecialValuePost, boolean aShowVoltageAmperageInNEI, boolean aNEIAllowed) { super( aRecipeList, @@ -225,33 +213,23 @@ public class MyRecipeAdder { setUsualFluidInputCount(2); } - public void addNaqFuelRefineRecipe( - FluidStack[] input1, ItemStack[] input2, FluidStack output, int EUt, int ticks, int tier) { - super.addRecipe(false, input2, null, null, input1, new FluidStack[] {output}, ticks, EUt, tier); + public void addNaqFuelRefineRecipe(FluidStack[] input1, ItemStack[] input2, FluidStack output, int EUt, + int ticks, int tier) { + super.addRecipe(false, input2, null, null, input1, new FluidStack[] { output }, ticks, EUt, tier); } } - public void addNaquadahFuelRefineRecipe( - FluidStack[] input1, ItemStack[] input2, FluidStack output, int EUt, int ticks, int tier) { + public void addNaquadahFuelRefineRecipe(FluidStack[] input1, ItemStack[] input2, FluidStack output, int EUt, + int ticks, int tier) { FRF.addNaqFuelRefineRecipe(input1, input2, output, EUt, ticks, tier); } public static class NeutronActivatorMapper extends GT_Recipe.GT_Recipe_Map { - public NeutronActivatorMapper( - Collection<GT_Recipe> aRecipeList, - String aUnlocalizedName, - String aLocalName, - String aNEIName, - String aNEIGUIPath, - int aUsualInputCount, - int aUsualOutputCount, - int aMinimalInputItems, - int aMinimalInputFluids, - int aAmperage, - String aNEISpecialValuePre, - int aNEISpecialValueMultiplier, - String aNEISpecialValuePost, - boolean aShowVoltageAmperageInNEI, + + public NeutronActivatorMapper(Collection<GT_Recipe> aRecipeList, String aUnlocalizedName, String aLocalName, + String aNEIName, String aNEIGUIPath, int aUsualInputCount, int aUsualOutputCount, + int aMinimalInputItems, int aMinimalInputFluids, int aAmperage, String aNEISpecialValuePre, + int aNEISpecialValueMultiplier, String aNEISpecialValuePost, boolean aShowVoltageAmperageInNEI, boolean aNEIAllowed) { super( aRecipeList, @@ -272,34 +250,22 @@ public class MyRecipeAdder { useModularUI(true); } - public void addNARecipe( - FluidStack[] input1, - ItemStack[] input2, - FluidStack[] output1, - ItemStack[] output2, - int ticks, - int special) { + public void addNARecipe(FluidStack[] input1, ItemStack[] input2, FluidStack[] output1, ItemStack[] output2, + int ticks, int special) { super.addRecipe(false, input2, output2, null, input1, output1, ticks, 0, special); } @Override - public void addProgressBarUI( - ModularWindow.Builder builder, Supplier<Float> progressSupplier, Pos2d windowOffset) { - builder.widget(new DrawableWidget() - .setDrawable(GG_UITextures.PICTURE_NEUTRON_ACTIVATOR) - .setPos(new Pos2d(73, 22).add(windowOffset)) - .setSize(31, 21)); + public void addProgressBarUI(ModularWindow.Builder builder, Supplier<Float> progressSupplier, + Pos2d windowOffset) { + builder.widget( + new DrawableWidget().setDrawable(GG_UITextures.PICTURE_NEUTRON_ACTIVATOR) + .setPos(new Pos2d(73, 22).add(windowOffset)).setSize(31, 21)); } } - public void addNeutronActivatorRecipe( - FluidStack[] input1, - ItemStack[] input2, - FluidStack[] output1, - ItemStack[] output2, - int ticks, - int maxNKE, - int minNKE) { + public void addNeutronActivatorRecipe(FluidStack[] input1, ItemStack[] input2, FluidStack[] output1, + ItemStack[] output2, int ticks, int maxNKE, int minNKE) { if (maxNKE <= 0) maxNKE = 1; if (maxNKE >= 1100) maxNKE = 1100; if (minNKE < 0) minNKE = 0; @@ -310,21 +276,11 @@ public class MyRecipeAdder { public static HashMap<Fluid, ExtremeHeatExchangerRecipe> mXHeatExchangerFuelMap = new HashMap<>(); public static class ExtremeHeatExchangerMapper extends GT_Recipe.GT_Recipe_Map { - public ExtremeHeatExchangerMapper( - Collection<GT_Recipe> aRecipeList, - String aUnlocalizedName, - String aLocalName, - String aNEIName, - String aNEIGUIPath, - int aUsualInputCount, - int aUsualOutputCount, - int aMinimalInputItems, - int aMinimalInputFluids, - int aAmperage, - String aNEISpecialValuePre, - int aNEISpecialValueMultiplier, - String aNEISpecialValuePost, - boolean aShowVoltageAmperageInNEI, + + public ExtremeHeatExchangerMapper(Collection<GT_Recipe> aRecipeList, String aUnlocalizedName, String aLocalName, + String aNEIName, String aNEIGUIPath, int aUsualInputCount, int aUsualOutputCount, + int aMinimalInputItems, int aMinimalInputFluids, int aAmperage, String aNEISpecialValuePre, + int aNEISpecialValueMultiplier, String aNEISpecialValuePost, boolean aShowVoltageAmperageInNEI, boolean aNEIAllowed) { super( aRecipeList, @@ -347,19 +303,13 @@ public class MyRecipeAdder { } @Override - public GT_Recipe addRecipe( - boolean aOptimize, - ItemStack[] aInputs, - ItemStack[] aOutputs, - Object aSpecial, - int[] aOutputChances, - FluidStack[] aFluidInputs, - FluidStack[] aFluidOutputs, - int aDuration, - int aEUt, + public GT_Recipe addRecipe(boolean aOptimize, ItemStack[] aInputs, ItemStack[] aOutputs, Object aSpecial, + int[] aOutputChances, FluidStack[] aFluidInputs, FluidStack[] aFluidOutputs, int aDuration, int aEUt, int aSpecialValue) { - ExtremeHeatExchangerRecipe tRecipe = - new ExtremeHeatExchangerRecipe(aFluidInputs, aFluidOutputs, aSpecialValue); + ExtremeHeatExchangerRecipe tRecipe = new ExtremeHeatExchangerRecipe( + aFluidInputs, + aFluidOutputs, + aSpecialValue); mXHeatExchangerFuelMap.put(aFluidInputs[0].getFluid(), tRecipe); return addRecipe(tRecipe); } @@ -375,12 +325,11 @@ public class MyRecipeAdder { } @Override - public void addProgressBarUI( - ModularWindow.Builder builder, Supplier<Float> progressSupplier, Pos2d windowOffset) { - builder.widget(new DrawableWidget() - .setDrawable(GG_UITextures.PICTURE_EXTREME_HEAT_EXCHANGER) - .setPos(new Pos2d(47, 13).add(windowOffset)) - .setSize(78, 59)); + public void addProgressBarUI(ModularWindow.Builder builder, Supplier<Float> progressSupplier, + Pos2d windowOffset) { + builder.widget( + new DrawableWidget().setDrawable(GG_UITextures.PICTURE_EXTREME_HEAT_EXCHANGER) + .setPos(new Pos2d(47, 13).add(windowOffset)).setSize(78, 59)); } } @@ -444,42 +393,27 @@ public class MyRecipeAdder { } } - public void addExtremeHeatExchangerRecipe( - FluidStack HotFluid, - FluidStack ColdFluid, - FluidStack WorkFluid, - FluidStack HeatedWorkFluid, - FluidStack OverHeatedWorkFluid, - int Threshold) { + public void addExtremeHeatExchangerRecipe(FluidStack HotFluid, FluidStack ColdFluid, FluidStack WorkFluid, + FluidStack HeatedWorkFluid, FluidStack OverHeatedWorkFluid, int Threshold) { XHE.addRecipe( false, null, null, null, null, - new FluidStack[] {HotFluid, WorkFluid}, - new FluidStack[] {HeatedWorkFluid, OverHeatedWorkFluid, ColdFluid}, + new FluidStack[] { HotFluid, WorkFluid }, + new FluidStack[] { HeatedWorkFluid, OverHeatedWorkFluid, ColdFluid }, 0, 0, Threshold); } public static class PreciseAssemblerMapper extends GT_Recipe.GT_Recipe_Map { - public PreciseAssemblerMapper( - Collection<GT_Recipe> aRecipeList, - String aUnlocalizedName, - String aLocalName, - String aNEIName, - String aNEIGUIPath, - int aUsualInputCount, - int aUsualOutputCount, - int aMinimalInputItems, - int aMinimalInputFluids, - int aAmperage, - String aNEISpecialValuePre, - int aNEISpecialValueMultiplier, - String aNEISpecialValuePost, - boolean aShowVoltageAmperageInNEI, + + public PreciseAssemblerMapper(Collection<GT_Recipe> aRecipeList, String aUnlocalizedName, String aLocalName, + String aNEIName, String aNEIGUIPath, int aUsualInputCount, int aUsualOutputCount, + int aMinimalInputItems, int aMinimalInputFluids, int aAmperage, String aNEISpecialValuePre, + int aNEISpecialValueMultiplier, String aNEISpecialValuePost, boolean aShowVoltageAmperageInNEI, boolean aNEIAllowed) { super( aRecipeList, @@ -504,19 +438,16 @@ public class MyRecipeAdder { } @Override - public GT_Recipe addRecipe( - boolean aOptimize, - ItemStack[] aInputs, - ItemStack[] aOutputs, - Object aSpecial, - int[] aOutputChances, - FluidStack[] aFluidInputs, - FluidStack[] aFluidOutputs, - int aDuration, - int aEUt, + public GT_Recipe addRecipe(boolean aOptimize, ItemStack[] aInputs, ItemStack[] aOutputs, Object aSpecial, + int[] aOutputChances, FluidStack[] aFluidInputs, FluidStack[] aFluidOutputs, int aDuration, int aEUt, int aSpecialValue) { - PreciseAssemblerRecipe tRecipe = - new PreciseAssemblerRecipe(aInputs, aFluidInputs, aOutputs[0], aEUt, aDuration, aSpecialValue); + PreciseAssemblerRecipe tRecipe = new PreciseAssemblerRecipe( + aInputs, + aFluidInputs, + aOutputs[0], + aEUt, + aDuration, + aSpecialValue); return addRecipe(tRecipe); } @@ -537,36 +468,35 @@ public class MyRecipeAdder { } public static class PreciseAssemblerRecipe extends GT_Recipe { - public PreciseAssemblerRecipe( - ItemStack[] input1, FluidStack[] input2, ItemStack output, int EUt, int ticks, int tier) { - super(false, input1, new ItemStack[] {output}, null, null, input2, null, ticks, EUt, tier); + + public PreciseAssemblerRecipe(ItemStack[] input1, FluidStack[] input2, ItemStack output, int EUt, int ticks, + int tier) { + super(false, input1, new ItemStack[] { output }, null, null, input2, null, ticks, EUt, tier); } } - public void addPreciseAssemblerRecipe( - ItemStack[] aItemInputs, FluidStack[] aFluidInputs, ItemStack aOutput, int aEUt, int aDuration, int aTier) { + public void addPreciseAssemblerRecipe(ItemStack[] aItemInputs, FluidStack[] aFluidInputs, ItemStack aOutput, + int aEUt, int aDuration, int aTier) { if (aOutput == null) return; PA.addRecipe( - false, aItemInputs, new ItemStack[] {aOutput}, null, null, aFluidInputs, null, aDuration, aEUt, aTier); + false, + aItemInputs, + new ItemStack[] { aOutput }, + null, + null, + aFluidInputs, + null, + aDuration, + aEUt, + aTier); } public static class ComponentAssemblyLineMapper extends GT_Recipe.GT_Recipe_Map { - public ComponentAssemblyLineMapper( - Collection<GT_Recipe> aRecipeList, - String aUnlocalizedName, - String aLocalName, - String aNEIName, - String aNEIGUIPath, - int aUsualInputCount, - int aUsualOutputCount, - int aMinimalInputItems, - int aMinimalInputFluids, - int aAmperage, - String aNEISpecialValuePre, - int aNEISpecialValueMultiplier, - String aNEISpecialValuePost, - boolean aShowVoltageAmperageInNEI, + public ComponentAssemblyLineMapper(Collection<GT_Recipe> aRecipeList, String aUnlocalizedName, + String aLocalName, String aNEIName, String aNEIGUIPath, int aUsualInputCount, int aUsualOutputCount, + int aMinimalInputItems, int aMinimalInputFluids, int aAmperage, String aNEISpecialValuePre, + int aNEISpecialValueMultiplier, String aNEISpecialValuePost, boolean aShowVoltageAmperageInNEI, boolean aNEIAllowed) { super( @@ -587,8 +517,9 @@ public class MyRecipeAdder { aNEIAllowed); setUsualFluidInputCount(8); setNEITransferRect(new Rectangle(70, 15, 18, 54)); - setNEISpecialInfoFormatter((recipeInfo, applyPrefixAndSuffix) -> Collections.singletonList( - recipeInfo.recipeMap.mNEISpecialValuePre + GT_Values.VN[recipeInfo.recipe.mSpecialValue])); + setNEISpecialInfoFormatter( + (recipeInfo, applyPrefixAndSuffix) -> Collections.singletonList( + recipeInfo.recipeMap.mNEISpecialValuePre + GT_Values.VN[recipeInfo.recipe.mSpecialValue])); } @Override @@ -610,12 +541,11 @@ public class MyRecipeAdder { public void addGregTechLogoUI(ModularWindow.Builder builder, Pos2d windowOffset) {} @Override - public void addProgressBarUI( - ModularWindow.Builder builder, Supplier<Float> progressSupplier, Pos2d windowOffset) { - builder.widget(new DrawableWidget() - .setDrawable(GG_UITextures.PICTURE_COMPONENT_ASSLINE) - .setPos(new Pos2d(70, 22).add(windowOffset)) - .setSize(72, 40)); + public void addProgressBarUI(ModularWindow.Builder builder, Supplier<Float> progressSupplier, + Pos2d windowOffset) { + builder.widget( + new DrawableWidget().setDrawable(GG_UITextures.PICTURE_COMPONENT_ASSLINE) + .setPos(new Pos2d(70, 22).add(windowOffset)).setSize(72, 40)); } } @@ -636,17 +566,12 @@ public class MyRecipeAdder { false, true); - public GT_Recipe addComponentAssemblyLineRecipe( - ItemStack[] ItemInputArray, - FluidStack[] FluidInputArray, - ItemStack OutputItem, - int aDuration, - int aEUt, - int casingLevel) { + public GT_Recipe addComponentAssemblyLineRecipe(ItemStack[] ItemInputArray, FluidStack[] FluidInputArray, + ItemStack OutputItem, int aDuration, int aEUt, int casingLevel) { return COMPASSLINE_RECIPES.addRecipe( false, ItemInputArray, - new ItemStack[] {OutputItem}, + new ItemStack[] { OutputItem }, null, FluidInputArray, null, diff --git a/src/main/java/goodgenerator/util/StackUtils.java b/src/main/java/goodgenerator/util/StackUtils.java index bf06f821ac..c4d8c4f9a1 100644 --- a/src/main/java/goodgenerator/util/StackUtils.java +++ b/src/main/java/goodgenerator/util/StackUtils.java @@ -1,20 +1,23 @@ package goodgenerator.util; -import goodgenerator.items.MyMaterial; -import gregtech.api.enums.Materials; -import gregtech.api.util.GT_Utility; import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; import java.util.List; + import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; +import goodgenerator.items.MyMaterial; +import gregtech.api.enums.Materials; +import gregtech.api.util.GT_Utility; + public class StackUtils { /** * Multiplies one ItemStack by a multiplier, and splits it into as many full stacks as it needs to. - * @param stack The ItemStack you want to multiply + * + * @param stack The ItemStack you want to multiply * @param multiplier The number the stack is multiplied by * @return A List of stacks that, in total, are the same as the input ItemStack after it has been multiplied. */ @@ -34,7 +37,7 @@ public class StackUtils { /** * Merges the ItemStacks in the array into full stacks. - * */ + */ public static ArrayList<ItemStack> mergeStacks(List<ItemStack> stacks) { ArrayList<ItemStack> output = new ArrayList<>(); for (int index = 0; index < stacks.size(); index++) { @@ -66,12 +69,8 @@ public class StackUtils { public static HashMap<ItemStack, Integer> getTotalItems(List<ItemStack> items) { HashMap<ItemStack, Integer> totals = new HashMap<>(); - itemLoop: - for (ItemStack item : items) { - int t = items.stream() - .filter(i2 -> GT_Utility.areStacksEqual(item, i2)) - .mapToInt(i -> i.stackSize) - .sum(); + itemLoop: for (ItemStack item : items) { + int t = items.stream().filter(i2 -> GT_Utility.areStacksEqual(item, i2)).mapToInt(i -> i.stackSize).sum(); for (ItemStack i2 : totals.keySet()) if (GT_Utility.areStacksEqual(item, i2)) continue itemLoop; totals.put(GT_Utility.copyAmount(1, item), t); } diff --git a/src/main/java/goodgenerator/util/StructureHelper.java b/src/main/java/goodgenerator/util/StructureHelper.java index 1267c357e1..6e8dab696f 100644 --- a/src/main/java/goodgenerator/util/StructureHelper.java +++ b/src/main/java/goodgenerator/util/StructureHelper.java @@ -1,16 +1,10 @@ package goodgenerator.util; -import com.gtnewhorizon.structurelib.StructureLibAPI; -import com.gtnewhorizon.structurelib.structure.IStructureElement; -import gregtech.api.enums.Materials; -import gregtech.api.enums.OrePrefixes; -import gregtech.api.metatileentity.BaseMetaPipeEntity; -import gregtech.api.metatileentity.implementations.GT_MetaPipeEntity_Frame; -import gregtech.api.util.GT_OreDictUnificator; import java.util.Arrays; import java.util.function.BiConsumer; import java.util.function.BiPredicate; import java.util.function.Function; + import net.minecraft.block.Block; import net.minecraft.init.Items; import net.minecraft.item.ItemBlock; @@ -19,6 +13,15 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.world.World; +import com.gtnewhorizon.structurelib.StructureLibAPI; +import com.gtnewhorizon.structurelib.structure.IStructureElement; + +import gregtech.api.enums.Materials; +import gregtech.api.enums.OrePrefixes; +import gregtech.api.metatileentity.BaseMetaPipeEntity; +import gregtech.api.metatileentity.implementations.GT_MetaPipeEntity_Frame; +import gregtech.api.util.GT_OreDictUnificator; + public class StructureHelper { public static <T> IStructureElement<T> addFrame(Materials aMaterials) { @@ -54,8 +57,8 @@ public class StructureHelper { ItemStack tFrame = GT_OreDictUnificator.get(OrePrefixes.frameGt, aMaterials, 1); if (tFrame.getItem() instanceof ItemBlock) { ItemBlock tFrameStackItem = (ItemBlock) tFrame.getItem(); - return tFrameStackItem.placeBlockAt( - tFrame, null, world, x, y, z, 6, 0, 0, 0, Items.feather.getDamage(tFrame)); + return tFrameStackItem + .placeBlockAt(tFrame, null, world, x, y, z, 6, 0, 0, 0, Items.feather.getDamage(tFrame)); } return false; } @@ -63,28 +66,19 @@ public class StructureHelper { } // Only support to use meta to tier - public static <T> IStructureElement<T> addTieredBlock( - Block aBlock, - BiConsumer<T, Integer> aSetTheFuckingMeta, - Function<T, Integer> aGetTheFuckingMeta, - int maxMeta) { - return addTieredBlock( - aBlock, - (t, i) -> { - aSetTheFuckingMeta.accept(t, i); - return true; - }, - aGetTheFuckingMeta, - maxMeta); + public static <T> IStructureElement<T> addTieredBlock(Block aBlock, BiConsumer<T, Integer> aSetTheFuckingMeta, + Function<T, Integer> aGetTheFuckingMeta, int maxMeta) { + return addTieredBlock(aBlock, (t, i) -> { + aSetTheFuckingMeta.accept(t, i); + return true; + }, aGetTheFuckingMeta, maxMeta); } - public static <T> IStructureElement<T> addTieredBlock( - Block aBlock, - BiPredicate<T, Integer> aSetTheFuckingMeta, - Function<T, Integer> aGetTheFuckingMeta, - int maxMeta) { + public static <T> IStructureElement<T> addTieredBlock(Block aBlock, BiPredicate<T, Integer> aSetTheFuckingMeta, + Function<T, Integer> aGetTheFuckingMeta, int maxMeta) { return new IStructureElement<T>() { + @Override public boolean check(T t, World world, int x, int y, int z) { Block tBlock = world.getBlock(x, y, z); |