diff options
Diffstat (limited to 'src')
88 files changed, 8094 insertions, 6597 deletions
diff --git a/src/main/java/goodgenerator/blocks/myFluids/BaseFluid.java b/src/main/java/goodgenerator/blocks/myFluids/BaseFluid.java index 9ccbd27e70..078012e64c 100644 --- a/src/main/java/goodgenerator/blocks/myFluids/BaseFluid.java +++ b/src/main/java/goodgenerator/blocks/myFluids/BaseFluid.java @@ -1,5 +1,7 @@ package goodgenerator.blocks.myFluids; +import static goodgenerator.main.GoodGenerator.MOD_ID; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.material.Material; @@ -9,46 +11,42 @@ import net.minecraftforge.fluids.BlockFluidClassic; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; -import static goodgenerator.main.GoodGenerator.MOD_ID; - -public class BaseFluid extends BlockFluidClassic{ - @SideOnly( Side.CLIENT ) +public class BaseFluid extends BlockFluidClassic { + @SideOnly(Side.CLIENT) protected IIcon stillIcon; - @SideOnly( Side.CLIENT ) + + @SideOnly(Side.CLIENT) protected IIcon flowingIcon; + private String stillTexture; private String flowingTexture; - public BaseFluid(Fluid fluid, Material material) - { - super( fluid, material ); + public BaseFluid(Fluid fluid, Material material) { + super(fluid, material); } - public void SetTexture(String fluidName) - { + public void SetTexture(String fluidName) { stillTexture = MOD_ID + ":fluids/" + fluidName + ".still"; flowingTexture = MOD_ID + ":fluids/" + fluidName + ".flowing"; } - public static Fluid BuildFluid(String fluidName){ + public static Fluid BuildFluid(String fluidName) { Fluid tFluid = new Fluid(fluidName); FluidRegistry.registerFluid(tFluid); return tFluid; } - @SideOnly( Side.CLIENT ) + @SideOnly(Side.CLIENT) @Override - public void registerBlockIcons( IIconRegister register ) - { + public void registerBlockIcons(IIconRegister register) { stillIcon = register.registerIcon(stillTexture); flowingIcon = register.registerIcon(flowingTexture); - super.getFluid().setIcons( stillIcon, flowingIcon ); + super.getFluid().setIcons(stillIcon, flowingIcon); } @Override - public IIcon getIcon( int side, int meta ) - { - return ( side == 0 || side == 1 ) ? stillIcon : flowingIcon; + public IIcon getIcon(int side, int meta) { + return (side == 0 || side == 1) ? stillIcon : flowingIcon; } } diff --git a/src/main/java/goodgenerator/blocks/myFluids/FluidsBuilder.java b/src/main/java/goodgenerator/blocks/myFluids/FluidsBuilder.java index eb7879200f..87466ea26a 100644 --- a/src/main/java/goodgenerator/blocks/myFluids/FluidsBuilder.java +++ b/src/main/java/goodgenerator/blocks/myFluids/FluidsBuilder.java @@ -1,13 +1,12 @@ package goodgenerator.blocks.myFluids; -import goodgenerator.crossmod.nei.NEI_Config; import cpw.mods.fml.common.registry.GameRegistry; +import goodgenerator.crossmod.nei.NEI_Config; import net.minecraft.block.material.Material; import net.minecraftforge.fluids.Fluid; public class FluidsBuilder { - public FluidsBuilder(){ - } + public FluidsBuilder() {} public static void Register() { crackedNaquadahGas_Lightly(); @@ -27,176 +26,153 @@ public class FluidsBuilder { supercriticalSteam(); } - public static void crackedNaquadahGas_Lightly(){ + public static void crackedNaquadahGas_Lightly() { Fluid tmp = BaseFluid.BuildFluid("lightlyCrackedNaquadahGas"); - tmp.setGaseous(true) - .setTemperature(800); + tmp.setGaseous(true).setTemperature(800); BaseFluid tmp2 = new BaseFluid(tmp, Material.water); tmp2.SetTexture("lightlyCrackedNaquadahGas"); tmp2.setBlockName("lightlyCrackedNaquadahGas"); - GameRegistry.registerBlock(tmp2,"lightlyCrackedNaquadahGas"); + GameRegistry.registerBlock(tmp2, "lightlyCrackedNaquadahGas"); NEI_Config.hide(tmp2); } - public static void crackedNaquadahGas_Moderately(){ + public static void crackedNaquadahGas_Moderately() { Fluid tmp = BaseFluid.BuildFluid("moderatelyCrackedNaquadahGas"); - tmp.setGaseous(true) - .setTemperature(800); + tmp.setGaseous(true).setTemperature(800); BaseFluid tmp2 = new BaseFluid(tmp, Material.water); tmp2.SetTexture("moderatelyCrackedNaquadahGas"); tmp2.setBlockName("moderatelyCrackedNaquadahGas"); - GameRegistry.registerBlock(tmp2,"moderatelyCrackedNaquadahGas"); + GameRegistry.registerBlock(tmp2, "moderatelyCrackedNaquadahGas"); NEI_Config.hide(tmp2); } - public static void crackedNaquadahGas_Heavily(){ + public static void crackedNaquadahGas_Heavily() { Fluid tmp = BaseFluid.BuildFluid("heavilyCrackedNaquadahGas"); - tmp.setGaseous(true) - .setTemperature(800); + tmp.setGaseous(true).setTemperature(800); BaseFluid tmp2 = new BaseFluid(tmp, Material.water); tmp2.SetTexture("heavilyCrackedNaquadahGas"); tmp2.setBlockName("heavilyCrackedNaquadahGas"); - GameRegistry.registerBlock(tmp2,"heavilyCrackedNaquadahGas"); + GameRegistry.registerBlock(tmp2, "heavilyCrackedNaquadahGas"); NEI_Config.hide(tmp2); } - public static void crackedLightNaquadahFuel_Lightly(){ + public static void crackedLightNaquadahFuel_Lightly() { Fluid tmp = BaseFluid.BuildFluid("lightlyCrackedLightNaquadahFuel"); - tmp.setGaseous(false) - .setTemperature(1200); + tmp.setGaseous(false).setTemperature(1200); BaseFluid tmp2 = new BaseFluid(tmp, Material.water); tmp2.SetTexture("lightlyCrackedLightNaquadahFuel"); tmp2.setBlockName("lightlyCrackedLightNaquadahFuel"); - GameRegistry.registerBlock(tmp2,"lightlyCrackedLightNaquadahFuel"); + GameRegistry.registerBlock(tmp2, "lightlyCrackedLightNaquadahFuel"); NEI_Config.hide(tmp2); } - public static void crackedLightNaquadahFuel_Moderately(){ + public static void crackedLightNaquadahFuel_Moderately() { Fluid tmp = BaseFluid.BuildFluid("moderatelyCrackedLightNaquadahFuel"); - tmp.setGaseous(false) - .setTemperature(1200); + tmp.setGaseous(false).setTemperature(1200); BaseFluid tmp2 = new BaseFluid(tmp, Material.water); tmp2.SetTexture("moderatelyCrackedLightNaquadahFuel"); tmp2.setBlockName("moderatelyCrackedLightNaquadahFuel"); - GameRegistry.registerBlock(tmp2,"moderatelyCrackedLightNaquadahFuel"); + GameRegistry.registerBlock(tmp2, "moderatelyCrackedLightNaquadahFuel"); NEI_Config.hide(tmp2); } - public static void crackedLightNaquadahFuel_Heavily(){ + public static void crackedLightNaquadahFuel_Heavily() { Fluid tmp = BaseFluid.BuildFluid("heavilyCrackedLightNaquadahFuel"); - tmp.setGaseous(false) - .setTemperature(1200); + tmp.setGaseous(false).setTemperature(1200); BaseFluid tmp2 = new BaseFluid(tmp, Material.water); tmp2.SetTexture("heavilyCrackedLightNaquadahFuel"); tmp2.setBlockName("heavilyCrackedLightNaquadahFuel"); - GameRegistry.registerBlock(tmp2,"heavilyCrackedLightNaquadahFuel"); + GameRegistry.registerBlock(tmp2, "heavilyCrackedLightNaquadahFuel"); NEI_Config.hide(tmp2); } - public static void crackedHeavyNaquadahFuel_Lightly(){ + public static void crackedHeavyNaquadahFuel_Lightly() { Fluid tmp = BaseFluid.BuildFluid("lightlyCrackedHeavyNaquadahFuel"); - tmp.setGaseous(false) - .setTemperature(1200); + tmp.setGaseous(false).setTemperature(1200); BaseFluid tmp2 = new BaseFluid(tmp, Material.water); tmp2.SetTexture("lightlyCrackedHeavyNaquadahFuel"); tmp2.setBlockName("lightlyCrackedHeavyNaquadahFuel"); - GameRegistry.registerBlock(tmp2,"lightlyCrackedHeavyNaquadahFuel"); + GameRegistry.registerBlock(tmp2, "lightlyCrackedHeavyNaquadahFuel"); NEI_Config.hide(tmp2); } - public static void crackedHeavyNaquadahFuel_Moderately(){ + public static void crackedHeavyNaquadahFuel_Moderately() { Fluid tmp = BaseFluid.BuildFluid("moderatelyCrackedHeavyNaquadahFuel"); - tmp.setGaseous(false) - .setTemperature(1200); + tmp.setGaseous(false).setTemperature(1200); BaseFluid tmp2 = new BaseFluid(tmp, Material.water); tmp2.SetTexture("moderatelyCrackedHeavyNaquadahFuel"); tmp2.setBlockName("moderatelyCrackedHeavyNaquadahFuel"); - GameRegistry.registerBlock(tmp2,"moderatelyCrackedHeavyNaquadahFuel"); + GameRegistry.registerBlock(tmp2, "moderatelyCrackedHeavyNaquadahFuel"); NEI_Config.hide(tmp2); } - public static void crackedHeavyNaquadahFuel_Heavily(){ + public static void crackedHeavyNaquadahFuel_Heavily() { Fluid tmp = BaseFluid.BuildFluid("heavilyCrackedHeavyNaquadahFuel"); - tmp.setGaseous(false) - .setTemperature(1200); + tmp.setGaseous(false).setTemperature(1200); BaseFluid tmp2 = new BaseFluid(tmp, Material.water); tmp2.SetTexture("heavilyCrackedHeavyNaquadahFuel"); tmp2.setBlockName("heavilyCrackedHeavyNaquadahFuel"); - GameRegistry.registerBlock(tmp2,"heavilyCrackedHeavyNaquadahFuel"); + GameRegistry.registerBlock(tmp2, "heavilyCrackedHeavyNaquadahFuel"); NEI_Config.hide(tmp2); } - public static void crackedNaquadahAsphalt_Lightly(){ + public static void crackedNaquadahAsphalt_Lightly() { Fluid tmp = BaseFluid.BuildFluid("lightlyCrackedNaquadahAsphalt"); - tmp.setGaseous(false) - .setTemperature(1800) - .setDensity(20000) - .setViscosity(20000); + tmp.setGaseous(false).setTemperature(1800).setDensity(20000).setViscosity(20000); BaseFluid tmp2 = new BaseFluid(tmp, Material.water); tmp2.SetTexture("lightlyCrackedNaquadahAsphalt"); tmp2.setBlockName("lightlyCrackedNaquadahAsphalt"); - GameRegistry.registerBlock(tmp2,"lightlyCrackedNaquadahAsphalt"); + GameRegistry.registerBlock(tmp2, "lightlyCrackedNaquadahAsphalt"); NEI_Config.hide(tmp2); } - public static void crackedNaquadahAsphalt_Moderately(){ + public static void crackedNaquadahAsphalt_Moderately() { Fluid tmp = BaseFluid.BuildFluid("moderatelyCrackedNaquadahAsphalt"); - tmp.setGaseous(false) - .setTemperature(1800) - .setDensity(20000) - .setViscosity(20000); + tmp.setGaseous(false).setTemperature(1800).setDensity(20000).setViscosity(20000); BaseFluid tmp2 = new BaseFluid(tmp, Material.water); tmp2.SetTexture("moderatelyCrackedNaquadahAsphalt"); tmp2.setBlockName("moderatelyCrackedNaquadahAsphalt"); - GameRegistry.registerBlock(tmp2,"moderatelyCrackedNaquadahAsphalt"); + GameRegistry.registerBlock(tmp2, "moderatelyCrackedNaquadahAsphalt"); NEI_Config.hide(tmp2); } - public static void crackedNaquadahAsphalt_Heavily(){ + public static void crackedNaquadahAsphalt_Heavily() { Fluid tmp = BaseFluid.BuildFluid("heavilyCrackedNaquadahAsphalt"); - tmp.setGaseous(false) - .setTemperature(1800) - .setDensity(20000) - .setViscosity(20000); + tmp.setGaseous(false).setTemperature(1800).setDensity(20000).setViscosity(20000); BaseFluid tmp2 = new BaseFluid(tmp, Material.water); tmp2.SetTexture("heavilyCrackedNaquadahAsphalt"); tmp2.setBlockName("heavilyCrackedNaquadahAsphalt"); - GameRegistry.registerBlock(tmp2,"heavilyCrackedNaquadahAsphalt"); + GameRegistry.registerBlock(tmp2, "heavilyCrackedNaquadahAsphalt"); NEI_Config.hide(tmp2); } - public static void combustionPromotor(){ + public static void combustionPromotor() { Fluid tmp = BaseFluid.BuildFluid("combustionPromotor"); - tmp.setGaseous(false) - .setTemperature(300); + tmp.setGaseous(false).setTemperature(300); BaseFluid tmp2 = new BaseFluid(tmp, Material.water); tmp2.SetTexture("combustionPromotor"); tmp2.setBlockName("combustionPromotor"); - GameRegistry.registerBlock(tmp2,"combustionPromotor"); + GameRegistry.registerBlock(tmp2, "combustionPromotor"); NEI_Config.hide(tmp2); } - public static void coalTar(){ + public static void coalTar() { Fluid tmp = BaseFluid.BuildFluid("fluid.coalTar"); - tmp.setGaseous(false) - .setTemperature(450) - .setUnlocalizedName("fluid.coalTar"); + tmp.setGaseous(false).setTemperature(450).setUnlocalizedName("fluid.coalTar"); BaseFluid tmp2 = new BaseFluid(tmp, Material.water); tmp2.SetTexture("coalTar"); tmp2.setBlockTextureName("coalTar"); - GameRegistry.registerBlock(tmp2,"coalTar"); + GameRegistry.registerBlock(tmp2, "coalTar"); NEI_Config.hide(tmp2); } - public static void supercriticalSteam(){ + public static void supercriticalSteam() { Fluid tmp = BaseFluid.BuildFluid("supercriticalSteam"); - tmp.setGaseous(true) - .setTemperature(648) - .setUnlocalizedName("supercriticalSteam"); + tmp.setGaseous(true).setTemperature(648).setUnlocalizedName("supercriticalSteam"); BaseFluid tmp2 = new BaseFluid(tmp, Material.water); tmp2.SetTexture("supercriticalSteam"); tmp2.setBlockTextureName("supercriticalSteam"); - GameRegistry.registerBlock(tmp2,"supercriticalSteam"); + GameRegistry.registerBlock(tmp2, "supercriticalSteam"); NEI_Config.hide(tmp2); } } diff --git a/src/main/java/goodgenerator/blocks/regularBlock/Casing.java b/src/main/java/goodgenerator/blocks/regularBlock/Casing.java index 7a1db3278d..8808abd169 100644 --- a/src/main/java/goodgenerator/blocks/regularBlock/Casing.java +++ b/src/main/java/goodgenerator/blocks/regularBlock/Casing.java @@ -1,9 +1,10 @@ package goodgenerator.blocks.regularBlock; -import goodgenerator.main.GoodGenerator; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import goodgenerator.main.GoodGenerator; import gregtech.api.GregTech_API; +import java.util.List; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -16,12 +17,11 @@ import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import java.util.List; - public class Casing extends Block { @SideOnly(Side.CLIENT) protected IIcon[] texture; + String[] textureNames; protected String name; @@ -30,29 +30,29 @@ public class Casing extends Block { this.setHardness(9.0F); this.setResistance(5.0F); this.name = name; - this.setHarvestLevel("wrench",2); + this.setHarvestLevel("wrench", 2); this.setCreativeTab(GoodGenerator.GG); GregTech_API.registerMachineBlock(this, -1); } - public Casing(String name, String[] texture){ + public Casing(String name, String[] texture) { super(Material.iron); this.setHardness(9.0F); this.setResistance(5.0F); this.name = name; this.textureNames = texture; - this.setHarvestLevel("wrench",2); + this.setHarvestLevel("wrench", 2); this.setCreativeTab(GoodGenerator.GG); GregTech_API.registerMachineBlock(this, -1); } - public Casing(String name, String[] texture, Material material){ + public Casing(String name, String[] texture, Material material) { super(material); this.setHardness(9.0F); this.setResistance(5.0F); this.name = name; this.textureNames = texture; - this.setHarvestLevel("wrench",2); + this.setHarvestLevel("wrench", 2); this.setCreativeTab(GoodGenerator.GG); GregTech_API.registerMachineBlock(this, -1); } @@ -119,5 +119,4 @@ public class Casing extends Block { public boolean canCreatureSpawn(EnumCreatureType type, IBlockAccess world, int x, int y, int z) { return false; } - } diff --git a/src/main/java/goodgenerator/blocks/regularBlock/ComplexTextureCasing.java b/src/main/java/goodgenerator/blocks/regularBlock/ComplexTextureCasing.java index 18a1629cbf..149a1b2bfb 100644 --- a/src/main/java/goodgenerator/blocks/regularBlock/ComplexTextureCasing.java +++ b/src/main/java/goodgenerator/blocks/regularBlock/ComplexTextureCasing.java @@ -2,22 +2,21 @@ package goodgenerator.blocks.regularBlock; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import java.util.List; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; -import java.util.List; - -public class ComplexTextureCasing extends Casing{ +public class ComplexTextureCasing extends Casing { @SideOnly(Side.CLIENT) protected IIcon[] texture1, texture2; String[] textureSide; String[] textureTopAndDown; - public ComplexTextureCasing(String name, String[] textureSide, String[] textureTopAndDown){ + public ComplexTextureCasing(String name, String[] textureSide, String[] textureTopAndDown) { super(name); this.textureSide = textureSide; this.textureTopAndDown = textureTopAndDown; @@ -28,8 +27,7 @@ public class ComplexTextureCasing extends Casing{ public IIcon getIcon(int side, int meta) { if (side < 2) { return meta < this.texture2.length ? this.texture2[meta] : this.texture2[0]; - } - else { + } else { return meta < this.texture1.length ? this.texture1[meta] : this.texture1[0]; } } diff --git a/src/main/java/goodgenerator/blocks/regularBlock/Frame.java b/src/main/java/goodgenerator/blocks/regularBlock/Frame.java index 90c38c4cce..f5a62bed4f 100644 --- a/src/main/java/goodgenerator/blocks/regularBlock/Frame.java +++ b/src/main/java/goodgenerator/blocks/regularBlock/Frame.java @@ -5,9 +5,9 @@ import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.material.Material; import net.minecraft.world.IBlockAccess; -public class Frame extends Casing{ - public Frame(String name,String[] texture){ - super(name,texture, Material.iron); +public class Frame extends Casing { + public Frame(String name, String[] texture) { + super(name, texture, Material.iron); } @Override @@ -18,8 +18,7 @@ public class Frame extends Casing{ @Override @SideOnly(Side.CLIENT) public boolean shouldSideBeRendered(IBlockAccess worldClient, int xCoord, int yCoord, int zCoord, int aSide) { - if (worldClient.getBlock(xCoord, yCoord, zCoord) instanceof Frame) - return false; + if (worldClient.getBlock(xCoord, yCoord, zCoord) instanceof Frame) return false; return super.shouldSideBeRendered(worldClient, xCoord, yCoord, zCoord, aSide); } diff --git a/src/main/java/goodgenerator/blocks/regularBlock/ITextureBlock.java b/src/main/java/goodgenerator/blocks/regularBlock/ITextureBlock.java index eba7c2c890..914552ad8d 100644 --- a/src/main/java/goodgenerator/blocks/regularBlock/ITextureBlock.java +++ b/src/main/java/goodgenerator/blocks/regularBlock/ITextureBlock.java @@ -13,5 +13,4 @@ public interface ITextureBlock { ITexture[] getTexture(Block aBlock, byte aSide, IBlockAccess aWorld, int xCoord, int yCoord, int zCoord); ITexture[] getTexture(Block aBlock, int aMeta, byte aSide); - } diff --git a/src/main/java/goodgenerator/blocks/regularBlock/TEBlock.java b/src/main/java/goodgenerator/blocks/regularBlock/TEBlock.java index 3be9619968..df98dc67dd 100644 --- a/src/main/java/goodgenerator/blocks/regularBlock/TEBlock.java +++ b/src/main/java/goodgenerator/blocks/regularBlock/TEBlock.java @@ -1,13 +1,14 @@ package goodgenerator.blocks.regularBlock; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import goodgenerator.blocks.tileEntity.EssentiaHatch; import goodgenerator.blocks.tileEntity.EssentiaOutputHatch; import goodgenerator.blocks.tileEntity.EssentiaOutputHatch_ME; import goodgenerator.main.GoodGenerator; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import gregtech.api.GregTech_API; import gregtech.api.util.GT_Utility; +import java.util.List; import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; @@ -26,46 +27,45 @@ import net.minecraft.world.World; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.IEssentiaContainerItem; -import java.util.List; - public class TEBlock extends BlockContainer { @SideOnly(Side.CLIENT) protected IIcon[] texture; + String[] textureNames; protected String name; protected int index; - public TEBlock(String name, String[] texture, CreativeTabs Tab){ + public TEBlock(String name, String[] texture, CreativeTabs Tab) { super(Material.iron); this.setHardness(9.0F); this.setResistance(5.0F); this.name = name; this.textureNames = texture; - this.setHarvestLevel("wrench",2); + this.setHarvestLevel("wrench", 2); this.setCreativeTab(GoodGenerator.GG); GregTech_API.registerMachineBlock(this, -1); } - public TEBlock(String name, String[] texture, int index){ + public TEBlock(String name, String[] texture, int index) { super(Material.iron); this.setHardness(9.0F); this.setResistance(5.0F); this.name = name; this.textureNames = texture; - this.setHarvestLevel("wrench",2); + this.setHarvestLevel("wrench", 2); this.index = index; this.setCreativeTab(GoodGenerator.GG); GregTech_API.registerMachineBlock(this, -1); } - public TEBlock(String name, String[] texture, Material material){ + public TEBlock(String name, String[] texture, Material material) { super(material); this.setHardness(9.0F); this.setResistance(5.0F); this.name = name; this.textureNames = texture; - this.setHarvestLevel("wrench",2); + this.setHarvestLevel("wrench", 2); this.setCreativeTab(GoodGenerator.GG); GregTech_API.registerMachineBlock(this, -1); } @@ -153,7 +153,8 @@ public class TEBlock extends BlockContainer { } @Override - public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int par6, float par7, float par8, float par9) { + public boolean onBlockActivated( + World world, int x, int y, int z, EntityPlayer player, int par6, float par7, float par8, float par9) { if (world.isRemote) { return false; } else { @@ -163,10 +164,21 @@ public class TEBlock extends BlockContainer { ItemStack tItemStack = player.getHeldItem(); if (tItemStack != null) { Item tItem = tItemStack.getItem(); - if (tItem instanceof IEssentiaContainerItem && ((IEssentiaContainerItem) tItem).getAspects(player.getHeldItem()) != null && ((IEssentiaContainerItem) tItem).getAspects(player.getHeldItem()).size() > 0) { - Aspect tLocked = ((IEssentiaContainerItem) tItem).getAspects(player.getHeldItem()).getAspects()[0]; + if (tItem instanceof IEssentiaContainerItem + && ((IEssentiaContainerItem) tItem).getAspects(player.getHeldItem()) != null + && ((IEssentiaContainerItem) tItem) + .getAspects(player.getHeldItem()) + .size() + > 0) { + Aspect tLocked = ((IEssentiaContainerItem) tItem) + .getAspects(player.getHeldItem()) + .getAspects()[0]; ((EssentiaHatch) tile).setLockedAspect(tLocked); - GT_Utility.sendChatToPlayer(player, String.format(StatCollector.translateToLocal("essentiahatch.chat.0"), tLocked.getLocalizedDescription())); + GT_Utility.sendChatToPlayer( + player, + String.format( + StatCollector.translateToLocal("essentiahatch.chat.0"), + tLocked.getLocalizedDescription())); } } else { ((EssentiaHatch) tile).setLockedAspect(null); @@ -180,7 +192,8 @@ public class TEBlock extends BlockContainer { ItemStack tItemStack = player.getHeldItem(); if (tItemStack == null) { ((EssentiaOutputHatch) tile).clear(); - GT_Utility.sendChatToPlayer(player, StatCollector.translateToLocal("essentiaoutputhatch.chat.0")); + GT_Utility.sendChatToPlayer( + player, StatCollector.translateToLocal("essentiaoutputhatch.chat.0")); } return true; } else return false; diff --git a/src/main/java/goodgenerator/blocks/regularBlock/TurbineCasing.java b/src/main/java/goodgenerator/blocks/regularBlock/TurbineCasing.java index 6fd25af048..b07d173491 100644 --- a/src/main/java/goodgenerator/blocks/regularBlock/TurbineCasing.java +++ b/src/main/java/goodgenerator/blocks/regularBlock/TurbineCasing.java @@ -1,7 +1,7 @@ package goodgenerator.blocks.regularBlock; -import goodgenerator.client.render.BlockRenderHandler; import goodgenerator.blocks.tileEntity.base.GT_MetaTileEntity_LargeTurbineBase; +import goodgenerator.client.render.BlockRenderHandler; import goodgenerator.main.GoodGenerator; import gregtech.api.enums.Textures; import gregtech.api.interfaces.IIconContainer; @@ -12,19 +12,19 @@ import net.minecraft.block.Block; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.IBlockAccess; -public class TurbineCasing extends Casing implements ITextureBlock{ +public class TurbineCasing extends Casing implements ITextureBlock { public static IIconContainer[][] turbineShape = new IIconContainer[3][9]; public IIconContainer base; static { - for (int i = 0; i < 3; i ++) - for (int j = 1; j <= 9; j ++) + for (int i = 0; i < 3; i++) + for (int j = 1; j <= 9; j++) turbineShape[i][j - 1] = new Textures.BlockIcons.CustomIcon("icons/turbines/TURBINE_" + i + "" + j); } public TurbineCasing(String name, String texture) { - super(name, new String[]{GoodGenerator.MOD_ID + ":" + texture}); + super(name, new String[] {GoodGenerator.MOD_ID + ":" + texture}); base = new Textures.BlockIcons.CustomIcon("icons/" + texture); } @@ -32,7 +32,8 @@ public class TurbineCasing extends Casing implements ITextureBlock{ TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ); if (!(tTileEntity instanceof IGregTechTileEntity)) return 0; IGregTechTileEntity tTile = (IGregTechTileEntity) tTileEntity; - if (tTile.getMetaTileEntity() instanceof GT_MetaTileEntity_LargeTurbineBase && tTile.getFrontFacing() == aSide) { + if (tTile.getMetaTileEntity() instanceof GT_MetaTileEntity_LargeTurbineBase + && tTile.getFrontFacing() == aSide) { if (tTile.isActive()) return 1; return ((GT_MetaTileEntity_LargeTurbineBase) tTile.getMetaTileEntity()).hasTurbine() ? 2 : 3; } @@ -41,10 +42,7 @@ public class TurbineCasing extends Casing implements ITextureBlock{ public ITexture[] getTurbineCasing(int iconIndex, boolean active, boolean hasTurbine) { int states = active ? 0 : hasTurbine ? 1 : 2; - return new ITexture[] { - TextureFactory.of(base), - TextureFactory.of(turbineShape[states][iconIndex]) - }; + return new ITexture[] {TextureFactory.of(base), TextureFactory.of(turbineShape[states][iconIndex])}; } @Override @@ -54,10 +52,10 @@ public class TurbineCasing extends Casing implements ITextureBlock{ case 0: for (int i = -1; i < 2; i++) { for (int j = -1; j < 2; j++) { - if (i == 0 && j == 0) - continue; + if (i == 0 && j == 0) continue; int tState; - if ((tState = isTurbineControllerWithSide(aWorld, xCoord + j, yCoord, zCoord + i, aSide)) != 0) { + if ((tState = isTurbineControllerWithSide(aWorld, xCoord + j, yCoord, zCoord + i, aSide)) + != 0) { return getTurbineCasing(4 - i * 3 - j, tState == 1, tState == 2); } } @@ -66,10 +64,10 @@ public class TurbineCasing extends Casing implements ITextureBlock{ case 1: for (int i = -1; i < 2; i++) { for (int j = -1; j < 2; j++) { - if (i == 0 && j == 0) - continue; + if (i == 0 && j == 0) continue; int tState; - if ((tState = isTurbineControllerWithSide(aWorld, xCoord + j, yCoord + i, zCoord, aSide)) != 0) { + if ((tState = isTurbineControllerWithSide(aWorld, xCoord + j, yCoord + i, zCoord, aSide)) + != 0) { return getTurbineCasing(4 + i * 3 - j * tInvertLeftRightMod, tState == 1, tState == 2); } } @@ -78,10 +76,10 @@ public class TurbineCasing extends Casing implements ITextureBlock{ case 2: for (int i = -1; i < 2; i++) { for (int j = -1; j < 2; j++) { - if (i == 0 && j == 0) - continue; + if (i == 0 && j == 0) continue; int tState; - if ((tState = isTurbineControllerWithSide(aWorld, xCoord, yCoord + i, zCoord + j, aSide)) != 0) { + if ((tState = isTurbineControllerWithSide(aWorld, xCoord, yCoord + i, zCoord + j, aSide)) + != 0) { return getTurbineCasing(4 + i * 3 + j * tInvertLeftRightMod, tState == 1, tState == 2); } } @@ -93,9 +91,7 @@ public class TurbineCasing extends Casing implements ITextureBlock{ @Override public ITexture[] getTexture(Block aBlock, int aMeta, byte aSide) { - return new ITexture[] { - TextureFactory.of(base) - }; + return new ITexture[] {TextureFactory.of(base)}; } @Override diff --git a/src/main/java/goodgenerator/blocks/tileEntity/CoolantTower.java b/src/main/java/goodgenerator/blocks/tileEntity/CoolantTower.java index 67dc2b9101..f011934b66 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/CoolantTower.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/CoolantTower.java @@ -1,5 +1,11 @@ package goodgenerator.blocks.tileEntity; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.*; +import static goodgenerator.util.DescTextLocalization.BLUE_PRINT_INFO; +import static gregtech.api.enums.Textures.BlockIcons.*; +import static gregtech.api.util.GT_StructureUtility.ofFrame; +import static gregtech.api.util.GT_StructureUtility.ofHatchAdder; + import com.github.technus.tectech.thing.metaTileEntity.multi.base.GT_MetaTileEntity_MultiblockBase_EM; import com.gtnewhorizon.structurelib.alignment.constructable.IConstructable; import com.gtnewhorizon.structurelib.structure.IStructureDefinition; @@ -21,12 +27,6 @@ import gregtech.api.util.GT_Utility; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; -import static com.gtnewhorizon.structurelib.structure.StructureUtility.*; -import static goodgenerator.util.DescTextLocalization.BLUE_PRINT_INFO; -import static gregtech.api.enums.Textures.BlockIcons.*; -import static gregtech.api.util.GT_StructureUtility.ofFrame; -import static gregtech.api.util.GT_StructureUtility.ofHatchAdder; - public class CoolantTower extends GT_MetaTileEntity_TooltipMultiBlockBase_EM implements IConstructable { protected IStructureDefinition<CoolantTower> multiDefinition = null; @@ -42,38 +42,187 @@ public class CoolantTower extends GT_MetaTileEntity_TooltipMultiBlockBase_EM imp @Override 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 "}, - }) - ).addElement('B', - ofBlockAnyMeta(GregTech_API.sBlockConcretes, 8) - ).addElement('C', - ofFrame(Materials.TungstenCarbide) - ).addElement('H', - ofChain( - ofHatchAdder( - CoolantTower::addIOFluidToMachineList, CASING_INDEX, 1 - ), - ofBlockAnyMeta(GregTech_API.sBlockConcretes, 8) - ) - ) - .build(); + if (multiDefinition == null) { + multiDefinition = StructureDefinition.<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 " + }, + })) + .addElement('B', ofBlockAnyMeta(GregTech_API.sBlockConcretes, 8)) + .addElement('C', ofFrame(Materials.TungstenCarbide)) + .addElement( + 'H', + ofChain( + ofHatchAdder(CoolantTower::addIOFluidToMachineList, CASING_INDEX, 1), + ofBlockAnyMeta(GregTech_API.sBlockConcretes, 8))) + .build(); } return multiDefinition; } @@ -86,11 +235,11 @@ public class CoolantTower extends GT_MetaTileEntity_TooltipMultiBlockBase_EM imp if (aMetaTileEntity == null) { return false; } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Input) { - ((GT_MetaTileEntity_Hatch)aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mInputHatches.add((GT_MetaTileEntity_Hatch_Input)aMetaTileEntity); + ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); + return this.mInputHatches.add((GT_MetaTileEntity_Hatch_Input) aMetaTileEntity); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Output) { - ((GT_MetaTileEntity_Hatch)aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mOutputHatches.add((GT_MetaTileEntity_Hatch_Output)aMetaTileEntity); + ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); + return this.mOutputHatches.add((GT_MetaTileEntity_Hatch_Output) aMetaTileEntity); } else { return false; } @@ -112,14 +261,14 @@ public class CoolantTower extends GT_MetaTileEntity_TooltipMultiBlockBase_EM imp protected GT_Multiblock_Tooltip_Builder createTooltip() { final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); tt.addMachineType("Coolant Tower") - .addInfo("Controller block for the Coolant Tower.") - .addInfo("Turn Steam back to Distilled Water.") - .addInfo(BLUE_PRINT_INFO) - .addSeparator() - .addController("Mid of the second layer.") - .addInputHatch("Input Hatch", 1) - .addOutputHatch("Output Hatch", 1) - .toolTipFinisher("Good Generator"); + .addInfo("Controller block for the Coolant Tower.") + .addInfo("Turn Steam back to Distilled Water.") + .addInfo(BLUE_PRINT_INFO) + .addSeparator() + .addController("Mid of the second layer.") + .addInputHatch("Input Hatch", 1) + .addOutputHatch("Output Hatch", 1) + .toolTipFinisher("Good Generator"); return tt; } @@ -177,18 +326,40 @@ public class CoolantTower extends GT_MetaTileEntity_TooltipMultiBlockBase_EM imp } @Override - public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone) { + public ITexture[] getTexture( + IGregTechTileEntity aBaseMetaTileEntity, + byte aSide, + byte aFacing, + byte aColorIndex, + boolean aActive, + boolean aRedstone) { if (aSide == aFacing) { if (aActive) - return new ITexture[]{ + return new ITexture[] { casingTexturePages[12][6], - TextureFactory.builder().addIcon(OVERLAY_FRONT_HEAT_EXCHANGER_ACTIVE).extFacing().build(), - TextureFactory.builder().addIcon(OVERLAY_FRONT_HEAT_EXCHANGER_ACTIVE_GLOW).extFacing().glow().build()}; - return new ITexture[]{ + TextureFactory.builder() + .addIcon(OVERLAY_FRONT_HEAT_EXCHANGER_ACTIVE) + .extFacing() + .build(), + TextureFactory.builder() + .addIcon(OVERLAY_FRONT_HEAT_EXCHANGER_ACTIVE_GLOW) + .extFacing() + .glow() + .build() + }; + return new ITexture[] { casingTexturePages[12][6], - TextureFactory.builder().addIcon(OVERLAY_FRONT_HEAT_EXCHANGER).extFacing().build(), - TextureFactory.builder().addIcon(OVERLAY_FRONT_HEAT_EXCHANGER_GLOW).extFacing().glow().build()}; + TextureFactory.builder() + .addIcon(OVERLAY_FRONT_HEAT_EXCHANGER) + .extFacing() + .build(), + TextureFactory.builder() + .addIcon(OVERLAY_FRONT_HEAT_EXCHANGER_GLOW) + .extFacing() + .glow() + .build() + }; } - return new ITexture[]{casingTexturePages[12][6]}; + return new ITexture[] {casingTexturePages[12][6]}; } } diff --git a/src/main/java/goodgenerator/blocks/tileEntity/EssentiaHatch.java b/src/main/java/goodgenerator/blocks/tileEntity/EssentiaHatch.java index 662767d3cf..4c72fff073 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/EssentiaHatch.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/EssentiaHatch.java @@ -1,6 +1,7 @@ package goodgenerator.blocks.tileEntity; import goodgenerator.crossmod.thaumcraft.LargeEssentiaEnergyData; +import java.util.ArrayList; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.network.NetworkManager; @@ -14,8 +15,6 @@ import thaumcraft.api.aspects.AspectList; import thaumcraft.api.aspects.IAspectContainer; import thaumcraft.api.aspects.IEssentiaTransport; -import java.util.ArrayList; - public class EssentiaHatch extends TileEntity implements IAspectContainer, IEssentiaTransport { private Aspect mLocked; @@ -86,17 +85,19 @@ public class EssentiaHatch extends TileEntity implements IAspectContainer, IEsse } public void fillfrompipe() { - if (getEssentiaAmount(null) >= 1000) - return; + if (getEssentiaAmount(null) >= 1000) return; TileEntity[] te = new TileEntity[ForgeDirection.VALID_DIRECTIONS.length]; for (int i = 0; i < ForgeDirection.VALID_DIRECTIONS.length; i++) { - te[i] = ThaumcraftApiHelper.getConnectableTile(this.worldObj, this.xCoord, this.yCoord, this.zCoord, ForgeDirection.VALID_DIRECTIONS[i]); + te[i] = ThaumcraftApiHelper.getConnectableTile( + this.worldObj, this.xCoord, this.yCoord, this.zCoord, ForgeDirection.VALID_DIRECTIONS[i]); if (te[i] != null) { IEssentiaTransport pipe = (IEssentiaTransport) te[i]; if (!pipe.canOutputTo(ForgeDirection.VALID_DIRECTIONS[i])) { return; } - if ((pipe.getEssentiaType(ForgeDirection.VALID_DIRECTIONS[i].getOpposite()) != null) && (pipe.getSuctionAmount(ForgeDirection.VALID_DIRECTIONS[i]) < getSuctionAmount(ForgeDirection.VALID_DIRECTIONS[i]))) { + if ((pipe.getEssentiaType(ForgeDirection.VALID_DIRECTIONS[i].getOpposite()) != null) + && (pipe.getSuctionAmount(ForgeDirection.VALID_DIRECTIONS[i]) + < getSuctionAmount(ForgeDirection.VALID_DIRECTIONS[i]))) { Aspect readyInput = pipe.getEssentiaType(ForgeDirection.VALID_DIRECTIONS[i].getOpposite()); int type = LargeEssentiaEnergyData.getAspectTypeIndex(readyInput); if (type != -1 && (mState & (1 << type)) == 0) continue; @@ -104,7 +105,12 @@ public class EssentiaHatch extends TileEntity implements IAspectContainer, IEsse addToContainer(mLocked, pipe.takeEssentia(mLocked, 1, ForgeDirection.VALID_DIRECTIONS[i])); } if (mLocked == null) - addToContainer(pipe.getEssentiaType(ForgeDirection.VALID_DIRECTIONS[i]), pipe.takeEssentia(pipe.getEssentiaType(ForgeDirection.VALID_DIRECTIONS[i]), 1, ForgeDirection.VALID_DIRECTIONS[i])); + addToContainer( + pipe.getEssentiaType(ForgeDirection.VALID_DIRECTIONS[i]), + pipe.takeEssentia( + pipe.getEssentiaType(ForgeDirection.VALID_DIRECTIONS[i]), + 1, + ForgeDirection.VALID_DIRECTIONS[i])); } } } @@ -159,8 +165,7 @@ public class EssentiaHatch extends TileEntity implements IAspectContainer, IEsse @Override public boolean doesContainerContain(AspectList aspectList) { ArrayList<Boolean> ret = new ArrayList<Boolean>(); - for (Aspect a : aspectList.aspects.keySet()) - ret.add(current.aspects.containsKey(a)); + for (Aspect a : aspectList.aspects.keySet()) ret.add(current.aspects.containsKey(a)); return !ret.contains(false); } @@ -185,7 +190,7 @@ public class EssentiaHatch extends TileEntity implements IAspectContainer, IEsse } @Override - public void setSuction(Aspect aspect, int i) { } + public void setSuction(Aspect aspect, int i) {} @Override public Aspect getSuctionType(ForgeDirection forgeDirection) { diff --git a/src/main/java/goodgenerator/blocks/tileEntity/EssentiaOutputHatch.java b/src/main/java/goodgenerator/blocks/tileEntity/EssentiaOutputHatch.java index 77d8004446..b3f3f51aff 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/EssentiaOutputHatch.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/EssentiaOutputHatch.java @@ -1,5 +1,6 @@ package goodgenerator.blocks.tileEntity; +import java.util.Map; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraftforge.common.util.ForgeDirection; @@ -9,8 +10,6 @@ import thaumcraft.api.aspects.AspectList; import thaumcraft.api.aspects.IAspectContainer; import thaumcraft.api.aspects.IEssentiaTransport; -import java.util.Map; - public class EssentiaOutputHatch extends TileThaumcraft implements IAspectContainer, IEssentiaTransport { public static final int CAPACITY = 256; @@ -134,8 +133,7 @@ public class EssentiaOutputHatch extends TileThaumcraft implements IAspectContai } @Override - public void setSuction(Aspect var1, int var2) { - } + public void setSuction(Aspect var1, int var2) {} @Override public Aspect getSuctionType(ForgeDirection var1) { diff --git a/src/main/java/goodgenerator/blocks/tileEntity/EssentiaOutputHatch_ME.java b/src/main/java/goodgenerator/blocks/tileEntity/EssentiaOutputHatch_ME.java index 8f2c4c920f..44a5bea3c6 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/EssentiaOutputHatch_ME.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/EssentiaOutputHatch_ME.java @@ -21,12 +21,17 @@ import thaumcraft.api.aspects.AspectList; import thaumicenergistics.api.grid.IEssentiaGrid; import thaumicenergistics.api.grid.IMEEssentiaMonitor; -import java.util.Map; - - -@Optional.InterfaceList(value = { - @Optional.Interface(iface = "appeng.api.networking.security.IActionHost", modid = "appliedenergistics2", striprefs = true), - @Optional.Interface(iface = "appeng.me.helpers.IGridProxyable", modid = "appliedenergistics2", striprefs = true),}) +@Optional.InterfaceList( + value = { + @Optional.Interface( + iface = "appeng.api.networking.security.IActionHost", + modid = "appliedenergistics2", + striprefs = true), + @Optional.Interface( + iface = "appeng.me.helpers.IGridProxyable", + modid = "appliedenergistics2", + striprefs = true), + }) public class EssentiaOutputHatch_ME extends EssentiaOutputHatch implements IActionHost, IGridProxyable { private AENetworkProxy gridProxy = null; @@ -55,30 +60,26 @@ public class EssentiaOutputHatch_ME extends EssentiaOutputHatch implements IActi @Optional.Method(modid = "appliedenergistics2") public void readFromNBT_AENetwork(final NBTTagCompound data) { AENetworkProxy gp = getProxy(); - if (gp != null) - getProxy().readFromNBT(data); + if (gp != null) getProxy().readFromNBT(data); } @TileEvent(TileEventType.WORLD_NBT_WRITE) @Optional.Method(modid = "appliedenergistics2") public void writeToNBT_AENetwork(final NBTTagCompound data) { AENetworkProxy gp = getProxy(); - if (gp != null) - gp.writeToNBT(data); + if (gp != null) gp.writeToNBT(data); } @Optional.Method(modid = "appliedenergistics2") void onChunkUnloadAE() { AENetworkProxy gp = getProxy(); - if (gp != null) - gp.onChunkUnload(); + if (gp != null) gp.onChunkUnload(); } @Optional.Method(modid = "appliedenergistics2") void invalidateAE() { AENetworkProxy gp = getProxy(); - if (gp != null) - gp.invalidate(); + if (gp != null) gp.invalidate(); } @Optional.Method(modid = "appliedenergistics2") @@ -89,8 +90,7 @@ public class EssentiaOutputHatch_ME extends EssentiaOutputHatch implements IActi @Override @Optional.Method(modid = "appliedenergistics2") - public void gridChanged() { - } + public void gridChanged() {} @Override @Optional.Method(modid = "appliedenergistics2") @@ -100,8 +100,7 @@ public class EssentiaOutputHatch_ME extends EssentiaOutputHatch implements IActi @Override @Optional.Method(modid = "appliedenergistics2") - public void securityBreak() { - } + public void securityBreak() {} @Override @Optional.Method(modid = "appliedenergistics2") @@ -168,5 +167,4 @@ public class EssentiaOutputHatch_ME extends EssentiaOutputHatch implements IActi public MachineSource getMachineSource() { return this.asMachineSource; } - } diff --git a/src/main/java/goodgenerator/blocks/tileEntity/ExtremeHeatExchanger.java b/src/main/java/goodgenerator/blocks/tileEntity/ExtremeHeatExchanger.java index b9ce6aa0d4..c7472acfbe 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/ExtremeHeatExchanger.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/ExtremeHeatExchanger.java @@ -1,5 +1,11 @@ package goodgenerator.blocks.tileEntity; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.*; +import static goodgenerator.util.DescTextLocalization.BLUE_PRINT_INFO; +import static gregtech.api.enums.GT_Values.V; +import static gregtech.api.enums.Textures.BlockIcons.*; +import static gregtech.api.util.GT_StructureUtility.ofHatchAdder; + import com.gtnewhorizon.structurelib.alignment.constructable.IConstructable; import com.gtnewhorizon.structurelib.structure.IStructureDefinition; import com.gtnewhorizon.structurelib.structure.StructureDefinition; @@ -28,12 +34,6 @@ import net.minecraft.util.StatCollector; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; -import static com.gtnewhorizon.structurelib.structure.StructureUtility.*; -import static goodgenerator.util.DescTextLocalization.BLUE_PRINT_INFO; -import static gregtech.api.enums.GT_Values.V; -import static gregtech.api.enums.Textures.BlockIcons.*; -import static gregtech.api.util.GT_StructureUtility.ofHatchAdder; - public class ExtremeHeatExchanger extends GT_MetaTileEntity_TooltipMultiBlockBase_EM implements IConstructable { protected IStructureDefinition<ExtremeHeatExchanger> multiDefinition = null; @@ -56,104 +56,60 @@ public class ExtremeHeatExchanger extends GT_MetaTileEntity_TooltipMultiBlockBas @Override 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 "}, - }) - ).addElement( + 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 " + }, + })) + .addElement( 'B', ofChain( - ofHatchAdder( - ExtremeHeatExchanger::addClassicInputToMachineList, 48, - 1 - ), - ofHatchAdder( - ExtremeHeatExchanger::addMaintenanceToMachineList, 48, - 1 - ), - onElementPass( - x -> x.casingAmount++, - ofBlock( - GregTech_API.sBlockCasings4, 0 - ) - ) - ) - ) + ofHatchAdder(ExtremeHeatExchanger::addClassicInputToMachineList, 48, 1), + ofHatchAdder(ExtremeHeatExchanger::addMaintenanceToMachineList, 48, 1), + onElementPass(x -> x.casingAmount++, ofBlock(GregTech_API.sBlockCasings4, 0)))) .addElement( 'T', ofChain( - ofHatchAdder( - ExtremeHeatExchanger::addClassicOutputToMachineList, 48, - 2 - ), - ofHatchAdder( - ExtremeHeatExchanger::addMaintenanceToMachineList, 48, - 2 - ), - onElementPass( - x -> x.casingAmount++, - ofBlock( - GregTech_API.sBlockCasings4, 0 - ) - ) - ) - ) - .addElement( - 'F', - ofHatchAdder( - ExtremeHeatExchanger::addHotFluidInputToMachineList, 48, - 3 - ) - ) - .addElement( - 'E', - ofHatchAdder( - ExtremeHeatExchanger::addColdFluidOutputToMachineList, 48, - 4 - ) - ) + ofHatchAdder(ExtremeHeatExchanger::addClassicOutputToMachineList, 48, 2), + ofHatchAdder(ExtremeHeatExchanger::addMaintenanceToMachineList, 48, 2), + onElementPass(x -> x.casingAmount++, ofBlock(GregTech_API.sBlockCasings4, 0)))) + .addElement('F', ofHatchAdder(ExtremeHeatExchanger::addHotFluidInputToMachineList, 48, 3)) + .addElement('E', ofHatchAdder(ExtremeHeatExchanger::addColdFluidOutputToMachineList, 48, 4)) .addElement( 'C', ofChain( ofHatchAdder( - ExtremeHeatExchanger::addMaintenanceToMachineList, 48, - GregTech_API.sBlockCasings4, 0 - ), - 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 - ) - ) + ExtremeHeatExchanger::addMaintenanceToMachineList, + 48, + GregTech_API.sBlockCasings4, + 0), + 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(); } return multiDefinition; @@ -232,11 +188,10 @@ public class ExtremeHeatExchanger extends GT_MetaTileEntity_TooltipMultiBlockBas @Override public boolean checkRecipe_EM(ItemStack aStack) { tRunningRecipe = null; - if (mHotFluidHatch.getFluid() == null) - return true; - MyRecipeAdder.ExtremeHeatExchangerRecipe tRecipe = MyRecipeAdder.mXHeatExchangerFuelMap.get(mHotFluidHatch.getFluid().getFluid()); - if (tRecipe == null) - return false; + if (mHotFluidHatch.getFluid() == null) return true; + MyRecipeAdder.ExtremeHeatExchangerRecipe tRecipe = MyRecipeAdder.mXHeatExchangerFuelMap.get( + mHotFluidHatch.getFluid().getFluid()); + if (tRecipe == null) return false; tRunningRecipe = tRecipe; this.hotName = mHotFluidHatch.getFluid().getFluid().getName(); int tMaxConsume = tRecipe.getMaxHotFluidConsume(); @@ -255,8 +210,7 @@ public class ExtremeHeatExchanger extends GT_MetaTileEntity_TooltipMultiBlockBas } efficiency -= penalty; - if (transformed_threshold <= 0) - transformed_threshold = 1; + if (transformed_threshold <= 0) transformed_threshold = 1; transformed = tRealConsume >= transformed_threshold; @@ -277,9 +231,8 @@ public class ExtremeHeatExchanger extends GT_MetaTileEntity_TooltipMultiBlockBas if (waterAmount < 0) return false; if (depleteInput(GT_ModHandler.getDistilledWater(waterAmount))) { addOutput(new FluidStack(tReadySteam, waterAmount * 160)); - } - else { - GT_Log.exp.println(this.mName+" had no more Distilled water!"); + } else { + GT_Log.exp.println(this.mName + " had no more Distilled water!"); mHotFluidHatch.getBaseMetaTileEntity().doExplosion(V[8]); return false; } @@ -289,10 +242,14 @@ public class ExtremeHeatExchanger extends GT_MetaTileEntity_TooltipMultiBlockBas public double getUnitSteamPower(String steam) { switch (steam) { - case "steam": return 0.5; - case "ic2superheatedsteam": return 1; - case "supercriticalsteam": return 100; - default: return -1; + case "steam": + return 0.5; + case "ic2superheatedsteam": + return 1; + case "supercriticalsteam": + return 100; + default: + return -1; } } @@ -319,34 +276,59 @@ public class ExtremeHeatExchanger extends GT_MetaTileEntity_TooltipMultiBlockBas @Override 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" + 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" }; } @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[]{ + 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()}; + 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]}; } } diff --git a/src/main/java/goodgenerator/blocks/tileEntity/FuelRefineFactory.java b/src/main/java/goodgenerator/blocks/tileEntity/FuelRefineFactory.java index 7db0bf7bf6..f964303394 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/FuelRefineFactory.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/FuelRefineFactory.java @@ -1,5 +1,10 @@ package goodgenerator.blocks.tileEntity; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.*; +import static goodgenerator.util.DescTextLocalization.BLUE_PRINT_INFO; +import static gregtech.api.enums.GT_Values.V; +import static gregtech.api.util.GT_StructureUtility.ofHatchAdder; + 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; @@ -22,6 +27,8 @@ 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.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -29,25 +36,20 @@ import net.minecraft.util.StatCollector; import net.minecraft.world.World; import net.minecraftforge.fluids.FluidStack; -import java.util.ArrayList; -import java.util.List; - -import static com.gtnewhorizon.structurelib.structure.StructureUtility.*; -import static goodgenerator.util.DescTextLocalization.BLUE_PRINT_INFO; -import static gregtech.api.enums.GT_Values.V; -import static gregtech.api.util.GT_StructureUtility.ofHatchAdder; - -public class FuelRefineFactory extends GT_MetaTileEntity_TooltipMultiBlockBase_EM implements TecTechEnabledMulti, IConstructable { +public class FuelRefineFactory extends GT_MetaTileEntity_TooltipMultiBlockBase_EM + implements TecTechEnabledMulti, IConstructable { 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);} + public FuelRefineFactory(String name) { + super(name); + } - public FuelRefineFactory(int id, String name, String nameRegional){ - super(id,name,nameRegional); + public FuelRefineFactory(int id, String name, String nameRegional) { + super(id, name, nameRegional); } @Override @@ -72,65 +74,38 @@ public class FuelRefineFactory extends GT_MetaTileEntity_TooltipMultiBlockBase_E @Override 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 "," "} - }) - ).addElement( - 'X', + 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 ", " "} + })) + .addElement( + 'X', ofChain( - ofHatchAdder( - FuelRefineFactory::addToFRFList,179, - Loaders.FRF_Casings,0 - ), - ofBlock( - Loaders.FRF_Casings,0 - ) - ) - ).addElement( - 'C', - ofBlock( - Loaders.FRF_Casings,0 - ) - ).addElement( - 'G', - ofBlock( - Loaders.fieldRestrictingGlass,0 - ) - ).addElement( + ofHatchAdder(FuelRefineFactory::addToFRFList, 179, Loaders.FRF_Casings, 0), + ofBlock(Loaders.FRF_Casings, 0))) + .addElement('C', ofBlock(Loaders.FRF_Casings, 0)) + .addElement('G', ofBlock(Loaders.fieldRestrictingGlass, 0)) + .addElement( 'F', ofChain( - onElementPass( - x -> ++x.cnt[0], - ofFieldCoil(0) - ), - onElementPass( - x -> ++x.cnt[1], - ofFieldCoil(1) - ), - onElementPass( - x -> ++x.cnt[2], - ofFieldCoil(2) - ) - ) - ) + onElementPass(x -> ++x.cnt[0], ofFieldCoil(0)), + onElementPass(x -> ++x.cnt[1], ofFieldCoil(1)), + onElementPass(x -> ++x.cnt[2], ofFieldCoil(2)))) .build(); } return multiDefinition; @@ -185,36 +160,38 @@ public class FuelRefineFactory extends GT_MetaTileEntity_TooltipMultiBlockBase_E } @Override - public void loadNBTData(NBTTagCompound aNBT){ + public void loadNBTData(NBTTagCompound aNBT) { this.Tier = aNBT.getInteger("mTier"); super.loadNBTData(aNBT); } @Override - public void saveNBTData(NBTTagCompound aNBT){ + public void saveNBTData(NBTTagCompound aNBT) { aNBT.setInteger("mTier", this.Tier); super.saveNBTData(aNBT); } @Override - public String[] getStructureDescription(ItemStack itemStack){ + public String[] getStructureDescription(ItemStack itemStack) { return DescTextLocalization.addText("FuelRefineFactory.hint", 8); } @Override public boolean checkMachine_EM(IGregTechTileEntity aBaseMetaTileEntity, ItemStack aStack) { - cnt[0] = 0;cnt[1] = 0;cnt[2] = 0; + cnt[0] = 0; + cnt[1] = 0; + cnt[2] = 0; mWrench = true; mScrewdriver = true; mSoftHammer = true; mHardHammer = true; mSolderingTool = true; mCrowbar = true; - return structureCheck_EM(mName, 7,12,1) && getTier() != -1; + return structureCheck_EM(mName, 7, 12, 1) && getTier() != -1; } - public int getTier(){ - for (int i = 0; i < 3; i ++) { + public int getTier() { + for (int i = 0; i < 3; i++) { if (cnt[i] == 32) { Tier = i + 1; return i; @@ -225,7 +202,7 @@ public class FuelRefineFactory extends GT_MetaTileEntity_TooltipMultiBlockBase_E } @Override - public boolean checkRecipe_EM(ItemStack aStack){ + public boolean checkRecipe_EM(ItemStack aStack) { mWrench = true; mScrewdriver = true; @@ -273,7 +250,7 @@ public class FuelRefineFactory extends GT_MetaTileEntity_TooltipMultiBlockBase_E GT_Recipe recipe = tRecipes.findRecipe(this.getBaseMetaTileEntity(), false, V[tTier], inFluids, inItems); if (recipe != null) { if (recipe.mSpecialValue > Tier) return false; - if (recipe.isRecipeInputEqual(true, inFluids, inItems)){ + if (recipe.isRecipeInputEqual(true, inFluids, inItems)) { mEUt = recipe.mEUt * (1 << (Tier - recipe.mSpecialValue)); mEUt = -Math.abs(mEUt); mMaxProgresstime = recipe.mDuration / (1 << (Tier - recipe.mSpecialValue)); @@ -285,7 +262,7 @@ public class FuelRefineFactory extends GT_MetaTileEntity_TooltipMultiBlockBase_E return false; } - public final boolean addToFRFList(IGregTechTileEntity aTileEntity, int aBaseCasingIndex){ + public final boolean addToFRFList(IGregTechTileEntity aTileEntity, int aBaseCasingIndex) { if (aTileEntity == null) { return false; } else { @@ -294,18 +271,18 @@ public class FuelRefineFactory extends GT_MetaTileEntity_TooltipMultiBlockBase_E return false; } else { if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch) { - ((GT_MetaTileEntity_Hatch)aMetaTileEntity).updateTexture(aBaseCasingIndex); + ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); } if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Input) { - return this.mInputHatches.add((GT_MetaTileEntity_Hatch_Input)aMetaTileEntity); + return this.mInputHatches.add((GT_MetaTileEntity_Hatch_Input) aMetaTileEntity); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Output) { - return this.mOutputHatches.add((GT_MetaTileEntity_Hatch_Output)aMetaTileEntity); + return this.mOutputHatches.add((GT_MetaTileEntity_Hatch_Output) aMetaTileEntity); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_InputBus) { - return this.mInputBusses.add((GT_MetaTileEntity_Hatch_InputBus)aMetaTileEntity); + return this.mInputBusses.add((GT_MetaTileEntity_Hatch_InputBus) aMetaTileEntity); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Energy) { - return this.mEnergyHatches.add((GT_MetaTileEntity_Hatch_Energy)aMetaTileEntity); + return this.mEnergyHatches.add((GT_MetaTileEntity_Hatch_Energy) aMetaTileEntity); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_EnergyMulti) { - return this.eEnergyMulti.add((GT_MetaTileEntity_Hatch_EnergyMulti)aMetaTileEntity); + return this.eEnergyMulti.add((GT_MetaTileEntity_Hatch_EnergyMulti) aMetaTileEntity); } else { return false; } @@ -346,18 +323,39 @@ public class FuelRefineFactory extends GT_MetaTileEntity_TooltipMultiBlockBase_E @Override public String[] getInfoData() { String[] infoData = new String[super.getInfoData().length + 1]; - System.arraycopy(super.getInfoData(),0,infoData,0, super.getInfoData().length); + System.arraycopy(super.getInfoData(), 0, infoData, 0, super.getInfoData().length); infoData[super.getInfoData().length] = StatCollector.translateToLocal("scanner.info.FRF") + " " + this.Tier; return infoData; } @Override @SuppressWarnings("ALL") - public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone) { - if(aSide == aFacing){ - if(aActive) return new ITexture[]{Textures.BlockIcons.getCasingTextureForId(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()}; + 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), + 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() + }; } - return new ITexture[]{Textures.BlockIcons.getCasingTextureForId(179)}; + return new ITexture[] {Textures.BlockIcons.getCasingTextureForId(179)}; } } diff --git a/src/main/java/goodgenerator/blocks/tileEntity/GTMetaTileEntity/DieselGenerator.java b/src/main/java/goodgenerator/blocks/tileEntity/GTMetaTileEntity/DieselGenerator.java index 2c7e24e584..9105685742 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/GTMetaTileEntity/DieselGenerator.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/GTMetaTileEntity/DieselGenerator.java @@ -1,5 +1,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 cpw.mods.fml.common.registry.GameRegistry; import gregtech.GT_Mod; import gregtech.api.enums.ItemList; @@ -14,17 +17,16 @@ import gregtech.api.util.GT_Recipe; import gregtech.api.util.GT_Utility; import net.minecraft.item.ItemStack; -import static gregtech.api.enums.Textures.BlockIcons.*; -import static gregtech.api.enums.Textures.BlockIcons.DIESEL_GENERATOR_SIDE_ACTIVE_GLOW; - 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; } @@ -74,7 +76,9 @@ public class DieselGenerator extends GT_MetaTileEntity_BasicGenerator { @Override 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()); + GT_Log.err.println( + "Dupe Abuse: " + aBaseMetaTileEntity.getOwnerName() + " Coords: " + aBaseMetaTileEntity.getXCoord() + + " " + aBaseMetaTileEntity.getYCoord() + " " + aBaseMetaTileEntity.getZCoord()); aBaseMetaTileEntity.setToFire(); } super.onPostTick(aBaseMetaTileEntity, aTick); @@ -82,74 +86,134 @@ 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 18d663e5a5..dc049e69c7 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/GTMetaTileEntity/NeutronAccelerator.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/GTMetaTileEntity/NeutronAccelerator.java @@ -1,12 +1,12 @@ package goodgenerator.blocks.tileEntity.GTMetaTileEntity; +import static gregtech.api.enums.GT_Values.V; + import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Energy; -import static gregtech.api.enums.GT_Values.V; - public class NeutronAccelerator extends GT_MetaTileEntity_Hatch_Energy { public NeutronAccelerator(int aID, String aName, String aNameRegional, int aTier) { @@ -18,7 +18,7 @@ public class NeutronAccelerator extends GT_MetaTileEntity_Hatch_Energy { } public int getMaxEUConsume() { - return (int)(V[mTier] * 8 / 10); + return (int) (V[mTier] * 8 / 10); } @Override @@ -28,11 +28,11 @@ 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." }; } diff --git a/src/main/java/goodgenerator/blocks/tileEntity/GTMetaTileEntity/NeutronSensor.java b/src/main/java/goodgenerator/blocks/tileEntity/GTMetaTileEntity/NeutronSensor.java index d69f0b75f8..6a0f7d5d8f 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/GTMetaTileEntity/NeutronSensor.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/GTMetaTileEntity/NeutronSensor.java @@ -20,7 +20,8 @@ import net.minecraft.nbt.NBTTagCompound; 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; @@ -35,10 +36,10 @@ 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." }; } @@ -81,7 +82,11 @@ public class NeutronSensor extends GT_MetaTileEntity_Hatch { @Override public Object getClientGUI(int aID, InventoryPlayer aPlayerInventory, IGregTechTileEntity aBaseMetaTileEntity) { - return new NeutronSensorGUIClient(aPlayerInventory, aBaseMetaTileEntity, GoodGenerator.MOD_ID + ":textures/gui/NeutronSensorGUI.png", this.texts); + return new NeutronSensorGUIClient( + aPlayerInventory, + aBaseMetaTileEntity, + GoodGenerator.MOD_ID + ":textures/gui/NeutronSensorGUI.png", + this.texts); } @Override @@ -90,10 +95,12 @@ 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) { if (aBaseMetaTileEntity.isClientSide()) return true; if (aSide == aBaseMetaTileEntity.getFrontFacing() && aPlayer instanceof EntityPlayerMP) { - GoodGenerator.CHANNEL.sendTo(new MessageOpenNeutronSensorGUI(aBaseMetaTileEntity, texts), (EntityPlayerMP) aPlayer); + GoodGenerator.CHANNEL.sendTo( + new MessageOpenNeutronSensorGUI(aBaseMetaTileEntity, texts), (EntityPlayerMP) aPlayer); return true; } return false; @@ -107,45 +114,39 @@ public class NeutronSensor extends GT_MetaTileEntity_Hatch { return texts == null ? "" : texts; } - public void outputRedstoneSignal(){ + public void outputRedstoneSignal() { isOn = true; } - public void stopOutputRedstoneSignal(){ + public void stopOutputRedstoneSignal() { isOn = false; } @Override public ITexture[] getTexturesActive(ITexture aBaseTexture) { return new ITexture[] { - aBaseTexture, - TextureFactory.of(textureFont), - TextureFactory.builder().addIcon(textureFont_Glow).glow().build() + 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 - public boolean allowGeneralRedstoneOutput(){ + public boolean allowGeneralRedstoneOutput() { return true; } @Override public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) { if (isOn) { - for (byte i = 0; i < 6; i ++) - aBaseMetaTileEntity.setInternalOutputRedstoneSignal(i, (byte) 15); - } - else { - for (byte i = 0; i < 6; i ++) - aBaseMetaTileEntity.setInternalOutputRedstoneSignal(i, (byte) 0); + for (byte i = 0; i < 6; i++) aBaseMetaTileEntity.setInternalOutputRedstoneSignal(i, (byte) 15); + } else { + for (byte i = 0; i < 6; i++) aBaseMetaTileEntity.setInternalOutputRedstoneSignal(i, (byte) 0); } super.onPostTick(aBaseMetaTileEntity, aTick); } @@ -164,5 +165,4 @@ public class NeutronSensor extends GT_MetaTileEntity_Hatch { public boolean allowPutStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, byte aSide, ItemStack aStack) { return false; } - } diff --git a/src/main/java/goodgenerator/blocks/tileEntity/GTMetaTileEntity/YOTTAHatch.java b/src/main/java/goodgenerator/blocks/tileEntity/GTMetaTileEntity/YOTTAHatch.java index bb9022764c..52a58f42b3 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/GTMetaTileEntity/YOTTAHatch.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/GTMetaTileEntity/YOTTAHatch.java @@ -29,6 +29,9 @@ 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; @@ -37,19 +40,35 @@ import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; -import java.math.BigInteger; -import java.util.ArrayList; -import java.util.List; - -@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.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> { private static final IIconContainer textureFont = new Textures.BlockIcons.CustomIcon("icons/YOTTAHatch"); @@ -57,14 +76,17 @@ public class YOTTAHatch extends GT_MetaTileEntity_Hatch implements IGridProxyabl private AENetworkProxy gridProxy = null; private int priority; 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) { @@ -101,17 +123,18 @@ public class YOTTAHatch extends GT_MetaTileEntity_Hatch implements IGridProxyabl @Override public final void onScrewdriverRightClick(byte aSide, EntityPlayer aPlayer, float aX, float aY, float aZ) { - if (aPlayer.isSneaking()) - this.priority -= 10; - else - this.priority += 10; - GT_Utility.sendChatToPlayer(aPlayer, String.format(StatCollector.translateToLocal("yothatch.chat.0"), this.priority)); + if (aPlayer.isSneaking()) this.priority -= 10; + else this.priority += 10; + GT_Utility.sendChatToPlayer( + 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)); + GT_Utility.sendChatToPlayer( + aPlayer, String.format(StatCollector.translateToLocal("yothatch.chat.1"), this.readMode)); return true; } @@ -151,15 +174,16 @@ public class YOTTAHatch extends GT_MetaTileEntity_Hatch implements IGridProxyabl @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; int ready; if (host.mStorageCurrent.compareTo(BigInteger.valueOf(Integer.MAX_VALUE)) > 0) { ready = Integer.MAX_VALUE; - } - else ready = host.mStorageCurrent.intValue(); + } else ready = host.mStorageCurrent.intValue(); out.add(FluidUtil.createAEFluidStack(FluidRegistry.getFluid(host.mFluidName), ready)); return out; } @@ -183,8 +207,7 @@ public class YOTTAHatch extends GT_MetaTileEntity_Hatch implements IGridProxyabl if (ready != null) { if (mode.equals(Actionable.MODULATE)) drain(null, request.getFluidStack(), true); return FluidUtil.createAEFluidStack(ready.getFluid(), ready.amount); - } - else return null; + } else return null; } @Override @@ -209,9 +232,10 @@ public class YOTTAHatch extends GT_MetaTileEntity_Hatch implements IGridProxyabl IStorageGrid storageGrid = grid.getCache(IStorageGrid.class); if (storageGrid == null) { node.getGrid().postEvent(new MENetworkStorageEvent(null, StorageChannel.FLUIDS)); - } - else { - node.getGrid().postEvent(new MENetworkStorageEvent(storageGrid.getFluidInventory(), StorageChannel.FLUIDS)); + } else { + node.getGrid() + .postEvent( + new MENetworkStorageEvent(storageGrid.getFluidInventory(), StorageChannel.FLUIDS)); } node.getGrid().postEvent(new MENetworkCellArrayUpdate()); } @@ -221,27 +245,29 @@ public class YOTTAHatch extends GT_MetaTileEntity_Hatch implements IGridProxyabl @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(); + } else return host.mStorage.intValue(); } @Override public int fill(ForgeDirection from, FluidStack resource, boolean doFill) { - if (host == null || host.getBaseMetaTileEntity() == null || !host.getBaseMetaTileEntity().isActive()) return 0; - if (host.mFluidName == null || host.mFluidName.equals("") || host.mFluidName.equals(resource.getFluid().getName())) { + if (host == null + || host.getBaseMetaTileEntity() == null + || !host.getBaseMetaTileEntity().isActive()) 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) { - if (doFill) - host.addFluid(resource.amount); + if (doFill) host.addFluid(resource.amount); return resource.amount; - } - else { + } else { int added = host.mStorage.subtract(host.mStorageCurrent).intValue(); - if (doFill) - host.addFluid(added); + if (doFill) host.addFluid(added); return added; } } @@ -250,15 +276,16 @@ public class YOTTAHatch extends GT_MetaTileEntity_Hatch implements IGridProxyabl @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; - } - else ready = host.mStorageCurrent.intValue(); + } else ready = host.mStorageCurrent.intValue(); ready = Math.min(ready, resource.amount); if (doDrain) { host.reduceFluid(ready); @@ -268,10 +295,10 @@ public class YOTTAHatch extends GT_MetaTileEntity_Hatch implements IGridProxyabl @Override public FluidStack drain(ForgeDirection from, int maxDrain, boolean doDrain) { - if (host == null || host.getBaseMetaTileEntity() == null || !host.getBaseMetaTileEntity().isActive()) - return null; - if (host.mFluidName == null || host.mFluidName.equals("")) - 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); } @@ -279,13 +306,13 @@ public class YOTTAHatch extends GT_MetaTileEntity_Hatch implements IGridProxyabl 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; - if (host.mStorageCurrent.compareTo(BigInteger.valueOf(Integer.MAX_VALUE)) > 0) - camt = Integer.MAX_VALUE; + if (host.mStorageCurrent.compareTo(BigInteger.valueOf(Integer.MAX_VALUE)) > 0) camt = Integer.MAX_VALUE; else camt = host.mStorageCurrent.intValue(); fluid = FluidRegistry.getFluidStack(host.mFluidName, camt); } @@ -307,16 +334,14 @@ public class YOTTAHatch extends GT_MetaTileEntity_Hatch implements IGridProxyabl @Override public ITexture[] getTexturesActive(ITexture aBaseTexture) { return new ITexture[] { - aBaseTexture, - TextureFactory.of(textureFont), + aBaseTexture, TextureFactory.of(textureFont), }; } @Override public ITexture[] getTexturesInactive(ITexture aBaseTexture) { return new ITexture[] { - aBaseTexture, - TextureFactory.of(textureFont), + aBaseTexture, TextureFactory.of(textureFont), }; } @@ -380,10 +405,10 @@ public class YOTTAHatch extends GT_MetaTileEntity_Hatch implements IGridProxyabl } @Override - public void blinkCell(int slot) { } + public void blinkCell(int slot) {} @Override public void saveChanges(IMEInventory cellInventory) { - //This is handled by host itself. + // This is handled by host itself. } } diff --git a/src/main/java/goodgenerator/blocks/tileEntity/LargeEssentiaGenerator.java b/src/main/java/goodgenerator/blocks/tileEntity/LargeEssentiaGenerator.java index 049d30b66d..ce77b0f365 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/LargeEssentiaGenerator.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/LargeEssentiaGenerator.java @@ -1,8 +1,11 @@ package goodgenerator.blocks.tileEntity; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.*; +import static goodgenerator.util.DescTextLocalization.BLUE_PRINT_INFO; +import static gregtech.api.util.GT_StructureUtility.ofHatchAdder; + import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader; import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_DynamoMulti; -import com.github.technus.tectech.thing.metaTileEntity.multi.base.GT_MetaTileEntity_MultiblockBase_EM; import com.gtnewhorizon.structurelib.alignment.constructable.IConstructable; import com.gtnewhorizon.structurelib.structure.IStructureDefinition; import com.gtnewhorizon.structurelib.structure.StructureDefinition; @@ -14,7 +17,6 @@ import goodgenerator.util.DescTextLocalization; import goodgenerator.util.ItemRefer; import gregtech.api.enums.Materials; import gregtech.api.enums.Textures; -import gregtech.api.interfaces.ISecondaryDescribable; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; @@ -27,6 +29,7 @@ import gregtech.api.objects.XSTR; import gregtech.api.render.TextureFactory; import gregtech.api.util.GT_Multiblock_Tooltip_Builder; import gregtech.api.util.GT_Utility; +import java.util.ArrayList; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -34,17 +37,10 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.StatCollector; import net.minecraft.world.World; import net.minecraftforge.fluids.FluidRegistry; -import org.lwjgl.input.Keyboard; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; import thaumcraft.common.config.ConfigBlocks; -import java.util.ArrayList; - -import static com.gtnewhorizon.structurelib.structure.StructureUtility.*; -import static goodgenerator.util.DescTextLocalization.BLUE_PRINT_INFO; -import static gregtech.api.util.GT_StructureUtility.ofHatchAdder; - public class LargeEssentiaGenerator extends GT_MetaTileEntity_TooltipMultiBlockBase_EM implements IConstructable { private IStructureDefinition<LargeEssentiaGenerator> multiDefinition = null; @@ -55,12 +51,12 @@ public class LargeEssentiaGenerator extends GT_MetaTileEntity_TooltipMultiBlockB final XSTR R = new XSTR(); protected ArrayList<EssentiaHatch> mEssentiaHatch = new ArrayList<>(); - public LargeEssentiaGenerator(String name){ + public LargeEssentiaGenerator(String name) { super(name); } - public LargeEssentiaGenerator(int id, String name, String nameRegional){ - super(id,name,nameRegional); + public LargeEssentiaGenerator(int id, String name, String nameRegional) { + super(id, name, nameRegional); } @Override @@ -72,8 +68,10 @@ public class LargeEssentiaGenerator extends GT_MetaTileEntity_TooltipMultiBlockB public boolean checkMachine_EM(IGregTechTileEntity aBaseMetaTileEntity, ItemStack aStack) { mStableValue = 0; mEssentiaHatch.clear(); - return structureCheck_EM(mName, 4, 0, 4) && (mDynamoHatches.size() + eDynamoMulti.size()) == 1 - && checkHatchTier() && updateEssentiaHatchState(); + return structureCheck_EM(mName, 4, 0, 4) + && (mDynamoHatches.size() + eDynamoMulti.size()) == 1 + && checkHatchTier() + && updateEssentiaHatchState(); } public boolean checkHatchTier() { @@ -113,7 +111,8 @@ public class LargeEssentiaGenerator extends GT_MetaTileEntity_TooltipMultiBlockB } @Override - public boolean onWrenchRightClick(byte aSide, byte aWrenchingSide, EntityPlayer aPlayer, float aX, float aY, float aZ) { + public boolean onWrenchRightClick( + byte aSide, byte aWrenchingSide, EntityPlayer aPlayer, float aX, float aY, float aZ) { if (aWrenchingSide == 0 || aWrenchingSide == 1) return false; if (getBaseMetaTileEntity().isValidFacing(aWrenchingSide)) { getBaseMetaTileEntity().setFrontFacing(aWrenchingSide); @@ -126,12 +125,18 @@ public class LargeEssentiaGenerator extends GT_MetaTileEntity_TooltipMultiBlockB public boolean onRightclick(IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer) { if (this.getBaseMetaTileEntity().isServerSide()) { ItemStack tCurrentItem = aPlayer.inventory.getCurrentItem(); - if (tCurrentItem != null && tCurrentItem.getItem().equals(ItemRefer.Essentia_Upgrade_Empty.get(1).getItem())) { + if (tCurrentItem != null + && tCurrentItem + .getItem() + .equals(ItemRefer.Essentia_Upgrade_Empty.get(1).getItem())) { int tMeta = tCurrentItem.getItemDamage(); if ((mUpgrade & (1 << tMeta)) == 0 && tMeta != 0) { - tCurrentItem.stackSize --; + tCurrentItem.stackSize--; mUpgrade = mUpgrade | (1 << tMeta); - GT_Utility.sendChatToPlayer(aPlayer, tCurrentItem.getDisplayName() + StatCollector.translateToLocal("largeessentiagenerator.chat")); + GT_Utility.sendChatToPlayer( + aPlayer, + tCurrentItem.getDisplayName() + + StatCollector.translateToLocal("largeessentiagenerator.chat")); } updateEssentiaHatchState(); return true; @@ -143,73 +148,79 @@ public class LargeEssentiaGenerator extends GT_MetaTileEntity_TooltipMultiBlockB @Override public IStructureDefinition<LargeEssentiaGenerator> getStructure_EM() { - if(multiDefinition == null) { - multiDefinition = StructureDefinition - .<LargeEssentiaGenerator>builder() - .addShape(mName, - transpose(new String[][]{ - {"A A"," "," "," "," ~ "," "," "," ","A A"}, - {"T C T"," CEC "," CEEEC "," CEEEEEC ","CEEEEEEEC"," CEEEEEC "," CEEEC "," CEC ","T C T"}, - {"T TXT T"," TCCCT "," TCCCCCT ","TCCCCCCCT","XCCCCCCCX","TCCCCCCCT"," TCCCCCT "," TCCCT ","T TXT T"} - }) - ).addElement( - 'A', - ofBlock( - ConfigBlocks.blockCosmeticOpaque, 1 - ) - ).addElement( - 'T', - ofBlock( - ConfigBlocks.blockCosmeticSolid, 7 - ) - ).addElement( - 'C', - ofBlock( - Loaders.magicCasing, 0 - ) - ).addElement( + if (multiDefinition == null) { + multiDefinition = StructureDefinition.<LargeEssentiaGenerator>builder() + .addShape(mName, transpose(new String[][] { + { + "A A", + " ", + " ", + " ", + " ~ ", + " ", + " ", + " ", + "A A" + }, + { + "T C T", + " CEC ", + " CEEEC ", + " CEEEEEC ", + "CEEEEEEEC", + " CEEEEEC ", + " CEEEC ", + " CEC ", + "T C T" + }, + { + "T TXT T", + " TCCCT ", + " TCCCCCT ", + "TCCCCCCCT", + "XCCCCCCCX", + "TCCCCCCCT", + " TCCCCCT ", + " TCCCT ", + "T TXT T" + } + })) + .addElement('A', ofBlock(ConfigBlocks.blockCosmeticOpaque, 1)) + .addElement('T', ofBlock(ConfigBlocks.blockCosmeticSolid, 7)) + .addElement('C', ofBlock(Loaders.magicCasing, 0)) + .addElement( 'E', ofChain( onElementPass( - x -> {++x.mStableValue; x.mTierLimit = Math.max(x.mTierLimit, 4);}, - ofBlock( - Loaders.essentiaCell, 0 - ) - ), + x -> { + ++x.mStableValue; + x.mTierLimit = Math.max(x.mTierLimit, 4); + }, + ofBlock(Loaders.essentiaCell, 0)), onElementPass( - x -> {x.mStableValue += 2; x.mTierLimit = Math.max(x.mTierLimit, 5);}, - ofBlock( - Loaders.essentiaCell, 1 - ) - ), + x -> { + x.mStableValue += 2; + x.mTierLimit = Math.max(x.mTierLimit, 5); + }, + ofBlock(Loaders.essentiaCell, 1)), onElementPass( - x -> {x.mStableValue += 5; x.mTierLimit = Math.max(x.mTierLimit, 6);}, - ofBlock( - Loaders.essentiaCell, 2 - ) - ), + x -> { + x.mStableValue += 5; + x.mTierLimit = Math.max(x.mTierLimit, 6); + }, + ofBlock(Loaders.essentiaCell, 2)), onElementPass( - x -> {x.mStableValue += 10; x.mTierLimit = Math.max(x.mTierLimit, 7);}, - ofBlock( - Loaders.essentiaCell, 3 - ) - ) - ) - ).addElement( + x -> { + x.mStableValue += 10; + x.mTierLimit = Math.max(x.mTierLimit, 7); + }, + ofBlock(Loaders.essentiaCell, 3)))) + .addElement( 'X', ofChain( - ofHatchAdder( - LargeEssentiaGenerator::addLargeEssentiaGeneratorList,1536, - 1 - ), - ofBlock( - Loaders.magicCasing, 0 - ), - ofTileAdder( - LargeEssentiaGenerator::addEssentiaHatch, Loaders.magicCasing, 0 - ) - ) - ) + ofHatchAdder(LargeEssentiaGenerator::addLargeEssentiaGeneratorList, 1536, 1), + ofBlock(Loaders.magicCasing, 0), + ofTileAdder(LargeEssentiaGenerator::addEssentiaHatch, Loaders.magicCasing, 0))) .build(); } return multiDefinition; @@ -227,18 +238,18 @@ public class LargeEssentiaGenerator extends GT_MetaTileEntity_TooltipMultiBlockB return false; } else { IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity(); - if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Input){ - ((GT_MetaTileEntity_Hatch)aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mInputHatches.add((GT_MetaTileEntity_Hatch_Input)aMetaTileEntity); - } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Maintenance){ - ((GT_MetaTileEntity_Hatch)aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mMaintenanceHatches.add((GT_MetaTileEntity_Hatch_Maintenance)aMetaTileEntity); - } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Dynamo){ - ((GT_MetaTileEntity_Hatch)aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mDynamoHatches.add((GT_MetaTileEntity_Hatch_Dynamo)aMetaTileEntity); - } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_DynamoMulti){ - ((GT_MetaTileEntity_Hatch)aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.eDynamoMulti.add((GT_MetaTileEntity_Hatch_DynamoMulti)aMetaTileEntity); + if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Input) { + ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); + return this.mInputHatches.add((GT_MetaTileEntity_Hatch_Input) aMetaTileEntity); + } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Maintenance) { + ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); + return this.mMaintenanceHatches.add((GT_MetaTileEntity_Hatch_Maintenance) aMetaTileEntity); + } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Dynamo) { + ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); + return this.mDynamoHatches.add((GT_MetaTileEntity_Hatch_Dynamo) aMetaTileEntity); + } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_DynamoMulti) { + ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); + return this.eDynamoMulti.add((GT_MetaTileEntity_Hatch_DynamoMulti) aMetaTileEntity); } } return false; @@ -261,7 +272,7 @@ public class LargeEssentiaGenerator extends GT_MetaTileEntity_TooltipMultiBlockB voltage += tHatch.maxEUOutput(); } if (voltage > Integer.MAX_VALUE) voltage = Integer.MAX_VALUE; - return (int)voltage; + return (int) voltage; } public int getAmpLimit() { @@ -273,24 +284,35 @@ public class LargeEssentiaGenerator extends GT_MetaTileEntity_TooltipMultiBlockB amp += tHatch.maxAmperesOut(); } if (amp > Integer.MAX_VALUE) amp = Integer.MAX_VALUE; - return (int)amp; + return (int) amp; } public long getPerAspectEnergy(Aspect aspect) { int type = LargeEssentiaEnergyData.getAspectTypeIndex(aspect); if (!isValidEssentia(aspect)) return 0; switch (type) { - case 0: return normalEssentia(aspect); - case 1: return airEssentia(aspect); - case 2: return thermalEssentia(aspect); - case 3: return unstableEssentia(aspect); - case 4: return victusEssentia(aspect); - case 5: return taintedEssentia(aspect); - case 6: return mechanicEssentia(aspect); - case 7: return spiritEssentia(aspect); - case 8: return radiationEssentia(aspect); - case 9: return electricEssentia(aspect); - default: return 0; + case 0: + return normalEssentia(aspect); + case 1: + return airEssentia(aspect); + case 2: + return thermalEssentia(aspect); + case 3: + return unstableEssentia(aspect); + case 4: + return victusEssentia(aspect); + case 5: + return taintedEssentia(aspect); + case 6: + return mechanicEssentia(aspect); + case 7: + return spiritEssentia(aspect); + case 8: + return radiationEssentia(aspect); + case 9: + return electricEssentia(aspect); + default: + return 0; } } @@ -304,8 +326,7 @@ public class LargeEssentiaGenerator extends GT_MetaTileEntity_TooltipMultiBlockB int ceoInput = (int) LargeEssentiaEnergyData.getAspectCeo(aspect) * 8; if (depleteInput(Materials.LiquidAir.getFluid(ceoInput))) { ceoOutput = 1.5D; - } - else if (depleteInput(Materials.Air.getGas(ceoInput))){ + } else if (depleteInput(Materials.Air.getGas(ceoInput))) { ceoOutput = 1.0D; } return (long) (baseValue * ceoOutput); @@ -317,20 +338,15 @@ public class LargeEssentiaGenerator extends GT_MetaTileEntity_TooltipMultiBlockB int ceoInput = (int) LargeEssentiaEnergyData.getAspectCeo(aspect) * 2; if (depleteInput(Materials.SuperCoolant.getFluid(ceoInput))) { ceoOutput = 9.0D; - } - else if (depleteInput(FluidRegistry.getFluidStack("cryotheum", ceoInput))) { + } else if (depleteInput(FluidRegistry.getFluidStack("cryotheum", ceoInput))) { ceoOutput = 5.0D; - } - else if (depleteInput(FluidRegistry.getFluidStack("ic2coolant", ceoInput))) { + } else if (depleteInput(FluidRegistry.getFluidStack("ic2coolant", ceoInput))) { ceoOutput = 1.5D; - } - else if (depleteInput(Materials.Ice.getSolid(ceoInput))) { + } else if (depleteInput(Materials.Ice.getSolid(ceoInput))) { ceoOutput = 1.2D; - } - else if (depleteInput(FluidRegistry.getFluidStack("ic2distilledwater", ceoInput))){ + } else if (depleteInput(FluidRegistry.getFluidStack("ic2distilledwater", ceoInput))) { ceoOutput = 1.0D; - } - else if (depleteInput(Materials.Water.getFluid(ceoInput))) { + } else if (depleteInput(Materials.Water.getFluid(ceoInput))) { ceoOutput = 0.5D; } @@ -341,22 +357,17 @@ public class LargeEssentiaGenerator extends GT_MetaTileEntity_TooltipMultiBlockB long baseValue = LargeEssentiaEnergyData.getAspectFuelValue(aspect); double ceoOutput = 0; int ceoInput = (int) LargeEssentiaEnergyData.getAspectCeo(aspect) * 4; - if (depleteInput(WerkstoffLoader.Xenon.getFluidOrGas(ceoInput))){ + if (depleteInput(WerkstoffLoader.Xenon.getFluidOrGas(ceoInput))) { ceoOutput = 4.0D; - } - else if (depleteInput(WerkstoffLoader.Krypton.getFluidOrGas(ceoInput))){ + } else if (depleteInput(WerkstoffLoader.Krypton.getFluidOrGas(ceoInput))) { ceoOutput = 3.0D; - } - else if (depleteInput(Materials.Argon.getFluid(ceoInput))){ + } else if (depleteInput(Materials.Argon.getFluid(ceoInput))) { ceoOutput = 2.5D; - } - else if (depleteInput(WerkstoffLoader.Neon.getFluidOrGas(ceoInput))){ + } else if (depleteInput(WerkstoffLoader.Neon.getFluidOrGas(ceoInput))) { ceoOutput = 2.2D; - } - else if (depleteInput(Materials.Helium.getFluid(ceoInput))){ + } else if (depleteInput(Materials.Helium.getFluid(ceoInput))) { ceoOutput = 2.0D; - } - else if (depleteInput(Materials.Nitrogen.getFluid(ceoInput))){ + } else if (depleteInput(Materials.Nitrogen.getFluid(ceoInput))) { ceoOutput = 1.0D; } return (long) (baseValue * ceoOutput); @@ -368,8 +379,7 @@ public class LargeEssentiaGenerator extends GT_MetaTileEntity_TooltipMultiBlockB int ceoInput = (int) LargeEssentiaEnergyData.getAspectCeo(aspect) * 18; if (depleteInput(FluidRegistry.getFluidStack("xpjuice", ceoInput))) { ceoOutput = 2.0D; - } - else if (depleteInput(FluidRegistry.getFluidStack("lifeessence", ceoInput))){ + } else if (depleteInput(FluidRegistry.getFluidStack("lifeessence", ceoInput))) { ceoOutput = 6.0D; } return (long) (baseValue * ceoOutput); @@ -383,8 +393,7 @@ public class LargeEssentiaGenerator extends GT_MetaTileEntity_TooltipMultiBlockB if (depleteInput(FluidRegistry.getFluidStack("fluidpure", ceoInput))) { ceoOutput = 60.0D; chance = 0; - } - else if (depleteInput(FluidRegistry.getFluidStack("fluiddeath", ceoInput))){ + } else if (depleteInput(FluidRegistry.getFluidStack("fluiddeath", ceoInput))) { ceoOutput = Math.pow(25000D / baseValue, 4); chance = 4000; } @@ -393,8 +402,7 @@ public class LargeEssentiaGenerator extends GT_MetaTileEntity_TooltipMultiBlockB World world = getBaseMetaTileEntity().getWorld(); int tX = R.nextInt(4); int tZ = R.nextInt(4); - if (world.isAirBlock(tX, 0, tZ)) - world.setBlock(tX, 0, tZ, ConfigBlocks.blockFluxGas, R.nextInt(8), 3); + if (world.isAirBlock(tX, 0, tZ)) world.setBlock(tX, 0, tZ, ConfigBlocks.blockFluxGas, R.nextInt(8), 3); } return (long) (baseValue * ceoOutput); @@ -416,8 +424,7 @@ public class LargeEssentiaGenerator extends GT_MetaTileEntity_TooltipMultiBlockB int ceoInput = (int) LargeEssentiaEnergyData.getAspectCeo(aspect) * 2; if (depleteInput(FluidRegistry.getFluidStack("witchery:fluidspirit", ceoInput))) { ceoOutput = 10D * (1 + mStableValue / 100D); - } - else if (depleteInput(FluidRegistry.getFluidStack("witchery:hollowtears", ceoInput))) { + } else if (depleteInput(FluidRegistry.getFluidStack("witchery:hollowtears", ceoInput))) { ceoOutput = 15D * (1 + 100D / mStableValue); } return (long) (baseValue * ceoOutput); @@ -429,14 +436,11 @@ public class LargeEssentiaGenerator extends GT_MetaTileEntity_TooltipMultiBlockB int ceoInput = (int) LargeEssentiaEnergyData.getAspectCeo(aspect) * 6; if (depleteInput(Materials.Caesium.getMolten(ceoInput))) { ceoOutput = 2.0D; - } - else if (depleteInput(Materials.Uranium235.getMolten(ceoInput))) { + } else if (depleteInput(Materials.Uranium235.getMolten(ceoInput))) { ceoOutput = 3.0D; - } - else if (depleteInput(Materials.Naquadah.getMolten(ceoInput))) { + } else if (depleteInput(Materials.Naquadah.getMolten(ceoInput))) { ceoOutput = 4.0D; - } - else if (depleteInput(MyMaterial.atomicSeparationCatalyst.getMolten(ceoInput))) { + } else if (depleteInput(MyMaterial.atomicSeparationCatalyst.getMolten(ceoInput))) { ceoOutput = 16.0D; } return (long) (baseValue * ceoOutput); @@ -452,23 +456,22 @@ public class LargeEssentiaGenerator extends GT_MetaTileEntity_TooltipMultiBlockB long EUt = mLeftEnergy; long EUVoltage = voltageLimit, EUAmp = 1; - for (EssentiaHatch hatch: this.mEssentiaHatch){ + for (EssentiaHatch hatch : this.mEssentiaHatch) { AspectList aspects = hatch.getAspects(); - for (Aspect aspect: aspects.aspects.keySet()) { + for (Aspect aspect : aspects.aspects.keySet()) { if (!isValidEssentia(aspect) || getPerAspectEnergy(aspect) == 0) continue; while (EUt <= (voltageLimit * ampLimit) && aspects.getAmount(aspect) > 0) { EUt += getPerAspectEnergy(aspect) * mStableValue / 25; aspects.reduce(aspect, 1); - if (aspects.getAmount(aspect) == 0) - aspects.remove(aspect); + if (aspects.getAmount(aspect) == 0) aspects.remove(aspect); } } if (EUt == 0 && aspects.size() != 0) { - if (!isValidEssentia(aspects.getAspects()[0]) || getPerAspectEnergy(aspects.getAspects()[0]) == 0) continue; + if (!isValidEssentia(aspects.getAspects()[0]) || getPerAspectEnergy(aspects.getAspects()[0]) == 0) + continue; EUt += getPerAspectEnergy(aspects.getAspects()[0]) * mStableValue / 25; aspects.reduce(aspects.getAspects()[0], 1); - if (aspects.getAmount(aspects.getAspects()[0]) == 0) - aspects.remove(aspects.getAspects()[0]); + if (aspects.getAmount(aspects.getAspects()[0]) == 0) aspects.remove(aspects.getAspects()[0]); } } @@ -476,16 +479,15 @@ public class LargeEssentiaGenerator extends GT_MetaTileEntity_TooltipMultiBlockB EUVoltage = EUt; EUAmp = 1; mLeftEnergy = 0; - } - else { + } else { while (EUVoltage * (EUAmp + 1) <= EUt && EUAmp + 1 <= ampLimit) { - EUAmp ++; + EUAmp++; } mLeftEnergy = EUt - (EUVoltage * EUAmp); } - this.mEUt = (int)EUVoltage; - this.eAmpereFlow = (int)EUAmp; + this.mEUt = (int) EUVoltage; + this.eAmpereFlow = (int) EUAmp; } @Override @@ -525,12 +527,29 @@ public class LargeEssentiaGenerator extends GT_MetaTileEntity_TooltipMultiBlockB @Override @SuppressWarnings("ALL") - public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone) { - if(aSide == aFacing) { - if(aActive) return new ITexture[]{Textures.BlockIcons.getCasingTextureForId(1536), new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_DRAGONEGG), TextureFactory.builder().addIcon(Textures.BlockIcons.MACHINE_CASING_DRAGONEGG_GLOW).glow().build()}; - return new ITexture[]{Textures.BlockIcons.getCasingTextureForId(1536), new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_DRAGONEGG)}; - } - return new ITexture[]{Textures.BlockIcons.getCasingTextureForId(1536)}; + public ITexture[] getTexture( + IGregTechTileEntity aBaseMetaTileEntity, + byte aSide, + byte aFacing, + byte aColorIndex, + boolean aActive, + boolean aRedstone) { + if (aSide == aFacing) { + if (aActive) + return new ITexture[] { + Textures.BlockIcons.getCasingTextureForId(1536), + new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_DRAGONEGG), + TextureFactory.builder() + .addIcon(Textures.BlockIcons.MACHINE_CASING_DRAGONEGG_GLOW) + .glow() + .build() + }; + return new ITexture[] { + Textures.BlockIcons.getCasingTextureForId(1536), + new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_DRAGONEGG) + }; + } + return new ITexture[] {Textures.BlockIcons.getCasingTextureForId(1536)}; } public boolean isValidEssentia(Aspect aspect) { diff --git a/src/main/java/goodgenerator/blocks/tileEntity/LargeEssentiaSmeltery.java b/src/main/java/goodgenerator/blocks/tileEntity/LargeEssentiaSmeltery.java index 7f8314787e..ddf48a63ed 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/LargeEssentiaSmeltery.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/LargeEssentiaSmeltery.java @@ -1,5 +1,9 @@ package goodgenerator.blocks.tileEntity; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.*; +import static goodgenerator.util.DescTextLocalization.BLUE_PRINT_INFO; +import static gregtech.api.util.GT_StructureUtility.ofHatchAdder; + import com.github.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; @@ -18,6 +22,8 @@ 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.block.BlockAir; import net.minecraft.item.ItemStack; @@ -33,19 +39,16 @@ import thaumcraft.api.visnet.VisNetHandler; import thaumcraft.common.config.ConfigBlocks; import thaumcraft.common.lib.crafting.ThaumcraftCraftingManager; -import java.util.ArrayList; -import java.util.Map; - -import static com.gtnewhorizon.structurelib.structure.StructureUtility.*; -import static goodgenerator.util.DescTextLocalization.BLUE_PRINT_INFO; -import static gregtech.api.util.GT_StructureUtility.ofHatchAdder; - public class LargeEssentiaSmeltery extends GT_MetaTileEntity_TooltipMultiBlockBase_EM implements IConstructable { - 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"; @@ -81,7 +84,7 @@ public class LargeEssentiaSmeltery extends GT_MetaTileEntity_TooltipMultiBlockBa @Override public void construct(ItemStack itemStack, boolean hintsOnly) { structureBuild_EM(STRUCTURE_PIECE_FIRST, 2, 2, 0, itemStack, hintsOnly); - //default + // default structureBuild_EM(STRUCTURE_PIECE_LATER, 2, 2, -1, itemStack, hintsOnly); structureBuild_EM(STRUCTURE_PIECE_LATER, 2, 2, -2, itemStack, hintsOnly); int len = itemStack.stackSize; @@ -110,10 +113,10 @@ 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 && - this.mInputBusses.size() >= 1 && - this.mEssentiaOutputHatches.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); return true; } @@ -123,31 +126,40 @@ public class LargeEssentiaSmeltery extends GT_MetaTileEntity_TooltipMultiBlockBa @Override public IStructureDefinition<? extends GT_MetaTileEntity_MultiblockBase_EM> getStructure_EM() { if (this.multiDefinition == null) { - this.multiDefinition = StructureDefinition - .<LargeEssentiaSmeltery>builder() - .addShape("first", transpose(new String[][]{{" A "}, {" AAA "}, {"AA~AA"}, {" AAA "}, {" A "}})) - .addShape("later", transpose(new String[][]{{" ABA "}, {"AECEA"}, {"D---D"}, {"AEFEA"}, {" AAA "}})) - .addShape("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) : ofBlock(ConfigBlocks.blockStoneDevice, 0)) - .addElement('E', ofChain( - onElementPass(x -> x.onEssentiaCellFound(0), - ofBlock(Loaders.essentiaCell, 0)), - onElementPass(x -> x.onEssentiaCellFound(1), - ofBlock(Loaders.essentiaCell, 1)), - onElementPass(x -> x.onEssentiaCellFound(2), - ofBlock(Loaders.essentiaCell, 2)), - onElementPass(x -> x.onEssentiaCellFound(3), - ofBlock(Loaders.essentiaCell, 3)))) - .addElement('A', ofChain( - ofHatchAdder(LargeEssentiaSmeltery::addMaintenanceToMachineList, CASING_INDEX, 1), - ofHatchAdder(LargeEssentiaSmeltery::addInputToMachineList, CASING_INDEX, 1), - ofHatchAdder(LargeEssentiaSmeltery::addEnergyHatchToMachineList, CASING_INDEX, 1), - ofTileAdder(LargeEssentiaSmeltery::addEssentiaOutputHatchToMachineList, Loaders.magicCasing, 0), - onElementPass(LargeEssentiaSmeltery::onCasingFound, ofBlock(Loaders.magicCasing, 0)))) - .addElement('B', ofHatchAdder(LargeEssentiaSmeltery::addMufflerToMachineList, CASING_INDEX, 2)) - .build(); + this.multiDefinition = StructureDefinition.<LargeEssentiaSmeltery>builder() + .addShape( + "first", transpose(new String[][] {{" A "}, {" AAA "}, {"AA~AA"}, {" AAA "}, {" A "}})) + .addShape( + "later", transpose(new String[][] {{" ABA "}, {"AECEA"}, {"D---D"}, {"AEFEA"}, {" AAA "}})) + .addShape("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) + : ofBlock(ConfigBlocks.blockStoneDevice, 0)) + .addElement( + 'E', + ofChain( + onElementPass(x -> x.onEssentiaCellFound(0), ofBlock(Loaders.essentiaCell, 0)), + onElementPass(x -> x.onEssentiaCellFound(1), ofBlock(Loaders.essentiaCell, 1)), + onElementPass(x -> x.onEssentiaCellFound(2), ofBlock(Loaders.essentiaCell, 2)), + onElementPass(x -> x.onEssentiaCellFound(3), ofBlock(Loaders.essentiaCell, 3)))) + .addElement( + 'A', + ofChain( + ofHatchAdder(LargeEssentiaSmeltery::addMaintenanceToMachineList, CASING_INDEX, 1), + ofHatchAdder(LargeEssentiaSmeltery::addInputToMachineList, CASING_INDEX, 1), + ofHatchAdder(LargeEssentiaSmeltery::addEnergyHatchToMachineList, CASING_INDEX, 1), + ofTileAdder( + LargeEssentiaSmeltery::addEssentiaOutputHatchToMachineList, + Loaders.magicCasing, + 0), + onElementPass( + LargeEssentiaSmeltery::onCasingFound, ofBlock(Loaders.magicCasing, 0)))) + .addElement('B', ofHatchAdder(LargeEssentiaSmeltery::addMufflerToMachineList, CASING_INDEX, 2)) + .build(); } return this.multiDefinition; } @@ -156,25 +168,25 @@ public class LargeEssentiaSmeltery extends GT_MetaTileEntity_TooltipMultiBlockBa 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.") - .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") - .addOtherStructurePart("Essentia Output Hatch", "Hint block with dot 1") - .addMufflerHatch("Hint block with dot 2") - .toolTipFinisher("Good Generator"); + .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") + .addOtherStructurePart("Essentia Output Hatch", "Hint block with dot 1") + .addMufflerHatch("Hint block with dot 2") + .toolTipFinisher("Good Generator"); return tt; } @@ -186,25 +198,36 @@ 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 + "%" + EnumChatFormatting.RESET; + 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), - TextureFactory.of(textureFontOn), - 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() - }; + 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.of(textureFontOff), + 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() { @@ -254,7 +277,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; @@ -290,7 +313,11 @@ public class LargeEssentiaSmeltery extends GT_MetaTileEntity_TooltipMultiBlockBa this.drainNodePower(WORLD, x, y, z); this.nodePower -= expectedPower(); - calculatePerfectOverclockedNessMulti(RECIPE_EUT, (int) Math.ceil(this.mOutputAspects.visSize() * RECIPE_DURATION * (1 - this.nodeIncrease * 0.005)), 1, Math.min(Integer.MAX_VALUE, getMaxInputEnergy_EM())); + calculatePerfectOverclockedNessMulti( + RECIPE_EUT, + (int) Math.ceil(this.mOutputAspects.visSize() * RECIPE_DURATION * (1 - this.nodeIncrease * 0.005)), + 1, + Math.min(Integer.MAX_VALUE, getMaxInputEnergy_EM())); this.updateSlots(); if (this.mEUt > 0) this.mEUt = -this.mEUt; @@ -400,7 +427,10 @@ public class LargeEssentiaSmeltery extends GT_MetaTileEntity_TooltipMultiBlockBa this.nodePurificationEfficiency = Math.max(0, this.nodePurificationEfficiency - 1); if (this.nodePurificationEfficiency < 100) { - this.nodePurificationEfficiency = (int) Math.min(100, this.nodePurificationEfficiency + Math.ceil(VisNetHandler.drainVis(WORLD, x, y, z, Aspect.ORDER, 200) * 0.05)); + this.nodePurificationEfficiency = (int) Math.min( + 100, + this.nodePurificationEfficiency + + Math.ceil(VisNetHandler.drainVis(WORLD, x, y, z, Aspect.ORDER, 200) * 0.05)); } this.nodeIncrease = Math.min(100, VisNetHandler.drainVis(WORLD, x, y, z, Aspect.ENTROPY, 125)); @@ -413,12 +443,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.next(this.mMufflerHatches.size())); + GT_MetaTileEntity_Hatch_Muffler mufflerHatch = + this.mMufflerHatches.get(xstr.next(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; @@ -475,5 +507,4 @@ public class LargeEssentiaSmeltery extends GT_MetaTileEntity_TooltipMultiBlockBa protected void maintenance_EM() { super.maintenance_EM(); } - } diff --git a/src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer1.java b/src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer1.java index 47ba591353..2aefa6a5d4 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer1.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer1.java @@ -1,5 +1,9 @@ package goodgenerator.blocks.tileEntity; +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 com.github.bartimaeusnek.bartworks.common.loaders.ItemRegistry; import goodgenerator.blocks.tileEntity.base.LargeFusionComputer; import goodgenerator.loader.Loaders; @@ -15,18 +19,18 @@ import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; -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; - 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); + super(id, name, nameRegional); } public LargeFusionComputer1(String name) { @@ -37,27 +41,28 @@ public class LargeFusionComputer1 extends LargeFusionComputer { 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.") - .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) - .addCasingInfo("Naquadah Alloy Frame Boxes", 128) - .addCasingInfo("Chrome 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") - .toolTipFinisher("Good Generator"); + .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) + .addCasingInfo("Naquadah Alloy Frame Boxes", 128) + .addCasingInfo("Chrome 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") + .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 15365b8556..4893789367 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer2.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer2.java @@ -1,5 +1,9 @@ package goodgenerator.blocks.tileEntity; +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 com.github.bartimaeusnek.bartworks.common.loaders.ItemRegistry; import goodgenerator.blocks.tileEntity.base.LargeFusionComputer; import goodgenerator.loader.Loaders; @@ -15,18 +19,18 @@ import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; -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; - 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); + super(id, name, nameRegional); } public LargeFusionComputer2(String name) { @@ -46,7 +50,8 @@ public class LargeFusionComputer2 extends LargeFusionComputer { .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("Support" + EnumChatFormatting.BLUE + " Tec" + EnumChatFormatting.DARK_BLUE + "Tech" + + EnumChatFormatting.GRAY + " Energy/Laser Hatches!") .addInfo("The structure is too complex!") .addInfo(BLUE_PRINT_INFO) .addSeparator() diff --git a/src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer3.java b/src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer3.java index e9b1170bdf..4833e4abca 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer3.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer3.java @@ -1,5 +1,9 @@ package goodgenerator.blocks.tileEntity; +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 com.github.bartimaeusnek.bartworks.common.loaders.ItemRegistry; import goodgenerator.blocks.tileEntity.base.LargeFusionComputer; import goodgenerator.loader.Loaders; @@ -15,18 +19,18 @@ import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; -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; - 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); + super(id, name, nameRegional); } public LargeFusionComputer3(String name) { @@ -47,7 +51,8 @@ public class LargeFusionComputer3 extends LargeFusionComputer { .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("Support" + EnumChatFormatting.BLUE + " Tec" + EnumChatFormatting.DARK_BLUE + "Tech" + + EnumChatFormatting.GRAY + " Energy/Laser Hatches!") .addInfo("The structure is too complex!") .addInfo(BLUE_PRINT_INFO) .addSeparator() diff --git a/src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer4.java b/src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer4.java index b3a958f966..ad6ab36a93 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer4.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer4.java @@ -1,5 +1,8 @@ package goodgenerator.blocks.tileEntity; +import static goodgenerator.util.DescTextLocalization.BLUE_PRINT_INFO; +import static gregtech.api.enums.Textures.BlockIcons.MACHINE_CASING_FUSION_GLASS; + 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; @@ -18,27 +21,22 @@ 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; -import org.lwjgl.input.Keyboard; - -import java.lang.reflect.Field; - -import static goodgenerator.util.DescTextLocalization.BLUE_PRINT_INFO; -import static gregtech.api.enums.Textures.BlockIcons.MACHINE_CASING_FUSION_GLASS; public class LargeFusionComputer4 extends LargeFusionComputerPP { public LargeFusionComputer4(int id, String name, String nameRegional) { - super(id,name,nameRegional); + super(id, name, nameRegional); } public LargeFusionComputer4(String name) { super(name); } - //Some hacky shit + // Some hacky shit public static Block mMK4Casing = null; public static int mMK4CasingMeta; @@ -58,7 +56,8 @@ public class LargeFusionComputer4 extends LargeFusionComputerPP { .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("Support" + EnumChatFormatting.BLUE + " Tec" + EnumChatFormatting.DARK_BLUE + "Tech" + + EnumChatFormatting.GRAY + " Energy/Laser Hatches!") .addInfo("The structure is too complex!") .addInfo(BLUE_PRINT_INFO) .addSeparator() @@ -81,15 +80,13 @@ public class LargeFusionComputer4 extends LargeFusionComputerPP { @Override public Block getCasingBlock() { - if (mMK4Casing == null) - doCasingInit(); + if (mMK4Casing == null) doCasingInit(); return mMK4Casing; } @Override public int getCasingMeta() { - if (mMK4Casing == null) - doCasingInit(); + if (mMK4Casing == null) doCasingInit(); return mMK4CasingMeta; } @@ -137,9 +134,15 @@ 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()); + 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()); + return TextureFactory.of(TextureFactory.builder() + .addIcon(TexturesGtBlock.Casing_Machine_Screen_1) + .extFacing() + .build()); } @Override @@ -159,12 +162,9 @@ public class LargeFusionComputer4 extends LargeFusionComputerPP { @Override public int extraPara(int startEnergy) { - if (startEnergy < 160000000) - return 4; - if (startEnergy < 320000000) - return 3; - if (startEnergy < 640000000) - return 2; + if (startEnergy < 160000000) return 4; + if (startEnergy < 320000000) return 3; + if (startEnergy < 640000000) return 2; return 1; } @@ -199,10 +199,28 @@ public class LargeFusionComputer4 extends LargeFusionComputerPP { } @Override - 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()}; + 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() + }; } @Override diff --git a/src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer5.java b/src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer5.java index 170359063f..3f7ab9cdc3 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer5.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer5.java @@ -1,5 +1,8 @@ package goodgenerator.blocks.tileEntity; +import static goodgenerator.util.DescTextLocalization.BLUE_PRINT_INFO; +import static gregtech.api.enums.Textures.BlockIcons.MACHINE_CASING_FUSION_GLASS; + 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; @@ -21,15 +24,11 @@ import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; -import org.lwjgl.input.Keyboard; - -import static goodgenerator.util.DescTextLocalization.BLUE_PRINT_INFO; -import static gregtech.api.enums.Textures.BlockIcons.MACHINE_CASING_FUSION_GLASS; public class LargeFusionComputer5 extends LargeFusionComputerPP { public LargeFusionComputer5(int id, String name, String nameRegional) { - super(id,name,nameRegional); + super(id, name, nameRegional); } public LargeFusionComputer5(String name) { @@ -53,7 +52,8 @@ public class LargeFusionComputer5 extends LargeFusionComputerPP { .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("Support" + EnumChatFormatting.BLUE + " Tec" + EnumChatFormatting.DARK_BLUE + "Tech" + + EnumChatFormatting.GRAY + " Energy/Laser Hatches!") .addInfo("The structure is too complex!") .addInfo(BLUE_PRINT_INFO) .addSeparator() @@ -117,9 +117,15 @@ 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()); + 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()); + return TextureFactory.of(TextureFactory.builder() + .addIcon(TexturesGtBlock.Casing_Machine_Screen_1) + .extFacing() + .build()); } @Override @@ -134,19 +140,19 @@ public class LargeFusionComputer5 extends LargeFusionComputerPP { @Override public int overclock(int mStartEnergy) { - return (mStartEnergy < 160000000) ? 256 : ((mStartEnergy < 320000000) ? 64 : ((mStartEnergy < 640000000) ? 16 : ((mStartEnergy < 1200000000) ? 4 : 1))); + return (mStartEnergy < 160000000) + ? 256 + : ((mStartEnergy < 320000000) + ? 64 + : ((mStartEnergy < 640000000) ? 16 : ((mStartEnergy < 1200000000) ? 4 : 1))); } @Override public int extraPara(int startEnergy) { - if (startEnergy < 160000000) - return 5; - if (startEnergy < 320000000) - return 4; - if (startEnergy < 640000000) - return 3; - if (startEnergy < 1200000000) - return 2; + if (startEnergy < 160000000) return 5; + if (startEnergy < 320000000) return 4; + if (startEnergy < 640000000) return 3; + if (startEnergy < 1200000000) return 2; return 1; } @@ -181,10 +187,28 @@ public class LargeFusionComputer5 extends LargeFusionComputerPP { } @Override - 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()}; + 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() + }; } @Override diff --git a/src/main/java/goodgenerator/blocks/tileEntity/MegaPlasmaTurbine.java b/src/main/java/goodgenerator/blocks/tileEntity/MegaPlasmaTurbine.java index 4ac1d7af6a..86f3e2ac31 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/MegaPlasmaTurbine.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/MegaPlasmaTurbine.java @@ -1,6 +1,5 @@ package goodgenerator.blocks.tileEntity; - 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; @@ -8,25 +7,25 @@ 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 net.minecraft.item.ItemStack; - import java.util.ArrayList; import java.util.List; +import net.minecraft.item.ItemStack; -public class MegaPlasmaTurbine extends GT_MetaTileEntity_LargeTurbine_Plasma implements TecTechEnabledMulti, IConstructable { +public class MegaPlasmaTurbine extends GT_MetaTileEntity_LargeTurbine_Plasma + implements TecTechEnabledMulti, IConstructable { private IStructureDefinition<MegaPlasmaTurbine> multiDefinition = null; - public MegaPlasmaTurbine(String name){super(name);} + public MegaPlasmaTurbine(String name) { + super(name); + } - public MegaPlasmaTurbine(int id, String name, String nameRegional){ - super(id,name,nameRegional); + public MegaPlasmaTurbine(int id, String name, String nameRegional) { + super(id, name, nameRegional); } @Override - public void construct(ItemStack itemStack, boolean b) { - - } + public void construct(ItemStack itemStack, boolean b) {} @Override public String[] getStructureDescription(ItemStack itemStack) { diff --git a/src/main/java/goodgenerator/blocks/tileEntity/MultiNqGenerator.java b/src/main/java/goodgenerator/blocks/tileEntity/MultiNqGenerator.java index 7841770aa6..b1d4518e27 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/MultiNqGenerator.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/MultiNqGenerator.java @@ -1,5 +1,10 @@ package goodgenerator.blocks.tileEntity; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.*; +import static goodgenerator.main.GG_Config_Loader.*; +import static goodgenerator.util.DescTextLocalization.BLUE_PRINT_INFO; +import static gregtech.api.util.GT_StructureUtility.ofHatchAdder; + 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; @@ -26,23 +31,17 @@ 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.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumChatFormatting; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; -import org.lwjgl.input.Keyboard; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - -import static com.gtnewhorizon.structurelib.structure.StructureUtility.*; -import static goodgenerator.main.GG_Config_Loader.*; -import static goodgenerator.util.DescTextLocalization.BLUE_PRINT_INFO; -import static gregtech.api.util.GT_StructureUtility.ofHatchAdder; - -public class MultiNqGenerator extends GT_MetaTileEntity_TooltipMultiBlockBase_EM implements TecTechEnabledMulti, IConstructable { +public class MultiNqGenerator extends GT_MetaTileEntity_TooltipMultiBlockBase_EM + implements TecTechEnabledMulti, IConstructable { protected IStructureDefinition<MultiNqGenerator> multiDefinition = null; protected long leftEnergy = 0; @@ -61,18 +60,16 @@ public class MultiNqGenerator extends GT_MetaTileEntity_TooltipMultiBlockBase_EM new Pair<>(MyMaterial.atomicSeparationCatalyst.getMolten(20), ExcitedLiquidCoe[0]), new Pair<>(Materials.Naquadah.getMolten(20L), ExcitedLiquidCoe[1]), new Pair<>(Materials.Uranium235.getMolten(180L), ExcitedLiquidCoe[2]), - new Pair<>(Materials.Caesium.getMolten(180L), ExcitedLiquidCoe[3]) - ); + new Pair<>(Materials.Caesium.getMolten(180L), ExcitedLiquidCoe[3])); coolant = Arrays.asList( new Pair<>(FluidRegistry.getFluidStack("cryotheum", 1000), CoolantEfficiency[0]), new Pair<>(Materials.SuperCoolant.getFluid(1000L), CoolantEfficiency[1]), - new Pair<>(FluidRegistry.getFluidStack("ic2coolant",1000), CoolantEfficiency[2]) - ); + new Pair<>(FluidRegistry.getFluidStack("ic2coolant", 1000), CoolantEfficiency[2])); } @Override public void construct(ItemStack itemStack, boolean hintsOnly) { - structureBuild_EM(mName, 3,7,0, itemStack, hintsOnly); + structureBuild_EM(mName, 3, 7, 0, itemStack, hintsOnly); } @Override @@ -80,7 +77,7 @@ public class MultiNqGenerator extends GT_MetaTileEntity_TooltipMultiBlockBase_EM return DescTextLocalization.addText("MultiNqGenerator.hint", 8); } - public final boolean addToGeneratorList(IGregTechTileEntity aTileEntity, int aBaseCasingIndex){ + public final boolean addToGeneratorList(IGregTechTileEntity aTileEntity, int aBaseCasingIndex) { if (aTileEntity == null) { return false; } else { @@ -89,18 +86,18 @@ public class MultiNqGenerator extends GT_MetaTileEntity_TooltipMultiBlockBase_EM return false; } else { if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch) { - ((GT_MetaTileEntity_Hatch)aMetaTileEntity).updateTexture(aBaseCasingIndex); + ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); } if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Input) { - return this.mInputHatches.add((GT_MetaTileEntity_Hatch_Input)aMetaTileEntity); + return this.mInputHatches.add((GT_MetaTileEntity_Hatch_Input) aMetaTileEntity); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Output) { - return this.mOutputHatches.add((GT_MetaTileEntity_Hatch_Output)aMetaTileEntity); + return this.mOutputHatches.add((GT_MetaTileEntity_Hatch_Output) aMetaTileEntity); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Dynamo) { - return this.mDynamoHatches.add((GT_MetaTileEntity_Hatch_Dynamo)aMetaTileEntity); + return this.mDynamoHatches.add((GT_MetaTileEntity_Hatch_Dynamo) aMetaTileEntity); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Maintenance) { - return this.mMaintenanceHatches.add((GT_MetaTileEntity_Hatch_Maintenance)aMetaTileEntity); + return this.mMaintenanceHatches.add((GT_MetaTileEntity_Hatch_Maintenance) aMetaTileEntity); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_DynamoMulti) { - return this.eDynamoMulti.add((GT_MetaTileEntity_Hatch_DynamoMulti)aMetaTileEntity); + return this.eDynamoMulti.add((GT_MetaTileEntity_Hatch_DynamoMulti) aMetaTileEntity); } else { return false; } @@ -110,52 +107,28 @@ 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"}, - }) - ).addElement( + 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"}, + })) + .addElement( 'X', ofChain( ofHatchAdder( - MultiNqGenerator::addToGeneratorList, 44, - GregTech_API.sBlockCasings3, 12 - ), - 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 - ) - ) + MultiNqGenerator::addToGeneratorList, 44, GregTech_API.sBlockCasings3, 12), + 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(); } return multiDefinition; @@ -166,7 +139,7 @@ public class MultiNqGenerator extends GT_MetaTileEntity_TooltipMultiBlockBase_EM } public MultiNqGenerator(int id, String name, String nameRegional) { - super(id,name,nameRegional); + super(id, name, nameRegional); } @Override @@ -175,22 +148,23 @@ public class MultiNqGenerator extends GT_MetaTileEntity_TooltipMultiBlockBase_EM } @Override - public void loadNBTData(NBTTagCompound aNBT){ + public void loadNBTData(NBTTagCompound aNBT) { 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")); + this.lockedFluid = new FluidStack( + FluidRegistry.getFluid(aNBT.getString("mLockedFluidName")), aNBT.getInteger("mLockedFluidAmount")); else this.lockedFluid = null; super.loadNBTData(aNBT); } @Override - public void saveNBTData(NBTTagCompound aNBT){ + public void saveNBTData(NBTTagCompound aNBT) { aNBT.setInteger("mTimes", this.times); aNBT.setLong("mLeftEnergy", this.leftEnergy); aNBT.setInteger("mbasicOutput", this.basicOutput); - if (lockedFluid != null){ + if (lockedFluid != null) { aNBT.setString("mLockedFluidName", this.lockedFluid.getFluid().getName()); aNBT.setInteger("mLockedFluidAmount", this.lockedFluid.amount); } @@ -215,12 +189,15 @@ 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)}; + if (consumeFuel( + CrackRecipeAdder.copyFluidWithAmount(tRecipe.mFluidInputs[0], pall), + tFluids.toArray(new FluidStack[0]))) { + mOutputFluids = new FluidStack[] {CrackRecipeAdder.copyFluidWithAmount(tRecipe.mFluidOutputs[0], pall)}; basicOutput = tRecipe.mSpecialValue; times = pall; lockedFluid = excitedInfo == null ? null : excitedInfo.getKey(); @@ -238,13 +215,15 @@ public class MultiNqGenerator extends GT_MetaTileEntity_TooltipMultiBlockBase_EM if (mMaxProgresstime != 0 && mProgresstime % 20 == 0) { FluidStack[] input = getStoredFluids().toArray(new FluidStack[0]); int eff = 100, time = 1; - if (LiquidAirConsumptionPerSecond != 0 && !consumeFuel(Materials.LiquidAir.getFluid(LiquidAirConsumptionPerSecond), input)) { + if (LiquidAirConsumptionPerSecond != 0 + && !consumeFuel(Materials.LiquidAir.getFluid(LiquidAirConsumptionPerSecond), input)) { this.mEUt = 0; this.trueEff = 0; 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; @@ -258,15 +237,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 + " EU/t"; - info[6] = "Problems: " + EnumChatFormatting.RED + (this.getIdealStatus() - this.getRepairStatus()) + EnumChatFormatting.RESET + " Efficiency: " + EnumChatFormatting.YELLOW + trueEff + 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 + " %"; return info; } public boolean consumeFuel(FluidStack target, FluidStack[] input) { if (target == null) return false; for (FluidStack inFluid : input) { - if (inFluid != null && inFluid.isFluidEqual(target) && inFluid.amount >= target.amount){ + if (inFluid != null && inFluid.isFluidEqual(target) && inFluid.amount >= target.amount) { inFluid.amount -= target.amount; return true; } @@ -300,36 +282,34 @@ public class MultiNqGenerator extends GT_MetaTileEntity_TooltipMultiBlockBase_EM return null; } - public void addAutoEnergy(long outputPower){ + 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); - } + 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){ + 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){ + if (outputPower >= voltage) { leftEnergy += outputPower; outputAmperes = leftEnergy / voltage; leftEnergy -= outputAmperes * voltage; addEnergyOutput_EM(voltage, outputAmperes); - } - else{ + } else { addEnergyOutput_EM(outputPower, 1); } } @@ -337,7 +317,9 @@ public class MultiNqGenerator extends GT_MetaTileEntity_TooltipMultiBlockBase_EM @Override public boolean checkMachine_EM(IGregTechTileEntity aBaseMetaTileEntity, ItemStack aStack) { - return structureCheck_EM(mName, 3, 7, 0) && mMaintenanceHatches.size() == 1 && mDynamoHatches.size() + eDynamoMulti.size() == 1; + return structureCheck_EM(mName, 3, 7, 0) + && mMaintenanceHatches.size() == 1 + && mDynamoHatches.size() + eDynamoMulti.size() == 1; } @Override @@ -372,11 +354,17 @@ public class MultiNqGenerator extends GT_MetaTileEntity_TooltipMultiBlockBase_EM .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(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])) @@ -397,12 +385,29 @@ public class MultiNqGenerator extends GT_MetaTileEntity_TooltipMultiBlockBase_EM @Override @SuppressWarnings("ALL") - public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone) { - if(aSide == aFacing){ - if(aActive) return new ITexture[]{Textures.BlockIcons.getCasingTextureForId(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)}; + 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), + 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) + }; } - return new ITexture[]{Textures.BlockIcons.getCasingTextureForId(44)}; + return new ITexture[] {Textures.BlockIcons.getCasingTextureForId(44)}; } @Override @@ -419,5 +424,4 @@ public class MultiNqGenerator extends GT_MetaTileEntity_TooltipMultiBlockBase_EM public List<GT_MetaTileEntity_Hatch_EnergyMulti> getTecTechEnergyMultis() { return new ArrayList<>(); } - } diff --git a/src/main/java/goodgenerator/blocks/tileEntity/NeutronActivator.java b/src/main/java/goodgenerator/blocks/tileEntity/NeutronActivator.java index 0dc91948c2..c39dde1f16 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/NeutronActivator.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/NeutronActivator.java @@ -1,5 +1,10 @@ package goodgenerator.blocks.tileEntity; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.*; +import static goodgenerator.util.DescTextLocalization.BLUE_PRINT_INFO; +import static goodgenerator.util.StructureHelper.addFrame; +import static gregtech.api.util.GT_StructureUtility.ofHatchAdder; + import com.gtnewhorizon.structurelib.alignment.constructable.IConstructable; import com.gtnewhorizon.structurelib.structure.IStructureDefinition; import com.gtnewhorizon.structurelib.structure.StructureDefinition; @@ -27,6 +32,8 @@ 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.Collection; import net.minecraft.block.Block; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.item.ItemStack; @@ -35,14 +42,6 @@ import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.StatCollector; import net.minecraftforge.fluids.FluidStack; -import java.util.ArrayList; -import java.util.Collection; - -import static com.gtnewhorizon.structurelib.structure.StructureUtility.*; -import static goodgenerator.util.DescTextLocalization.BLUE_PRINT_INFO; -import static goodgenerator.util.StructureHelper.addFrame; -import static gregtech.api.util.GT_StructureUtility.ofHatchAdder; - public class NeutronActivator extends GT_MetaTileEntity_TooltipMultiBlockBase_EM implements IConstructable { protected IStructureDefinition<NeutronActivator> multiDefinition = null; @@ -54,9 +53,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"; @@ -114,13 +116,13 @@ public class NeutronActivator extends GT_MetaTileEntity_TooltipMultiBlockBase_EM if (recipe.isRecipeInputEqual(true, inFluids, inItems)) { mFloor = minNKE; mCeil = maxNKE; - mMaxProgresstime = Math.max((int)(recipe.mDuration * Math.pow(0.9, height - 4)), 1); + mMaxProgresstime = Math.max((int) (recipe.mDuration * Math.pow(0.9, height - 4)), 1); if (eV <= maxNKE && eV >= minNKE) { this.mOutputFluids = recipe.mFluidOutputs; 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; } @@ -178,7 +180,8 @@ 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) @@ -199,85 +202,26 @@ public class NeutronActivator extends GT_MetaTileEntity_TooltipMultiBlockBase_EM @Override 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"} - }) - ) + 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"}})) .addElement( 'C', ofChain( - ofHatchAdder( - NeutronActivator::addClassicInputToMachineList, 49, - 1 - ), - onElementPass( - x -> x.casingAmount++, - ofBlock( - GregTech_API.sBlockCasings4, 1 - ) - ) - ) - ) - .addElement( - 'D', - ofBlock( - GregTech_API.sBlockCasings2, 6 - ) - ) - .addElement( - 'F', - addFrame( - Materials.Steel - ) - ) - .addElement( - 'G', - ofBlock( - Block.getBlockFromItem(Ic2Items.reinforcedGlass.getItem()), 0 - ) - ) - .addElement( - 'P', - ofBlock( - Loaders.speedingPipe, 0 - ) - ) + ofHatchAdder(NeutronActivator::addClassicInputToMachineList, 49, 1), + onElementPass(x -> x.casingAmount++, ofBlock(GregTech_API.sBlockCasings4, 1)))) + .addElement('D', ofBlock(GregTech_API.sBlockCasings2, 6)) + .addElement('F', addFrame(Materials.Steel)) + .addElement('G', ofBlock(Block.getBlockFromItem(Ic2Items.reinforcedGlass.getItem()), 0)) + .addElement('P', ofBlock(Loaders.speedingPipe, 0)) .addElement( 'X', ofChain( - ofHatchAdder( - NeutronActivator::addClassicOutputToMachineList, 49, - 2 - ), - ofHatchAdder( - NeutronActivator::addMaintenanceToMachineList, 49, - 2 - ), - ofHatchAdder( - NeutronActivator::addAcceleratorAndSensor, 49, - 2 - ), - onElementPass( - x -> x.casingAmount++, - ofBlock( - GregTech_API.sBlockCasings4, 1 - ) - ) - ) - ) + ofHatchAdder(NeutronActivator::addClassicOutputToMachineList, 49, 2), + ofHatchAdder(NeutronActivator::addMaintenanceToMachineList, 49, 2), + ofHatchAdder(NeutronActivator::addAcceleratorAndSensor, 49, 2), + onElementPass(x -> x.casingAmount++, ofBlock(GregTech_API.sBlockCasings4, 1)))) .build(); } return multiDefinition; @@ -290,8 +234,8 @@ public class NeutronActivator extends GT_MetaTileEntity_TooltipMultiBlockBase_EM this.mNeutronSensor.clear(); if (!structureCheck_EM(NA_BOTTOM, 2, 0, 0)) return false; height = 0; - while (structureCheck_EM(NA_MID, 2, height +1, 0)) { - height ++; + while (structureCheck_EM(NA_MID, 2, height + 1, 0)) { + height++; } if (height < 4) return false; return structureCheck_EM(NA_TOP, 2, height + 1, 0) && casingAmount >= 7; @@ -333,7 +277,8 @@ public class NeutronActivator extends GT_MetaTileEntity_TooltipMultiBlockBase_EM if (aBaseMetaTileEntity.isServerSide()) { for (ItemStack input : getStoredInputs()) { - if (input.isItemEqual(Materials.Graphite.getDust(1)) || input.isItemEqual(Materials.Beryllium.getDust(1))) { + if (input.isItemEqual(Materials.Graphite.getDust(1)) + || input.isItemEqual(Materials.Beryllium.getDust(1))) { int consume = Math.min(this.eV / 10000000, input.stackSize); depleteInput(GT_Utility.copyAmount(consume, input)); this.eV -= 10000000 * consume; @@ -343,7 +288,11 @@ public class NeutronActivator extends GT_MetaTileEntity_TooltipMultiBlockBase_EM for (NeutronAccelerator tHatch : mNeutronAccelerator) { if (tHatch.getBaseMetaTileEntity().isActive() && this.getRepairStatus() == this.getIdealStatus()) { anyWorking = true; - this.eV += Math.max((R.nextInt(tHatch.getMaxEUConsume() + 1) + tHatch.getMaxEUConsume()) * 10 * Math.pow(0.95, height - 4), 10); + this.eV += Math.max( + (R.nextInt(tHatch.getMaxEUConsume() + 1) + tHatch.getMaxEUConsume()) + * 10 + * Math.pow(0.95, height - 4), + 10); } } if (!anyWorking) { @@ -367,7 +316,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)}; } } } @@ -399,7 +348,7 @@ public class NeutronActivator extends GT_MetaTileEntity_TooltipMultiBlockBase_EM structureBuild_EM(NA_TOP, 2, heights + 1, 0, stackSize, hintsOnly); while (heights > 0) { structureBuild_EM(NA_MID, 2, heights, 0, stackSize, hintsOnly); - heights --; + heights--; } } @@ -414,33 +363,46 @@ 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 * Math.pow(0.95, height - 4); + 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" + "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) { - if(aSide == aFacing) { - if(aActive) return new ITexture[]{ + 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[]{ + }; + else + return new ITexture[] { Textures.BlockIcons.getCasingTextureForId(49), TextureFactory.of(textureFontOff), TextureFactory.builder().addIcon(textureFontOff_Glow).glow().build() - }; + }; } - return new ITexture[]{Textures.BlockIcons.getCasingTextureForId(49)}; + return new ITexture[] {Textures.BlockIcons.getCasingTextureForId(49)}; } } diff --git a/src/main/java/goodgenerator/blocks/tileEntity/PreciseAssembler.java b/src/main/java/goodgenerator/blocks/tileEntity/PreciseAssembler.java index 848cda3540..146dcf0c1d 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/PreciseAssembler.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/PreciseAssembler.java @@ -1,5 +1,13 @@ package goodgenerator.blocks.tileEntity; +import static com.github.bartimaeusnek.bartworks.util.RecipeFinderForParallel.getMultiOutput; +import static com.github.bartimaeusnek.bartworks.util.RecipeFinderForParallel.handleParallelRecipe; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.*; +import static goodgenerator.util.DescTextLocalization.BLUE_PRINT_INFO; +import static goodgenerator.util.StructureHelper.addTieredBlock; +import static gregtech.api.util.GT_StructureUtility.ofFrame; +import static gregtech.api.util.GT_StructureUtility.ofHatchAdder; + 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; @@ -26,6 +34,7 @@ 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 net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -33,22 +42,14 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.StatCollector; import net.minecraftforge.fluids.FluidStack; -import java.util.ArrayList; - -import static com.github.bartimaeusnek.bartworks.util.RecipeFinderForParallel.getMultiOutput; -import static com.github.bartimaeusnek.bartworks.util.RecipeFinderForParallel.handleParallelRecipe; -import static com.gtnewhorizon.structurelib.structure.StructureUtility.*; -import static goodgenerator.util.DescTextLocalization.BLUE_PRINT_INFO; -import static goodgenerator.util.StructureHelper.addTieredBlock; -import static gregtech.api.util.GT_StructureUtility.ofFrame; -import static gregtech.api.util.GT_StructureUtility.ofHatchAdder; - public class PreciseAssembler extends GT_MetaTileEntity_TooltipMultiBlockBase_EM implements IConstructable { 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; @@ -68,49 +69,34 @@ public class PreciseAssembler extends GT_MetaTileEntity_TooltipMultiBlockBase_EM @Override public IStructureDefinition<PreciseAssembler> getStructure_EM() { 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', ofChain( - ofHatchAdder( - PreciseAssembler::addToPAssList, 0, 1 - ), + ofHatchAdder(PreciseAssembler::addToPAssList, 0, 1), onElementPass( x -> x.casingAmount++, addTieredBlock( - Loaders.preciseUnitCasing, PreciseAssembler::setCasingTier, PreciseAssembler::getCasingTier, 3 - ) - ) - ) - ) - .addElement( - 'F', - ofFrame( - Materials.TungstenSteel - ) - ) - .addElement( - 'G', - ofBlock( - Block.getBlockFromItem(Ic2Items.reinforcedGlass.getItem()), 0 - ) - ) + Loaders.preciseUnitCasing, + PreciseAssembler::setCasingTier, + PreciseAssembler::getCasingTier, + 3)))) + .addElement('F', ofFrame(Materials.TungstenSteel)) + .addElement('G', ofBlock(Block.getBlockFromItem(Ic2Items.reinforcedGlass.getItem()), 0)) .addElement( 'M', addTieredBlock( - GregTech_API.sBlockCasings1, PreciseAssembler::setMachineTier, PreciseAssembler::getMachineTier, 10 - ) - ) + GregTech_API.sBlockCasings1, + PreciseAssembler::setMachineTier, + PreciseAssembler::getMachineTier, + 10)) .build(); } return multiDefinition; @@ -196,13 +182,23 @@ public class PreciseAssembler extends GT_MetaTileEntity_TooltipMultiBlockBase_EM if (this.mode == 0) { for (GT_MetaTileEntity_Hatch_InputBus bus : mInputBusses) { if (!isValidMetaTileEntity(bus)) continue; - GT_Recipe tRecipe = getRecipeMap().findRecipe(this.getBaseMetaTileEntity(), false, Math.min(getMachineVoltageLimit(), getMaxInputEnergyPA()), inputFluids, getStoredItemFromHatch(bus)); + GT_Recipe tRecipe = getRecipeMap() + .findRecipe( + this.getBaseMetaTileEntity(), + false, + Math.min(getMachineVoltageLimit(), getMaxInputEnergyPA()), + inputFluids, + getStoredItemFromHatch(bus)); if (tRecipe != null && tRecipe.mSpecialValue <= casingTier) { this.mEfficiency = (10000 - (this.getIdealStatus() - this.getRepairStatus()) * 1000); this.mEfficiencyIncrease = 10000; tRecipe.isRecipeInputEqual(true, inputFluids, getStoredItemFromHatch(bus)); mOutputItems = tRecipe.mOutputs; - calculateOverclockedNessMulti(tRecipe.mEUt, tRecipe.mDuration, 1, Math.min(GT_Values.V[machineTier - 1], getMaxInputVoltage())); + calculateOverclockedNessMulti( + tRecipe.mEUt, + tRecipe.mDuration, + 1, + Math.min(GT_Values.V[machineTier - 1], getMaxInputVoltage())); this.updateSlots(); if (this.mEUt > 0) { this.mEUt = (-this.mEUt); @@ -210,16 +206,22 @@ public class PreciseAssembler extends GT_MetaTileEntity_TooltipMultiBlockBase_EM return true; } } - } - else { + } else { for (GT_MetaTileEntity_Hatch_InputBus bus : mInputBusses) { if (!isValidMetaTileEntity(bus) || getStoredItemFromHatch(bus).length < 1) continue; - GT_Recipe tRecipe = getRecipeMap().findRecipe(this.getBaseMetaTileEntity(), false, Math.min(getMachineVoltageLimit(), getMaxInputEnergyPA()), inputFluids, getStoredItemFromHatch(bus)); + GT_Recipe tRecipe = getRecipeMap() + .findRecipe( + this.getBaseMetaTileEntity(), + false, + Math.min(getMachineVoltageLimit(), getMaxInputEnergyPA()), + inputFluids, + getStoredItemFromHatch(bus)); if (tRecipe != null) { this.mEfficiency = (10000 - (this.getIdealStatus() - this.getRepairStatus()) * 1000); this.mEfficiencyIncrease = 10000; long fullInput = getMaxInputEnergy_EM(); - int pall = handleParallelRecipe(tRecipe, inputFluids, getStoredItemFromHatch(bus), (int) Math.min((long) Math.pow(2, 4 + casingTier), fullInput / tRecipe.mEUt)); + int pall = handleParallelRecipe(tRecipe, inputFluids, getStoredItemFromHatch(bus), (int) + Math.min((long) Math.pow(2, 4 + casingTier), fullInput / tRecipe.mEUt)); if (pall <= 0) continue; Pair<ArrayList<FluidStack>, ArrayList<ItemStack>> Outputs = getMultiOutput(tRecipe, pall); long lEUt = (long) tRecipe.mEUt * (long) pall; @@ -228,10 +230,11 @@ public class PreciseAssembler extends GT_MetaTileEntity_TooltipMultiBlockBase_EM while (lEUt >= Integer.MAX_VALUE - 1) { lEUt = (long) tRecipe.mEUt * (long) pall / modifier; time = tRecipe.mDuration / 2 * modifier; - modifier ++; + modifier++; } mOutputItems = Outputs.getValue().toArray(new ItemStack[0]); - calculateOverclockedNessMultiPara((int) lEUt, time, 1, Math.min(Integer.MAX_VALUE, getMaxInputEnergy_EM())); + calculateOverclockedNessMultiPara( + (int) lEUt, time, 1, Math.min(Integer.MAX_VALUE, getMaxInputEnergy_EM())); this.updateSlots(); if (this.mEUt > 0) { this.mEUt = (-this.mEUt); @@ -254,12 +257,14 @@ public class PreciseAssembler extends GT_MetaTileEntity_TooltipMultiBlockBase_EM } for (GT_MetaTileEntity_Hatch_Energy tHatch : mEnergyHatches) { if (isValidMetaTileEntity(tHatch)) { - rEnergy += tHatch.getBaseMetaTileEntity().getInputVoltage() * tHatch.getBaseMetaTileEntity().getInputAmperage(); + rEnergy += tHatch.getBaseMetaTileEntity().getInputVoltage() + * tHatch.getBaseMetaTileEntity().getInputAmperage(); } } for (GT_MetaTileEntity_Hatch_EnergyMulti tHatch : eEnergyMulti) { if (isValidMetaTileEntity(tHatch)) { - rEnergy += tHatch.getBaseMetaTileEntity().getInputVoltage() * tHatch.getBaseMetaTileEntity().getInputAmperage(); + rEnergy += tHatch.getBaseMetaTileEntity().getInputVoltage() + * tHatch.getBaseMetaTileEntity().getInputAmperage(); } } return rEnergy; @@ -345,8 +350,19 @@ public class PreciseAssembler extends GT_MetaTileEntity_TooltipMultiBlockBase_EM if (casingTier != 0) { reUpdate(1538 + casingTier); } - GoodGenerator.CHANNEL.sendToAllAround(new MessageResetTileTexture(aBaseMetaTileEntity, casingTier), new NetworkRegistry.TargetPoint(aBaseMetaTileEntity.getWorld().provider.dimensionId, aBaseMetaTileEntity.getXCoord(), aBaseMetaTileEntity.getYCoord(), aBaseMetaTileEntity.getZCoord(), 16)); - return casingAmount >= 42 && machineTier != 0 && casingTier != 0 && mMaintenanceHatches.size() == 1 && !mMufflerHatches.isEmpty(); + GoodGenerator.CHANNEL.sendToAllAround( + new MessageResetTileTexture(aBaseMetaTileEntity, casingTier), + new NetworkRegistry.TargetPoint( + aBaseMetaTileEntity.getWorld().provider.dimensionId, + aBaseMetaTileEntity.getXCoord(), + aBaseMetaTileEntity.getYCoord(), + aBaseMetaTileEntity.getZCoord(), + 16)); + return casingAmount >= 42 + && machineTier != 0 + && casingTier != 0 + && mMaintenanceHatches.size() == 1 + && !mMufflerHatches.isEmpty(); } return false; } @@ -383,7 +399,7 @@ public class PreciseAssembler extends GT_MetaTileEntity_TooltipMultiBlockBase_EM } @Override - public int getPollutionPerSecond(ItemStack aStack){ + public int getPollutionPerSecond(ItemStack aStack) { return 780; } @@ -456,21 +472,28 @@ public class PreciseAssembler 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) { int t = 1; if (getCasingTier() != 0) t = getCasingTier(); if (aSide == aFacing) { - if (aActive) return new ITexture[] { + if (aActive) + return new ITexture[] { Textures.BlockIcons.getCasingTextureForId(1538 + t), TextureFactory.of(textureFontOn), TextureFactory.builder().addIcon(textureFontOn_Glow).glow().build() - }; - else return new ITexture[] { + }; + else + return new ITexture[] { Textures.BlockIcons.getCasingTextureForId(1538 + t), TextureFactory.of(textureFontOff), TextureFactory.builder().addIcon(textureFontOff_Glow).glow().build() - }; - } - else return new ITexture[] {Textures.BlockIcons.getCasingTextureForId(1538 + t)}; + }; + } else return new ITexture[] {Textures.BlockIcons.getCasingTextureForId(1538 + t)}; } } diff --git a/src/main/java/goodgenerator/blocks/tileEntity/SupercriticalFluidTurbine.java b/src/main/java/goodgenerator/blocks/tileEntity/SupercriticalFluidTurbine.java index aeb24bd8c2..ef9647b56f 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/SupercriticalFluidTurbine.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/SupercriticalFluidTurbine.java @@ -11,6 +11,7 @@ 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; @@ -18,8 +19,6 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; -import java.util.ArrayList; - public class SupercriticalFluidTurbine extends GT_MetaTileEntity_LargeTurbineBase { private boolean looseFit = false; @@ -54,7 +53,9 @@ 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 multi-hatch scenarios. + 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; storedFluid = 0; @@ -89,7 +90,11 @@ public class SupercriticalFluidTurbine extends GT_MetaTileEntity_LargeTurbineBas public void onScrewdriverRightClick(byte aSide, EntityPlayer aPlayer, float aX, float aY, float aZ) { if (aSide == getBaseMetaTileEntity().getFrontFacing()) { looseFit ^= true; - GT_Utility.sendChatToPlayer(aPlayer, looseFit ? trans("500", "Fitting: Loose - More Flow") : trans("501", "Fitting: Tight - More Efficiency")); + GT_Utility.sendChatToPlayer( + aPlayer, + looseFit + ? trans("500", "Fitting: Loose - More Flow") + : trans("501", "Fitting: Tight - More Efficiency")); } } @@ -161,12 +166,20 @@ public class SupercriticalFluidTurbine extends GT_MetaTileEntity_LargeTurbineBas } @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) { return new ITexture[] { - Textures.BlockIcons.getCasingTextureForId(1538), - aFacing == aSide ? - (aActive ? TextureFactory.of(turbineOn) : hasTurbine() ? TextureFactory.of(turbineOff) : TextureFactory.of(turbineEmpty)) - : Textures.BlockIcons.getCasingTextureForId(1538) + 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 2a55b258df..e2afb171a2 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/UniversalChemicalFuelEngine.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/UniversalChemicalFuelEngine.java @@ -1,5 +1,11 @@ package goodgenerator.blocks.tileEntity; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; +import static goodgenerator.util.DescTextLocalization.BLUE_PRINT_INFO; +import static gregtech.api.enums.Textures.BlockIcons.*; +import static gregtech.api.util.GT_StructureUtility.ofHatchAdder; + import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_DynamoMulti; import com.gtnewhorizon.structurelib.alignment.constructable.IConstructable; import com.gtnewhorizon.structurelib.structure.IStructureDefinition; @@ -18,21 +24,14 @@ 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.item.ItemStack; import net.minecraft.util.EnumChatFormatting; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; - -import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; -import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; -import static goodgenerator.util.DescTextLocalization.BLUE_PRINT_INFO; -import static gregtech.api.enums.Textures.BlockIcons.*; -import static gregtech.api.util.GT_StructureUtility.ofHatchAdder; - public class UniversalChemicalFuelEngine extends GT_MetaTileEntity_TooltipMultiBlockBase_EM implements IConstructable { protected final double DIESEL_EFFICIENCY_COEFFICIENT = 0.04D; @@ -45,129 +44,88 @@ public class UniversalChemicalFuelEngine extends GT_MetaTileEntity_TooltipMultiB private IStructureDefinition<UniversalChemicalFuelEngine> multiDefinition = null; - public UniversalChemicalFuelEngine(String name){super(name);} + public UniversalChemicalFuelEngine(String name) { + super(name); + } - public UniversalChemicalFuelEngine(int id, String name, String nameRegional){ - super(id,name,nameRegional); + public UniversalChemicalFuelEngine(int id, String name, String nameRegional) { + super(id, name, nameRegional); } - public final boolean addMaintenance(IGregTechTileEntity aTileEntity, int aBaseCasingIndex){ + public final boolean addMaintenance(IGregTechTileEntity aTileEntity, int aBaseCasingIndex) { if (aTileEntity == null) { return false; } else { IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity(); - if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Maintenance){ - ((GT_MetaTileEntity_Hatch)aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mMaintenanceHatches.add((GT_MetaTileEntity_Hatch_Maintenance)aMetaTileEntity); + if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Maintenance) { + ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); + return this.mMaintenanceHatches.add((GT_MetaTileEntity_Hatch_Maintenance) aMetaTileEntity); } } return false; } - public final boolean addMuffler(IGregTechTileEntity aTileEntity, int aBaseCasingIndex){ + public final boolean addMuffler(IGregTechTileEntity aTileEntity, int aBaseCasingIndex) { if (aTileEntity == null) { return false; } else { IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity(); - if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Muffler){ - ((GT_MetaTileEntity_Hatch)aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mMufflerHatches.add((GT_MetaTileEntity_Hatch_Muffler)aMetaTileEntity); + if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Muffler) { + ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); + return this.mMufflerHatches.add((GT_MetaTileEntity_Hatch_Muffler) aMetaTileEntity); } } return false; } - public final boolean addInputHatch(IGregTechTileEntity aTileEntity, int aBaseCasingIndex){ + public final boolean addInputHatch(IGregTechTileEntity aTileEntity, int aBaseCasingIndex) { if (aTileEntity == null) { return false; } else { IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity(); - if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Input){ - ((GT_MetaTileEntity_Hatch)aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mInputHatches.add((GT_MetaTileEntity_Hatch_Input)aMetaTileEntity); + if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Input) { + ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); + return this.mInputHatches.add((GT_MetaTileEntity_Hatch_Input) aMetaTileEntity); } } return false; } - public final boolean addDynamoHatch(IGregTechTileEntity aTileEntity, int aBaseCasingIndex){ + public final boolean addDynamoHatch(IGregTechTileEntity aTileEntity, int aBaseCasingIndex) { if (aTileEntity == null) { return false; } else { IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity(); - if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Dynamo){ - ((GT_MetaTileEntity_Hatch)aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mDynamoHatches.add((GT_MetaTileEntity_Hatch_Dynamo)aMetaTileEntity); - } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_DynamoMulti){ - ((GT_MetaTileEntity_Hatch)aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.eDynamoMulti.add((GT_MetaTileEntity_Hatch_DynamoMulti)aMetaTileEntity); + if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Dynamo) { + ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); + return this.mDynamoHatches.add((GT_MetaTileEntity_Hatch_Dynamo) aMetaTileEntity); + } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_DynamoMulti) { + ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); + return this.eDynamoMulti.add((GT_MetaTileEntity_Hatch_DynamoMulti) aMetaTileEntity); } } return false; } @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"} - }) - ).addElement( - 'T', - ofBlock( - GregTech_API.sBlockCasings4, 2 - ) - ).addElement( - 'W', - ofHatchAdder( - UniversalChemicalFuelEngine::addMaintenance, 50, - 1 - ) - ).addElement( - 'M', - ofHatchAdder( - UniversalChemicalFuelEngine::addMuffler, 50, - 2 - ) - ).addElement( - 'S', - ofHatchAdder( - UniversalChemicalFuelEngine::addInputHatch, 50, - 3 - ) - ).addElement( - 'E', - ofHatchAdder( - UniversalChemicalFuelEngine::addDynamoHatch, 50, - 4 - ) - ).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 - ) - ) + 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"} + })) + .addElement('T', ofBlock(GregTech_API.sBlockCasings4, 2)) + .addElement('W', ofHatchAdder(UniversalChemicalFuelEngine::addMaintenance, 50, 1)) + .addElement('M', ofHatchAdder(UniversalChemicalFuelEngine::addMuffler, 50, 2)) + .addElement('S', ofHatchAdder(UniversalChemicalFuelEngine::addInputHatch, 50, 3)) + .addElement('E', ofHatchAdder(UniversalChemicalFuelEngine::addDynamoHatch, 50, 4)) + .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(); } return multiDefinition; @@ -195,7 +153,7 @@ public class UniversalChemicalFuelEngine extends GT_MetaTileEntity_TooltipMultiB @Override public int getPollutionPerTick(ItemStack aStack) { - return (int)Math.sqrt(this.mEUt) / 20; + return (int) Math.sqrt(this.mEUt) / 20; } @Override @@ -210,7 +168,8 @@ public class UniversalChemicalFuelEngine extends GT_MetaTileEntity_TooltipMultiB .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("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) @@ -244,8 +203,8 @@ public class UniversalChemicalFuelEngine extends GT_MetaTileEntity_TooltipMultiB consumeAllLiquid(tFuel); consumeAllLiquid(getPromoter()); - this.mEUt = (int)(FuelAmount * recipe.mSpecialValue / 20.0D); - this.lEUt = (long)((long) FuelAmount * recipe.mSpecialValue / 20.0D); + this.mEUt = (int) (FuelAmount * recipe.mSpecialValue / 20.0D); + this.lEUt = (long) ((long) FuelAmount * recipe.mSpecialValue / 20.0D); this.mMaxProgresstime = 20; this.updateSlots(); return true; @@ -261,8 +220,8 @@ public class UniversalChemicalFuelEngine extends GT_MetaTileEntity_TooltipMultiB consumeAllLiquid(tFuel); consumeAllLiquid(getPromoter()); - this.mEUt = (int)(FuelAmount * recipe.mSpecialValue / 20.0D); - this.lEUt = (long)((long) FuelAmount * recipe.mSpecialValue / 20.0D); + this.mEUt = (int) (FuelAmount * recipe.mSpecialValue / 20.0D); + this.lEUt = (long) ((long) FuelAmount * recipe.mSpecialValue / 20.0D); this.mMaxProgresstime = 20; this.updateSlots(); return true; @@ -280,8 +239,8 @@ public class UniversalChemicalFuelEngine extends GT_MetaTileEntity_TooltipMultiB consumeAllLiquid(tFuel); consumeAllLiquid(getPromoter()); - this.mEUt = (int)(FuelAmount * recipe.mSpecialValue * 3 / 20.0D); - this.lEUt = (long)((long) FuelAmount * recipe.mSpecialValue * 3 / 20.0D); + this.mEUt = (int) (FuelAmount * recipe.mSpecialValue * 3 / 20.0D); + this.lEUt = (long) ((long) FuelAmount * recipe.mSpecialValue * 3 / 20.0D); this.mMaxProgresstime = 20; this.updateSlots(); return true; @@ -304,7 +263,9 @@ 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; } @@ -313,16 +274,16 @@ 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)); - } - else tHatch.doExplosion(tHatch.maxEUOutput()); + 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)); - } - else tHatch.doExplosion(tHatch.maxEUOutput()); + tHatch.setEUVar(Math.min( + tHatch.maxEUStore(), tHatch.getBaseMetaTileEntity().getStoredEU() + exEU)); + } else tHatch.doExplosion(tHatch.maxEUOutput()); } } @@ -333,8 +294,7 @@ public class UniversalChemicalFuelEngine extends GT_MetaTileEntity_TooltipMultiB public FluidStack findFuel(GT_Recipe aFuel) { if (aFuel.mInputs != null && aFuel.mInputs.length > 0) return GT_Utility.getFluidForFilledItem(aFuel.mInputs[0], true); - else - return aFuel.mFluidInputs[0]; + else return aFuel.mFluidInputs[0]; } public void calculateEfficiency(int aFuel, int aPromoter, double coefficient) { @@ -342,12 +302,12 @@ public class UniversalChemicalFuelEngine extends GT_MetaTileEntity_TooltipMultiB this.tEff = 0; return; } - this.tEff = (int)(Math.exp(-coefficient * (double)aFuel / (double)aPromoter) * EFFICIENCY_CEILING * 10000); + this.tEff = (int) (Math.exp(-coefficient * (double) aFuel / (double) aPromoter) * EFFICIENCY_CEILING * 10000); } public int findLiquidAmount(FluidStack liquid, List<FluidStack> input) { int cnt = 0; - for (FluidStack fluid : input){ + for (FluidStack fluid : input) { if (fluid.isFluidEqual(liquid)) { cnt += fluid.amount; } @@ -368,20 +328,33 @@ public class UniversalChemicalFuelEngine extends GT_MetaTileEntity_TooltipMultiB } @Override - public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone) { - if(aSide == aFacing) { - if(aActive) return new ITexture[] { + 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], TextureFactory.of(OVERLAY_FRONT_DIESEL_ENGINE_ACTIVE), - TextureFactory.builder().addIcon(OVERLAY_FRONT_DIESEL_ENGINE_ACTIVE_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() + 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 f98e46fcb7..9c4b404fb6 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/YottaFluidTank.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/YottaFluidTank.java @@ -1,5 +1,16 @@ package goodgenerator.blocks.tileEntity; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.*; +import static goodgenerator.util.DescTextLocalization.BLUE_PRINT_INFO; +import static goodgenerator.util.StructureHelper.addFrame; +import static goodgenerator.util.StructureHelper.addTieredBlock; +import static gregtech.api.util.GT_StructureUtility.*; + +import com.github.bartimaeusnek.bartworks.common.loaders.ItemRegistry; +import com.gtnewhorizon.structurelib.alignment.constructable.IConstructable; +import com.gtnewhorizon.structurelib.structure.IStructureDefinition; +import com.gtnewhorizon.structurelib.structure.IStructureElement; +import com.gtnewhorizon.structurelib.structure.StructureDefinition; import goodgenerator.blocks.tileEntity.GTMetaTileEntity.YOTTAHatch; import goodgenerator.blocks.tileEntity.base.GT_MetaTileEntity_TooltipMultiBlockBase_EM; import goodgenerator.client.GUI.YOTTankGUIClient; @@ -7,16 +18,9 @@ import goodgenerator.common.container.YOTTankGUIContainer; import goodgenerator.loader.Loaders; import goodgenerator.util.CharExchanger; import goodgenerator.util.DescTextLocalization; -import com.github.bartimaeusnek.bartworks.common.loaders.ItemRegistry; -import com.github.technus.tectech.thing.metaTileEntity.multi.base.GT_MetaTileEntity_MultiblockBase_EM; -import com.gtnewhorizon.structurelib.alignment.constructable.IConstructable; -import com.gtnewhorizon.structurelib.structure.IStructureDefinition; -import com.gtnewhorizon.structurelib.structure.IStructureElement; -import com.gtnewhorizon.structurelib.structure.StructureDefinition; import gregtech.api.enums.Materials; import gregtech.api.enums.Textures; import gregtech.api.interfaces.IIconContainer; -import gregtech.api.interfaces.ISecondaryDescribable; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; @@ -25,6 +29,9 @@ 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.InventoryPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -32,24 +39,15 @@ import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.StatCollector; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; -import org.lwjgl.input.Keyboard; - -import java.math.BigInteger; -import java.util.ArrayList; -import java.util.List; - -import static goodgenerator.util.DescTextLocalization.BLUE_PRINT_INFO; -import static goodgenerator.util.StructureHelper.addFrame; -import static goodgenerator.util.StructureHelper.addTieredBlock; -import static com.gtnewhorizon.structurelib.structure.StructureUtility.*; -import static gregtech.api.util.GT_StructureUtility.*; public class YottaFluidTank extends GT_MetaTileEntity_TooltipMultiBlockBase_EM implements IConstructable { 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<>(); @@ -88,7 +86,8 @@ public class YottaFluidTank extends GT_MetaTileEntity_TooltipMultiBlockBase_EM i } public String getFluidName() { - if (mFluidName == null || mFluidName.equals("") || FluidRegistry.getFluidStack(mFluidName, 1) == null) return "Empty"; + if (mFluidName == null || mFluidName.equals("") || FluidRegistry.getFluidStack(mFluidName, 1) == null) + return "Empty"; return FluidRegistry.getFluidStack(mFluidName, 1).getLocalizedName(); } @@ -123,8 +122,7 @@ public class YottaFluidTank extends GT_MetaTileEntity_TooltipMultiBlockBase_EM i BigInteger tmp = new BigInteger(amount + ""); if (mStorageCurrent.compareTo(tmp) < 0) { return false; - } - else { + } else { mStorageCurrent = mStorageCurrent.subtract(tmp); return true; } @@ -134,8 +132,7 @@ public class YottaFluidTank extends GT_MetaTileEntity_TooltipMultiBlockBase_EM i BigInteger tmp = new BigInteger(amount + ""); if (mStorage.subtract(mStorageCurrent).compareTo(tmp) < 0) { return false; - } - else { + } else { mStorageCurrent = mStorageCurrent.add(tmp); return true; } @@ -155,7 +152,7 @@ public class YottaFluidTank extends GT_MetaTileEntity_TooltipMultiBlockBase_EM i if (!structureCheck_EM(YOTTANK_BOTTOM, 2, 0, 0)) return false; int cnt = 0; while (structureCheck_EM(YOTTANK_MID, 2, cnt + 1, 0)) { - cnt ++; + cnt++; } if (cnt > 15 || cnt < 1) return false; if (!structureCheck_EM(YOTTANK_TOP, 2, cnt + 2, 0)) return false; @@ -172,52 +169,27 @@ public class YottaFluidTank extends GT_MetaTileEntity_TooltipMultiBlockBase_EM i @Override 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 "," "} + 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_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_TOP, transpose(new String[][]{ - {"FFFFF","F F","F F","F F","FFFFF"}, - {"CCCCC","CIIIC","CIIIC","CIIIC","CCCCC"} - })) - .addElement( - 'C', - ofBlock( - Loaders.yottaFluidTankCasing, 0 - ) - ) + .addElement('C', ofBlock(Loaders.yottaFluidTankCasing, 0)) .addElement( 'G', addTieredBlock( - ItemRegistry.bw_realglas, YottaFluidTank::setMeta, YottaFluidTank::getMeta, 12 - ) - ) - .addElement( - 'R', - ofChain( - cells(10) - ) - ) - .addElement( - 'F', - addFrame(Materials.Steel) - ) + ItemRegistry.bw_realglas, YottaFluidTank::setMeta, YottaFluidTank::getMeta, 12)) + .addElement('R', ofChain(cells(10))) + .addElement('F', addFrame(Materials.Steel)) .addElement( 'I', - ofHatchAdderOptional( - YottaFluidTank::addInput, - 1537, - 1, - Loaders.yottaFluidTankCasing, - 0 - ) - ) + ofHatchAdderOptional(YottaFluidTank::addInput, 1537, 1, Loaders.yottaFluidTankCasing, 0)) .addElement( 'M', ofHatchAdderOptional( @@ -225,19 +197,10 @@ public class YottaFluidTank extends GT_MetaTileEntity_TooltipMultiBlockBase_EM i 1537, 2, Loaders.yottaFluidTankCasing, - 0 - ) - ) + 0)) .addElement( 'O', - ofHatchAdderOptional( - YottaFluidTank::addOutput, - 1537, - 3, - Loaders.yottaFluidTankCasing, - 0 - ) - ) + ofHatchAdderOptional(YottaFluidTank::addOutput, 1537, 3, Loaders.yottaFluidTankCasing, 0)) .build(); } return multiDefinition; @@ -247,15 +210,12 @@ public class YottaFluidTank extends GT_MetaTileEntity_TooltipMultiBlockBase_EM i 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; } @@ -269,8 +229,8 @@ public class YottaFluidTank extends GT_MetaTileEntity_TooltipMultiBlockBase_EM i return false; } else { if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Input) { - ((GT_MetaTileEntity_Hatch)aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mInputHatches.add((GT_MetaTileEntity_Hatch_Input)aMetaTileEntity); + ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); + return this.mInputHatches.add((GT_MetaTileEntity_Hatch_Input) aMetaTileEntity); } } } @@ -286,15 +246,14 @@ public class YottaFluidTank extends GT_MetaTileEntity_TooltipMultiBlockBase_EM i return false; } else { if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Output) { - ((GT_MetaTileEntity_Hatch)aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mOutputHatches.add((GT_MetaTileEntity_Hatch_Output)aMetaTileEntity); + ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); + return this.mOutputHatches.add((GT_MetaTileEntity_Hatch_Output) aMetaTileEntity); } else if (aMetaTileEntity instanceof YOTTAHatch) { - //only one yothatch allowed - if(!this.mYottaHatch.isEmpty()) - return false; - ((GT_MetaTileEntity_Hatch)aMetaTileEntity).updateTexture(aBaseCasingIndex); + // only one yothatch allowed + if (!this.mYottaHatch.isEmpty()) return false; + ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); ((YOTTAHatch) aMetaTileEntity).setTank(this); - return this.mYottaHatch.add((YOTTAHatch)aMetaTileEntity); + return this.mYottaHatch.add((YOTTAHatch) aMetaTileEntity); } } } @@ -304,9 +263,12 @@ public class YottaFluidTank extends GT_MetaTileEntity_TooltipMultiBlockBase_EM i @Override public String[] getInfoData() { return new String[] { - StatCollector.translateToLocal("scanner.info.YOTTank.0") + " " + EnumChatFormatting.GREEN + CharExchanger.formatNumber(getCap()) + EnumChatFormatting.RESET + " L", - StatCollector.translateToLocal("scanner.info.YOTTank.1") + " " + EnumChatFormatting.YELLOW + CharExchanger.formatNumber(getFluidName()) + EnumChatFormatting.RESET, - StatCollector.translateToLocal("scanner.info.YOTTank.2") + " " + EnumChatFormatting.BLUE + CharExchanger.formatNumber(getStored()) + EnumChatFormatting.RESET + " L", + StatCollector.translateToLocal("scanner.info.YOTTank.0") + " " + EnumChatFormatting.GREEN + + CharExchanger.formatNumber(getCap()) + EnumChatFormatting.RESET + " L", + StatCollector.translateToLocal("scanner.info.YOTTank.1") + " " + EnumChatFormatting.YELLOW + + CharExchanger.formatNumber(getFluidName()) + EnumChatFormatting.RESET, + StatCollector.translateToLocal("scanner.info.YOTTank.2") + " " + EnumChatFormatting.BLUE + + CharExchanger.formatNumber(getStored()) + EnumChatFormatting.RESET + " L", }; } @@ -315,14 +277,15 @@ public class YottaFluidTank extends GT_MetaTileEntity_TooltipMultiBlockBase_EM i 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.") + .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) + .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") @@ -334,8 +297,7 @@ public class YottaFluidTank extends GT_MetaTileEntity_TooltipMultiBlockBase_EM i public BigInteger calStorage(int meta) { StringBuilder cap = new StringBuilder(); cap.append("1000000"); - for (int i = 0; i < meta; ++i) - cap.append("00"); + for (int i = 0; i < meta; ++i) cap.append("00"); return new BigInteger(cap.toString()); } @@ -356,7 +318,9 @@ public class YottaFluidTank extends GT_MetaTileEntity_TooltipMultiBlockBase_EM i List<FluidStack> tStore = getStoredFluids(); for (FluidStack tFluid : tStore) { if (tFluid == null) continue; - 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(); } @@ -371,7 +335,8 @@ public class YottaFluidTank extends GT_MetaTileEntity_TooltipMultiBlockBase_EM i } } BigInteger outputAmount = mStorageCurrent.divide(new BigInteger("100", 10)); - if (outputAmount.compareTo(new BigInteger(Integer.MAX_VALUE + "", 10)) > 0) outputAmount = new BigInteger(Integer.MAX_VALUE + ""); + if (outputAmount.compareTo(new BigInteger(Integer.MAX_VALUE + "", 10)) > 0) + outputAmount = new BigInteger(Integer.MAX_VALUE + ""); if (outputAmount.compareTo(BigInteger.ONE) <= 0) outputAmount = new BigInteger("1", 10); if (mStorageCurrent.compareTo(BigInteger.ZERO) <= 0) mFluidName = ""; @@ -384,17 +349,15 @@ public class YottaFluidTank extends GT_MetaTileEntity_TooltipMultiBlockBase_EM i int leftSpace = outputHatch.getCapacity() - tHatchFluid.amount; if (leftSpace < tOutput.amount) { if (reduceFluid(leftSpace)) tHatchFluid.amount += leftSpace; - } - else { + } else { if (reduceFluid(tOutput.amount)) tHatchFluid.amount += tOutput.amount; } - } - else if (tHatchFluid == null) { + } else if (tHatchFluid == null) { int leftSpace = outputHatch.getCapacity(); if (leftSpace < tOutput.amount) { - if (reduceFluid(leftSpace)) outputHatch.fill(FluidRegistry.getFluidStack(mFluidName, leftSpace), true); - } - else { + if (reduceFluid(leftSpace)) + outputHatch.fill(FluidRegistry.getFluidStack(mFluidName, leftSpace), true); + } else { if (reduceFluid(tOutput.amount)) outputHatch.fill(tOutput, true); } } @@ -412,7 +375,7 @@ public class YottaFluidTank extends GT_MetaTileEntity_TooltipMultiBlockBase_EM i structureBuild_EM(YOTTANK_TOP, 2, height + 2, 0, stackSize, hintsOnly); while (height > 0) { structureBuild_EM(YOTTANK_MID, 2, height, 0, stackSize, hintsOnly); - height --; + height--; } } @@ -427,19 +390,26 @@ public class YottaFluidTank extends GT_MetaTileEntity_TooltipMultiBlockBase_EM i } @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[] { + if (aActive) + return new ITexture[] { Textures.BlockIcons.getCasingTextureForId(1537), TextureFactory.of(textureFontOn), TextureFactory.builder().addIcon(textureFontOn_Glow).glow().build() - }; - else return new ITexture[] { + }; + 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)}; + }; + } else return new ITexture[] {Textures.BlockIcons.getCasingTextureForId(1537)}; } } 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 5b9bfaaf79..75d2b201e0 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 @@ -1,7 +1,13 @@ -//copied from gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_LargeTurbine -//The origin one in gt made the abstract method private so i can't imp it. +// copied from gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_LargeTurbine +// The origin one in gt made the abstract method private so i can't imp it. package goodgenerator.blocks.tileEntity.base; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.lazy; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; +import static gregtech.api.util.GT_StructureUtility.ofHatchAdder; +import static gregtech.api.util.GT_StructureUtility.ofHatchAdderOptional; + import com.gtnewhorizon.structurelib.structure.IStructureDefinition; import com.gtnewhorizon.structurelib.structure.IStructureElementCheckOnly; import com.gtnewhorizon.structurelib.structure.StructureDefinition; @@ -13,6 +19,7 @@ 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.InventoryPlayer; import net.minecraft.item.ItemStack; @@ -22,37 +29,56 @@ import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.StatCollector; import net.minecraftforge.fluids.FluidStack; -import java.util.ArrayList; - -import static com.gtnewhorizon.structurelib.structure.StructureUtility.lazy; -import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; -import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; -import static gregtech.api.util.GT_StructureUtility.ofHatchAdder; -import static gregtech.api.util.GT_StructureUtility.ofHatchAdderOptional; - -public abstract class GT_MetaTileEntity_LargeTurbineBase extends GT_MetaTileEntity_EnhancedMultiBlockBase<GT_MetaTileEntity_LargeTurbineBase> { +public abstract class GT_MetaTileEntity_LargeTurbineBase + extends GT_MetaTileEntity_EnhancedMultiBlockBase<GT_MetaTileEntity_LargeTurbineBase> { 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 -> ofHatchAdder(GT_MetaTileEntity_LargeTurbineBase::addDynamoToMachineList, t.getCasingTextureIndex(), 1))) - .addElement('h', lazy(t -> ofHatchAdderOptional(GT_MetaTileEntity_LargeTurbineBase::addToMachineList, t.getCasingTextureIndex(), 2, 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 -> ofHatchAdder( + GT_MetaTileEntity_LargeTurbineBase::addDynamoToMachineList, + t.getCasingTextureIndex(), + 1))) + .addElement( + 'h', + lazy(t -> ofHatchAdderOptional( + GT_MetaTileEntity_LargeTurbineBase::addToMachineList, + t.getCasingTextureIndex(), + 2, + 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; @@ -76,7 +102,8 @@ public abstract class GT_MetaTileEntity_LargeTurbineBase extends GT_MetaTileEnti @Override public Object getClientGUI(int aID, InventoryPlayer aPlayerInventory, IGregTechTileEntity aBaseMetaTileEntity) { - return new GT_GUIContainer_MultiMachine(aPlayerInventory, aBaseMetaTileEntity, getLocalName(), "LargeTurbine.png"); + return new GT_GUIContainer_MultiMachine( + aPlayerInventory, aBaseMetaTileEntity, getLocalName(), "LargeTurbine.png"); } @Override @@ -86,7 +113,9 @@ public abstract class GT_MetaTileEntity_LargeTurbineBase extends GT_MetaTileEnti @Override public boolean checkMachine(IGregTechTileEntity aBaseMetaTileEntity, ItemStack aStack) { - return checkPiece(STRUCTURE_PIECE_MAIN, 2, 2, 1) && mMaintenanceHatches.size() == 1 && mMufflerHatches.isEmpty() == (getPollutionPerTick(null) == 0); + return checkPiece(STRUCTURE_PIECE_MAIN, 2, 2, 1) + && mMaintenanceHatches.size() == 1 + && mMufflerHatches.isEmpty() == (getPollutionPerTick(null) == 0); } public abstract Block getCasingBlock(); @@ -97,7 +126,10 @@ public abstract class GT_MetaTileEntity_LargeTurbineBase extends GT_MetaTileEnti @Override public boolean addToMachineList(IGregTechTileEntity tTileEntity, int aBaseCasingIndex) { - return addMaintenanceToMachineList(tTileEntity, getCasingTextureIndex()) || addInputToMachineList(tTileEntity, getCasingTextureIndex()) || addOutputToMachineList(tTileEntity, getCasingTextureIndex()) || addMufflerToMachineList(tTileEntity, getCasingTextureIndex()); + return addMaintenanceToMachineList(tTileEntity, getCasingTextureIndex()) + || addInputToMachineList(tTileEntity, getCasingTextureIndex()) + || addOutputToMachineList(tTileEntity, getCasingTextureIndex()) + || addMufflerToMachineList(tTileEntity, getCasingTextureIndex()); } @Override @@ -112,22 +144,33 @@ public abstract class GT_MetaTileEntity_LargeTurbineBase extends GT_MetaTileEnti @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 || counter >= 512 || this.getBaseMetaTileEntity().hasWorkJustBeenEnabled() + 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() + 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)); - if(optFlow<=0 || baseEff<=0){ - stopMachine();//in case the turbine got removed + if (optFlow <= 0 || baseEff <= 0) { + stopMachine(); // in case the turbine got removed return false; } } else { @@ -135,23 +178,24 @@ public abstract class GT_MetaTileEntity_LargeTurbineBase extends GT_MetaTileEnti } } - 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 power level (per tick) + // Magic numbers: can always change by at least 10 eu/t, but otherwise by at most 1 percent of the difference in + // power level (per tick) // This is how much the turbine can actually change during this tick - int maxChangeAllowed = Math.max(10, GT_Utility.safeInt((long)Math.abs(difference)/100)); + int maxChangeAllowed = Math.max(10, GT_Utility.safeInt((long) Math.abs(difference) / 100)); if (Math.abs(difference) > maxChangeAllowed) { // If this difference is too big, use the maximum allowed change int change = maxChangeAllowed * (difference > 0 ? 1 : -1); // Make the change positive or negative. this.mEUt += change; // Apply the change - } else - this.mEUt = newPower; + } else this.mEUt = newPower; if (this.mEUt <= 0) { - //stopMachine(); - this.mEUt=0; - this.mEfficiency=0; + // stopMachine(); + this.mEUt = 0; + this.mEfficiency = 0; return false; } else { this.mMaxProgresstime = 1; @@ -186,58 +230,74 @@ public abstract class GT_MetaTileEntity_LargeTurbineBase extends GT_MetaTileEnti @Override public String[] getInfoData() { - int mPollutionReduction=0; + int mPollutionReduction = 0; for (GT_MetaTileEntity_Hatch_Muffler tHatch : mMufflerHatches) { if (isValidMetaTileEntity(tHatch)) { - mPollutionReduction=Math.max(tHatch.calculatePollutionReduction(100),mPollutionReduction); + mPollutionReduction = Math.max(tHatch.calculatePollutionReduction(100), mPollutionReduction); } } - String tRunning = mMaxProgresstime>0 ? - - EnumChatFormatting.GREEN+StatCollector.translateToLocal("GT5U.turbine.running.true")+EnumChatFormatting.RESET : - EnumChatFormatting.RED+StatCollector.translateToLocal("GT5U.turbine.running.false")+EnumChatFormatting.RESET; - String tMaintainance = getIdealStatus() == getRepairStatus() ? - EnumChatFormatting.GREEN+StatCollector.translateToLocal("GT5U.turbine.maintenance.false")+EnumChatFormatting.RESET : - EnumChatFormatting.RED+StatCollector.translateToLocal("GT5U.turbine.maintenance.true")+EnumChatFormatting.RESET ; + String tRunning = mMaxProgresstime > 0 + ? EnumChatFormatting.GREEN + + StatCollector.translateToLocal("GT5U.turbine.running.true") + + EnumChatFormatting.RESET + : EnumChatFormatting.RED + + StatCollector.translateToLocal("GT5U.turbine.running.false") + + EnumChatFormatting.RESET; + String tMaintainance = getIdealStatus() == getRepairStatus() + ? EnumChatFormatting.GREEN + + StatCollector.translateToLocal("GT5U.turbine.maintenance.false") + + EnumChatFormatting.RESET + : 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; - long maxEnergy=0; - for(GT_MetaTileEntity_Hatch_Dynamo tHatch : mDynamoHatches) { + long storedEnergy = 0; + long maxEnergy = 0; + for (GT_MetaTileEntity_Hatch_Dynamo tHatch : mDynamoHatches) { if (isValidMetaTileEntity(tHatch)) { - storedEnergy+=tHatch.getBaseMetaTileEntity().getStoredEU(); - maxEnergy+=tHatch.getBaseMetaTileEntity().getEUCapacity(); + storedEnergy += tHatch.getBaseMetaTileEntity().getStoredEU(); + maxEnergy += tHatch.getBaseMetaTileEntity().getEUCapacity(); } } - 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 */ + 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 */ }; 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; - - } public boolean hasTurbine() { 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 896d341ddf..7a09f4eb95 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 @@ -3,12 +3,12 @@ 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 org.lwjgl.input.Keyboard; - import java.util.Map; import java.util.concurrent.ConcurrentHashMap; +import org.lwjgl.input.Keyboard; -public abstract class GT_MetaTileEntity_TooltipMultiBlockBase_EM extends GT_MetaTileEntity_MultiblockBase_EM implements ISecondaryDescribable { +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) { @@ -48,5 +48,4 @@ public abstract class GT_MetaTileEntity_TooltipMultiBlockBase_EM extends GT_Meta public String[] getSecondaryDescription() { return getTooltip().getStructureInformation(); } - } diff --git a/src/main/java/goodgenerator/blocks/tileEntity/base/LargeFusionComputer.java b/src/main/java/goodgenerator/blocks/tileEntity/base/LargeFusionComputer.java index e563596813..303fc3947d 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/base/LargeFusionComputer.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/base/LargeFusionComputer.java @@ -1,5 +1,12 @@ package goodgenerator.blocks.tileEntity.base; +import static com.github.bartimaeusnek.bartworks.util.RecipeFinderForParallel.getMultiOutput; +import static com.github.bartimaeusnek.bartworks.util.RecipeFinderForParallel.handleParallelRecipe; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.*; +import static gregtech.api.enums.Textures.BlockIcons.*; +import static gregtech.api.util.GT_StructureUtility.ofFrame; +import static gregtech.api.util.GT_StructureUtility.ofHatchAdderOptional; + import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_EnergyMulti; import com.gtnewhorizon.structurelib.alignment.constructable.IConstructable; import com.gtnewhorizon.structurelib.structure.IStructureDefinition; @@ -18,6 +25,7 @@ import gregtech.api.objects.GT_ItemStack; import gregtech.api.render.TextureFactory; 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.InventoryPlayer; import net.minecraft.item.ItemStack; @@ -28,15 +36,6 @@ import net.minecraft.world.ChunkCoordIntPair; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidStack; -import java.util.ArrayList; - -import static com.github.bartimaeusnek.bartworks.util.RecipeFinderForParallel.getMultiOutput; -import static com.github.bartimaeusnek.bartworks.util.RecipeFinderForParallel.handleParallelRecipe; -import static com.gtnewhorizon.structurelib.structure.StructureUtility.*; -import static gregtech.api.enums.Textures.BlockIcons.*; -import static gregtech.api.util.GT_StructureUtility.ofFrame; -import static gregtech.api.util.GT_StructureUtility.ofHatchAdderOptional; - public abstract class LargeFusionComputer extends GT_MetaTileEntity_TooltipMultiBlockBase_EM implements IConstructable { public static final String MAIN_NAME = "largeFusion"; @@ -44,44 +43,57 @@ 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 -> ofHatchAdderOptional(LargeFusionComputer::addInjector, x.textureIndex(), 1, x.getGlassBlock(), x.getGlassMeta())) - ) - .addElement( - 'O', lazy(x -> ofHatchAdderOptional(LargeFusionComputer::addExtractor, x.textureIndex(), 2, x.getGlassBlock(), x.getGlassMeta())) - ) - .addElement( - 'E', lazy(x -> ofHatchAdderOptional(LargeFusionComputer::addEnergyInjector, x.textureIndex(), 3, 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 -> ofHatchAdderOptional( + LargeFusionComputer::addInjector, + x.textureIndex(), + 1, + x.getGlassBlock(), + x.getGlassMeta()))) + .addElement( + 'O', + lazy(x -> ofHatchAdderOptional( + LargeFusionComputer::addExtractor, + x.textureIndex(), + 2, + x.getGlassBlock(), + x.getGlassMeta()))) + .addElement( + 'E', + lazy(x -> ofHatchAdderOptional( + LargeFusionComputer::addEnergyInjector, + x.textureIndex(), + 3, + x.getCasingBlock(), + x.getCasingMeta()))) + .addElement('F', lazy(x -> ofFrame(x.getFrameBox()))) + .build(); + } + }; static { - Textures.BlockIcons.setCasingTextureForId(52, + 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().build() - )); + TextureFactory.builder() + .addIcon(MACHINE_CASING_FUSION_GLASS_YELLOW) + .extFacing() + .build(), + TextureFactory.builder() + .addIcon(MACHINE_CASING_FUSION_GLASS_YELLOW_GLOW) + .extFacing() + .glow() + .build())); } public LargeFusionComputer(String name) { @@ -89,7 +101,7 @@ public abstract class LargeFusionComputer extends GT_MetaTileEntity_TooltipMulti } public LargeFusionComputer(int id, String name, String nameRegional) { - super(id,name,nameRegional); + super(id, name, nameRegional); } @Override @@ -122,7 +134,8 @@ public abstract class LargeFusionComputer extends GT_MetaTileEntity_TooltipMulti public int textureIndex() { return 53; - }; + } + ; public abstract ITexture getTextureOverlay(); @@ -134,7 +147,10 @@ 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 && !mOutputHatches.isEmpty() && (mEnergyHatches.size() + eEnergyMulti.size()) != 0) { + if (structureCheck_EM(MAIN_NAME, 23, 3, 40) + && mInputHatches.size() > 1 + && !mOutputHatches.isEmpty() + && (mEnergyHatches.size() + eEnergyMulti.size()) != 0) { fixAllIssue(); return true; } @@ -159,30 +175,45 @@ public abstract class LargeFusionComputer extends GT_MetaTileEntity_TooltipMulti public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) { if (aBaseMetaTileEntity.isServerSide() && !aBaseMetaTileEntity.isAllowedToWork()) { // if machine has stopped, stop chunkloading - GT_ChunkManager.releaseTicket((TileEntity)aBaseMetaTileEntity); + GT_ChunkManager.releaseTicket((TileEntity) aBaseMetaTileEntity); this.isLoadedChunk = false; - } - else if (aBaseMetaTileEntity.isServerSide() && aBaseMetaTileEntity.isAllowedToWork() && !this.isLoadedChunk) { - //load a 3x3 area when machine is running - GT_ChunkManager.releaseTicket((TileEntity)aBaseMetaTileEntity); + } else if (aBaseMetaTileEntity.isServerSide() && aBaseMetaTileEntity.isAllowedToWork() && !this.isLoadedChunk) { + // load a 3x3 area when machine is running + GT_ChunkManager.releaseTicket((TileEntity) aBaseMetaTileEntity); 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)); - GT_ChunkManager.requestChunkLoad((TileEntity)aBaseMetaTileEntity, new ChunkCoordIntPair(getChunkX() + 1 + offX, getChunkZ() + 1 + offZ)); - GT_ChunkManager.requestChunkLoad((TileEntity)aBaseMetaTileEntity, new ChunkCoordIntPair(getChunkX() + 1 + offX, getChunkZ() + offZ)); - GT_ChunkManager.requestChunkLoad((TileEntity)aBaseMetaTileEntity, new ChunkCoordIntPair(getChunkX() + 1 + offX, getChunkZ() - 1 + offZ)); - GT_ChunkManager.requestChunkLoad((TileEntity)aBaseMetaTileEntity, new ChunkCoordIntPair(getChunkX() - 1 + offX, getChunkZ() + 1 + offZ)); - GT_ChunkManager.requestChunkLoad((TileEntity)aBaseMetaTileEntity, new ChunkCoordIntPair(getChunkX() - 1 + offX, getChunkZ() + offZ)); - GT_ChunkManager.requestChunkLoad((TileEntity)aBaseMetaTileEntity, new ChunkCoordIntPair(getChunkX() - 1 + offX, getChunkZ() - 1 + offZ)); - GT_ChunkManager.requestChunkLoad((TileEntity)aBaseMetaTileEntity, new ChunkCoordIntPair(getChunkX() + offX, getChunkZ() + 1 + offZ)); - GT_ChunkManager.requestChunkLoad((TileEntity)aBaseMetaTileEntity, new ChunkCoordIntPair(getChunkX() + offX, getChunkZ() - 1 + offZ)); + GT_ChunkManager.requestChunkLoad( + (TileEntity) aBaseMetaTileEntity, new ChunkCoordIntPair(getChunkX() + offX, getChunkZ() + offZ)); + GT_ChunkManager.requestChunkLoad( + (TileEntity) aBaseMetaTileEntity, + new ChunkCoordIntPair(getChunkX() + 1 + offX, getChunkZ() + 1 + offZ)); + GT_ChunkManager.requestChunkLoad( + (TileEntity) aBaseMetaTileEntity, + new ChunkCoordIntPair(getChunkX() + 1 + offX, getChunkZ() + offZ)); + GT_ChunkManager.requestChunkLoad( + (TileEntity) aBaseMetaTileEntity, + new ChunkCoordIntPair(getChunkX() + 1 + offX, getChunkZ() - 1 + offZ)); + GT_ChunkManager.requestChunkLoad( + (TileEntity) aBaseMetaTileEntity, + new ChunkCoordIntPair(getChunkX() - 1 + offX, getChunkZ() + 1 + offZ)); + GT_ChunkManager.requestChunkLoad( + (TileEntity) aBaseMetaTileEntity, + new ChunkCoordIntPair(getChunkX() - 1 + offX, getChunkZ() + offZ)); + GT_ChunkManager.requestChunkLoad( + (TileEntity) aBaseMetaTileEntity, + new ChunkCoordIntPair(getChunkX() - 1 + offX, getChunkZ() - 1 + offZ)); + GT_ChunkManager.requestChunkLoad( + (TileEntity) aBaseMetaTileEntity, + new ChunkCoordIntPair(getChunkX() + offX, getChunkZ() + 1 + offZ)); + GT_ChunkManager.requestChunkLoad( + (TileEntity) aBaseMetaTileEntity, + new ChunkCoordIntPair(getChunkX() + offX, getChunkZ() - 1 + offZ)); this.isLoadedChunk = true; } if (aBaseMetaTileEntity.isServerSide()) { if (aTick % 400 == 0) fixAllIssue(); - if (mEfficiency < 0) - mEfficiency = 0; + if (mEfficiency < 0) mEfficiency = 0; if (mRunningOnLoad && checkMachine(aBaseMetaTileEntity, mInventory[1])) { this.mEUStore = (int) aBaseMetaTileEntity.getStoredEU(); checkRecipe(mInventory[1]); @@ -195,11 +226,18 @@ public abstract class LargeFusionComputer extends GT_MetaTileEntity_TooltipMulti if (this.mEnergyHatches != null) { 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)) { - aBaseMetaTileEntity.increaseStoredEnergyUnits(2048L * tierOverclock() * getMaxPara() * extraPara(100), true); + if (aBaseMetaTileEntity.getStoredEU() + + (2048L * tierOverclock() * getMaxPara() * extraPara(100)) + < maxEUStore() + && tHatch.getBaseMetaTileEntity() + .decreaseStoredEnergyUnits( + 2048L * tierOverclock() * getMaxPara() * extraPara(100), + false)) { + aBaseMetaTileEntity.increaseStoredEnergyUnits( + 2048L * tierOverclock() * getMaxPara() * extraPara(100), true); } else if (aBaseMetaTileEntity.getStoredEU() + (2048L * tierOverclock()) < maxEUStore() - && tHatch.getBaseMetaTileEntity().decreaseStoredEnergyUnits(2048L * tierOverclock(), false)) { + && tHatch.getBaseMetaTileEntity() + .decreaseStoredEnergyUnits(2048L * tierOverclock(), false)) { aBaseMetaTileEntity.increaseStoredEnergyUnits(2048L * tierOverclock(), true); } } @@ -207,11 +245,18 @@ public abstract class LargeFusionComputer extends GT_MetaTileEntity_TooltipMulti 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)) { - aBaseMetaTileEntity.increaseStoredEnergyUnits(2048L * tierOverclock() * getMaxPara() * extraPara(100), true); + if (aBaseMetaTileEntity.getStoredEU() + + (2048L * tierOverclock() * getMaxPara() * extraPara(100)) + < maxEUStore() + && tHatch.getBaseMetaTileEntity() + .decreaseStoredEnergyUnits( + 2048L * tierOverclock() * getMaxPara() * extraPara(100), + false)) { + aBaseMetaTileEntity.increaseStoredEnergyUnits( + 2048L * tierOverclock() * getMaxPara() * extraPara(100), true); } else if (aBaseMetaTileEntity.getStoredEU() + (2048L * tierOverclock()) < maxEUStore() - && tHatch.getBaseMetaTileEntity().decreaseStoredEnergyUnits(2048L * tierOverclock(), false)) { + && tHatch.getBaseMetaTileEntity() + .decreaseStoredEnergyUnits(2048L * tierOverclock(), false)) { aBaseMetaTileEntity.increaseStoredEnergyUnits(2048L * tierOverclock(), true); } } @@ -226,17 +271,19 @@ public abstract class LargeFusionComputer extends GT_MetaTileEntity_TooltipMulti for (ItemStack tStack : mOutputItems) if (tStack != null) addOutput(tStack); if (mOutputFluids != null) for (FluidStack tStack : mOutputFluids) if (tStack != null) addOutput(tStack); - mEfficiency = Math.max(0, Math.min(mEfficiency + mEfficiencyIncrease, getMaxEfficiency(mInventory[1]))); + mEfficiency = Math.max( + 0, Math.min(mEfficiency + mEfficiencyIncrease, getMaxEfficiency(mInventory[1]))); mOutputItems = null; mProgresstime = 0; mMaxProgresstime = 0; mEfficiencyIncrease = 0; this.mEUStore = (int) getBaseMetaTileEntity().getStoredEU(); - if (aBaseMetaTileEntity.isAllowedToWork()) - checkRecipe(mInventory[1]); + if (aBaseMetaTileEntity.isAllowedToWork()) checkRecipe(mInventory[1]); } } else { - if (aTick % 100 == 0 || aBaseMetaTileEntity.hasWorkJustBeenEnabled() || aBaseMetaTileEntity.hasInventoryBeenModified()) { + if (aTick % 100 == 0 + || aBaseMetaTileEntity.hasWorkJustBeenEnabled() + || aBaseMetaTileEntity.hasInventoryBeenModified()) { turnCasingActive(mMaxProgresstime > 0); if (aBaseMetaTileEntity.isAllowedToWork()) { this.mEUStore = (int) getBaseMetaTileEntity().getStoredEU(); @@ -245,11 +292,12 @@ 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); + if (mMaxProgresstime <= 0) mEfficiency = Math.max(0, mEfficiency - 1000); } } } else { @@ -258,7 +306,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); } } @@ -288,10 +337,28 @@ public abstract class LargeFusionComputer extends GT_MetaTileEntity_TooltipMulti } @Override - 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()}; + 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() + }; } @Override @@ -336,9 +403,15 @@ public abstract class LargeFusionComputer extends GT_MetaTileEntity_TooltipMulti return (mStartEnergy < 160000000 ? 4 : (mStartEnergy < 320000000 ? 2 : 1)); } if (tierOverclock() == 8) { - return (mStartEnergy < 160000000) ? 8 : ((mStartEnergy < 320000000) ? 4 : (mStartEnergy < 640000000) ? 2 : 1); + return (mStartEnergy < 160000000) + ? 8 + : ((mStartEnergy < 320000000) ? 4 : (mStartEnergy < 640000000) ? 2 : 1); } - return (mStartEnergy < 160000000) ? 16 : ((mStartEnergy < 320000000) ? 8 : ((mStartEnergy < 640000000) ? 4 : (mStartEnergy < 1280000000) ? 2 : 1)); + return (mStartEnergy < 160000000) + ? 16 + : ((mStartEnergy < 320000000) + ? 8 + : ((mStartEnergy < 640000000) ? 4 : (mStartEnergy < 1280000000) ? 2 : 1)); } @Override @@ -347,18 +420,22 @@ 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)))); + int pall = handleParallelRecipe( + 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); @@ -373,12 +450,16 @@ public abstract class LargeFusionComputer extends GT_MetaTileEntity_TooltipMulti long sum = 0; for (GT_MetaTileEntity_Hatch_Energy hatch : mEnergyHatches) { if (isValidMetaTileEntity(hatch)) { - sum += Math.min(2048L * tierOverclock() * getMaxPara() * extraPara(100), hatch.maxEUInput() * hatch.maxAmperesIn()); + sum += Math.min( + 2048L * tierOverclock() * getMaxPara() * extraPara(100), + hatch.maxEUInput() * hatch.maxAmperesIn()); } } for (GT_MetaTileEntity_Hatch_EnergyMulti hatch : eEnergyMulti) { if (isValidMetaTileEntity(hatch)) { - sum += Math.min(2048L * tierOverclock() * getMaxPara() * extraPara(100), hatch.maxEUInput() * hatch.maxAmperesIn()); + sum += Math.min( + 2048L * tierOverclock() * getMaxPara() * extraPara(100), + hatch.maxEUInput() * hatch.maxAmperesIn()); } } return sum; @@ -386,8 +467,7 @@ public abstract class LargeFusionComputer extends GT_MetaTileEntity_TooltipMulti @Override public void onRemoval() { - if (this.isLoadedChunk) - GT_ChunkManager.releaseTicket((TileEntity)getBaseMetaTileEntity()); + if (this.isLoadedChunk) GT_ChunkManager.releaseTicket((TileEntity) getBaseMetaTileEntity()); super.onRemoval(); } @@ -407,8 +487,7 @@ public abstract class LargeFusionComputer extends GT_MetaTileEntity_TooltipMulti if (tHatch.mTier < hatchTier()) return false; tHatch.updateTexture(aBaseCasingIndex); return mEnergyHatches.add(tHatch); - } - else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_EnergyMulti) { + } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_EnergyMulti) { GT_MetaTileEntity_Hatch_EnergyMulti tHatch = (GT_MetaTileEntity_Hatch_EnergyMulti) aMetaTileEntity; if (tHatch.mTier < hatchTier()) return false; tHatch.updateTexture(aBaseCasingIndex); @@ -466,226 +545,234 @@ 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 : hatchTier() == 8 ? EnumChatFormatting.GRAY+"III" + EnumChatFormatting.RESET : "IV"; + 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; if (this.mLastRecipe.getFluidOutput(0) != null) { - plasmaOut = (float)this.mLastRecipe.getFluidOutput(0).amount / (float)this.mLastRecipe.mDuration * this.para; + 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" + }; } 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 ", - " ", - " ", + " ", + " ", + " 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 ", - " ", + " ", + " 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 ", + " 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 ", + " 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 03f3dd9b5f..aad7991984 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/base/LargeFusionComputerPP.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/base/LargeFusionComputerPP.java @@ -1,5 +1,12 @@ package goodgenerator.blocks.tileEntity.base; +import static com.github.bartimaeusnek.bartworks.util.RecipeFinderForParallel.getMultiOutput; +import static com.github.bartimaeusnek.bartworks.util.RecipeFinderForParallel.handleParallelRecipe; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.*; +import static gregtech.api.enums.Textures.BlockIcons.*; +import static gregtech.api.util.GT_StructureUtility.ofFrame; +import static gregtech.api.util.GT_StructureUtility.ofHatchAdderOptional; + import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_EnergyMulti; import com.gtnewhorizon.structurelib.alignment.constructable.IConstructable; import com.gtnewhorizon.structurelib.structure.IStructureDefinition; @@ -7,7 +14,6 @@ import com.gtnewhorizon.structurelib.structure.StructureDefinition; import goodgenerator.client.GUI.LargeFusionComputerGUIClient; import gregtech.api.enums.Materials; import gregtech.api.enums.Textures; -import gregtech.api.interfaces.ISecondaryDescribable; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; @@ -19,6 +25,7 @@ import gregtech.api.objects.GT_ItemStack; import gregtech.api.render.TextureFactory; 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.InventoryPlayer; import net.minecraft.item.ItemStack; @@ -29,60 +36,65 @@ import net.minecraft.world.ChunkCoordIntPair; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidStack; -import java.util.ArrayList; - -import static com.github.bartimaeusnek.bartworks.util.RecipeFinderForParallel.getMultiOutput; -import static com.github.bartimaeusnek.bartworks.util.RecipeFinderForParallel.handleParallelRecipe; -import static com.gtnewhorizon.structurelib.structure.StructureUtility.*; -import static gregtech.api.enums.Textures.BlockIcons.*; -import static gregtech.api.util.GT_StructureUtility.ofFrame; -import static gregtech.api.util.GT_StructureUtility.ofHatchAdderOptional; - -public abstract class LargeFusionComputerPP extends GT_MetaTileEntity_TooltipMultiBlockBase_EM implements IConstructable { +public abstract class LargeFusionComputerPP extends GT_MetaTileEntity_TooltipMultiBlockBase_EM + implements IConstructable { public static final String MAIN_NAME = "largeFusionPP"; private boolean isLoadedChunk; 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 -> ofHatchAdderOptional(LargeFusionComputerPP::addInjector, x.textureIndex(), 1, x.getGlassBlock(), x.getGlassMeta())) - ) - .addElement( - 'O', lazy(x -> ofHatchAdderOptional(LargeFusionComputerPP::addExtractor, x.textureIndex(), 2, x.getGlassBlock(), x.getGlassMeta())) - ) - .addElement( - 'E', lazy(x -> ofHatchAdderOptional(LargeFusionComputerPP::addEnergyInjector, x.textureIndex(), 3, 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 -> ofHatchAdderOptional( + LargeFusionComputerPP::addInjector, + x.textureIndex(), + 1, + x.getGlassBlock(), + x.getGlassMeta()))) + .addElement( + 'O', + lazy(x -> ofHatchAdderOptional( + LargeFusionComputerPP::addExtractor, + x.textureIndex(), + 2, + x.getGlassBlock(), + x.getGlassMeta()))) + .addElement( + 'E', + lazy(x -> ofHatchAdderOptional( + LargeFusionComputerPP::addEnergyInjector, + x.textureIndex(), + 3, + x.getCasingBlock(), + x.getCasingMeta()))) + .addElement('F', lazy(x -> ofFrame(x.getFrameBox()))) + .build(); + } + }; static { - Textures.BlockIcons.setCasingTextureForId(52, + 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().build() - )); + TextureFactory.builder() + .addIcon(MACHINE_CASING_FUSION_GLASS_YELLOW) + .extFacing() + .build(), + TextureFactory.builder() + .addIcon(MACHINE_CASING_FUSION_GLASS_YELLOW_GLOW) + .extFacing() + .glow() + .build())); } public LargeFusionComputerPP(String name) { @@ -90,7 +102,7 @@ public abstract class LargeFusionComputerPP extends GT_MetaTileEntity_TooltipMul } public LargeFusionComputerPP(int id, String name, String nameRegional) { - super(id,name,nameRegional); + super(id, name, nameRegional); } @Override @@ -119,7 +131,8 @@ public abstract class LargeFusionComputerPP extends GT_MetaTileEntity_TooltipMul public int textureIndex() { return 53; - }; + } + ; public abstract ITexture getTextureOverlay(); @@ -133,7 +146,10 @@ 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 && !mOutputHatches.isEmpty() && (mEnergyHatches.size() + eEnergyMulti.size()) != 0) { + if (structureCheck_EM(MAIN_NAME, 23, 3, 40) + && mInputHatches.size() > 1 + && !mOutputHatches.isEmpty() + && (mEnergyHatches.size() + eEnergyMulti.size()) != 0) { fixAllIssue(); return true; } @@ -158,30 +174,45 @@ public abstract class LargeFusionComputerPP extends GT_MetaTileEntity_TooltipMul public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) { if (aBaseMetaTileEntity.isServerSide() && !aBaseMetaTileEntity.isAllowedToWork()) { // if machine has stopped, stop chunkloading - GT_ChunkManager.releaseTicket((TileEntity)aBaseMetaTileEntity); + GT_ChunkManager.releaseTicket((TileEntity) aBaseMetaTileEntity); this.isLoadedChunk = false; - } - else if (aBaseMetaTileEntity.isServerSide() && aBaseMetaTileEntity.isAllowedToWork() && !this.isLoadedChunk) { - //load a 3x3 area when machine is running - GT_ChunkManager.releaseTicket((TileEntity)aBaseMetaTileEntity); + } else if (aBaseMetaTileEntity.isServerSide() && aBaseMetaTileEntity.isAllowedToWork() && !this.isLoadedChunk) { + // load a 3x3 area when machine is running + GT_ChunkManager.releaseTicket((TileEntity) aBaseMetaTileEntity); 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)); - GT_ChunkManager.requestChunkLoad((TileEntity)aBaseMetaTileEntity, new ChunkCoordIntPair(getChunkX() + 1 + offX, getChunkZ() + 1 + offZ)); - GT_ChunkManager.requestChunkLoad((TileEntity)aBaseMetaTileEntity, new ChunkCoordIntPair(getChunkX() + 1 + offX, getChunkZ() + offZ)); - GT_ChunkManager.requestChunkLoad((TileEntity)aBaseMetaTileEntity, new ChunkCoordIntPair(getChunkX() + 1 + offX, getChunkZ() - 1 + offZ)); - GT_ChunkManager.requestChunkLoad((TileEntity)aBaseMetaTileEntity, new ChunkCoordIntPair(getChunkX() - 1 + offX, getChunkZ() + 1 + offZ)); - GT_ChunkManager.requestChunkLoad((TileEntity)aBaseMetaTileEntity, new ChunkCoordIntPair(getChunkX() - 1 + offX, getChunkZ() + offZ)); - GT_ChunkManager.requestChunkLoad((TileEntity)aBaseMetaTileEntity, new ChunkCoordIntPair(getChunkX() - 1 + offX, getChunkZ() - 1 + offZ)); - GT_ChunkManager.requestChunkLoad((TileEntity)aBaseMetaTileEntity, new ChunkCoordIntPair(getChunkX() + offX, getChunkZ() + 1 + offZ)); - GT_ChunkManager.requestChunkLoad((TileEntity)aBaseMetaTileEntity, new ChunkCoordIntPair(getChunkX() + offX, getChunkZ() - 1 + offZ)); + GT_ChunkManager.requestChunkLoad( + (TileEntity) aBaseMetaTileEntity, new ChunkCoordIntPair(getChunkX() + offX, getChunkZ() + offZ)); + GT_ChunkManager.requestChunkLoad( + (TileEntity) aBaseMetaTileEntity, + new ChunkCoordIntPair(getChunkX() + 1 + offX, getChunkZ() + 1 + offZ)); + GT_ChunkManager.requestChunkLoad( + (TileEntity) aBaseMetaTileEntity, + new ChunkCoordIntPair(getChunkX() + 1 + offX, getChunkZ() + offZ)); + GT_ChunkManager.requestChunkLoad( + (TileEntity) aBaseMetaTileEntity, + new ChunkCoordIntPair(getChunkX() + 1 + offX, getChunkZ() - 1 + offZ)); + GT_ChunkManager.requestChunkLoad( + (TileEntity) aBaseMetaTileEntity, + new ChunkCoordIntPair(getChunkX() - 1 + offX, getChunkZ() + 1 + offZ)); + GT_ChunkManager.requestChunkLoad( + (TileEntity) aBaseMetaTileEntity, + new ChunkCoordIntPair(getChunkX() - 1 + offX, getChunkZ() + offZ)); + GT_ChunkManager.requestChunkLoad( + (TileEntity) aBaseMetaTileEntity, + new ChunkCoordIntPair(getChunkX() - 1 + offX, getChunkZ() - 1 + offZ)); + GT_ChunkManager.requestChunkLoad( + (TileEntity) aBaseMetaTileEntity, + new ChunkCoordIntPair(getChunkX() + offX, getChunkZ() + 1 + offZ)); + GT_ChunkManager.requestChunkLoad( + (TileEntity) aBaseMetaTileEntity, + new ChunkCoordIntPair(getChunkX() + offX, getChunkZ() - 1 + offZ)); this.isLoadedChunk = true; } if (aBaseMetaTileEntity.isServerSide()) { if (aTick % 400 == 0) fixAllIssue(); - if (mEfficiency < 0) - mEfficiency = 0; + if (mEfficiency < 0) mEfficiency = 0; if (mRunningOnLoad && checkMachine(aBaseMetaTileEntity, mInventory[1])) { this.mEUStore = aBaseMetaTileEntity.getStoredEU(); checkRecipe(mInventory[1]); @@ -194,11 +225,18 @@ public abstract class LargeFusionComputerPP extends GT_MetaTileEntity_TooltipMul if (this.mEnergyHatches != null) { 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)) { - aBaseMetaTileEntity.increaseStoredEnergyUnits(2048L * tierOverclock() * getMaxPara() * extraPara(100), true); + if (aBaseMetaTileEntity.getStoredEU() + + (2048L * tierOverclock() * getMaxPara() * extraPara(100)) + < maxEUStore() + && tHatch.getBaseMetaTileEntity() + .decreaseStoredEnergyUnits( + 2048L * tierOverclock() * getMaxPara() * extraPara(100), + false)) { + aBaseMetaTileEntity.increaseStoredEnergyUnits( + 2048L * tierOverclock() * getMaxPara() * extraPara(100), true); } else if (aBaseMetaTileEntity.getStoredEU() + (2048L * tierOverclock()) < maxEUStore() - && tHatch.getBaseMetaTileEntity().decreaseStoredEnergyUnits(2048L * tierOverclock(), false)) { + && tHatch.getBaseMetaTileEntity() + .decreaseStoredEnergyUnits(2048L * tierOverclock(), false)) { aBaseMetaTileEntity.increaseStoredEnergyUnits(2048L * tierOverclock(), true); } } @@ -206,11 +244,18 @@ public abstract class LargeFusionComputerPP extends GT_MetaTileEntity_TooltipMul 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)) { - aBaseMetaTileEntity.increaseStoredEnergyUnits(2048L * tierOverclock() * getMaxPara() * extraPara(100), true); + if (aBaseMetaTileEntity.getStoredEU() + + (2048L * tierOverclock() * getMaxPara() * extraPara(100)) + < maxEUStore() + && tHatch.getBaseMetaTileEntity() + .decreaseStoredEnergyUnits( + 2048L * tierOverclock() * getMaxPara() * extraPara(100), + false)) { + aBaseMetaTileEntity.increaseStoredEnergyUnits( + 2048L * tierOverclock() * getMaxPara() * extraPara(100), true); } else if (aBaseMetaTileEntity.getStoredEU() + (2048L * tierOverclock()) < maxEUStore() - && tHatch.getBaseMetaTileEntity().decreaseStoredEnergyUnits(2048L * tierOverclock(), false)) { + && tHatch.getBaseMetaTileEntity() + .decreaseStoredEnergyUnits(2048L * tierOverclock(), false)) { aBaseMetaTileEntity.increaseStoredEnergyUnits(2048L * tierOverclock(), true); } } @@ -225,17 +270,19 @@ public abstract class LargeFusionComputerPP extends GT_MetaTileEntity_TooltipMul for (ItemStack tStack : mOutputItems) if (tStack != null) addOutput(tStack); if (mOutputFluids != null) for (FluidStack tStack : mOutputFluids) if (tStack != null) addOutput(tStack); - mEfficiency = Math.max(0, Math.min(mEfficiency + mEfficiencyIncrease, getMaxEfficiency(mInventory[1]))); + mEfficiency = Math.max( + 0, Math.min(mEfficiency + mEfficiencyIncrease, getMaxEfficiency(mInventory[1]))); mOutputItems = null; mProgresstime = 0; mMaxProgresstime = 0; mEfficiencyIncrease = 0; this.mEUStore = getBaseMetaTileEntity().getStoredEU(); - if (aBaseMetaTileEntity.isAllowedToWork()) - checkRecipe(mInventory[1]); + if (aBaseMetaTileEntity.isAllowedToWork()) checkRecipe(mInventory[1]); } } else { - if (aTick % 100 == 0 || aBaseMetaTileEntity.hasWorkJustBeenEnabled() || aBaseMetaTileEntity.hasInventoryBeenModified()) { + if (aTick % 100 == 0 + || aBaseMetaTileEntity.hasWorkJustBeenEnabled() + || aBaseMetaTileEntity.hasInventoryBeenModified()) { turnCasingActive(mMaxProgresstime > 0); if (aBaseMetaTileEntity.isAllowedToWork()) { this.mEUStore = getBaseMetaTileEntity().getStoredEU(); @@ -244,11 +291,12 @@ 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); + if (mMaxProgresstime <= 0) mEfficiency = Math.max(0, mEfficiency - 1000); } } } else { @@ -257,7 +305,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); } } @@ -287,10 +336,28 @@ public abstract class LargeFusionComputerPP extends GT_MetaTileEntity_TooltipMul } @Override - 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()}; + 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() + }; } @Override @@ -334,18 +401,22 @@ 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)))); + int pall = handleParallelRecipe( + 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); @@ -360,12 +431,16 @@ public abstract class LargeFusionComputerPP extends GT_MetaTileEntity_TooltipMul long sum = 0; for (GT_MetaTileEntity_Hatch_Energy hatch : mEnergyHatches) { if (isValidMetaTileEntity(hatch)) { - sum += Math.min(2048L * tierOverclock() * getMaxPara() * extraPara(100), hatch.maxEUInput() * hatch.maxAmperesIn()); + sum += Math.min( + 2048L * tierOverclock() * getMaxPara() * extraPara(100), + hatch.maxEUInput() * hatch.maxAmperesIn()); } } for (GT_MetaTileEntity_Hatch_EnergyMulti hatch : eEnergyMulti) { if (isValidMetaTileEntity(hatch)) { - sum += Math.min(2048L * tierOverclock() * getMaxPara() * extraPara(100), hatch.maxEUInput() * hatch.maxAmperesIn()); + sum += Math.min( + 2048L * tierOverclock() * getMaxPara() * extraPara(100), + hatch.maxEUInput() * hatch.maxAmperesIn()); } } return sum; @@ -373,8 +448,7 @@ public abstract class LargeFusionComputerPP extends GT_MetaTileEntity_TooltipMul @Override public void onRemoval() { - if (this.isLoadedChunk) - GT_ChunkManager.releaseTicket((TileEntity)getBaseMetaTileEntity()); + if (this.isLoadedChunk) GT_ChunkManager.releaseTicket((TileEntity) getBaseMetaTileEntity()); super.onRemoval(); } @@ -394,8 +468,7 @@ public abstract class LargeFusionComputerPP extends GT_MetaTileEntity_TooltipMul if (tHatch.mTier < hatchTier()) return false; tHatch.updateTexture(aBaseCasingIndex); return mEnergyHatches.add(tHatch); - } - else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_EnergyMulti) { + } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_EnergyMulti) { GT_MetaTileEntity_Hatch_EnergyMulti tHatch = (GT_MetaTileEntity_Hatch_EnergyMulti) aMetaTileEntity; if (tHatch.mTier < hatchTier()) return false; tHatch.updateTexture(aBaseCasingIndex); @@ -453,226 +526,232 @@ public abstract class LargeFusionComputerPP extends GT_MetaTileEntity_TooltipMul @Override public String[] getInfoData() { - String tier = hatchTier() == 9 ? EnumChatFormatting.BLUE+"IV"+EnumChatFormatting.RESET : EnumChatFormatting.GOLD+"V"+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 * this.para; + 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" + }; } 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 ", - " ", - " ", + " ", + " ", + " 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 ", - " ", + " ", + " 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 ", + " 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 ", + " 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 e97cbd6e86..df6c962106 100644 --- a/src/main/java/goodgenerator/client/ClientProxy.java +++ b/src/main/java/goodgenerator/client/ClientProxy.java @@ -1,21 +1,23 @@ package goodgenerator.client; -import goodgenerator.common.CommonProxy; import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; +import goodgenerator.common.CommonProxy; public class ClientProxy extends CommonProxy { @Override - public void preInit(FMLPreInitializationEvent event){ + public void preInit(FMLPreInitializationEvent event) { super.preInit(event); } + @Override - public void init(FMLInitializationEvent event){ + public void init(FMLInitializationEvent event) { super.init(event); } + @Override - public void postInit(FMLPostInitializationEvent event){ + public void postInit(FMLPostInitializationEvent event) { super.postInit(event); } } diff --git a/src/main/java/goodgenerator/client/GUI/LargeFusionComputerGUIClient.java b/src/main/java/goodgenerator/client/GUI/LargeFusionComputerGUIClient.java index 58b0f7bc0d..51899b09cd 100644 --- a/src/main/java/goodgenerator/client/GUI/LargeFusionComputerGUIClient.java +++ b/src/main/java/goodgenerator/client/GUI/LargeFusionComputerGUIClient.java @@ -9,7 +9,8 @@ import net.minecraft.util.StatCollector; public class LargeFusionComputerGUIClient extends GT_GUIContainer_MultiMachineEM { - public LargeFusionComputerGUIClient(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity, String aName, String aTextureFile) { + public LargeFusionComputerGUIClient( + InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity, String aName, String aTextureFile) { super(new YOTTankGUIContainer(aInventoryPlayer, aTileEntity), aName, aTextureFile, true, true, true); } @@ -17,9 +18,18 @@ public class LargeFusionComputerGUIClient extends GT_GUIContainer_MultiMachineEM protected void drawGuiContainerForegroundLayer(int par1, int par2) { super.drawGuiContainerForegroundLayer(par1, par2); if (this.mContainer.mDisplayErrorCode == 0) { - fontRendererObj.drawString(StatCollector.translateToLocal("gui.LargeFusion.0") + " " + GT_Utility.formatNumbers(this.mContainer.mStorage) + " EU", 7, 40, 16448255); - fontRendererObj.drawString(StatCollector.translateToLocal("gui.LargeFusion.1") + " " + GT_Utility.formatNumbers(this.mContainer.mEnergy) + " EU", 7, 48, 16448255); + fontRendererObj.drawString( + StatCollector.translateToLocal("gui.LargeFusion.0") + " " + + GT_Utility.formatNumbers(this.mContainer.mStorage) + " EU", + 7, + 40, + 16448255); + fontRendererObj.drawString( + StatCollector.translateToLocal("gui.LargeFusion.1") + " " + + GT_Utility.formatNumbers(this.mContainer.mEnergy) + " EU", + 7, + 48, + 16448255); } } - } diff --git a/src/main/java/goodgenerator/client/GUI/NeutronActivatorGUIClient.java b/src/main/java/goodgenerator/client/GUI/NeutronActivatorGUIClient.java index c3f7992a17..1bd0b09f99 100644 --- a/src/main/java/goodgenerator/client/GUI/NeutronActivatorGUIClient.java +++ b/src/main/java/goodgenerator/client/GUI/NeutronActivatorGUIClient.java @@ -1,9 +1,9 @@ package goodgenerator.client.GUI; -import goodgenerator.common.container.NeutronActivatorGUIContainer; import com.github.technus.tectech.thing.metaTileEntity.multi.base.GT_GUIContainer_MultiMachineEM; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import goodgenerator.common.container.NeutronActivatorGUIContainer; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.StatCollector; @@ -13,7 +13,8 @@ public class NeutronActivatorGUIClient extends GT_GUIContainer_MultiMachineEM { private final NeutronActivatorGUIContainer containerNeutronActivator; - public NeutronActivatorGUIClient(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity, String aName, String aTextureFile) { + public NeutronActivatorGUIClient( + InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity, String aName, String aTextureFile) { super(new NeutronActivatorGUIContainer(aInventoryPlayer, aTileEntity), aName, aTextureFile, true, true, true); containerNeutronActivator = (NeutronActivatorGUIContainer) this.mContainer; } @@ -39,5 +40,4 @@ public class NeutronActivatorGUIClient extends GT_GUIContainer_MultiMachineEM { num2 /= 1000F; return String.format("%.1fM", num2); } - } diff --git a/src/main/java/goodgenerator/client/GUI/NeutronSensorGUIClient.java b/src/main/java/goodgenerator/client/GUI/NeutronSensorGUIClient.java index 5070d80ead..b2ddd6b04a 100644 --- a/src/main/java/goodgenerator/client/GUI/NeutronSensorGUIClient.java +++ b/src/main/java/goodgenerator/client/GUI/NeutronSensorGUIClient.java @@ -1,10 +1,10 @@ package goodgenerator.client.GUI; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import goodgenerator.main.GoodGenerator; import goodgenerator.network.MessageSetNeutronSensorData; import goodgenerator.util.CharExchanger; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import gregtech.api.gui.GT_GUIContainerMetaTile_Machine; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import net.minecraft.client.gui.GuiTextField; @@ -20,15 +20,16 @@ public class NeutronSensorGUIClient extends GT_GUIContainerMetaTile_Machine { private GuiTextField TextBox; private String context; - public NeutronSensorGUIClient(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity, String aTexture, String text) { + public NeutronSensorGUIClient( + InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity, String aTexture, String text) { super(aInventoryPlayer, aTileEntity, aTexture); this.mName = "Neutron Sensor"; this.mContainer.detectAndSendChanges(); if (text == null) this.context = ""; - else this.context = text; + else this.context = text; } - public void initGui(){ + public void initGui() { super.initGui(); this.TextBox = new GuiTextField(this.fontRendererObj, 8, 48, 100, 18); TextBox.setMaxStringLength(20); @@ -44,12 +45,18 @@ public class NeutronSensorGUIClient extends GT_GUIContainerMetaTile_Machine { if (TextBox.getText() != null) { if (isValidSuffix(TextBox.getText())) { if (CharExchanger.isValidCompareExpress(rawProcessExp(TextBox.getText()))) - this.fontRendererObj.drawString(StatCollector.translateToLocal("gui.NeutronSensor.2"), 120, 53, 0x077d02); - else this.fontRendererObj.drawString(StatCollector.translateToLocal("gui.NeutronSensor.3"), 120, 53, 0xff0000); - } - else this.fontRendererObj.drawString(StatCollector.translateToLocal("gui.NeutronSensor.3"), 120, 53, 0xff0000); + this.fontRendererObj.drawString( + StatCollector.translateToLocal("gui.NeutronSensor.2"), 120, 53, 0x077d02); + else + this.fontRendererObj.drawString( + StatCollector.translateToLocal("gui.NeutronSensor.3"), 120, 53, 0xff0000); + } else + this.fontRendererObj.drawString( + StatCollector.translateToLocal("gui.NeutronSensor.3"), 120, 53, 0xff0000); } - this.mc.getTextureManager().bindTexture(new ResourceLocation(GoodGenerator.MOD_ID + ":textures/gui/NeutronSensorGUI.png")); + this.mc + .getTextureManager() + .bindTexture(new ResourceLocation(GoodGenerator.MOD_ID + ":textures/gui/NeutronSensorGUI.png")); } protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) { @@ -60,8 +67,7 @@ public class NeutronSensorGUIClient extends GT_GUIContainerMetaTile_Machine { } protected void keyTyped(char par1, int par2) { - if (!this.TextBox.isFocused()) - super.keyTyped(par1, par2); + if (!this.TextBox.isFocused()) super.keyTyped(par1, par2); if (par2 == 1) this.mc.thePlayer.closeScreen(); this.TextBox.textboxKeyTyped(par1, par2); } @@ -79,13 +85,14 @@ public class NeutronSensorGUIClient extends GT_GUIContainerMetaTile_Machine { @Override public void onGuiClosed() { if (CharExchanger.isValidCompareExpress(rawProcessExp(TextBox.getText()))) - GoodGenerator.CHANNEL.sendToServer(new MessageSetNeutronSensorData(mContainer.mTileEntity, TextBox.getText())); + GoodGenerator.CHANNEL.sendToServer( + new MessageSetNeutronSensorData(mContainer.mTileEntity, TextBox.getText())); super.onGuiClosed(); } protected String rawProcessExp(String exp) { StringBuilder ret = new StringBuilder(); - for (char c: exp.toCharArray()) { + for (char c : exp.toCharArray()) { if (exp.length() - ret.length() == 3) { if (Character.isDigit(c)) ret.append(c); break; @@ -105,6 +112,10 @@ public class NeutronSensorGUIClient extends GT_GUIContainerMetaTile_Machine { 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' || exp.charAt(index) == 'K' || exp.charAt(index) == 'k' || Character.isDigit(exp.charAt(index)); + 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/client/GUI/YOTTankGUIClient.java b/src/main/java/goodgenerator/client/GUI/YOTTankGUIClient.java index 82d8b19e35..e4a93fb6e2 100644 --- a/src/main/java/goodgenerator/client/GUI/YOTTankGUIClient.java +++ b/src/main/java/goodgenerator/client/GUI/YOTTankGUIClient.java @@ -1,8 +1,8 @@ package goodgenerator.client.GUI; +import com.github.technus.tectech.thing.metaTileEntity.multi.base.GT_GUIContainer_MultiMachineEM; import goodgenerator.common.container.YOTTankGUIContainer; import goodgenerator.util.CharExchanger; -import com.github.technus.tectech.thing.metaTileEntity.multi.base.GT_GUIContainer_MultiMachineEM; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.StatCollector; @@ -11,7 +11,8 @@ public class YOTTankGUIClient extends GT_GUIContainer_MultiMachineEM { private final YOTTankGUIContainer containerYOTTank; - public YOTTankGUIClient(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity, String aName, String aTextureFile) { + public YOTTankGUIClient( + InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity, String aName, String aTextureFile) { super(new YOTTankGUIContainer(aInventoryPlayer, aTileEntity), aName, aTextureFile, true, true, true); containerYOTTank = (YOTTankGUIContainer) this.mContainer; } @@ -20,9 +21,24 @@ public class YOTTankGUIClient extends GT_GUIContainer_MultiMachineEM { protected void drawGuiContainerForegroundLayer(int par1, int par2) { super.drawGuiContainerForegroundLayer(par1, par2); if (this.mContainer.mDisplayErrorCode == 0) { - fontRendererObj.drawString(StatCollector.translateToLocal("gui.YOTTank.0") + " " + CharExchanger.formatNumber(containerYOTTank.getCap()) + " L", 7, 40, 16448255); - fontRendererObj.drawString(StatCollector.translateToLocal("gui.YOTTank.1") + " " + CharExchanger.formatNumber(containerYOTTank.getFluidName()), 7, 48, 16448255); - fontRendererObj.drawString(StatCollector.translateToLocal("gui.YOTTank.2") + " " + CharExchanger.formatNumber(containerYOTTank.getStorage()) + " L", 7, 56, 16448255); + fontRendererObj.drawString( + StatCollector.translateToLocal("gui.YOTTank.0") + " " + + CharExchanger.formatNumber(containerYOTTank.getCap()) + " L", + 7, + 40, + 16448255); + fontRendererObj.drawString( + StatCollector.translateToLocal("gui.YOTTank.1") + " " + + CharExchanger.formatNumber(containerYOTTank.getFluidName()), + 7, + 48, + 16448255); + fontRendererObj.drawString( + StatCollector.translateToLocal("gui.YOTTank.2") + " " + + CharExchanger.formatNumber(containerYOTTank.getStorage()) + " L", + 7, + 56, + 16448255); } } } diff --git a/src/main/java/goodgenerator/client/render/BlockRenderHandler.java b/src/main/java/goodgenerator/client/render/BlockRenderHandler.java index 6fad73ba21..d9ddd62d97 100644 --- a/src/main/java/goodgenerator/client/render/BlockRenderHandler.java +++ b/src/main/java/goodgenerator/client/render/BlockRenderHandler.java @@ -1,5 +1,9 @@ package goodgenerator.client.render; +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; @@ -10,10 +14,6 @@ import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.world.IBlockAccess; import org.lwjgl.opengl.GL11; -import static gregtech.common.render.GT_Renderer_Block.*; -import static net.minecraftforge.common.util.ForgeDirection.*; -import static net.minecraftforge.common.util.ForgeDirection.EAST; - public class BlockRenderHandler implements ISimpleBlockRenderingHandler { public static final float blockMin = 0.0F; @@ -39,12 +39,18 @@ public class BlockRenderHandler implements ISimpleBlockRenderingHandler { ITextureBlock tc = (ITextureBlock) aBlock; aBlock.setBlockBoundsForItemRender(); aRenderer.setRenderBoundsFromBlock(aBlock); - renderNegativeYFacing(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); - renderNegativeZFacing(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); - renderNegativeXFacing(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); + renderNegativeYFacing( + 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); + renderNegativeZFacing( + 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); + renderNegativeXFacing( + 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); } aBlock.setBlockBounds(blockMin, blockMin, blockMin, blockMax, blockMax, blockMax); @@ -55,19 +61,68 @@ 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) { aBlock.setBlockBounds(blockMin, blockMin, blockMin, blockMax, blockMax, blockMax); aRenderer.setRenderBoundsFromBlock(aBlock); ITextureBlock tc = (ITextureBlock) aBlock; - renderNegativeYFacing(aWorld, aRenderer, aBlock, aX, aY, aZ, tc.getTexture(aBlock, (byte) DOWN.ordinal(), aWorld, aX, aY, aZ), true); - renderPositiveYFacing(aWorld, aRenderer, aBlock, aX, aY, aZ, tc.getTexture(aBlock, (byte) UP.ordinal(), aWorld, aX, aY, aZ), true); - renderNegativeZFacing(aWorld, aRenderer, aBlock, aX, aY, aZ, tc.getTexture(aBlock, (byte) NORTH.ordinal(), aWorld, aX, aY, aZ), true); - renderPositiveZFacing(aWorld, aRenderer, aBlock, aX, aY, aZ, tc.getTexture(aBlock, (byte) SOUTH.ordinal(), aWorld, aX, aY, aZ), true); - renderNegativeXFacing(aWorld, aRenderer, aBlock, aX, aY, aZ, tc.getTexture(aBlock, (byte) WEST.ordinal(), aWorld, aX, aY, aZ), true); - renderPositiveXFacing(aWorld, aRenderer, aBlock, aX, aY, aZ, tc.getTexture(aBlock, (byte) EAST.ordinal(), aWorld, aX, aY, aZ), true); + renderNegativeYFacing( + aWorld, + aRenderer, + aBlock, + aX, + aY, + aZ, + tc.getTexture(aBlock, (byte) DOWN.ordinal(), aWorld, aX, aY, aZ), + true); + renderPositiveYFacing( + aWorld, + aRenderer, + aBlock, + aX, + aY, + aZ, + tc.getTexture(aBlock, (byte) UP.ordinal(), aWorld, aX, aY, aZ), + true); + renderNegativeZFacing( + aWorld, + aRenderer, + aBlock, + aX, + aY, + aZ, + tc.getTexture(aBlock, (byte) NORTH.ordinal(), aWorld, aX, aY, aZ), + true); + renderPositiveZFacing( + aWorld, + aRenderer, + aBlock, + aX, + aY, + aZ, + tc.getTexture(aBlock, (byte) SOUTH.ordinal(), aWorld, aX, aY, aZ), + true); + renderNegativeXFacing( + aWorld, + aRenderer, + aBlock, + aX, + aY, + aZ, + tc.getTexture(aBlock, (byte) WEST.ordinal(), aWorld, aX, aY, aZ), + true); + renderPositiveXFacing( + aWorld, + aRenderer, + aBlock, + aX, + aY, + aZ, + tc.getTexture(aBlock, (byte) EAST.ordinal(), aWorld, aX, aY, aZ), + true); } return false; } diff --git a/src/main/java/goodgenerator/common/CommonProxy.java b/src/main/java/goodgenerator/common/CommonProxy.java index 7a270b9550..528e165bb4 100644 --- a/src/main/java/goodgenerator/common/CommonProxy.java +++ b/src/main/java/goodgenerator/common/CommonProxy.java @@ -5,7 +5,9 @@ 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){} - public void postInit(FMLPostInitializationEvent event){} + public void preInit(FMLPreInitializationEvent event) {} + + public void init(FMLInitializationEvent event) {} + + public void postInit(FMLPostInitializationEvent event) {} } diff --git a/src/main/java/goodgenerator/common/container/NeutronActivatorGUIContainer.java b/src/main/java/goodgenerator/common/container/NeutronActivatorGUIContainer.java index 772557957e..c13e290755 100644 --- a/src/main/java/goodgenerator/common/container/NeutronActivatorGUIContainer.java +++ b/src/main/java/goodgenerator/common/container/NeutronActivatorGUIContainer.java @@ -1,16 +1,15 @@ package goodgenerator.common.container; -import goodgenerator.blocks.tileEntity.NeutronActivator; import com.github.technus.tectech.thing.metaTileEntity.multi.base.GT_Container_MultiMachineEM; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import goodgenerator.blocks.tileEntity.NeutronActivator; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; +import java.nio.ByteBuffer; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.ICrafting; -import java.nio.ByteBuffer; - public class NeutronActivatorGUIContainer extends GT_Container_MultiMachineEM { private int KineticE; @@ -34,7 +33,7 @@ public class NeutronActivatorGUIContainer extends GT_Container_MultiMachineEM { if (buffer == null) { buffer = ByteBuffer.allocate(Integer.BYTES); } - if(mTileEntity.isServerSide()) { + if (mTileEntity.isServerSide()) { NeutronActivator tile = (NeutronActivator) mTileEntity.getMetaTileEntity(); if (tile == null) return; int currentKineticE = tile.getCurrentNeutronKineticEnergy(); @@ -68,7 +67,7 @@ public class NeutronActivatorGUIContainer extends GT_Container_MultiMachineEM { public void updateProgressBar(int index, int value) { super.updateProgressBar(index, value); index = index - 21; - if(index >= 0 && index < buffer.capacity()) { + if (index >= 0 && index < buffer.capacity()) { buffer.put(index, (byte) value); } } diff --git a/src/main/java/goodgenerator/common/container/YOTTankGUIContainer.java b/src/main/java/goodgenerator/common/container/YOTTankGUIContainer.java index 9d378dc203..05a5352132 100644 --- a/src/main/java/goodgenerator/common/container/YOTTankGUIContainer.java +++ b/src/main/java/goodgenerator/common/container/YOTTankGUIContainer.java @@ -1,17 +1,16 @@ package goodgenerator.common.container; -import goodgenerator.blocks.tileEntity.YottaFluidTank; import com.github.technus.tectech.thing.metaTileEntity.multi.base.GT_Container_MultiMachineEM; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import goodgenerator.blocks.tileEntity.YottaFluidTank; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; +import java.nio.ByteBuffer; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.ICrafting; import net.minecraft.util.StatCollector; -import java.nio.ByteBuffer; - public class YOTTankGUIContainer extends GT_Container_MultiMachineEM { private String currentStore = ""; @@ -36,7 +35,9 @@ public class YOTTankGUIContainer extends GT_Container_MultiMachineEM { buffer.putChar(Integer.BYTES * 3 + Character.BYTES * (i + currentStore.length()), store.charAt(i)); } for (int i = 0; i < fluidName.length(); ++i) { - buffer.putChar(Integer.BYTES * 3 + Character.BYTES * (i + currentStore.length() + store.length()), fluidName.charAt(i)); + buffer.putChar( + Integer.BYTES * 3 + Character.BYTES * (i + currentStore.length() + store.length()), + fluidName.charAt(i)); } sendStateUpdate(clientHandle); super.addCraftingToCrafters(clientHandle); @@ -48,7 +49,7 @@ public class YOTTankGUIContainer extends GT_Container_MultiMachineEM { if (buffer == null) { buffer = ByteBuffer.allocate(8192); } - if(mTileEntity.isServerSide()) { + if (mTileEntity.isServerSide()) { YottaFluidTank tile = (YottaFluidTank) mTileEntity.getMetaTileEntity(); if (tile == null) return; String newStored = tile.getStored(); @@ -69,7 +70,9 @@ public class YOTTankGUIContainer extends GT_Container_MultiMachineEM { buffer.putChar(Integer.BYTES * 3 + Character.BYTES * (i + currentStore.length()), store.charAt(i)); } for (int i = 0; i < fluidName.length(); ++i) { - buffer.putChar(Integer.BYTES * 3 + Character.BYTES * (i + currentStore.length() + store.length()), fluidName.charAt(i)); + buffer.putChar( + Integer.BYTES * 3 + Character.BYTES * (i + currentStore.length() + store.length()), + fluidName.charAt(i)); } isUpdated = true; } @@ -87,7 +90,8 @@ public class YOTTankGUIContainer extends GT_Container_MultiMachineEM { } private void sendStateUpdate(ICrafting clientHandle) { - final int bytes = Integer.BYTES * 3 + Character.BYTES * (currentStore.length() + store.length() + fluidName.length()); + final int bytes = + Integer.BYTES * 3 + Character.BYTES * (currentStore.length() + store.length() + fluidName.length()); for (int i = 0; i < bytes; i++) { clientHandle.sendProgressBarUpdate(this, i + 300, buffer.get(i)); } @@ -97,7 +101,7 @@ public class YOTTankGUIContainer extends GT_Container_MultiMachineEM { public void updateProgressBar(int index, int value) { super.updateProgressBar(index, value); index = index - 300; - if(index >= 0 && index < buffer.capacity()) { + if (index >= 0 && index < buffer.capacity()) { buffer.put(index, (byte) value); } } diff --git a/src/main/java/goodgenerator/crossmod/LoadedList.java b/src/main/java/goodgenerator/crossmod/LoadedList.java index f5a30509f8..0079e60dcd 100644 --- a/src/main/java/goodgenerator/crossmod/LoadedList.java +++ b/src/main/java/goodgenerator/crossmod/LoadedList.java @@ -23,5 +23,4 @@ public class LoadedList { AUTOMAGY = Loader.isModLoaded("Automagy"); WITCHING_GADGETS = Loader.isModLoaded("WitchingGadgets"); } - } diff --git a/src/main/java/goodgenerator/crossmod/ic2/CropsLoader.java b/src/main/java/goodgenerator/crossmod/ic2/CropsLoader.java index ce9e9f74a1..0c94742ddb 100644 --- a/src/main/java/goodgenerator/crossmod/ic2/CropsLoader.java +++ b/src/main/java/goodgenerator/crossmod/ic2/CropsLoader.java @@ -7,5 +7,4 @@ public class CropsLoader { public static void registerCrops() { Crops.instance.registerCrop(new GGCropsSaltyRoot("saltroot")); } - } diff --git a/src/main/java/goodgenerator/crossmod/ic2/GGCropsSaltyRoot.java b/src/main/java/goodgenerator/crossmod/ic2/GGCropsSaltyRoot.java index 77d4f2edee..030b30b270 100644 --- a/src/main/java/goodgenerator/crossmod/ic2/GGCropsSaltyRoot.java +++ b/src/main/java/goodgenerator/crossmod/ic2/GGCropsSaltyRoot.java @@ -6,15 +6,14 @@ 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 java.util.Arrays; -import java.util.List; - public class GGCropsSaltyRoot extends CropCard implements ICropCardInfo { private final String cropName; @@ -88,7 +87,7 @@ public class GGCropsSaltyRoot extends CropCard implements ICropCardInfo { public void registerSprites(IIconRegister iconRegister) { textures = new IIcon[maxSize()]; for (int i = 1; i <= textures.length; i++) { - textures[i - 1] = iconRegister.registerIcon(GoodGenerator.MOD_ID + ":crops/"+name()+"."+i); + textures[i - 1] = iconRegister.registerIcon(GoodGenerator.MOD_ID + ":crops/" + name() + "." + i); } } @@ -111,15 +110,12 @@ public class GGCropsSaltyRoot extends CropCard implements ICropCardInfo { @Override public int weightInfluences(ICropTile crop, float humidity, float nutrients, float air) { - return (int) ( - humidity + nutrients * 2 + air); + return (int) (-humidity + nutrients * 2 + air); } @Override public List<String> getCropInformation() { - return Arrays.asList( - "It prefers dry environment.", - "Inedible." - ); + return Arrays.asList("It prefers dry environment.", "Inedible."); } @Override diff --git a/src/main/java/goodgenerator/crossmod/nei/ExtremeHeatExchangerHandler.java b/src/main/java/goodgenerator/crossmod/nei/ExtremeHeatExchangerHandler.java index 4397c3ab5e..d2bc69d90b 100644 --- a/src/main/java/goodgenerator/crossmod/nei/ExtremeHeatExchangerHandler.java +++ b/src/main/java/goodgenerator/crossmod/nei/ExtremeHeatExchangerHandler.java @@ -8,18 +8,22 @@ import gregtech.api.enums.GT_Values; import gregtech.api.util.GT_Recipe; import gregtech.api.util.GT_Utility; import gregtech.nei.GT_NEI_DefaultHandler; +import java.awt.*; import net.minecraft.util.StatCollector; import net.minecraftforge.fluids.FluidStack; -import java.awt.*; - public class ExtremeHeatExchangerHandler extends GT_NEI_DefaultHandler { public ExtremeHeatExchangerHandler(GT_Recipe.GT_Recipe_Map aRecipeMap) { super(aRecipeMap); - this.transferRects.add(new TemplateRecipeHandler.RecipeTransferRect(new Rectangle(65, 13, 36, 18), this.getOverlayIdentifier())); + this.transferRects.add(new TemplateRecipeHandler.RecipeTransferRect( + new Rectangle(65, 13, 36, 18), this.getOverlayIdentifier())); if (!NEI_Config.isAdded) { - FMLInterModComms.sendRuntimeMessage(GT_Values.GT, "NEIPlugins", "register-crafting-handler", "gregtech@" + this.getRecipeName() + "@" + this.getOverlayIdentifier()); + FMLInterModComms.sendRuntimeMessage( + GT_Values.GT, + "NEIPlugins", + "register-crafting-handler", + "gregtech@" + this.getRecipeName() + "@" + this.getOverlayIdentifier()); GuiCraftingRecipe.craftinghandlers.add(this); GuiUsageRecipe.usagehandlers.add(this); } @@ -35,12 +39,20 @@ public class ExtremeHeatExchangerHandler extends GT_NEI_DefaultHandler { FluidStack[] Inputs = ((CachedDefaultRecipe) this.arecipes.get(aRecipeIndex)).mRecipe.mFluidInputs; FluidStack[] Outputs = ((CachedDefaultRecipe) this.arecipes.get(aRecipeIndex)).mRecipe.mFluidOutputs; int Threshold = ((CachedDefaultRecipe) this.arecipes.get(aRecipeIndex)).mRecipe.mSpecialValue; - drawText(10, 73, StatCollector.translateToLocal("value.extreme_heat_exchanger.0") + " " + GT_Utility.formatNumbers(Inputs[0].amount) + " L/s", -16777216); + drawText( + 10, + 73, + StatCollector.translateToLocal("value.extreme_heat_exchanger.0") + " " + + GT_Utility.formatNumbers(Inputs[0].amount) + " L/s", + -16777216); drawText(10, 83, StatCollector.translateToLocal("value.extreme_heat_exchanger.1"), -16777216); drawText(10, 93, GT_Utility.formatNumbers(Outputs[0].amount / 160) + " L/s", -16777216); drawText(10, 103, StatCollector.translateToLocal("value.extreme_heat_exchanger.2"), -16777216); drawText(10, 113, GT_Utility.formatNumbers(Outputs[1].amount / 160) + " L/s", -16777216); - drawText(10, 123, StatCollector.translateToLocal("value.extreme_heat_exchanger.4") + " " + Threshold + " L/s", -16777216); + drawText( + 10, + 123, + StatCollector.translateToLocal("value.extreme_heat_exchanger.4") + " " + Threshold + " L/s", + -16777216); } - } diff --git a/src/main/java/goodgenerator/crossmod/nei/IMCForNEI.java b/src/main/java/goodgenerator/crossmod/nei/IMCForNEI.java index c1fae90a88..bcae911545 100644 --- a/src/main/java/goodgenerator/crossmod/nei/IMCForNEI.java +++ b/src/main/java/goodgenerator/crossmod/nei/IMCForNEI.java @@ -22,7 +22,8 @@ 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 MK-V + // sendCatalyst("gt.recipe.fusionreactor", "gregtech:gt.blockmachines:32023", -10); // Compact Fusion + // MK-V sendCatalyst("gt.recipe.complexfusionreactor", "gregtech:gt.blockmachines:32019", -10); sendCatalyst("gt.recipe.complexfusionreactor", "gregtech:gt.blockmachines:32020", -10); @@ -30,7 +31,8 @@ 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 Fusion MK-V + // sendCatalyst("gt.recipe.complexfusionreactor", "gregtech:gt.blockmachines:32023", -10); // Compact + // Fusion MK-V } private static void sendHandler(String aName, String aBlock) { diff --git a/src/main/java/goodgenerator/crossmod/nei/NEI_Config.java b/src/main/java/goodgenerator/crossmod/nei/NEI_Config.java index 2d3b51f90d..b9a8d5cb52 100644 --- a/src/main/java/goodgenerator/crossmod/nei/NEI_Config.java +++ b/src/main/java/goodgenerator/crossmod/nei/NEI_Config.java @@ -1,9 +1,9 @@ package goodgenerator.crossmod.nei; -import goodgenerator.main.GoodGenerator; -import goodgenerator.util.MyRecipeAdder; import codechicken.nei.api.API; import codechicken.nei.api.IConfigureNEI; +import goodgenerator.main.GoodGenerator; +import goodgenerator.util.MyRecipeAdder; import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; diff --git a/src/main/java/goodgenerator/crossmod/nei/NeutronActivatorHandler.java b/src/main/java/goodgenerator/crossmod/nei/NeutronActivatorHandler.java index ea7cf56cf9..ab2aedf2fc 100644 --- a/src/main/java/goodgenerator/crossmod/nei/NeutronActivatorHandler.java +++ b/src/main/java/goodgenerator/crossmod/nei/NeutronActivatorHandler.java @@ -8,17 +8,21 @@ import gregtech.api.enums.GT_Values; import gregtech.api.util.GT_Recipe; import gregtech.api.util.GT_Utility; import gregtech.nei.GT_NEI_DefaultHandler; -import net.minecraft.util.StatCollector; - import java.awt.*; +import net.minecraft.util.StatCollector; public class NeutronActivatorHandler extends GT_NEI_DefaultHandler { public NeutronActivatorHandler(GT_Recipe.GT_Recipe_Map aRecipeMap) { super(aRecipeMap); - this.transferRects.add(new TemplateRecipeHandler.RecipeTransferRect(new Rectangle(65, 13, 36, 18), this.getOverlayIdentifier())); + this.transferRects.add(new TemplateRecipeHandler.RecipeTransferRect( + new Rectangle(65, 13, 36, 18), this.getOverlayIdentifier())); if (!NEI_Config.isAdded) { - FMLInterModComms.sendRuntimeMessage(GT_Values.GT, "NEIPlugins", "register-crafting-handler", "gregtech@" + this.getRecipeName() + "@" + this.getOverlayIdentifier()); + FMLInterModComms.sendRuntimeMessage( + GT_Values.GT, + "NEIPlugins", + "register-crafting-handler", + "gregtech@" + this.getRecipeName() + "@" + this.getOverlayIdentifier()); GuiCraftingRecipe.craftinghandlers.add(this); GuiUsageRecipe.usagehandlers.add(this); } @@ -34,10 +38,24 @@ public class NeutronActivatorHandler extends GT_NEI_DefaultHandler { int tDuration = ((CachedDefaultRecipe) this.arecipes.get(aRecipeIndex)).mRecipe.mDuration; int minNKE = ((CachedDefaultRecipe) this.arecipes.get(aRecipeIndex)).mRecipe.mSpecialValue % 10000; int maxNKE = ((CachedDefaultRecipe) this.arecipes.get(aRecipeIndex)).mRecipe.mSpecialValue / 10000; - drawText(10, 73, this.trans("158", "Time: ") + GT_Utility.formatNumbers((float)tDuration / 20.0) + this.trans("161", " secs"), -16777216); + drawText( + 10, + 73, + this.trans("158", "Time: ") + + GT_Utility.formatNumbers((float) tDuration / 20.0) + + this.trans("161", " secs"), + -16777216); drawText(10, 83, StatCollector.translateToLocal("value.neutron_activator.0"), -16777216); - drawText(10, 93, GT_Utility.formatNumbers(minNKE) + StatCollector.translateToLocal("value.neutron_activator.2"), -16777216); + drawText( + 10, + 93, + GT_Utility.formatNumbers(minNKE) + StatCollector.translateToLocal("value.neutron_activator.2"), + -16777216); drawText(10, 103, StatCollector.translateToLocal("value.neutron_activator.1"), -16777216); - drawText(10, 113, GT_Utility.formatNumbers(maxNKE) + StatCollector.translateToLocal("value.neutron_activator.2"), -16777216); + drawText( + 10, + 113, + GT_Utility.formatNumbers(maxNKE) + StatCollector.translateToLocal("value.neutron_activator.2"), + -16777216); } } diff --git a/src/main/java/goodgenerator/crossmod/nei/PreciseAssemblerHandler.java b/src/main/java/goodgenerator/crossmod/nei/PreciseAssemblerHandler.java index 06918fe3ce..5d1797a834 100644 --- a/src/main/java/goodgenerator/crossmod/nei/PreciseAssemblerHandler.java +++ b/src/main/java/goodgenerator/crossmod/nei/PreciseAssemblerHandler.java @@ -7,7 +7,6 @@ import cpw.mods.fml.common.event.FMLInterModComms; import gregtech.api.enums.GT_Values; import gregtech.api.util.GT_Recipe; import gregtech.nei.GT_NEI_DefaultHandler; - import java.awt.*; public class PreciseAssemblerHandler extends GT_NEI_DefaultHandler { @@ -17,7 +16,11 @@ public class PreciseAssemblerHandler extends GT_NEI_DefaultHandler { this.transferRects.remove(new RecipeTransferRect(new Rectangle(65, 13, 36, 18), getOverlayIdentifier())); this.transferRects.add(new RecipeTransferRect(new Rectangle(75, 19, 26, 18), getOverlayIdentifier())); if (!NEI_Config.isAdded) { - FMLInterModComms.sendRuntimeMessage(GT_Values.GT, "NEIPlugins", "register-crafting-handler", "gregtech@" + this.getRecipeName() + "@" + this.getOverlayIdentifier()); + FMLInterModComms.sendRuntimeMessage( + GT_Values.GT, + "NEIPlugins", + "register-crafting-handler", + "gregtech@" + this.getRecipeName() + "@" + this.getOverlayIdentifier()); GuiCraftingRecipe.craftinghandlers.add(this); GuiUsageRecipe.usagehandlers.add(this); } @@ -27,5 +30,4 @@ public class PreciseAssemblerHandler extends GT_NEI_DefaultHandler { public TemplateRecipeHandler newInstance() { return new PreciseAssemblerHandler(this.mRecipeMap); } - } diff --git a/src/main/java/goodgenerator/crossmod/thaumcraft/LargeEssentiaEnergyData.java b/src/main/java/goodgenerator/crossmod/thaumcraft/LargeEssentiaEnergyData.java index 0328b5906d..a55ddd9dd0 100644 --- a/src/main/java/goodgenerator/crossmod/thaumcraft/LargeEssentiaEnergyData.java +++ b/src/main/java/goodgenerator/crossmod/thaumcraft/LargeEssentiaEnergyData.java @@ -4,12 +4,11 @@ import com.google.gson.JsonArray; import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.JsonParser; -import thaumcraft.api.aspects.Aspect; - import java.io.*; import java.net.URL; import java.nio.charset.StandardCharsets; import java.util.HashMap; +import thaumcraft.api.aspects.Aspect; public class LargeEssentiaEnergyData { @@ -17,7 +16,9 @@ public class LargeEssentiaEnergyData { public static String readJsonFile() { try { - URL url = Thread.currentThread().getContextClassLoader().getResource("assets/goodgenerator/data/essentia.json"); + 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)); String s; @@ -39,7 +40,7 @@ public class LargeEssentiaEnergyData { return; } JsonParser jsonParser = new JsonParser(); - JsonObject jsonObject = (JsonObject)jsonParser.parse(data); + JsonObject jsonObject = (JsonObject) jsonParser.parse(data); JsonArray jsonArray = jsonObject.get("Essentia").getAsJsonArray(); for (JsonElement elm : jsonArray) { JsonObject essData = elm.getAsJsonObject(); @@ -57,29 +58,25 @@ public class LargeEssentiaEnergyData { public static int getAspectTypeIndex(Aspect aspect) { if (ASPECT_FUEL_DATA.containsKey(aspect)) { return ASPECT_FUEL_DATA.get(aspect).getCategoryIndex(); - } - else return -1; + } else return -1; } public static String getAspectType(Aspect aspect) { if (ASPECT_FUEL_DATA.containsKey(aspect)) { return ASPECT_FUEL_DATA.get(aspect).getCategory(); - } - else return null; + } else return null; } public static int getAspectFuelValue(Aspect aspect) { if (ASPECT_FUEL_DATA.containsKey(aspect)) { return ASPECT_FUEL_DATA.get(aspect).getFuelValue(); - } - else return 0; + } else return 0; } public static float getAspectCeo(Aspect aspect) { if (ASPECT_FUEL_DATA.containsKey(aspect)) { return ASPECT_FUEL_DATA.get(aspect).getConsumeSpeed(); - } - else return 0; + } else return 0; } } @@ -108,17 +105,28 @@ class FuelData { public int getCategoryIndex() { switch (category) { - case "NORMAL": return 0; - case "AIR": return 1; - case "THERMAL": return 2; - case "UNSTABLE": return 3; - case "VICTUS": return 4; - case "TAINTED": return 5; - case "MECHANICS": return 6; - case "SPRITE": return 7; - case "RADIATION": return 8; - case "ELECTRIC": return 9; - default: return -1; + case "NORMAL": + return 0; + case "AIR": + return 1; + case "THERMAL": + return 2; + case "UNSTABLE": + return 3; + case "VICTUS": + return 4; + case "TAINTED": + return 5; + case "MECHANICS": + return 6; + case "SPRITE": + return 7; + case "RADIATION": + return 8; + case "ELECTRIC": + return 9; + default: + return -1; } } -}
\ No newline at end of file +} diff --git a/src/main/java/goodgenerator/crossmod/thaumcraft/Research.java b/src/main/java/goodgenerator/crossmod/thaumcraft/Research.java index 274ea5643a..3055db0e74 100644 --- a/src/main/java/goodgenerator/crossmod/thaumcraft/Research.java +++ b/src/main/java/goodgenerator/crossmod/thaumcraft/Research.java @@ -1,11 +1,12 @@ package goodgenerator.crossmod.thaumcraft; +import static thaumcraft.api.ThaumcraftApi.addArcaneCraftingRecipe; + +import com.github.bartimaeusnek.bartworks.common.loaders.ItemRegistry; +import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader; import goodgenerator.crossmod.LoadedList; -import goodgenerator.items.MyMaterial; import goodgenerator.util.DescTextLocalization; import goodgenerator.util.ItemRefer; -import com.github.bartimaeusnek.bartworks.common.loaders.ItemRegistry; -import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader; import gregtech.api.GregTech_API; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; @@ -14,6 +15,8 @@ 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; @@ -22,719 +25,752 @@ import thaumcraft.api.aspects.AspectList; import thaumcraft.common.config.ConfigBlocks; import thaumcraft.common.config.ConfigItems; -import java.util.Arrays; -import java.util.Collections; - -import static thaumcraft.api.ThaumcraftApi.addArcaneCraftingRecipe; - -public class Research{ +public class Research { public static void addResearch() { - DescTextLocalization.addText("research.ESSENTIA_GENERATOR.page",4); - DescTextLocalization.addText("research.ESSENTIA_CELL.page",1); - DescTextLocalization.addText("research.ESSENTIA_UPGRADE_BLANK.page",1); - DescTextLocalization.addText("research.ESSENTIA_UPGRADE_AIR.page",2); - DescTextLocalization.addText("research.ESSENTIA_UPGRADE_THERMAL.page",3); - DescTextLocalization.addText("research.ESSENTIA_UPGRADE_UNSTABLE.page",3); - DescTextLocalization.addText("research.ESSENTIA_UPGRADE_VICTUS.page",3); - DescTextLocalization.addText("research.ESSENTIA_UPGRADE_TAINTED.page",4); - DescTextLocalization.addText("research.ESSENTIA_UPGRADE_MECHANICS.page",3); - DescTextLocalization.addText("research.ESSENTIA_UPGRADE_SPRITE.page",3); - DescTextLocalization.addText("research.ESSENTIA_UPGRADE_RADIATION.page",3); - DescTextLocalization.addText("research.ESSENTIA_UPGRADE_ELECTRIC.page",2); + DescTextLocalization.addText("research.ESSENTIA_GENERATOR.page", 4); + DescTextLocalization.addText("research.ESSENTIA_CELL.page", 1); + DescTextLocalization.addText("research.ESSENTIA_UPGRADE_BLANK.page", 1); + DescTextLocalization.addText("research.ESSENTIA_UPGRADE_AIR.page", 2); + DescTextLocalization.addText("research.ESSENTIA_UPGRADE_THERMAL.page", 3); + DescTextLocalization.addText("research.ESSENTIA_UPGRADE_UNSTABLE.page", 3); + DescTextLocalization.addText("research.ESSENTIA_UPGRADE_VICTUS.page", 3); + DescTextLocalization.addText("research.ESSENTIA_UPGRADE_TAINTED.page", 4); + DescTextLocalization.addText("research.ESSENTIA_UPGRADE_MECHANICS.page", 3); + DescTextLocalization.addText("research.ESSENTIA_UPGRADE_SPRITE.page", 3); + DescTextLocalization.addText("research.ESSENTIA_UPGRADE_RADIATION.page", 3); + DescTextLocalization.addText("research.ESSENTIA_UPGRADE_ELECTRIC.page", 2); GregTech_API.sThaumcraftCompat.addResearch( "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, 0, -9, 3, + 3, + 0, + -9, + 3, Arrays.asList( new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 10L), new TC_Aspects.TC_AspectStack(TC_Aspects.PRAECANTATIO, 10L), new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 10L), new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 10L), - new TC_Aspects.TC_AspectStack(TC_Aspects.PERMUTATIO, 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), - 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", + 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 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 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" + }); 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, 0, -10, 3, + 2, + 0, + -10, + 3, Arrays.asList( new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 10L), new TC_Aspects.TC_AspectStack(TC_Aspects.VACUOS, 10L), new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 10L), new TC_Aspects.TC_AspectStack(TC_Aspects.PRAECANTATIO, 10L), - new TC_Aspects.TC_AspectStack(TC_Aspects.PERMUTATIO, 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"}, + new String[] {"ESSENTIA_GENERATOR"}, "ARTIFICE", ItemRefer.Essentia_Upgrade_Empty.get(1), - 2, 0, -9, 4, + 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) - ), + 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) - ), - } - ); + "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, 0, -9, 5, + 1, + 0, + -9, + 5, Arrays.asList( new TC_Aspects.TC_AspectStack(TC_Aspects.AER, 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) - ), + 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" - } - ); + "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, 0, -10, 5, + 1, + 0, + -10, + 5, Arrays.asList( new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 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) - ), + 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" - } - ); + "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, 0, -11, 5, + 1, + 0, + -11, + 5, Arrays.asList( new TC_Aspects.TC_AspectStack(TC_Aspects.PERDITIO, 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) - ), + 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" - } - ); + "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, 0, -12, 5, + 1, + 0, + -12, + 5, Arrays.asList( new TC_Aspects.TC_AspectStack(TC_Aspects.VICTUS, 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) - ), + 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" - } - ); + "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, 0, -13, 5, + 1, + 0, + -13, + 5, Arrays.asList( new TC_Aspects.TC_AspectStack(TC_Aspects.MORTUUS, 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) - ), + 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" - } - ); + "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, 0, -14, 5, + 1, + 0, + -14, + 5, Arrays.asList( new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 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) - ), + 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" - } - ); + "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, 0, -15, 5, + 1, + 0, + -15, + 5, Arrays.asList( new TC_Aspects.TC_AspectStack(TC_Aspects.COGNITIO, 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) - ), + 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" - } - ); + "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, 0, -16, 5, + 1, + 0, + -16, + 5, Arrays.asList( new TC_Aspects.TC_AspectStack(TC_Aspects.RADIO, 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) - ), + 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" - } - ); + "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, 0, -12, 7, + 1, + 0, + -12, + 7, Arrays.asList( 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) - ), + 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" - } - ); + "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) : new ItemStack(ConfigBlocks.blockStoneDevice, 1, 11); - 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) : new ItemStack(ConfigItems.itemResource, 1, 1); - 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) : new ItemStack(ConfigBlocks.blockJar, 1, 1); - ItemStack thauminiteBlock = LoadedList.THAUMIC_BASES ? GT_ModHandler.getModItem("thaumicbases", "thauminiteBlock", 1, 0) : new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 4); - GregTech_API.sThaumcraftCompat.addResearch("ESSENTIA_SMELTERY", - "Large Essentia Smeltery", - "You need a bigger boat.", - new String[]{"INFUSION"}, - "ARTIFICE", - ItemRefer.Large_Essentia_Smeltery.get(1), - 4, 0, -16, 3, - Arrays.asList( - new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 10), - new TC_Aspects.TC_AspectStack(TC_Aspects.TENEBRAE, 10), - new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 10), - new TC_Aspects.TC_AspectStack(TC_Aspects.LUCRUM, 10), - 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 ItemStack(ConfigBlocks.blockCrystal, 1, 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 - ) - } - ); + ItemStack nodeLinkDevice = LoadedList.THAUMIC_BASES + ? GT_ModHandler.getModItem("thaumicbases", "nodeLinker", 1, 0) + : new ItemStack(ConfigBlocks.blockStoneDevice, 1, 11); + 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) + : new ItemStack(ConfigItems.itemResource, 1, 1); + 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) + : new ItemStack(ConfigBlocks.blockJar, 1, 1); + ItemStack thauminiteBlock = LoadedList.THAUMIC_BASES + ? GT_ModHandler.getModItem("thaumicbases", "thauminiteBlock", 1, 0) + : new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 4); + GregTech_API.sThaumcraftCompat.addResearch( + "ESSENTIA_SMELTERY", + "Large Essentia Smeltery", + "You need a bigger boat.", + new String[] {"INFUSION"}, + "ARTIFICE", + ItemRefer.Large_Essentia_Smeltery.get(1), + 4, + 0, + -16, + 3, + Arrays.asList( + new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 10), + new TC_Aspects.TC_AspectStack(TC_Aspects.TENEBRAE, 10), + new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 10), + new TC_Aspects.TC_AspectStack(TC_Aspects.LUCRUM, 10), + 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 ItemStack(ConfigBlocks.blockCrystal, 1, 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) + }); - ItemStack essentiaPump = LoadedList.WITCHING_GADGETS ? GT_ModHandler.getModItem("WitchingGadgets", "WG_MetalDevice", 1, 0) : new ItemStack(ConfigBlocks.blockTube, 1, 4); - ItemStack inter = LoadedList.THAUMIC_TINKERER ? GT_ModHandler.getModItem("ThaumicTinkerer", "interface", 1, 0) : new ItemStack(ConfigItems.itemResource, 1, 15); - GregTech_API.sThaumcraftCompat.addResearch("ESSENTIA_OUTPUT_HATCH_ME", - "Essentia Output Hatch (ME)", - "It must exist.", - new String[]{"INFUSION"}, - "ARTIFICE", - ItemRefer.Essentia_Output_Hatch_ME.get(1), - 3, 0, -15, 3, - Arrays.asList( - new TC_Aspects.TC_AspectStack(TC_Aspects.ALIENIS, 10), - new TC_Aspects.TC_AspectStack(TC_Aspects.VINCULUM, 10), - new TC_Aspects.TC_AspectStack(TC_Aspects.STRONTIO, 10), - 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) - ) - ) - } - ); + ItemStack essentiaPump = LoadedList.WITCHING_GADGETS + ? GT_ModHandler.getModItem("WitchingGadgets", "WG_MetalDevice", 1, 0) + : new ItemStack(ConfigBlocks.blockTube, 1, 4); + ItemStack inter = LoadedList.THAUMIC_TINKERER + ? GT_ModHandler.getModItem("ThaumicTinkerer", "interface", 1, 0) + : new ItemStack(ConfigItems.itemResource, 1, 15); + GregTech_API.sThaumcraftCompat.addResearch( + "ESSENTIA_OUTPUT_HATCH_ME", + "Essentia Output Hatch (ME)", + "It must exist.", + new String[] {"INFUSION"}, + "ARTIFICE", + ItemRefer.Essentia_Output_Hatch_ME.get(1), + 3, + 0, + -15, + 3, + Arrays.asList( + new TC_Aspects.TC_AspectStack(TC_Aspects.ALIENIS, 10), + new TC_Aspects.TC_AspectStack(TC_Aspects.VINCULUM, 10), + new TC_Aspects.TC_AspectStack(TC_Aspects.STRONTIO, 10), + 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))) + }); } } diff --git a/src/main/java/goodgenerator/items/DepletedFuelRod.java b/src/main/java/goodgenerator/items/DepletedFuelRod.java index 389187d966..1ae3d0be97 100644 --- a/src/main/java/goodgenerator/items/DepletedFuelRod.java +++ b/src/main/java/goodgenerator/items/DepletedFuelRod.java @@ -8,7 +8,6 @@ import net.minecraft.item.ItemStack; public class DepletedFuelRod extends RadioactiveItem implements IReactorComponent, IBoxable { - public DepletedFuelRod(String name, String[] tooltip, CreativeTabs Tab, int Rad) { super(name, tooltip, Tab, Rad); } @@ -19,11 +18,11 @@ public class DepletedFuelRod extends RadioactiveItem implements IReactorComponen } @Override - public void processChamber(IReactor iReactor, ItemStack itemStack, int i, int i1, boolean b) { - } + 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 52ad395d12..e9227c3c91 100644 --- a/src/main/java/goodgenerator/items/FuelRod.java +++ b/src/main/java/goodgenerator/items/FuelRod.java @@ -1,5 +1,7 @@ package goodgenerator.items; +import static goodgenerator.util.DescTextLocalization.addText; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import ic2.api.item.IBoxable; @@ -7,6 +9,8 @@ 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; @@ -14,11 +18,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.StatCollector; -import java.util.ArrayList; -import java.util.List; - -import static goodgenerator.util.DescTextLocalization.addText; - public class FuelRod extends RadioactiveItem implements IReactorComponent, IBoxable { private final int numberOfCells; private final int maxDmg; @@ -27,23 +26,40 @@ 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, CreativeTabs Tab) { + 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); this.numberOfCells = aCells; this.maxDmg = aDuration; - this.Power = (float)aEUt / 25.0F; + this.Power = (float) aEUt / 25.0F; this.result = aResult; this.Heat = aHeat; 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; this.maxDmg = aDuration; - this.Power = (float)aEUt / 25.0F; + this.Power = (float) aEUt / 25.0F; this.result = aResult; this.Heat = aHeat; this.HeatBonus = aHeatBonus; @@ -52,11 +68,11 @@ public class FuelRod extends RadioactiveItem implements IReactorComponent, IBoxa public void processChamber(IReactor reactor, ItemStack stack, int x, int y, boolean heatRun) { if (reactor.produceEnergy()) { - for(int iteration = 0; iteration < this.numberOfCells; ++iteration) { + for (int iteration = 0; iteration < this.numberOfCells; ++iteration) { int pulses = 1 + this.numberOfCells / 2; int heat; if (!heatRun) { - for(heat = 0; heat < pulses; ++heat) { + for (heat = 0; heat < pulses; ++heat) { this.acceptUraniumPulse(reactor, stack, stack, x, y, x, y, heatRun); } checkPulseable(reactor, x - 1, y, stack, x, y, heatRun); @@ -64,7 +80,10 @@ public class FuelRod extends RadioactiveItem implements IReactorComponent, IBoxa checkPulseable(reactor, x, y - 1, stack, x, y, heatRun); checkPulseable(reactor, x, y + 1, stack, x, y, heatRun); } else { - pulses += checkPulseable(reactor, x - 1, y, stack, x, y, heatRun) + checkPulseable(reactor, x + 1, y, stack, x, y, heatRun) + checkPulseable(reactor, x, y - 1, stack, x, y, heatRun) + checkPulseable(reactor, x, y + 1, stack, x, y, heatRun); + pulses += checkPulseable(reactor, x - 1, y, stack, x, y, heatRun) + + checkPulseable(reactor, x + 1, y, stack, x, y, heatRun) + + checkPulseable(reactor, x, y - 1, stack, x, y, heatRun) + + checkPulseable(reactor, x, y + 1, stack, x, y, heatRun); heat = sumUp(pulses) * this.Heat; ArrayList<FuelRod.ItemStackCoord> heatAcceptors = new ArrayList<>(); this.checkHeatAcceptor(reactor, x - 1, y, heatAcceptors); @@ -72,10 +91,16 @@ public class FuelRod extends RadioactiveItem implements IReactorComponent, IBoxa this.checkHeatAcceptor(reactor, x, y - 1, heatAcceptors); this.checkHeatAcceptor(reactor, x, y + 1, heatAcceptors); - while(heatAcceptors.size() > 0 && heat > 0) { + 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); } @@ -95,7 +120,12 @@ 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) { @@ -104,15 +134,24 @@ 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 && ((IReactorComponent)thing.getItem()).canStoreHeat(reactor, thing, x, y)) { + 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()))); + reactor.addOutput(Power * (1 + HeatBonus * ((float) reactor.getHeat() / (float) reactor.getMaxHeat()))); } return true; } @@ -134,7 +173,7 @@ public class FuelRod extends RadioactiveItem implements IReactorComponent, IBoxa } public float influenceExplosion(IReactor reactor, ItemStack yourStack) { - return (float)(2 * this.numberOfCells); + return (float) (2 * this.numberOfCells); } @Override @@ -182,14 +221,16 @@ 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")); } else { tooltip.add(String.format(StatCollector.translateToLocal("fuelrodheat.tooltip.1"), tMut)); } - if (this.HeatBonus != 0) - tooltip.add(StatCollector.translateToLocal("fuelrodheat.tooltip.2")); + if (this.HeatBonus != 0) tooltip.add(StatCollector.translateToLocal("fuelrodheat.tooltip.2")); } } diff --git a/src/main/java/goodgenerator/items/MyItemBlocks.java b/src/main/java/goodgenerator/items/MyItemBlocks.java index abb55e7f1d..f778444058 100644 --- a/src/main/java/goodgenerator/items/MyItemBlocks.java +++ b/src/main/java/goodgenerator/items/MyItemBlocks.java @@ -1,33 +1,33 @@ package goodgenerator.items; +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 cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; 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; -import goodgenerator.main.GoodGenerator; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.util.StatCollector; -import java.util.Arrays; -import java.util.List; - -import static goodgenerator.loader.Loaders.essentiaCell; -import static goodgenerator.loader.Loaders.yottaFluidTankCell; -import static goodgenerator.util.CharExchanger.tierName; - 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){ + public MyItemBlocks(Block block) { super(block); this.setMaxDamage(0); this.setHasSubtypes(true); @@ -74,7 +74,8 @@ 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); @@ -83,11 +84,13 @@ 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 3d4b648747..68ae8e3357 100644 --- a/src/main/java/goodgenerator/items/MyItems.java +++ b/src/main/java/goodgenerator/items/MyItems.java @@ -1,8 +1,11 @@ package goodgenerator.items; -import goodgenerator.main.GoodGenerator; 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; @@ -10,118 +13,113 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - public class MyItems extends Item { - @SideOnly(Side.CLIENT) - protected IIcon[] texture; - private String tex; - private String[] textureNames; - private final String Name; - private List<String> tooltips = new ArrayList<>(); - private List<String> tooltipses = new ArrayList<>(); + @SideOnly(Side.CLIENT) + protected IIcon[] texture; - public MyItems(String name, CreativeTabs Tab){ - this.setUnlocalizedName(name); - this.setCreativeTab(Tab); - this.tex = name; - this.Name = name; - } + private String tex; + private String[] textureNames; + private final String Name; + private List<String> tooltips = new ArrayList<>(); + private List<String> tooltipses = new ArrayList<>(); - public MyItems(String name, CreativeTabs Tab, String[] textures){ - this.setUnlocalizedName(name); - this.setCreativeTab(Tab); - this.setHasSubtypes(true); - this.textureNames = textures; - this.Name = name; - } + public MyItems(String name, CreativeTabs Tab) { + this.setUnlocalizedName(name); + this.setCreativeTab(Tab); + this.tex = name; + this.Name = name; + } - public MyItems(String name, String[] tooltip, CreativeTabs Tab, String[] textures){ - this.setUnlocalizedName(name); - this.setCreativeTab(Tab); - this.setHasSubtypes(true); - this.textureNames = textures; - this.Name = name; - this.tooltipses = Arrays.asList(tooltip); - } + public MyItems(String name, CreativeTabs Tab, String[] textures) { + this.setUnlocalizedName(name); + this.setCreativeTab(Tab); + this.setHasSubtypes(true); + this.textureNames = textures; + this.Name = name; + } - public MyItems(String name, String tooltip, CreativeTabs Tab) { - this.setUnlocalizedName(name); - this.setCreativeTab(Tab); - this.tex = name; - this.tooltips.add(tooltip); - this.Name = name; - } + public MyItems(String name, String[] tooltip, CreativeTabs Tab, String[] textures) { + this.setUnlocalizedName(name); + this.setCreativeTab(Tab); + this.setHasSubtypes(true); + this.textureNames = textures; + this.Name = name; + this.tooltipses = Arrays.asList(tooltip); + } - public MyItems(String name, String[] tooltip, CreativeTabs Tab) { - this.setUnlocalizedName(name); - this.setCreativeTab(Tab); - this.tex = name; - this.tooltips = Arrays.asList(tooltip); - this.Name = name; - } + public MyItems(String name, String tooltip, CreativeTabs Tab) { + this.setUnlocalizedName(name); + this.setCreativeTab(Tab); + this.tex = name; + this.tooltips.add(tooltip); + this.Name = name; + } - @Override - @SideOnly(Side.CLIENT) - public IIcon getIconFromDamage(int meta) { - if (this.texture == null || this.texture.length < 1) return this.itemIcon; - else return meta < this.texture.length ? this.texture[meta] : this.texture[0]; - } + public MyItems(String name, String[] tooltip, CreativeTabs Tab) { + this.setUnlocalizedName(name); + this.setCreativeTab(Tab); + this.tex = name; + this.tooltips = Arrays.asList(tooltip); + this.Name = name; + } - @Override - public int getMetadata(int aMeta) { - return aMeta; - } + @Override + @SideOnly(Side.CLIENT) + public IIcon getIconFromDamage(int meta) { + if (this.texture == null || this.texture.length < 1) return this.itemIcon; + else return meta < this.texture.length ? this.texture[meta] : this.texture[0]; + } - @Override - @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister iconRegister) { - if (this.textureNames == null || this.textureNames.length < 1) { - this.itemIcon = iconRegister.registerIcon(GoodGenerator.MOD_ID + ":" + this.tex); - } - else { - this.texture = new IIcon[this.textureNames.length]; - for (int i = 0; i < this.textureNames.length; ++i) { - this.texture[i] = iconRegister.registerIcon(this.textureNames[i]); - } - } + @Override + public int getMetadata(int aMeta) { + return aMeta; + } + + @Override + @SideOnly(Side.CLIENT) + public void registerIcons(IIconRegister iconRegister) { + if (this.textureNames == null || this.textureNames.length < 1) { + this.itemIcon = iconRegister.registerIcon(GoodGenerator.MOD_ID + ":" + this.tex); + } else { + this.texture = new IIcon[this.textureNames.length]; + for (int i = 0; i < this.textureNames.length; ++i) { + this.texture[i] = iconRegister.registerIcon(this.textureNames[i]); + } } + } - @Override - public String getUnlocalizedName(ItemStack p_77667_1_) { - if (this.textureNames == null || this.textureNames.length < 1){ - return "item." + this.Name; - } - else { - return "item." + this.Name + "." + p_77667_1_.getItemDamage(); - } + @Override + public String getUnlocalizedName(ItemStack p_77667_1_) { + if (this.textureNames == null || this.textureNames.length < 1) { + return "item." + this.Name; + } else { + return "item." + this.Name + "." + p_77667_1_.getItemDamage(); } + } - @Override - @SideOnly(Side.CLIENT) - @SuppressWarnings("unchecked") - public void getSubItems(Item item, CreativeTabs tab, List list) { - if (this.texture == null || this.texture.length < 1) list.add(new ItemStack(item, 1, 0)); - else { - for (int i = 0; i < this.texture.length; ++i) { - list.add(new ItemStack(item, 1, i)); - } - } + @Override + @SideOnly(Side.CLIENT) + @SuppressWarnings("unchecked") + public void getSubItems(Item item, CreativeTabs tab, List list) { + if (this.texture == null || this.texture.length < 1) list.add(new ItemStack(item, 1, 0)); + else { + for (int i = 0; i < this.texture.length; ++i) { + list.add(new ItemStack(item, 1, i)); + } } + } - @SideOnly(Side.CLIENT) - @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); - } - if (tooltipses.size() > 0) { - int meta = p_77624_1_.getItemDamage(); - if (tooltipses.size() - 1 < meta) meta = tooltipses.size() - 1; - p_77624_3_.add(tooltipses.get(meta)); - } + @SideOnly(Side.CLIENT) + @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); + } + if (tooltipses.size() > 0) { + int meta = p_77624_1_.getItemDamage(); + if (tooltipses.size() - 1 < meta) meta = tooltipses.size() - 1; + p_77624_3_.add(tooltipses.get(meta)); } + } } diff --git a/src/main/java/goodgenerator/items/MyMaterial.java b/src/main/java/goodgenerator/items/MyMaterial.java index 87b4dce439..566fa837ea 100644 --- a/src/main/java/goodgenerator/items/MyMaterial.java +++ b/src/main/java/goodgenerator/items/MyMaterial.java @@ -1,23 +1,22 @@ package goodgenerator.items; -import goodgenerator.util.CharExchanger; +import static com.github.bartimaeusnek.bartworks.util.BW_Util.subscriptNumbers; +import static gregtech.api.enums.Materials.*; + import com.github.bartimaeusnek.bartworks.system.material.Werkstoff; import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader; -import gregtech.api.enums.Materials; -import gregtech.api.enums.TextureSet; import com.github.bartimaeusnek.bartworks.util.Pair; - -import static com.github.bartimaeusnek.bartworks.util.BW_Util.subscriptNumbers; -import static gregtech.api.enums.Materials.*; +import goodgenerator.util.CharExchanger; +import gregtech.api.enums.TextureSet; @SuppressWarnings({"unchecked"}) public class MyMaterial implements Runnable { protected static final int OffsetID = 10001; - //Uranium Based Fuel Line + // 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(), @@ -25,323 +24,314 @@ public class MyMaterial implements Runnable { new Werkstoff.GenerationFeatures().disable().addMixerRecipes().onlyDust(), OffsetID, TextureSet.SET_DULL, - new Pair<> (Graphite,3), - new Pair<> (Uranium,1) - ); + new Pair<>(Graphite, 3), + 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), Werkstoff.Types.COMPOUND, new Werkstoff.GenerationFeatures().disable().addCells(), OffsetID + 1, - TextureSet.SET_FLUID - ); + 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), Werkstoff.Types.COMPOUND, new Werkstoff.GenerationFeatures().disable().addCells(), OffsetID + 2, - TextureSet.SET_FLUID - ); + 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), Werkstoff.Types.COMPOUND, new Werkstoff.GenerationFeatures().disable().addCells(), OffsetID + 3, - TextureSet.SET_FLUID - ); + TextureSet.SET_FLUID); - //Thorium Based Fuel + // 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(), OffsetID + 4, TextureSet.SET_DULL, - new Pair<> (Thorium,8), - new Pair<> (WerkstoffLoader.Thorium232,4), - new Pair<> (Uranium235,1), - new Pair<> (Carbon,3) - ); + new Pair<>(Thorium, 8), + new Pair<>(WerkstoffLoader.Thorium232, 4), + new Pair<>(Uranium235, 1), + 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), Werkstoff.Types.COMPOUND, new Werkstoff.GenerationFeatures().disable().addCells(), OffsetID + 5, - TextureSet.SET_FLUID - ); + 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), Werkstoff.Types.COMPOUND, new Werkstoff.GenerationFeatures().disable().addCells(), OffsetID + 6, - TextureSet.SET_FLUID - ); + 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("Lu?Pr?B?In?"), new Werkstoff.Stats().setToxic(true), Werkstoff.Types.COMPOUND, new Werkstoff.GenerationFeatures().disable().addCells(), OffsetID + 7, - TextureSet.SET_FLUID - ); + TextureSet.SET_FLUID); - //Plutonium Based Fuel + // 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(), OffsetID + 8, TextureSet.SET_SHINY, - new Pair<> (Plutonium,10), - new Pair<> (Oxygen,12), - new Pair<> (Uranium,2), - new Pair<> (Carbon,8) - ); + new Pair<>(Plutonium, 10), + new Pair<>(Oxygen, 12), + new Pair<>(Uranium, 2), + 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), Werkstoff.Types.COMPOUND, new Werkstoff.GenerationFeatures().disable().addCells(), OffsetID + 9, - TextureSet.SET_FLUID - ); + 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), Werkstoff.Types.COMPOUND, new Werkstoff.GenerationFeatures().disable().addCells(), OffsetID + 10, - TextureSet.SET_FLUID - ); + 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), Werkstoff.Types.COMPOUND, new Werkstoff.GenerationFeatures().disable().addCells(), OffsetID + 11, - TextureSet.SET_FLUID - ); + TextureSet.SET_FLUID); - //Thorium-233 + // 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(), OffsetID + 12, TextureSet.SET_FLUID, - new Pair<> (Hydrogen,2), - new Pair<> (Carbon,2), - new Pair<> (Oxygen,4) - ); + new Pair<>(Hydrogen, 2), + new Pair<>(Carbon, 2), + 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(), OffsetID + 13, TextureSet.SET_SHINY, - new Pair<> (Vanadium,2), - new Pair<> (Oxygen,5) - ); + new Pair<>(Vanadium, 2), + 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(), Werkstoff.Types.COMPOUND, new Werkstoff.GenerationFeatures().disable().addCells(), OffsetID + 14, - TextureSet.SET_DULL - ); + 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(), Werkstoff.Types.COMPOUND, new Werkstoff.GenerationFeatures().disable().onlyDust(), OffsetID + 15, - TextureSet.SET_DULL - ); + 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(), Werkstoff.Types.COMPOUND, new Werkstoff.GenerationFeatures().disable().onlyDust(), OffsetID + 16, - TextureSet.SET_SHINY - ); + 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(), Werkstoff.Types.COMPOUND, new Werkstoff.GenerationFeatures().disable().onlyDust(), OffsetID + 17, - TextureSet.SET_DULL - ); + 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(), Werkstoff.Types.COMPOUND, new Werkstoff.GenerationFeatures().disable().addCells(), OffsetID + 18, - TextureSet.SET_FLUID - ); + 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(), Werkstoff.Types.COMPOUND, new Werkstoff.GenerationFeatures().disable().addCells(), OffsetID + 19, - TextureSet.SET_FLUID - ); + 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, new Werkstoff.GenerationFeatures().disable().addCells(), OffsetID + 20, TextureSet.SET_FLUID, - new Pair<> (WerkstoffLoader.Thorium232,1), - new Pair<> (Fluorine,4) - ); + new Pair<>(WerkstoffLoader.Thorium232, 1), + new Pair<>(Fluorine, 4)); - //Atomic Separation Catalyst + // 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), Werkstoff.Types.ELEMENT, new Werkstoff.GenerationFeatures().addGems(), OffsetID + 22, - TextureSet.SET_DIAMOND - ); + 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), new Pair<>(Plutonium, 1), - new Pair<>(Naquadah, 2) - ); + new Pair<>(Naquadah, 2)); - //Naquadah Fuel Rework + // 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).setRadioactive(true), + "Nq" + CharExchanger.shifter(9734), + 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 - ); + 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), Werkstoff.Types.COMPOUND, new Werkstoff.GenerationFeatures().disable().addCells(), OffsetID + 24, - TextureSet.SET_FLUID - ); + 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), Werkstoff.Types.COMPOUND, new Werkstoff.GenerationFeatures().disable().addCells(), OffsetID + 25, - TextureSet.SET_FLUID - ); + 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), Werkstoff.Types.COMPOUND, new Werkstoff.GenerationFeatures().disable().addCells(), OffsetID + 26, - TextureSet.SET_FLUID - ); + 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), Werkstoff.Types.COMPOUND, new Werkstoff.GenerationFeatures().disable().addCells(), OffsetID + 27, - TextureSet.SET_FLUID - ); + 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), @@ -349,149 +339,135 @@ public class MyMaterial implements Runnable { new Werkstoff.GenerationFeatures().disable().addCells(), OffsetID + 28, TextureSet.SET_FLUID, - new Pair<> (Carbon,4), - new Pair<> (Hydrogen, 10), - new Pair<> (Oxygen, 1) - ); + new Pair<>(Carbon, 4), + new Pair<>(Hydrogen, 10), + 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(), Werkstoff.Types.COMPOUND, new Werkstoff.GenerationFeatures().disable().addCells(), OffsetID + 29, - TextureSet.SET_FLUID - ); + 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(), Werkstoff.Types.COMPOUND, new Werkstoff.GenerationFeatures().disable().addCells(), OffsetID + 30, - TextureSet.SET_FLUID - ); + 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(), Werkstoff.Types.COMPOUND, new Werkstoff.GenerationFeatures().disable().addCells(), OffsetID + 31, - TextureSet.SET_FLUID - ); + 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(), Werkstoff.Types.COMPOUND, new Werkstoff.GenerationFeatures().disable().addCells(), OffsetID + 32, - TextureSet.SET_FLUID - ); + 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(), Werkstoff.Types.COMPOUND, new Werkstoff.GenerationFeatures().disable().addCells(), OffsetID + 33, - TextureSet.SET_FLUID - ); + 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), Werkstoff.Types.MIXTURE, new Werkstoff.GenerationFeatures().disable().onlyDust(), OffsetID + 34, - TextureSet.SET_DULL - ); + 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), + "??Nq??H" + CharExchanger.shifter(8314), new Werkstoff.Stats().setRadioactive(true), Werkstoff.Types.MIXTURE, new Werkstoff.GenerationFeatures().disable().addCells(), OffsetID + 35, - TextureSet.SET_FLUID - ); + 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), Werkstoff.Types.MIXTURE, new Werkstoff.GenerationFeatures().disable().addCells(), OffsetID + 36, - TextureSet.SET_FLUID - ); + 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), Werkstoff.Types.MIXTURE, new Werkstoff.GenerationFeatures().disable().addCells(), OffsetID + 37, - TextureSet.SET_FLUID - ); + 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, new Werkstoff.GenerationFeatures().disable().addCells(), OffsetID + 38, - TextureSet.SET_FLUID - ); + 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, new Werkstoff.GenerationFeatures().disable().addCells(), OffsetID + 39, - TextureSet.SET_FLUID - ); + 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, new Werkstoff.GenerationFeatures().disable().addCells(), OffsetID + 40, - TextureSet.SET_FLUID - ); + 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 - ); + TextureSet.SET_FLUID); /*These materials will be enable when they are removed in GregTech*/ /* public static final Werkstoff praseodymium = new Werkstoff( @@ -528,69 +504,63 @@ public class MyMaterial implements Runnable { ); */ 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, new Werkstoff.GenerationFeatures().disable().addCells(), OffsetID + 45, - TextureSet.SET_FLUID - ); + 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, new Werkstoff.GenerationFeatures().disable().addCells(), OffsetID + 46, - TextureSet.SET_FLUID - ); + 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, new Werkstoff.GenerationFeatures().disable().addCells(), OffsetID + 47, - TextureSet.SET_FLUID - ); + 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, new Werkstoff.GenerationFeatures().disable().addCells(), OffsetID + 48, - TextureSet.SET_FLUID - ); + 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), Werkstoff.Types.MIXTURE, new Werkstoff.GenerationFeatures().disable().addCells(), OffsetID + 49, - TextureSet.SET_FLUID - ); + 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), Werkstoff.Types.MIXTURE, new Werkstoff.GenerationFeatures().disable().addCells(), OffsetID + 50, - TextureSet.SET_FLUID - ); + 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(), @@ -599,11 +569,10 @@ public class MyMaterial implements Runnable { OffsetID + 51, TextureSet.SET_SHINY, new Pair<>(Zinc, 1), - new Pair<>(Chlorine, 2) - ); + 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(), @@ -612,23 +581,21 @@ public class MyMaterial implements Runnable { OffsetID + 52, TextureSet.SET_SHINY, new Pair<>(Zinc, 1), - new Pair<>(Thorium, 1) - ); + new Pair<>(Thorium, 1)); - //Naquadah Rework Materials + // 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(), Werkstoff.Types.MIXTURE, new Werkstoff.GenerationFeatures(), OffsetID + 53, - TextureSet.SET_METALLIC - ); + 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(true), @@ -636,23 +603,21 @@ public class MyMaterial implements Runnable { new Werkstoff.GenerationFeatures().disable().onlyDust(), OffsetID + 54, TextureSet.SET_METALLIC, - new Pair<> (Titanium, 1), - new Pair<> (Fluorine, 3) - ); + new Pair<>(Titanium, 1), + 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(), Werkstoff.Types.MIXTURE, new Werkstoff.GenerationFeatures().disable().addCells(), OffsetID + 55, - TextureSet.SET_FLUID - ); + 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(true), @@ -660,24 +625,22 @@ public class MyMaterial implements Runnable { new Werkstoff.GenerationFeatures().disable().onlyDust(), OffsetID + 56, TextureSet.SET_DULL, - new Pair<> (Gallium, 1), - new Pair<> (Oxygen, 3), - new Pair<> (Hydrogen, 3) - ); + new Pair<>(Gallium, 1), + new Pair<>(Oxygen, 3), + 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(), Werkstoff.Types.MIXTURE, new Werkstoff.GenerationFeatures().disable().addCells(), OffsetID + 57, - TextureSet.SET_FLUID - ); + 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), @@ -685,13 +648,12 @@ public class MyMaterial implements Runnable { new Werkstoff.GenerationFeatures().disable().addCells(), OffsetID + 58, TextureSet.SET_FLUID, - new Pair<> (Carbon, 8), - new Pair<> (Oxygen, 1), - new Pair<> (Hydrogen, 18) - ); + new Pair<>(Carbon, 8), + new Pair<>(Oxygen, 1), + 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), @@ -699,36 +661,33 @@ public class MyMaterial implements Runnable { new Werkstoff.GenerationFeatures().disable().addCells(), OffsetID + 59, TextureSet.SET_FLUID, - new Pair<> (Carbon, 16), - new Pair<> (Phosphorus, 1), - new Pair<> (Oxygen, 3), - new Pair<> (Hydrogen, 35) - ); + new Pair<>(Carbon, 16), + new Pair<>(Phosphorus, 1), + new Pair<>(Oxygen, 3), + 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(), Werkstoff.Types.MIXTURE, new Werkstoff.GenerationFeatures().disable().addCells(), OffsetID + 60, - TextureSet.SET_FLUID - ); + 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(), Werkstoff.Types.MIXTURE, new Werkstoff.GenerationFeatures().disable().addCells(), OffsetID + 61, - TextureSet.SET_FLUID - ); + 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), @@ -736,32 +695,29 @@ public class MyMaterial implements Runnable { new Werkstoff.GenerationFeatures().disable().onlyDust(), OffsetID + 62, TextureSet.SET_METALLIC, - new Pair<> (Naquadah, 1), - new Pair<> (Oxygen, 2) - ); + new Pair<>(Naquadah, 1), + 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, new Werkstoff.GenerationFeatures().disable().addCells(), OffsetID + 63, - TextureSet.SET_FLUID - ); + 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, new Werkstoff.GenerationFeatures().disable().addCells(), OffsetID + 64, - TextureSet.SET_FLUID - ); + 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), @@ -769,23 +725,21 @@ public class MyMaterial implements Runnable { new Werkstoff.GenerationFeatures().disable().onlyDust(), OffsetID + 65, TextureSet.SET_DULL, - new Pair<> (Adamantium, 2), - new Pair<> (Oxygen, 3) - ); + new Pair<>(Adamantium, 2), + 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), Werkstoff.Types.MIXTURE, new Werkstoff.GenerationFeatures(), OffsetID + 66, - TextureSet.SET_METALLIC - ); + 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(true), @@ -793,35 +747,32 @@ public class MyMaterial implements Runnable { new Werkstoff.GenerationFeatures().disable().onlyDust(), OffsetID + 67, TextureSet.SET_METALLIC, - new Pair<> (Trinium, 1), - new Pair<> (Sulfur, 1), - new Pair<> (Oxygen, 4) - ); + new Pair<>(Trinium, 1), + new Pair<>(Sulfur, 1), + 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), Werkstoff.Types.MIXTURE, new Werkstoff.GenerationFeatures().disable().addCells(), OffsetID + 68, - TextureSet.SET_FLUID - ); + 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), Werkstoff.Types.MIXTURE, new Werkstoff.GenerationFeatures().disable().onlyDust(), OffsetID + 69, - TextureSet.SET_METALLIC - ); + 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), @@ -831,22 +782,20 @@ public class MyMaterial implements Runnable { TextureSet.SET_DULL, new Pair<>(NaquadahEnriched, 1), new Pair<>(Sulfur, 2), - new Pair<>(Oxygen, 8) - ); + 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), Werkstoff.Types.MIXTURE, new Werkstoff.GenerationFeatures(), OffsetID + 71, - TextureSet.SET_METALLIC - ); + 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(true), @@ -856,55 +805,50 @@ public class MyMaterial implements Runnable { TextureSet.SET_DULL, new Pair<>(Indium, 1), new Pair<>(Phosphorus, 1), - new Pair<>(Oxygen, 4) - ); + 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), Werkstoff.Types.MIXTURE, new Werkstoff.GenerationFeatures().disable().onlyDust(), OffsetID + 73, - TextureSet.SET_DULL - ); + 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), Werkstoff.Types.MIXTURE, new Werkstoff.GenerationFeatures().disable().addCells(), OffsetID + 74, - TextureSet.SET_FLUID - ); + 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), Werkstoff.Types.COMPOUND, new Werkstoff.GenerationFeatures().disable().onlyDust(), OffsetID + 75, - TextureSet.SET_METALLIC - ); + 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), Werkstoff.Types.MIXTURE, new Werkstoff.GenerationFeatures().disable().addCells(), OffsetID + 76, - TextureSet.SET_FLUID - ); + 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), @@ -914,81 +858,91 @@ public class MyMaterial implements Runnable { TextureSet.SET_METALLIC, new Pair<>(Naquadria, 1), new Pair<>(Sulfur, 2), - new Pair<>(Oxygen, 8) - ); + 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(), Werkstoff.Types.MIXTURE, new Werkstoff.GenerationFeatures().disable().addCells(), OffsetID + 78, - TextureSet.SET_FLUID - ); + 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), Werkstoff.Types.MIXTURE, new Werkstoff.GenerationFeatures().disable().addCells(), OffsetID + 79, - TextureSet.SET_FLUID - ); + 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), Werkstoff.Types.MIXTURE, new Werkstoff.GenerationFeatures().disable().addCells(), OffsetID + 80, - TextureSet.SET_FLUID - ); + TextureSet.SET_FLUID); - //material for reactor stuff + // 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().addMixerRecipes((short) 4), + new Werkstoff.GenerationFeatures() + .onlyDust() + .addMolten() + .addMetalItems() + .addCraftingMetalWorkingItems() + .addMixerRecipes((short) 4), OffsetID + 81, TextureSet.SET_METALLIC, new Pair<>(WerkstoffLoader.Zirconium, 34), new Pair<>(Tin, 5), new Pair<>(Iron, 2), - new Pair<>(Chrome, 1) - ); + 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().addMixerRecipes((short) 2), + new Werkstoff.GenerationFeatures() + .onlyDust() + .addMolten() + .addMetalItems() + .addCraftingMetalWorkingItems() + .addMixerRecipes((short) 2), OffsetID + 82, TextureSet.SET_METALLIC, new Pair<>(WerkstoffLoader.Zirconium, 34), new Pair<>(Tin, 4), new Pair<>(Iron, 1), new Pair<>(Chrome, 1), - new Pair<>(Nickel, 1) - ); + 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), @@ -996,133 +950,140 @@ public class MyMaterial implements Runnable { new Pair<>(Cobalt, 8), new Pair<>(Titanium, 4), new Pair<>(Molybdenum, 2), - new Pair<>(Aluminium, 1) - ); + 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), new Pair<>(Naquadah, 2), - new Pair<>(Lanthanum, 3) - ); + 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, new Werkstoff.GenerationFeatures().disable().addCells(), OffsetID + 85, - TextureSet.SET_FLUID - ); + 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(), Werkstoff.Types.COMPOUND, new Werkstoff.GenerationFeatures().disable().addCells(), OffsetID + 86, - TextureSet.SET_FLUID - ); + 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(), Werkstoff.Types.COMPOUND, new Werkstoff.GenerationFeatures().disable().addCells(), OffsetID + 87, - TextureSet.SET_FLUID - ); + 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(), Werkstoff.Types.COMPOUND, new Werkstoff.GenerationFeatures().disable().addCells(), OffsetID + 88, - TextureSet.SET_FLUID - ); + 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, new Werkstoff.GenerationFeatures().disable().addCells(), OffsetID + 89, - TextureSet.SET_FLUID - ); + 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, new Werkstoff.GenerationFeatures().disable().addCells(), OffsetID + 90, - TextureSet.SET_FLUID - ); + 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, new Werkstoff.GenerationFeatures().disable().addCells(), OffsetID + 91, - TextureSet.SET_FLUID - ); + 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(), Werkstoff.Types.COMPOUND, new Werkstoff.GenerationFeatures().disable().onlyDust(), OffsetID + 92, - TextureSet.SET_SHINY - ); + 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, new Werkstoff.GenerationFeatures().disable().addCells(), OffsetID + 93, - TextureSet.SET_FLUID - ); + 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, new Werkstoff.GenerationFeatures().disable().addCells(), OffsetID + 94, - TextureSet.SET_FLUID - ); + 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), @@ -1131,76 +1092,100 @@ public class MyMaterial implements Runnable { new Pair<>(Titanium, 2), new Pair<>(Cobalt, 10), new Pair<>(Tungsten, 13), - new Pair<>(Nickel, 18) - ); + 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) - ); + 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) - ); + 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), new Pair<>(Ardite, 2), - new Pair<>(RedAlloy, 2) - ); + 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(), Werkstoff.Types.MIXTURE, new Werkstoff.GenerationFeatures().onlyDust(), OffsetID + 99, - TextureSet.SET_DULL - ); + 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), new Pair<>(SterlingSilver, 2), - new Pair<>(lumiinessence, 2) - ); + 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().addMixerRecipes((short) 6), + new Werkstoff.GenerationFeatures() + .onlyDust() + .addMolten() + .addMetalItems() + .addCraftingMetalWorkingItems() + .addMixerRecipes((short) 6), OffsetID + 101, TextureSet.SET_SHINY, new Pair<>(adamantiumAlloy, 12), @@ -1208,30 +1193,38 @@ public class MyMaterial implements Runnable { new Pair<>(Tin, 8), new Pair<>(Arsenic, 7), new Pair<>(Caesium, 4), - new Pair<>(Osmiridium, 3) - ); + 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().addMixerRecipes((short) 5), + new Werkstoff.GenerationFeatures() + .onlyDust() + .addMolten() + .addMetalItems() + .addCraftingMetalWorkingItems() + .addMixerRecipes((short) 5), OffsetID + 102, TextureSet.SET_METALLIC, new Pair<>(Titanium, 5), new Pair<>(Molybdenum, 5), new Pair<>(Vanadium, 2), new Pair<>(Chrome, 3), - new Pair<>(Aluminium, 1) - ); + 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().setBlastFurnace(true).setMeltingPoint(8700).setCentrifuge(true), Werkstoff.Types.MIXTURE, - new Werkstoff.GenerationFeatures().onlyDust().addMolten().addMetalItems().addCraftingMetalWorkingItems().addMixerRecipes((short) 6), + new Werkstoff.GenerationFeatures() + .onlyDust() + .addMolten() + .addMetalItems() + .addCraftingMetalWorkingItems() + .addMixerRecipes((short) 6), OffsetID + 103, TextureSet.SET_SHINY, new Pair<>(titaniumBetaC, 14), @@ -1239,28 +1232,36 @@ public class MyMaterial implements Runnable { new Pair<>(NiobiumTitanium, 9), new Pair<>(WerkstoffLoader.LuVTierMaterial, 8), new Pair<>(Quantium, 7), - new Pair<>(Erbium, 3) - ); + 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().addMixerRecipes((short) 3), + new Werkstoff.GenerationFeatures() + .onlyDust() + .addMolten() + .addMetalItems() + .addCraftingMetalWorkingItems() + .addMixerRecipes((short) 3), OffsetID + 104, TextureSet.SET_SHINY, new Pair<>(lumiium, 18), new Pair<>(Silver, 8), - new Pair<>(Sunnarium, 4) - ); + 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().addMixerRecipes((short) 6), + new Werkstoff.GenerationFeatures() + .onlyDust() + .addMolten() + .addMetalItems() + .addCraftingMetalWorkingItems() + .addMixerRecipes((short) 6), OffsetID + 105, TextureSet.SET_SHINY, new Pair<>(Tungsten, 8), @@ -1268,34 +1269,31 @@ public class MyMaterial implements Runnable { new Pair<>(Bedrockium, 4), new Pair<>(Carbon, 4), new Pair<>(Vanadium, 3), - new Pair<>(BlackPlutonium, 1) - ); + new Pair<>(BlackPlutonium, 1)); public static final Werkstoff antimonyPentafluorideSolution = new Werkstoff( - new short[]{0x16,0xd5,0xe2}, - "Antimony Pentafluoride Solution", - subscriptNumbers("SbF5"), - new Werkstoff.Stats(), - Werkstoff.Types.MIXTURE, - new Werkstoff.GenerationFeatures().disable().addCells(), - OffsetID + 106, - TextureSet.SET_FLUID - ); + new short[] {0x16, 0xd5, 0xe2}, + "Antimony Pentafluoride Solution", + subscriptNumbers("SbF5"), + new Werkstoff.Stats(), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().disable().addCells(), + OffsetID + 106, + TextureSet.SET_FLUID); public static final Werkstoff magnesiumSulphate = new Werkstoff( - new short[]{0x87,0x74,0x91}, - "Magnesium Sulphate", - subscriptNumbers("MgSO4"), - new Werkstoff.Stats().setElektrolysis(true), - Werkstoff.Types.COMPOUND, - new Werkstoff.GenerationFeatures().disable().onlyDust(), - OffsetID + 107, - TextureSet.SET_DULL, - new Pair<>(Magnesium, 1), - new Pair<>(Sulfur, 1), - new Pair<>(Oxygen, 4) - ); + new short[] {0x87, 0x74, 0x91}, + "Magnesium Sulphate", + subscriptNumbers("MgSO4"), + new Werkstoff.Stats().setElektrolysis(true), + Werkstoff.Types.COMPOUND, + new Werkstoff.GenerationFeatures().disable().onlyDust(), + OffsetID + 107, + TextureSet.SET_DULL, + new Pair<>(Magnesium, 1), + new Pair<>(Sulfur, 1), + new Pair<>(Oxygen, 4)); @Override - public void run() { } + public void run() {} } diff --git a/src/main/java/goodgenerator/items/RadioactiveItem.java b/src/main/java/goodgenerator/items/RadioactiveItem.java index 81ed7aa98a..3d085c421c 100644 --- a/src/main/java/goodgenerator/items/RadioactiveItem.java +++ b/src/main/java/goodgenerator/items/RadioactiveItem.java @@ -10,7 +10,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.potion.PotionEffect; import net.minecraft.world.World; -public class RadioactiveItem extends MyItems{ +public class RadioactiveItem extends MyItems { protected final int mRadio; @@ -36,5 +36,4 @@ public class RadioactiveItem extends MyItems{ if (!GT_Utility.isWearingFullRadioHazmat(tPlayer)) tPlayer.addPotionEffect(new PotionEffect(IC2Potion.radiation.id, mRadio, 4)); } - } diff --git a/src/main/java/goodgenerator/items/nuclear/IsotopeMaterial.java b/src/main/java/goodgenerator/items/nuclear/IsotopeMaterial.java index 3f4131bb97..1fef61888c 100644 --- a/src/main/java/goodgenerator/items/nuclear/IsotopeMaterial.java +++ b/src/main/java/goodgenerator/items/nuclear/IsotopeMaterial.java @@ -1,12 +1,12 @@ -//package goodgenerator.items.nuclear; +// package goodgenerator.items.nuclear; // -//import goodgenerator.loader.Loaders; -//import net.minecraft.item.ItemStack; +// import goodgenerator.loader.Loaders; +// import net.minecraft.item.ItemStack; // -//import java.util.HashMap; -//import java.util.HashSet; +// import java.util.HashMap; +// import java.util.HashSet; // -//public class IsotopeMaterial { +// public class IsotopeMaterial { // // public static final HashSet<IsotopeMaterial> mIsotopeMaterial = new HashSet<>(); // public static final HashMap<Integer, IsotopeMaterial> mIDMap = new HashMap<>(); @@ -21,7 +21,8 @@ // 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) { +// 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; @@ -56,4 +57,4 @@ // 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 a678842912..5bd5ee3938 100644 --- a/src/main/java/goodgenerator/items/nuclear/IsotopeMaterialLoader.java +++ b/src/main/java/goodgenerator/items/nuclear/IsotopeMaterialLoader.java @@ -1,6 +1,6 @@ -//package goodgenerator.items.nuclear; +// package goodgenerator.items.nuclear; // -//public class IsotopeMaterialLoader implements Runnable { +// public class IsotopeMaterialLoader implements Runnable { // // protected static final int OffsetID = 0; // @@ -174,4 +174,4 @@ // // @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 873b3a4e67..dbd2dd184f 100644 --- a/src/main/java/goodgenerator/items/nuclear/NuclearMetaItemGenerator.java +++ b/src/main/java/goodgenerator/items/nuclear/NuclearMetaItemGenerator.java @@ -1,25 +1,25 @@ -//package goodgenerator.items.nuclear; +// package goodgenerator.items.nuclear; // -//import com.github.bartimaeusnek.bartworks.util.Pair; -//import cpw.mods.fml.relauncher.Side; -//import cpw.mods.fml.relauncher.SideOnly; -//import goodgenerator.main.GoodGenerator; -//import gregtech.api.interfaces.IIconContainer; -//import gregtech.api.items.GT_MetaGenerated_Item; -//import gregtech.api.util.GT_LanguageManager; -//import gregtech.api.util.GT_OreDictUnificator; -//import net.minecraft.creativetab.CreativeTabs; -//import net.minecraft.item.Item; -//import net.minecraft.item.ItemStack; -//import net.minecraft.util.EnumChatFormatting; -//import net.minecraft.util.IIcon; +// import com.github.bartimaeusnek.bartworks.util.Pair; +// import cpw.mods.fml.relauncher.Side; +// import cpw.mods.fml.relauncher.SideOnly; +// import goodgenerator.main.GoodGenerator; +// import gregtech.api.interfaces.IIconContainer; +// import gregtech.api.items.GT_MetaGenerated_Item; +// import gregtech.api.util.GT_LanguageManager; +// import gregtech.api.util.GT_OreDictUnificator; +// import net.minecraft.creativetab.CreativeTabs; +// import net.minecraft.item.Item; +// import net.minecraft.item.ItemStack; +// import net.minecraft.util.EnumChatFormatting; +// import net.minecraft.util.IIcon; // -//import java.util.List; +// import java.util.List; // -//import static goodgenerator.items.nuclear.IsotopeMaterial.mIDMap; -//import static goodgenerator.items.nuclear.IsotopeMaterial.mIsotopeMaterial; +// import static goodgenerator.items.nuclear.IsotopeMaterial.mIDMap; +// import static goodgenerator.items.nuclear.IsotopeMaterial.mIsotopeMaterial; // -//public class NuclearMetaItemGenerator extends GT_MetaGenerated_Item { +// public class NuclearMetaItemGenerator extends GT_MetaGenerated_Item { // // /** // * <p>Full ingot - 1000 @@ -48,8 +48,10 @@ // 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", EnumChatFormatting.AQUA + String.format("%s's Isotope.", tIsotope.mMaterialName) + EnumChatFormatting.RESET); +// GT_LanguageManager.addStringLocalization(this.getUnlocalizedName(tStack) + ".name", +// String.format(tOreName, tIsotope.mLocalizedName)); +// 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(); @@ -105,4 +107,4 @@ // 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 e3d0391cc6..5828932e5c 100644 --- a/src/main/java/goodgenerator/items/nuclear/NuclearTextures.java +++ b/src/main/java/goodgenerator/items/nuclear/NuclearTextures.java @@ -1,9 +1,9 @@ -//package goodgenerator.items.nuclear; +// package goodgenerator.items.nuclear; // -//import gregtech.api.enums.Textures; -//import gregtech.api.interfaces.IIconContainer; +// import gregtech.api.enums.Textures; +// import gregtech.api.interfaces.IIconContainer; // -//public class NuclearTextures { +// public class NuclearTextures { // public static final NuclearTextures // STABLE1 = new NuclearTextures("stable1"), // STABLE2 = new NuclearTextures("stable2"), @@ -28,4 +28,4 @@ // 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 2df30c8752..13d9048092 100644 --- a/src/main/java/goodgenerator/loader/AchievementLoader.java +++ b/src/main/java/goodgenerator/loader/AchievementLoader.java @@ -1,4 +1,3 @@ package goodgenerator.loader; -public class AchievementLoader { -} +public class AchievementLoader {} diff --git a/src/main/java/goodgenerator/loader/FuelRecipeLoader.java b/src/main/java/goodgenerator/loader/FuelRecipeLoader.java index 73e97830a2..29d6c9558a 100644 --- a/src/main/java/goodgenerator/loader/FuelRecipeLoader.java +++ b/src/main/java/goodgenerator/loader/FuelRecipeLoader.java @@ -1,9 +1,12 @@ package goodgenerator.loader; +import static goodgenerator.main.GG_Config_Loader.NaquadahFuelTime; +import static goodgenerator.main.GG_Config_Loader.NaquadahFuelVoltage; + +import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader; import goodgenerator.items.MyMaterial; import goodgenerator.util.ItemRefer; import goodgenerator.util.MyRecipeAdder; -import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.util.GT_OreDictUnificator; @@ -11,69 +14,93 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; -import static goodgenerator.main.GG_Config_Loader.NaquadahFuelTime; -import static goodgenerator.main.GG_Config_Loader.NaquadahFuelVoltage; - 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); - MyRecipeAdder.instance.addLiquidMentalFuel(MyMaterial.uraniumBasedLiquidFuelExcited.getFluidOrGas(1),MyMaterial.uraniumBasedLiquidFuelDepleted.getFluidOrGas(1),NaquadahFuelVoltage[0],NaquadahFuelTime[0]); - MyRecipeAdder.instance.addLiquidMentalFuel(MyMaterial.thoriumBasedLiquidFuelExcited.getFluidOrGas(1),MyMaterial.thoriumBasedLiquidFuelDepleted.getFluidOrGas(1),NaquadahFuelVoltage[1],NaquadahFuelTime[1]); - MyRecipeAdder.instance.addLiquidMentalFuel(MyMaterial.plutoniumBasedLiquidFuelExcited.getFluidOrGas(1),MyMaterial.plutoniumBasedLiquidFuelDepleted.getFluidOrGas(1),NaquadahFuelVoltage[2],NaquadahFuelTime[2]); - MyRecipeAdder.instance.addLiquidMentalFuel(MyMaterial.naquadahBasedFuelMkI.getFluidOrGas(1),MyMaterial.naquadahBasedFuelMkIDepleted.getFluidOrGas(1),NaquadahFuelVoltage[3],NaquadahFuelTime[3]); - MyRecipeAdder.instance.addLiquidMentalFuel(MyMaterial.naquadahBasedFuelMkII.getFluidOrGas(1),MyMaterial.naquadahBasedFuelMkIIDepleted.getFluidOrGas(1),NaquadahFuelVoltage[4],NaquadahFuelTime[4]); - MyRecipeAdder.instance.addLiquidMentalFuel(MyMaterial.naquadahBasedFuelMkIII.getFluidOrGas(1),MyMaterial.naquadahBasedFuelMkIIIDepleted.getFluidOrGas(1),NaquadahFuelVoltage[5],NaquadahFuelTime[5]); - MyRecipeAdder.instance.addLiquidMentalFuel(MyMaterial.naquadahBasedFuelMkIV.getFluidOrGas(1),MyMaterial.naquadahBasedFuelMkIVDepleted.getFluidOrGas(1),NaquadahFuelVoltage[6],NaquadahFuelTime[6]); - MyRecipeAdder.instance.addLiquidMentalFuel(MyMaterial.naquadahBasedFuelMkV.getFluidOrGas(1),MyMaterial.naquadahBasedFuelMkVDepleted.getFluidOrGas(1),NaquadahFuelVoltage[7],NaquadahFuelTime[7]); + 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); + MyRecipeAdder.instance.addLiquidMentalFuel( + MyMaterial.uraniumBasedLiquidFuelExcited.getFluidOrGas(1), + MyMaterial.uraniumBasedLiquidFuelDepleted.getFluidOrGas(1), + NaquadahFuelVoltage[0], + NaquadahFuelTime[0]); + MyRecipeAdder.instance.addLiquidMentalFuel( + MyMaterial.thoriumBasedLiquidFuelExcited.getFluidOrGas(1), + MyMaterial.thoriumBasedLiquidFuelDepleted.getFluidOrGas(1), + NaquadahFuelVoltage[1], + NaquadahFuelTime[1]); + MyRecipeAdder.instance.addLiquidMentalFuel( + MyMaterial.plutoniumBasedLiquidFuelExcited.getFluidOrGas(1), + MyMaterial.plutoniumBasedLiquidFuelDepleted.getFluidOrGas(1), + NaquadahFuelVoltage[2], + NaquadahFuelTime[2]); + MyRecipeAdder.instance.addLiquidMentalFuel( + MyMaterial.naquadahBasedFuelMkI.getFluidOrGas(1), + MyMaterial.naquadahBasedFuelMkIDepleted.getFluidOrGas(1), + NaquadahFuelVoltage[3], + NaquadahFuelTime[3]); + MyRecipeAdder.instance.addLiquidMentalFuel( + MyMaterial.naquadahBasedFuelMkII.getFluidOrGas(1), + MyMaterial.naquadahBasedFuelMkIIDepleted.getFluidOrGas(1), + NaquadahFuelVoltage[4], + NaquadahFuelTime[4]); + MyRecipeAdder.instance.addLiquidMentalFuel( + MyMaterial.naquadahBasedFuelMkIII.getFluidOrGas(1), + MyMaterial.naquadahBasedFuelMkIIIDepleted.getFluidOrGas(1), + NaquadahFuelVoltage[5], + NaquadahFuelTime[5]); + MyRecipeAdder.instance.addLiquidMentalFuel( + MyMaterial.naquadahBasedFuelMkIV.getFluidOrGas(1), + MyMaterial.naquadahBasedFuelMkIVDepleted.getFluidOrGas(1), + NaquadahFuelVoltage[6], + NaquadahFuelTime[6]); + MyRecipeAdder.instance.addLiquidMentalFuel( + MyMaterial.naquadahBasedFuelMkV.getFluidOrGas(1), + MyMaterial.naquadahBasedFuelMkVDepleted.getFluidOrGas(1), + NaquadahFuelVoltage[7], + NaquadahFuelTime[7]); MyRecipeAdder.instance.addNaquadahFuelRefineRecipe( - new FluidStack[]{ - MyMaterial.heavyNaquadahFuel.getFluidOrGas(800), - MyMaterial.lightNaquadahFuel.getFluidOrGas(1000), + 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 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 - ); + 1); MyRecipeAdder.instance.addNaquadahFuelRefineRecipe( - new FluidStack[]{ - MyMaterial.naquadahBasedFuelMkIII.getFluidOrGas(2000), - Materials.Praseodymium.getMolten(9216L) + 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 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, - 2 - ); + 2); MyRecipeAdder.instance.addNaquadahFuelRefineRecipe( - new FluidStack[]{ - MyMaterial.naquadahBasedFuelMkIV.getFluidOrGas(2000), - FluidRegistry.getFluidStack("heavyradox",1000), + 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 ItemStack[] { + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Infinity, 16), + MyMaterial.atomicSeparationCatalyst.get(OrePrefixes.dust, 32), }, MyMaterial.naquadahBasedFuelMkV.getFluidOrGas(500), 100000000, 200, - 2 - ); + 2); } } diff --git a/src/main/java/goodgenerator/loader/FuelRodLoader.java b/src/main/java/goodgenerator/loader/FuelRodLoader.java index 723821b0e5..93555a834d 100644 --- a/src/main/java/goodgenerator/loader/FuelRodLoader.java +++ b/src/main/java/goodgenerator/loader/FuelRodLoader.java @@ -1,14 +1,14 @@ package goodgenerator.loader; +import static goodgenerator.util.DescTextLocalization.addText; + +import cpw.mods.fml.common.registry.GameRegistry; import goodgenerator.items.DepletedFuelRod; import goodgenerator.items.FuelRod; import goodgenerator.main.GoodGenerator; -import cpw.mods.fml.common.registry.GameRegistry; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import static goodgenerator.util.DescTextLocalization.addText; - public class FuelRodLoader { public static Item rodCompressedUraniumDepleted; @@ -37,25 +37,42 @@ public class FuelRodLoader { public static Item rodLiquidPlutonium_4; public static void RegisterRod() { - rodCompressedUraniumDepleted = new DepletedFuelRod("rodCompressedUraniumDepleted", addText("depletedfuelrod.tooltip", 1), GoodGenerator.GG, 100); - rodCompressedUraniumDepleted_2 = new DepletedFuelRod("rodCompressedUraniumDepleted2", addText("depletedfuelrod.tooltip", 1), GoodGenerator.GG, 200); - rodCompressedUraniumDepleted_4 = new DepletedFuelRod("rodCompressedUraniumDepleted4", addText("depletedfuelrod.tooltip", 1), GoodGenerator.GG, 400); - rodCompressedPlutoniumDepleted = new DepletedFuelRod("rodCompressedPlutoniumDepleted", addText("depletedfuelrod.tooltip", 1), GoodGenerator.GG, 120); - rodCompressedPlutoniumDepleted_2 = new DepletedFuelRod("rodCompressedPlutoniumDepleted2", addText("depletedfuelrod.tooltip", 1), GoodGenerator.GG, 240); - rodCompressedPlutoniumDepleted_4 = new DepletedFuelRod("rodCompressedPlutoniumDepleted4", addText("depletedfuelrod.tooltip", 1), GoodGenerator.GG, 480); - rodLiquidUraniumDepleted = new DepletedFuelRod("rodLiquidUraniumDepleted", addText("depletedfuelrod.tooltip", 1), GoodGenerator.GG, 800); - rodLiquidUraniumDepleted_2 = new DepletedFuelRod("rodLiquidUraniumDepleted2", addText("depletedfuelrod.tooltip", 1), GoodGenerator.GG, 1600); - rodLiquidUraniumDepleted_4 = new DepletedFuelRod("rodLiquidUraniumDepleted4", addText("depletedfuelrod.tooltip", 1), GoodGenerator.GG, 3200); - rodLiquidPlutoniumDepleted = new DepletedFuelRod("rodLiquidPlutoniumDepleted", addText("depletedfuelrod.tooltip", 1), GoodGenerator.GG, 1000); - rodLiquidPlutoniumDepleted_2 = new DepletedFuelRod("rodLiquidPlutoniumDepleted2", addText("depletedfuelrod.tooltip", 1), GoodGenerator.GG, 2000); - rodLiquidPlutoniumDepleted_4 = new DepletedFuelRod("rodLiquidPlutoniumDepleted4", addText("depletedfuelrod.tooltip", 1), GoodGenerator.GG, 4000); + rodCompressedUraniumDepleted = new DepletedFuelRod( + "rodCompressedUraniumDepleted", addText("depletedfuelrod.tooltip", 1), GoodGenerator.GG, 100); + rodCompressedUraniumDepleted_2 = new DepletedFuelRod( + "rodCompressedUraniumDepleted2", addText("depletedfuelrod.tooltip", 1), GoodGenerator.GG, 200); + rodCompressedUraniumDepleted_4 = new DepletedFuelRod( + "rodCompressedUraniumDepleted4", addText("depletedfuelrod.tooltip", 1), GoodGenerator.GG, 400); + rodCompressedPlutoniumDepleted = new DepletedFuelRod( + "rodCompressedPlutoniumDepleted", addText("depletedfuelrod.tooltip", 1), GoodGenerator.GG, 120); + rodCompressedPlutoniumDepleted_2 = new DepletedFuelRod( + "rodCompressedPlutoniumDepleted2", addText("depletedfuelrod.tooltip", 1), GoodGenerator.GG, 240); + rodCompressedPlutoniumDepleted_4 = new DepletedFuelRod( + "rodCompressedPlutoniumDepleted4", addText("depletedfuelrod.tooltip", 1), GoodGenerator.GG, 480); + rodLiquidUraniumDepleted = new DepletedFuelRod( + "rodLiquidUraniumDepleted", addText("depletedfuelrod.tooltip", 1), GoodGenerator.GG, 800); + rodLiquidUraniumDepleted_2 = new DepletedFuelRod( + "rodLiquidUraniumDepleted2", addText("depletedfuelrod.tooltip", 1), GoodGenerator.GG, 1600); + rodLiquidUraniumDepleted_4 = new DepletedFuelRod( + "rodLiquidUraniumDepleted4", addText("depletedfuelrod.tooltip", 1), GoodGenerator.GG, 3200); + rodLiquidPlutoniumDepleted = new DepletedFuelRod( + "rodLiquidPlutoniumDepleted", addText("depletedfuelrod.tooltip", 1), GoodGenerator.GG, 1000); + rodLiquidPlutoniumDepleted_2 = new DepletedFuelRod( + "rodLiquidPlutoniumDepleted2", addText("depletedfuelrod.tooltip", 1), GoodGenerator.GG, 2000); + rodLiquidPlutoniumDepleted_4 = new DepletedFuelRod( + "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(rodCompressedPlutoniumDepleted_2, "rodCompressedPlutoniumDepleted2", GoodGenerator.MOD_ID); - GameRegistry.registerItem(rodCompressedPlutoniumDepleted_4, "rodCompressedPlutoniumDepleted4", 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); + GameRegistry.registerItem( + 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); @@ -63,18 +80,120 @@ public class FuelRodLoader { GameRegistry.registerItem(rodLiquidPlutoniumDepleted_2, "rodLiquidPlutoniumDepleted2", GoodGenerator.MOD_ID); GameRegistry.registerItem(rodLiquidPlutoniumDepleted_4, "rodLiquidPlutoniumDepleted4", GoodGenerator.MOD_ID); - rodCompressedUranium = new FuelRod("rodCompressedUranium", 1, 100, 4, 800, 70000, new ItemStack(rodCompressedUraniumDepleted, 1), GoodGenerator.GG); - rodCompressedUranium_2 = new FuelRod("rodCompressedUranium2", 2, 100, 4, 1600, 70000, new ItemStack(rodCompressedUraniumDepleted_2, 1), GoodGenerator.GG); - rodCompressedUranium_4 = new FuelRod("rodCompressedUranium4", 4, 100, 4, 3200, 70000, new ItemStack(rodCompressedUraniumDepleted_4, 1), GoodGenerator.GG); - rodCompressedPlutonium = new FuelRod("rodCompressedPlutonium", 1, 50, 4, 1000, 30000, 6, new ItemStack(rodCompressedPlutoniumDepleted, 1), GoodGenerator.GG); - rodCompressedPlutonium_2 = new FuelRod("rodCompressedPlutonium2", 2, 50, 4, 2000, 30000, 6, new ItemStack(rodCompressedPlutoniumDepleted_2, 1), GoodGenerator.GG); - rodCompressedPlutonium_4 = new FuelRod("rodCompressedPlutonium4", 4, 50, 4, 4000, 30000, 6, new ItemStack(rodCompressedPlutoniumDepleted_4, 1), GoodGenerator.GG); - rodLiquidUranium = new FuelRod("rodLiquidUranium", 1, 1200, 64, 8000, 6000, new ItemStack(rodLiquidUraniumDepleted, 1), GoodGenerator.GG); - rodLiquidUranium_2 = new FuelRod("rodLiquidUranium2", 2, 1200, 64, 8000, 6000, new ItemStack(rodLiquidUraniumDepleted_2, 1), GoodGenerator.GG); - rodLiquidUranium_4 = new FuelRod("rodLiquidUranium4", 4, 1200, 64, 8000, 6000, new ItemStack(rodLiquidUraniumDepleted_4, 1), GoodGenerator.GG); - rodLiquidPlutonium = new FuelRod("rodLiquidPlutonium", 1, 1600, 64, 10000, 10000, 2, new ItemStack(rodLiquidPlutoniumDepleted, 1), GoodGenerator.GG); - rodLiquidPlutonium_2 = new FuelRod("rodLiquidPlutonium2", 2, 1600, 64, 10000, 10000, 2, new ItemStack(rodLiquidPlutoniumDepleted_2, 1), GoodGenerator.GG); - rodLiquidPlutonium_4 = new FuelRod("rodLiquidPlutonium4", 4, 1600, 64, 10000, 10000, 2, new ItemStack(rodLiquidPlutoniumDepleted_4, 1), GoodGenerator.GG); + rodCompressedUranium = new FuelRod( + "rodCompressedUranium", + 1, + 100, + 4, + 800, + 70000, + new ItemStack(rodCompressedUraniumDepleted, 1), + GoodGenerator.GG); + rodCompressedUranium_2 = new FuelRod( + "rodCompressedUranium2", + 2, + 100, + 4, + 1600, + 70000, + new ItemStack(rodCompressedUraniumDepleted_2, 1), + GoodGenerator.GG); + rodCompressedUranium_4 = new FuelRod( + "rodCompressedUranium4", + 4, + 100, + 4, + 3200, + 70000, + new ItemStack(rodCompressedUraniumDepleted_4, 1), + GoodGenerator.GG); + rodCompressedPlutonium = new FuelRod( + "rodCompressedPlutonium", + 1, + 50, + 4, + 1000, + 30000, + 6, + new ItemStack(rodCompressedPlutoniumDepleted, 1), + GoodGenerator.GG); + rodCompressedPlutonium_2 = new FuelRod( + "rodCompressedPlutonium2", + 2, + 50, + 4, + 2000, + 30000, + 6, + new ItemStack(rodCompressedPlutoniumDepleted_2, 1), + GoodGenerator.GG); + rodCompressedPlutonium_4 = new FuelRod( + "rodCompressedPlutonium4", + 4, + 50, + 4, + 4000, + 30000, + 6, + new ItemStack(rodCompressedPlutoniumDepleted_4, 1), + GoodGenerator.GG); + rodLiquidUranium = new FuelRod( + "rodLiquidUranium", + 1, + 1200, + 64, + 8000, + 6000, + new ItemStack(rodLiquidUraniumDepleted, 1), + GoodGenerator.GG); + rodLiquidUranium_2 = new FuelRod( + "rodLiquidUranium2", + 2, + 1200, + 64, + 8000, + 6000, + new ItemStack(rodLiquidUraniumDepleted_2, 1), + GoodGenerator.GG); + rodLiquidUranium_4 = new FuelRod( + "rodLiquidUranium4", + 4, + 1200, + 64, + 8000, + 6000, + new ItemStack(rodLiquidUraniumDepleted_4, 1), + GoodGenerator.GG); + rodLiquidPlutonium = new FuelRod( + "rodLiquidPlutonium", + 1, + 1600, + 64, + 10000, + 10000, + 2, + new ItemStack(rodLiquidPlutoniumDepleted, 1), + GoodGenerator.GG); + rodLiquidPlutonium_2 = new FuelRod( + "rodLiquidPlutonium2", + 2, + 1600, + 64, + 10000, + 10000, + 2, + new ItemStack(rodLiquidPlutoniumDepleted_2, 1), + GoodGenerator.GG); + rodLiquidPlutonium_4 = new FuelRod( + "rodLiquidPlutonium4", + 4, + 1600, + 64, + 10000, + 10000, + 2, + new ItemStack(rodLiquidPlutoniumDepleted_4, 1), + GoodGenerator.GG); GameRegistry.registerItem(rodCompressedUranium, "rodCompressedUranium", GoodGenerator.MOD_ID); GameRegistry.registerItem(rodCompressedUranium_2, "rodCompressedUranium2", GoodGenerator.MOD_ID); diff --git a/src/main/java/goodgenerator/loader/Loaders.java b/src/main/java/goodgenerator/loader/Loaders.java index db5f19f3e7..288c422da2 100644 --- a/src/main/java/goodgenerator/loader/Loaders.java +++ b/src/main/java/goodgenerator/loader/Loaders.java @@ -1,14 +1,18 @@ package goodgenerator.loader; +import static goodgenerator.util.DescTextLocalization.addText; + import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.common.Loader; +import cpw.mods.fml.common.registry.GameRegistry; import goodgenerator.blocks.myFluids.FluidsBuilder; import goodgenerator.blocks.regularBlock.*; -import goodgenerator.client.render.BlockRenderHandler; import goodgenerator.blocks.tileEntity.*; import goodgenerator.blocks.tileEntity.GTMetaTileEntity.DieselGenerator; import goodgenerator.blocks.tileEntity.GTMetaTileEntity.NeutronAccelerator; import goodgenerator.blocks.tileEntity.GTMetaTileEntity.NeutronSensor; import goodgenerator.blocks.tileEntity.GTMetaTileEntity.YOTTAHatch; +import goodgenerator.client.render.BlockRenderHandler; import goodgenerator.crossmod.LoadedList; import goodgenerator.crossmod.ic2.CropsLoader; import goodgenerator.crossmod.nei.IMCForNEI; @@ -19,8 +23,6 @@ import goodgenerator.items.MyItems; import goodgenerator.items.MyMaterial; import goodgenerator.items.RadioactiveItem; import goodgenerator.main.GoodGenerator; -import cpw.mods.fml.common.Loader; -import cpw.mods.fml.common.registry.GameRegistry; import goodgenerator.util.CrackRecipeAdder; import goodgenerator.util.MaterialFix; import gregtech.api.GregTech_API; @@ -33,8 +35,6 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; -import static goodgenerator.util.DescTextLocalization.addText; - public class Loaders { public static final int IDOffset = 32001; @@ -44,16 +44,20 @@ 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); @@ -64,36 +68,110 @@ 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"}); - 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"}); + 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" + }); + 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" + }); - 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"}); - 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",}); - 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"}); + 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" + }); + 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", + }); + 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"}); public static Block essentiaHatch; public static Block essentiaOutputHatch; public static Block essentiaOutputHatch_ME; @@ -116,31 +194,56 @@ public class Loaders { public static ItemStack[] NeutronAccelerators = new ItemStack[9]; public static ItemStack[] Generator_Diesel = new ItemStack[2]; - //public static Item Isotope = new NuclearMetaItemGenerator(); + // public static Item Isotope = new NuclearMetaItemGenerator(); public static void GTMetaTileRegister() { 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); - 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); + Loaders.UCFE = new UniversalChemicalFuelEngine( + 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); } 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); - 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); - Loaders.LFC[1] = new LargeFusionComputer2(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); + Loaders.SCTurbine = new SupercriticalFluidTurbine( + 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); + Loaders.LFC[1] = new LargeFusionComputer2( + 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); if (LoadedList.GTPP) { - Loaders.LFC[3] = new LargeFusionComputer4(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); + Loaders.LFC[3] = new LargeFusionComputer4( + 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); } - Loaders.Generator_Diesel[0] = new DieselGenerator(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); + Loaders.Generator_Diesel[0] = new DieselGenerator( + 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); Loaders.CT = new CoolantTower(IDOffset + 24, "CoolantTower", "Coolant Tower").getStackForm(1L); CrackRecipeAdder.registerPipe(30995, MyMaterial.incoloy903, 15000, 8000, true); CrackRecipeAdder.registerWire(32749, MyMaterial.signalium, 12, 131072, 16, true); @@ -164,7 +267,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(pressureResistantWalls, MyItemBlocks.class, "pressureResistantWalls"); GameRegistry.registerBlock(preciseUnitCasing, MyItemBlocks.class, "preciseUnitCasing"); GameRegistry.registerBlock(compactFusionCoil, MyItemBlocks.class, "compactFusionCoil"); @@ -179,7 +283,8 @@ public class Loaders { GameRegistry.registerItem(highDensityPlutoniumNugget, "highDensityPlutoniumNugget", GoodGenerator.MOD_ID); GameRegistry.registerItem(highDensityPlutonium, "highDensityPlutonium", GoodGenerator.MOD_ID); GameRegistry.registerItem(rawAtomicSeparationCatalyst, "rawAtomicSeparationCatalyst", GoodGenerator.MOD_ID); - GameRegistry.registerItem(advancedRadiationProtectionPlate, "advancedRadiationProtectionPlate", GoodGenerator.MOD_ID); + GameRegistry.registerItem( + 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); @@ -207,11 +312,15 @@ public class Loaders { GameRegistry.registerTileEntity(EssentiaHatch.class, "EssentiaHatch"); GameRegistry.registerTileEntity(EssentiaOutputHatch.class, "EssentiaOutputHatch"); GameRegistry.registerTileEntity(EssentiaOutputHatch_ME.class, "EssentiaOutputHatch_ME"); - Loaders.LEG = new LargeEssentiaGenerator(IDOffset + 1, "LargeEssentiaGenerator", "Large Essentia Generator").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); - essentiaOutputHatch_ME = new TEBlock("essentiaOutputHatch_ME", new String[]{GoodGenerator.MOD_ID + ":essentiaOutputHatch_ME"}, 3); + Loaders.LEG = new LargeEssentiaGenerator(IDOffset + 1, "LargeEssentiaGenerator", "Large Essentia Generator") + .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); + essentiaOutputHatch_ME = new TEBlock( + "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"); @@ -228,14 +337,20 @@ public class Loaders { } public static void addTexturePage() { - if (Textures.BlockIcons.casingTexturePages[GoodGeneratorTexturePage] == null){ + 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); } } @@ -259,23 +374,23 @@ public class Loaders { CropsLoader.registerCrops(); } - public static void postInitLoad(){ + public static void postInitLoad() { postInitLoadRecipes(); } - public static void completeLoad(){ + public static void completeLoad() { RecipeLoader_02.FinishLoadRecipe(); MaterialFix.addRecipeForMultiItems(); } - public static void initLoadRecipes(){ + public static void initLoadRecipes() { RecipeLoader.InitLoadRecipe(); RecipeLoader_02.InitLoadRecipe(); FuelRecipeLoader.RegisterFuel(); NaquadahReworkRecipeLoader.RecipeLoad(); } - public static void postInitLoadRecipes(){ + public static void postInitLoadRecipes() { RecipeLoader.RecipeLoad(); RecipeLoader.Fixer(); RecipeLoader_02.RecipeLoad(); diff --git a/src/main/java/goodgenerator/loader/NaquadahReworkRecipeLoader.java b/src/main/java/goodgenerator/loader/NaquadahReworkRecipeLoader.java index 2c5f379d00..94b8485539 100644 --- a/src/main/java/goodgenerator/loader/NaquadahReworkRecipeLoader.java +++ b/src/main/java/goodgenerator/loader/NaquadahReworkRecipeLoader.java @@ -1,12 +1,15 @@ package goodgenerator.loader; +import static goodgenerator.items.MyMaterial.*; +import static goodgenerator.main.GG_Config_Loader.EnableNaquadahRework; +import static gregtech.common.items.GT_MetaGenerated_Item_01.registerCauldronCleaningFor; + +import com.github.bartimaeusnek.bartworks.system.material.GT_Enhancement.PlatinumSludgeOverHaul; +import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader; import goodgenerator.crossmod.LoadedList; -import goodgenerator.items.MyMaterial; import goodgenerator.main.GoodGenerator; import goodgenerator.util.ItemRefer; import goodgenerator.util.MyRecipeAdder; -import com.github.bartimaeusnek.bartworks.system.material.GT_Enhancement.PlatinumSludgeOverHaul; -import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader; import gregtech.api.enums.GT_Values; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; @@ -15,6 +18,8 @@ import gregtech.api.util.*; import gregtech.common.items.CombType; import gregtech.loaders.misc.GT_Bees; import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_MultisUsingFluidInsteadOfCells; +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; @@ -27,29 +32,21 @@ import net.minecraftforge.oredict.ShapedOreRecipe; import net.minecraftforge.oredict.ShapelessOreRecipe; import org.apache.commons.lang3.reflect.FieldUtils; -import java.lang.reflect.*; -import java.util.HashSet; - -import static goodgenerator.items.MyMaterial.*; -import static goodgenerator.main.GG_Config_Loader.EnableNaquadahRework; -import static gregtech.common.items.GT_MetaGenerated_Item_01.registerCauldronCleaningFor; - public class NaquadahReworkRecipeLoader { - public static void RecipeLoad(){ + public static void RecipeLoad() { if (!EnableNaquadahRework) return; - //Fix shit + // 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 - ); + 4); - //Naquadah Rework Line + // Naquadah Rework Line GT_Values.RA.addBlastRecipe( naquadahEarth.get(OrePrefixes.dust, 2), GT_Utility.getIntegratedCircuit(1), @@ -59,10 +56,9 @@ public class NaquadahReworkRecipeLoader { null, 100, 480, - 3000 - ); + 3000); - //TiF3 + 3H = Ti + 3HF + // TiF3 + 3H = Ti + 3HF GT_Values.RA.addBlastRecipe( titaniumTrifluoride.get(OrePrefixes.dust, 4), GT_Utility.getIntegratedCircuit(1), @@ -72,8 +68,7 @@ public class NaquadahReworkRecipeLoader { null, 120, 1920, - 2000 - ); + 2000); GT_Values.RA.addChemicalRecipe( GT_Utility.copyAmount(0, GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Copper, 1)), @@ -82,26 +77,20 @@ public class NaquadahReworkRecipeLoader { towEthyl1Hexanol.getFluidOrGas(1000), ItemList.Cell_Empty.get(8), 400, - 480 - ); + 480); - //2C8H18O + H3PO4 =Na,C2H6O= C16H35O3P + 2H2O + // 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 - ); + 1920); GT_Values.RA.addChemicalRecipeForBasicMachineOnly( lowQualityNaquadahSolution.get(OrePrefixes.cell, 36), @@ -111,23 +100,19 @@ public class NaquadahReworkRecipeLoader { naquadahAdamantiumSolution.get(OrePrefixes.cell, 30), ItemList.Cell_Empty.get(10), 4000, - 1920 - ); + 1920); GT_Values.RA.addMultiblockChemicalRecipe( null, - new FluidStack[]{ - P507.getFluidOrGas(4000), - lowQualityNaquadahSolution.getFluidOrGas(36000), + new FluidStack[] { + P507.getFluidOrGas(4000), lowQualityNaquadahSolution.getFluidOrGas(36000), }, - new FluidStack[]{ - fluorineRichWasteLiquid.getFluidOrGas(10000), - naquadahAdamantiumSolution.getFluidOrGas(30000) + new FluidStack[] { + fluorineRichWasteLiquid.getFluidOrGas(10000), naquadahAdamantiumSolution.getFluidOrGas(30000) }, null, 4000, - 1920 - ); + 1920); GT_Values.RA.addChemicalRecipe( GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Quicklime, 40), @@ -136,38 +121,31 @@ public class NaquadahReworkRecipeLoader { wasteLiquid.getFluidOrGas(1000), WerkstoffLoader.Fluorspar.get(OrePrefixes.dust, 60), 1000, - 120 - ); + 120); 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 - ); + 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 - ); + 200); GT_Values.RA.addAutoclaveRecipe( GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SodiumHydroxide, 27), @@ -178,10 +156,9 @@ public class NaquadahReworkRecipeLoader { 10000, 1000, 120, - false - ); + false); - //NqO2 + C = CO2 + Nq + // NqO2 + C = CO2 + Nq GT_Values.RA.addBlastRecipe( naquadahine.get(OrePrefixes.dust, 3), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Carbon, 1), @@ -191,8 +168,7 @@ public class NaquadahReworkRecipeLoader { null, 40, 7680, - 5000 - ); + 5000); GT_Values.RA.addCentrifugeRecipe( GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SodiumHydroxide, 27), @@ -202,42 +178,32 @@ public class NaquadahReworkRecipeLoader { galliumHydroxide.get(OrePrefixes.dust, 64), galliumHydroxide.get(OrePrefixes.dust, 48), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Antimony, 15), - null,null, null, - new int[]{6250, 6250, 10000}, + null, + null, + null, + new int[] {6250, 6250, 10000}, 1000, - 1920 - ); + 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 - ); + 1920); - //ZnSO4 + 2H = H2SO4 + Zn + // ZnSO4 + 2H = H2SO4 + Zn GT_Values.RA.addChemicalRecipe( - WerkstoffLoader.ZincSulfate.get(OrePrefixes.dust, 6), - null, - Materials.Hydrogen.getGas(2000), - Materials.SulfuricAcid.getFluid(1000), - Materials.Zinc.getDust(1), - 30, - 7 - ); + WerkstoffLoader.ZincSulfate.get(OrePrefixes.dust, 6), + null, + Materials.Hydrogen.getGas(2000), + Materials.SulfuricAcid.getFluid(1000), + Materials.Zinc.getDust(1), + 30, + 7); GT_Values.RA.addAutoclaveRecipe( GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SodiumHydroxide, 60), @@ -248,29 +214,28 @@ public class NaquadahReworkRecipeLoader { 10000, 1000, 480, - false - ); + false); 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), + 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 - ); + 460); - //Nq+(SO4)2 + 2Zn = Nq+ + 2ZnSO4 + // Nq+(SO4)2 + 2Zn = Nq+ + 2ZnSO4 GT_Values.RA.addBlastRecipe( enrichedNaquadahSulphate.get(OrePrefixes.dust, 11), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Zinc, 2), @@ -280,26 +245,20 @@ public class NaquadahReworkRecipeLoader { WerkstoffLoader.ZincSulfate.get(OrePrefixes.dust, 12), 100, 7680, - 7500 - ); + 7500); - //KeSO4 + 2H = Ke + H2SO4 + // KeSO4 + 2H = Ke + H2SO4 GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[]{ - triniumSulphate.get(OrePrefixes.dust, 6), - }, - new FluidStack[]{ - Materials.Hydrogen.getGas(2000) + new ItemStack[] { + triniumSulphate.get(OrePrefixes.dust, 6), }, - new FluidStack[]{ - Materials.SulfuricAcid.getFluid(1000) - }, - new ItemStack[]{ - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Trinium, 1), + new FluidStack[] {Materials.Hydrogen.getGas(2000)}, + new FluidStack[] {Materials.SulfuricAcid.getFluid(1000)}, + new ItemStack[] { + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Trinium, 1), }, 120, - 480 - ); + 480); GT_Values.RA.addCentrifugeRecipe( naquadriaEarth.get(OrePrefixes.dust, 4), @@ -308,13 +267,15 @@ public class NaquadahReworkRecipeLoader { null, indiumPhosphate.get(OrePrefixes.dust, 6), lowQualityNaquadriaPhosphate.get(OrePrefixes.dust, 4), - null, null, null, null, - new int[]{2000, 10000}, + null, + null, + null, + null, + new int[] {2000, 10000}, 400, - 122880 - ); + 122880); - //Ga(OH)3 + 3Na = Ga + 3NaOH + // Ga(OH)3 + 3Na = Ga + 3NaOH GT_Values.RA.addChemicalRecipe( galliumHydroxide.get(OrePrefixes.dust, 7), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sodium, 2), @@ -323,19 +284,18 @@ public class NaquadahReworkRecipeLoader { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Gallium, 1), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SodiumHydroxide, 9), 40, - 30 - ); + 30); - //2InPO4 + 3Ca = 2In + Ca3(PO4)2 + // 2InPO4 + 3Ca = 2In + Ca3(PO4)2 GT_Values.RA.addChemicalRecipe( indiumPhosphate.get(OrePrefixes.dust, 12), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Calcium, 3), - null, null, + null, + null, GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Indium, 2), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.TricalciumPhosphate, 5), 20, - 30 - ); + 30); GT_Values.RA.addChemicalRecipe( lowQualityNaquadriaPhosphate.get(OrePrefixes.dust, 10), @@ -345,23 +305,18 @@ public class NaquadahReworkRecipeLoader { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Barite, 1), ItemList.Cell_Empty.get(30), 1000, - 7680 - ); + 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 - ); + 1050); GT_Values.RA.addChemicalRecipe( lowQualityNaquadriaSulphate.get(OrePrefixes.dust, 3), @@ -370,22 +325,20 @@ public class NaquadahReworkRecipeLoader { lowQualityNaquadriaSolution.getFluidOrGas(3500), ItemList.Cell_Empty.get(3), 500, - 1920 - ); + 1920); 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 - ); + 7680); - //Nq*(SO4)2 + 2Mg = Nq* + 2MgSO4 + // Nq*(SO4)2 + 2Mg = Nq* + 2MgSO4 GT_Values.RA.addBlastRecipe( naquadriaSulphate.get(OrePrefixes.dust, 11), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Magnesium, 2), @@ -395,10 +348,9 @@ public class NaquadahReworkRecipeLoader { magnesiumSulphate.get(OrePrefixes.dust, 12), 100, 122880, - 9100 - ); + 9100); - //InPO4 + Ga(OH)3 = InGaP + // InPO4 + Ga(OH)3 = InGaP GT_Values.RA.addMixerRecipe( indiumPhosphate.get(OrePrefixes.dust, 6), galliumHydroxide.get(OrePrefixes.dust, 7), @@ -408,65 +360,51 @@ public class NaquadahReworkRecipeLoader { null, GT_OreDictUnificator.get(OrePrefixes.dust, Materials.IndiumGalliumPhosphide, 3), 15, - 7 - ); + 7); GT_Values.RA.addFluidSolidifierRecipe( ItemList.Shape_Mold_Ball.get(0), naquadahGoo.getFluidOrGas(72), ItemRefer.Naquadah_Mass.get(1), 100, - 30 - ); + 30); GT_Values.RA.addFluidSolidifierRecipe( ItemList.Shape_Mold_Ball.get(0), enrichedNaquadahGoo.getFluidOrGas(72), ItemRefer.Enriched_Naquadah_Mass.get(1), 100, - 30 - ); + 30); GT_Values.RA.addFluidSolidifierRecipe( ItemList.Shape_Mold_Ball.get(0), naquadriaGoo.getFluidOrGas(72), ItemRefer.Naquadria_Mass.get(1), 100, - 30 - ); + 30); GT_Values.RA.addPulveriserRecipe( ItemRefer.Naquadah_Mass.get(1), - new ItemStack[]{ - naquadahEarth.get(OrePrefixes.dust, 1), - enrichedNaquadahEarth.get(OrePrefixes.dust, 1) + new ItemStack[] {naquadahEarth.get(OrePrefixes.dust, 1), enrichedNaquadahEarth.get(OrePrefixes.dust, 1) }, - new int[]{10000, 100}, + new int[] {10000, 100}, 100, - 2 - ); + 2); GT_Values.RA.addPulveriserRecipe( ItemRefer.Enriched_Naquadah_Mass.get(1), - new ItemStack[]{ - enrichedNaquadahEarth.get(OrePrefixes.dust, 1), - naquadriaEarth.get(OrePrefixes.dust, 1) + new ItemStack[] {enrichedNaquadahEarth.get(OrePrefixes.dust, 1), naquadriaEarth.get(OrePrefixes.dust, 1) }, - new int[]{10000, 100}, + new int[] {10000, 100}, 100, - 2 - ); + 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 - ); + 2); GT_Values.RA.addBlastRecipe( GT_OreDictUnificator.get(OrePrefixes.block, Materials.SiliconSG, 16), @@ -481,10 +419,9 @@ public class NaquadahReworkRecipeLoader { null, 1000, 7680, - 4484 - ); + 4484); - //NqO2 + 4Na = 2Na2O + Nq + // NqO2 + 4Na = 2Na2O + Nq GT_Values.RA.addChemicalRecipe( naquadahine.get(OrePrefixes.dust, 3), Materials.Sodium.getDust(4), @@ -493,8 +430,7 @@ public class NaquadahReworkRecipeLoader { Materials.Naquadah.getDust(1), Materials.SodiumOxide.getDust(6), 100, - 1920 - ); + 1920); GT_Values.RA.addBlastRecipe( naquadahEarth.get(OrePrefixes.dust, 2), @@ -505,25 +441,16 @@ public class NaquadahReworkRecipeLoader { null, 2400, 7680, - 5000 - ); + 5000); - //C2H4 + H2O(g) = C2H6O + // 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 - ); + 480); GT_Values.RA.addChemicalRecipeForBasicMachineOnly( Materials.Ethylene.getCells(1), @@ -533,15 +460,13 @@ public class NaquadahReworkRecipeLoader { Materials.Ethanol.getCells(1), null, 400, - 480 - ); + 480); GT_Values.RA.addVacuumFreezerRecipe( GT_OreDictUnificator.get(OrePrefixes.ingotHot, Materials.Naquadah, 1), GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Naquadah, 1), 330, - 7680 - ); + 7680); } public static void SmallRecipeChange() { @@ -549,44 +474,54 @@ public class NaquadahReworkRecipeLoader { GT_Recipe tRecipe; tRecipe = GT_Recipe.GT_Recipe_Map.sChemicalRecipes.findRecipe( - null, false, 1 << 30, - new FluidStack[]{Materials.SulfuricAcid.getFluid(500)}, + null, + false, + 1 << 30, + new FluidStack[] {Materials.SulfuricAcid.getFluid(500)}, GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Platinum, 16), - ItemList.Empty_Board_Elite.get(2) - ); + 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(); } tRecipe = GT_Recipe.GT_Recipe_Map.sMultiblockChemicalRecipes.findRecipe( - null, false, 1 << 30, - new FluidStack[]{Materials.SulfuricAcid.getFluid(500)}, + null, + false, + 1 << 30, + new FluidStack[] {Materials.SulfuricAcid.getFluid(500)}, GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Platinum, 16), - ItemList.Empty_Board_Elite.get(2) - ); + 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(); } tRecipe = GT_Recipe.GT_Recipe_Map.sAssemblerRecipes.findRecipe( - null, false, 1 << 30, - new FluidStack[]{Materials.Polybenzimidazole.getMolten(36)}, + null, + false, + 1 << 30, + 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) - ); + GT_Utility.getIntegratedCircuit(1)); if (tRecipe != null) { 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)}; + tRecipe2.mInputs = new ItemStack[] { + 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(); } @@ -601,25 +536,31 @@ public class NaquadahReworkRecipeLoader { HashSet<GT_Recipe> remove = new HashSet<>(5000); HashSet<GT_Recipe> reAdd = new HashSet<>(5000); - //For Crusher + // For Crusher for (GT_Recipe recipe : GT_Recipe.GT_Recipe_Map.sMaceratorRecipes.mRecipeList) { ItemStack input = recipe.mInputs[0]; if (GT_Utility.isStackValid(input)) { int[] oreDict = OreDictionary.getOreIDs(input); for (int oreDictID : oreDict) { - if ((OreDictionary.getOreName(oreDictID).startsWith("ore") || OreDictionary.getOreName(oreDictID).startsWith("crushed")) && OreDictionary.getOreName(oreDictID).contains("Naq")) { + if ((OreDictionary.getOreName(oreDictID).startsWith("ore") + || OreDictionary.getOreName(oreDictID).startsWith("crushed")) + && OreDictionary.getOreName(oreDictID).contains("Naq")) { GT_Recipe tRecipe = recipe.copy(); - for (int i = 0; i < tRecipe.mOutputs.length; i ++) { + for (int i = 0; i < tRecipe.mOutputs.length; i++) { 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] = GT_Utility.copyAmount( + tRecipe.mOutputs[i].stackSize * 2, naquadahEarth.get(OrePrefixes.dust, 1)); } 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)); + tRecipe.mOutputs[i] = GT_Utility.copyAmount( + tRecipe.mOutputs[i].stackSize * 2, + enrichedNaquadahEarth.get(OrePrefixes.dust, 1)); } 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] = GT_Utility.copyAmount( + tRecipe.mOutputs[i].stackSize * 2, naquadriaEarth.get(OrePrefixes.dust, 1)); } } - if (!tRecipe.equals(recipe)){ + if (!tRecipe.equals(recipe)) { reAdd.add(tRecipe); remove.add(recipe); } @@ -639,25 +580,30 @@ public class NaquadahReworkRecipeLoader { GT_Log.out.print("Crusher done!\n"); - //For Washer + // For Washer for (GT_Recipe recipe : GT_Recipe.GT_Recipe_Map.sOreWasherRecipes.mRecipeList) { ItemStack input = recipe.mInputs[0]; if (GT_Utility.isStackValid(input)) { int[] oreDict = OreDictionary.getOreIDs(input); for (int oreDictID : oreDict) { - if (OreDictionary.getOreName(oreDictID).startsWith("crushed") && OreDictionary.getOreName(oreDictID).contains("Naq")) { + if (OreDictionary.getOreName(oreDictID).startsWith("crushed") + && OreDictionary.getOreName(oreDictID).contains("Naq")) { GT_Recipe tRecipe = recipe.copy(); - for (int i = 0; i < tRecipe.mOutputs.length; i ++) { + for (int i = 0; i < tRecipe.mOutputs.length; i++) { 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] = GT_Utility.copyAmount( + tRecipe.mOutputs[i].stackSize * 2, naquadahEarth.get(OrePrefixes.dust, 1)); } 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)); + tRecipe.mOutputs[i] = GT_Utility.copyAmount( + tRecipe.mOutputs[i].stackSize * 2, + enrichedNaquadahEarth.get(OrePrefixes.dust, 1)); } 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] = GT_Utility.copyAmount( + tRecipe.mOutputs[i].stackSize * 2, naquadriaEarth.get(OrePrefixes.dust, 1)); } } - if (!tRecipe.equals(recipe)){ + if (!tRecipe.equals(recipe)) { reAdd.add(tRecipe); remove.add(recipe); } @@ -677,25 +623,30 @@ public class NaquadahReworkRecipeLoader { GT_Log.out.print("Washer done!\n"); - //For Thermal Centrifuge + // For Thermal Centrifuge for (GT_Recipe recipe : GT_Recipe.GT_Recipe_Map.sThermalCentrifugeRecipes.mRecipeList) { ItemStack input = recipe.mInputs[0]; if (GT_Utility.isStackValid(input)) { int[] oreDict = OreDictionary.getOreIDs(input); for (int oreDictID : oreDict) { - if (OreDictionary.getOreName(oreDictID).startsWith("crushed") && OreDictionary.getOreName(oreDictID).contains("Naq")) { + if (OreDictionary.getOreName(oreDictID).startsWith("crushed") + && OreDictionary.getOreName(oreDictID).contains("Naq")) { GT_Recipe tRecipe = recipe.copy(); - for (int i = 0; i < tRecipe.mOutputs.length; i ++) { + for (int i = 0; i < tRecipe.mOutputs.length; i++) { 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] = GT_Utility.copyAmount( + tRecipe.mOutputs[i].stackSize * 2, naquadahEarth.get(OrePrefixes.dust, 1)); } 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)); + tRecipe.mOutputs[i] = GT_Utility.copyAmount( + tRecipe.mOutputs[i].stackSize * 2, + enrichedNaquadahEarth.get(OrePrefixes.dust, 1)); } 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] = GT_Utility.copyAmount( + tRecipe.mOutputs[i].stackSize * 2, naquadriaEarth.get(OrePrefixes.dust, 1)); } } - if (!tRecipe.equals(recipe)){ + if (!tRecipe.equals(recipe)) { reAdd.add(tRecipe); remove.add(recipe); } @@ -715,57 +666,78 @@ public class NaquadahReworkRecipeLoader { GT_Log.out.print("Thermal Centrifuge done!\n"); - //For Centrifuge + // For Centrifuge for (GT_Recipe recipe : GT_Recipe.GT_Recipe_Map.sCentrifugeRecipes.mRecipeList) { ItemStack input = null; if (recipe.mInputs.length > 0) input = recipe.mInputs[0]; if (GT_Utility.isStackValid(input)) { int[] oreDict = OreDictionary.getOreIDs(input); - if (input.isItemEqual(GT_Bees.combs.getStackForType(CombType.DOB))){ + if (input.isItemEqual(GT_Bees.combs.getStackForType(CombType.DOB))) { GT_Recipe tRecipe = recipe.copy(); - for (int i = 0; i < tRecipe.mOutputs.length; i ++) { + 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 * 2L, naquadahEarth.get(OrePrefixes.dustTiny, 1)); + tRecipe.mOutputs[i] = GT_Utility.copyAmount( + tRecipe.mOutputs[i].stackSize * 2L, naquadahEarth.get(OrePrefixes.dustTiny, 1)); } } - if (!tRecipe.equals(recipe)){ + if (!tRecipe.equals(recipe)) { 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(); - 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)); - } 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)); - } 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)); - } 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)); - } 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)); - } 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)); - } 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)); - } 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)); - } 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)); + } 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(); + 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)); + } 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)); + } 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)); + } 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)); + } 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)); + } 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)); + } 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)); + } 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)); + } 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)); + } } + if (!tRecipe.equals(recipe)) { + reAdd.add(tRecipe); + remove.add(recipe); + } + break; } - if (!tRecipe.equals(recipe)){ - reAdd.add(tRecipe); - remove.add(recipe); - } - break; } - } } } GT_Recipe.GT_Recipe_Map.sCentrifugeRecipes.mRecipeList.removeAll(remove); @@ -779,25 +751,30 @@ public class NaquadahReworkRecipeLoader { GT_Log.out.print("Centrifuge done!\n"); - //For Hammer + // For Hammer for (GT_Recipe recipe : GT_Recipe.GT_Recipe_Map.sHammerRecipes.mRecipeList) { ItemStack input = recipe.mInputs[0]; if (GT_Utility.isStackValid(input)) { int[] oreDict = OreDictionary.getOreIDs(input); for (int oreDictID : oreDict) { - if (OreDictionary.getOreName(oreDictID).startsWith("crushed") && OreDictionary.getOreName(oreDictID).contains("Naq")) { + if (OreDictionary.getOreName(oreDictID).startsWith("crushed") + && OreDictionary.getOreName(oreDictID).contains("Naq")) { GT_Recipe tRecipe = recipe.copy(); - for (int i = 0; i < tRecipe.mOutputs.length; i ++) { + for (int i = 0; i < tRecipe.mOutputs.length; i++) { 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] = GT_Utility.copyAmount( + tRecipe.mOutputs[i].stackSize * 2, naquadahEarth.get(OrePrefixes.dust, 1)); } 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)); + tRecipe.mOutputs[i] = GT_Utility.copyAmount( + tRecipe.mOutputs[i].stackSize * 2, + enrichedNaquadahEarth.get(OrePrefixes.dust, 1)); } 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] = GT_Utility.copyAmount( + tRecipe.mOutputs[i].stackSize * 2, naquadriaEarth.get(OrePrefixes.dust, 1)); } } - if (!tRecipe.equals(recipe)){ + if (!tRecipe.equals(recipe)) { reAdd.add(tRecipe); remove.add(recipe); } @@ -817,22 +794,22 @@ public class NaquadahReworkRecipeLoader { GT_Log.out.print("Hammer done!\n"); - //For Chemical Reactor + // For Chemical Reactor for (GT_Recipe recipe : GT_Recipe.GT_Recipe_Map.sChemicalRecipes.mRecipeList) { if (recipe.mFluidOutputs == null) continue; boolean isAny = false; - for (int i = 0; i < recipe.mFluidOutputs.length; i ++) { + for (int i = 0; i < recipe.mFluidOutputs.length; i++) { if (recipe.mFluidOutputs[i] == null) continue; - if (recipe.mFluidOutputs[i].isFluidEqual(Materials.Naquadah.getMolten(1)) || - recipe.mFluidOutputs[i].isFluidEqual(Materials.NaquadahEnriched.getMolten(1)) || - recipe.mFluidOutputs[i].isFluidEqual(Materials.Naquadria.getMolten(1))) { + if (recipe.mFluidOutputs[i].isFluidEqual(Materials.Naquadah.getMolten(1)) + || recipe.mFluidOutputs[i].isFluidEqual(Materials.NaquadahEnriched.getMolten(1)) + || recipe.mFluidOutputs[i].isFluidEqual(Materials.Naquadria.getMolten(1))) { isAny = true; break; } } if (!isAny) continue; GT_Recipe tRecipe = recipe.copy(); - for (int i = 0; i < recipe.mFluidOutputs.length; i ++) { + for (int i = 0; i < recipe.mFluidOutputs.length; i++) { if (recipe.mFluidOutputs[i] == null) continue; if (recipe.mFluidOutputs[i].isFluidEqual(Materials.Naquadah.getMolten(1))) { tRecipe.mFluidOutputs[i] = naquadahGoo.getFluidOrGas(recipe.mFluidOutputs[i].amount * 2); @@ -858,22 +835,22 @@ public class NaquadahReworkRecipeLoader { GT_Log.out.print("Chemical Reactor done!\n"); - //For Multi Chemical Reactor + // For Multi Chemical Reactor for (GT_Recipe recipe : GT_Recipe.GT_Recipe_Map.sMultiblockChemicalRecipes.mRecipeList) { if (recipe.mFluidOutputs == null) continue; boolean isAny = false; - for (int i = 0; i < recipe.mFluidOutputs.length; i ++) { + for (int i = 0; i < recipe.mFluidOutputs.length; i++) { if (recipe.mFluidOutputs[i] == null) continue; - if (recipe.mFluidOutputs[i].isFluidEqual(Materials.Naquadah.getMolten(1)) || - recipe.mFluidOutputs[i].isFluidEqual(Materials.NaquadahEnriched.getMolten(1)) || - recipe.mFluidOutputs[i].isFluidEqual(Materials.Naquadria.getMolten(1))) { + if (recipe.mFluidOutputs[i].isFluidEqual(Materials.Naquadah.getMolten(1)) + || recipe.mFluidOutputs[i].isFluidEqual(Materials.NaquadahEnriched.getMolten(1)) + || recipe.mFluidOutputs[i].isFluidEqual(Materials.Naquadria.getMolten(1))) { isAny = true; break; } } if (!isAny) continue; GT_Recipe tRecipe = recipe.copy(); - for (int i = 0; i < recipe.mFluidOutputs.length; i ++) { + for (int i = 0; i < recipe.mFluidOutputs.length; i++) { if (recipe.mFluidOutputs[i] == null) continue; if (recipe.mFluidOutputs[i].isFluidEqual(Materials.Naquadah.getMolten(1))) { tRecipe.mFluidOutputs[i] = naquadahGoo.getFluidOrGas(recipe.mFluidOutputs[i].amount * 2); @@ -900,13 +877,15 @@ public class NaquadahReworkRecipeLoader { GT_Log.out.print("Multi Chemical Reactor done!\n"); 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. + // 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); + 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 Simple Washer for (GT_Recipe recipe : GTPP_Recipe.GTPP_Recipe_Map.sSimpleWasherRecipes.mRecipeList) { ItemStack input = recipe.mInputs[0]; if (GT_Utility.isStackValid(input)) { @@ -914,17 +893,21 @@ public class NaquadahReworkRecipeLoader { for (int oreDictID : oreDict) { if (OreDictionary.getOreName(oreDictID).startsWith("dustImpureNaq")) { GT_Recipe tRecipe = recipe.copy(); - for (int i = 0; i < tRecipe.mOutputs.length; i ++) { + for (int i = 0; i < tRecipe.mOutputs.length; i++) { 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] = GT_Utility.copyAmount( + tRecipe.mOutputs[i].stackSize, naquadahEarth.get(OrePrefixes.dust, 1)); } 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] = GT_Utility.copyAmount( + tRecipe.mOutputs[i].stackSize, + enrichedNaquadahEarth.get(OrePrefixes.dust, 1)); } 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] = GT_Utility.copyAmount( + tRecipe.mOutputs[i].stackSize, naquadriaEarth.get(OrePrefixes.dust, 1)); } } - if (!tRecipe.equals(recipe)){ + if (!tRecipe.equals(recipe)) { reAdd.add(tRecipe); remove.add(recipe); } @@ -945,25 +928,29 @@ public class NaquadahReworkRecipeLoader { GT_Log.out.print("Simple Washer done!\n"); } - //For ByProduct List + // For ByProduct List for (GT_Recipe recipe : GT_Recipe.GT_Recipe_Map.sByProductList.mRecipeList) { ItemStack input = recipe.mInputs[0]; if (GT_Utility.isStackValid(input)) { int[] oreDict = OreDictionary.getOreIDs(input); for (int oreDictID : oreDict) { - if (OreDictionary.getOreName(oreDictID).startsWith("ore") && OreDictionary.getOreName(oreDictID).contains("Naq")) { + if (OreDictionary.getOreName(oreDictID).startsWith("ore") + && OreDictionary.getOreName(oreDictID).contains("Naq")) { GT_Recipe tRecipe = recipe.copy(); - for (int i = 0; i < tRecipe.mOutputs.length; i ++) { + for (int i = 0; i < tRecipe.mOutputs.length; i++) { 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] = GT_Utility.copyAmount( + tRecipe.mOutputs[i].stackSize, naquadahEarth.get(OrePrefixes.dust, 1)); } 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] = GT_Utility.copyAmount( + tRecipe.mOutputs[i].stackSize, enrichedNaquadahEarth.get(OrePrefixes.dust, 1)); } 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] = GT_Utility.copyAmount( + tRecipe.mOutputs[i].stackSize, naquadriaEarth.get(OrePrefixes.dust, 1)); } } - if (!tRecipe.equals(recipe)){ + if (!tRecipe.equals(recipe)) { reAdd.add(tRecipe); remove.add(recipe); } @@ -983,23 +970,23 @@ public class NaquadahReworkRecipeLoader { GT_Log.out.print("ByProduct List done!\n"); - //For Cauldron Wash + // For Cauldron Wash registerCauldronCleaningFor(Materials.Naquadah, naquadahEarth.getBridgeMaterial()); registerCauldronCleaningFor(Materials.NaquadahEnriched, enrichedNaquadahEarth.getBridgeMaterial()); registerCauldronCleaningFor(Materials.Naquadria, naquadriaEarth.getBridgeMaterial()); GT_Log.out.print(GoodGenerator.MOD_ID + ": Replace 3! "); GT_Log.out.print("Cauldron Wash done!\n"); - //For Crafting Table + // For Crafting Table CraftingManager.getInstance().getRecipeList().forEach(NaquadahReworkRecipeLoader::replaceInCraftTable); GT_Log.out.print(GoodGenerator.MOD_ID + ": Replace Unknown! "); GT_Log.out.print("Crafting Table done!\n"); } - //I don't understand. . . - //I use and copy some private methods in Bartworks because his system runs well. - //Bartworks is under MIT License + // I don't understand. . . + // I use and copy some private methods in Bartworks because his system runs well. + // Bartworks is under MIT License /* * Copyright (c) 2018-2020 bartimaeusnek * @@ -1035,7 +1022,7 @@ public class NaquadahReworkRecipeLoader { if (cs == null) return; try { - BartObj = (PlatinumSludgeOverHaul)cs.newInstance(); + BartObj = (PlatinumSludgeOverHaul) cs.newInstance(); } catch (IllegalAccessException | InstantiationException | InvocationTargetException e) { e.printStackTrace(); } @@ -1051,7 +1038,7 @@ public class NaquadahReworkRecipeLoader { String inputName = "output"; String inputItemName = "input"; - if (!(obj instanceof ShapedOreRecipe || obj instanceof ShapelessOreRecipe)){ + if (!(obj instanceof ShapedOreRecipe || obj instanceof ShapelessOreRecipe)) { if (obj instanceof ShapedRecipes || (obj instanceof ShapelessRecipes)) { inputName = "recipeOutput"; inputItemName = "recipeItems"; @@ -1061,16 +1048,13 @@ public class NaquadahReworkRecipeLoader { ItemStack result = recipe.getRecipeOutput(); Field out = FieldUtils.getDeclaredField(recipe.getClass(), inputName, true); - if (out == null) - out = FieldUtils.getField(recipe.getClass(), inputName, true); + if (out == null) out = FieldUtils.getField(recipe.getClass(), inputName, true); Field in = FieldUtils.getDeclaredField(recipe.getClass(), inputItemName, true); - if (in == null) - in = FieldUtils.getField(recipe.getClass(), inputItemName, true); - if (in == null) - return; + if (in == null) in = FieldUtils.getField(recipe.getClass(), inputItemName, true); + if (in == null) return; - //this part here is NOT MIT LICENSED BUT LICSENSED UNDER THE Apache License, Version 2.0! + // this part here is NOT MIT LICENSED BUT LICSENSED UNDER THE Apache License, Version 2.0! try { if (Modifier.isFinal(in.getModifiers())) { // Do all JREs implement Field with a private ivar called "modifiers"? @@ -1110,7 +1094,7 @@ public class NaquadahReworkRecipeLoader { boolean isOk = true; try { - isOk = (boolean)recipeCheck.invoke(BartObj, input, Materials.Naquadah); + isOk = (boolean) recipeCheck.invoke(BartObj, input, Materials.Naquadah); } catch (InvocationTargetException | IllegalAccessException ignored) { } @@ -1126,7 +1110,7 @@ public class NaquadahReworkRecipeLoader { boolean isOk = true; try { - isOk = (boolean)recipeCheck.invoke(BartObj, input, Materials.NaquadahEnriched); + isOk = (boolean) recipeCheck.invoke(BartObj, input, Materials.NaquadahEnriched); } catch (InvocationTargetException | IllegalAccessException ignored) { } @@ -1142,7 +1126,7 @@ public class NaquadahReworkRecipeLoader { boolean isOk = true; try { - isOk = (boolean)recipeCheck.invoke(BartObj, input, Materials.Naquadria); + isOk = (boolean) recipeCheck.invoke(BartObj, input, Materials.Naquadria); } catch (InvocationTargetException | IllegalAccessException ignored) { } diff --git a/src/main/java/goodgenerator/loader/NeutronActivatorLoader.java b/src/main/java/goodgenerator/loader/NeutronActivatorLoader.java index 420d801b5e..4b8e7bfd9a 100644 --- a/src/main/java/goodgenerator/loader/NeutronActivatorLoader.java +++ b/src/main/java/goodgenerator/loader/NeutronActivatorLoader.java @@ -1,5 +1,7 @@ package goodgenerator.loader; +import static goodgenerator.items.MyMaterial.*; + import goodgenerator.util.MyRecipeAdder; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; @@ -8,54 +10,37 @@ import gregtech.api.util.GT_Utility; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; -import static goodgenerator.items.MyMaterial.*; - 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 - ); + 500); MyRecipeAdder.instance.addNeutronActivatorRecipe( - new FluidStack[]{ - uraniumBasedLiquidFuel.getFluidOrGas(100) - }, - new ItemStack[]{ - GT_Utility.copyAmount(0, GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Tungsten, 1)) - }, - new FluidStack[]{ - uraniumBasedLiquidFuelExcited.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)}, null, 80, 550, - 450 - ); + 450); MyRecipeAdder.instance.addNeutronActivatorRecipe( - new FluidStack[]{ - plutoniumBasedLiquidFuel.getFluidOrGas(100) - }, - new ItemStack[]{ - GT_Utility.copyAmount(0, GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Tritanium, 1)) - }, - new FluidStack[]{ - plutoniumBasedLiquidFuelExcited.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)}, null, 80, 600, - 500 - ); + 500); } } diff --git a/src/main/java/goodgenerator/loader/RecipeLoader.java b/src/main/java/goodgenerator/loader/RecipeLoader.java index bdf710b689..e1a08e8798 100644 --- a/src/main/java/goodgenerator/loader/RecipeLoader.java +++ b/src/main/java/goodgenerator/loader/RecipeLoader.java @@ -1,129 +1,121 @@ package goodgenerator.loader; +import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader; import goodgenerator.crossmod.LoadedList; import goodgenerator.items.MyMaterial; import goodgenerator.util.CrackRecipeAdder; import goodgenerator.util.ItemRefer; import goodgenerator.util.MaterialFix; -import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader; import goodgenerator.util.MyRecipeAdder; import gregtech.api.enums.*; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; -import ic2.core.Ic2Items; +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; -import gregtech.api.util.GT_Utility; public class RecipeLoader { - public static void RecipeLoad(){ + public static void RecipeLoad() { - //Radiation Protection Plate + // Radiation Protection Plate GT_Values.RA.addAssemblerRecipe( - new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Lanthanum, 8L), - GT_OreDictUnificator.get(OrePrefixes.plate,Materials.NaquadahAlloy,8L), - GT_OreDictUnificator.get(OrePrefixes.foil,Materials.Neutronium,1L), - GT_Utility.getIntegratedCircuit(1)}, + new ItemStack[] { + GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Lanthanum, 8L), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.NaquadahAlloy, 8L), + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Neutronium, 1L), + GT_Utility.getIntegratedCircuit(1) + }, Materials.Lead.getMolten(1152), ItemRefer.Radiation_Protection_Plate.get(1), 400, - 1920 - ); + 1920); - Fluid solderIndalloy = FluidRegistry.getFluid("molten.indalloy140") != null ? FluidRegistry.getFluid("molten.indalloy140") : FluidRegistry.getFluid("molten.solderingalloy"); + Fluid solderIndalloy = FluidRegistry.getFluid("molten.indalloy140") != null + ? FluidRegistry.getFluid("molten.indalloy140") + : FluidRegistry.getFluid("molten.solderingalloy"); - //LNR Controller + // LNR Controller 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 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 FluidStack[] { + Materials.Trinium.getMolten(576), + new FluidStack(solderIndalloy, 4608), + Materials.Lubricant.getFluid(8000) }, ItemRefer.Large_Naquadah_Reactor.get(1), 16200, - 122880 - ); + 122880); - //LNR Casing + // 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, - 1920 - ); + 1920); - //LNR Frame + // 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, - 1920 - ); + 1920); - //Uranium Liquid Fuel Process Line + // 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, - 480 - ); + 480); GT_Values.RA.addImplosionRecipe( ItemRefer.Wrapped_Uranium_Ingot.get(4), 8, ItemRefer.High_Density_Uranium_Nugget.get(1), - GT_OreDictUnificator.get(OrePrefixes.dustTiny,Materials.TungstenCarbide,8) - ); + 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), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Potassium,8), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Quantium,4), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Potassium, 8), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Quantium, 4), GT_Utility.getIntegratedCircuit(1), Materials.Radon.getGas(1000L), MyMaterial.uraniumBasedLiquidFuel.getFluidOrGas(1000), null, 200, - 15360 - ); + 15360); GT_Values.RA.addFusionReactorRecipe( MyMaterial.uraniumBasedLiquidFuel.getFluidOrGas(10), @@ -131,98 +123,84 @@ public class RecipeLoader { MyMaterial.uraniumBasedLiquidFuelExcited.getFluidOrGas(10), 40, 7680, - 200000000 - ); + 200000000); - //Thorium Liquid Process Line + // 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), 1000, - 480 - ); + 480); GT_Values.RA.addImplosionRecipe( ItemRefer.Wrapped_Thorium_Ingot.get(1), 4, ItemRefer.High_Density_Thorium_Nugget.get(1), - GT_OreDictUnificator.get(OrePrefixes.dustTiny,Materials.TungstenSteel,3) - ); + GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.TungstenSteel, 3)); GT_Values.RA.addCompressorRecipe( - ItemRefer.High_Density_Thorium_Nugget.get(9), - ItemRefer.High_Density_Thorium.get(1), - 400, - 120 - ); + ItemRefer.High_Density_Thorium_Nugget.get(9), ItemRefer.High_Density_Thorium.get(1), 400, 120); GT_Values.RA.addMixerRecipe( ItemRefer.High_Density_Thorium.get(1), - GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Lithium,4), - GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Draconium,2), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Lithium, 4), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Draconium, 2), GT_Utility.getIntegratedCircuit(2), Materials.Mercury.getFluid(1000L), MyMaterial.thoriumBasedLiquidFuel.getFluidOrGas(4000), null, 3000, - 240 - ); + 240); GT_Values.RA.addMixerRecipe( - MyMaterial.thoriumBasedLiquidFuel.get(OrePrefixes.cell,1), + MyMaterial.thoriumBasedLiquidFuel.get(OrePrefixes.cell, 1), GT_Utility.getIntegratedCircuit(1), - null,null, + null, + null, Materials.Helium.getPlasma(750L), null, - MyMaterial.thoriumBasedLiquidFuelExcited.get(OrePrefixes.cell,1), + MyMaterial.thoriumBasedLiquidFuelExcited.get(OrePrefixes.cell, 1), 120, - 3840 - ); + 3840); - //Liquid Plutonium Process Line + // 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, - 2040 - ); + 2040); GT_Values.RA.addImplosionRecipe( ItemRefer.Wrapped_Plutonium_Ingot.get(2), 16, ItemRefer.High_Density_Plutonium_Nugget.get(1), - GT_OreDictUnificator.get(OrePrefixes.dustTiny,Materials.HSSS,8) - ); + 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), - GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Neutronium,8), - GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Caesium,16), - GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Naquadah,2), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Neutronium, 8), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Caesium, 16), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Naquadah, 2), GT_Utility.getIntegratedCircuit(1), - null,null, + null, + null, MyMaterial.plutoniumBasedLiquidFuel.getFluidOrGas(1000), null, 360, - 30720 - ); + 30720); GT_Values.RA.addFusionReactorRecipe( Materials.Lutetium.getMolten(16), @@ -230,60 +208,48 @@ public class RecipeLoader { MyMaterial.plutoniumBasedLiquidFuelExcited.getFluidOrGas(20), 20, 15360, - 220000000 - ); + 220000000); - //Th-232 + // 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 - ); + 120); - //Th + 2O = ThO2 + // Th + 2O = ThO2 GT_Values.RA.addBlastRecipe( - GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Thorium,1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Thorium, 1), null, Materials.Oxygen.getGas(2000), null, - WerkstoffLoader.Thorianit.get(OrePrefixes.dust,3), + WerkstoffLoader.Thorianit.get(OrePrefixes.dust, 3), null, 100, 480, - 1200 - ); + 1200); - //Th + 8HNO3 =HF= Th(NO3)4 + 4NO2 + 4H2O + // Th + 8HNO3 =HF= Th(NO3)4 + 4NO2 + 4H2O GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[]{ - Materials.Thorium.getDust(1), + new ItemStack[] { + Materials.Thorium.getDust(1), }, - new FluidStack[]{ - Materials.HydrofluoricAcid.getFluid(100), - FluidRegistry.getFluidStack("nitricacid", 8000) + new FluidStack[] { + Materials.HydrofluoricAcid.getFluid(100), FluidRegistry.getFluidStack("nitricacid", 8000) }, - new FluidStack[]{ - MyMaterial.thoriumNitrate.getFluidOrGas(1000), - Materials.NitrogenDioxide.getGas(4000) + new FluidStack[] {MyMaterial.thoriumNitrate.getFluidOrGas(1000), Materials.NitrogenDioxide.getGas(4000) }, null, 40, - 120 - ); + 120); - //4NaOH + Th(NO3)4 = Th(OH)4 + 4NaNO3 + // 4NaOH + Th(NO3)4 = Th(OH)4 + 4NaNO3 GT_Values.RA.addChemicalRecipe( GT_Utility.getIntegratedCircuit(1), Materials.SodiumHydroxide.getDust(12), @@ -292,22 +258,20 @@ public class RecipeLoader { MyMaterial.thoriumHydroxide.get(OrePrefixes.dust, 9), WerkstoffLoader.SodiumNitrate.get(OrePrefixes.dust, 20), 200, - 120 - ); + 120); - //Th(OH)4 + 4HF = ThF4 + 4H2O + // Th(OH)4 + 4HF = ThF4 + 4H2O GT_Values.RA.addChemicalRecipe( - MyMaterial.thoriumHydroxide.get(OrePrefixes.dust,9), + MyMaterial.thoriumHydroxide.get(OrePrefixes.dust, 9), GT_Utility.getIntegratedCircuit(1), Materials.HydrofluoricAcid.getFluid(4000), MyMaterial.thoriumTetrafluoride.getFluidOrGas(1000), null, null, 400, - 30 - ); + 30); - //Zn + 2Cl = ZnCl2 + // Zn + 2Cl = ZnCl2 GT_Values.RA.addChemicalRecipe( GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Zinc, 1), GT_Utility.getIntegratedCircuit(1), @@ -316,8 +280,7 @@ public class RecipeLoader { MyMaterial.zincChloride.get(OrePrefixes.dust, 3), null, 100, - 30 - ); + 30); GT_Values.RA.addBlastRecipe( MyMaterial.zincChloride.get(OrePrefixes.dust, 1), @@ -328,8 +291,7 @@ public class RecipeLoader { WerkstoffLoader.Fluorspar.get(OrePrefixes.dust, 8), 300, 120, - 3000 - ); + 3000); GT_Values.RA.addBlastRecipe( MyMaterial.zincThoriumAlloy.get(OrePrefixes.ingot, 1), @@ -340,172 +302,166 @@ public class RecipeLoader { null, 150, 480, - 1900 - ); + 1900); - //2V + 5O = V2O5 + // 2V + 5O = V2O5 GT_Values.RA.addBlastRecipe( GT_Utility.getIntegratedCircuit(24), - GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Vanadium,2), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Vanadium, 2), Materials.Oxygen.getGas(5000), null, - MyMaterial.vanadiumPentoxide.get(OrePrefixes.dust,7), + MyMaterial.vanadiumPentoxide.get(OrePrefixes.dust, 7), null, 200, 120, - 2500 - ); - - //Atomic Separation Catalyst - - ItemStack[] mat1 = new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Blaze,32), GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Firestone,9)}; - ItemStack[] mat2 = new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Shadow,4), GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Bedrockium,4)}; - ItemStack[] mat3 = new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Sunnarium,4), GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Europium,4), GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Ichorium,4)}; - ItemStack[] mat4 = new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Ardite,4), GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Manyullyn,4)}; - - for (int i = 0; i < mat1.length; i ++) { + 2500); + + // Atomic Separation Catalyst + + ItemStack[] mat1 = new ItemStack[] { + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Blaze, 32), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Firestone, 9) + }; + ItemStack[] mat2 = new ItemStack[] { + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Shadow, 4), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Bedrockium, 4) + }; + ItemStack[] mat3 = new ItemStack[] { + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sunnarium, 4), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Europium, 4), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ichorium, 4) + }; + ItemStack[] mat4 = new ItemStack[] { + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ardite, 4), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Manyullyn, 4) + }; + + for (int i = 0; i < mat1.length; i++) { for (ItemStack itemStack : mat2) { for (int k = 0; k < mat3.length; k++) { for (ItemStack itemStack2 : mat4) { int c1 = i == 1 ? 2 : 1; int c2 = k == 2 ? 3 : 1; GT_Values.RA.addMixerRecipe( - mat1[i], - itemStack, - mat3[k], - itemStack2, - GT_Utility.getIntegratedCircuit(4), null, - Materials.Naquadah.getMolten(288), - null, - ItemRefer.Raw_Atomic_Separation_Catalyst.get(9 * c1 * c2), - 300, - 480 - ); + mat1[i], + itemStack, + mat3[k], + itemStack2, + GT_Utility.getIntegratedCircuit(4), + null, + Materials.Naquadah.getMolten(288), + null, + ItemRefer.Raw_Atomic_Separation_Catalyst.get(9 * c1 * c2), + 300, + 480); } } } } GT_Values.RA.addFormingPressRecipe( - WerkstoffLoader.Tiberium.get(OrePrefixes.plate,4), - GT_OreDictUnificator.get(OrePrefixes.plate,Materials.Silicon,8), - MyMaterial.orundum.get(OrePrefixes.plate,1), + WerkstoffLoader.Tiberium.get(OrePrefixes.plate, 4), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Silicon, 8), + MyMaterial.orundum.get(OrePrefixes.plate, 1), 400, - 3000 - ); + 3000); GT_Values.RA.addBlastRecipe( - MyMaterial.orundum.get(OrePrefixes.plate,2), + MyMaterial.orundum.get(OrePrefixes.plate, 2), ItemRefer.Raw_Atomic_Separation_Catalyst.get(4), Materials.Plutonium.getMolten(144), null, - MyMaterial.atomicSeparationCatalyst.get(OrePrefixes.ingotHot,1), + MyMaterial.atomicSeparationCatalyst.get(OrePrefixes.ingotHot, 1), null, 3600, 480, - 5000 - ); + 5000); GT_Values.RA.addVacuumFreezerRecipe( - MyMaterial.atomicSeparationCatalyst.get(OrePrefixes.ingotHot,1), - MyMaterial.atomicSeparationCatalyst.get(OrePrefixes.ingot,1), + MyMaterial.atomicSeparationCatalyst.get(OrePrefixes.ingotHot, 1), + MyMaterial.atomicSeparationCatalyst.get(OrePrefixes.ingot, 1), 450, - 960 - ); + 960); 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) - }, - GT_OreDictUnificator.get(OrePrefixes.dustTiny,Materials.Naquadah,1), + 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, - 300 - ); + 300); 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) - }, - GT_OreDictUnificator.get(OrePrefixes.dustTiny,Materials.Uranium235,1), + 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, - 450 - ); + 450); 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) - }, - GT_OreDictUnificator.get(OrePrefixes.dustTiny,Materials.Plutonium,1), + 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, - 500 - ); + 500); 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) - }, - GT_OreDictUnificator.get(OrePrefixes.dustTiny,Materials.Naquadria,1), + 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, - 800 - ); + 800); - //2C2H6O =H2SO4= C4H10O + H2O + // 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 - ); + 120); GT_Values.RA.addChemicalRecipe( Materials.GasolineRaw.getCells(9), Materials.Ethanol.getCells(1), MyMaterial.ethanolGasoline.get(OrePrefixes.cell, 10), 15, - 120 - ); + 120); GT_Values.RA.addFuel(MyMaterial.ether.get(OrePrefixes.cell), null, 537, 0); GT_Values.RA.addFuel(MyMaterial.ether.get(OrePrefixes.cell), null, 537, 1); @@ -514,133 +470,111 @@ public class RecipeLoader { GT_Values.RA.addFuel(MyMaterial.ironedFuel.get(OrePrefixes.cell), null, 2248, 0); GT_Values.RA.addFuel(MyMaterial.ironedKerosene.get(OrePrefixes.cell), null, 1824, 0); - //Sb + 3Cl = SbCl3 + // 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 - ); + 30); - //SbCl3 + 2Cl = SbCl5 + // 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 - ); + 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 - ); + 120); - //SbCl5 + 5HF = SbF5 + 5HCl + // SbCl5 + 5HF = SbF5 + 5HCl GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[]{ - GT_Utility.getIntegratedCircuit(1), + new ItemStack[] { + GT_Utility.getIntegratedCircuit(1), }, - new FluidStack[]{ - MyMaterial.antimonyPentachloride.getFluidOrGas(1000), - Materials.HydrofluoricAcid.getFluid(5000) + new FluidStack[] { + MyMaterial.antimonyPentachloride.getFluidOrGas(1000), Materials.HydrofluoricAcid.getFluid(5000) }, - new FluidStack[]{ - MyMaterial.antimonyPentafluoride.getFluidOrGas(1000), - Materials.HydrochloricAcid.getFluid(5000) + new FluidStack[] { + MyMaterial.antimonyPentafluoride.getFluidOrGas(1000), Materials.HydrochloricAcid.getFluid(5000) }, null, 420, - 30 - ); + 30); - //SbH5 + HF = HSbF6 + // SbH5 + HF = HSbF6 GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[]{ - GT_Utility.getIntegratedCircuit(1), + new ItemStack[] { + GT_Utility.getIntegratedCircuit(1), }, - new FluidStack[]{ - MyMaterial.antimonyPentafluoride.getFluidOrGas(1000), - Materials.HydrofluoricAcid.getFluid(1000) + new FluidStack[] { + MyMaterial.antimonyPentafluoride.getFluidOrGas(1000), Materials.HydrofluoricAcid.getFluid(1000) }, - new FluidStack[]{ - MyMaterial.fluoroantimonicAcid.getFluidOrGas(1000), + new FluidStack[] { + MyMaterial.fluoroantimonicAcid.getFluidOrGas(1000), }, null, 840, - 2040 - ); + 2040); GT_Values.RA.addBlastRecipe( - GT_OreDictUnificator.get(OrePrefixes.dust,Materials.NaquadahEnriched,32), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.NaquadahEnriched, 32), GT_Utility.getIntegratedCircuit(16), MyMaterial.fluoroantimonicAcid.getFluidOrGas(1000), MyMaterial.acidNaquadahEmulsion.getFluidOrGas(2000), - MyMaterial.radioactiveSludge.get(OrePrefixes.dust,3), + MyMaterial.radioactiveSludge.get(OrePrefixes.dust, 3), null, 3600, 2040, - 3400 - ); + 3400); GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[]{ - GT_Utility.getIntegratedCircuit(3), - GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Quicklime,32) + new ItemStack[] { + GT_Utility.getIntegratedCircuit(3), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Quicklime, 32) }, - new FluidStack[]{ - MyMaterial.acidNaquadahEmulsion.getFluidOrGas(1000), + new FluidStack[] { + MyMaterial.acidNaquadahEmulsion.getFluidOrGas(1000), }, - new FluidStack[]{ - MyMaterial.naquadahEmulsion.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_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.AntimonyTrioxide, 1), + WerkstoffLoader.Fluorspar.get(OrePrefixes.dust, 4) }, 240, - 30 - ); + 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 - ); + 2040); - GT_Values.RA.addFuel(MyMaterial.naquadahGas.get(OrePrefixes.cell),null,1024,1); + GT_Values.RA.addFuel(MyMaterial.naquadahGas.get(OrePrefixes.cell), null, 1024, 1); GT_Values.RA.addFusionReactorRecipe( MyMaterial.lightNaquadahFuel.getFluidOrGas(65), @@ -648,1062 +582,1001 @@ public class RecipeLoader { MyMaterial.naquadahBasedFuelMkI.getFluidOrGas(100), 5, 26000, - 330000000 - ); + 330000000); GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[]{ - GT_Utility.getIntegratedCircuit(1), - GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Praseodymium,16), - GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Samarium,24), - GT_OreDictUnificator.get(OrePrefixes.dust,Materials.ElectrumFlux,32), - }, - new FluidStack[]{ - MyMaterial.naquadahBasedFuelMkI.getFluidOrGas(1000), - MyMaterial.naquadahGas.getFluidOrGas(2500) + new ItemStack[] { + GT_Utility.getIntegratedCircuit(1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Praseodymium, 16), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Samarium, 24), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.ElectrumFlux, 32), }, - new FluidStack[]{ - MyMaterial.naquadahBasedFuelMkII.getFluidOrGas(1000) + new FluidStack[] { + MyMaterial.naquadahBasedFuelMkI.getFluidOrGas(1000), MyMaterial.naquadahGas.getFluidOrGas(2500) }, + new FluidStack[] {MyMaterial.naquadahBasedFuelMkII.getFluidOrGas(1000)}, null, 200, - 480000 - ); + 480000); GT_Values.RA.addBlastRecipe( - GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Naquadria,32), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Naquadria, 32), GT_Utility.getIntegratedCircuit(16), MyMaterial.fluoroantimonicAcid.getFluidOrGas(4000), MyMaterial.acidNaquadahEmulsion.getFluidOrGas(8000), - MyMaterial.extremelyUnstableNaquadah.get(OrePrefixes.dust,17), + MyMaterial.extremelyUnstableNaquadah.get(OrePrefixes.dust, 17), null, 3600, 4080, - 3400 - ); + 3400); 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 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 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 - ); + 1919810); 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 - ); + 65536); 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 - ); + 65536); if (LoadedList.GTNH_CORE) { 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[]{"circuitNano", 1}, + 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[] {"circuitNano", 1}, }, - new FluidStack[]{ - WerkstoffLoader.Krypton.getFluidOrGas(32000), - Materials.ElectrumFlux.getMolten(9216), - Materials.Lubricant.getFluid(128000) + new FluidStack[] { + WerkstoffLoader.Krypton.getFluidOrGas(32000), + Materials.ElectrumFlux.getMolten(9216), + Materials.Lubricant.getFluid(128000) }, ItemRefer.Field_Restriction_Coil_T1.get(1), 18000, - 114514 - ); + 114514); 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[]{"circuitPiko", 1}, + 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[] {"circuitPiko", 1}, }, - new FluidStack[]{ - Materials.Radon.getPlasma(32000), - Materials.DraconiumAwakened.getMolten(9216), - Materials.Lubricant.getFluid(128000), + new FluidStack[] { + Materials.Radon.getPlasma(32000), + Materials.DraconiumAwakened.getMolten(9216), + Materials.Lubricant.getFluid(128000), }, ItemRefer.Field_Restriction_Coil_T2.get(1), 36000, - 114514 - ); + 114514); 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), - new Object[]{"plateDenseRadoxPoly", 8}, - GT_OreDictUnificator.get(OrePrefixes.pipeMedium,Materials.Infinity,16), - ItemList.Circuit_Wafer_PPIC.get(64), - new Object[]{"circuitQuantum", 1}, + 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), + new Object[] {"plateDenseRadoxPoly", 8}, + GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Infinity, 16), + ItemList.Circuit_Wafer_PPIC.get(64), + new Object[] {"circuitQuantum", 1}, }, - new FluidStack[]{ - WerkstoffLoader.Oganesson.getFluidOrGas(32000), - Materials.Neutronium.getMolten(9216), - Materials.Lubricant.getFluid(128000), + new FluidStack[] { + WerkstoffLoader.Oganesson.getFluidOrGas(32000), + Materials.Neutronium.getMolten(9216), + Materials.Lubricant.getFluid(128000), }, ItemRefer.Field_Restriction_Coil_T3.get(1), 72000, - 114514 - ); - } - else { + 114514); + } else { 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 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 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 - ); + 114514); 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 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 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 - ); + 114514); 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 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 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 - ); + 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) }, MyMaterial.naquadahAsphalt.getFluidOrGas(500), ItemRefer.Field_Restriction_Glass.get(1), 300, - 120000 - ); + 120000); - //Ca + O = CaO + // Ca + O = CaO GT_Values.RA.addChemicalRecipe( GT_Utility.getIntegratedCircuit(1), - GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Calcium,1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Calcium, 1), Materials.Oxygen.getGas(1000), null, - GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Quicklime,2), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Quicklime, 2), 10, - 30 - ); + 30); - //AlN = Al + N + // AlN = Al + N GT_Values.RA.addElectrolyzerRecipe( ItemRefer.Aluminum_Nitride_Dust.get(2), null, null, Materials.Nitrogen.getGas(1000L), - GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Aluminium,1), - null,null,null,null,null, - new int[]{10000}, + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Aluminium, 1), + null, + null, + null, + null, + null, + new int[] {10000}, 100, - 120 - ); + 120); GT_Values.RA.addMixerRecipe( ItemRefer.Aluminum_Nitride_Dust.get(4), - WerkstoffLoader.YttriumOxide.get(OrePrefixes.dust,5), + WerkstoffLoader.YttriumOxide.get(OrePrefixes.dust, 5), GT_Utility.getIntegratedCircuit(9), null, - FluidRegistry.getFluidStack("refinedglue",1000), + FluidRegistry.getFluidStack("refinedglue", 1000), null, ItemRefer.Special_Ceramics_Dust.get(9), 100, - 1980 - ); + 1980); GT_Values.RA.addMixerRecipe( ItemRefer.Aluminum_Nitride_Dust.get(4), - GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Uraninite,5), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Uraninite, 5), GT_Utility.getIntegratedCircuit(9), null, - FluidRegistry.getFluidStack("refinedglue",1000), + FluidRegistry.getFluidStack("refinedglue", 1000), null, ItemRefer.Special_Ceramics_Dust.get(9), 100, - 1980 - ); + 1980); GT_Values.RA.addExtruderRecipe( ItemRefer.Special_Ceramics_Dust.get(2), ItemList.Shape_Extruder_Plate.get(0L), ItemRefer.Special_Ceramics_Plate.get(1), 400, - 480 - ); + 480); 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 - ); + 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 ItemStack[] { + GT_Utility.getIntegratedCircuit(16), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Saltpeter, 2) }, - new FluidStack[]{ - FluidRegistry.getFluidStack("combustionpromotor",500) + new FluidStack[] { + FluidRegistry.getFluidStack("liquidoxygen", 1000), Materials.NitrogenDioxide.getGas(1000) }, + new FluidStack[] {FluidRegistry.getFluidStack("combustionpromotor", 500)}, null, 200, - 120 - ); + 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 ItemStack[] { + GT_Utility.getIntegratedCircuit(16), WerkstoffLoader.SodiumNitrate.get(OrePrefixes.dust, 2) }, - new FluidStack[]{ - FluidRegistry.getFluidStack("combustionpromotor",500) + new FluidStack[] { + FluidRegistry.getFluidStack("liquidoxygen", 1000), Materials.NitrogenDioxide.getGas(1000) }, + new FluidStack[] {FluidRegistry.getFluidStack("combustionpromotor", 500)}, null, 200, - 120 - ); + 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 ItemStack[] { + GT_Utility.getIntegratedCircuit(16), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Saltpeter, 2) }, - new FluidStack[]{ - FluidRegistry.getFluidStack("combustionpromotor", 2000) + new FluidStack[] { + FluidRegistry.getFluidStack("fluid.hydrogenperoxide", 1000), + Materials.NitrogenDioxide.getGas(1000) }, + new FluidStack[] {FluidRegistry.getFluidStack("combustionpromotor", 2000)}, null, 200, - 120 - ); + 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 ItemStack[] { + GT_Utility.getIntegratedCircuit(16), WerkstoffLoader.SodiumNitrate.get(OrePrefixes.dust, 2) }, - new FluidStack[]{ - FluidRegistry.getFluidStack("combustionpromotor", 2000) + new FluidStack[] { + FluidRegistry.getFluidStack("fluid.hydrogenperoxide", 1000), + Materials.NitrogenDioxide.getGas(1000) }, + new FluidStack[] {FluidRegistry.getFluidStack("combustionpromotor", 2000)}, null, 200, - 120 - ); + 120); } 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 ItemStack[] { + GT_Utility.getIntegratedCircuit(16), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Saltpeter, 2) }, - new FluidStack[]{ - FluidRegistry.getFluidStack("combustionpromotor", 2000) + new FluidStack[] { + FluidRegistry.getFluidStack("hydrogen peroxide", 1000), Materials.NitrogenDioxide.getGas(1000) }, + new FluidStack[] {FluidRegistry.getFluidStack("combustionpromotor", 2000)}, null, 200, - 120 - ); + 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 ItemStack[] { + GT_Utility.getIntegratedCircuit(16), WerkstoffLoader.SodiumNitrate.get(OrePrefixes.dust, 2) }, - new FluidStack[]{ - FluidRegistry.getFluidStack("combustionpromotor", 2000) + new FluidStack[] { + FluidRegistry.getFluidStack("hydrogen peroxide", 1000), Materials.NitrogenDioxide.getGas(1000) }, + new FluidStack[] {FluidRegistry.getFluidStack("combustionpromotor", 2000)}, null, 200, - 120 - ); + 120); } 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), - } - ); - - //neutron activator + 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 - ); + 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" - } - ); + 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" + }); 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, - 1 - ); + 1); GT_Values.RA.addAutoclaveRecipe( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Quartzite,1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sodium,4), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Quartzite, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sodium, 4), Materials.Water.getFluid(1000), ItemRefer.Quartz_Wafer.get(1), 3333, 6000, 30, - true - ); + true); GT_Values.RA.addAutoclaveRecipe( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Quartzite,1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sodium,4), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Quartzite, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sodium, 4), FluidRegistry.getFluidStack("ic2distilledwater", 1000), ItemRefer.Quartz_Wafer.get(1), 10000, 1500, 30, - true - ); + 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 - ); + 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, 120, - false - ); + 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, 120, - false - ); + 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, 120, - false - ); + false); 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 - ); + 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, - 480 - ); + 480); 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) - }, + 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 - ); + 30720); 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) - }, + 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 - ); + 122880); 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) - }, + 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 - ); + 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, - 1920 - ); + 1920); 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, - 1 - ); + 1); } - public static void InitLoadRecipe(){ + 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 - ); + 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, - 7680 - ); + 7680); - //Al2O3 + 2N + 3C = 2AlN + 3CO + // Al2O3 + 2N + 3C = 2AlN + 3CO GT_Values.RA.addBlastRecipe( - GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Sapphire,5), - GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Coal,3), - FluidRegistry.getFluidStack("liquidnitrogen",2000), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sapphire, 5), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Coal, 3), + FluidRegistry.getFluidStack("liquidnitrogen", 2000), Materials.CarbonMonoxide.getGas(3000), ItemRefer.Aluminum_Nitride_Dust.get(2), null, 200, 1920, - 4600 - ); + 4600); GT_Values.RA.addBlastRecipe( - GT_OreDictUnificator.get(OrePrefixes.dust,Materials.GreenSapphire,5), - GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Coal,3), - FluidRegistry.getFluidStack("liquidnitrogen",2000), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.GreenSapphire, 5), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Coal, 3), + FluidRegistry.getFluidStack("liquidnitrogen", 2000), Materials.CarbonMonoxide.getGas(3000), ItemRefer.Aluminum_Nitride_Dust.get(2), null, 200, 1920, - 4600 - ); + 4600); GT_Values.RA.addBlastRecipe( - GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Aluminiumoxide,5), - GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Coal,3), - FluidRegistry.getFluidStack("liquidnitrogen",2000), - Materials.CarbonMonoxide.getGas(3000), - ItemRefer.Aluminum_Nitride_Dust.get(2), - null, - 200, - 1920, - 4600 - ); + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Aluminiumoxide, 5), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Coal, 3), + FluidRegistry.getFluidStack("liquidnitrogen", 2000), + Materials.CarbonMonoxide.getGas(3000), + ItemRefer.Aluminum_Nitride_Dust.get(2), + null, + 200, + 1920, + 4600); GT_Values.RA.addBlastRecipe( - MyMaterial.extremelyUnstableNaquadah.get(OrePrefixes.dust,1), + MyMaterial.extremelyUnstableNaquadah.get(OrePrefixes.dust, 1), GT_Utility.getIntegratedCircuit(1), - null,null, + null, + null, MyMaterial.extremelyUnstableNaquadah.get(OrePrefixes.ingotHot), null, 8000, 114514, - 7000 - ); + 7000); GT_Values.RA.addVacuumFreezerRecipe( - MyMaterial.atomicSeparationCatalyst.get(OrePrefixes.ingotHot,1), - MyMaterial.atomicSeparationCatalyst.get(OrePrefixes.ingot,1), + MyMaterial.atomicSeparationCatalyst.get(OrePrefixes.ingotHot, 1), + MyMaterial.atomicSeparationCatalyst.get(OrePrefixes.ingot, 1), 200, - 30720 - ); + 30720); GT_Values.RA.addVacuumFreezerRecipe( - MyMaterial.extremelyUnstableNaquadah.get(OrePrefixes.ingotHot,1), - MyMaterial.extremelyUnstableNaquadah.get(OrePrefixes.ingot,1), + MyMaterial.extremelyUnstableNaquadah.get(OrePrefixes.ingotHot, 1), + MyMaterial.extremelyUnstableNaquadah.get(OrePrefixes.ingot, 1), 400, - 30720 - ); + 30720); GT_Values.RA.addCentrifugeRecipe( - GT_Utility.getIntegratedCircuit(1),null, + GT_Utility.getIntegratedCircuit(1), + null, MyMaterial.naquadahBasedFuelMkVDepleted.getFluidOrGas(1000), WerkstoffLoader.Oganesson.getFluidOrGas(1), - GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Naquadah,1), - GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Naquadah,1), - GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Naquadah,1), - 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 - }, + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Naquadah, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Naquadah, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Naquadah, 1), + 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}, 100, - 30 - ); + 30); GT_Values.RA.addCentrifugeRecipe( - GT_Utility.getIntegratedCircuit(1),null, + GT_Utility.getIntegratedCircuit(1), + null, MyMaterial.naquadahBasedFuelMkIVDepleted.getFluidOrGas(1000), WerkstoffLoader.Oganesson.getFluidOrGas(864), - GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Naquadah,64), - GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Naquadah,64), - GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Naquadah,64), - 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 - }, + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Naquadah, 64), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Naquadah, 64), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Naquadah, 64), + 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}, 2500, - 30000 - ); + 30000); GT_Values.RA.addCentrifugeRecipe( - GT_Utility.getIntegratedCircuit(1),null, + GT_Utility.getIntegratedCircuit(1), + null, MyMaterial.naquadahBasedFuelMkIIIDepleted.getFluidOrGas(1000), WerkstoffLoader.Oganesson.getFluidOrGas(720), - GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Naquadah,64), - GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Naquadah,64), - GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Naquadah,64), - 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 - }, + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Naquadah, 64), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Naquadah, 64), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Naquadah, 64), + 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}, 2000, - 30000 - ); + 30000); GT_Values.RA.addCentrifugeRecipe( GT_Utility.getIntegratedCircuit(1), null, MyMaterial.naquadahBasedFuelMkIIDepleted.getFluidOrGas(1000), WerkstoffLoader.Oganesson.getFluidOrGas(144), - GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Naquadah,64), - GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Naquadah,64), - GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Naquadah,32), - GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Americium,32), - WerkstoffLoader.Californium.get(OrePrefixes.dust,32), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Naquadah, 64), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Naquadah, 64), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Naquadah, 32), + 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 - ); + 2040); GT_Values.RA.addCentrifugeRecipe( - GT_Utility.getIntegratedCircuit(1),null, + GT_Utility.getIntegratedCircuit(1), + null, MyMaterial.uraniumBasedLiquidFuelDepleted.getFluidOrGas(1000), WerkstoffLoader.Xenon.getFluidOrGas(10), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Lead,16L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Bismuth,1L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Barium,6L), - null,null,null, - new int[]{6000,1000,5000}, - 1000,1040 - ); + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Lead, 16L), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Bismuth, 1L), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Barium, 6L), + null, + null, + null, + new int[] {6000, 1000, 5000}, + 1000, + 1040); GT_Values.RA.addCentrifugeRecipe( - GT_Utility.getIntegratedCircuit(1),null, + GT_Utility.getIntegratedCircuit(1), + null, MyMaterial.thoriumBasedLiquidFuelDepleted.getFluidOrGas(1000), null, - GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Lutetium,64), - GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Lutetium,48), - GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Lutetium,32), - GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Praseodymium,64), - GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Boron,2), - GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Indium,4), - new int[]{9000,7000,1500,10000,3000,5000}, + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Lutetium, 64), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Lutetium, 48), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Lutetium, 32), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Praseodymium, 64), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Boron, 2), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Indium, 4), + new int[] {9000, 7000, 1500, 10000, 3000, 5000}, 1500, - 1040 - ); + 1040); GT_Values.RA.addCentrifugeRecipe( - GT_Utility.getIntegratedCircuit(1),null, + GT_Utility.getIntegratedCircuit(1), + null, MyMaterial.plutoniumBasedLiquidFuelDepleted.getFluidOrGas(1000), WerkstoffLoader.Krypton.getFluidOrGas(144), - GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Tritanium,9), - GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Cerium,4), - GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Gold,2), - null,null,null, - new int[]{5000,8000,7500}, + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Tritanium, 9), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Cerium, 4), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Gold, 2), + null, + null, + null, + new int[] {5000, 8000, 7500}, 2500, - 7680 - ); + 7680); GT_Values.RA.addCentrifugeRecipe( GT_Utility.getIntegratedCircuit(1), null, MyMaterial.thoriumTetrafluoride.getFluidOrGas(1000), MyMaterial.thorium232Tetrafluoride.getFluidOrGas(750), - GT_OreDictUnificator.get(OrePrefixes.dustSmall,Materials.Thorium,1), - null,null,null,null,null,null, + GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Thorium, 1), + null, + null, + null, + null, + null, + null, 100, - 480 - ); + 480); GT_Values.RA.addCentrifugeRecipe( GT_Utility.getIntegratedCircuit(1), null, MyMaterial.naquadahEmulsion.getFluidOrGas(1000), MyMaterial.naquadahSolution.getFluidOrGas(500), - MyMaterial.radioactiveSludge.get(OrePrefixes.dust,4), - MyMaterial.radioactiveSludge.get(OrePrefixes.dust,2), - MyMaterial.radioactiveSludge.get(OrePrefixes.dust,1), - 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}, + MyMaterial.radioactiveSludge.get(OrePrefixes.dust, 4), + MyMaterial.radioactiveSludge.get(OrePrefixes.dust, 2), + MyMaterial.radioactiveSludge.get(OrePrefixes.dust, 1), + 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}, 800, - 120 - ); + 120); GT_Values.RA.addCentrifugeRecipe( GT_Utility.getIntegratedCircuit(1), null, MyMaterial.naquadahBasedFuelMkIDepleted.getFluidOrGas(1000), WerkstoffLoader.Xenon.getFluidOrGas(144), - GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Naquadah,64), - GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Naquadah,48), - GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Naquadah,32), - GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Neodymium,32), - GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Europium,32), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Naquadah, 64), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Naquadah, 48), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Naquadah, 32), + 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 - ); + 2040); GT_Values.RA.addCentrifugeRecipe( - MyMaterial.radioactiveSludge.get(OrePrefixes.dust,1), - null,null, + MyMaterial.radioactiveSludge.get(OrePrefixes.dust, 1), + null, + null, Materials.Radon.getGas(5), - GT_OreDictUnificator.get(OrePrefixes.dustSmall,Materials.Calcium,2), - GT_OreDictUnificator.get(OrePrefixes.dustSmall,Materials.Calcium,1), - GT_OreDictUnificator.get(OrePrefixes.dustSmall,Materials.Naquadah,1), - GT_OreDictUnificator.get(OrePrefixes.dustSmall,Materials.Uranium,1), - GT_OreDictUnificator.get(OrePrefixes.dustSmall,Materials.Plutonium,1), - WerkstoffLoader.Tiberium.get(OrePrefixes.dustSmall,1), - new int[]{10000,9500,8000,2500,2000,2000}, + GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Calcium, 2), + GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Calcium, 1), + GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Naquadah, 1), + GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Uranium, 1), + GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Plutonium, 1), + WerkstoffLoader.Tiberium.get(OrePrefixes.dustSmall, 1), + new int[] {10000, 9500, 8000, 2500, 2000, 2000}, 100, - 120 - ); + 120); } - public static void Fixer(){ + public static void Fixer() { MaterialFix.MaterialFluidExtractionFix(MyMaterial.atomicSeparationCatalyst); MaterialFix.MaterialFluidExtractionFix(MyMaterial.extremelyUnstableNaquadah); } diff --git a/src/main/java/goodgenerator/loader/RecipeLoader_02.java b/src/main/java/goodgenerator/loader/RecipeLoader_02.java index ba8ba6c467..ec2e1a8c0b 100644 --- a/src/main/java/goodgenerator/loader/RecipeLoader_02.java +++ b/src/main/java/goodgenerator/loader/RecipeLoader_02.java @@ -1,18 +1,18 @@ package goodgenerator.loader; +import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader; import goodgenerator.crossmod.LoadedList; import goodgenerator.items.MyMaterial; import goodgenerator.util.CrackRecipeAdder; import goodgenerator.util.ItemRefer; -import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader; import goodgenerator.util.MyRecipeAdder; import gregtech.api.GregTech_API; import gregtech.api.enums.GT_Values; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; -import gregtech.api.util.GT_ModHandler; import gregtech.api.util.*; +import gregtech.api.util.GT_ModHandler; import ic2.core.Ic2Items; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.Fluid; @@ -22,54 +22,48 @@ import net.minecraftforge.oredict.OreDictionary; public class RecipeLoader_02 { - public static void RecipeLoad(){ + public static void RecipeLoad() { 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) - }, - null, - ItemRefer.Speeding_Pipe.get(1), - 300, - 1920 - ); + 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, + 1920); // Compact MK1 Fusion Disassembly Recipe GT_Values.RA.addAssemblerRecipe( - new ItemStack[]{ - ItemRefer.Compact_Fusion_Coil_T0.get(1) - }, - null, - ItemList.Casing_Coil_Superconductor.get(3), - 600, - 120000 - ); + new ItemStack[] {ItemRefer.Compact_Fusion_Coil_T0.get(1)}, + null, + ItemList.Casing_Coil_Superconductor.get(3), + 600, + 120000); // Compact MK2 Fusion Disassembly Recipe GT_Values.RA.addAssemblerRecipe( - new ItemStack[]{ - ItemRefer.Compact_Fusion_Coil_T1.get(1), - }, - null, - ItemList.Casing_Fusion_Coil.get(3), - 600, - 480000 - ); + new ItemStack[] { + ItemRefer.Compact_Fusion_Coil_T1.get(1), + }, + null, + ItemList.Casing_Fusion_Coil.get(3), + 600, + 480000); // Compact MK3 Fusion Disassembly Recipe GT_Values.RA.addAssemblerRecipe( - new ItemStack[]{ - ItemRefer.Compact_Fusion_Coil_T2.get(1), - }, - null, - ItemList.Casing_Fusion_Coil.get(3), - 600, - 1920000 - ); + new ItemStack[] { + ItemRefer.Compact_Fusion_Coil_T2.get(1), + }, + null, + ItemList.Casing_Fusion_Coil.get(3), + 600, + 1920000); CrackRecipeAdder.reAddBlastRecipe(MyMaterial.zircaloy2, 500, 480, 2800, true); CrackRecipeAdder.reAddBlastRecipe(MyMaterial.zircaloy2, 513, 480, 2800, false); @@ -88,1606 +82,1529 @@ public class RecipeLoader_02 { CrackRecipeAdder.reAddBlastRecipe(MyMaterial.tairitsu, 1200, 1966080, 7400, true); GT_Values.RA.addAssemblerRecipe( - 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, - 120 - ); + 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, + 120); GT_Values.RA.addCannerRecipe( - ItemRefer.Advanced_Fuel_Rod.get(1), - ItemRefer.High_Density_Uranium.get(1), - ItemRefer.Fuel_Rod_U_1.get(1), - null, - 400, - 120 - ); + ItemRefer.Advanced_Fuel_Rod.get(1), + ItemRefer.High_Density_Uranium.get(1), + ItemRefer.Fuel_Rod_U_1.get(1), + null, + 400, + 120); GT_Values.RA.addAssemblerRecipe( - 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 - ); + 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) - }, - null, - ItemRefer.Fuel_Rod_U_4.get(1), - 200, - 1920 - ); + 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) - }, - null, - ItemRefer.Fuel_Rod_U_4.get(1), - 220, - 1920 - ); + 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, + 1920); GT_Values.RA.addCannerRecipe( - ItemRefer.Advanced_Fuel_Rod.get(1), - ItemRefer.High_Density_Plutonium.get(1), - ItemRefer.Fuel_Rod_Pu_1.get(1), - null, - 400, - 120 - ); + ItemRefer.Advanced_Fuel_Rod.get(1), + ItemRefer.High_Density_Plutonium.get(1), + ItemRefer.Fuel_Rod_Pu_1.get(1), + null, + 400, + 120); GT_Values.RA.addAssemblerRecipe( - 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 - ); + 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) - }, - null, - ItemRefer.Fuel_Rod_Pu_4.get(1), - 200, - 1920 - ); + 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) - }, - null, - ItemRefer.Fuel_Rod_Pu_4.get(1), - 220, - 1920 - ); + 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, + 1920); 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), - } - ); + 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), + }); 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) - } - ); + 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) + }); 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), + 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, + 1920); + } + + 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) }, Materials.Plastic.getMolten(144), - Loaders.YFH, + ItemRefer.Fluid_Storage_Core_T1.get(1), 200, - 1920 - ); - } + 480); 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) - }, - Materials.Plastic.getMolten(144), - ItemRefer.Fluid_Storage_Core_T1.get(1), - 200, - 480 - ); + 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_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 - ); + 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_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 - ); + 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_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 - ); + 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_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 - ); + 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[]{ - 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 - ); + 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, + 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) - }, - Materials.Polytetrafluoroethylene.getMolten(2304), - ItemRefer.Fluid_Storage_Core_T2.get(1), - 200, - 7680 - ); + new ItemStack[] { + ItemRefer.Fluid_Storage_Core_T2.get(32), + ItemRefer.Fluid_Storage_Core_T2.get(32), + GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Iridium, 2), + GT_Utility.getIntegratedCircuit(10) + }, + Materials.Polytetrafluoroethylene.getMolten(2304), + ItemRefer.Fluid_Storage_Core_T3.get(1), + 800, + 30720); GT_Values.RA.addAssemblerRecipe( - new ItemStack[]{ - ItemRefer.Fluid_Storage_Core_T2.get(32), - ItemRefer.Fluid_Storage_Core_T2.get(32), - GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Iridium,2), - GT_Utility.getIntegratedCircuit(10) - }, - Materials.Polytetrafluoroethylene.getMolten(2304), - ItemRefer.Fluid_Storage_Core_T3.get(1), - 800, - 30720 - ); + new ItemStack[] { + ItemRefer.Fluid_Storage_Core_T3.get(32), + ItemRefer.Fluid_Storage_Core_T3.get(32), + GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Osmium, 2), + GT_Utility.getIntegratedCircuit(10) + }, + Materials.Polybenzimidazole.getMolten(2304), + ItemRefer.Fluid_Storage_Core_T4.get(1), + 3200, + 491520); GT_Values.RA.addAssemblerRecipe( - new ItemStack[]{ - ItemRefer.Fluid_Storage_Core_T3.get(32), - ItemRefer.Fluid_Storage_Core_T3.get(32), - GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Osmium,2), - GT_Utility.getIntegratedCircuit(10) - }, - Materials.Polybenzimidazole.getMolten(2304), - ItemRefer.Fluid_Storage_Core_T4.get(1), - 3200, - 491520 - ); + new ItemStack[] { + ItemRefer.Fluid_Storage_Core_T4.get(32), + ItemRefer.Fluid_Storage_Core_T4.get(32), + GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Neutronium, 2), + GT_Utility.getIntegratedCircuit(10) + }, + Materials.Polybenzimidazole.getMolten(2304), + ItemRefer.Fluid_Storage_Core_T5.get(1), + 6400, + 980290); GT_Values.RA.addAssemblerRecipe( - new ItemStack[]{ - ItemRefer.Fluid_Storage_Core_T4.get(32), - ItemRefer.Fluid_Storage_Core_T4.get(32), - GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Neutronium,2), - GT_Utility.getIntegratedCircuit(10) - }, - Materials.Polybenzimidazole.getMolten(2304), - ItemRefer.Fluid_Storage_Core_T5.get(1), - 6400, - 980290 - ); + new ItemStack[] { + ItemRefer.Fluid_Storage_Core_T5.get(32), + ItemRefer.Fluid_Storage_Core_T5.get(32), + GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.DraconiumAwakened, 2), + GT_Utility.getIntegratedCircuit(10) + }, + Materials.Polybenzimidazole.getMolten(2304), + ItemRefer.Fluid_Storage_Core_T6.get(1), + 12800, + 1960580); - GT_Values.RA.addAssemblerRecipe( - new ItemStack[]{ - ItemRefer.Fluid_Storage_Core_T5.get(32), - ItemRefer.Fluid_Storage_Core_T5.get(32), - GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.DraconiumAwakened,2), - GT_Utility.getIntegratedCircuit(10) - }, - Materials.Polybenzimidazole.getMolten(2304), - ItemRefer.Fluid_Storage_Core_T6.get(1), - 12800, - 1960580 - ); - - Fluid solderIndalloy = FluidRegistry.getFluid("molten.indalloy140") != null ? FluidRegistry.getFluid("molten.indalloy140") : FluidRegistry.getFluid("molten.solderingalloy"); + Fluid solderIndalloy = FluidRegistry.getFluid("molten.indalloy140") != null + ? FluidRegistry.getFluid("molten.indalloy140") + : FluidRegistry.getFluid("molten.solderingalloy"); GT_Values.RA.addAssemblylineRecipe( - ItemRefer.Fluid_Storage_Core_T2.get(1), - 20000, - new Object[]{ - ItemList.Super_Tank_IV.get(2L), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Polytetrafluoroethylene,16), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Polytetrafluoroethylene,16), - GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Iridium,32) - }, - new FluidStack[]{ - new FluidStack(solderIndalloy, 2304), - Materials.Lubricant.getFluid(4000) - }, - ItemRefer.Fluid_Storage_Core_T3.get(1), - 800, - 122880 - ); + ItemRefer.Fluid_Storage_Core_T2.get(1), + 20000, + new Object[] { + ItemList.Super_Tank_IV.get(2L), + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Polytetrafluoroethylene, 16), + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Polytetrafluoroethylene, 16), + GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Iridium, 32) + }, + new FluidStack[] {new FluidStack(solderIndalloy, 2304), Materials.Lubricant.getFluid(4000)}, + ItemRefer.Fluid_Storage_Core_T3.get(1), + 800, + 122880); GT_Values.RA.addAssemblylineRecipe( - ItemRefer.Fluid_Storage_Core_T3.get(1), - 40000, - new Object[]{ - ItemList.Quantum_Tank_MV.get(3L), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Polybenzimidazole,16), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Polybenzimidazole,16), - GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Osmium,32) - }, - new FluidStack[]{ - new FluidStack(solderIndalloy, 18432), - Materials.Lubricant.getFluid(16000) - }, - ItemRefer.Fluid_Storage_Core_T4.get(1), - 3200, - 1966080 - ); + ItemRefer.Fluid_Storage_Core_T3.get(1), + 40000, + new Object[] { + ItemList.Quantum_Tank_MV.get(3L), + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Polybenzimidazole, 16), + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Polybenzimidazole, 16), + GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Osmium, 32) + }, + new FluidStack[] {new FluidStack(solderIndalloy, 18432), Materials.Lubricant.getFluid(16000)}, + ItemRefer.Fluid_Storage_Core_T4.get(1), + 3200, + 1966080); GT_Values.RA.addAssemblylineRecipe( - ItemRefer.Fluid_Storage_Core_T4.get(1), - 80000, - new Object[]{ - ItemList.Quantum_Tank_EV.get(32L), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Polybenzimidazole,32), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Polybenzimidazole,32), - GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Neutronium,32), - }, - new FluidStack[]{ - Materials.Draconium.getMolten(2304), - Materials.Titanium.getMolten(288), - Materials.Lubricant.getFluid(64000) - }, - ItemRefer.Fluid_Storage_Core_T5.get(1), - 6400, - 3921160 - ); + ItemRefer.Fluid_Storage_Core_T4.get(1), + 80000, + new Object[] { + ItemList.Quantum_Tank_EV.get(32L), + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Polybenzimidazole, 32), + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Polybenzimidazole, 32), + GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Neutronium, 32), + }, + new FluidStack[] { + Materials.Draconium.getMolten(2304), + Materials.Titanium.getMolten(288), + Materials.Lubricant.getFluid(64000) + }, + ItemRefer.Fluid_Storage_Core_T5.get(1), + 6400, + 3921160); 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(2), - GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.StainlessSteel,4), - GT_Utility.getIntegratedCircuit(5) - }, - Materials.Plastic.getMolten(144), - ItemRefer.YOTTank_Cell_T1.get(1), - 400, - 480 - ); + 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(2), + 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_IV.get(2), - GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Enderium,4), - GT_Utility.getIntegratedCircuit(5) - }, - Materials.Polytetrafluoroethylene.getMolten(144), - ItemRefer.YOTTank_Cell_T2.get(1), - 1600, - 7680 - ); + 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_IV.get(2), + GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Enderium, 4), + GT_Utility.getIntegratedCircuit(5) + }, + Materials.Polytetrafluoroethylene.getMolten(144), + ItemRefer.YOTTank_Cell_T2.get(1), + 1600, + 7680); 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[]{"circuitUltimate", 4}, - new Object[]{"circuitUltimate", 4}, - ItemList.Electric_Pump_ZPM.get(2), - 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), - 1600, - 122880 - ); + 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[] {"circuitUltimate", 4}, + new Object[] {"circuitUltimate", 4}, + ItemList.Electric_Pump_ZPM.get(2), + 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), + 1600, + 122880); 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[]{"circuitInfinite", 4}, - new Object[]{"circuitInfinite", 4}, - ItemList.Electric_Pump_UHV.get(2), - 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), - 3200, - 1966080 - ); + 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[] {"circuitInfinite", 4}, + new Object[] {"circuitInfinite", 4}, + ItemList.Electric_Pump_UHV.get(2), + 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), + 3200, + 1966080); 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[]{"circuitBio", 4}, - new Object[]{"circuitBio", 4}, - ItemList.Electric_Pump_UEV.get(2), - 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), - 6400, - 3921160 - ); + 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[] {"circuitBio", 4}, + new Object[] {"circuitBio", 4}, + ItemList.Electric_Pump_UEV.get(2), + 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), + 6400, + 3921160); 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(5), - ItemRefer.Fluid_Storage_Core_T6.get(5), - ItemList.Field_Generator_UEV.get(4), - ItemList.Field_Generator_UEV.get(4), - ItemList.Electric_Pump_UEV.get(16), - 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",32000), - Materials.Lubricant.getFluid(32000) - }, - ItemRefer.YOTTank_Cell_T6.get(1), - 12800, - 7842320 - ); + ItemRefer.YOTTank_Cell_T5.get(1), + 160000, + new Object[] { + GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Infinity, 1), + ItemRefer.Fluid_Storage_Core_T6.get(5), + ItemRefer.Fluid_Storage_Core_T6.get(5), + ItemList.Field_Generator_UEV.get(4), + ItemList.Field_Generator_UEV.get(4), + ItemList.Electric_Pump_UEV.get(16), + 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", 32000), + Materials.Lubricant.getFluid(32000) + }, + ItemRefer.YOTTank_Cell_T6.get(1), + 12800, + 7842320); GT_Values.RA.addUnboxingRecipe( - ItemRefer.YOTTank_Cell_T1.get(1), - ItemRefer.Fluid_Storage_Core_T1.get(10), - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.BlackSteel,1), - 100, - 480 - ); + ItemRefer.YOTTank_Cell_T1.get(1), + ItemRefer.Fluid_Storage_Core_T1.get(10), + GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.BlackSteel, 1), + 100, + 480); GT_Values.RA.addUnboxingRecipe( - ItemRefer.YOTTank_Cell_T2.get(1), - ItemRefer.Fluid_Storage_Core_T2.get(10), - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.TungstenSteel,1), - 100, - 480 - ); + ItemRefer.YOTTank_Cell_T2.get(1), + ItemRefer.Fluid_Storage_Core_T2.get(10), + GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.TungstenSteel, 1), + 100, + 480); GT_Values.RA.addUnboxingRecipe( - ItemRefer.YOTTank_Cell_T3.get(1), - ItemRefer.Fluid_Storage_Core_T3.get(10), - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Naquadah,1), - 100, - 480 - ); + ItemRefer.YOTTank_Cell_T3.get(1), + ItemRefer.Fluid_Storage_Core_T3.get(10), + GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Naquadah, 1), + 100, + 480); GT_Values.RA.addUnboxingRecipe( - ItemRefer.YOTTank_Cell_T4.get(1), - ItemRefer.Fluid_Storage_Core_T4.get(10), - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Neutronium,1), - 100, - 480 - ); + ItemRefer.YOTTank_Cell_T4.get(1), + ItemRefer.Fluid_Storage_Core_T4.get(10), + GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Neutronium, 1), + 100, + 480); GT_Values.RA.addUnboxingRecipe( - ItemRefer.YOTTank_Cell_T5.get(1), - ItemRefer.Fluid_Storage_Core_T5.get(10), - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.CosmicNeutronium,1), - 100, - 480 - ); + ItemRefer.YOTTank_Cell_T5.get(1), + ItemRefer.Fluid_Storage_Core_T5.get(10), + GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.CosmicNeutronium, 1), + 100, + 480); GT_Values.RA.addUnboxingRecipe( - ItemRefer.YOTTank_Cell_T6.get(1), - ItemRefer.Fluid_Storage_Core_T6.get(10), - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Infinity,1), - 100, - 480 - ); + ItemRefer.YOTTank_Cell_T6.get(1), + ItemRefer.Fluid_Storage_Core_T6.get(10), + GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Infinity, 1), + 100, + 480); GT_Values.RA.addAutoclaveRecipe( - WerkstoffLoader.Tiberium.get(OrePrefixes.dust, 1), - MyMaterial.naquadahGas.getFluidOrGas(250), - WerkstoffLoader.Tiberium.get(OrePrefixes.gem, 1), - 10000, - 400, - 480 - ); + WerkstoffLoader.Tiberium.get(OrePrefixes.dust, 1), + MyMaterial.naquadahGas.getFluidOrGas(250), + WerkstoffLoader.Tiberium.get(OrePrefixes.gem, 1), + 10000, + 400, + 480); GT_Values.RA.addChemicalBathRecipe( - Materials.Firestone.getGems(1), - MyMaterial.lightNaquadahFuel.getFluidOrGas(144), - WerkstoffLoader.Tiberium.get(OrePrefixes.gem, 1), - null, null, - new int[]{10000}, - 400, - 1980 - ); + Materials.Firestone.getGems(1), + MyMaterial.lightNaquadahFuel.getFluidOrGas(144), + WerkstoffLoader.Tiberium.get(OrePrefixes.gem, 1), + null, + null, + new int[] {10000}, + 400, + 1980); GT_Values.RA.addChemicalBathRecipe( - Materials.Diamond.getGems(1), - MyMaterial.heavyNaquadahFuel.getFluidOrGas(144), - WerkstoffLoader.Tiberium.get(OrePrefixes.gem, 1), - null, null, - new int[]{10000}, - 400, - 1980 - ); + Materials.Diamond.getGems(1), + MyMaterial.heavyNaquadahFuel.getFluidOrGas(144), + WerkstoffLoader.Tiberium.get(OrePrefixes.gem, 1), + null, + null, + 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) - }, - null, - 120, - 480 - ); + Materials.HeavyFuel.getFluid(1000), + new FluidStack[] { + Materials.Toluene.getFluid(400), Materials.Benzene.getFluid(400), Materials.Phenol.getFluid(250) + }, + null, + 120, + 480); GT_Values.RA.addFluidExtractionRecipe( - Materials.Coal.getGems(1), - Materials.Ash.getDust(1), - FluidRegistry.getFluidStack("fluid.coaltar", 250), - 10, - 60, - 120 - ); - - if (OreDictionary.getOres("fuelCoke").size() > 0) { - GT_Values.RA.addFluidExtractionRecipe( - OreDictionary.getOres("fuelCoke").get(0), + Materials.Coal.getGems(1), Materials.Ash.getDust(1), - FluidRegistry.getFluidStack("fluid.coaltar", 500), + FluidRegistry.getFluidStack("fluid.coaltar", 250), 10, 60, - 120 - ); + 120); + + if (OreDictionary.getOres("fuelCoke").size() > 0) { + GT_Values.RA.addFluidExtractionRecipe( + OreDictionary.getOres("fuelCoke").get(0), + Materials.Ash.getDust(1), + FluidRegistry.getFluidStack("fluid.coaltar", 500), + 10, + 60, + 120); } if (LoadedList.GTPP) { GT_Values.RA.addDistilleryRecipe( - 24, - FluidRegistry.getFluidStack("fluid.coaltaroil", 100), - MyMaterial.cyclopentadiene.getFluidOrGas(30), - 100, - 120, - false - ); - } - else { + 24, + FluidRegistry.getFluidStack("fluid.coaltaroil", 100), + MyMaterial.cyclopentadiene.getFluidOrGas(30), + 100, + 120, + false); + } else { GT_Values.RA.addDistilleryRecipe( - 24, - FluidRegistry.getFluidStack("fluid.coaltar", 300), - MyMaterial.cyclopentadiene.getFluidOrGas(100), - 100, - 120, - false - ); + 24, + FluidRegistry.getFluidStack("fluid.coaltar", 300), + MyMaterial.cyclopentadiene.getFluidOrGas(100), + 100, + 120, + false); } GT_Values.RA.addDistilleryRecipe( - 24, - Materials.WoodTar.getFluid(500), - MyMaterial.cyclopentadiene.getFluidOrGas(20), - 100, - 120, - false - ); - - //FeCl2 + Cl = FeCl3 + 24, Materials.WoodTar.getFluid(500), MyMaterial.cyclopentadiene.getFluidOrGas(20), 100, 120, false); + + // FeCl2 + Cl = FeCl3 GT_Values.RA.addChemicalRecipe( - MyMaterial.ferrousChloride.get(OrePrefixes.cell, 1), - GT_Utility.getIntegratedCircuit(1), - Materials.Chlorine.getGas(1000), - null, - Materials.IronIIIChloride.getCells(1), - 40 - ); - - //FeCl3 + H = FeCl2 + HCl + MyMaterial.ferrousChloride.get(OrePrefixes.cell, 1), + GT_Utility.getIntegratedCircuit(1), + Materials.Chlorine.getGas(1000), + null, + Materials.IronIIIChloride.getCells(1), + 40); + + // FeCl3 + H = FeCl2 + HCl GT_Values.RA.addChemicalRecipe( - Materials.IronIIIChloride.getCells(1), - GT_Utility.getIntegratedCircuit(7), - Materials.Hydrogen.getGas(1000), - Materials.HydrochloricAcid.getFluid(1000), - MyMaterial.ferrousChloride.get(OrePrefixes.cell, 1), - 80, - 120 - ); - - //NH3 + 2C2H6O = C4H11N + 2H2O + Materials.IronIIIChloride.getCells(1), + GT_Utility.getIntegratedCircuit(7), + Materials.Hydrogen.getGas(1000), + Materials.HydrochloricAcid.getFluid(1000), + MyMaterial.ferrousChloride.get(OrePrefixes.cell, 1), + 80, + 120); + + // NH3 + 2C2H6O = C4H11N + 2H2O GT_Values.RA.addChemicalRecipe( - Materials.Ammonia.getCells(1), - GT_Utility.getIntegratedCircuit(1), - Materials.Ethanol.getFluid(2000), - Materials.Water.getFluid(2000), - MyMaterial.diethylamine.get(OrePrefixes.cell, 1), - 200, - 120 - ); + Materials.Ammonia.getCells(1), + GT_Utility.getIntegratedCircuit(1), + Materials.Ethanol.getFluid(2000), + Materials.Water.getFluid(2000), + MyMaterial.diethylamine.get(OrePrefixes.cell, 1), + 200, + 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) - }, - null, - 2400, - 120 - ); + 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); GT_Values.RA.addMixerRecipe( - MyMaterial.ether.get(OrePrefixes.cell, 1), - GT_Utility.getIntegratedCircuit(1), - null, - null, - MyMaterial.impureFerroceneMixture.getFluidOrGas(7500), - MyMaterial.ferroceneWaste.getFluidOrGas(5000), - MyMaterial.ferroceneSolution.get(OrePrefixes.cell, 1), - 800, - 120 - ); + MyMaterial.ether.get(OrePrefixes.cell, 1), + GT_Utility.getIntegratedCircuit(1), + null, + null, + MyMaterial.impureFerroceneMixture.getFluidOrGas(7500), + MyMaterial.ferroceneWaste.getFluidOrGas(5000), + MyMaterial.ferroceneSolution.get(OrePrefixes.cell, 1), + 800, + 120); GT_Values.RA.addUniversalDistillationRecipe( - MyMaterial.ferroceneWaste.getFluidOrGas(1000), - new FluidStack[] { - Materials.Water.getFluid(400), - MyMaterial.diethylamine.getFluidOrGas(800), - MyMaterial.ether.getFluidOrGas(500) - }, - null, - 600, - 120 - ); + MyMaterial.ferroceneWaste.getFluidOrGas(1000), + 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) - }, - MyMaterial.ferrocene.get(OrePrefixes.dust, 1), - 600, - 120 - ); + MyMaterial.ferroceneSolution.getFluidOrGas(2000), + new FluidStack[] {MyMaterial.ether.getFluidOrGas(1000)}, + MyMaterial.ferrocene.get(OrePrefixes.dust, 1), + 600, + 120); if (LoadedList.GTPP) { GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[]{ + 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), - 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 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, - 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) - }, - null, - 2400, - 7680 - ); + 7680); 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 - } - ); + 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 + }); 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 - } - ); + 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 + }); GT_Values.RA.addFluidCannerRecipe( - ItemRefer.Advanced_Fuel_Rod.get(1), - ItemRefer.Fuel_Rod_LU_1.get(1), - MyMaterial.uraniumBasedLiquidFuelExcited.getFluidOrGas(250), - null, - 100, - 1920 - ); + ItemRefer.Advanced_Fuel_Rod.get(1), + ItemRefer.Fuel_Rod_LU_1.get(1), + MyMaterial.uraniumBasedLiquidFuelExcited.getFluidOrGas(250), + null, + 100, + 1920); GT_Values.RA.addFluidCannerRecipe( - ItemRefer.Advanced_Fuel_Rod.get(1), - ItemRefer.Fuel_Rod_LPu_1.get(1), - MyMaterial.plutoniumBasedLiquidFuelExcited.getFluidOrGas(250), - null, - 100, - 1920 - ); + ItemRefer.Advanced_Fuel_Rod.get(1), + ItemRefer.Fuel_Rod_LPu_1.get(1), + MyMaterial.plutoniumBasedLiquidFuelExcited.getFluidOrGas(250), + null, + 100, + 1920); GT_Values.RA.addAssemblerRecipe( - 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 - ); + 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) - }, - null, - ItemRefer.Fuel_Rod_LPu_4.get(1), - 200, - 7680 - ); + 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) - }, - null, - ItemRefer.Fuel_Rod_LPu_4.get(1), - 220, - 7680 - ); + 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) - }, - null, - ItemRefer.Fuel_Rod_LU_2.get(1), - 200, - 7680 - ); + 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) - }, - null, - ItemRefer.Fuel_Rod_LU_4.get(1), - 200, - 7680 - ); + 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) - }, - null, - ItemRefer.Fuel_Rod_LU_4.get(1), - 220, - 7680 - ); + 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, + 7680); MyRecipeAdder.instance.addExtremeHeatExchangerRecipe( - FluidRegistry.getFluidStack("lava", 20000), - FluidRegistry.getFluidStack("ic2pahoehoelava", 20000), - FluidRegistry.getFluidStack("ic2distilledwater", 20000), - FluidRegistry.getFluidStack("steam", 3200000), - FluidRegistry.getFluidStack("ic2superheatedsteam", 1600000), - 10000 - ); + FluidRegistry.getFluidStack("lava", 20000), + FluidRegistry.getFluidStack("ic2pahoehoelava", 20000), + FluidRegistry.getFluidStack("ic2distilledwater", 20000), + FluidRegistry.getFluidStack("steam", 3200000), + FluidRegistry.getFluidStack("ic2superheatedsteam", 1600000), + 10000); MyRecipeAdder.instance.addExtremeHeatExchangerRecipe( - FluidRegistry.getFluidStack("ic2hotcoolant", 16000), - FluidRegistry.getFluidStack("ic2coolant", 16000), - FluidRegistry.getFluidStack("ic2distilledwater", 20000), - FluidRegistry.getFluidStack("ic2superheatedsteam", 3200000), - FluidRegistry.getFluidStack("supercriticalsteam", 32000), - 8000 - ); + FluidRegistry.getFluidStack("ic2hotcoolant", 16000), + FluidRegistry.getFluidStack("ic2coolant", 16000), + FluidRegistry.getFluidStack("ic2distilledwater", 20000), + FluidRegistry.getFluidStack("ic2superheatedsteam", 3200000), + FluidRegistry.getFluidStack("supercriticalsteam", 32000), + 8000); GT_Values.RA.addChemicalBathRecipe( - GT_OreDictUnificator.get(OrePrefixes.crushedPurified, Materials.Lepidolite, 1), - Materials.HydrochloricAcid.getFluid(1000), - Materials.RockSalt.getDust(1), - MyMaterial.lithiumChloride.get(OrePrefixes.dust, 3), - Materials.Cryolite.getDust(4), - new int[]{8000, 8000, 8000}, - 140, - 120 - ); + GT_OreDictUnificator.get(OrePrefixes.crushedPurified, Materials.Lepidolite, 1), + Materials.HydrochloricAcid.getFluid(1000), + Materials.RockSalt.getDust(1), + MyMaterial.lithiumChloride.get(OrePrefixes.dust, 3), + Materials.Cryolite.getDust(4), + new int[] {8000, 8000, 8000}, + 140, + 120); GT_Values.RA.addBlastRecipe( - MyMaterial.marM200.get(OrePrefixes.ingot, 18), - Materials.Cerium.getIngots(1), - MyMaterial.lithiumChloride.getMolten(144), - null, - MyMaterial.marCeM200.get(OrePrefixes.ingotHot, 19), - null, - 5700, - 122880, - 4500 - ); + MyMaterial.marM200.get(OrePrefixes.ingot, 18), + Materials.Cerium.getIngots(1), + MyMaterial.lithiumChloride.getMolten(144), + null, + MyMaterial.marCeM200.get(OrePrefixes.ingotHot, 19), + null, + 5700, + 122880, + 4500); 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), - } - ); + 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), + }); GT_Values.RA.addAssemblerRecipe( - 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, - 480 - ); + 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, + 480); 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) - } - ); + 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) + }); 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) - }, - null, - ItemRefer.SC_Fluid_Turbine.get(1), - 300, - 480 - ); + 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) - }, - null, - ItemRefer.Pressure_Resistant_Wall.get(1), - 1000, - 480 - ); + 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, + 480); 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) - } - ); + 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) + }); GT_Values.RA.addChemicalBathRecipe( - ItemRefer.Salty_Root.get(1), - GT_ModHandler.getWater(100), - Materials.Salt.getDust(1), - Materials.RockSalt.getDust(1), - Materials.Saltpeter.getDust(1), - new int[]{9500, 8000, 5000}, - 100, - 30 - ); + ItemRefer.Salty_Root.get(1), + GT_ModHandler.getWater(100), + Materials.Salt.getDust(1), + Materials.RockSalt.getDust(1), + Materials.Saltpeter.getDust(1), + 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) - }, - ItemRefer.HiC_T1.get(1), - 288, - 1200, - 7680, - false - ); + 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, + 7680, + 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), - }, - Materials.Palladium.getMolten(1152), - ItemRefer.Precise_Assembler.get(1), - 1800, - 7680, - false - ); + 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 - ); + 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) - }, - ItemRefer.HiC_T2.get(1), - 30720, - 100, - 1 - ); + 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) - }, - ItemRefer.HiC_T3.get(1), - 122880, - 100, - 2 - ); + 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) - }, - ItemRefer.HiC_T4.get(1), - 491520, - 100, - 3 - ); + 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) - }, - ItemRefer.HiC_T5.get(1), - 1966080, - 100, - 3 - ); + 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), - }, - MyMaterial.adamantiumAlloy.getMolten(1152), - ItemRefer.Precise_Electronic_Unit_T2.get(4), - 4800, - 122880 - ); + 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), - }, - MyMaterial.artheriumSn.getMolten(1152), - ItemRefer.Precise_Electronic_Unit_T3.get(4), - 4800, - 491520 - ); + 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, + 491520); } // 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) - }, - ItemRefer.Compact_Fusion_Coil_T0.get(1), - 9001, - 1200, - 1 - ); + 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, + 1); // 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) - }, - ItemRefer.Compact_Fusion_Coil_T1.get(1), - 14000, - 800, - 2 - ); + 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, + 2); // 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) - }, - ItemRefer.Compact_Fusion_Coil_T2.get(1), - 114514, - 800, - 3 - ); + 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) - }, - MyMaterial.adamantiumAlloy.getMolten(9216), - ItemRefer.Compact_Fusion_MK1.get(1), - 1200, - 30000 - ); + 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, + 30000); 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) - }, - ItemRefer.Compact_Fusion_MK2.get(1), - 6000, - 60000 - ); + 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) + }, + ItemRefer.Compact_Fusion_MK2.get(1), + 6000, + 60000); 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) - }, - ItemRefer.Compact_Fusion_MK3.get(1), - 6000, - 90000 - ); + 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) + }, + ItemRefer.Compact_Fusion_MK3.get(1), + 6000, + 90000); // 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) - }, - ItemRefer.Compact_Fusion_Coil_T3.get(1), - 520000, - 2000, - 3 - ); + 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, + 3); // Compact MK4 Fusion Disassembly Recipe GT_Values.RA.addAssemblerRecipe( - new ItemStack[]{ - ItemRefer.Compact_Fusion_Coil_T3.get(1), - }, - null, - GT_ModHandler.getModItem("miscutils", "gtplusplus.blockcasings.3", 3, 13), - 600, - 7680000 - ); + new ItemStack[] { + ItemRefer.Compact_Fusion_Coil_T3.get(1), + }, + null, + GT_ModHandler.getModItem("miscutils", "gtplusplus.blockcasings.3", 3, 13), + 600, + 7680000); int tID = GregTech_API.METATILEENTITIES[31076] != null ? 31076 : 965; GT_Values.RA.addAssemblylineRecipe( - ItemRefer.Compact_Fusion_MK3.get(1), - 24000, - new Object[] { - GT_ModHandler.getModItem("gregtech", "gt.blockmachines", 48, tID), - 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 -// ); + ItemRefer.Compact_Fusion_MK3.get(1), + 24000, + new Object[] { + GT_ModHandler.getModItem("gregtech", "gt.blockmachines", 48, tID), + 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 + // ); // 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) - }, - null, - 800, - 7680 - ); + 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) - }, - null, - 100, - 120 - ); + MyMaterial.antimonyPentafluorideSolution.getFluidOrGas(4000), + 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) - }, - Materials.Concrete.getMolten(2304), - ItemRefer.Coolant_Tower.get(1), - 200, - 120 - ); - + 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, + 120); } public static void InitLoadRecipe() { GT_Values.RA.addCentrifugeRecipe( - ItemRefer.Fuel_Rod_U_Depleted_1.get(1), - null, - null, - WerkstoffLoader.Neon.getFluidOrGas(32), - ItemRefer.Advanced_Fuel_Rod.get(1), - Materials.Uranium.getDust(8), - Materials.Plutonium.getDust(2), - Materials.Graphite.getDust(8), - Materials.Uranium235.getDust(1), - Materials.Plutonium241.getDust(1), - new int[]{10000, 10000, 10000, 9000, 5000, 3000}, - 200, - 1920 - ); + ItemRefer.Fuel_Rod_U_Depleted_1.get(1), + null, + null, + WerkstoffLoader.Neon.getFluidOrGas(32), + ItemRefer.Advanced_Fuel_Rod.get(1), + Materials.Uranium.getDust(8), + Materials.Plutonium.getDust(2), + Materials.Graphite.getDust(8), + Materials.Uranium235.getDust(1), + Materials.Plutonium241.getDust(1), + new int[] {10000, 10000, 10000, 9000, 5000, 3000}, + 200, + 1920); GT_Values.RA.addCentrifugeRecipe( - ItemRefer.Fuel_Rod_U_Depleted_2.get(1), - null, - null, - WerkstoffLoader.Neon.getFluidOrGas(64), - ItemRefer.Advanced_Fuel_Rod.get(2), - Materials.Uranium.getDust(16), - Materials.Plutonium.getDust(4), - Materials.Graphite.getDust(16), - Materials.Uranium235.getDust(2), - Materials.Plutonium241.getDust(2), - new int[]{10000, 10000, 10000, 9000, 5000, 3000}, - 200, - 1920 - ); + ItemRefer.Fuel_Rod_U_Depleted_2.get(1), + null, + null, + WerkstoffLoader.Neon.getFluidOrGas(64), + ItemRefer.Advanced_Fuel_Rod.get(2), + Materials.Uranium.getDust(16), + Materials.Plutonium.getDust(4), + Materials.Graphite.getDust(16), + Materials.Uranium235.getDust(2), + Materials.Plutonium241.getDust(2), + new int[] {10000, 10000, 10000, 9000, 5000, 3000}, + 200, + 1920); GT_Values.RA.addCentrifugeRecipe( - ItemRefer.Fuel_Rod_U_Depleted_4.get(1), - null, - null, - WerkstoffLoader.Neon.getFluidOrGas(128), - ItemRefer.Advanced_Fuel_Rod.get(4), - Materials.Uranium.getDust(32), - Materials.Plutonium.getDust(8), - Materials.Graphite.getDust(32), - Materials.Uranium235.getDust(4), - Materials.Plutonium241.getDust(4), - new int[]{10000, 10000, 10000, 9000, 5000, 3000}, - 200, - 1920 - ); + ItemRefer.Fuel_Rod_U_Depleted_4.get(1), + null, + null, + WerkstoffLoader.Neon.getFluidOrGas(128), + ItemRefer.Advanced_Fuel_Rod.get(4), + Materials.Uranium.getDust(32), + Materials.Plutonium.getDust(8), + Materials.Graphite.getDust(32), + Materials.Uranium235.getDust(4), + Materials.Plutonium241.getDust(4), + new int[] {10000, 10000, 10000, 9000, 5000, 3000}, + 200, + 1920); GT_Values.RA.addCentrifugeRecipe( - ItemRefer.Fuel_Rod_Pu_Depleted_1.get(1), - null, - null, - WerkstoffLoader.Krypton.getFluidOrGas(32), - ItemRefer.Advanced_Fuel_Rod.get(1), - Materials.Plutonium.getDust(5), - Materials.Plutonium241.getDust(2), - Materials.Carbon.getDust(2), - Materials.Uranium.getDust(1), - Materials.Uranium235.getDust(1), - new int[]{10000, 10000, 10000, 9000, 5000, 3000}, - 200, - 1920 - ); + ItemRefer.Fuel_Rod_Pu_Depleted_1.get(1), + null, + null, + WerkstoffLoader.Krypton.getFluidOrGas(32), + ItemRefer.Advanced_Fuel_Rod.get(1), + Materials.Plutonium.getDust(5), + Materials.Plutonium241.getDust(2), + Materials.Carbon.getDust(2), + Materials.Uranium.getDust(1), + Materials.Uranium235.getDust(1), + new int[] {10000, 10000, 10000, 9000, 5000, 3000}, + 200, + 1920); GT_Values.RA.addCentrifugeRecipe( - ItemRefer.Fuel_Rod_Pu_Depleted_2.get(1), - null, - null, - WerkstoffLoader.Krypton.getFluidOrGas(64), - ItemRefer.Advanced_Fuel_Rod.get(2), - Materials.Plutonium.getDust(10), - Materials.Plutonium241.getDust(4), - Materials.Carbon.getDust(4), - Materials.Uranium.getDust(2), - Materials.Uranium235.getDust(2), - new int[]{10000, 10000, 10000, 9000, 5000, 3000}, - 200, - 1920 - ); + ItemRefer.Fuel_Rod_Pu_Depleted_2.get(1), + null, + null, + WerkstoffLoader.Krypton.getFluidOrGas(64), + ItemRefer.Advanced_Fuel_Rod.get(2), + Materials.Plutonium.getDust(10), + Materials.Plutonium241.getDust(4), + Materials.Carbon.getDust(4), + Materials.Uranium.getDust(2), + Materials.Uranium235.getDust(2), + new int[] {10000, 10000, 10000, 9000, 5000, 3000}, + 200, + 1920); GT_Values.RA.addCentrifugeRecipe( - ItemRefer.Fuel_Rod_Pu_Depleted_4.get(1), - null, - null, - WerkstoffLoader.Krypton.getFluidOrGas(128), - ItemRefer.Advanced_Fuel_Rod.get(4), - Materials.Plutonium.getDust(20), - Materials.Plutonium241.getDust(8), - Materials.Carbon.getDust(8), - Materials.Uranium.getDust(4), - Materials.Uranium235.getDust(4), - new int[]{10000, 10000, 10000, 9000, 5000, 3000}, - 200, - 1920 - ); + ItemRefer.Fuel_Rod_Pu_Depleted_4.get(1), + null, + null, + WerkstoffLoader.Krypton.getFluidOrGas(128), + ItemRefer.Advanced_Fuel_Rod.get(4), + Materials.Plutonium.getDust(20), + Materials.Plutonium241.getDust(8), + Materials.Carbon.getDust(8), + Materials.Uranium.getDust(4), + Materials.Uranium235.getDust(4), + new int[] {10000, 10000, 10000, 9000, 5000, 3000}, + 200, + 1920); GT_Values.RA.addCentrifugeRecipe( - ItemRefer.Fuel_Rod_LPu_Depleted_1.get(1), - null, - null, - MyMaterial.plutoniumBasedLiquidFuelDepleted.getFluidOrGas(250), - ItemRefer.Advanced_Fuel_Rod.get(1), null, null, null, null, null, - new int[]{10000}, - 200, - 7680 - ); + ItemRefer.Fuel_Rod_LPu_Depleted_1.get(1), + null, + null, + MyMaterial.plutoniumBasedLiquidFuelDepleted.getFluidOrGas(250), + ItemRefer.Advanced_Fuel_Rod.get(1), + null, + null, + null, + null, + null, + new int[] {10000}, + 200, + 7680); GT_Values.RA.addCentrifugeRecipe( - ItemRefer.Fuel_Rod_LPu_Depleted_2.get(1), - null, - null, - MyMaterial.plutoniumBasedLiquidFuelDepleted.getFluidOrGas(500), - ItemRefer.Advanced_Fuel_Rod.get(2), null, null, null, null, null, - new int[]{10000}, - 200, - 7680 - ); + ItemRefer.Fuel_Rod_LPu_Depleted_2.get(1), + null, + null, + MyMaterial.plutoniumBasedLiquidFuelDepleted.getFluidOrGas(500), + ItemRefer.Advanced_Fuel_Rod.get(2), + null, + null, + null, + null, + null, + new int[] {10000}, + 200, + 7680); GT_Values.RA.addCentrifugeRecipe( - ItemRefer.Fuel_Rod_LPu_Depleted_4.get(1), - null, - null, - MyMaterial.plutoniumBasedLiquidFuelDepleted.getFluidOrGas(1000), - ItemRefer.Advanced_Fuel_Rod.get(4), null, null, null, null, null, - new int[]{10000}, - 200, - 7680 - ); + ItemRefer.Fuel_Rod_LPu_Depleted_4.get(1), + null, + null, + MyMaterial.plutoniumBasedLiquidFuelDepleted.getFluidOrGas(1000), + ItemRefer.Advanced_Fuel_Rod.get(4), + null, + null, + null, + null, + null, + new int[] {10000}, + 200, + 7680); GT_Values.RA.addCentrifugeRecipe( - ItemRefer.Fuel_Rod_LU_Depleted_1.get(1), - null, - null, - MyMaterial.uraniumBasedLiquidFuelDepleted.getFluidOrGas(250), - ItemRefer.Advanced_Fuel_Rod.get(1), null, null, null, null, null, - new int[]{10000}, - 200, - 7680 - ); + ItemRefer.Fuel_Rod_LU_Depleted_1.get(1), + null, + null, + MyMaterial.uraniumBasedLiquidFuelDepleted.getFluidOrGas(250), + ItemRefer.Advanced_Fuel_Rod.get(1), + null, + null, + null, + null, + null, + new int[] {10000}, + 200, + 7680); GT_Values.RA.addCentrifugeRecipe( - ItemRefer.Fuel_Rod_LU_Depleted_2.get(1), - null, - null, - MyMaterial.uraniumBasedLiquidFuelDepleted.getFluidOrGas(500), - ItemRefer.Advanced_Fuel_Rod.get(2), null, null, null, null, null, - new int[]{10000}, - 200, - 7680 - ); + ItemRefer.Fuel_Rod_LU_Depleted_2.get(1), + null, + null, + MyMaterial.uraniumBasedLiquidFuelDepleted.getFluidOrGas(500), + ItemRefer.Advanced_Fuel_Rod.get(2), + null, + null, + null, + null, + null, + new int[] {10000}, + 200, + 7680); GT_Values.RA.addCentrifugeRecipe( - ItemRefer.Fuel_Rod_LU_Depleted_4.get(1), - null, - null, - MyMaterial.uraniumBasedLiquidFuelDepleted.getFluidOrGas(1000), - ItemRefer.Advanced_Fuel_Rod.get(4), null, null, null, null, null, - new int[]{10000}, - 200, - 7680 - ); + ItemRefer.Fuel_Rod_LU_Depleted_4.get(1), + null, + null, + MyMaterial.uraniumBasedLiquidFuelDepleted.getFluidOrGas(1000), + ItemRefer.Advanced_Fuel_Rod.get(4), + null, + null, + null, + null, + null, + new int[] {10000}, + 200, + 7680); GT_Values.RA.addMixerRecipe( - Materials.Glowstone.getDust(4), - Materials.Redstone.getDust(2), - Materials.Aluminium.getDust(1), - GT_Utility.getIntegratedCircuit(3), - null, - null, - ItemRefer.High_Energy_Mixture.get(4), - 240, - 120 - ); + Materials.Glowstone.getDust(4), + Materials.Redstone.getDust(2), + Materials.Aluminium.getDust(1), + GT_Utility.getIntegratedCircuit(3), + null, + null, + ItemRefer.High_Energy_Mixture.get(4), + 240, + 120); GT_Values.RA.addFluidSolidifierRecipe( - ItemRefer.High_Energy_Mixture.get(2), - Materials.PhosphoricAcid.getFluid(4000), - MyMaterial.lumiinessence.get(OrePrefixes.dust, 1), - 600, - 240 - ); + ItemRefer.High_Energy_Mixture.get(2), + Materials.PhosphoricAcid.getFluid(4000), + MyMaterial.lumiinessence.get(OrePrefixes.dust, 1), + 600, + 240); GT_Values.RA.addMixerRecipe( - Materials.AnnealedCopper.getDust(4), - Materials.Ardite.getDust(2), - Materials.RedAlloy.getDust(2), - GT_Utility.getIntegratedCircuit(4), - Materials.Redstone.getMolten(288), - null, - MyMaterial.signalium.get(OrePrefixes.dust, 1), - 240, - 120 - ); + Materials.AnnealedCopper.getDust(4), + Materials.Ardite.getDust(2), + Materials.RedAlloy.getDust(2), + GT_Utility.getIntegratedCircuit(4), + Materials.Redstone.getMolten(288), + null, + MyMaterial.signalium.get(OrePrefixes.dust, 1), + 240, + 120); GT_Values.RA.addMixerRecipe( - Materials.TinAlloy.getDust(4), - Materials.SterlingSilver.getDust(2), - MyMaterial.lumiinessence.get(OrePrefixes.dust, 2), - GT_Utility.getIntegratedCircuit(4), - Materials.Glowstone.getMolten(288), - null, - MyMaterial.lumiium.get(OrePrefixes.dust, 1), - 240, - 120 - ); + Materials.TinAlloy.getDust(4), + Materials.SterlingSilver.getDust(2), + MyMaterial.lumiinessence.get(OrePrefixes.dust, 2), + GT_Utility.getIntegratedCircuit(4), + Materials.Glowstone.getMolten(288), + null, + MyMaterial.lumiium.get(OrePrefixes.dust, 1), + 240, + 120); } public static void FinishLoadRecipe() { @@ -1714,17 +1631,15 @@ public class RecipeLoader_02 { if (tPlasmaName.split("\\.", 2).length == 2) { String tOutName = tPlasmaName.split("\\.", 2)[1]; FluidStack output = FluidRegistry.getFluidStack(tOutName, tPlasma.amount); - if (output == null) - output = FluidRegistry.getFluidStack("molten." + tOutName, tPlasma.amount); + if (output == null) output = FluidRegistry.getFluidStack("molten." + tOutName, tPlasma.amount); if (output != null) { MyRecipeAdder.instance.addExtremeHeatExchangerRecipe( - tPlasma, - output, - FluidRegistry.getFluidStack("ic2distilledwater", tUnit * 3 * tPlasma.amount / 160), - FluidRegistry.getFluidStack("ic2superheatedsteam", tUnit * 3 * tPlasma.amount), - FluidRegistry.getFluidStack("supercriticalsteam", tUnit * 3 * tPlasma.amount / 100), - 1 - ); + tPlasma, + output, + FluidRegistry.getFluidStack("ic2distilledwater", tUnit * 3 * tPlasma.amount / 160), + FluidRegistry.getFluidStack("ic2superheatedsteam", tUnit * 3 * tPlasma.amount), + FluidRegistry.getFluidStack("supercriticalsteam", tUnit * 3 * tPlasma.amount / 100), + 1); } } } diff --git a/src/main/java/goodgenerator/main/GG_Config_Loader.java b/src/main/java/goodgenerator/main/GG_Config_Loader.java index a93256c27d..cac5581752 100644 --- a/src/main/java/goodgenerator/main/GG_Config_Loader.java +++ b/src/main/java/goodgenerator/main/GG_Config_Loader.java @@ -1,28 +1,22 @@ package goodgenerator.main; import cpw.mods.fml.relauncher.FMLInjectionData; -import net.minecraftforge.common.config.Configuration; - import java.io.File; +import net.minecraftforge.common.config.Configuration; 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, 220000, - 380000, 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, 220000, + 380000, 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() { @@ -31,39 +25,92 @@ 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(); - 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[1] = GG_Config.get("LargeNaquadahReactor", "Naquadah Magnification", ExcitedLiquidCoe[1]).getInt(); - ExcitedLiquidCoe[2] = GG_Config.get("LargeNaquadahReactor", "Uranium-235 Magnification", ExcitedLiquidCoe[2]).getInt(); - ExcitedLiquidCoe[3] = GG_Config.get("LargeNaquadahReactor", "Caesium Magnification", ExcitedLiquidCoe[3]).getInt(); - LiquidAirConsumptionPerSecond = Math.max(GG_Config.get("LargeNaquadahReactor", "Liquid Air Consumption Per Second", LiquidAirConsumptionPerSecond).getInt(), 0); + 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[1] = GG_Config.get("LargeNaquadahReactor", "Naquadah Magnification", ExcitedLiquidCoe[1]) + .getInt(); + ExcitedLiquidCoe[2] = GG_Config.get("LargeNaquadahReactor", "Uranium-235 Magnification", ExcitedLiquidCoe[2]) + .getInt(); + ExcitedLiquidCoe[3] = GG_Config.get("LargeNaquadahReactor", "Caesium Magnification", ExcitedLiquidCoe[3]) + .getInt(); + LiquidAirConsumptionPerSecond = Math.max( + GG_Config.get( + "LargeNaquadahReactor", + "Liquid Air Consumption Per Second", + LiquidAirConsumptionPerSecond) + .getInt(), + 0); - EnableNaquadahRework = GG_Config.get("NaquadahRework", "Enable Naquadah Rework", EnableNaquadahRework).getBoolean(); + EnableNaquadahRework = GG_Config.get("NaquadahRework", "Enable Naquadah Rework", EnableNaquadahRework) + .getBoolean(); - if (GG_Config.hasChanged()) - GG_Config.save(); + if (GG_Config.hasChanged()) GG_Config.save(); } private static void loadCategory() { - GG_Config.addCustomCategoryComment("LargeNaquadahReactor", "Set fuel value, coolant or excited liquid property."); + GG_Config.addCustomCategoryComment( + "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 497d1afc39..825af307d4 100644 --- a/src/main/java/goodgenerator/main/GoodGenerator.java +++ b/src/main/java/goodgenerator/main/GoodGenerator.java @@ -1,5 +1,13 @@ package goodgenerator.main; +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; +import cpw.mods.fml.common.event.*; +import cpw.mods.fml.common.network.NetworkRegistry; +import cpw.mods.fml.common.network.simpleimpl.SimpleNetworkWrapper; +import cpw.mods.fml.relauncher.Side; import goodgenerator.common.CommonProxy; import goodgenerator.crossmod.thaumcraft.Research; import goodgenerator.items.MyMaterial; @@ -8,24 +16,18 @@ import goodgenerator.network.MessageOpenNeutronSensorGUI; import goodgenerator.network.MessageResetTileTexture; import goodgenerator.network.MessageSetNeutronSensorData; import goodgenerator.tabs.MyTabs; -import com.github.bartimaeusnek.bartworks.API.WerkstoffAdderRegistry; -import cpw.mods.fml.common.Loader; -import cpw.mods.fml.common.SidedProxy; -import cpw.mods.fml.common.event.*; -import cpw.mods.fml.common.network.NetworkRegistry; -import cpw.mods.fml.common.network.simpleimpl.SimpleNetworkWrapper; -import cpw.mods.fml.relauncher.Side; import net.minecraft.creativetab.CreativeTabs; -import cpw.mods.fml.common.Mod; @SuppressWarnings("ALL") -@Mod(modid = GoodGenerator.MOD_ID, version = GoodGenerator.VERSION, +@Mod( + modid = GoodGenerator.MOD_ID, + version = GoodGenerator.VERSION, dependencies = "required-after:IC2; " - + "required-after:gregtech; " - + "required-after:bartworks; " - + "required-after:tectech; " - + "required-after:structurelib; " - + "after:dreamcraft;") + + "required-after:gregtech; " + + "required-after:bartworks; " + + "required-after:tectech; " + + "required-after:structurelib; " + + "after:dreamcraft;") public final class GoodGenerator { public static final String MOD_ID = "GRADLETOKEN_MODID"; public static final String MOD_NAME = "GRADLETOKEN_MODNAME"; @@ -33,14 +35,18 @@ public final class GoodGenerator { public static final CreativeTabs GG = new MyTabs("Good Generator"); - @SidedProxy(clientSide = "goodgenerator.client.ClientProxy",serverSide = "goodgenerator.common.CommonProxy") + @SidedProxy(clientSide = "goodgenerator.client.ClientProxy", serverSide = "goodgenerator.common.CommonProxy") public static CommonProxy proxy; + public static SimpleNetworkWrapper CHANNEL = NetworkRegistry.INSTANCE.newSimpleChannel(MOD_ID); static { - CHANNEL.registerMessage(MessageSetNeutronSensorData.ServerHandler.class, MessageSetNeutronSensorData.class, 0, Side.SERVER); - CHANNEL.registerMessage(MessageOpenNeutronSensorGUI.ClientHandler.class, MessageOpenNeutronSensorGUI.class, 1, Side.CLIENT); - CHANNEL.registerMessage(MessageResetTileTexture.ClientHandler.class, MessageResetTileTexture.class, 2, Side.CLIENT); + CHANNEL.registerMessage( + MessageSetNeutronSensorData.ServerHandler.class, MessageSetNeutronSensorData.class, 0, Side.SERVER); + CHANNEL.registerMessage( + MessageOpenNeutronSensorGUI.ClientHandler.class, MessageOpenNeutronSensorGUI.class, 1, Side.CLIENT); + CHANNEL.registerMessage( + MessageResetTileTexture.ClientHandler.class, MessageResetTileTexture.class, 2, Side.CLIENT); } @Mod.Instance(GoodGenerator.MOD_ID) @@ -50,24 +56,27 @@ public final class GoodGenerator { public static void preInit(FMLPreInitializationEvent event) { GG_Config_Loader.run(); WerkstoffAdderRegistry.addWerkstoffAdder(new MyMaterial()); - //WerkstoffAdderRegistry.addWerkstoffAdder(new IsotopeMaterialLoader()); + // WerkstoffAdderRegistry.addWerkstoffAdder(new IsotopeMaterialLoader()); Loaders.preInitLoad(); proxy.preInit(event); } + @Mod.EventHandler public static void init(FMLInitializationEvent event) { Loaders.initLoad(); proxy.init(event); } + @Mod.EventHandler public static void postInit(FMLPostInitializationEvent event) { Loaders.postInitLoad(); crossMod(); proxy.postInit(event); } + @Mod.EventHandler public void onLoadComplete(FMLLoadCompleteEvent event) { - //NaquadahReworkRecipeLoader.SmallRecipeChange(); + // NaquadahReworkRecipeLoader.SmallRecipeChange(); NaquadahReworkRecipeLoader.Remover(); Loaders.completeLoad(); } diff --git a/src/main/java/goodgenerator/network/MessageMTEBase.java b/src/main/java/goodgenerator/network/MessageMTEBase.java index 65a86573d6..aad0128742 100644 --- a/src/main/java/goodgenerator/network/MessageMTEBase.java +++ b/src/main/java/goodgenerator/network/MessageMTEBase.java @@ -41,8 +41,7 @@ public abstract class MessageMTEBase implements IMessage { protected short y; protected int z; - public MessageMTEBase() { - } + public MessageMTEBase() {} public MessageMTEBase(IGregTechTileEntity tile) { this.w = tile.getWorld().provider.dimensionId; @@ -67,7 +66,8 @@ public abstract class MessageMTEBase implements IMessage { buf.writeInt(w); } - public static abstract class Handler<REQ extends MessageMTEBase, REPLY extends IMessage> implements IMessageHandler<REQ, REPLY> { + 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); @@ -79,17 +79,14 @@ public abstract class MessageMTEBase implements IMessage { world = DimensionManager.getWorld(message.w); } else { world = TecTech.proxy.getClientWorld(); - if (world.provider.dimensionId != message.w) - return onError(message, ctx); + if (world.provider.dimensionId != message.w) return onError(message, ctx); } - if (world == null) - return onError(message, ctx); + if (world == null) return onError(message, ctx); if (world.blockExists(message.x, message.y, message.z)) { TileEntity te = world.getTileEntity(message.x, message.y, message.z); if (te instanceof IGregTechTileEntity && !((IGregTechTileEntity) te).isInvalidTileEntity()) { IMetaTileEntity mte = ((IGregTechTileEntity) te).getMetaTileEntity(); - if (mte != null) - return onSuccess(message, ctx, mte); + if (mte != null) return onSuccess(message, ctx, mte); } } return onError(message, ctx); diff --git a/src/main/java/goodgenerator/network/MessageOpenNeutronSensorGUI.java b/src/main/java/goodgenerator/network/MessageOpenNeutronSensorGUI.java index ec0c40d4e1..634864564d 100644 --- a/src/main/java/goodgenerator/network/MessageOpenNeutronSensorGUI.java +++ b/src/main/java/goodgenerator/network/MessageOpenNeutronSensorGUI.java @@ -1,10 +1,10 @@ package goodgenerator.network; -import goodgenerator.blocks.tileEntity.GTMetaTileEntity.NeutronSensor; import com.github.technus.tectech.TecTech; import cpw.mods.fml.common.network.ByteBufUtils; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import goodgenerator.blocks.tileEntity.GTMetaTileEntity.NeutronSensor; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import io.netty.buffer.ByteBuf; @@ -12,8 +12,7 @@ import io.netty.buffer.ByteBuf; public class MessageOpenNeutronSensorGUI extends MessageMTEBase { protected String data; - public MessageOpenNeutronSensorGUI() { - } + public MessageOpenNeutronSensorGUI() {} public MessageOpenNeutronSensorGUI(IGregTechTileEntity tile, String data) { super(tile); diff --git a/src/main/java/goodgenerator/network/MessageResetTileTexture.java b/src/main/java/goodgenerator/network/MessageResetTileTexture.java index dd729af662..e078891c40 100644 --- a/src/main/java/goodgenerator/network/MessageResetTileTexture.java +++ b/src/main/java/goodgenerator/network/MessageResetTileTexture.java @@ -11,8 +11,7 @@ public class MessageResetTileTexture extends MessageMTEBase { protected int index; - public MessageResetTileTexture(){ - } + public MessageResetTileTexture() {} public MessageResetTileTexture(IGregTechTileEntity tile, int index) { super(tile); @@ -47,5 +46,4 @@ public class MessageResetTileTexture extends MessageMTEBase { return null; } } - } diff --git a/src/main/java/goodgenerator/network/MessageSetNeutronSensorData.java b/src/main/java/goodgenerator/network/MessageSetNeutronSensorData.java index e802e9477e..a3e2d30d60 100644 --- a/src/main/java/goodgenerator/network/MessageSetNeutronSensorData.java +++ b/src/main/java/goodgenerator/network/MessageSetNeutronSensorData.java @@ -1,11 +1,11 @@ package goodgenerator.network; -import goodgenerator.blocks.tileEntity.GTMetaTileEntity.NeutronSensor; import com.github.technus.tectech.TecTech; import cpw.mods.fml.common.network.ByteBufUtils; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import cpw.mods.fml.relauncher.Side; +import goodgenerator.blocks.tileEntity.GTMetaTileEntity.NeutronSensor; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import io.netty.buffer.ByteBuf; @@ -13,8 +13,7 @@ import io.netty.buffer.ByteBuf; public class MessageSetNeutronSensorData extends MessageMTEBase { protected String data; - public MessageSetNeutronSensorData() { - } + public MessageSetNeutronSensorData() {} public MessageSetNeutronSensorData(IGregTechTileEntity tile, String data) { super(tile); @@ -43,8 +42,7 @@ public class MessageSetNeutronSensorData extends MessageMTEBase { protected IMessage onSuccess(MessageSetNeutronSensorData message, MessageContext ctx, IMetaTileEntity mte) { if (mte instanceof NeutronSensor) { ((NeutronSensor) mte).setText(message.data); - if (ctx.side == Side.CLIENT) - mte.getBaseMetaTileEntity().openGUI(TecTech.proxy.getPlayer()); + if (ctx.side == Side.CLIENT) mte.getBaseMetaTileEntity().openGUI(TecTech.proxy.getPlayer()); } return null; } diff --git a/src/main/java/goodgenerator/tabs/MyTabs.java b/src/main/java/goodgenerator/tabs/MyTabs.java index 52320703d5..1084f11a85 100644 --- a/src/main/java/goodgenerator/tabs/MyTabs.java +++ b/src/main/java/goodgenerator/tabs/MyTabs.java @@ -5,7 +5,7 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; public class MyTabs extends CreativeTabs { - public MyTabs(String name){ + 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 6c5a9c2175..2677e3fa69 100644 --- a/src/main/java/goodgenerator/util/CharExchanger.java +++ b/src/main/java/goodgenerator/util/CharExchanger.java @@ -5,21 +5,21 @@ 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, + 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; + public static char shifter(int unicode) { + return (char) unicode; } public static boolean isValidCompareExpressChar(char c) { @@ -28,8 +28,7 @@ public class CharExchanger { public static boolean isValidCompareExpress(String exp) { if (exp.length() < 2) return false; - for (char c: exp.toCharArray()) - if (!isValidCompareExpressChar(c)) return false; + for (char c : exp.toCharArray()) if (!isValidCompareExpressChar(c)) return false; char c1 = exp.charAt(0), c2 = exp.charAt(1); String subExp = "" + c1; if (!Character.isDigit(c2)) subExp = subExp + c2; @@ -41,10 +40,11 @@ public class CharExchanger { case "==": case "!=": break; - default: return false; + default: + return false; } if (exp.length() == subExp.length()) return false; - for (int i = subExp.length(); i < exp.length(); i ++) { + for (int i = subExp.length(); i < exp.length(); i++) { if (!Character.isDigit(exp.charAt(i))) return false; } return true; @@ -59,17 +59,26 @@ public class CharExchanger { * "<=" : 12 <BR> * INVALID : -1 */ - public static int getOperator(String exp){ + public static int getOperator(String exp) { char c1, c2; int ret; if (exp.length() < 1) return -1; c1 = exp.charAt(0); switch (c1) { - case '>': ret = 1;break; - case '<': ret = 2;break; - case '=': ret = 3;break; - case '!': ret = 4;break; - default: return -1; + case '>': + ret = 1; + break; + case '<': + ret = 2; + break; + case '=': + ret = 3; + break; + case '!': + ret = 4; + break; + default: + return -1; } if (exp.length() > 1) c2 = exp.charAt(1); else return ret; @@ -82,22 +91,29 @@ 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, ""); + for (String re : opChar) NumExp = NumExp.replace(re, ""); long num2 = 0; - for (char c: NumExp.toCharArray()) { - num2 *=10; + for (char c : NumExp.toCharArray()) { + num2 *= 10; num2 += c - '0'; } switch (op) { - case 1: return num > num2; - case 2: return num < num2; - case 13: return num == num2; - case 14: return num != num2; - case 11: return num >= num2; - case 12: return num <= num2; - default: return false; + case 1: + return num > num2; + case 2: + return num < num2; + case 13: + return num == num2; + case 14: + return num != num2; + case 11: + return num >= num2; + case 12: + return num <= num2; + default: + return false; } } @@ -107,13 +123,13 @@ public class CharExchanger { if (Character.isDigit(exp.charAt(i))) { int cnt = 0, prt = i; while (i < exp.length() && Character.isDigit(exp.charAt(i))) { - i ++; - cnt ++; + i++; + cnt++; } while (prt < exp.length() && Character.isDigit(exp.charAt(prt))) { sb.append(exp.charAt(prt)); - prt ++; - cnt --; + prt++; + cnt--; if (cnt % 3 == 0 && cnt != 0) sb.append(","); } } @@ -125,7 +141,7 @@ public class CharExchanger { public static String[] genString(String content, int len) { String[] ret = new String[len]; while (len > 0) { - len --; + len--; ret[len] = content; } return ret; diff --git a/src/main/java/goodgenerator/util/CrackRecipeAdder.java b/src/main/java/goodgenerator/util/CrackRecipeAdder.java index ea4158eb4d..3c53063301 100644 --- a/src/main/java/goodgenerator/util/CrackRecipeAdder.java +++ b/src/main/java/goodgenerator/util/CrackRecipeAdder.java @@ -15,52 +15,94 @@ 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]; - name = inputFluid.getFluid().getName().replaceAll(" ",""); + name = inputFluid.getFluid().getName().replaceAll(" ", ""); - GT_Values.RA.addCrackingRecipe(1,inputFluid,cracker, FluidRegistry.getFluidStack("lightlycracked"+name,1000),(int)(Duration * 0.8),EUt); - GT_Values.RA.addCrackingRecipe(2,inputFluid,cracker, FluidRegistry.getFluidStack("moderatelycracked"+name,1000),Duration,EUt); - GT_Values.RA.addCrackingRecipe(3,inputFluid,cracker, FluidRegistry.getFluidStack("heavilycracked"+name,1000),(int)(Duration * 1.2),EUt); + GT_Values.RA.addCrackingRecipe( + 1, + inputFluid, + cracker, + FluidRegistry.getFluidStack("lightlycracked" + name, 1000), + (int) (Duration * 0.8), + EUt); + GT_Values.RA.addCrackingRecipe( + 2, inputFluid, cracker, FluidRegistry.getFluidStack("moderatelycracked" + name, 1000), Duration, EUt); + GT_Values.RA.addCrackingRecipe( + 3, + inputFluid, + cracker, + FluidRegistry.getFluidStack("heavilycracked" + name, 1000), + (int) (Duration * 1.2), + EUt); - for ( int i = num - 1, j = 0; i >= 0; i --, j ++ ){ + for (int i = num - 1, j = 0; i >= 0; i--, j++) { Fluid tmp1 = outputFluids[i].getFluid(); - int tmp2 = (int)(outputFluids[i].amount * coe1[i]); + int tmp2 = (int) (outputFluids[i].amount * coe1[i]); actOutput[j] = new FluidStack(tmp1, tmp2); } - GT_Values.RA.addUniversalDistillationRecipe(FluidRegistry.getFluidStack("lightlycracked"+name,1000),actOutput,outputItem,Duration / 2,EUt / 3); + GT_Values.RA.addUniversalDistillationRecipe( + FluidRegistry.getFluidStack("lightlycracked" + name, 1000), + actOutput, + outputItem, + Duration / 2, + EUt / 3); - for ( int i = num - 1, j = 0; i >= 0; i --, j ++ ){ + for (int i = num - 1, j = 0; i >= 0; i--, j++) { Fluid tmp1 = outputFluids[i].getFluid(); - int tmp2 = (int)(outputFluids[i].amount * coe2[i]); + int tmp2 = (int) (outputFluids[i].amount * coe2[i]); actOutput[j] = new FluidStack(tmp1, tmp2); } - GT_Values.RA.addUniversalDistillationRecipe(FluidRegistry.getFluidStack("moderatelycracked"+name,1000),actOutput,outputItem,Duration / 2,EUt / 3); + GT_Values.RA.addUniversalDistillationRecipe( + FluidRegistry.getFluidStack("moderatelycracked" + name, 1000), + actOutput, + outputItem, + Duration / 2, + EUt / 3); - for ( int i = num - 1, j = 0; i >= 0; i --, j ++ ){ + for (int i = num - 1, j = 0; i >= 0; i--, j++) { Fluid tmp1 = outputFluids[i].getFluid(); - int tmp2 = (int)(outputFluids[i].amount * coe3[i]); + int tmp2 = (int) (outputFluids[i].amount * coe3[i]); actOutput[j] = new FluidStack(tmp1, tmp2); } - GT_Values.RA.addUniversalDistillationRecipe(FluidRegistry.getFluidStack("heavilycracked"+name,1000),actOutput,outputItem,Duration / 2,EUt / 3); + GT_Values.RA.addUniversalDistillationRecipe( + FluidRegistry.getFluidStack("heavilycracked" + name, 1000), + actOutput, + outputItem, + Duration / 2, + EUt / 3); } - 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); - GT_Values.RA.addCircuitAssemblerRecipe(inputs, Materials.Tin.getMolten(solders * 2), output, duration, EUt, isClean); - GT_Values.RA.addCircuitAssemblerRecipe(inputs, Materials.Lead.getMolten(solders * 4), output, duration, EUt, 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); + GT_Values.RA.addCircuitAssemblerRecipe( + inputs, Materials.Tin.getMolten(solders * 2), output, duration, EUt, isClean); + GT_Values.RA.addCircuitAssemblerRecipe( + 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) { - GT_Values.RA.addAssemblerRecipe(inputs, Materials.SolderingAlloy.getMolten(solders), output, duration, EUt, 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); 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); } @@ -69,9 +111,19 @@ public class CrackRecipeAdder { ItemStack input = material.get(OrePrefixes.dust, 1); ItemStack output = level > 1750 ? material.get(OrePrefixes.ingotHot, 1) : material.get(OrePrefixes.ingot, 1); if (gas) { - GT_Values.RA.addBlastRecipe(input, GT_Utility.getIntegratedCircuit(11), Materials.Helium.getGas(1000), null, output, null, duration, EUt, level); + GT_Values.RA.addBlastRecipe( + input, + GT_Utility.getIntegratedCircuit(11), + Materials.Helium.getGas(1000), + null, + output, + null, + duration, + EUt, + level); } else { - GT_Values.RA.addBlastRecipe(input, GT_Utility.getIntegratedCircuit(1), null, null, output, null, duration, EUt, level); + GT_Values.RA.addBlastRecipe( + input, GT_Utility.getIntegratedCircuit(1), null, null, output, null, duration, EUt, level); } } @@ -83,21 +135,126 @@ public class CrackRecipeAdder { public static void registerPipe(int ID, Werkstoff material, int flow, int temp, boolean gas) { String unName = material.getDefaultName().replace(" ", "_"); String Name = material.getDefaultName(); - 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)); - 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)); - 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)); - 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)); - 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)); - GT_Values.RA.addExtruderRecipe(material.get(OrePrefixes.ingot, 1), ItemList.Shape_Extruder_Pipe_Tiny.get(0), material.get(OrePrefixes.pipeTiny, 2), (int) material.getStats().getMass(), 120); - GT_Values.RA.addExtruderRecipe(material.get(OrePrefixes.ingot, 1), ItemList.Shape_Extruder_Pipe_Small.get(0), material.get(OrePrefixes.pipeSmall, 1), (int) material.getStats().getMass() * 2, 120); - GT_Values.RA.addExtruderRecipe(material.get(OrePrefixes.ingot, 3), ItemList.Shape_Extruder_Pipe_Medium.get(0), material.get(OrePrefixes.pipeMedium, 1), (int) material.getStats().getMass() * 6, 120); - GT_Values.RA.addExtruderRecipe(material.get(OrePrefixes.ingot, 6), ItemList.Shape_Extruder_Pipe_Large.get(0), material.get(OrePrefixes.pipeLarge, 1), (int) material.getStats().getMass() * 12, 120); - GT_Values.RA.addExtruderRecipe(material.get(OrePrefixes.ingot, 12), ItemList.Shape_Extruder_Pipe_Huge.get(0), material.get(OrePrefixes.pipeHuge, 1), (int) material.getStats().getMass() * 24, 120); - GT_Values.RA.addFluidSolidifierRecipe(ItemList.Shape_Mold_Pipe_Tiny.get(0), material.getMolten(72), material.get(OrePrefixes.pipeTiny, 1), (int) material.getStats().getMass(), 30); - GT_Values.RA.addFluidSolidifierRecipe(ItemList.Shape_Mold_Pipe_Small.get(0), material.getMolten(144), material.get(OrePrefixes.pipeSmall, 1), (int) material.getStats().getMass() * 2, 30); - GT_Values.RA.addFluidSolidifierRecipe(ItemList.Shape_Mold_Pipe_Medium.get(0), material.getMolten(432), material.get(OrePrefixes.pipeMedium, 1), (int) material.getStats().getMass() * 6, 30); - GT_Values.RA.addFluidSolidifierRecipe(ItemList.Shape_Mold_Pipe_Large.get(0), material.getMolten(864), material.get(OrePrefixes.pipeLarge, 1), (int) material.getStats().getMass() * 12, 30); - GT_Values.RA.addFluidSolidifierRecipe(ItemList.Shape_Mold_Pipe_Huge.get(0), material.getMolten(1728), material.get(OrePrefixes.pipeHuge, 1), (int) material.getStats().getMass() * 24, 30); + 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)); + 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)); + 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)); + 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)); + 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)); + GT_Values.RA.addExtruderRecipe( + material.get(OrePrefixes.ingot, 1), + ItemList.Shape_Extruder_Pipe_Tiny.get(0), + material.get(OrePrefixes.pipeTiny, 2), + (int) material.getStats().getMass(), + 120); + GT_Values.RA.addExtruderRecipe( + material.get(OrePrefixes.ingot, 1), + ItemList.Shape_Extruder_Pipe_Small.get(0), + material.get(OrePrefixes.pipeSmall, 1), + (int) material.getStats().getMass() * 2, + 120); + GT_Values.RA.addExtruderRecipe( + material.get(OrePrefixes.ingot, 3), + ItemList.Shape_Extruder_Pipe_Medium.get(0), + material.get(OrePrefixes.pipeMedium, 1), + (int) material.getStats().getMass() * 6, + 120); + GT_Values.RA.addExtruderRecipe( + material.get(OrePrefixes.ingot, 6), + ItemList.Shape_Extruder_Pipe_Large.get(0), + material.get(OrePrefixes.pipeLarge, 1), + (int) material.getStats().getMass() * 12, + 120); + GT_Values.RA.addExtruderRecipe( + material.get(OrePrefixes.ingot, 12), + ItemList.Shape_Extruder_Pipe_Huge.get(0), + material.get(OrePrefixes.pipeHuge, 1), + (int) material.getStats().getMass() * 24, + 120); + GT_Values.RA.addFluidSolidifierRecipe( + ItemList.Shape_Mold_Pipe_Tiny.get(0), + material.getMolten(72), + material.get(OrePrefixes.pipeTiny, 1), + (int) material.getStats().getMass(), + 30); + GT_Values.RA.addFluidSolidifierRecipe( + ItemList.Shape_Mold_Pipe_Small.get(0), + material.getMolten(144), + material.get(OrePrefixes.pipeSmall, 1), + (int) material.getStats().getMass() * 2, + 30); + GT_Values.RA.addFluidSolidifierRecipe( + ItemList.Shape_Mold_Pipe_Medium.get(0), + material.getMolten(432), + material.get(OrePrefixes.pipeMedium, 1), + (int) material.getStats().getMass() * 6, + 30); + GT_Values.RA.addFluidSolidifierRecipe( + ItemList.Shape_Mold_Pipe_Large.get(0), + material.getMolten(864), + material.get(OrePrefixes.pipeLarge, 1), + (int) material.getStats().getMass() * 12, + 30); + GT_Values.RA.addFluidSolidifierRecipe( + ItemList.Shape_Mold_Pipe_Huge.get(0), + material.getMolten(1728), + material.get(OrePrefixes.pipeHuge, 1), + (int) material.getStats().getMass() * 24, + 30); } public static void registerWire(int ID, Werkstoff material, int aAmperage, int aVoltage, int aLoss, boolean cover) { @@ -108,23 +265,208 @@ public class CrackRecipeAdder { String aTextWire2 = " Wire"; String aTextCable2 = " Cable"; int aLossInsulated = aLoss / 4; - GT_OreDictUnificator.registerOre(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)); - 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)); - 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)); - 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)); - 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)); - 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)); + GT_OreDictUnificator.registerOre( + 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)); + 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)); + 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)); + 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)); + 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)); + 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)); 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)); - 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)); - 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)); - 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)); - 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)); - 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)); + 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)); + 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)); + 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)); + 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)); + 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)); + 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)); } - GT_Values.RA.addWiremillRecipe(material.get(OrePrefixes.ingot, 1), material.get(OrePrefixes.wireGt01, 2), (int) material.getStats().getMass() * 4, 90); - GT_Values.RA.addWiremillRecipe(material.get(OrePrefixes.stick, 1), material.get(OrePrefixes.wireGt01, 1), (int) material.getStats().getMass(), 90); - GT_Values.RA.addWiremillRecipe(material.get(OrePrefixes.wireGt01, 1), material.get(OrePrefixes.wireFine, 4), (int) material.getStats().getMass() * 4, 7); - GT_Values.RA.addExtruderRecipe(material.get(OrePrefixes.ingot, 1), ItemList.Shape_Extruder_Wire.get(0), material.get(OrePrefixes.wireGt01, 2), (int) material.getStats().getMass() * 8, 480); + GT_Values.RA.addWiremillRecipe( + material.get(OrePrefixes.ingot, 1), + material.get(OrePrefixes.wireGt01, 2), + (int) material.getStats().getMass() * 4, + 90); + GT_Values.RA.addWiremillRecipe( + material.get(OrePrefixes.stick, 1), + material.get(OrePrefixes.wireGt01, 1), + (int) material.getStats().getMass(), + 90); + GT_Values.RA.addWiremillRecipe( + material.get(OrePrefixes.wireGt01, 1), + material.get(OrePrefixes.wireFine, 4), + (int) material.getStats().getMass() * 4, + 7); + GT_Values.RA.addExtruderRecipe( + material.get(OrePrefixes.ingot, 1), + ItemList.Shape_Extruder_Wire.get(0), + material.get(OrePrefixes.wireGt01, 2), + (int) material.getStats().getMass() * 8, + 480); } } diff --git a/src/main/java/goodgenerator/util/DescTextLocalization.java b/src/main/java/goodgenerator/util/DescTextLocalization.java index 755397a864..b65f529475 100644 --- a/src/main/java/goodgenerator/util/DescTextLocalization.java +++ b/src/main/java/goodgenerator/util/DescTextLocalization.java @@ -5,11 +5,13 @@ 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){ + public static String[] addText(String preFix, int length) { String[] text = new String[length]; - for (int i = 0; i < length; i ++) { + for (int i = 0; i < length; i++) { text[i] = StatCollector.translateToLocal(preFix + "." + i); } return text; diff --git a/src/main/java/goodgenerator/util/ItemRefer.java b/src/main/java/goodgenerator/util/ItemRefer.java index 205296d166..86d3e02fdf 100644 --- a/src/main/java/goodgenerator/util/ItemRefer.java +++ b/src/main/java/goodgenerator/util/ItemRefer.java @@ -1,14 +1,14 @@ 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 static goodgenerator.loader.FuelRodLoader.*; -import static goodgenerator.loader.Loaders.*; - public final class ItemRefer { public static ItemRefer NULL = getItemStack(_null_); diff --git a/src/main/java/goodgenerator/util/MaterialFix.java b/src/main/java/goodgenerator/util/MaterialFix.java index c402e96ab3..e6c50f6ec1 100644 --- a/src/main/java/goodgenerator/util/MaterialFix.java +++ b/src/main/java/goodgenerator/util/MaterialFix.java @@ -10,95 +10,218 @@ import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; public class MaterialFix { - public static void MaterialFluidExtractionFix(Werkstoff material){ + 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); 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); if (material.hasItemType(OrePrefixes.gearGtSmall)) - GT_Values.RA.addFluidExtractionRecipe(material.get(OrePrefixes.gearGtSmall),null,material.getMolten(144),0,32,8); + 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); + 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); + 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); + 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); + 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); + 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); + 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); + 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); + 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); + 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); + 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); + 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); + 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); + 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); + 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); + 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); + GT_Values.RA.addFluidExtractionRecipe( + material.get(OrePrefixes.gearGt), null, material.getMolten(576), 0, 128, 8); } public static void addRecipeForMultiItems() { for (Werkstoff tMaterial : Werkstoff.werkstoffHashSet) { if (tMaterial == null) continue; if (tMaterial.hasItemType(OrePrefixes.plateDouble) && tMaterial.hasItemType(OrePrefixes.ingotDouble)) { - GT_Values.RA.addBenderRecipe(tMaterial.get(OrePrefixes.plate, 2), GT_Utility.getIntegratedCircuit(2), tMaterial.get(OrePrefixes.plateDouble, 1), (int) Math.max(tMaterial.getStats().getMass() * 2, 1L), 60); - GT_Values.RA.addBenderRecipe(tMaterial.get(OrePrefixes.ingotDouble, 1), GT_Utility.getIntegratedCircuit(1), tMaterial.get(OrePrefixes.plateDouble, 1), (int) Math.max(tMaterial.getStats().getMass(), 1L), 60); - GT_ModHandler.addCraftingRecipe(tMaterial.get(OrePrefixes.plateDouble, 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)}); + GT_Values.RA.addBenderRecipe( + tMaterial.get(OrePrefixes.plate, 2), + GT_Utility.getIntegratedCircuit(2), + tMaterial.get(OrePrefixes.plateDouble, 1), + (int) Math.max(tMaterial.getStats().getMass() * 2, 1L), + 60); + GT_Values.RA.addBenderRecipe( + tMaterial.get(OrePrefixes.ingotDouble, 1), + GT_Utility.getIntegratedCircuit(1), + tMaterial.get(OrePrefixes.plateDouble, 1), + (int) Math.max(tMaterial.getStats().getMass(), 1L), + 60); + GT_ModHandler.addCraftingRecipe( + tMaterial.get(OrePrefixes.plateDouble, 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)}); } if (tMaterial.hasItemType(OrePrefixes.plateTriple) && tMaterial.hasItemType(OrePrefixes.ingotTriple)) { - GT_Values.RA.addBenderRecipe(tMaterial.get(OrePrefixes.plate, 3), GT_Utility.getIntegratedCircuit(3), tMaterial.get(OrePrefixes.plateTriple, 1), (int) Math.max(tMaterial.getStats().getMass() * 3, 1L), 60); - GT_Values.RA.addBenderRecipe(tMaterial.get(OrePrefixes.ingot, 3), GT_Utility.getIntegratedCircuit(3), tMaterial.get(OrePrefixes.plateTriple, 1), (int) Math.max(tMaterial.getStats().getMass() * 3, 1L), 60); - GT_Values.RA.addBenderRecipe(tMaterial.get(OrePrefixes.ingotTriple, 1), GT_Utility.getIntegratedCircuit(1), 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_Values.RA.addBenderRecipe( + tMaterial.get(OrePrefixes.plate, 3), + GT_Utility.getIntegratedCircuit(3), + tMaterial.get(OrePrefixes.plateTriple, 1), + (int) Math.max(tMaterial.getStats().getMass() * 3, 1L), + 60); + GT_Values.RA.addBenderRecipe( + tMaterial.get(OrePrefixes.ingot, 3), + GT_Utility.getIntegratedCircuit(3), + tMaterial.get(OrePrefixes.plateTriple, 1), + (int) Math.max(tMaterial.getStats().getMass() * 3, 1L), + 60); + GT_Values.RA.addBenderRecipe( + tMaterial.get(OrePrefixes.ingotTriple, 1), + GT_Utility.getIntegratedCircuit(1), + 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) + }); } if (tMaterial.hasItemType(OrePrefixes.plateDense)) { - GT_Values.RA.addBenderRecipe(tMaterial.get(OrePrefixes.plate, 9), GT_Utility.getIntegratedCircuit(9), tMaterial.get(OrePrefixes.plateDense, 1), (int) Math.max(tMaterial.getStats().getMass() * 9, 1L), 60); - GT_Values.RA.addBenderRecipe(tMaterial.get(OrePrefixes.ingot, 9), GT_Utility.getIntegratedCircuit(9), tMaterial.get(OrePrefixes.plateDense, 1), (int) Math.max(tMaterial.getStats().getMass() * 9, 1L), 60); + GT_Values.RA.addBenderRecipe( + tMaterial.get(OrePrefixes.plate, 9), + GT_Utility.getIntegratedCircuit(9), + tMaterial.get(OrePrefixes.plateDense, 1), + (int) Math.max(tMaterial.getStats().getMass() * 9, 1L), + 60); + GT_Values.RA.addBenderRecipe( + tMaterial.get(OrePrefixes.ingot, 9), + GT_Utility.getIntegratedCircuit(9), + tMaterial.get(OrePrefixes.plateDense, 1), + (int) Math.max(tMaterial.getStats().getMass() * 9, 1L), + 60); if (tMaterial.hasItemType(OrePrefixes.plateTriple) && tMaterial.hasItemType(OrePrefixes.ingotTriple)) { - GT_Values.RA.addBenderRecipe(tMaterial.get(OrePrefixes.plateTriple, 3), GT_Utility.getIntegratedCircuit(3), tMaterial.get(OrePrefixes.plateDense, 1), (int) Math.max(tMaterial.getStats().getMass() * 3, 1L), 60); - GT_Values.RA.addBenderRecipe(tMaterial.get(OrePrefixes.ingotTriple, 3), GT_Utility.getIntegratedCircuit(3), tMaterial.get(OrePrefixes.plateDense, 1), (int) Math.max(tMaterial.getStats().getMass() * 3, 1L), 60); + GT_Values.RA.addBenderRecipe( + tMaterial.get(OrePrefixes.plateTriple, 3), + GT_Utility.getIntegratedCircuit(3), + tMaterial.get(OrePrefixes.plateDense, 1), + (int) Math.max(tMaterial.getStats().getMass() * 3, 1L), + 60); + GT_Values.RA.addBenderRecipe( + tMaterial.get(OrePrefixes.ingotTriple, 3), + GT_Utility.getIntegratedCircuit(3), + tMaterial.get(OrePrefixes.plateDense, 1), + (int) Math.max(tMaterial.getStats().getMass() * 3, 1L), + 60); } } if (tMaterial.hasItemType(OrePrefixes.stick)) { if (tMaterial.hasItemType(OrePrefixes.cellMolten)) { - GT_Values.RA.addFluidSolidifierRecipe(ItemList.Shape_Mold_Rod.get(0), tMaterial.getMolten(72), tMaterial.get(OrePrefixes.stick, 1), (int) Math.max(tMaterial.getStats().getMass() >> 1, 1L), 480); + GT_Values.RA.addFluidSolidifierRecipe( + ItemList.Shape_Mold_Rod.get(0), + tMaterial.getMolten(72), + tMaterial.get(OrePrefixes.stick, 1), + (int) Math.max(tMaterial.getStats().getMass() >> 1, 1L), + 480); } } if (tMaterial.hasItemType(OrePrefixes.stickLong)) { if (tMaterial.hasItemType(OrePrefixes.cellMolten)) { - GT_Values.RA.addFluidSolidifierRecipe(ItemList.Shape_Mold_Rod_Long.get(0), tMaterial.getMolten(144), tMaterial.get(OrePrefixes.stickLong, 1), (int) Math.max(tMaterial.getStats().getMass(), 1L), 480); + GT_Values.RA.addFluidSolidifierRecipe( + ItemList.Shape_Mold_Rod_Long.get(0), + tMaterial.getMolten(144), + tMaterial.get(OrePrefixes.stickLong, 1), + (int) Math.max(tMaterial.getStats().getMass(), 1L), + 480); } if (tMaterial.hasItemType(OrePrefixes.stick)) { - GT_ModHandler.addCraftingRecipe(tMaterial.get(OrePrefixes.stickLong, 1), new Object[] {"PhP",'P',tMaterial.get(OrePrefixes.stick, 1)}); - GT_Values.RA.addForgeHammerRecipe(tMaterial.get(OrePrefixes.stick, 2), tMaterial.get(OrePrefixes.stickLong, 1), (int) Math.max(tMaterial.getStats().getMass(), 1L), 16); + GT_ModHandler.addCraftingRecipe( + tMaterial.get(OrePrefixes.stickLong, 1), + new Object[] {"PhP", 'P', tMaterial.get(OrePrefixes.stick, 1)}); + GT_Values.RA.addForgeHammerRecipe( + tMaterial.get(OrePrefixes.stick, 2), + tMaterial.get(OrePrefixes.stickLong, 1), + (int) Math.max(tMaterial.getStats().getMass(), 1L), + 16); } } if (tMaterial.hasItemType(OrePrefixes.spring)) { - GT_ModHandler.addCraftingRecipe(tMaterial.get(OrePrefixes.spring, 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), tMaterial.get(OrePrefixes.spring, 1), (int) Math.max(tMaterial.getStats().getMass() * 2, 1L), 16); + GT_ModHandler.addCraftingRecipe( + tMaterial.get(OrePrefixes.spring, 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), + tMaterial.get(OrePrefixes.spring, 1), + (int) Math.max(tMaterial.getStats().getMass() * 2, 1L), + 16); } if (tMaterial.hasItemType(OrePrefixes.springSmall)) { - GT_ModHandler.addCraftingRecipe(tMaterial.get(OrePrefixes.springSmall, 1), new Object[] {" s ","fPx",'P',tMaterial.get(OrePrefixes.stick, 1)}); - GT_Values.RA.addBenderRecipe(tMaterial.get(OrePrefixes.stick, 1), GT_Utility.getIntegratedCircuit(1), tMaterial.get(OrePrefixes.springSmall, 2), (int) Math.max(tMaterial.getStats().getMass(), 1L), 16); + GT_ModHandler.addCraftingRecipe( + tMaterial.get(OrePrefixes.springSmall, 1), + new Object[] {" s ", "fPx", 'P', tMaterial.get(OrePrefixes.stick, 1)}); + GT_Values.RA.addBenderRecipe( + tMaterial.get(OrePrefixes.stick, 1), + GT_Utility.getIntegratedCircuit(1), + tMaterial.get(OrePrefixes.springSmall, 2), + (int) Math.max(tMaterial.getStats().getMass(), 1L), + 16); } } Materials tUHV = Materials.Longasssuperconductornameforuhvwire; - GT_Values.RA.addForgeHammerRecipe(GT_OreDictUnificator.get(OrePrefixes.stick, tUHV, 2), GT_OreDictUnificator.get(OrePrefixes.stickLong, tUHV, 1), (int) Math.max(tUHV.getMass(), 1L), 16); + GT_Values.RA.addForgeHammerRecipe( + GT_OreDictUnificator.get(OrePrefixes.stick, tUHV, 2), + GT_OreDictUnificator.get(OrePrefixes.stickLong, tUHV, 1), + (int) Math.max(tUHV.getMass(), 1L), + 16); } } diff --git a/src/main/java/goodgenerator/util/MyRecipeAdder.java b/src/main/java/goodgenerator/util/MyRecipeAdder.java index c8a2a198a7..3e2c5371a3 100644 --- a/src/main/java/goodgenerator/util/MyRecipeAdder.java +++ b/src/main/java/goodgenerator/util/MyRecipeAdder.java @@ -3,15 +3,14 @@ package goodgenerator.util; import codechicken.nei.PositionedStack; import gregtech.api.util.GT_Recipe; import gregtech.api.util.GT_Utility; -import net.minecraft.item.ItemStack; -import net.minecraft.util.StatCollector; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidStack; - import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; import java.util.HashSet; +import net.minecraft.item.ItemStack; +import net.minecraft.util.StatCollector; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidStack; public class MyRecipeAdder { @@ -23,13 +22,16 @@ public class MyRecipeAdder { StatCollector.translateToLocal("tile.recipe.naquadah_reactor"), null, "goodgenerator:textures/gui/naquadah_reactor", - 0,0,0,1,1, + 0, + 0, + 0, + 1, + 1, StatCollector.translateToLocal("value.naquadah_reactor") + " ", 1, " EU/t", false, - true - ); + true); public final NaqFuelRefineMapper FRF = new NaqFuelRefineMapper( new HashSet<>(50), @@ -37,13 +39,16 @@ public class MyRecipeAdder { StatCollector.translateToLocal("tile.naquadah_fuel_refine_factory"), null, "gregtech:textures/gui/basicmachines/FusionReactor", - 6,0, 0, 1, 1, + 6, + 0, + 0, + 1, + 1, StatCollector.translateToLocal("value.naquadah_fuel_refine_factory.0") + " ", 1, StatCollector.translateToLocal("value.naquadah_fuel_refine_factory.1"), true, - true - ); + true); public final NeutronActivatorMapper NA = new NeutronActivatorMapper( new HashSet<>(150), @@ -51,11 +56,16 @@ public class MyRecipeAdder { StatCollector.translateToLocal("tile.neutron_activator"), null, "goodgenerator:textures/gui/neutron_activator", - 6, 6, 0, 0, 0, - null, 0, null, + 9, + 9, + 0, + 0, + 0, + null, + 0, + null, false, - false - ); + false); public final ExtremeHeatExchangerMapper XHE = new ExtremeHeatExchangerMapper( new HashSet<>(50), @@ -63,11 +73,16 @@ public class MyRecipeAdder { StatCollector.translateToLocal("tile.extreme_heat_exchanger"), null, "goodgenerator:textures/gui/extreme_heat_exchanger", - 0, 0, 0, 0, 0, - null, 0, null, + 0, + 0, + 0, + 0, + 0, + null, + 0, + null, false, - false - ); + false); public final PreciseAssemblerMapper PA = new PreciseAssemblerMapper( new HashSet<>(120), @@ -75,53 +90,161 @@ public class MyRecipeAdder { StatCollector.translateToLocal("tile.precise_assembler"), null, "goodgenerator:textures/gui/precise_assembler", - 4, 1, 1, 0, 1, + 4, + 1, + 1, + 0, + 1, StatCollector.translateToLocal("value.precise_assembler.0"), 1, StatCollector.translateToLocal("value.precise_assembler.1"), true, - false - ); - - 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, boolean aNEIAllowed){ - super(aRecipeList, aUnlocalizedName, aLocalName, aNEIName, aNEIGUIPath, aUsualInputCount, aUsualOutputCount, aMinimalInputItems, aMinimalInputFluids, aAmperage, aNEISpecialValuePre, aNEISpecialValueMultiplier, aNEISpecialValuePost, aShowVoltageAmperageInNEI, aNEIAllowed); + false); + + 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, + boolean aNEIAllowed) { + super( + aRecipeList, + aUnlocalizedName, + aLocalName, + aNEIName, + aNEIGUIPath, + aUsualInputCount, + aUsualOutputCount, + aMinimalInputItems, + aMinimalInputFluids, + aAmperage, + aNEISpecialValuePre, + aNEISpecialValueMultiplier, + aNEISpecialValuePost, + aShowVoltageAmperageInNEI, + aNEIAllowed); } - 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); + 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); } } - public void addLiquidMentalFuel(FluidStack input, FluidStack output, int EUt, int ticks){ + public void addLiquidMentalFuel(FluidStack input, FluidStack output, int EUt, int ticks) { NqGFuels.addFuel(input, output, EUt, ticks); } - 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, boolean aNEIAllowed){ - super(aRecipeList, aUnlocalizedName, aLocalName, aNEIName, aNEIGUIPath, aUsualInputCount, aUsualOutputCount, aMinimalInputItems, aMinimalInputFluids, aAmperage, aNEISpecialValuePre, aNEISpecialValueMultiplier, aNEISpecialValuePost, aShowVoltageAmperageInNEI, aNEIAllowed); + 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, + boolean aNEIAllowed) { + super( + aRecipeList, + aUnlocalizedName, + aLocalName, + aNEIName, + aNEIGUIPath, + aUsualInputCount, + aUsualOutputCount, + aMinimalInputItems, + aMinimalInputFluids, + aAmperage, + aNEISpecialValuePre, + aNEISpecialValueMultiplier, + aNEISpecialValuePost, + aShowVoltageAmperageInNEI, + aNEIAllowed); } - 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, boolean aNEIAllowed){ - super(aRecipeList, aUnlocalizedName, aLocalName, aNEIName, aNEIGUIPath, aUsualInputCount, aUsualOutputCount, aMinimalInputItems, aMinimalInputFluids, aAmperage, aNEISpecialValuePre, aNEISpecialValueMultiplier, aNEISpecialValuePost, aShowVoltageAmperageInNEI, aNEIAllowed); + 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, + boolean aNEIAllowed) { + super( + aRecipeList, + aUnlocalizedName, + aLocalName, + aNEIName, + aNEIGUIPath, + aUsualInputCount, + aUsualOutputCount, + aMinimalInputItems, + aMinimalInputFluids, + aAmperage, + aNEISpecialValuePre, + aNEISpecialValueMultiplier, + aNEISpecialValuePost, + aShowVoltageAmperageInNEI, + aNEIAllowed); } - 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); } } - 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; @@ -132,13 +255,54 @@ 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, boolean aNEIAllowed){ - super(aRecipeList, aUnlocalizedName, aLocalName, aNEIName, aNEIGUIPath, aUsualInputCount, aUsualOutputCount, aMinimalInputItems, aMinimalInputFluids, aAmperage, aNEISpecialValuePre, aNEISpecialValueMultiplier, aNEISpecialValuePost, aShowVoltageAmperageInNEI, aNEIAllowed); + 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, + aUnlocalizedName, + aLocalName, + aNEIName, + aNEIGUIPath, + aUsualInputCount, + aUsualOutputCount, + aMinimalInputItems, + aMinimalInputFluids, + aAmperage, + aNEISpecialValuePre, + aNEISpecialValueMultiplier, + aNEISpecialValuePost, + aShowVoltageAmperageInNEI, + aNEIAllowed); } @Override - 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); + 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); mXHeatExchangerFuelMap.put(aFluidInputs[0].getFluid(), tRecipe); return addRecipe(tRecipe); } @@ -154,8 +318,10 @@ public class MyRecipeAdder { public ArrayList<PositionedStack> getInputPositionedStacks() { ArrayList<PositionedStack> inputStacks = new ArrayList<>(); if (this.mFluidInputs != null && this.mFluidInputs.length == 2) { - inputStacks.add(new PositionedStack(GT_Utility.getFluidDisplayStack(this.mFluidInputs[0], true), 22, 3)); - inputStacks.add(new PositionedStack(GT_Utility.getFluidDisplayStack(this.mFluidInputs[1], true), 22, 27)); + inputStacks.add( + new PositionedStack(GT_Utility.getFluidDisplayStack(this.mFluidInputs[0], true), 22, 3)); + inputStacks.add( + new PositionedStack(GT_Utility.getFluidDisplayStack(this.mFluidInputs[1], true), 22, 27)); } return inputStacks; } @@ -164,9 +330,12 @@ public class MyRecipeAdder { public ArrayList<PositionedStack> getOutputPositionedStacks() { ArrayList<PositionedStack> outputStacks = new ArrayList<>(); if (this.mFluidOutputs != null && this.mFluidOutputs.length == 3) { - outputStacks.add(new PositionedStack(GT_Utility.getFluidDisplayStack(this.mFluidOutputs[0], true), 124, 3)); - outputStacks.add(new PositionedStack(GT_Utility.getFluidDisplayStack(this.mFluidOutputs[1], true), 124, 21)); - outputStacks.add(new PositionedStack(GT_Utility.getFluidDisplayStack(this.mFluidOutputs[2], true), 124, 44)); + outputStacks.add( + new PositionedStack(GT_Utility.getFluidDisplayStack(this.mFluidOutputs[0], true), 124, 3)); + outputStacks.add( + new PositionedStack(GT_Utility.getFluidDisplayStack(this.mFluidOutputs[1], true), 124, 21)); + outputStacks.add( + new PositionedStack(GT_Utility.getFluidDisplayStack(this.mFluidOutputs[2], true), 124, 44)); } return outputStacks; } @@ -217,32 +386,91 @@ public class MyRecipeAdder { if (tVal < 0) tVal = -tVal; return tVal; } - default: return 0; + default: + return 0; } } return 0; } } - 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}, 0, 0, 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}, + 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, boolean aNEIAllowed){ - super(aRecipeList, aUnlocalizedName, aLocalName, aNEIName, aNEIGUIPath, aUsualInputCount, aUsualOutputCount, aMinimalInputItems, aMinimalInputFluids, aAmperage, aNEISpecialValuePre, aNEISpecialValueMultiplier, aNEISpecialValuePost, aShowVoltageAmperageInNEI, aNEIAllowed); + 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, + aUnlocalizedName, + aLocalName, + aNEIName, + aNEIGUIPath, + aUsualInputCount, + aUsualOutputCount, + aMinimalInputItems, + aMinimalInputFluids, + aAmperage, + aNEISpecialValuePre, + aNEISpecialValueMultiplier, + aNEISpecialValuePost, + aShowVoltageAmperageInNEI, + aNEIAllowed); } @Override - 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); + 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); return addRecipe(tRecipe); } } 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); } @Override @@ -252,8 +480,9 @@ public class MyRecipeAdder { int index = 0; for (FluidStack inFluid : mFluidInputs) { if (inFluid == null) continue; - inputStacks.add(new PositionedStack(GT_Utility.getFluidDisplayStack(inFluid, true), 4 + index * 18, 38)); - index ++; + inputStacks.add( + new PositionedStack(GT_Utility.getFluidDisplayStack(inFluid, true), 4 + index * 18, 38)); + index++; } } if (this.mInputs != null) { @@ -261,7 +490,7 @@ public class MyRecipeAdder { for (ItemStack inItem : mInputs) { if (inItem == null) continue; inputStacks.add(new PositionedStack(inItem, 4 + index * 18, 3)); - index ++; + index++; } } return inputStacks; @@ -276,8 +505,10 @@ public class MyRecipeAdder { } } - 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); + PA.addRecipe( + false, aItemInputs, new ItemStack[] {aOutput}, null, null, aFluidInputs, null, aDuration, aEUt, aTier); } } diff --git a/src/main/java/goodgenerator/util/StructureHelper.java b/src/main/java/goodgenerator/util/StructureHelper.java index f9c6de38e1..1267c357e1 100644 --- a/src/main/java/goodgenerator/util/StructureHelper.java +++ b/src/main/java/goodgenerator/util/StructureHelper.java @@ -7,6 +7,10 @@ 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; @@ -15,11 +19,6 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.world.World; -import java.util.Arrays; -import java.util.function.BiConsumer; -import java.util.function.BiPredicate; -import java.util.function.Function; - public class StructureHelper { public static <T> IStructureElement<T> addFrame(Materials aMaterials) { @@ -55,23 +54,35 @@ 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; } }; } - //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 - ); + // 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, 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 diff --git a/src/main/resources/assets/goodgenerator/textures/gui/neutron_activator.png b/src/main/resources/assets/goodgenerator/textures/gui/neutron_activator.png Binary files differindex a1b1421800..b96cfe9e31 100644 --- a/src/main/resources/assets/goodgenerator/textures/gui/neutron_activator.png +++ b/src/main/resources/assets/goodgenerator/textures/gui/neutron_activator.png |
