diff options
| author | Jordan Byrne <draknyte1@hotmail.com> | 2018-02-26 08:08:00 +1000 |
|---|---|---|
| committer | Jordan Byrne <draknyte1@hotmail.com> | 2018-02-26 08:08:00 +1000 |
| commit | 41eb02602c8a6d5899b3e375572ee9990a5a752b (patch) | |
| tree | 80263f91e6a304fe7ab527fbab18d2810e134aff /src | |
| parent | 90addb9717e2a1bffeec55d064248d6f98835f01 (diff) | |
| download | GT5-Unofficial-41eb02602c8a6d5899b3e375572ee9990a5a752b.tar.gz GT5-Unofficial-41eb02602c8a6d5899b3e375572ee9990a5a752b.tar.bz2 GT5-Unofficial-41eb02602c8a6d5899b3e375572ee9990a5a752b.zip | |
% Made all GTNH recipes use cheaper circuits for all recipes I add.
% Recipe tweaks.
% Tried to fluorite ore not having correct recipe outputs during ore processing. (This is still broken due to an invalid output)
$ Fixed old fluorite ore not having a valid shapeless recipe.
$ Fixed all custom ores trying to register static textures.
$ Fixed plugin loading system not registering plugins, I think?
$ Fixed missing texture for Nitro Fix.
Diffstat (limited to 'src')
17 files changed, 1342 insertions, 1224 deletions
diff --git a/src/Java/gtPlusPlus/GTplusplus.java b/src/Java/gtPlusPlus/GTplusplus.java index 1fa7997a26..e0baa7d186 100644 --- a/src/Java/gtPlusPlus/GTplusplus.java +++ b/src/Java/gtPlusPlus/GTplusplus.java @@ -1,6 +1,5 @@ package gtPlusPlus; -import static gtPlusPlus.api.objects.minecraft.ChunkManager.mChunkLoaderManagerMap; import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableCustomCapes; import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableUpdateChecker; @@ -18,12 +17,9 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gregtech.api.enums.Materials; import gregtech.api.util.GT_Recipe; -import gregtech.api.util.Recipe_GT; import gregtech.api.util.GT_Recipe.GT_Recipe_Map; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.api.objects.data.Triplet; import gtPlusPlus.api.objects.minecraft.ChunkManager; -import gtPlusPlus.api.objects.minecraft.DimChunkPos; import gtPlusPlus.core.commands.CommandMath; import gtPlusPlus.core.common.CommonProxy; import gtPlusPlus.core.config.ConfigHandler; @@ -46,13 +42,9 @@ import gtPlusPlus.plugin.manager.Core_Manager; import gtPlusPlus.xmod.gregtech.common.Meta_GT_Proxy; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtTools; -import gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic.GregtechMetaTileEntityChunkLoader; import gtPlusPlus.xmod.gregtech.loaders.GT_Material_Loader; import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_Recycling; import net.minecraft.launchwrapper.Launch; -import net.minecraft.world.chunk.Chunk; -import net.minecraftforge.common.ForgeChunkManager; -import net.minecraftforge.common.ForgeChunkManager.Ticket; import net.minecraftforge.oredict.OreDictionary; @MCVersion(value = "1.7.10") @@ -149,13 +141,13 @@ public class GTplusplus implements ActionListener { proxy.postInit(event); BookHandler.runLater(); Core_Manager.postInit(); - RecipeGen_Recycling.executeGenerators(); + RecipeGen_Recycling.executeGenerators(); + Logger.INFO("~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"); Logger.INFO("| Recipes succesfully Loaded: " + RegistrationHandler.recipesSuccess + " | Failed: " + RegistrationHandler.recipesFailed + " |"); Logger.INFO("~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"); Logger.INFO("Finally, we are finished. Have some cripsy bacon as a reward."); - dumpGtRecipeMap(Recipe_GT.Gregtech_Recipe_Map.sSlowFusion2Recipes); } @EventHandler diff --git a/src/Java/gtPlusPlus/api/interfaces/IPlugin.java b/src/Java/gtPlusPlus/api/interfaces/IPlugin.java index 3ac960eaf2..99c71a5823 100644 --- a/src/Java/gtPlusPlus/api/interfaces/IPlugin.java +++ b/src/Java/gtPlusPlus/api/interfaces/IPlugin.java @@ -1,12 +1,6 @@ package gtPlusPlus.api.interfaces; -import gtPlusPlus.plugin.manager.Core_Manager; - public interface IPlugin { - - public default void register() { - Core_Manager.registerPlugin(this); - } public String getPluginName(); diff --git a/src/Java/gtPlusPlus/api/plugin/Sample_Plugin.java b/src/Java/gtPlusPlus/api/plugin/Sample_Plugin.java new file mode 100644 index 0000000000..5d79da2197 --- /dev/null +++ b/src/Java/gtPlusPlus/api/plugin/Sample_Plugin.java @@ -0,0 +1,32 @@ +package gtPlusPlus.api.plugin; + +import gtPlusPlus.api.interfaces.IPlugin; +import gtPlusPlus.plugin.manager.Core_Manager; + +public class Sample_Plugin implements IPlugin { + + private Sample_Plugin() { + Core_Manager.registerPlugin(this); //This must be called, else it won't load. + } + + @Override + public boolean preInit() { + return true; + } + + @Override + public boolean init() { + return true; + } + + @Override + public boolean postInit() { + return true; + } + + @Override + public String getPluginName() { + return "Sample Plugin"; + } + +} diff --git a/src/Java/gtPlusPlus/core/block/base/BasicBlock.java b/src/Java/gtPlusPlus/core/block/base/BasicBlock.java index f97763dd54..01db44f28b 100644 --- a/src/Java/gtPlusPlus/core/block/base/BasicBlock.java +++ b/src/Java/gtPlusPlus/core/block/base/BasicBlock.java @@ -13,13 +13,21 @@ import net.minecraft.world.World; public class BasicBlock extends BlockContainer { public BasicBlock(final String unlocalizedName, final Material material) { - this(unlocalizedName, material, 2); + this(BlockTypes.STANDARD, unlocalizedName, material, 2); } - public BasicBlock(final String unlocalizedName, final Material material, final int harvestLevel) { + public BasicBlock(final BlockTypes type, final String unlocalizedName, final Material material) { + this(type, unlocalizedName, material, 2); + } + + public BasicBlock(BlockTypes type, final String unlocalizedName, final Material material, final int harvestLevel) { super(material); this.setBlockName(Utils.sanitizeString(unlocalizedName)); - this.setBlockTextureName(CORE.MODID + ":" + unlocalizedName); + + if (type != BlockTypes.ORE) { + this.setBlockTextureName(CORE.MODID + ":" + unlocalizedName); + } + this.setCreativeTab(AddToCreativeTab.tabBlock); this.setHardness(2.0F); this.setResistance(6.0F); diff --git a/src/Java/gtPlusPlus/core/block/base/BlockBaseModular.java b/src/Java/gtPlusPlus/core/block/base/BlockBaseModular.java index 2f7b3338d7..351c44b0c5 100644 --- a/src/Java/gtPlusPlus/core/block/base/BlockBaseModular.java +++ b/src/Java/gtPlusPlus/core/block/base/BlockBaseModular.java @@ -1,7 +1,6 @@ package gtPlusPlus.core.block.base; import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.common.registry.LanguageRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gregtech.api.util.GT_OreDictUnificator; @@ -15,106 +14,87 @@ import gtPlusPlus.core.util.minecraft.ItemUtils; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.world.IBlockAccess; -public class BlockBaseModular extends BasicBlock{ +public class BlockBaseModular extends BasicBlock { protected Material blockMaterial; - + protected int blockColour; protected BlockTypes thisBlock; protected String thisBlockMaterial; protected final String thisBlockType; public BlockBaseModular(final Material material, final BlockTypes blockType, final int colour) { - this(material.getUnlocalizedName(), material.getLocalizedName(), net.minecraft.block.material.Material.iron, blockType, colour, 2); + this(material.getUnlocalizedName(), material.getLocalizedName(), net.minecraft.block.material.Material.iron, + blockType, colour, 2); } - - public BlockBaseModular(final String unlocalizedName, final String blockMaterial, final BlockTypes blockType, final int colour) { + + public BlockBaseModular(final String unlocalizedName, final String blockMaterial, final BlockTypes blockType, + final int colour) { this(unlocalizedName, blockMaterial, net.minecraft.block.material.Material.iron, blockType, colour, 2); } - public BlockBaseModular(final String unlocalizedName, final String blockMaterial, final net.minecraft.block.material.Material vanillaMaterial, final BlockTypes blockType, final int colour, final int miningLevel) { + public BlockBaseModular(final String unlocalizedName, final String blockMaterial, + final net.minecraft.block.material.Material vanillaMaterial, final BlockTypes blockType, final int colour, + final int miningLevel) { super(unlocalizedName, vanillaMaterial); this.setHarvestLevel(blockType.getHarvestTool(), miningLevel); - this.setBlockTextureName(CORE.MODID+":"+blockType.getTexture()); + this.setBlockTextureName(CORE.MODID + ":" + blockType.getTexture()); this.blockColour = colour; this.thisBlock = blockType; this.thisBlockMaterial = blockMaterial; this.thisBlockType = blockType.name().toUpperCase(); this.setBlockName(this.GetProperName()); - if (!CORE.DEBUG){ - //Utils.LOG_INFO("=============Block Info Dump============="); - //Utils.LOG_INFO("thisBlock.name().toLowerCase() - "+thisBlock.name().toLowerCase()); - //Utils.LOG_INFO("This Blocks Type - "+thisBlockType); - //Utils.LOG_INFO("BlockTypes.STANDARD.name().toLowerCase() - "+BlockTypes.STANDARD.name().toLowerCase()); - //Utils.LOG_INFO("BlockTypes.FRAME.name().toLowerCase() - "+BlockTypes.FRAME.name().toLowerCase()); - //Utils.LOG_INFO("blockMaterial - "+blockMaterial); - //Utils.LOG_INFO("=========================================="); - } - - if (this.thisBlockType.equals(BlockTypes.STANDARD.name().toUpperCase())){ - //LanguageRegistry.addName(this, "Block of "+blockMaterial); - //Utils.LOG_INFO("Registered Block in Language Registry as: "+"Block of "+blockMaterial); + if (this.thisBlockType.equals(BlockTypes.STANDARD.name().toUpperCase())) { + GameRegistry.registerBlock(this, ItemBlockGtBlock.class, + Utils.sanitizeString(blockType.getTexture() + unlocalizedName)); + GT_OreDictUnificator.registerOre( + "block" + getUnlocalizedName().replace("tile.block", "").replace("tile.", "").replace("of", "") + .replace("Of", "").replace("Block", "").replace("-", "").replace("_", "").replace(" ", ""), + ItemUtils.getSimpleStack(this)); } - else if (this.thisBlockType.equals(BlockTypes.FRAME.name().toUpperCase())){ - //LanguageRegistry.addName(this, blockMaterial+ " Frame Box"); - //Utils.LOG_INFO("Registered Block in Language Registry as: "+blockMaterial+ " Frame Box"); + else if (this.thisBlockType.equals(BlockTypes.FRAME.name().toUpperCase())) { + GameRegistry.registerBlock(this, ItemBlockGtFrameBox.class, + Utils.sanitizeString(blockType.getTexture() + unlocalizedName)); + GT_OreDictUnificator.registerOre( + "frameGt" + getUnlocalizedName().replace("tile.", "").replace("tile.BlockGtFrame", "") + .replace("-", "").replace("_", "").replace(" ", "").replace("FrameBox", ""), + ItemUtils.getSimpleStack(this)); } - - //setOreDict(unlocalizedName, blockType); - if (this.thisBlockType.equals(BlockTypes.STANDARD.name().toUpperCase())){ - GameRegistry.registerBlock(this, ItemBlockGtBlock.class, Utils.sanitizeString(blockType.getTexture()+unlocalizedName)); - GT_OreDictUnificator.registerOre("block"+getUnlocalizedName().replace("tile.block", "").replace("tile.", "").replace("of", "").replace("Of", "").replace("Block", "").replace("-", "").replace("_", "").replace(" ", ""), ItemUtils.getSimpleStack(this)); - //Utils.LOG_INFO("Registered Block in Block Registry as: "+"Block of "+blockMaterial); - } - else if (this.thisBlockType.equals(BlockTypes.FRAME.name().toUpperCase())){ - GameRegistry.registerBlock(this, ItemBlockGtFrameBox.class, Utils.sanitizeString(blockType.getTexture()+unlocalizedName)); - GT_OreDictUnificator.registerOre("frameGt"+getUnlocalizedName().replace("tile.", "").replace("tile.BlockGtFrame", "").replace("-", "").replace("_", "").replace(" ", "").replace("FrameBox", ""), ItemUtils.getSimpleStack(this)); - //Utils.LOG_INFO("Registered Block in Block Registry as: "+blockMaterial+" Frame Box"); + else if (this.thisBlockType.equals(BlockTypes.ORE.name().toUpperCase())) { + GameRegistry.registerBlock(this, ItemBlockGtBlock.class, + Utils.sanitizeString(blockType.getTexture() + unlocalizedName)); + GT_OreDictUnificator.registerOre( + "block" + getUnlocalizedName().replace("tile.block", "").replace("tile.", "").replace("of", "") + .replace("Of", "").replace("Block", "").replace("-", "").replace("_", "").replace(" ", ""), + ItemUtils.getSimpleStack(this)); } - } /** - * Returns which pass should this block be rendered on. 0 for solids and 1 for alpha + * Returns which pass should this block be rendered on. 0 for solids and 1 + * for alpha */ @Override @SideOnly(Side.CLIENT) - public int getRenderBlockPass() - { - if (this.thisBlock == BlockTypes.FRAME){ + public int getRenderBlockPass() { + if (this.thisBlock == BlockTypes.FRAME) { return 1; } return 0; } - /*@Override - public String getLocalizedName() { - String tempIngot; - if (thisBlock == BlockTypes.STANDARD){ - tempIngot = "Block of "+thisBlockMaterial; - } - else if (thisBlock == BlockTypes.FRAME){ - tempIngot = thisBlockMaterial + " Frame Box"; - } - else { - - tempIngot = getUnlocalizedName().replace("tile.blockGt", "ingot"); - } - return tempIngot; - }*/ - public String GetProperName() { String tempIngot; - if (this.thisBlock == BlockTypes.STANDARD){ - tempIngot = "Block of "+this.thisBlockMaterial; + if (this.thisBlock == BlockTypes.STANDARD) { + tempIngot = "Block of " + this.thisBlockMaterial; } - else if (this.thisBlock == BlockTypes.FRAME){ + else if (this.thisBlock == BlockTypes.FRAME) { tempIngot = this.thisBlockMaterial + " Frame Box"; } - else if (this.thisBlock == BlockTypes.ORE){ - tempIngot = this.thisBlockMaterial + " Ore"; + else if (this.thisBlock == BlockTypes.ORE) { + tempIngot = this.thisBlockMaterial + " Ore [Old]"; } else { @@ -124,22 +104,22 @@ public class BlockBaseModular extends BasicBlock{ } @Override - public boolean isOpaqueCube() - { + public boolean isOpaqueCube() { return false; } @Override @SideOnly(Side.CLIENT) - public void registerBlockIcons(final IIconRegister iIcon) - { - this.blockIcon = iIcon.registerIcon(CORE.MODID + ":" + this.thisBlock.getTexture()); + public void registerBlockIcons(final IIconRegister iIcon) { + if (this.thisBlock != BlockTypes.ORE) { + this.blockIcon = iIcon.registerIcon(CORE.MODID + ":" + this.thisBlock.getTexture()); + } } @Override - public int colorMultiplier(final IBlockAccess par1IBlockAccess, final int par2, final int par3, final int par4){ + public int colorMultiplier(final IBlockAccess par1IBlockAccess, final int par2, final int par3, final int par4) { - if (this.blockColour == 0){ + if (this.blockColour == 0) { return MathUtils.generateSingularRandomHexValue(); } @@ -148,7 +128,7 @@ public class BlockBaseModular extends BasicBlock{ @Override public int getRenderColor(final int aMeta) { - if (this.blockColour == 0){ + if (this.blockColour == 0) { return MathUtils.generateSingularRandomHexValue(); } diff --git a/src/Java/gtPlusPlus/core/block/base/BlockBaseOre.java b/src/Java/gtPlusPlus/core/block/base/BlockBaseOre.java index d444f11261..5f476ef8df 100644 --- a/src/Java/gtPlusPlus/core/block/base/BlockBaseOre.java +++ b/src/Java/gtPlusPlus/core/block/base/BlockBaseOre.java @@ -3,10 +3,6 @@ package gtPlusPlus.core.block.base; import java.lang.reflect.Field; import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.common.registry.LanguageRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.enums.Textures; import gregtech.api.interfaces.IIconContainer; @@ -21,11 +17,9 @@ import gtPlusPlus.core.item.base.itemblock.ItemBlockOre; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.material.Material; import gtPlusPlus.core.util.Utils; -import gtPlusPlus.core.util.math.MathUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.core.util.reflect.ReflectionUtils; import net.minecraft.block.Block; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.EnumCreatureType; import net.minecraft.init.Blocks; import net.minecraft.util.IIcon; @@ -34,9 +28,9 @@ import net.minecraft.world.IBlockAccess; public class BlockBaseOre extends BasicBlock implements ITexturedBlock { private final Material blockMaterial; - + public BlockBaseOre(final Material material, final BlockTypes blockType, final int colour) { - super(Utils.sanitizeString(material.getUnlocalizedName()), net.minecraft.block.material.Material.rock); + super(blockType, Utils.sanitizeString(material.getUnlocalizedName()), net.minecraft.block.material.Material.rock); this.blockMaterial = material; this.setHardness(2.0f); this.setResistance(6.0F); @@ -45,15 +39,9 @@ public class BlockBaseOre extends BasicBlock implements ITexturedBlock { this.setCreativeTab(AddToCreativeTab.tabBlock); this.setStepSound(soundTypeStone); this.setBlockName("Ore"+Utils.sanitizeString(Utils.sanitizeString(material.getUnlocalizedName()))); - - - //this.setBlockTextureName(CORE.MODID+":"+blockType.getTexture()); - //this.setBlockName(this.blockMaterial.getLocalizedName()+" Ore"); - try { GameRegistry.registerBlock(this, ItemBlockOre.class, Utils.sanitizeString("ore"+Utils.sanitizeString(this.blockMaterial.getLocalizedName()))); GT_OreDictUnificator.registerOre("ore"+Utils.sanitizeString(this.blockMaterial.getLocalizedName()), ItemUtils.getSimpleStack(this)); - //LanguageRegistry.addName(this, blockMaterial.getLocalizedName()+ " Ore"); } catch (Throwable t){ t.printStackTrace(); @@ -89,7 +77,7 @@ public class BlockBaseOre extends BasicBlock implements ITexturedBlock { */ //.08 compat - IIconContainer[] hiddenTextureArray; + public static IIconContainer[] hiddenTextureArray; public ITexture[] getTexture(byte arg0) { return getTexture(null, arg0); } @@ -98,7 +86,6 @@ public class BlockBaseOre extends BasicBlock implements ITexturedBlock { if (this.blockMaterial != null){ GT_RenderedTexture aIconSet = new GT_RenderedTexture(blockMaterial.getTextureSet().mTextures[OrePrefixes.ore.mTextureIndex], this.blockMaterial.getRGBA()); if (aIconSet != null){ - //Logger.INFO("[Render] Good Overlay."); return new ITexture[]{new GT_CopiedBlockTexture(Blocks.stone, 0, 0), aIconSet}; } } @@ -111,30 +98,21 @@ public class BlockBaseOre extends BasicBlock implements ITexturedBlock { try { Field o = ReflectionUtils.getField(Textures.BlockIcons.class, "STONES"); if (o != null){ - hiddenTextureArray = (IIconContainer[]) o.get(Textures.BlockIcons.class); - if (hiddenTextureArray != null){ - //Found - } - else { - hiddenTextureArray = new IIconContainer[6]; - } + hiddenTextureArray = (IIconContainer[]) o.get(Textures.BlockIcons.class); + } + if (hiddenTextureArray == null){ + hiddenTextureArray = new IIconContainer[6]; } } catch (NoSuchFieldException | IllegalArgumentException | IllegalAccessException e) { + hiddenTextureArray = new IIconContainer[6]; } } } - - //return new ITexture[]{new GT_RenderedTexture(Textures.BlockIcons.STONES[0], new short[]{240, 240, 240, 0})}; - return new ITexture[]{new GT_RenderedTexture(hiddenTextureArray[0], new short[]{240, 240, 240, 0})}; + return new ITexture[]{new GT_RenderedTexture(hiddenTextureArray[0], new short[]{240, 240, 240, 0})}; } - public static class oldOreBlock extends BlockBaseModular{ - - @SuppressWarnings("unused") - private IIcon base; - @SuppressWarnings("unused") - private IIcon overlay; + public static class oldOreBlock extends BlockBaseModular implements ITexturedBlock{ public oldOreBlock(final String unlocalizedName, final String blockMaterial, final BlockTypes blockType, final int colour) { this(unlocalizedName, blockMaterial, net.minecraft.block.material.Material.iron, blockType, colour, 2); @@ -144,7 +122,7 @@ public class BlockBaseOre extends BasicBlock implements ITexturedBlock { super(unlocalizedName, blockMaterial, vanillaMaterial, blockType, colour, miningLevel); } - @Override + /*@Override @SideOnly(Side.CLIENT) public void registerBlockIcons(final IIconRegister iIcon) { @@ -167,11 +145,66 @@ public class BlockBaseOre extends BasicBlock implements ITexturedBlock { return MathUtils.generateSingularRandomHexValue(); } return this.blockColour; - } + }*/ @Override public boolean canCreatureSpawn(final EnumCreatureType type, final IBlockAccess world, final int x, final int y, final int z) { return false; + } + + @Override + public int getRenderType() { + return CustomOreBlockRenderer.INSTANCE.mRenderID; + } + + @Override + public IIcon getIcon(IBlockAccess aIBlockAccess, int aX, int aY, int aZ, int aSide) { + return Blocks.stone.getIcon(0, 0); + } + + @Override + public IIcon getIcon(int aSide, int aMeta) { + return Blocks.stone.getIcon(0, 0); + } + + /** + * GT Texture Handler + */ + + //.08 compat + IIconContainer[] hiddenTextureArray; + public ITexture[] getTexture(byte arg0) { + return getTexture(null, arg0); + } + + public ITexture[] getTexture(Block block, byte side) { + if (this.blockMaterial != null){ + GT_RenderedTexture aIconSet = new GT_RenderedTexture(blockMaterial.getTextureSet().mTextures[OrePrefixes.ore.mTextureIndex], this.blockMaterial.getRGBA()); + if (aIconSet != null){ + return new ITexture[]{new GT_CopiedBlockTexture(Blocks.stone, 0, 0), aIconSet}; + } + } + + if (hiddenTextureArray == null){ + if (!CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK){ + hiddenTextureArray = Textures.BlockIcons.GRANITES; + } + else { + try { + Field o = ReflectionUtils.getField(Textures.BlockIcons.class, "STONES"); + if (o != null){ + hiddenTextureArray = (IIconContainer[]) o.get(Textures.BlockIcons.class); + } + if (hiddenTextureArray == null){ + hiddenTextureArray = new IIconContainer[6]; + } + } + catch (NoSuchFieldException | IllegalArgumentException | IllegalAccessException e) { + hiddenTextureArray = new IIconContainer[6]; + } + } + } + return new ITexture[]{new GT_RenderedTexture(hiddenTextureArray[0], new short[]{240, 240, 240, 0})}; } } diff --git a/src/Java/gtPlusPlus/core/material/Material.java b/src/Java/gtPlusPlus/core/material/Material.java index 09b6e24d9e..749431b6de 100644 --- a/src/Java/gtPlusPlus/core/material/Material.java +++ b/src/Java/gtPlusPlus/core/material/Material.java @@ -3,16 +3,12 @@ package gtPlusPlus.core.material; import static gregtech.api.enums.GT_Values.M; import java.util.*; -import java.util.Map.Entry; - import gregtech.api.enums.*; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.objects.data.AutoMap; -import gtPlusPlus.api.objects.data.Pair; import gtPlusPlus.core.item.base.cell.BaseItemCell; import gtPlusPlus.core.material.state.MaterialState; import gtPlusPlus.core.util.Utils; -import gtPlusPlus.core.util.data.ArrayUtils; import gtPlusPlus.core.util.data.StringUtils; import gtPlusPlus.core.util.math.MathUtils; import gtPlusPlus.core.util.minecraft.FluidUtils; @@ -24,7 +20,6 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; -import scala.xml.dtd.ELEMENTS; public class Material { diff --git a/src/Java/gtPlusPlus/core/material/nuclear/FLUORIDES.java b/src/Java/gtPlusPlus/core/material/nuclear/FLUORIDES.java index 5f83074a0d..132db39f3f 100644 --- a/src/Java/gtPlusPlus/core/material/nuclear/FLUORIDES.java +++ b/src/Java/gtPlusPlus/core/material/nuclear/FLUORIDES.java @@ -3,6 +3,7 @@ package gtPlusPlus.core.material.nuclear; import gregtech.api.enums.Materials; import gtPlusPlus.core.material.*; import gtPlusPlus.core.material.state.MaterialState; +import gtPlusPlus.core.util.minecraft.MaterialUtils; public class FLUORIDES { @@ -22,8 +23,9 @@ public class FLUORIDES { false, //Generate cells //Material Stacks with Percentage of required elements. new MaterialStack[]{ - new MaterialStack(ELEMENT.getInstance().CALCIUM, 1), - new MaterialStack(ELEMENT.getInstance().FLUORINE, 2) + new MaterialStack(ELEMENT.getInstance().CALCIUM, 24), + new MaterialStack(ELEMENT.getInstance().FLUORINE, 72), + new MaterialStack(MaterialUtils.generateMaterialFromGtENUM(Materials.Galena), 4) }); //ThF4 diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java index cc1fdaf91b..72437d0bad 100644 --- a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java +++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java @@ -32,14 +32,14 @@ import net.minecraftforge.fluids.FluidStack; public class RECIPES_GREGTECH { - public static void run(){ + public static void run() { Logger.INFO("Loading Recipes through GregAPI for Industrial Multiblocks."); execute(); } - private static void execute(){ + private static void execute() { cokeOvenRecipes(); - //matterFabRecipes(); + // matterFabRecipes(); assemblerRecipes(); fluidcannerRecipes(); distilleryRecipes(); @@ -67,13 +67,10 @@ public class RECIPES_GREGTECH { } private static void extruderRecipes() { - //Osmium Credits - if (GT_Values.RA.addExtruderRecipe( - ItemUtils.getItemStackOfAmountFromOreDict("blockOsmium", 4), - ItemList.Shape_Mold_Credit.get(0), - ItemList.Credit_Greg_Osmium.get(0), - (int) Math.max(Materials.Osmium.getMass() * 2L * 1, 1), - (int) (4 * Materials.Osmium.mDensity))){ + // Osmium Credits + if (GT_Values.RA.addExtruderRecipe(ItemUtils.getItemStackOfAmountFromOreDict("blockOsmium", 1), + ItemList.Shape_Mold_Credit.get(0), ItemList.Credit_Greg_Osmium.get(1), + (int) Math.max(Materials.Osmium.getMass() * 2L * 20, 1), 1024)) { Logger.WARNING("Extruder Recipe: Osmium Credit - Success"); } else { @@ -83,623 +80,666 @@ public class RECIPES_GREGTECH { private static void blastSmelterRecipes() { - //Black Bronze + // Black Bronze CORE.RA.addBlastSmelterRecipe( - new ItemStack[]{ - ItemUtils.getGregtechCircuit(13), + new ItemStack[] { ItemUtils.getGregtechCircuit(13), ItemUtils.getItemStackOfAmountFromOreDict("dustGold", 1), ItemUtils.getItemStackOfAmountFromOreDict("dustSilver", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustCopper", 3), - }, - FluidUtils.getFluidStack("molten.blackbronze", 5*144), - 0, - MathUtils.findPercentageOfInt(200*20, 80), + ItemUtils.getItemStackOfAmountFromOreDict("dustCopper", 3), }, + FluidUtils.getFluidStack("molten.blackbronze", 5 * 144), 0, MathUtils.findPercentageOfInt(200 * 20, 80), 120); - //Black Steel + // Black Steel CORE.RA.addBlastSmelterRecipe( - new ItemStack[]{ - ItemUtils.getGregtechCircuit(5), + new ItemStack[] { ItemUtils.getGregtechCircuit(5), ItemUtils.getItemStackOfAmountFromOreDict("dustNickel", 5), ItemUtils.getItemStackOfAmountFromOreDict("dustSteel", 15), ItemUtils.getItemStackOfAmountFromOreDict("dustGold", 1), ItemUtils.getItemStackOfAmountFromOreDict("dustSilver", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustCopper", 3) - }, - FluidUtils.getFluidStack("molten.blacksteel", 25*144), - 0, - MathUtils.findPercentageOfInt(60*20, 80), + ItemUtils.getItemStackOfAmountFromOreDict("dustCopper", 3) }, + FluidUtils.getFluidStack("molten.blacksteel", 25 * 144), 0, MathUtils.findPercentageOfInt(60 * 20, 80), 120); - //Red Steel + // Red Steel CORE.RA.addBlastSmelterRecipe( - new ItemStack[]{ - ItemUtils.getGregtechCircuit(6), + new ItemStack[] { ItemUtils.getGregtechCircuit(6), ItemUtils.getItemStackOfAmountFromOreDict("dustSilver", 4), ItemUtils.getItemStackOfAmountFromOreDict("dustCopper", 4), ItemUtils.getItemStackOfAmountFromOreDict("dustZinc", 1), ItemUtils.getItemStackOfAmountFromOreDict("dustBismuth", 1), ItemUtils.getItemStackOfAmountFromOreDict("dustSteel", 10), - ItemUtils.getItemStackOfAmountFromOreDict("dustBlackSteel", 20) - }, - FluidUtils.getFluidStack("molten.redsteel", 40*144), - 0, - MathUtils.findPercentageOfInt(65*20, 80), + ItemUtils.getItemStackOfAmountFromOreDict("dustBlackSteel", 20) }, + FluidUtils.getFluidStack("molten.redsteel", 40 * 144), 0, MathUtils.findPercentageOfInt(65 * 20, 80), 120); - //Blue Steel - CORE.RA.addBlastSmelterRecipe( - new ItemStack[]{ - ItemUtils.getGregtechCircuit(5), - ItemUtils.getItemStackOfAmountFromOreDict("dustGold", 12), - ItemUtils.getItemStackOfAmountFromOreDict("dustCopper", 18), - ItemUtils.getItemStackOfAmountFromOreDict("dustZinc", 5), - ItemUtils.getItemStackOfAmountFromOreDict("dustSteel", 30), - ItemUtils.getItemStackOfAmountFromOreDict("dustBlackSteel", 60) - - }, - FluidUtils.getFluidStack("molten.bluesteel", 125*144), - 0, - MathUtils.findPercentageOfInt(70*20, 80), - 120); + // Blue Steel + CORE.RA.addBlastSmelterRecipe(new ItemStack[] { ItemUtils.getGregtechCircuit(5), + ItemUtils.getItemStackOfAmountFromOreDict("dustGold", 12), + ItemUtils.getItemStackOfAmountFromOreDict("dustCopper", 18), + ItemUtils.getItemStackOfAmountFromOreDict("dustZinc", 5), + ItemUtils.getItemStackOfAmountFromOreDict("dustSteel", 30), + ItemUtils.getItemStackOfAmountFromOreDict("dustBlackSteel", 60) + + }, FluidUtils.getFluidStack("molten.bluesteel", 125 * 144), 0, MathUtils.findPercentageOfInt(70 * 20, 80), 120); - //TungstenSteel + // TungstenSteel CORE.RA.addBlastSmelterRecipe( - new ItemStack[]{ - ItemUtils.getGregtechCircuit(2), + new ItemStack[] { ItemUtils.getGregtechCircuit(2), ItemUtils.getItemStackOfAmountFromOreDict("ingotTungsten", 1), - ItemUtils.getItemStackOfAmountFromOreDict("ingotSteel", 1) - }, - FluidUtils.getFluidStack("molten.tungstensteel", 2*144), - 0, - MathUtils.findPercentageOfInt(300*20, 80), - 120); + ItemUtils.getItemStackOfAmountFromOreDict("ingotSteel", 1) }, + FluidUtils.getFluidStack("molten.tungstensteel", 2 * 144), 0, + MathUtils.findPercentageOfInt(300 * 20, 80), 120); - //Stainless Steel + // Stainless Steel CORE.RA.addBlastSmelterRecipe( - new ItemStack[]{ - ItemUtils.getGregtechCircuit(14), + new ItemStack[] { ItemUtils.getGregtechCircuit(14), ItemUtils.getItemStackOfAmountFromOreDict("dustIron", 6), ItemUtils.getItemStackOfAmountFromOreDict("dustNickel", 1), ItemUtils.getItemStackOfAmountFromOreDict("dustManganese", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustChrome", 1) - }, - FluidUtils.getFluidStack("molten.stainlesssteel", 9*144), - 0, - MathUtils.findPercentageOfInt(85*20, 80), - 120); + ItemUtils.getItemStackOfAmountFromOreDict("dustChrome", 1) }, + FluidUtils.getFluidStack("molten.stainlesssteel", 9 * 144), 0, + MathUtils.findPercentageOfInt(85 * 20, 80), 120); - //Eglin + // Eglin CORE.RA.addBlastSmelterRecipe( - new ItemStack[]{ - ItemUtils.getGregtechCircuit(7), + new ItemStack[] { ItemUtils.getGregtechCircuit(7), ItemUtils.getItemStackOfAmountFromOreDict("dustNickel", 5), ItemUtils.getItemStackOfAmountFromOreDict("dustIron", 23), ItemUtils.getItemStackOfAmountFromOreDict("dustAluminium", 1), ItemUtils.getItemStackOfAmountFromOreDict("dustChrome", 1), ItemUtils.getItemStackOfAmountFromOreDict("dustSulfur", 3), ItemUtils.getItemStackOfAmountFromOreDict("dustCarbon", 3), - ItemUtils.getItemStackOfAmountFromOreDict("dustSilicon", 12) - }, - FluidUtils.getFluidStack("molten.eglinsteel", 48*144), - 0, - MathUtils.findPercentageOfInt(30*20, 80), + ItemUtils.getItemStackOfAmountFromOreDict("dustSilicon", 12) }, + FluidUtils.getFluidStack("molten.eglinsteel", 48 * 144), 0, MathUtils.findPercentageOfInt(30 * 20, 80), 120); if (!CORE.GTNH) { - //HSS-G + // HSS-G CORE.RA.addBlastSmelterRecipe( - new ItemStack[]{ - ItemUtils.getGregtechCircuit(14), + new ItemStack[] { ItemUtils.getGregtechCircuit(14), ItemUtils.getItemStackOfAmountFromOreDict("dustTungstenSteel", 5), ItemUtils.getItemStackOfAmountFromOreDict("dustVanadium", 1), ItemUtils.getItemStackOfAmountFromOreDict("dustMolybdenum", 2), - ItemUtils.getItemStackOfAmountFromOreDict("dustChrome", 1) - }, - FluidUtils.getFluidStack("molten.hssg", 9 * 144), - 0, - MathUtils.findPercentageOfInt(450 * 20, 80), + ItemUtils.getItemStackOfAmountFromOreDict("dustChrome", 1) }, + FluidUtils.getFluidStack("molten.hssg", 9 * 144), 0, MathUtils.findPercentageOfInt(450 * 20, 80), 120); - //HSS-G + // HSS-G CORE.RA.addBlastSmelterRecipe( - new ItemStack[]{ - ItemUtils.getGregtechCircuit(5), + new ItemStack[] { ItemUtils.getGregtechCircuit(5), ItemUtils.getItemStackOfAmountFromOreDict("dustTungsten", 5), ItemUtils.getItemStackOfAmountFromOreDict("dustSteel", 5), ItemUtils.getItemStackOfAmountFromOreDict("dustVanadium", 2), ItemUtils.getItemStackOfAmountFromOreDict("dustMolybdenum", 4), - ItemUtils.getItemStackOfAmountFromOreDict("dustChrome", 2) - }, - FluidUtils.getFluidStack("molten.hssg", 18 * 144), - 0, - MathUtils.findPercentageOfInt(900 * 20, 80), + ItemUtils.getItemStackOfAmountFromOreDict("dustChrome", 2) }, + FluidUtils.getFluidStack("molten.hssg", 18 * 144), 0, MathUtils.findPercentageOfInt(900 * 20, 80), 120); - //HSS-E + // HSS-E CORE.RA.addBlastSmelterRecipe( - new ItemStack[]{ - ItemUtils.getGregtechCircuit(14), + new ItemStack[] { ItemUtils.getGregtechCircuit(14), ItemUtils.getItemStackOfAmountFromOreDict("dustHSSG", 6), ItemUtils.getItemStackOfAmountFromOreDict("dustCobalt", 1), ItemUtils.getItemStackOfAmountFromOreDict("dustSilicon", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustManganese", 1) - }, - FluidUtils.getFluidStack("molten.hsse", 9 * 144), - 0, - MathUtils.findPercentageOfInt(540 * 20, 80), + ItemUtils.getItemStackOfAmountFromOreDict("dustManganese", 1) }, + FluidUtils.getFluidStack("molten.hsse", 9 * 144), 0, MathUtils.findPercentageOfInt(540 * 20, 80), 120); - //HSS-S + // HSS-S CORE.RA.addBlastSmelterRecipe( - new ItemStack[]{ - ItemUtils.getGregtechCircuit(3), + new ItemStack[] { ItemUtils.getGregtechCircuit(3), ItemUtils.getItemStackOfAmountFromOreDict("dustHSSG", 6), ItemUtils.getItemStackOfAmountFromOreDict("dustOsmium", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustIridium", 2) - }, - FluidUtils.getFluidStack("molten.hsss", 9 * 144), - 0, - MathUtils.findPercentageOfInt(810 * 20, 80), + ItemUtils.getItemStackOfAmountFromOreDict("dustIridium", 2) }, + FluidUtils.getFluidStack("molten.hsss", 9 * 144), 0, MathUtils.findPercentageOfInt(810 * 20, 80), 120); - //Osmiridium + // Osmiridium CORE.RA.addBlastSmelterRecipe( - new ItemStack[]{ - ItemUtils.getGregtechCircuit(2), + new ItemStack[] { ItemUtils.getGregtechCircuit(2), ItemUtils.getItemStackOfAmountFromOreDict("dustIridium", 3), - ItemUtils.getItemStackOfAmountFromOreDict("dustOsmium", 1) - }, - Materials.Helium.getGas(1000), - FluidUtils.getFluidStack("molten.osmiridium", 4 * 144), - 0, - MathUtils.findPercentageOfInt(500 * 20, 80), - 1920); - - //Naq Alloy + ItemUtils.getItemStackOfAmountFromOreDict("dustOsmium", 1) }, + Materials.Helium.getGas(1000), FluidUtils.getFluidStack("molten.osmiridium", 4 * 144), 0, + MathUtils.findPercentageOfInt(500 * 20, 80), 1920); + + // Naq Alloy CORE.RA.addBlastSmelterRecipe( - new ItemStack[]{ - ItemUtils.getGregtechCircuit(2), + new ItemStack[] { ItemUtils.getGregtechCircuit(2), ItemUtils.getItemStackOfAmountFromOreDict("dustNaquadah", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustOsmiridium", 1) - }, - Materials.Argon.getGas(1000), - FluidUtils.getFluidStack("molten.naquadahalloy", 2 * 144), - 0, - MathUtils.findPercentageOfInt(500 * 20, 80), - 30720); - - //Nickel-Zinc-Ferrite + ItemUtils.getItemStackOfAmountFromOreDict("dustOsmiridium", 1) }, + Materials.Argon.getGas(1000), FluidUtils.getFluidStack("molten.naquadahalloy", 2 * 144), 0, + MathUtils.findPercentageOfInt(500 * 20, 80), 30720); + + // Nickel-Zinc-Ferrite if (Materials.get("NickelZincFerrite") != null) { CORE.RA.addBlastSmelterRecipe( - new ItemStack[]{ - ItemUtils.getGregtechCircuit(2), - ItemUtils.getItemStackOfAmountFromOreDict("dustFerriteMixture", 6) - }, - Materials.Oxygen.getGas(2000), - FluidUtils.getFluidStack("molten.nickelzincferrite", 2 * 144), - 0, - MathUtils.findPercentageOfInt(600 * 20, 80), - 120); + new ItemStack[] { ItemUtils.getGregtechCircuit(2), + ItemUtils.getItemStackOfAmountFromOreDict("dustFerriteMixture", 6) }, + Materials.Oxygen.getGas(2000), FluidUtils.getFluidStack("molten.nickelzincferrite", 2 * 144), 0, + MathUtils.findPercentageOfInt(600 * 20, 80), 120); } - //Gallium-Arsenide + // Gallium-Arsenide if (Materials.get("GalliumArsenide") != null) { CORE.RA.addBlastSmelterRecipe( - new ItemStack[]{ - ItemUtils.getGregtechCircuit(2), + new ItemStack[] { ItemUtils.getGregtechCircuit(2), ItemUtils.getItemStackOfAmountFromOreDict("dustGallium", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustArsenic", 1) - }, - FluidUtils.getFluidStack("molten.galliumarsenide", 2 * 144), - 0, - MathUtils.findPercentageOfInt(600 * 20, 80), - 120); + ItemUtils.getItemStackOfAmountFromOreDict("dustArsenic", 1) }, + FluidUtils.getFluidStack("molten.galliumarsenide", 2 * 144), 0, + MathUtils.findPercentageOfInt(600 * 20, 80), 120); } - //TungstenCarbide + // TungstenCarbide if (Materials.get("TungstenCarbide") != null) { CORE.RA.addBlastSmelterRecipe( - new ItemStack[]{ - ItemUtils.getGregtechCircuit(12), + new ItemStack[] { ItemUtils.getGregtechCircuit(12), ItemUtils.getItemStackOfAmountFromOreDict("dustTungsten", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustCarbon", 1) - }, - FluidUtils.getFluidStack("molten.tungstencarbide", 2 * 144), - 0, - MathUtils.findPercentageOfInt((int) Math.max(Materials.get("TungstenCarbide").getMass() / 40L, 1L) * Materials.get("TungstenCarbide").mBlastFurnaceTemp, 80), + ItemUtils.getItemStackOfAmountFromOreDict("dustCarbon", 1) }, + FluidUtils.getFluidStack("molten.tungstencarbide", 2 * 144), 0, + MathUtils.findPercentageOfInt( + (int) Math.max(Materials.get("TungstenCarbide").getMass() / 40L, 1L) + * Materials.get("TungstenCarbide").mBlastFurnaceTemp, + 80), 480); } - - //Vanadium-Gallium + // Vanadium-Gallium if (Materials.get("VanadiumGallium") != null) { CORE.RA.addBlastSmelterRecipe( - new ItemStack[]{ - ItemUtils.getGregtechCircuit(12), + new ItemStack[] { ItemUtils.getGregtechCircuit(12), ItemUtils.getItemStackOfAmountFromOreDict("dustGallium", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustVanadium", 3) - }, - FluidUtils.getFluidStack("molten.vanadiumgallium", 4 * 144), - 0, - MathUtils.findPercentageOfInt((int) Math.max(Materials.VanadiumGallium.getMass() / 40L, 1L) * Materials.VanadiumGallium.mBlastFurnaceTemp, 80), + ItemUtils.getItemStackOfAmountFromOreDict("dustVanadium", 3) }, + FluidUtils.getFluidStack("molten.vanadiumgallium", 4 * 144), 0, + MathUtils.findPercentageOfInt((int) Math.max(Materials.VanadiumGallium.getMass() / 40L, 1L) + * Materials.VanadiumGallium.mBlastFurnaceTemp, 80), 480); } - //EIO - //Dark Steel - if (ItemUtils.getItemStackOfAmountFromOreDict("dustElectricalSteel", 1) != ItemUtils.getSimpleStack(ModItems.AAA_Broken)) { + // EIO + // Dark Steel + if (ItemUtils.getItemStackOfAmountFromOreDict("dustElectricalSteel", 1) != ItemUtils + .getSimpleStack(ModItems.AAA_Broken)) { CORE.RA.addBlastSmelterRecipe( - new ItemStack[]{ - ItemUtils.getGregtechCircuit(2), + new ItemStack[] { ItemUtils.getGregtechCircuit(2), ItemUtils.getItemStackOfAmountFromOreDict("dustElectricalSteel", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustObsidian", 1) - }, - FluidUtils.getFluidStack("molten.darksteel", 2 * 144), - 0, - MathUtils.findPercentageOfInt(200 * 20, 80), - 120); + ItemUtils.getItemStackOfAmountFromOreDict("dustObsidian", 1) }, + FluidUtils.getFluidStack("molten.darksteel", 2 * 144), 0, + MathUtils.findPercentageOfInt(200 * 20, 80), 120); } - //Pulsating Iron - if (ItemUtils.getItemStackOfAmountFromOreDict("dustIron", 1) != ItemUtils.getSimpleStack(ModItems.AAA_Broken)) { + // Pulsating Iron + if (ItemUtils.getItemStackOfAmountFromOreDict("dustIron", 1) != ItemUtils + .getSimpleStack(ModItems.AAA_Broken)) { CORE.RA.addBlastSmelterRecipe( - new ItemStack[]{ - ItemUtils.getGregtechCircuit(2), + new ItemStack[] { ItemUtils.getGregtechCircuit(2), ItemUtils.getItemStackOfAmountFromOreDict("dustIron", 1), - ItemUtils.getSimpleStack(Items.ender_pearl) - }, - FluidUtils.getFluidStack("molten.pulsatingiron", 2 * 144), - 0, - MathUtils.findPercentageOfInt(8 * 20, 80), - 120); + ItemUtils.getSimpleStack(Items.ender_pearl) }, + FluidUtils.getFluidStack("molten.pulsatingiron", 2 * 144), 0, + MathUtils.findPercentageOfInt(8 * 20, 80), 120); } - //Energetic Alloy - if (ItemUtils.getItemStackOfAmountFromOreDict("dustEnergeticAlloy", 1) != ItemUtils.getSimpleStack(ModItems.AAA_Broken)) { + // Energetic Alloy + if (ItemUtils.getItemStackOfAmountFromOreDict("dustEnergeticAlloy", 1) != ItemUtils + .getSimpleStack(ModItems.AAA_Broken)) { CORE.RA.addBlastSmelterRecipe( - new ItemStack[]{ - ItemUtils.getGregtechCircuit(12), + new ItemStack[] { ItemUtils.getGregtechCircuit(12), ItemUtils.getItemStackOfAmountFromOreDict("dustIron", 1), - ItemUtils.getSimpleStack(Items.glowstone_dust) - }, + ItemUtils.getSimpleStack(Items.glowstone_dust) }, FluidUtils.getFluidStack("molten.redstone", 144), - FluidUtils.getFluidStack("molten.energeticalloy", 144), - 0, - MathUtils.findPercentageOfInt(9 * 20, 80), - 120); + FluidUtils.getFluidStack("molten.energeticalloy", 144), 0, + MathUtils.findPercentageOfInt(9 * 20, 80), 120); } - //Vibrant Alloy - if (ItemUtils.getItemStackOfAmountFromOreDict("dustVibrantAlloy", 1) != ItemUtils.getSimpleStack(ModItems.AAA_Broken)) { + // Vibrant Alloy + if (ItemUtils.getItemStackOfAmountFromOreDict("dustVibrantAlloy", 1) != ItemUtils + .getSimpleStack(ModItems.AAA_Broken)) { CORE.RA.addBlastSmelterRecipe( - new ItemStack[]{ - ItemUtils.getGregtechCircuit(12), + new ItemStack[] { ItemUtils.getGregtechCircuit(12), ItemUtils.getItemStackOfAmountFromOreDict("dustEnergeticAlloy", 1), - ItemUtils.getSimpleStack(Items.ender_pearl) - }, - FluidUtils.getFluidStack("molten.vibrantalloy", 144), - 0, - MathUtils.findPercentageOfInt(16 * 20, 80), - 480); + ItemUtils.getSimpleStack(Items.ender_pearl) }, + FluidUtils.getFluidStack("molten.vibrantalloy", 144), 0, + MathUtils.findPercentageOfInt(16 * 20, 80), 480); } } } private static void fluidcannerRecipes() { - //Sulfuric Acid - GT_Values.RA.addFluidCannerRecipe(ItemUtils.getSimpleStack(Items.glass_bottle), ItemUtils.getSimpleStack(ModItems.itemSulfuricPotion), FluidUtils.getFluidStack("sulfuricacid", 250), null); - GT_Values.RA.addFluidCannerRecipe(ItemUtils.getSimpleStack(ModItems.itemSulfuricPotion), ItemUtils.getSimpleStack(Items.glass_bottle), null, FluidUtils.getFluidStack("sulfuricacid", 250)); - - //Hydrofluoric Acid - GT_Values.RA.addFluidCannerRecipe(ItemUtils.getSimpleStack(Items.glass_bottle), ItemUtils.getSimpleStack(ModItems.itemHydrofluoricPotion), FluidUtils.getFluidStack("hydrofluoricacid", 250), null); - GT_Values.RA.addFluidCannerRecipe(ItemUtils.getSimpleStack(ModItems.itemHydrofluoricPotion), ItemUtils.getSimpleStack(Items.glass_bottle), null, FluidUtils.getFluidStack("hydrofluoricacid", 250)); + // Sulfuric Acid + GT_Values.RA.addFluidCannerRecipe(ItemUtils.getSimpleStack(Items.glass_bottle), + ItemUtils.getSimpleStack(ModItems.itemSulfuricPotion), FluidUtils.getFluidStack("sulfuricacid", 250), + null); + GT_Values.RA.addFluidCannerRecipe(ItemUtils.getSimpleStack(ModItems.itemSulfuricPotion), + ItemUtils.getSimpleStack(Items.glass_bottle), null, FluidUtils.getFluidStack("sulfuricacid", 250)); + + // Hydrofluoric Acid + GT_Values.RA.addFluidCannerRecipe(ItemUtils.getSimpleStack(Items.glass_bottle), + ItemUtils.getSimpleStack(ModItems.itemHydrofluoricPotion), + FluidUtils.getFluidStack("hydrofluoricacid", 250), null); + GT_Values.RA.addFluidCannerRecipe(ItemUtils.getSimpleStack(ModItems.itemHydrofluoricPotion), + ItemUtils.getSimpleStack(Items.glass_bottle), null, FluidUtils.getFluidStack("hydrofluoricacid", 250)); } - private static void cokeOvenRecipes(){ + private static void cokeOvenRecipes() { Logger.INFO("Loading Recipes for Industrial Coking Oven."); - //Wood to Charcoal - AddGregtechRecipe.addCokeAndPyrolyseRecipes( - GT_OreDictUnificator.get(OrePrefixes.log, Materials.Wood, 20L), - 20, - GT_ModHandler.getSteam(1000), - GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Charcoal, 24L), - FluidUtils.getFluidStack("fluid.coalgas", 1440), - 60, - 30); - - //Coal to Coke - AddGregtechRecipe.addCokeAndPyrolyseRecipes( - GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Coal, 16L), - 22, - GT_ModHandler.getSteam(1000), - ItemUtils.getItemStackOfAmountFromOreDict("fuelCoke", 10), - FluidUtils.getFluidStack("fluid.coalgas", 2880), - 30, - 120); - - //Coke & Coal - CORE.RA.addCokeOvenRecipe( - GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Coal, 12L), - ItemUtils.getItemStackOfAmountFromOreDict("fuelCoke", 6), - GT_ModHandler.getSteam(2000), - FluidUtils.getFluidStack("fluid.coalgas", 5040), - ItemUtils.getItemStackOfAmountFromOreDict("fuelCoke", 14), - 60*20, - 240); + // Wood to Charcoal + AddGregtechRecipe.addCokeAndPyrolyseRecipes(GT_OreDictUnificator.get(OrePrefixes.log, Materials.Wood, 20L), 20, + GT_ModHandler.getSteam(1000), GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Charcoal, 24L), + FluidUtils.getFluidStack("fluid.coalgas", 1440), 60, 30); + // Coal to Coke + AddGregtechRecipe.addCokeAndPyrolyseRecipes(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Coal, 16L), 22, + GT_ModHandler.getSteam(1000), ItemUtils.getItemStackOfAmountFromOreDict("fuelCoke", 10), + FluidUtils.getFluidStack("fluid.coalgas", 2880), 30, 120); + // Coke & Coal + CORE.RA.addCokeOvenRecipe(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Coal, 12L), + ItemUtils.getItemStackOfAmountFromOreDict("fuelCoke", 6), GT_ModHandler.getSteam(2000), + FluidUtils.getFluidStack("fluid.coalgas", 5040), + ItemUtils.getItemStackOfAmountFromOreDict("fuelCoke", 14), 60 * 20, 240); } - private static void matterFabRecipes(){ + private static void matterFabRecipes() { Logger.INFO("Loading Recipes for Matter Fabricator."); try { - CORE.RA.addMatterFabricatorRecipe( - Materials.UUAmplifier.getFluid(1L), //Fluid Input - Materials.UUMatter.getFluid(1L), //Fluid Output - 800, //Time in ticks - 32); //EU - }catch (final NullPointerException e){Logger.INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");} + CORE.RA.addMatterFabricatorRecipe(Materials.UUAmplifier.getFluid(1L), // Fluid + // Input + Materials.UUMatter.getFluid(1L), // Fluid Output + 800, // Time in ticks + 32); // EU + } + catch (final NullPointerException e) { + Logger.INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE"); + } try { - CORE.RA.addMatterFabricatorRecipe( - null, //Fluid Input - Materials.UUMatter.getFluid(1L), //Fluid Output - 3200, //Time in ticks - 32); //EU - }catch (final NullPointerException e){Logger.INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");} + CORE.RA.addMatterFabricatorRecipe(null, // Fluid Input + Materials.UUMatter.getFluid(1L), // Fluid Output + 3200, // Time in ticks + 32); // EU + } + catch (final NullPointerException e) { + Logger.INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE"); + } } - private static void dehydratorRecipes(){ + private static void dehydratorRecipes() { Logger.INFO("Loading Recipes for Chemical Dehydrator."); try { - //Makes Lithium Carbonate - CORE.RA.addDehydratorRecipe( - ItemUtils.getItemStackOfAmountFromOreDict("cellSulfuricLithium", 1), //Item Input - FluidUtils.getFluidStack("sulfuriclithium", 440), //Fluid input (slot 1) - new ItemStack[]{ - ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 1), + // Makes Lithium Carbonate + CORE.RA.addDehydratorRecipe(ItemUtils.getItemStackOfAmountFromOreDict("cellSulfuricLithium", 1), // Item + // Input + FluidUtils.getFluidStack("sulfuriclithium", 440), // Fluid + // input + // (slot + // 1) + new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 1), ItemUtils.getItemStackOfAmountFromOreDict("dustSulfur", 3), ItemUtils.getItemStackOfAmountFromOreDict("dustCopper", 1), ItemUtils.getItemStackOfAmountFromOreDict("dustSodium", 1), ItemUtils.getItemStackOfAmountFromOreDict("dustCarbon", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustLithium7", 3) - }, //Output Array of Items - Upto 9 - 30*20, //Time in ticks - 30); //EU - }catch (final NullPointerException e){Logger.INFO("[cellSulfuricLithium] FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");} + ItemUtils.getItemStackOfAmountFromOreDict("dustLithium7", 3) }, // Output + // Array + // of + // Items + // - + // Upto + // 9 + 30 * 20, // Time in ticks + 30); // EU + } + catch (final NullPointerException e) { + Logger.INFO("[cellSulfuricLithium] FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE"); + } try { - ItemStack cells = ItemUtils.getItemStackWithMeta(LoadedMods.IndustrialCraft2, "IC2:itemCellEmpty", "Empty Fluid Cells", 0, 12); + ItemStack cells = ItemUtils.getItemStackWithMeta(LoadedMods.IndustrialCraft2, "IC2:itemCellEmpty", + "Empty Fluid Cells", 0, 12); - if (cells == null){ + if (cells == null) { cells = ItemUtils.getItemStackOfAmountFromOreDictNoBroken("cellEmpty", 12); } - final ItemStack[] input = {cells, ItemUtils.getItemStackOfAmountFromOreDict("dustLepidolite", 20)}; - - CORE.RA.addDehydratorRecipe( - input, //Item input (Array, up to 2) - FluidUtils.getFluidStack("sulfuricacid", 10000), //Fluid input (slot 1) - FluidUtils.getFluidStack("sulfuriclithium", 10000), //Fluid output (slot 2) - new ItemStack[]{ - ItemUtils.getItemStackOfAmountFromOreDict("dustPotassium", 1), + final ItemStack[] input = { cells, ItemUtils.getItemStackOfAmountFromOreDict("dustLepidolite", 20) }; + + CORE.RA.addDehydratorRecipe(input, // Item input (Array, up to 2) + FluidUtils.getFluidStack("sulfuricacid", 10000), // Fluid + // input + // (slot + // 1) + FluidUtils.getFluidStack("sulfuriclithium", 10000), // Fluid + // output + // (slot + // 2) + new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("dustPotassium", 1), ItemUtils.getItemStackOfAmountFromOreDict("dustAluminium", 4), ItemUtils.getItemStackOfAmountFromOreDict("cellOxygen", 10), ItemUtils.getItemStackOfAmountFromOreDict("cellFluorine", 2), - ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumCarbonate", 3), //LithiumCarbonate - }, //Output Array of Items - Upto 9, - new int[]{0}, - 75*20, //Time in ticks - 1000); //EU + ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumCarbonate", 3), // LithiumCarbonate + }, // Output Array of Items - Upto 9, + new int[] { 0 }, 75 * 20, // Time in ticks + 1000); // EU - }catch (final NullPointerException e){Logger.INFO("[dustLepidolite] FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");} + } + catch (final NullPointerException e) { + Logger.INFO("[dustLepidolite] FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE"); + } try { - CORE.RA.addDehydratorRecipe( - new ItemStack[]{ - ItemUtils.getItemStackOfAmountFromOreDict("cellWater", 10) - }, //Item input (Array, up to 2) - FluidUtils.getFluidStack("molten.uraniumtetrafluoride", 1440), //Fluid input (slot 1) - null, //Fluid output (slot 2) - new ItemStack[]{ - ItemUtils.getItemStackOfAmountFromOreDict("dustUraniumTetrafluoride", 10), - ItemUtils.getItemStackOfAmountFromOreDictNoBroken("cellEmpty", 10) - }, //Output Array of Items - Upto 9, - new int[]{0}, - 150*20, //Time in ticks - 2000); //EU - - }catch (final NullPointerException e){Logger.INFO("[dustUraniumTetrafluoride] FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");} + CORE.RA.addDehydratorRecipe(new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("cellWater", 10) }, // Item + // input + // (Array, + // up + // to + // 2) + FluidUtils.getFluidStack("molten.uraniumtetrafluoride", 1440), // Fluid + // input + // (slot + // 1) + null, // Fluid output (slot 2) + new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("dustUraniumTetrafluoride", 10), + ItemUtils.getItemStackOfAmountFromOreDictNoBroken("cellEmpty", 10) }, // Output + // Array + // of + // Items + // - + // Upto + // 9, + new int[] { 0 }, 150 * 20, // Time in ticks + 2000); // EU + + } + catch (final NullPointerException e) { + Logger.INFO("[dustUraniumTetrafluoride] FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE"); + } try { - CORE.RA.addDehydratorRecipe( - new ItemStack[]{ - ItemUtils.getItemStackOfAmountFromOreDict("cellWater", 10) - }, //Item input (Array, up to 2) - FluidUtils.getFluidStack("molten.uraniumhexafluoride", 1440), //Fluid input (slot 1) - null, //Fluid output (slot 2) - new ItemStack[]{ - ItemUtils.getItemStackOfAmountFromOreDict("dustUraniumHexafluoride", 10), - ItemUtils.getItemStackOfAmountFromOreDictNoBroken("cellEmpty", 10) - }, //Output Array of Items - Upto 9, - new int[]{0}, - 300*20, //Time in ticks - 4000); //EU - - }catch (final NullPointerException e){Logger.INFO("[dustUraniumHexafluoride] FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");} - - //Raisins from Grapes + CORE.RA.addDehydratorRecipe(new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("cellWater", 10) }, // Item + // input + // (Array, + // up + // to + // 2) + FluidUtils.getFluidStack("molten.uraniumhexafluoride", 1440), // Fluid + // input + // (slot + // 1) + null, // Fluid output (slot 2) + new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("dustUraniumHexafluoride", 10), + ItemUtils.getItemStackOfAmountFromOreDictNoBroken("cellEmpty", 10) }, // Output + // Array + // of + // Items + // - + // Upto + // 9, + new int[] { 0 }, 300 * 20, // Time in ticks + 4000); // EU + + } + catch (final NullPointerException e) { + Logger.INFO("[dustUraniumHexafluoride] FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE"); + } + + // Raisins from Grapes try { - CORE.RA.addDehydratorRecipe( - new ItemStack[]{ - ItemUtils.getItemStackOfAmountFromOreDict("cropGrape", 1) - }, //Item input (Array, up to 2) - null, //Fluid input (slot 1) - null, //Fluid output (slot 2) - new ItemStack[]{ - ItemUtils.getItemStackOfAmountFromOreDict("foodRaisins", 1) - }, //Output Array of Items - Upto 9, - new int[]{0}, - 10*20, //Time in ticks - 8); //EU - - }catch (final NullPointerException e){Logger.INFO("[foodRaisins] FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");} - - //Calcium Hydroxide - if ((ItemUtils.getItemStackOfAmountFromOreDict("dustQuicklime", 1).getItem() != ModItems.AAA_Broken) || LoadedMods.IHL){ + CORE.RA.addDehydratorRecipe(new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("cropGrape", 1) }, // Item + // input + // (Array, + // up + // to + // 2) + null, // Fluid input (slot 1) + null, // Fluid output (slot 2) + new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("foodRaisins", 1) }, // Output + // Array + // of + // Items + // - + // Upto + // 9, + new int[] { 0 }, 10 * 20, // Time in ticks + 8); // EU + + } + catch (final NullPointerException e) { + Logger.INFO("[foodRaisins] FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE"); + } + + // Calcium Hydroxide + if ((ItemUtils.getItemStackOfAmountFromOreDict("dustQuicklime", 1).getItem() != ModItems.AAA_Broken) + || LoadedMods.IHL) { try { CORE.RA.addDehydratorRecipe( - new ItemStack[]{ - ItemUtils.getItemStackOfAmountFromOreDict("dustQuicklime", 10) - }, //Item input (Array, up to 2) - FluidUtils.getFluidStack("water", 10000), //Fluid input (slot 1) - null, //Fluid output (slot 2) - new ItemStack[]{ - ItemUtils.getItemStackOfAmountFromOreDict("dustCalciumHydroxide", 20) - }, //Output Array of Items - Upto 9, - new int[]{0}, - 120*20, //Time in ticks - 120); //EU - - }catch (final NullPointerException e){Logger.INFO("[dustCalciumHydroxide] FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");} - - //2 LiOH + CaCO3 + new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("dustQuicklime", 10) }, // Item + // input + // (Array, + // up + // to + // 2) + FluidUtils.getFluidStack("water", 10000), // Fluid input + // (slot 1) + null, // Fluid output (slot 2) + new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("dustCalciumHydroxide", 20) }, // Output + // Array + // of + // Items + // - + // Upto + // 9, + new int[] { 0 }, 120 * 20, // Time in ticks + 120); // EU + + } + catch (final NullPointerException e) { + Logger.INFO("[dustCalciumHydroxide] FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE"); + } + + // 2 LiOH + CaCO3 try { CORE.RA.addDehydratorRecipe( - new ItemStack[]{ - ItemUtils.getItemStackOfAmountFromOreDict("dustLi2CO3CaOH2", 5) - }, //Item input (Array, up to 2) - null, //Fluid input (slot 1) - null, //Fluid output (slot 2) - new ItemStack[]{ - ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumHydroxide", 2), - ItemUtils.getItemStackOfAmountFromOreDict("dustCalciumCarbonate", 3) - }, //Output Array of Items - Upto 9, - new int[]{0}, - 120*20, //Time in ticks - 1000); //EU - - }catch (final NullPointerException e){Logger.INFO("[dustLi2CO3CaOH2] FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");} - - //LiOH Liquid to Dust + new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("dustLi2CO3CaOH2", 5) }, // Item + // input + // (Array, + // up + // to + // 2) + null, // Fluid input (slot 1) + null, // Fluid output (slot 2) + new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumHydroxide", 2), + ItemUtils.getItemStackOfAmountFromOreDict("dustCalciumCarbonate", 3) }, // Output + // Array + // of + // Items + // - + // Upto + // 9, + new int[] { 0 }, 120 * 20, // Time in ticks + 1000); // EU + + } + catch (final NullPointerException e) { + Logger.INFO("[dustLi2CO3CaOH2] FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE"); + } + + // LiOH Liquid to Dust try { - CORE.RA.addDehydratorRecipe( - new ItemStack[]{ - ItemUtils.getGregtechCircuit(0) - }, //Item input (Array, up to 2) - FluidUtils.getFluidStack("lithiumhydroxide", 144), //Fluid input (slot 1) - null, //Fluid output (slot 2) - new ItemStack[]{ - ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumHydroxide", 1) - }, //Output Array of Items - Upto 9, - new int[]{0}, - 1*20, //Time in ticks - 64); //EU - - }catch (final NullPointerException e){Logger.INFO("[dustLithiumHydroxide] FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");} - - //Zirconium Chloride -> TetraFluoride + CORE.RA.addDehydratorRecipe(new ItemStack[] { ItemUtils.getGregtechCircuit(0) }, // Item + // input + // (Array, + // up + // to + // 2) + FluidUtils.getFluidStack("lithiumhydroxide", 144), // Fluid + // input + // (slot + // 1) + null, // Fluid output (slot 2) + new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumHydroxide", 1) }, // Output + // Array + // of + // Items + // - + // Upto + // 9, + new int[] { 0 }, 1 * 20, // Time in ticks + 64); // EU + + } + catch (final NullPointerException e) { + Logger.INFO("[dustLithiumHydroxide] FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE"); + } + + // Zirconium Chloride -> TetraFluoride try { CORE.RA.addDehydratorRecipe( - new ItemStack[]{ - ItemUtils.getItemStackOfAmountFromOreDict("dustCookedZrCl4", 9), - ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 9) - }, //Item input (Array, up to 2) - FluidUtils.getFluidStack("hydrofluoricacid", 9*144), //Fluid input (slot 1) - null, //Fluid output (slot 2) - new ItemStack[]{ - ItemUtils.getItemStackOfAmountFromOreDict("cellHydrogenChloride", 9), - ItemUtils.getItemStackOfAmountFromOreDict("dustZrF4", 9) - }, //Output Array of Items - Upto 9, - new int[]{0}, - 120*20, //Time in ticks - 500); //EU - - }catch (final NullPointerException e){Logger.INFO("[dustZrF4] FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");} - - //CaF2 + H2SO4 → CaSO4(solid) + 2 HF + new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("dustCookedZrCl4", 9), + ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 9) }, // Item + // input + // (Array, + // up + // to + // 2) + FluidUtils.getFluidStack("hydrofluoricacid", 9 * 144), // Fluid + // input + // (slot + // 1) + null, // Fluid output (slot 2) + new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("cellHydrogenChloride", 9), + ItemUtils.getItemStackOfAmountFromOreDict("dustZrF4", 9) }, // Output + // Array + // of + // Items + // - + // Upto + // 9, + new int[] { 0 }, 120 * 20, // Time in ticks + 500); // EU + + } + catch (final NullPointerException e) { + Logger.INFO("[dustZrF4] FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE"); + } + + // CaF2 + H2SO4 → CaSO4(solid) + 2 HF try { CORE.RA.addDehydratorRecipe( - new ItemStack[]{ - ItemUtils.getItemStackOfAmountFromOreDict("dustFluorite", 37), - ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 16) - }, //Item input (Array, up to 2) - FluidUtils.getFluidStack("sulfuricacid", 56*144), //Fluid input (slot 1) - null, //Fluid output (slot 2) - new ItemStack[]{ - ItemUtils.getItemStackOfAmountFromOreDict("dustCalciumSulfate", 30), + new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("dustFluorite", 37), + ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 16) }, // Item + // input + // (Array, + // up + // to + // 2) + FluidUtils.getFluidStack("sulfuricacid", 56 * 144), // Fluid + // input + // (slot + // 1) + null, // Fluid output (slot 2) + new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("dustCalciumSulfate", 30), ItemUtils.getItemStackOfAmountFromOreDict("cellHydrofluoricAcid", 16), ItemUtils.getItemStackOfAmountFromOreDict("dustSilver", 1), ItemUtils.getItemStackOfAmountFromOreDict("dustGold", 2), ItemUtils.getItemStackOfAmountFromOreDict("dustTin", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustCopper", 2) - }, //Output Array of Items - Upto 9, - new int[]{0, 0, 100, 100, 300, 200}, - 10*60*20, //Time in ticks - 230); //EU + ItemUtils.getItemStackOfAmountFromOreDict("dustCopper", 2) }, // Output + // Array + // of + // Items + // - + // Upto + // 9, + new int[] { 0, 0, 100, 100, 300, 200 }, 10 * 60 * 20, // Time + // in + // ticks + 230); // EU - }catch (final NullPointerException e){Logger.INFO("[dustFluorite] FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");} + } + catch (final NullPointerException e) { + Logger.INFO("[dustFluorite] FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE"); + } - //Be(OH)2 + 2 (NH4)HF2 → (NH4)2BeF4 + 2 H2O + // Be(OH)2 + 2 (NH4)HF2 → (NH4)2BeF4 + 2 H2O try { CORE.RA.addDehydratorRecipe( - new ItemStack[]{ - ItemUtils.getItemStackOfAmountFromOreDict("cellBerylliumHydroxide", 2), - ItemUtils.getItemStackOfAmountFromOreDict("cellAmmoniumBifluoride", 4) - }, //Item input (Array, up to 2) - null, //Fluid input (slot 1) - FluidUtils.getFluidStack("ammoniumtetrafluoroberyllate", 6000), //Fluid output (slot 2) - new ItemStack[]{ - ItemUtils.getItemStackOfAmountFromOreDict("cellWater", 4), - ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 2) - }, //Output Array of Items - Upto 9, - new int[]{0, 0, 0}, - 32*20, //Time in ticks - 64); //EU - - - }catch (final NullPointerException e){Logger.INFO("[ammoniumtetrafluoroberyllate] FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");} - - //(NH4)2BeF4 → 2 NH3 + 2 HF + BeF2 + new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("cellBerylliumHydroxide", 2), + ItemUtils.getItemStackOfAmountFromOreDict("cellAmmoniumBifluoride", 4) }, // Item + // input + // (Array, + // up + // to + // 2) + null, // Fluid input (slot 1) + FluidUtils.getFluidStack("ammoniumtetrafluoroberyllate", 6000), // Fluid + // output + // (slot + // 2) + new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("cellWater", 4), + ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 2) }, // Output + // Array + // of + // Items + // - + // Upto + // 9, + new int[] { 0, 0, 0 }, 32 * 20, // Time in ticks + 64); // EU + + } + catch (final NullPointerException e) { + Logger.INFO("[ammoniumtetrafluoroberyllate] FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE"); + } + + // (NH4)2BeF4 → 2 NH3 + 2 HF + BeF2 try { CORE.RA.addDehydratorRecipe( - new ItemStack[]{ - ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 5) - }, //Item input (Array, up to 2) - FluidUtils.getFluidStack("ammoniumtetrafluoroberyllate", 5000), //Fluid input (slot 1) - null, //Fluid output (slot 2) - new ItemStack[]{ - ItemUtils.getItemStackOfAmountFromOreDict("cellAmmonia", 2), + new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 5) }, // Item + // input + // (Array, + // up + // to + // 2) + FluidUtils.getFluidStack("ammoniumtetrafluoroberyllate", 5000), // Fluid + // input + // (slot + // 1) + null, // Fluid output (slot 2) + new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("cellAmmonia", 2), ItemUtils.getItemStackOfAmountFromOreDict("cellHydrofluoricAcid", 2), - ItemUtils.getItemStackOfAmountFromOreDict("cellBerylliumFluoride", 1) - }, //Output Array of Items - Upto 9, - new int[]{0, 0, 0}, - 5*60*20, //Time in ticks - 120); //EU + ItemUtils.getItemStackOfAmountFromOreDict("cellBerylliumFluoride", 1) }, // Output + // Array + // of + // Items + // - + // Upto + // 9, + new int[] { 0, 0, 0 }, 5 * 60 * 20, // Time in ticks + 120); // EU - }catch (final NullPointerException e){Logger.INFO("[cellBerylliumFluoride] FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");} + } + catch (final NullPointerException e) { + Logger.INFO("[cellBerylliumFluoride] FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE"); + } - //Process Waste Water + // Process Waste Water try { - CORE.RA.addDehydratorRecipe( - null, //Item input (Array, up to 2) - FluidUtils.getFluidStack("sludge", 1000), //Fluid input (slot 1) - FluidUtils.getFluidStack("nitricacid", 10), //Fluid output (slot 2) - new ItemStack[]{ - ItemUtils.getItemStackOfAmountFromOreDict("dustTinyIron", 1), + CORE.RA.addDehydratorRecipe(null, // Item input (Array, up to 2) + FluidUtils.getFluidStack("sludge", 1000), // Fluid input + // (slot 1) + FluidUtils.getFluidStack("nitricacid", 10), // Fluid + // output + // (slot 2) + new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("dustTinyIron", 1), ItemUtils.getItemStackOfAmountFromOreDict("dustTinyCopper", 1), ItemUtils.getItemStackOfAmountFromOreDict("dustTinyTin", 1), ItemUtils.getItemStackOfAmountFromOreDict("dustTinyNickel", 1), @@ -707,598 +747,571 @@ public class RECIPES_GREGTECH { ItemUtils.getItemStackOfAmountFromOreDict("dustTinyAluminium", 1), ItemUtils.getItemStackOfAmountFromOreDict("dustTinySilver", 1), ItemUtils.getItemStackOfAmountFromOreDict("dustTinyGold", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustTinyIridium", 1) - }, //Output Array of Items - Upto 9, - new int[]{10, 5, 5, 4, 4, 3, 2, 2, 1}, - 2*20, //Time in ticks - 500); //EU + ItemUtils.getItemStackOfAmountFromOreDict("dustTinyIridium", 1) }, // Output + // Array + // of + // Items + // - + // Upto + // 9, + new int[] { 10, 5, 5, 4, 4, 3, 2, 2, 1 }, 2 * 20, // Time + // in + // ticks + 500); // EU - }catch (final NullPointerException e){Logger.INFO("[sludge] FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");} + } + catch (final NullPointerException e) { + Logger.INFO("[sludge] FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE"); + } - } } - private static void lftrRecipes(){ + private static void lftrRecipes() { try { - }catch (final NullPointerException e){Logger.INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");} + } + catch (final NullPointerException e) { + Logger.INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE"); + } try { - //Fli2BeF4 + Thorium TetraFluoride = Uranium233 - CORE.RA.addLFTRRecipe( - FluidUtils.getFluidStack("molten.LiFBeF2ThF4UF4".toLowerCase(), 144*4), //Fluid input (slot 1) - FluidUtils.getFluidStack("molten.li2bef4", 1200), //Fluid output (slot 2) - FluidUtils.getFluidStack("molten.uraniumhexafluoride", (1200+(144*4))), //Output Array of Items - Upto 9, - 300*60*20, //Time in ticks - 3500); //EU - - }catch (final NullPointerException e){Logger.INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");} + // Fli2BeF4 + Thorium TetraFluoride = Uranium233 + CORE.RA.addLFTRRecipe(FluidUtils.getFluidStack("molten.LiFBeF2ThF4UF4".toLowerCase(), 144 * 4), // Fluid + // input + // (slot + // 1) + FluidUtils.getFluidStack("molten.li2bef4", 1200), // Fluid + // output + // (slot + // 2) + FluidUtils.getFluidStack("molten.uraniumhexafluoride", (1200 + (144 * 4))), // Output + // Array + // of + // Items + // - + // Upto + // 9, + 300 * 60 * 20, // Time in ticks + 3500); // EU + + } + catch (final NullPointerException e) { + Logger.INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE"); + } try { - //Fli2BeF4 + Uranium235 = 1x Uranium233 - CORE.RA.addLFTRRecipe( - FluidUtils.getFluidStack("molten.LiFBeF2ZrF4U235".toLowerCase(), 144*16), //Fluid input (slot 1) - FluidUtils.getFluidStack("molten.li2bef4", 144*12), //Fluid output (slot 2) - FluidUtils.getFluidStack("molten.uraniumhexafluoride", 3*144), //Output Array of Items - Upto 9, - 120*60*20, //Time in ticks - 8000); //EU - }catch (final NullPointerException e){Logger.INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");} + // Fli2BeF4 + Uranium235 = 1x Uranium233 + CORE.RA.addLFTRRecipe(FluidUtils.getFluidStack("molten.LiFBeF2ZrF4U235".toLowerCase(), 144 * 16), // Fluid + // input + // (slot + // 1) + FluidUtils.getFluidStack("molten.li2bef4", 144 * 12), // Fluid + // output + // (slot + // 2) + FluidUtils.getFluidStack("molten.uraniumhexafluoride", 3 * 144), // Output + // Array + // of + // Items + // - + // Upto + // 9, + 120 * 60 * 20, // Time in ticks + 8000); // EU + } + catch (final NullPointerException e) { + Logger.INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE"); + } try { - //Fli2BeF4 + Uranium233 TetraFluoride = Uranium233 - CORE.RA.addLFTRRecipe( - FluidUtils.getFluidStack("molten.LiFBeF2ZrF4UF4".toLowerCase(), 144*2), //Fluid input (slot 1) - FluidUtils.getFluidStack("molten.li2bef4", 500), //Fluid output (slot 2) - FluidUtils.getFluidStack("molten.uraniumhexafluoride", 1288), //Output Array of Items - Upto 9, - 420*60*20, //Time in ticks - 4000); //EU - - }catch (final NullPointerException e){Logger.INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");} + // Fli2BeF4 + Uranium233 TetraFluoride = Uranium233 + CORE.RA.addLFTRRecipe(FluidUtils.getFluidStack("molten.LiFBeF2ZrF4UF4".toLowerCase(), 144 * 2), // Fluid + // input + // (slot + // 1) + FluidUtils.getFluidStack("molten.li2bef4", 500), // Fluid + // output + // (slot + // 2) + FluidUtils.getFluidStack("molten.uraniumhexafluoride", 1288), // Output + // Array + // of + // Items + // - + // Upto + // 9, + 420 * 60 * 20, // Time in ticks + 4000); // EU + + } + catch (final NullPointerException e) { + Logger.INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE"); + } } - private static void fissionFuelRecipes(){ + private static void fissionFuelRecipes() { try { final String salt_LiFBeF2ThF4UF4 = "LiFBeF2ThF4UF4".toLowerCase(); final String salt_LiFBeF2ZrF4U235 = "LiFBeF2ZrF4U235".toLowerCase(); final String salt_LiFBeF2ZrF4UF4 = "LiFBeF2ZrF4UF4".toLowerCase(); - final FluidStack LithiumFluoride = FluidUtils.getFluidStack("molten.lithiumfluoride", 100); //Re-usable FluidStacks - final FluidStack BerylliumFluoride = FluidUtils.getFluidStack("molten.berylliumfluoride", 100); //Re-usable FluidStacks - final FluidStack ThoriumFluoride = FluidUtils.getFluidStack("molten.thoriumtetrafluoride", 100); //Re-usable FluidStacks - final FluidStack ZirconiumFluoride = FluidUtils.getFluidStack("molten.zirconiumtetrafluoride", 100); //Re-usable FluidStacks - final FluidStack UraniumTetraFluoride = FluidUtils.getFluidStack("molten.uraniumtetrafluoride", 100); //Re-usable FluidStacks - final FluidStack Uranium235 = FluidUtils.getFluidStack("molten.uranium235", 1000); //Re-usable FluidStacks - - final FluidStack LiFBeF2ThF4UF4 = FluidUtils.getFluidStack("molten."+salt_LiFBeF2ThF4UF4, 100); //Re-usable FluidStacks - final FluidStack LiFBeF2ZrF4U235 = FluidUtils.getFluidStack("molten."+salt_LiFBeF2ZrF4U235, 100); //Re-usable FluidStacks - final FluidStack LiFBeF2ZrF4UF4 = FluidUtils.getFluidStack("molten."+salt_LiFBeF2ZrF4UF4, 100); //Re-usable FluidStacks - - //7LiF - BeF2 - ZrF4 - UF4 - 650C - CORE.RA.addFissionFuel( - FluidUtils.getFluidStack(LithiumFluoride, 6500), //Input A - FluidUtils.getFluidStack(BerylliumFluoride, 2500), //Input B - FluidUtils.getFluidStack(ZirconiumFluoride, 800), //Input C - FluidUtils.getFluidStack(UraniumTetraFluoride, 700), //Input D - null, null, null, null, null, //Extra 5 inputs - FluidUtils.getFluidStack(LiFBeF2ZrF4UF4, 10000), //Output Fluid 1 - null, //Output Fluid 2 - 60*60*20, //Duration + final FluidStack LithiumFluoride = FluidUtils.getFluidStack("molten.lithiumfluoride", 100); // Re-usable + // FluidStacks + final FluidStack BerylliumFluoride = FluidUtils.getFluidStack("molten.berylliumfluoride", 100); // Re-usable + // FluidStacks + final FluidStack ThoriumFluoride = FluidUtils.getFluidStack("molten.thoriumtetrafluoride", 100); // Re-usable + // FluidStacks + final FluidStack ZirconiumFluoride = FluidUtils.getFluidStack("molten.zirconiumtetrafluoride", 100); // Re-usable + // FluidStacks + final FluidStack UraniumTetraFluoride = FluidUtils.getFluidStack("molten.uraniumtetrafluoride", 100); // Re-usable + // FluidStacks + final FluidStack Uranium235 = FluidUtils.getFluidStack("molten.uranium235", 1000); // Re-usable + // FluidStacks + + final FluidStack LiFBeF2ThF4UF4 = FluidUtils.getFluidStack("molten." + salt_LiFBeF2ThF4UF4, 100); // Re-usable + // FluidStacks + final FluidStack LiFBeF2ZrF4U235 = FluidUtils.getFluidStack("molten." + salt_LiFBeF2ZrF4U235, 100); // Re-usable + // FluidStacks + final FluidStack LiFBeF2ZrF4UF4 = FluidUtils.getFluidStack("molten." + salt_LiFBeF2ZrF4UF4, 100); // Re-usable + // FluidStacks + + // 7LiF - BeF2 - ZrF4 - UF4 - 650C + CORE.RA.addFissionFuel(FluidUtils.getFluidStack(LithiumFluoride, 6500), // Input + // A + FluidUtils.getFluidStack(BerylliumFluoride, 2500), // Input + // B + FluidUtils.getFluidStack(ZirconiumFluoride, 800), // Input C + FluidUtils.getFluidStack(UraniumTetraFluoride, 700), // Input + // D + null, null, null, null, null, // Extra 5 inputs + FluidUtils.getFluidStack(LiFBeF2ZrF4UF4, 10000), // Output + // Fluid + // 1 + null, // Output Fluid 2 + 60 * 60 * 20, // Duration 500); - //7LiF - BeF2 - ZrF4 - U235 - 590C - CORE.RA.addFissionFuel( - FluidUtils.getFluidStack(LithiumFluoride, 5500), //Input A - FluidUtils.getFluidStack(BerylliumFluoride, 1500), //Input B - FluidUtils.getFluidStack(ZirconiumFluoride, 600), //Input C - FluidUtils.getFluidStack(Uranium235, 2400), //Input D - null, null, null, null, null, //Extra 5 inputs - FluidUtils.getFluidStack(LiFBeF2ZrF4U235, 10000), //Output Fluid 1 - null, //Output Fluid 2 - 45*60*20, //Duration + // 7LiF - BeF2 - ZrF4 - U235 - 590C + CORE.RA.addFissionFuel(FluidUtils.getFluidStack(LithiumFluoride, 5500), // Input + // A + FluidUtils.getFluidStack(BerylliumFluoride, 1500), // Input + // B + FluidUtils.getFluidStack(ZirconiumFluoride, 600), // Input C + FluidUtils.getFluidStack(Uranium235, 2400), // Input D + null, null, null, null, null, // Extra 5 inputs + FluidUtils.getFluidStack(LiFBeF2ZrF4U235, 10000), // Output + // Fluid + // 1 + null, // Output Fluid 2 + 45 * 60 * 20, // Duration 500); - //7liF - BeF2 - ThF4 - UF4 - 566C - CORE.RA.addFissionFuel( - FluidUtils.getFluidStack(LithiumFluoride, 6200), //Input A - FluidUtils.getFluidStack(BerylliumFluoride, 2800), //Input B - FluidUtils.getFluidStack(ThoriumFluoride, 700), //Input C - FluidUtils.getFluidStack(UraniumTetraFluoride, 700), //Input D - null, null, null, null, null, //Extra 5 inputs - FluidUtils.getFluidStack(LiFBeF2ThF4UF4, 10000), //Output Fluid 1 - null, //Output Fluid 2 - 60*60*20, //Duration + // 7liF - BeF2 - ThF4 - UF4 - 566C + CORE.RA.addFissionFuel(FluidUtils.getFluidStack(LithiumFluoride, 6200), // Input + // A + FluidUtils.getFluidStack(BerylliumFluoride, 2800), // Input + // B + FluidUtils.getFluidStack(ThoriumFluoride, 700), // Input C + FluidUtils.getFluidStack(UraniumTetraFluoride, 700), // Input + // D + null, null, null, null, null, // Extra 5 inputs + FluidUtils.getFluidStack(LiFBeF2ThF4UF4, 10000), // Output + // Fluid + // 1 + null, // Output Fluid 2 + 60 * 60 * 20, // Duration 500); - }catch (final NullPointerException e){Logger.INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");} + } + catch (final NullPointerException e) { + Logger.INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE"); + } } - private static void assemblerRecipes(){ - //ItemUtils.getSimpleStack(GregtechItemList.Casing_Vanadium_Redox.get(1) - addAR(ItemUtils.getItemStackOfAmountFromOreDict("plateVanadium", 32), ItemUtils.getItemStackOfAmountFromOreDict("frameGtVanadiumSteel", 8), FluidUtils.getFluidStack("oxygen", 8000), ItemUtils.simpleMetaStack(ModItems.itemHalfCompleteCasings, 0, 4), 16, 64); - addAR(ItemUtils.simpleMetaStack(ModItems.itemHalfCompleteCasings, 0, 2), ItemUtils.getItemStackOfAmountFromOreDict("plateVanadiumGallium", 8), FluidUtils.getFluidStack("molten.tantalum", 144*4), ItemUtils.simpleMetaStack(ModItems.itemHalfCompleteCasings, 1, 8), 32, 128); - addAR(ItemUtils.simpleMetaStack(ModItems.itemHalfCompleteCasings, 1, 1), ItemUtils.getItemStackOfAmountFromOreDict("plateLead", 4), FluidUtils.getFluidStack("nitrogen", 1000), ItemUtils.getSimpleStack(GregtechItemList.Casing_Vanadium_Redox.get(1), 1), 64, 256); - addAR(ItemUtils.getItemStackOfAmountFromOreDict("plateIncoloy020", 16), ItemUtils.getItemStackOfAmountFromOreDict("frameGtIncoloyMA956", 4), null, GregtechItemList.Casing_Power_SubStation.get(4), 80, 128); + private static void assemblerRecipes() { + // ItemUtils.getSimpleStack(GregtechItemList.Casing_Vanadium_Redox.get(1) + addAR(ItemUtils.getItemStackOfAmountFromOreDict("plateVanadium", 32), + ItemUtils.getItemStackOfAmountFromOreDict("frameGtVanadiumSteel", 8), + FluidUtils.getFluidStack("oxygen", 8000), + ItemUtils.simpleMetaStack(ModItems.itemHalfCompleteCasings, 0, 4), 16, 64); + addAR(ItemUtils.simpleMetaStack(ModItems.itemHalfCompleteCasings, 0, 2), + ItemUtils.getItemStackOfAmountFromOreDict("plateVanadiumGallium", 8), + FluidUtils.getFluidStack("molten.tantalum", 144 * 4), + ItemUtils.simpleMetaStack(ModItems.itemHalfCompleteCasings, 1, 8), 32, 128); + addAR(ItemUtils.simpleMetaStack(ModItems.itemHalfCompleteCasings, 1, 1), + ItemUtils.getItemStackOfAmountFromOreDict("plateLead", 4), FluidUtils.getFluidStack("nitrogen", 1000), + ItemUtils.getSimpleStack(GregtechItemList.Casing_Vanadium_Redox.get(1), 1), 64, 256); + addAR(ItemUtils.getItemStackOfAmountFromOreDict("plateIncoloy020", 16), + ItemUtils.getItemStackOfAmountFromOreDict("frameGtIncoloyMA956", 4), null, + GregtechItemList.Casing_Power_SubStation.get(4), 80, 128); } - private static boolean addAR(final ItemStack inputA, final ItemStack inputB, final ItemStack outputA, final int seconds, final int voltage){ - //return GT_Values.RA.addAssemblerRecipe(inputA, inputB, outputA, seconds*20, voltage); - return addAR(inputA, inputB, null, outputA, seconds*20, voltage); + private static boolean addAR(final ItemStack inputA, final ItemStack inputB, final ItemStack outputA, + final int seconds, final int voltage) { + // return GT_Values.RA.addAssemblerRecipe(inputA, inputB, outputA, + // seconds*20, voltage); + return addAR(inputA, inputB, null, outputA, seconds * 20, voltage); } - private static boolean addAR(final ItemStack inputA, final ItemStack inputB, final FluidStack inputFluidA, final ItemStack outputA, final int seconds, final int voltage){ - //return GT_Values.RA.addAssemblerRecipe(inputA, inputB, outputA, seconds*20, voltage); - return GT_Values.RA.addAssemblerRecipe(inputA, inputB, inputFluidA, outputA, seconds*20, voltage); + private static boolean addAR(final ItemStack inputA, final ItemStack inputB, final FluidStack inputFluidA, + final ItemStack outputA, final int seconds, final int voltage) { + // return GT_Values.RA.addAssemblerRecipe(inputA, inputB, outputA, + // seconds*20, voltage); + return GT_Values.RA.addAssemblerRecipe(inputA, inputB, inputFluidA, outputA, seconds * 20, voltage); } - private static void distilleryRecipes(){ + private static void distilleryRecipes() { Logger.INFO("Registering Distillery/Distillation Tower Recipes."); - GT_Values.RA.addDistilleryRecipe(ItemList.Circuit_Integrated.getWithDamage(0L, 4L, new Object[0]), FluidUtils.getFluidStack("air", 1000), FluidUtils.getFluidStack("helium", 1), 400, 30, false); - GT_Values.RA.addDistillationTowerRecipe(FluidUtils.getFluidStack("air", 20000), FluidUtils.getFluidStackArray("helium", 25), ItemUtils.getSimpleStack(ModItems.itemHydrogenBlob, 1), 200, 60); + GT_Values.RA.addDistilleryRecipe(ItemList.Circuit_Integrated.getWithDamage(0L, 4L, new Object[0]), + FluidUtils.getFluidStack("air", 1000), FluidUtils.getFluidStack("helium", 1), 400, 30, false); + GT_Values.RA.addDistillationTowerRecipe(FluidUtils.getFluidStack("air", 20000), + FluidUtils.getFluidStackArray("helium", 25), ItemUtils.getSimpleStack(ModItems.itemHydrogenBlob, 1), + 200, 60); - //Apatite Distillation + // Apatite Distillation /* - * so if you dissolve aparite in sulphuric acid - * you'll get a mixture of SO2, H2O, HF and HCl + * so if you dissolve aparite in sulphuric acid you'll get a mixture of + * SO2, H2O, HF and HCl */ - final FluidStack[] apatiteOutput = { - FluidUtils.getFluidStack("sulfurousacid", 3800), - FluidUtils.getFluidStack("hydrogenchloride", 1000), - FluidUtils.getFluidStack("hydrofluoricacid", 400) - }; - GT_Values.RA.addDistillationTowerRecipe( - FluidUtils.getFluidStack("sulfuricapatite", 5200), - apatiteOutput, - null, - 45*20, - 256); - - final FluidStack[] sulfurousacidOutput = { - FluidUtils.getFluidStack("sulfurdioxide", 500), - FluidUtils.getFluidStack("water", 500) - }; - GT_Values.RA.addDistillationTowerRecipe( - FluidUtils.getFluidStack("sulfurousacid", 1000), - sulfurousacidOutput, - null, - 10*20, - 60); - - final FluidStack[] sulfurdioxideOutput = { - FluidUtils.getFluidStack("oxygen", 144*2) - }; - GT_Values.RA.addDistillationTowerRecipe( - FluidUtils.getFluidStack("sulfurdioxide", 144*3), - sulfurdioxideOutput, - ItemUtils.getItemStackOfAmountFromOreDict("dustSulfur", 1), - 5*20, - 30); + final FluidStack[] apatiteOutput = { FluidUtils.getFluidStack("sulfurousacid", 3800), + FluidUtils.getFluidStack("hydrogenchloride", 1000), FluidUtils.getFluidStack("hydrofluoricacid", 400) }; + GT_Values.RA.addDistillationTowerRecipe(FluidUtils.getFluidStack("sulfuricapatite", 5200), apatiteOutput, null, + 45 * 20, 256); + + final FluidStack[] sulfurousacidOutput = { FluidUtils.getFluidStack("sulfurdioxide", 500), + FluidUtils.getFluidStack("water", 500) }; + GT_Values.RA.addDistillationTowerRecipe(FluidUtils.getFluidStack("sulfurousacid", 1000), sulfurousacidOutput, + null, 10 * 20, 60); + + final FluidStack[] sulfurdioxideOutput = { FluidUtils.getFluidStack("oxygen", 144 * 2) }; + GT_Values.RA.addDistillationTowerRecipe(FluidUtils.getFluidStack("sulfurdioxide", 144 * 3), sulfurdioxideOutput, + ItemUtils.getItemStackOfAmountFromOreDict("dustSulfur", 1), 5 * 20, 30); } - private static void addFuels(){ + private static void addFuels() { Logger.INFO("Registering New Fuels."); GT_Values.RA.addFuel(ItemUtils.simpleMetaStack("EnderIO:bucketFire_water", 0, 1), null, 120, 0); GT_Values.RA.addFuel(ItemUtils.simpleMetaStack("EnderIO:bucketRocket_fuel", 0, 1), null, 112, 0); GT_Values.RA.addFuel(ItemUtils.simpleMetaStack("EnderIO:bucketHootch", 0, 1), null, 36, 0); - HotFuel.addNewHotFuel( - GT_ModHandler.getLava(83), - GT_Values.NF, - new ItemStack[]{ - ItemUtils.getItemStackOfAmountFromOreDict("nuggetCopper", 1), + HotFuel.addNewHotFuel(GT_ModHandler.getLava(83), GT_Values.NF, + new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("nuggetCopper", 1), ItemUtils.getItemStackOfAmountFromOreDict("nuggetTin", 1), ItemUtils.getItemStackOfAmountFromOreDict("nuggetGold", 1), ItemUtils.getItemStackOfAmountFromOreDict("nuggetSilver", 1), ItemUtils.getItemStackOfAmountFromOreDict("nuggetTantalum", 1), ItemUtils.getItemStackOfAmountFromOreDict("dustSmallTungstate", 1), - ItemUtils.getSimpleStack(Blocks.obsidian) - }, - new int[]{2000, 1000, 250, 250, 250, 250, 500}, - 0); - - HotFuel.addNewHotFuel( - FluidUtils.getFluidStack("ic2pahoehoelava", 83), - GT_Values.NF, - new ItemStack[]{ - ItemUtils.getItemStackOfAmountFromOreDict("nuggetCopper", 1), + ItemUtils.getSimpleStack(Blocks.obsidian) }, + new int[] { 2000, 1000, 250, 250, 250, 250, 500 }, 0); + + HotFuel.addNewHotFuel(FluidUtils.getFluidStack("ic2pahoehoelava", 83), GT_Values.NF, + new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("nuggetCopper", 1), ItemUtils.getItemStackOfAmountFromOreDict("nuggetTin", 1), ItemUtils.getItemStackOfAmountFromOreDict("nuggetElectrum", 1), - ItemUtils.getSimpleStack(Blocks.obsidian) - }, - new int[]{1000, 500, 125, 1850}, - 0); - - /*HotFuel.addNewHotFuel( - FluidUtils.getFluidStack("ic2hotcoolant", 100), - GT_Values.NF, - new ItemStack[]{}, - new int[]{}, - 0);*/ + ItemUtils.getSimpleStack(Blocks.obsidian) }, + new int[] { 1000, 500, 125, 1850 }, 0); + + /* + * HotFuel.addNewHotFuel( FluidUtils.getFluidStack("ic2hotcoolant", + * 100), GT_Values.NF, new ItemStack[]{}, new int[]{}, 0); + */ ThermalFuel.addSteamTurbineFuel(FluidUtils.getFluidStack("steam", 1024)); - //CORE.RA.addFuel(UtilsItems.simpleMetaStack("EnderIO:bucketRocket_fuel", 0, 1), null, 112, 0); + // CORE.RA.addFuel(UtilsItems.simpleMetaStack("EnderIO:bucketRocket_fuel", + // 0, 1), null, 112, 0); GT_Values.RA.addFuel(ItemUtils.getSimpleStack(Items.lava_bucket), null, 32, 2); GT_Values.RA.addFuel(ItemUtils.getIC2Cell(2), null, 32, 2); GT_Values.RA.addFuel(ItemUtils.getIC2Cell(11), null, 24, 2); - //System.exit(1); + // System.exit(1); } - private static void extractorRecipes(){ + private static void extractorRecipes() { Logger.INFO("Registering Extractor Recipes."); - GT_ModHandler.addExtractionRecipe(GregtechItemList.Battery_RE_EV_Sodium.get(1L, new Object[0]), ItemList.Battery_Hull_HV.get(4L, new Object[0])); - GT_ModHandler.addExtractionRecipe(GregtechItemList.Battery_RE_EV_Cadmium.get(1L, new Object[0]), ItemList.Battery_Hull_HV.get(4L, new Object[0])); - GT_ModHandler.addExtractionRecipe(GregtechItemList.Battery_RE_EV_Lithium.get(1L, new Object[0]), ItemList.Battery_Hull_HV.get(4L, new Object[0])); + GT_ModHandler.addExtractionRecipe(GregtechItemList.Battery_RE_EV_Sodium.get(1L, new Object[0]), + ItemList.Battery_Hull_HV.get(4L, new Object[0])); + GT_ModHandler.addExtractionRecipe(GregtechItemList.Battery_RE_EV_Cadmium.get(1L, new Object[0]), + ItemList.Battery_Hull_HV.get(4L, new Object[0])); + GT_ModHandler.addExtractionRecipe(GregtechItemList.Battery_RE_EV_Lithium.get(1L, new Object[0]), + ItemList.Battery_Hull_HV.get(4L, new Object[0])); } - private static void fluidExtractorRecipes(){ - GT_Values.RA.addFluidExtractionRecipe(ItemUtils.getSimpleStack(Items.ender_pearl), null, FluidUtils.getFluidStack("ender", 250), 10000, 100, 30); + private static void fluidExtractorRecipes() { + GT_Values.RA.addFluidExtractionRecipe(ItemUtils.getSimpleStack(Items.ender_pearl), null, + FluidUtils.getFluidStack("ender", 250), 10000, 100, 30); } - private static void chemicalBathRecipes(){ + private static void chemicalBathRecipes() { final int[] chances = {}; - GT_Values.RA.addChemicalBathRecipe(ItemUtils.getItemStackOfAmountFromOreDict("dustTin", 12), FluidUtils.getFluidStack("chlorine", 2400), + GT_Values.RA.addChemicalBathRecipe(ItemUtils.getItemStackOfAmountFromOreDict("dustTin", 12), + FluidUtils.getFluidStack("chlorine", 2400), ItemUtils.getItemStackOfAmountFromOreDict("dustZirconium", 3), ItemUtils.getItemStackOfAmountFromOreDict("dustZirconium", 3), - ItemUtils.getItemStackOfAmountFromOreDict("dustZirconium", 3), - chances, - 30*20, - 240); - - GT_Values.RA.addChemicalBathRecipe( - FLUORIDES.FLUORITE.getCrushed(2), - FluidUtils.getFluidStack("hydrogen", 2000), - FLUORIDES.FLUORITE.getCrushedPurified(8), - FLUORIDES.FLUORITE.getDustImpure(4), - FLUORIDES.FLUORITE.getDustPurified(2), - new int[]{10000, 5000, 1000}, - 30*20, - 240); - - GT_Values.RA.addChemicalBathRecipe( - ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumCarbonate", 10), - FluidUtils.getFluidStack("hydrofluoricacid", 10*144), - ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumFluoride", 5), - null, - null, - new int[]{}, - 90*20, - 500); + ItemUtils.getItemStackOfAmountFromOreDict("dustZirconium", 3), chances, 30 * 20, 240); + GT_Values.RA.addChemicalBathRecipe(FLUORIDES.FLUORITE.getCrushed(2), FluidUtils.getFluidStack("hydrogen", 2000), + FLUORIDES.FLUORITE.getCrushedPurified(8), FLUORIDES.FLUORITE.getDustImpure(4), + FLUORIDES.FLUORITE.getDustPurified(2), new int[] { 10000, 5000, 1000 }, 30 * 20, 240); + + GT_Values.RA.addChemicalBathRecipe(ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumCarbonate", 10), + FluidUtils.getFluidStack("hydrofluoricacid", 10 * 144), + ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumFluoride", 5), null, null, new int[] {}, 90 * 20, + 500); } - private static void centrifugeRecipes(){ - GT_Values.RA.addCentrifugeRecipe( - ItemUtils.getItemStackOfAmountFromOreDict("dustThorium", 8), - GT_Values.NI, - GT_Values.NF, - GT_Values.NF, - NUCLIDE.getInstance().THORIUM232.getDust(2), + private static void centrifugeRecipes() { + GT_Values.RA.addCentrifugeRecipe(ItemUtils.getItemStackOfAmountFromOreDict("dustThorium", 8), GT_Values.NI, + GT_Values.NF, GT_Values.NF, NUCLIDE.getInstance().THORIUM232.getDust(2), ItemUtils.getItemStackOfAmountFromOreDict("dustSmallThorium", 20), - NUCLIDE.getInstance().URANIUM232.getDust(1), - GT_Values.NI, - GT_Values.NI, - GT_Values.NI, - new int[]{0, 0, 10}, - 500*20, - 2000); + NUCLIDE.getInstance().URANIUM232.getDust(1), GT_Values.NI, GT_Values.NI, GT_Values.NI, + new int[] { 0, 0, 10 }, 500 * 20, 2000); } - private static void mixerRecipes(){ - GT_Values.RA.addMixerRecipe(ItemUtils.getItemStackOfAmountFromOreDict("dustSulfur", 1), null, null, null, FluidUtils.getFluidStack("oxygen", 288), FluidUtils.getFluidStack("sulfurdioxide", 432), null, 600, 60); - GT_Values.RA.addMixerRecipe(ItemUtils.getItemStackOfAmountFromOreDict("dustUranium233", 4), ItemUtils.getItemStackOfAmountFromOreDict("dustUranium235", 1), null, null, FluidUtils.getFluidStack("hydrofluoricacid", 144*5), FluidUtils.getFluidStack("molten.uraniumtetrafluoride", 144*5), null, 3000, 500); - //GT_Values.RA.addMixerRecipe(ItemUtils.getItemStackOfAmountFromOreDict("cellFluorine", 1), ItemUtils.getItemStackOfAmountFromOreDict("cellFluorine", 1), null, null, FluidUtils.getFluidStack("molten.uraniumtetrafluoride", 720), FluidUtils.getFluidStack("molten.uraniumhexafluoride", 288), null, 5000, 2000); - //GT_Values.RA.addMixerRecipe(ItemUtils.getItemStackOfAmountFromOreDict("dustSteel", 20), ItemUtils.getItemStackOfAmountFromOreDict("dustSilicon", 1), ItemUtils.getItemStackOfAmountFromOreDict("dustNickel", 5), ItemUtils.getItemStackOfAmountFromOreDict("dustAluminium", 4), null, null, ItemUtils.getItemStackOfAmountFromOreDict("dustEglinSteel", 30), 1200, 60); + private static void mixerRecipes() { + GT_Values.RA.addMixerRecipe(ItemUtils.getItemStackOfAmountFromOreDict("dustSulfur", 1), null, null, null, + FluidUtils.getFluidStack("oxygen", 288), FluidUtils.getFluidStack("sulfurdioxide", 432), null, 600, 60); + GT_Values.RA.addMixerRecipe(ItemUtils.getItemStackOfAmountFromOreDict("dustUranium233", 4), + ItemUtils.getItemStackOfAmountFromOreDict("dustUranium235", 1), null, null, + FluidUtils.getFluidStack("hydrofluoricacid", 144 * 5), + FluidUtils.getFluidStack("molten.uraniumtetrafluoride", 144 * 5), null, 3000, 500); + // GT_Values.RA.addMixerRecipe(ItemUtils.getItemStackOfAmountFromOreDict("cellFluorine", + // 1), ItemUtils.getItemStackOfAmountFromOreDict("cellFluorine", 1), + // null, null, FluidUtils.getFluidStack("molten.uraniumtetrafluoride", + // 720), FluidUtils.getFluidStack("molten.uraniumhexafluoride", 288), + // null, 5000, 2000); + // GT_Values.RA.addMixerRecipe(ItemUtils.getItemStackOfAmountFromOreDict("dustSteel", + // 20), ItemUtils.getItemStackOfAmountFromOreDict("dustSilicon", 1), + // ItemUtils.getItemStackOfAmountFromOreDict("dustNickel", 5), + // ItemUtils.getItemStackOfAmountFromOreDict("dustAluminium", 4), null, + // null, ItemUtils.getItemStackOfAmountFromOreDict("dustEglinSteel", + // 30), 1200, 60); } - private static void chemicalReactorRecipes(){ - GT_Values.RA.addChemicalRecipe( - ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumCarbonate", 5), //Input Stack 1 - ItemUtils.getItemStackOfAmountFromOreDict("dustCalciumHydroxide", 5), //Input Stack 2 - null, //Fluid Input - null, //Fluid Output - ItemUtils.getItemStackOfAmountFromOreDict("dustLi2CO3CaOH2", 10), //Output Stack - 600*20 - ); - - GT_Values.RA.addChemicalRecipe( - ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumHydroxide", 5), //Input Stack 1 - null, //Input Stack 2 - FluidUtils.getFluidStack("hydrofluoricacid", 5*144), //Fluid Input - FluidUtils.getFluidStack("water", 5*144), //Fluid Output - ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumFluoride", 5), //Output Stack - 600*20 - ); - - GT_Values.RA.addChemicalRecipe( - ItemUtils.getItemStackOfAmountFromOreDict("dustApatite", 16), - null, - FluidUtils.getFluidStack("sulfuricacid", 144*32), - FluidUtils.getFluidStack("sulfuricapatite", 144*4), - ItemUtils.getItemStackOfAmountFromOreDict("dustSmallSulfur", 1), - 20*20); - - GT_Values.RA.addChemicalRecipe( - ItemUtils.getItemStackOfAmountFromOreDict("dustLithium7", 1), - null, - FluidUtils.getFluidStack("sulfuricacid", 144*8), - FluidUtils.getFluidStack("sulfuriclithium", 144*2), - ItemUtils.getItemStackOfAmountFromOreDict("dustSmallLithium7", 1), - 20*20); - - GT_Values.RA.addChemicalRecipe( - ItemUtils.getItemStackOfAmountFromOreDict("cellOxygen", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustLithium7", 16), - FluidUtils.getFluidStack("water", 1000), - FluidUtils.getFluidStack("lithiumhydroxide", 144*4), - ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 1), - 300*20); - - - - //LFTR Fuel Related Compounds - - if(CORE.GTNH){ - //Hydroxide + private static void chemicalReactorRecipes() { + GT_Values.RA.addChemicalRecipe(ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumCarbonate", 5), // Input + // Stack + // 1 + ItemUtils.getItemStackOfAmountFromOreDict("dustCalciumHydroxide", 5), // Input + // Stack + // 2 + null, // Fluid Input + null, // Fluid Output + ItemUtils.getItemStackOfAmountFromOreDict("dustLi2CO3CaOH2", 10), // Output + // Stack + 600 * 20); + + GT_Values.RA.addChemicalRecipe(ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumHydroxide", 5), // Input + // Stack + // 1 + null, // Input Stack 2 + FluidUtils.getFluidStack("hydrofluoricacid", 5 * 144), // Fluid + // Input + FluidUtils.getFluidStack("water", 5 * 144), // Fluid Output + ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumFluoride", 5), // Output + // Stack + 600 * 20); + + GT_Values.RA.addChemicalRecipe(ItemUtils.getItemStackOfAmountFromOreDict("dustApatite", 16), null, + FluidUtils.getFluidStack("sulfuricacid", 144 * 32), + FluidUtils.getFluidStack("sulfuricapatite", 144 * 4), + ItemUtils.getItemStackOfAmountFromOreDict("dustSmallSulfur", 1), 20 * 20); + + GT_Values.RA.addChemicalRecipe(ItemUtils.getItemStackOfAmountFromOreDict("dustLithium7", 1), null, + FluidUtils.getFluidStack("sulfuricacid", 144 * 8), FluidUtils.getFluidStack("sulfuriclithium", 144 * 2), + ItemUtils.getItemStackOfAmountFromOreDict("dustSmallLithium7", 1), 20 * 20); + + GT_Values.RA.addChemicalRecipe(ItemUtils.getItemStackOfAmountFromOreDict("cellOxygen", 1), + ItemUtils.getItemStackOfAmountFromOreDict("dustLithium7", 16), FluidUtils.getFluidStack("water", 1000), + FluidUtils.getFluidStack("lithiumhydroxide", 144 * 4), + ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 1), 300 * 20); + + // LFTR Fuel Related Compounds + + if (CORE.GTNH) { + // Hydroxide AddGregtechRecipe.addChemicalRecipeForBasicMachineOnly( ItemUtils.getItemStackOfAmountFromOreDict("cellOxygen", 1), - ItemUtils.getItemStackOfAmountFromOreDict("cellHydrogen", 1), - GT_Values.NF, + ItemUtils.getItemStackOfAmountFromOreDict("cellHydrogen", 1), GT_Values.NF, FluidUtils.getFluidStack("hydroxide", 2000), - ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 2), - GT_Values.NI, - 8*20, 30); - //Beryllium Hydroxide - GT_Values.RA.addChemicalRecipe( - ItemUtils.getItemStackOfAmountFromOreDict("dustBeryllium", 7), - ItemUtils.getGregtechCircuit(3), - FluidUtils.getFluidStack("hydroxide", 1000), - FluidUtils.getFluidStack("berylliumhydroxide", 2000), - GT_Values.NI, - 8*20); - //Ammonium Bifluoride - GT_Values.RA.addChemicalRecipe( - ItemUtils.getItemStackOfAmountFromOreDict("cellHydrofluoricAcid", 1), - ItemUtils.getGregtechCircuit(3), - FluidUtils.getFluidStack("ammonium", 1000), + ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 2), GT_Values.NI, 8 * 20, 30); + // Beryllium Hydroxide + GT_Values.RA.addChemicalRecipe(ItemUtils.getItemStackOfAmountFromOreDict("dustBeryllium", 7), + ItemUtils.getGregtechCircuit(3), FluidUtils.getFluidStack("hydroxide", 1000), + FluidUtils.getFluidStack("berylliumhydroxide", 2000), GT_Values.NI, 8 * 20); + // Ammonium Bifluoride + GT_Values.RA.addChemicalRecipe(ItemUtils.getItemStackOfAmountFromOreDict("cellHydrofluoricAcid", 1), + ItemUtils.getGregtechCircuit(3), FluidUtils.getFluidStack("ammonium", 1000), FluidUtils.getFluidStack("ammoniumbifluoride", 2000), - ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 1), - 26*20); - //Ammonium + ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 1), 26 * 20); + // Ammonium AddGregtechRecipe.addChemicalRecipeForBasicMachineOnly( ItemUtils.getItemStackOfAmountFromOreDict("cellAmmonia", 1), - ItemUtils.getItemStackOfAmountFromOreDict("cellHydrogen", 1), - GT_Values.NF, + ItemUtils.getItemStackOfAmountFromOreDict("cellHydrogen", 1), GT_Values.NF, FluidUtils.getFluidStack("ammonium", 2000), - ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 2), - GT_Values.NI, - 20*20, 30); + ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 2), GT_Values.NI, 20 * 20, 30); } if (!CORE.GTNH) { - //Hydroxide - GT_Values.RA.addChemicalRecipe( - ItemUtils.getItemStackOfAmountFromOreDict("cellOxygen", 1), - ItemUtils.getItemStackOfAmountFromOreDict("cellHydrogen", 1), - GT_Values.NF, + // Hydroxide + GT_Values.RA.addChemicalRecipe(ItemUtils.getItemStackOfAmountFromOreDict("cellOxygen", 1), + ItemUtils.getItemStackOfAmountFromOreDict("cellHydrogen", 1), GT_Values.NF, FluidUtils.getFluidStack("hydroxide", 2000), - ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 2), - 8*20); - //Ammonia (moved to GTNH core mod) - GT_Values.RA.addChemicalRecipe( - ItemUtils.getItemStackOfAmountFromOreDict("cellHydrogen", 3), + ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 2), 8 * 20); + // Ammonia (moved to GTNH core mod) + GT_Values.RA.addChemicalRecipe(ItemUtils.getItemStackOfAmountFromOreDict("cellHydrogen", 3), ItemUtils.getItemStackOfAmountFromOreDict("dustMagnetite", 0), - FluidUtils.getFluidStack("nitrogen", 1000), - FluidUtils.getFluidStack("ammonia", 1000), - ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 3), - 14 * 20); - //Beryllium Hydroxide - GT_Values.RA.addChemicalRecipe( - ItemUtils.getItemStackOfAmountFromOreDict("dustBeryllium", 7), - GT_Values.NI, - FluidUtils.getFluidStack("hydroxide", 1000), - FluidUtils.getFluidStack("berylliumhydroxide", 2000), - GT_Values.NI, - 8*20); - //Ammonium Bifluoride - GT_Values.RA.addChemicalRecipe( - ItemUtils.getItemStackOfAmountFromOreDict("cellHydrofluoricAcid", 1), - GT_Values.NI, - FluidUtils.getFluidStack("ammonium", 1000), + FluidUtils.getFluidStack("nitrogen", 1000), FluidUtils.getFluidStack("ammonia", 1000), + ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 3), 14 * 20); + // Beryllium Hydroxide + GT_Values.RA.addChemicalRecipe(ItemUtils.getItemStackOfAmountFromOreDict("dustBeryllium", 7), GT_Values.NI, + FluidUtils.getFluidStack("hydroxide", 1000), FluidUtils.getFluidStack("berylliumhydroxide", 2000), + GT_Values.NI, 8 * 20); + // Ammonium Bifluoride + GT_Values.RA.addChemicalRecipe(ItemUtils.getItemStackOfAmountFromOreDict("cellHydrofluoricAcid", 1), + GT_Values.NI, FluidUtils.getFluidStack("ammonium", 1000), FluidUtils.getFluidStack("ammoniumbifluoride", 2000), - ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 1), - 26*20); - //Ammonium - GT_Values.RA.addChemicalRecipe( - ItemUtils.getItemStackOfAmountFromOreDict("cellAmmonia", 1), - ItemUtils.getItemStackOfAmountFromOreDict("cellHydrogen", 1), - GT_Values.NF, + ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 1), 26 * 20); + // Ammonium + GT_Values.RA.addChemicalRecipe(ItemUtils.getItemStackOfAmountFromOreDict("cellAmmonia", 1), + ItemUtils.getItemStackOfAmountFromOreDict("cellHydrogen", 1), GT_Values.NF, FluidUtils.getFluidStack("ammonium", 2000), - ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 2), - 20*20); + ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 2), 20 * 20); } } - private static void blastFurnaceRecipes(){ - GT_Values.RA.addBlastRecipe( - ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumFluoride", 2), - ItemUtils.getItemStackOfAmountFromOreDict("dustBerylliumFluoride", 1), - GT_Values.NF, GT_Values.NF, - ItemUtils.getItemStackOfAmountFromOreDict("dustLi2BeF4", 3), - null, - 60*20, - 2000, - 3000); - GT_Values.RA.addBlastRecipe( - ItemUtils.getItemStackOfAmountFromOreDict("dustZrCl4", 1), - null, - GT_Values.NF, GT_Values.NF, - ItemUtils.getItemStackOfAmountFromOreDict("dustCookedZrCl4", 1), - null, - 60*20, - 340, - 300); + private static void blastFurnaceRecipes() { + GT_Values.RA.addBlastRecipe(ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumFluoride", 2), + ItemUtils.getItemStackOfAmountFromOreDict("dustBerylliumFluoride", 1), GT_Values.NF, GT_Values.NF, + ItemUtils.getItemStackOfAmountFromOreDict("dustLi2BeF4", 3), null, 60 * 20, 2000, 3000); + GT_Values.RA.addBlastRecipe(ItemUtils.getItemStackOfAmountFromOreDict("dustZrCl4", 1), null, GT_Values.NF, + GT_Values.NF, ItemUtils.getItemStackOfAmountFromOreDict("dustCookedZrCl4", 1), null, 60 * 20, 340, 300); } - private static void autoclaveRecipes(){ - GT_Values.RA.addAutoclaveRecipe( - ItemUtils.getItemStackOfAmountFromOreDict("dustZirconium", 9), - FluidUtils.getFluidStack("chlorine", 9*4*144), - ItemUtils.getItemStackOfAmountFromOreDict("pelletZirconium", 9), - 0, - 120*20, - 30); + private static void autoclaveRecipes() { + GT_Values.RA.addAutoclaveRecipe(ItemUtils.getItemStackOfAmountFromOreDict("dustZirconium", 9), + FluidUtils.getFluidStack("chlorine", 9 * 4 * 144), + ItemUtils.getItemStackOfAmountFromOreDict("pelletZirconium", 9), 0, 120 * 20, 30); } - private static void benderRecipes(){ + private static void benderRecipes() { - if (CORE.ConfigSwitches.enableMultiblock_PowerSubstation){ - GT_Values.RA.addBenderRecipe(ItemUtils.getItemStackOfAmountFromOreDict("ingotVanadium", 1), ItemUtils.getItemStackOfAmountFromOreDict("plateVanadium", 1), 8, 16); + if (CORE.ConfigSwitches.enableMultiblock_PowerSubstation) { + GT_Values.RA.addBenderRecipe(ItemUtils.getItemStackOfAmountFromOreDict("ingotVanadium", 1), + ItemUtils.getItemStackOfAmountFromOreDict("plateVanadium", 1), 8, 16); } } - private static void compressorRecipes(){ - GT_ModHandler.addCompressionRecipe(ItemUtils.getItemStackOfAmountFromOreDict("dustSmallClay", 4), ItemUtils.getItemStackOfAmountFromOreDict("plateClay", 1)); + private static void compressorRecipes() { + GT_ModHandler.addCompressionRecipe(ItemUtils.getItemStackOfAmountFromOreDict("dustSmallClay", 4), + ItemUtils.getItemStackOfAmountFromOreDict("plateClay", 1)); } - private static void macerationRecipes(){ - GT_ModHandler.addPulverisationRecipe( - ItemUtils.getItemStackOfAmountFromOreDict("pelletZirconium", 1), + private static void macerationRecipes() { + GT_ModHandler.addPulverisationRecipe(ItemUtils.getItemStackOfAmountFromOreDict("pelletZirconium", 1), ItemUtils.getItemStackOfAmountFromOreDict("dustZrCl4", 1)); - /*GT_ModHandler.addPulverisationRecipe( - FLUORIDES.FLUORITE.getOre(1), - FLUORIDES.FLUORITE.getDust(4));*/ + /* + * GT_ModHandler.addPulverisationRecipe( FLUORIDES.FLUORITE.getOre(1), + * FLUORIDES.FLUORITE.getDust(4)); + */ - if (ItemUtils.simpleMetaStack("chisel:limestone", 0, 1) != null){ - GT_ModHandler.addPulverisationRecipe( - ItemUtils.getItemStackOfAmountFromOreDict("limestone", 1), + if (ItemUtils.simpleMetaStack("chisel:limestone", 0, 1) != null) { + GT_ModHandler.addPulverisationRecipe(ItemUtils.getItemStackOfAmountFromOreDict("limestone", 1), ItemUtils.getItemStackOfAmountFromOreDict("dustCalcite", 4)); } } - public static boolean addPulverisationRecipe(final ItemStack aInput, ItemStack aOutput1, ItemStack aOutput2, final ItemStack aOutput3) { + public static boolean addPulverisationRecipe(final ItemStack aInput, ItemStack aOutput1, ItemStack aOutput2, + final ItemStack aOutput3) { aOutput1 = GT_OreDictUnificator.get(true, aOutput1); aOutput2 = GT_OreDictUnificator.get(true, aOutput2); - if ((GT_Utility.isStackInvalid(aInput)) || (GT_Utility.isStackInvalid(aOutput1))){ + if ((GT_Utility.isStackInvalid(aInput)) || (GT_Utility.isStackInvalid(aOutput1))) { return false; } if (GT_Utility.getContainerItem(aInput, false) == null) { if (GregTech_API.sRecipeFile.get(ConfigCategories.Machines.maceration, aInput, true)) { - GT_Utility.addSimpleIC2MachineRecipe(aInput, GT_ModHandler.getMaceratorRecipeList(), null, new Object[] { aOutput1 }); + GT_Utility.addSimpleIC2MachineRecipe(aInput, GT_ModHandler.getMaceratorRecipeList(), null, + new Object[] { aOutput1 }); } - GT_Values.RA.addPulveriserRecipe(aInput, new ItemStack[] { - aOutput1, aOutput2, aOutput3 }, - new int[] {10000, 10000, 10000}, - 400, - 2); + GT_Values.RA.addPulveriserRecipe(aInput, new ItemStack[] { aOutput1, aOutput2, aOutput3 }, + new int[] { 10000, 10000, 10000 }, 400, 2); } return true; } private static void cyclotronRecipes() { - CORE.RA.addCyclotronRecipe( - CI.getNumberedCircuit(0), - FluidUtils.getFluidStack("molten.bismuth", 1), - new ItemStack[]{GregtechItemList.Pellet_RTG_PO210.get(1)}, - null, - new int[]{100}, - 20*300, - 2040, - 500*20); + CORE.RA.addCyclotronRecipe(CI.getNumberedCircuit(0), FluidUtils.getFluidStack("molten.bismuth", 1), + new ItemStack[] { GregtechItemList.Pellet_RTG_PO210.get(1) }, null, new int[] { 100 }, 20 * 300, 2040, + 500 * 20); } private static void sifterRecipes() { - //Zirconium - GT_Values.RA.addSifterRecipe( - ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedTin", 1), - new ItemStack[]{ - ItemUtils.getItemStackOfAmountFromOreDict("dustTin", 1), + // Zirconium + GT_Values.RA.addSifterRecipe(ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedTin", 1), + new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("dustTin", 1), ItemUtils.getItemStackOfAmountFromOreDict("dustTinyZinc", 1), ItemUtils.getItemStackOfAmountFromOreDict("dustZirconium", 1), ItemUtils.getItemStackOfAmountFromOreDict("dustZirconium", 1), ItemUtils.getItemStackOfAmountFromOreDict("dustZirconium", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustZirconium", 1) - }, - new int[]{10000, 5000, 1500, 1000, 500, 500}, - 20*30, - 60); - - //Zirconium - GT_Values.RA.addSifterRecipe( - ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedCassiterite", 1), - new ItemStack[]{ - ItemUtils.getItemStackOfAmountFromOreDict("dustCassiterite", 1), + ItemUtils.getItemStackOfAmountFromOreDict("dustZirconium", 1) }, + new int[] { 10000, 5000, 1500, 1000, 500, 500 }, 20 * 30, 60); + + // Zirconium + GT_Values.RA.addSifterRecipe(ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedCassiterite", 1), + new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("dustCassiterite", 1), ItemUtils.getItemStackOfAmountFromOreDict("dustTinyTin", 1), ItemUtils.getItemStackOfAmountFromOreDict("dustZirconium", 1), ItemUtils.getItemStackOfAmountFromOreDict("dustZirconium", 1), ItemUtils.getItemStackOfAmountFromOreDict("dustZirconium", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustZirconium", 1) - }, - new int[]{10000, 5000, 1500, 1000, 500, 500}, - 20*30, - 60); + ItemUtils.getItemStackOfAmountFromOreDict("dustZirconium", 1) }, + new int[] { 10000, 5000, 1500, 1000, 500, 500 }, 20 * 30, 60); } - private static void electroMagneticSeperatorRecipes(){ - //Zirconium + private static void electroMagneticSeperatorRecipes() { + // Zirconium GT_Values.RA.addElectromagneticSeparatorRecipe( ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedBauxite", 1), ItemUtils.getItemStackOfAmountFromOreDict("dustBauxite", 1), ItemUtils.getItemStackOfAmountFromOreDict("dustSmallRutile", 1), - ItemUtils.getItemStackOfAmountFromOreDict("nuggetZirconium", 1), - new int[]{10000, 2500, 4000}, - 20*20, - 24); + ItemUtils.getItemStackOfAmountFromOreDict("nuggetZirconium", 1), new int[] { 10000, 2500, 4000 }, + 20 * 20, 24); - //Trinium + // Trinium GT_Values.RA.addElectromagneticSeparatorRecipe( ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedNaquadah", 1), ItemUtils.getItemStackOfAmountFromOreDict("dustNaquadah", 1), ItemUtils.getItemStackOfAmountFromOreDict("dustSmallNaquadahEnriched", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustSmallTrinium", 1), - new int[]{10000, 2500, 5000}, - 20*20, - 24); + ItemUtils.getItemStackOfAmountFromOreDict("dustSmallTrinium", 1), new int[] { 10000, 2500, 5000 }, + 20 * 20, 24); - //Trinium + // Trinium GT_Values.RA.addElectromagneticSeparatorRecipe( ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedIridium", 1), ItemUtils.getItemStackOfAmountFromOreDict("dustIridium", 1), ItemUtils.getItemStackOfAmountFromOreDict("dustSmallOsmium", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustSmallTrinium", 1), - new int[]{10000, 2500, 5000}, - 20*20, - 24); + ItemUtils.getItemStackOfAmountFromOreDict("dustSmallTrinium", 1), new int[] { 10000, 2500, 5000 }, + 20 * 20, 24); - //Trinium + // Trinium GT_Values.RA.addElectromagneticSeparatorRecipe( ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedWulfenite", 1), ItemUtils.getItemStackOfAmountFromOreDict("dustWulfenite", 1), ItemUtils.getItemStackOfAmountFromOreDict("dustSmallTrinium", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustSmallTrinium", 1), - new int[]{10000, 3000, 3000}, - 20*20, - 24); + ItemUtils.getItemStackOfAmountFromOreDict("dustSmallTrinium", 1), new int[] { 10000, 3000, 3000 }, + 20 * 20, 24); } - private static void advancedMixerRecipes(){ - //HgBa2Ca2Cu3O8 - CORE.RA.addMixerRecipe( - ItemUtils.getItemStackOfAmountFromOreDict("cellMercury", 1), + private static void advancedMixerRecipes() { + // HgBa2Ca2Cu3O8 + CORE.RA.addMixerRecipe(ItemUtils.getItemStackOfAmountFromOreDict("cellMercury", 1), ItemUtils.getItemStackOfAmountFromOreDict("dustBarium", 2), ItemUtils.getItemStackOfAmountFromOreDict("dustCalcium", 2), - ItemUtils.getItemStackOfAmountFromOreDict("dustCopper", 3), - FluidUtils.getFluidStack("oxygen", 8000), - null, - ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 1), - ALLOY.HG1223.getDust(16), - null, - null, - 30*20, - 500); + ItemUtils.getItemStackOfAmountFromOreDict("dustCopper", 3), FluidUtils.getFluidStack("oxygen", 8000), + null, ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 1), ALLOY.HG1223.getDust(16), null, null, + 30 * 20, 500); } } diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_General.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_General.java index d096212e5e..4ee7d23dd9 100644 --- a/src/Java/gtPlusPlus/core/recipe/RECIPES_General.java +++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_General.java @@ -45,7 +45,6 @@ public class RECIPES_General { RECIPE_BasicCasingIC2 = ItemUtils.getItemStack("IC2:blockMachine", 1); run(); addCompressedObsidian(); - addFluoriteFix(); } } @@ -107,6 +106,12 @@ public class RECIPES_General { Logger.INFO("Added a recipe for Rainforest oak Saplings."); } + + // Try fix this ore + if (ModBlocks.blockOreFluorite != null){ + RecipeUtils.addShapelessGregtechRecipe(new ItemStack[]{ItemUtils.getSimpleStack(ModBlocks.blockOreFluorite)}, FLUORIDES.FLUORITE.getOre(1)); + } + //Iron bars final ItemStack ironBars; if (CORE.GTNH) { @@ -163,7 +168,7 @@ public class RECIPES_General { //Alkalus Coin if (RecipeUtils.recipeBuilder( "gemExquisiteRuby", "gemFlawlessDiamond", "gemExquisiteDiamond", - "gemFlawlessRuby", ItemList.Credit_Greg_Naquadah.get(1), "gemFlawlessSapphire", + "gemFlawlessRuby", ItemList.Credit_Greg_Osmium.get(1), "gemFlawlessSapphire", "gemExquisiteEmerald", "gemFlawlessEmerald", "gemExquisiteSapphire", ItemUtils.getSimpleStack(ModItems.itemAlkalusDisk))){ Logger.INFO("Added a recipe for The Alkalus Disk."); @@ -196,46 +201,25 @@ public class RECIPES_General { getSimpleStack(Items.experience_bottle), ItemUtils.simpleMetaStack(ModBlocks.blockCompressedObsidian, 2, 1), getSimpleStack(Items.experience_bottle), ItemUtils.getSimpleStack(ModBlocks.blockXpConverter, 1)); - //Alkalus Coin - /*AddGregtechRecipe.addAssemblylineRecipe( - ItemUtils.getSimpleStack(ModItems.itemAlkalusDisk), - 288000, - new ItemStack[]{ - ItemUtils.getSimpleStack(gemShards[0], 10), - ItemUtils.getSimpleStack(gemShards[1], 10), - ItemUtils.getSimpleStack(gemShards[2], 10), - ItemUtils.getSimpleStack(gemShards[3], 10), - GT_OreDictUnificator.get(OrePrefixes.block, Materials.NeodymiumMagnetic, 1L), - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Superconductor, 16L), - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Superconductor, 16L), - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Superconductor, 16L), - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Superconductor, 16L), - GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.NiobiumTitanium, 2L)}, - new FluidStack[]{ - Materials.Osmium.getMolten(144*32), - Materials.Europium.getFluid(144*8)}, - ItemUtils.getSimpleStack(Dimension_DarkWorld.portalItem), - 30*20*60, - 100000);*/ - + + + + // Rope/Fiber/Net RecipeUtils.addShapelessGregtechRecipe( new ItemStack[]{ ItemUtils.getItemStackOfAmountFromOreDictNoBroken(CI.craftingToolKnife, 1), ItemUtils.getSimpleStack(Items.reeds)}, ItemUtils.getSimpleStack(ModItems.itemFiber, 16) ); - RecipeUtils.addShapelessGregtechRecipe( new ItemStack[]{ ItemUtils.getItemStackOfAmountFromOreDictNoBroken(CI.craftingToolKnife, 1), ItemUtils.getSimpleStack(Blocks.sapling)}, ItemUtils.getSimpleStack(ModItems.itemFiber, 32) ); - RecipeUtils.recipeBuilder( null, ItemUtils.getSimpleStack(ModItems.itemFiber, 1), null, ItemUtils.getSimpleStack(ModItems.itemFiber, 1), CI.craftingToolKnife, ItemUtils.getSimpleStack(ModItems.itemFiber, 1), null, ItemUtils.getSimpleStack(ModItems.itemFiber, 1), null, ItemUtils.getSimpleStack(ModItems.itemRope, 3)); - RecipeUtils.recipeBuilder( ItemUtils.getSimpleStack(ModItems.itemRope, 1), ItemUtils.getSimpleStack(ModItems.itemRope, 1), ItemUtils.getSimpleStack(ModItems.itemRope, 1), ItemUtils.getSimpleStack(ModItems.itemRope, 1), ItemUtils.getSimpleStack(ModItems.itemRope, 1), ItemUtils.getSimpleStack(ModItems.itemRope, 1), @@ -277,12 +261,6 @@ public class RECIPES_General { return true; } - private static boolean addFluoriteFix(){ - if (ModBlocks.blockOreFluorite != null){ - return RecipeUtils.addShapelessGregtechRecipe(new ItemStack[]{ItemUtils.getSimpleStack(ModBlocks.blockOreFluorite)}, FLUORIDES.FLUORITE.getOre(1)); - } - return false; - } } diff --git a/src/Java/gtPlusPlus/core/recipe/common/CI.java b/src/Java/gtPlusPlus/core/recipe/common/CI.java index 4c7e6e3652..9010f9ba4b 100644 --- a/src/Java/gtPlusPlus/core/recipe/common/CI.java +++ b/src/Java/gtPlusPlus/core/recipe/common/CI.java @@ -268,7 +268,7 @@ public class CI { } } else { - return getTieredCircuitOreDictName(tier); + return getTieredCircuitOreDictName((CORE.GTNH && tier >= 6 ? tier - 1 : tier)); } return _NULL; } diff --git a/src/Java/gtPlusPlus/plugin/fishing/Core_Fishing.java b/src/Java/gtPlusPlus/plugin/fishing/Core_Fishing.java index 909c9c3c50..fed07135fb 100644 --- a/src/Java/gtPlusPlus/plugin/fishing/Core_Fishing.java +++ b/src/Java/gtPlusPlus/plugin/fishing/Core_Fishing.java @@ -1,24 +1,26 @@ package gtPlusPlus.plugin.fishing; import gtPlusPlus.api.interfaces.IPlugin; +import gtPlusPlus.plugin.manager.Core_Manager; public class Core_Fishing implements IPlugin { + Core_Fishing() { + Core_Manager.registerPlugin(this); + } + @Override public boolean preInit() { - // TODO Auto-generated method stub return true; } @Override public boolean init() { - // TODO Auto-generated method stub return true; } @Override public boolean postInit() { - // TODO Auto-generated method stub return true; } diff --git a/src/Java/gtPlusPlus/plugin/manager/Core_Manager.java b/src/Java/gtPlusPlus/plugin/manager/Core_Manager.java index 2fd6096d32..de8d8bc408 100644 --- a/src/Java/gtPlusPlus/plugin/manager/Core_Manager.java +++ b/src/Java/gtPlusPlus/plugin/manager/Core_Manager.java @@ -8,6 +8,7 @@ public class Core_Manager { public static AutoMap<IPlugin> mPlugins = new AutoMap<IPlugin>(); public static void registerPlugin(IPlugin plug) { + Logger.INFO("[Plugin] " + "Registered "+plug.getPluginName()+"."); mPlugins.put(plug); } public static boolean preInit() { diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Ore.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Ore.java index d544f9f545..cd1e372fe2 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Ore.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Ore.java @@ -48,10 +48,15 @@ public class RecipeGen_Ore implements Runnable{ } if (material.getComposites().size() >= 1 && material.getComposites().get(1) != null){ bonusB = material.getComposites().get(1).getStackMaterial(); - } - else if (material.getComposites().get(0) != null){ - bonusB = material.getComposites().get(0).getStackMaterial(); - } + } + else if (material.getComposites().size() >= 1 && material.getComposites().get(1) == null){ + if (material.getComposites().get(0) != null){ + bonusB = material.getComposites().get(0).getStackMaterial(); + } + else { + bonusB = ELEMENT.getInstance().CHROMIUM; + } + } else { //Ultra Bonus bonusB = ELEMENT.getInstance().GALLIUM; @@ -65,6 +70,9 @@ public class RecipeGen_Ore implements Runnable{ } } + if (bonusA == null || bonusB == null) { + return; + } /** * Macerate */ diff --git a/src/Java/gtPlusPlus/xmod/gregtech/recipes/GregtechRecipeAdder.java b/src/Java/gtPlusPlus/xmod/gregtech/recipes/GregtechRecipeAdder.java index 6325fefc2b..1fb2d52939 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/recipes/GregtechRecipeAdder.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/recipes/GregtechRecipeAdder.java @@ -7,66 +7,108 @@ import gregtech.api.util.Recipe_GT; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.xmod.gregtech.api.interfaces.internal.IGregtech_RecipeAdder; -import gtPlusPlus.xmod.gregtech.recipes.machines.RECIPEHANDLER_CokeOven; import gtPlusPlus.xmod.gregtech.recipes.machines.RECIPEHANDLER_MatterFabricator; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; public class GregtechRecipeAdder implements IGregtech_RecipeAdder { - - @Override - public boolean addCokeOvenRecipe(final ItemStack aInput1, final ItemStack aInput2, final FluidStack aFluidInput, final FluidStack aFluidOutput, final ItemStack aOutput, int aDuration, final int aEUt) { + public boolean addCokeOvenRecipe(final ItemStack aInput1, final ItemStack aInput2, final FluidStack aFluidInput, + final FluidStack aFluidOutput, final ItemStack aOutput, int aDuration, final int aEUt) { try { try { - //RECIPEHANDLER_CokeOven.debug1(); - if (((aInput1 == null) /*&& (aFluidInput == null)*/) || ((aOutput == null) || (aFluidOutput == null))) { - //Utils.LOG_WARNING("aInput1:"+aInput1.toString()+" aInput2:"+aInput2.toString()+" aFluidInput:"+aFluidInput.toString()+" aFluidOutput:"+aFluidOutput.toString()+" aOutput:"+aOutput.toString()+" aDuration:"+aDuration+" aEU/t:"+aEUt); + // RECIPEHANDLER_CokeOven.debug1(); + if (((aInput1 == null) /* && (aFluidInput == null) */) + || ((aOutput == null) || (aFluidOutput == null))) { + // Utils.LOG_WARNING("aInput1:"+aInput1.toString()+" + // aInput2:"+aInput2.toString()+" + // aFluidInput:"+aFluidInput.toString()+" + // aFluidOutput:"+aFluidOutput.toString()+" + // aOutput:"+aOutput.toString()+" aDuration:"+aDuration+" + // aEU/t:"+aEUt); Logger.WARNING("Something was null, returning false"); return false; } - } catch (final NullPointerException e){e.getStackTrace();} + } + catch (final NullPointerException e) { + e.getStackTrace(); + } try { - //RECIPEHANDLER_CokeOven.debug2(aInput1, aInput2, aFluidInput, aFluidOutput, aOutput, aDuration, aEUt); - if ((aOutput != null) && ((aDuration = GregTech_API.sRecipeFile.get("cokeoven", aOutput, aDuration)) <= 0)) { - //Utils.LOG_WARNING("aInput1:"+aInput1.toString()+" aInput2:"+aInput2.toString()+" aFluidInput:"+aFluidInput.toString()+" aFluidOutput:"+aFluidOutput.toString()+" aOutput:"+aOutput.toString()+" aDuration:"+aDuration+" aEU/t:"+aEUt); + // RECIPEHANDLER_CokeOven.debug2(aInput1, aInput2, aFluidInput, + // aFluidOutput, aOutput, aDuration, aEUt); + if ((aOutput != null) + && ((aDuration = GregTech_API.sRecipeFile.get("cokeoven", aOutput, aDuration)) <= 0)) { + // Utils.LOG_WARNING("aInput1:"+aInput1.toString()+" + // aInput2:"+aInput2.toString()+" + // aFluidInput:"+aFluidInput.toString()+" + // aFluidOutput:"+aFluidOutput.toString()+" + // aOutput:"+aOutput.toString()+" aDuration:"+aDuration+" + // aEU/t:"+aEUt); Logger.WARNING("Something was null, returning false"); return false; } - } catch (final NullPointerException e){e.getStackTrace();} + } + catch (final NullPointerException e) { + e.getStackTrace(); + } try { - //RECIPEHANDLER_CokeOven.debug3(aInput1, aInput2, aFluidInput, aFluidOutput, aOutput, aDuration, aEUt); - if ((aFluidOutput == null) || ((aDuration = GregTech_API.sRecipeFile.get("cokeoven", aFluidOutput.getFluid().getName(), aDuration)) <= 0)) { - //Utils.LOG_WARNING("aInput1:"+aInput1.toString()+" aInput2:"+aInput2.toString()+" aFluidInput:"+aFluidInput.toString()+" aFluidOutput:"+aFluidOutput.toString()+" aOutput:"+aOutput.toString()+" aDuration:"+aDuration+" aEU/t:"+aEUt); + // RECIPEHANDLER_CokeOven.debug3(aInput1, aInput2, aFluidInput, + // aFluidOutput, aOutput, aDuration, aEUt); + if ((aFluidOutput == null) || ((aDuration = GregTech_API.sRecipeFile.get("cokeoven", + aFluidOutput.getFluid().getName(), aDuration)) <= 0)) { + // Utils.LOG_WARNING("aInput1:"+aInput1.toString()+" + // aInput2:"+aInput2.toString()+" + // aFluidInput:"+aFluidInput.toString()+" + // aFluidOutput:"+aFluidOutput.toString()+" + // aOutput:"+aOutput.toString()+" aDuration:"+aDuration+" + // aEU/t:"+aEUt); Logger.WARNING("Something was null, returning false"); return false; } - } catch (final NullPointerException e){e.getStackTrace();} + } + catch (final NullPointerException e) { + e.getStackTrace(); + } try { - //RECIPEHANDLER_CokeOven.debug4(aInput1, aInput2, aFluidInput, aFluidOutput, aOutput, aDuration, aEUt); - if (aFluidInput == null && aInput2 != null){ - Recipe_GT.Gregtech_Recipe_Map.sCokeOvenRecipes.addRecipe(true, new ItemStack[]{aInput1, aInput2}, new ItemStack[]{aOutput}, null, null, null, new FluidStack[]{aFluidOutput}, aDuration, aEUt, 0); + // RECIPEHANDLER_CokeOven.debug4(aInput1, aInput2, aFluidInput, + // aFluidOutput, aOutput, aDuration, aEUt); + if (aFluidInput == null && aInput2 != null) { + Recipe_GT.Gregtech_Recipe_Map.sCokeOvenRecipes.addRecipe(true, new ItemStack[] { aInput1, aInput2 }, + new ItemStack[] { aOutput }, null, null, null, new FluidStack[] { aFluidOutput }, aDuration, + aEUt, 0); } - else if (aFluidInput == null && aInput2 == null){ - Recipe_GT.Gregtech_Recipe_Map.sCokeOvenRecipes.addRecipe(true, new ItemStack[]{aInput1}, new ItemStack[]{aOutput}, null, null, null, new FluidStack[]{aFluidOutput}, aDuration, aEUt, 0); + else if (aFluidInput == null && aInput2 == null) { + Recipe_GT.Gregtech_Recipe_Map.sCokeOvenRecipes.addRecipe(true, new ItemStack[] { aInput1 }, + new ItemStack[] { aOutput }, null, null, null, new FluidStack[] { aFluidOutput }, aDuration, + aEUt, 0); } else { - Recipe_GT.Gregtech_Recipe_Map.sCokeOvenRecipes.addRecipe(true, new ItemStack[]{aInput1, aInput2}, new ItemStack[]{aOutput}, null, null, new FluidStack[]{aFluidInput}, new FluidStack[]{aFluidOutput}, aDuration, aEUt, 0); + Recipe_GT.Gregtech_Recipe_Map.sCokeOvenRecipes.addRecipe(true, new ItemStack[] { aInput1, aInput2 }, + new ItemStack[] { aOutput }, null, null, new FluidStack[] { aFluidInput }, + new FluidStack[] { aFluidOutput }, aDuration, aEUt, 0); } - RECIPEHANDLER_CokeOven.debug5(aInput1, aInput2, aFluidInput, aFluidOutput, aOutput, aDuration, aEUt); + // RECIPEHANDLER_CokeOven.debug5(aInput1, aInput2, aFluidInput, + // aFluidOutput, aOutput, aDuration, aEUt); return true; - } catch (final NullPointerException e){ + } + catch (final NullPointerException e) { Logger.WARNING("Something was null, returning false"); return false; } - } catch (final Throwable e){ - Logger.WARNING("aInput1:"+aInput1.toString()+" aInput2:"+aInput2.toString()+" aFluidInput:"+aFluidInput.toString()+" aFluidOutput:"+aFluidOutput.toString()+" aOutput:"+aOutput.toString()+" aDuration:"+aDuration+" aEU/t:"+aEUt); + } + catch (final Throwable e) { + // Logger.WARNING("aInput1:"+aInput1.toString()+" + // aInput2:"+aInput2.toString()+" + // aFluidInput:"+aFluidInput.toString()+" + // aFluidOutput:"+aFluidOutput.toString()+" + // aOutput:"+aOutput.toString()+" aDuration:"+aDuration+" + // aEU/t:"+aEUt); Logger.WARNING("Failed."); e.getStackTrace(); return false; @@ -74,37 +116,54 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder { } @Override - public boolean addMatterFabricatorRecipe(final FluidStack aFluidInput, final FluidStack aFluidOutput, final int aDuration, final int aEUt) { + public boolean addMatterFabricatorRecipe(final FluidStack aFluidInput, final FluidStack aFluidOutput, + final int aDuration, final int aEUt) { try { try { - //RECIPEHANDLER_MatterFabricator.debug1(); + // RECIPEHANDLER_MatterFabricator.debug1(); if (aFluidOutput == null) { - //Utils.LOG_WARNING("aFluidInput:"+aFluidInput.toString()+" aFluidOutput:"+aFluidOutput.toString()+" aDuration:"+aDuration+" aEU/t:"+aEUt); + // Utils.LOG_WARNING("aFluidInput:"+aFluidInput.toString()+" + // aFluidOutput:"+aFluidOutput.toString()+" + // aDuration:"+aDuration+" aEU/t:"+aEUt); Logger.WARNING("Something was null, returning false"); return false; } - } catch (final NullPointerException e){e.getStackTrace();} - try{ + } + catch (final NullPointerException e) { + e.getStackTrace(); + } + try { - //RECIPEHANDLER_MatterFabricator.debug4(aFluidInput, aFluidOutput, aDuration, aEUt); - if (aFluidInput == null){ - //Recipe_GT.Gregtech_Recipe_Map.sMatterFabRecipes.addRecipe(true, null, new FluidStack[]{aFluidOutput}, aDuration, aEUt, 0); - Recipe_GT.Gregtech_Recipe_Map.sMatterFab2Recipes.addRecipe(true, null, null, null, null, new FluidStack[]{aFluidOutput}, aDuration, aEUt, 0); + // RECIPEHANDLER_MatterFabricator.debug4(aFluidInput, + // aFluidOutput, aDuration, aEUt); + if (aFluidInput == null) { + // Recipe_GT.Gregtech_Recipe_Map.sMatterFabRecipes.addRecipe(true, + // null, new FluidStack[]{aFluidOutput}, aDuration, aEUt, + // 0); + Recipe_GT.Gregtech_Recipe_Map.sMatterFab2Recipes.addRecipe(true, null, null, null, null, + new FluidStack[] { aFluidOutput }, aDuration, aEUt, 0); } else { - //Recipe_GT.Gregtech_Recipe_Map.sMatterFabRecipes.addRecipe(true, new FluidStack[]{aFluidInput}, new FluidStack[]{aFluidOutput}, aDuration, aEUt, 0); - Recipe_GT.Gregtech_Recipe_Map.sMatterFab2Recipes.addRecipe(true, null, null, null, new FluidStack[]{aFluidInput}, new FluidStack[]{aFluidOutput}, aDuration, aEUt, 0); + // Recipe_GT.Gregtech_Recipe_Map.sMatterFabRecipes.addRecipe(true, + // new FluidStack[]{aFluidInput}, new + // FluidStack[]{aFluidOutput}, aDuration, aEUt, 0); + Recipe_GT.Gregtech_Recipe_Map.sMatterFab2Recipes.addRecipe(true, null, null, null, + new FluidStack[] { aFluidInput }, new FluidStack[] { aFluidOutput }, aDuration, aEUt, 0); } RECIPEHANDLER_MatterFabricator.debug5(aFluidInput, aFluidOutput, aDuration, aEUt); return true; - } catch (final NullPointerException e){ + } + catch (final NullPointerException e) { return false; } - } catch (final Throwable e){ - //Utils.LOG_WARNING("aFluidInput:"+aFluidInput.toString()+" aFluidOutput:"+aFluidOutput.toString()+" aDuration:"+aDuration+" aEU/t:"+aEUt); + } + catch (final Throwable e) { + // Utils.LOG_WARNING("aFluidInput:"+aFluidInput.toString()+" + // aFluidOutput:"+aFluidOutput.toString()+" aDuration:"+aDuration+" + // aEU/t:"+aEUt); Logger.WARNING("Failed."); e.getStackTrace(); return false; @@ -112,155 +171,174 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder { } @Override - public boolean addMatterFabricatorRecipe(final ItemStack aInputStack, final FluidStack aFluidInput, final FluidStack aFluidOutput, final int aDuration, final int aEUt) { + public boolean addMatterFabricatorRecipe(final ItemStack aInputStack, final FluidStack aFluidInput, + final FluidStack aFluidOutput, final int aDuration, final int aEUt) { try { - try {if ((aFluidOutput == null) || (aInputStack == null)) {return false;}} catch (final NullPointerException e){} - try{ - if (aFluidInput == null){ - Recipe_GT.Gregtech_Recipe_Map.sMatterFab2Recipes.addRecipe(true, new ItemStack[]{aInputStack}, null, null, null, new FluidStack[]{aFluidOutput}, aDuration, aEUt, 0); + try { + if ((aFluidOutput == null) || (aInputStack == null)) { + return false; + } + } + catch (final NullPointerException e) { + } + try { + if (aFluidInput == null) { + Recipe_GT.Gregtech_Recipe_Map.sMatterFab2Recipes.addRecipe(true, new ItemStack[] { aInputStack }, + null, null, null, new FluidStack[] { aFluidOutput }, aDuration, aEUt, 0); } else { - Recipe_GT.Gregtech_Recipe_Map.sMatterFab2Recipes.addRecipe(true, new ItemStack[]{aInputStack}, null, null, new FluidStack[]{aFluidInput}, new FluidStack[]{aFluidOutput}, aDuration, aEUt, 0); + Recipe_GT.Gregtech_Recipe_Map.sMatterFab2Recipes.addRecipe(true, new ItemStack[] { aInputStack }, + null, null, new FluidStack[] { aFluidInput }, new FluidStack[] { aFluidOutput }, aDuration, + aEUt, 0); } RECIPEHANDLER_MatterFabricator.debug5(aFluidInput, aFluidOutput, aDuration, aEUt); return true; - } catch (final NullPointerException e){return false;} - } catch (final Throwable e){return false;} + } + catch (final NullPointerException e) { + return false; + } + } + catch (final Throwable e) { + return false; + } } - @Override public boolean addFuel(final ItemStack aInput1, final ItemStack aOutput1, final int aEU, final int aType) { if (aInput1 == null) { Logger.WARNING("Fuel Input is Invalid."); return false; } - //new GregtechRecipe(aInput1, aOutput1, GregTech_API.sRecipeFile.get("fuel_" + aType, aInput1, aEU), aType); + // new GregtechRecipe(aInput1, aOutput1, + // GregTech_API.sRecipeFile.get("fuel_" + aType, aInput1, aEU), aType); return true; } - /*@Override - public boolean addDehydratorRecipe(ItemStack aItemA, ItemStack aItemB, FluidStack aFluid, ItemStack[] aOutputItems, FluidStack aOutputFluid, int aDuration, int aEUt) { - if ((aItemA == null) || (aItemB == null) || (aOutputItems == null)) { - return false; - } - for (ItemStack tStack : aOutputItems) { - if (tStack != null) { - if ((aDuration = GregTech_API.sRecipeFile.get("dehydrator", aItemA, aDuration)) <= 0) { - return false; - } - Recipe_GT.Gregtech_Recipe_Map.sChemicalDehydratorRecipes.addRecipe(true, new ItemStack[]{aItemA, aItemB}, aOutputItems, null, null, null, aDuration, aEUt, 0); - RECIPEHANDLER_Dehydrator.debug5(aItemA, aItemB, aFluid, aOutputFluid, aOutputItems, aDuration, aEUt); - return true; - } - } - return false; - } - - @Override - public boolean addDehydratorRecipe(ItemStack aItemA, ItemStack aItemB, ItemStack[] aOutputItems, int aDuration, int aEUt) { - if ((aItemA == null) || (aItemB == null) || (aOutputItems == null)) { - return false; - } - if ((aDuration = GregTech_API.sRecipeFile.get("dehydrator", aItemA, aDuration)) <= 0) { - return false; - } - Recipe_GT.Gregtech_Recipe_Map.sChemicalDehydratorRecipes.addRecipe(true, new ItemStack[]{aItemA, aItemB}, aOutputItems, null, null, null, aDuration, aEUt, 0); - RECIPEHANDLER_Dehydrator.debug5(aItemA, aItemB, null, null, aOutputItems, aDuration, aEUt); - return true; - } - - + /* + * @Override public boolean addDehydratorRecipe(ItemStack aItemA, ItemStack + * aItemB, FluidStack aFluid, ItemStack[] aOutputItems, FluidStack + * aOutputFluid, int aDuration, int aEUt) { if ((aItemA == null) || (aItemB + * == null) || (aOutputItems == null)) { return false; } for (ItemStack + * tStack : aOutputItems) { if (tStack != null) { if ((aDuration = + * GregTech_API.sRecipeFile.get("dehydrator", aItemA, aDuration)) <= 0) { + * return false; } + * Recipe_GT.Gregtech_Recipe_Map.sChemicalDehydratorRecipes.addRecipe(true, + * new ItemStack[]{aItemA, aItemB}, aOutputItems, null, null, null, + * aDuration, aEUt, 0); RECIPEHANDLER_Dehydrator.debug5(aItemA, aItemB, + * aFluid, aOutputFluid, aOutputItems, aDuration, aEUt); return true; } } + * return false; } + * @Override public boolean addDehydratorRecipe(ItemStack aItemA, ItemStack + * aItemB, ItemStack[] aOutputItems, int aDuration, int aEUt) { if ((aItemA + * == null) || (aItemB == null) || (aOutputItems == null)) { return false; } + * if ((aDuration = GregTech_API.sRecipeFile.get("dehydrator", aItemA, + * aDuration)) <= 0) { return false; } + * Recipe_GT.Gregtech_Recipe_Map.sChemicalDehydratorRecipes.addRecipe(true, + * new ItemStack[]{aItemA, aItemB}, aOutputItems, null, null, null, + * aDuration, aEUt, 0); RECIPEHANDLER_Dehydrator.debug5(aItemA, aItemB, + * null, null, aOutputItems, aDuration, aEUt); return true; } + * @Override public boolean addDehydratorRecipe(FluidStack aFluid, + * FluidStack aOutputFluid, ItemStack[] aOutputItems, int aDuration, int + * aEUt){ if ((aFluid == null) || (aOutputFluid == null || aOutputItems == + * null)) { return false; } if ((aDuration = + * GregTech_API.sRecipeFile.get("dehydrator", aFluid.getUnlocalizedName(), + * aDuration)) <= 0) { return false; } + * Recipe_GT.Gregtech_Recipe_Map.sChemicalDehydratorRecipes.addRecipe(true, + * null, aOutputItems, null, new FluidStack[]{aFluid}, new + * FluidStack[]{aOutputFluid}, aDuration, aEUt, 0); + * RECIPEHANDLER_Dehydrator.debug5(null, null, aFluid, aOutputFluid, + * aOutputItems, aDuration, aEUt); return true; } + */ @Override - public boolean addDehydratorRecipe(FluidStack aFluid, FluidStack aOutputFluid, ItemStack[] aOutputItems, int aDuration, int aEUt){ - if ((aFluid == null) || (aOutputFluid == null || aOutputItems == null)) { - return false; - } - if ((aDuration = GregTech_API.sRecipeFile.get("dehydrator", aFluid.getUnlocalizedName(), aDuration)) <= 0) { - return false; - } - Recipe_GT.Gregtech_Recipe_Map.sChemicalDehydratorRecipes.addRecipe(true, null, aOutputItems, null, new FluidStack[]{aFluid}, new FluidStack[]{aOutputFluid}, aDuration, aEUt, 0); - RECIPEHANDLER_Dehydrator.debug5(null, null, aFluid, aOutputFluid, aOutputItems, aDuration, aEUt); - return true; -}*/ - - - @Override - public boolean addDehydratorRecipe(final ItemStack aInput, final FluidStack aFluid, final ItemStack[] aOutput, int aDuration, final int aEUt) { + public boolean addDehydratorRecipe(final ItemStack aInput, final FluidStack aFluid, final ItemStack[] aOutput, + int aDuration, final int aEUt) { Logger.WARNING("Trying to add a Dehydrator recipe."); - try{ + try { if ((aInput == null) || (aFluid == null) || (aOutput == null)) { return false; } if ((aDuration = GregTech_API.sRecipeFile.get("dehydrator", aInput, aDuration)) <= 0) { return false; } - Recipe_GT.Gregtech_Recipe_Map.sChemicalDehydratorRecipes.addRecipe(true, new ItemStack[]{aInput}, aOutput, null, new FluidStack[]{aFluid}, null, aDuration, aEUt, 0); - //RECIPEHANDLER_Dehydrator.debug5(aInput, null, aFluid, null, aOutput, aDuration, aEUt); + Recipe_GT.Gregtech_Recipe_Map.sChemicalDehydratorRecipes.addRecipe(true, new ItemStack[] { aInput }, + aOutput, null, new FluidStack[] { aFluid }, null, aDuration, aEUt, 0); + // RECIPEHANDLER_Dehydrator.debug5(aInput, null, aFluid, null, + // aOutput, aDuration, aEUt); return true; - }catch (final NullPointerException e){Logger.WARNING("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");return false;} + } + catch (final NullPointerException e) { + Logger.WARNING("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE"); + return false; + } } - - - @Override - public boolean addDehydratorRecipe(final ItemStack[] aInput, final FluidStack aFluidInput, final FluidStack aFluidOutput, final ItemStack[] aOutputItems, final int[] aChances, int aDuration, final int aEUt) throws IndexOutOfBoundsException{ + public boolean addDehydratorRecipe(final ItemStack[] aInput, final FluidStack aFluidInput, + final FluidStack aFluidOutput, final ItemStack[] aOutputItems, final int[] aChances, int aDuration, + final int aEUt) throws IndexOutOfBoundsException { Logger.WARNING("Trying to add a Dehydrator recipe."); - try{ - if (aInput[0] != null){ - Logger.WARNING("Recipe requires input: "+aInput[0].getDisplayName()+" x"+aInput[0].stackSize); + try { + if (aInput[0] != null) { + Logger.WARNING("Recipe requires input: " + aInput[0].getDisplayName() + " x" + aInput[0].stackSize); } - if (aInput.length > 1){ - if (aInput[1] != null){ - Logger.WARNING("Recipe requires input: "+aInput[1].getDisplayName()+" x"+aInput[1].stackSize); + if (aInput.length > 1) { + if (aInput[1] != null) { + Logger.WARNING("Recipe requires input: " + aInput[1].getDisplayName() + " x" + aInput[1].stackSize); } } - if (aFluidInput != null){ - Logger.WARNING("Recipe requires input: "+aFluidInput.getFluid().getName()+" "+aFluidInput.amount+"mbst"); + if (aFluidInput != null) { + Logger.WARNING("Recipe requires input: " + aFluidInput.getFluid().getName() + " " + aFluidInput.amount + + "mbst"); } if (((aInput[0] == null) && (aFluidInput == null)) || ((aOutputItems == null) && (aFluidOutput == null))) { return false; } - if ((aOutputItems != null) && ((aDuration = GregTech_API.sRecipeFile.get("dehydrator", aOutputItems[0], aDuration)) <= 0)) { + if ((aOutputItems != null) + && ((aDuration = GregTech_API.sRecipeFile.get("dehydrator", aOutputItems[0], aDuration)) <= 0)) { return false; } - if (aOutputItems != null){ - Logger.WARNING("Recipe will output: "+ItemUtils.getArrayStackNames(aOutputItems)); + if (aOutputItems != null) { + Logger.WARNING("Recipe will output: " + ItemUtils.getArrayStackNames(aOutputItems)); } - if ((aFluidOutput != null) && ((aDuration = GregTech_API.sRecipeFile.get("dehydrator", aFluidOutput.getFluid().getName(), aDuration)) <= 0)) { + if ((aFluidOutput != null) && ((aDuration = GregTech_API.sRecipeFile.get("dehydrator", + aFluidOutput.getFluid().getName(), aDuration)) <= 0)) { return false; } - if (aFluidOutput != null){ - Logger.WARNING("Recipe will output: "+aFluidOutput.getFluid().getName()); + if (aFluidOutput != null) { + Logger.WARNING("Recipe will output: " + aFluidOutput.getFluid().getName()); } - - - if (aInput.length == 1){ + if (aInput.length == 1) { Logger.WARNING("Dehydrator recipe only has a single input item."); - Recipe_GT.Gregtech_Recipe_Map.sChemicalDehydratorRecipes.addRecipe(true, aInput, aOutputItems, null, aChances, new FluidStack[]{aFluidInput}, new FluidStack[]{aFluidOutput}, aDuration, aEUt, 0); + Recipe_GT.Gregtech_Recipe_Map.sChemicalDehydratorRecipes.addRecipe(true, aInput, aOutputItems, null, + aChances, new FluidStack[] { aFluidInput }, new FluidStack[] { aFluidOutput }, aDuration, aEUt, + 0); } else { Logger.WARNING("Dehydrator recipe has two input items."); - Recipe_GT.Gregtech_Recipe_Map.sChemicalDehydratorRecipes.addRecipe(true, aInput, aOutputItems, null, aChances, new FluidStack[]{aFluidInput}, new FluidStack[]{aFluidOutput}, aDuration, aEUt, 0); + Recipe_GT.Gregtech_Recipe_Map.sChemicalDehydratorRecipes.addRecipe(true, aInput, aOutputItems, null, + aChances, new FluidStack[] { aFluidInput }, new FluidStack[] { aFluidOutput }, aDuration, aEUt, + 0); } return true; - }catch (final NullPointerException e){Logger.WARNING("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");return false;} + } + catch (final NullPointerException e) { + Logger.WARNING("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE"); + return false; + } } @Override - public boolean addBlastSmelterRecipe(final ItemStack[] aInput, FluidStack aOutput, final int aChance, int aDuration, final int aEUt) { + public boolean addBlastSmelterRecipe(final ItemStack[] aInput, FluidStack aOutput, final int aChance, int aDuration, + final int aEUt) { if ((aInput == null) || (aOutput == null)) { Logger.WARNING("Fail - Input or Output was null."); return false; } - if (aOutput.isFluidEqual(Materials.PhasedGold.getMolten(1))) { aOutput = Materials.VibrantAlloy.getMolten(aOutput.amount); } @@ -272,24 +350,26 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder { return false; } - for (int das=0;das<aInput.length;das++){ + for (int das = 0; das < aInput.length; das++) { if (aInput[das] != null) { - Logger.WARNING("tMaterial["+das+"]: "+aInput[das].getDisplayName()+", Amount: "+aInput[das].stackSize); + Logger.WARNING("tMaterial[" + das + "]: " + aInput[das].getDisplayName() + ", Amount: " + + aInput[das].stackSize); } } - Recipe_GT.Gregtech_Recipe_Map.sAlloyBlastSmelterRecipes.addRecipe(true, aInput, new ItemStack[]{null}, null, new int[]{aChance}, null, new FluidStack[]{aOutput}, aDuration, aEUt, 0); + Recipe_GT.Gregtech_Recipe_Map.sAlloyBlastSmelterRecipes.addRecipe(true, aInput, new ItemStack[] { null }, null, + new int[] { aChance }, null, new FluidStack[] { aOutput }, aDuration, aEUt, 0); return true; } @Override - public boolean addBlastSmelterRecipe(final ItemStack[] aInput, FluidStack aInputFluid, FluidStack aOutput, final int aChance, int aDuration, final int aEUt) { + public boolean addBlastSmelterRecipe(final ItemStack[] aInput, FluidStack aInputFluid, FluidStack aOutput, + final int aChance, int aDuration, final int aEUt) { if ((aInput == null) || (aOutput == null)) { Logger.WARNING("Fail - Input or Output was null."); return false; } - if (aOutput.isFluidEqual(Materials.PhasedGold.getMolten(1))) { aOutput = Materials.VibrantAlloy.getMolten(aOutput.amount); } @@ -301,53 +381,56 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder { return false; } - for (int das=0;das<aInput.length;das++){ + for (int das = 0; das < aInput.length; das++) { if (aInput[das] != null) { - Logger.WARNING("tMaterial["+das+"]: "+aInput[das].getDisplayName()+", Amount: "+aInput[das].stackSize); + Logger.WARNING("tMaterial[" + das + "]: " + aInput[das].getDisplayName() + ", Amount: " + + aInput[das].stackSize); } } - Recipe_GT.Gregtech_Recipe_Map.sAlloyBlastSmelterRecipes.addRecipe(true, aInput, new ItemStack[]{null}, null, new int[]{aChance}, new FluidStack[]{aInputFluid}, new FluidStack[]{aOutput}, aDuration, aEUt, 0); + Recipe_GT.Gregtech_Recipe_Map.sAlloyBlastSmelterRecipes.addRecipe(true, aInput, new ItemStack[] { null }, null, + new int[] { aChance }, new FluidStack[] { aInputFluid }, new FluidStack[] { aOutput }, aDuration, aEUt, + 0); return true; } - - @Override - public boolean addLFTRRecipe(final ItemStack aInput1, final FluidStack aInput2, - final ItemStack aOutput1, final FluidStack aOutput2, final int aDuration, final int aEUt) { + public boolean addLFTRRecipe(final ItemStack aInput1, final FluidStack aInput2, final ItemStack aOutput1, + final FluidStack aOutput2, final int aDuration, final int aEUt) { // TODO Auto-generated method stub return false; } @Override - public boolean addLFTRRecipe(final ItemStack aInput1, final ItemStack aInput2, final ItemStack aOutput1, final int aDuration, final int aEUt) { + public boolean addLFTRRecipe(final ItemStack aInput1, final ItemStack aInput2, final ItemStack aOutput1, + final int aDuration, final int aEUt) { return false; } @Override - public boolean addLFTRRecipe(final FluidStack aInput1, final FluidStack aInput2, final FluidStack aOutput1, final int aDuration, final int aEUt) { + public boolean addLFTRRecipe(final FluidStack aInput1, final FluidStack aInput2, final FluidStack aOutput1, + final int aDuration, final int aEUt) { if ((aInput1 == null) || (aInput2 == null) || (aOutput1 == null) || (aDuration < 1) || (aEUt < 1)) { return false; } - Recipe_GT.Gregtech_Recipe_Map.sLiquidFluorineThoriumReactorRecipes.addRecipe(null, new FluidStack[]{aInput1, aInput2}, new FluidStack[]{aOutput1}, aDuration, aEUt, 16000); + Recipe_GT.Gregtech_Recipe_Map.sLiquidFluorineThoriumReactorRecipes.addRecipe(null, + new FluidStack[] { aInput1, aInput2 }, new FluidStack[] { aOutput1 }, aDuration, aEUt, 16000); return true; } @Override - public boolean addFissionFuel( - final FluidStack aInput1, final FluidStack aInput2, final FluidStack aInput3, - final FluidStack aInput4, final FluidStack aInput5, final FluidStack aInput6, - final FluidStack aInput7, final FluidStack aInput8, final FluidStack aInput9, - final FluidStack aOutput1, final FluidStack aOutput2, + public boolean addFissionFuel(final FluidStack aInput1, final FluidStack aInput2, final FluidStack aInput3, + final FluidStack aInput4, final FluidStack aInput5, final FluidStack aInput6, final FluidStack aInput7, + final FluidStack aInput8, final FluidStack aInput9, final FluidStack aOutput1, final FluidStack aOutput2, final int aDuration, final int aEUt) { if ((aInput1 == null) || (aInput2 == null) || (aOutput1 == null) || (aDuration < 1) || (aEUt < 1)) { return false; } - final FluidStack inputs[] = {aInput1, aInput2, aInput3, aInput4, aInput5, aInput6, aInput7, aInput8, aInput9}; - final FluidStack outputs[] = {aOutput1, aOutput2}; - //Recipe_GT.Gregtech_Recipe_Map.sFissionFuelProcessing.addRecipe(null, inputs, outputs, aDuration, aEUt, 0); + final FluidStack inputs[] = { aInput1, aInput2, aInput3, aInput4, aInput5, aInput6, aInput7, aInput8, aInput9 }; + final FluidStack outputs[] = { aOutput1, aOutput2 }; + // Recipe_GT.Gregtech_Recipe_Map.sFissionFuelProcessing.addRecipe(null, + // inputs, outputs, aDuration, aEUt, 0); CustomRecipeMap.sFissionFuelProcessing.addRecipe(null, inputs, outputs, aDuration, aEUt, 0); return true; } @@ -374,27 +457,31 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder { @Override public boolean addMixerRecipe(ItemStack aInput1, ItemStack aInput2, ItemStack aInput3, ItemStack aInput4, - FluidStack aFluidInput, FluidStack aFluidOutput, ItemStack aOutput1, ItemStack aOutput2, ItemStack aOutput3, ItemStack aOutput4, int aDuration, int aEUt) { + FluidStack aFluidInput, FluidStack aFluidOutput, ItemStack aOutput1, ItemStack aOutput2, ItemStack aOutput3, + ItemStack aOutput4, int aDuration, int aEUt) { if (((aInput1 == null) && (aFluidInput == null)) || ((aOutput1 == null) && (aFluidOutput == null))) { return false; } - if ((aOutput1 != null) && ((aDuration = GregTech_API.sRecipeFile.get("advancedmixer", aOutput1, aDuration)) <= 0)) { + if ((aOutput1 != null) + && ((aDuration = GregTech_API.sRecipeFile.get("advancedmixer", aOutput1, aDuration)) <= 0)) { return false; } if ((aFluidOutput != null) && ((aDuration = GregTech_API.sRecipeFile.get("advancedmixer", aFluidOutput.getFluid().getName(), aDuration)) <= 0)) { return false; } - Recipe_GT.Gregtech_Recipe_Map.sAdvancedMixerRecipes.addRecipe(true, new ItemStack[] { aInput1, aInput2, aInput3, aInput4 }, - new ItemStack[] { aOutput1, aOutput2, aOutput3, aOutput4 }, null, null, new FluidStack[] { aFluidInput }, - new FluidStack[] { aFluidOutput }, aDuration, aEUt, 0); + Recipe_GT.Gregtech_Recipe_Map.sAdvancedMixerRecipes.addRecipe(true, + new ItemStack[] { aInput1, aInput2, aInput3, aInput4 }, + new ItemStack[] { aOutput1, aOutput2, aOutput3, aOutput4 }, null, null, + new FluidStack[] { aFluidInput }, new FluidStack[] { aFluidOutput }, aDuration, aEUt, 0); return true; } - //Machine Component Assembler + // Machine Component Assembler @Override - public boolean addComponentMakerRecipe(ItemStack[] aInputs, FluidStack aFluidInput, ItemStack aOutput1, int aDuration, int aEUt) { - if (areItemsAndFluidsBothNull(aInputs, new FluidStack[]{aFluidInput})) { + public boolean addComponentMakerRecipe(ItemStack[] aInputs, FluidStack aFluidInput, ItemStack aOutput1, + int aDuration, int aEUt) { + if (areItemsAndFluidsBothNull(aInputs, new FluidStack[] { aFluidInput })) { return false; } if (aOutput1 == null) { @@ -403,22 +490,11 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder { if ((aDuration = GregTech_API.sRecipeFile.get("machinecomponents", aOutput1, aDuration)) <= 0) { return false; } - Recipe_GT.Gregtech_Recipe_Map.sComponentAssemblerRecipes.addRecipe(true, aInputs, new ItemStack[]{aOutput1}, null, new FluidStack[]{aFluidInput}, null, aDuration, aEUt, 0); + Recipe_GT.Gregtech_Recipe_Map.sComponentAssemblerRecipes.addRecipe(true, aInputs, new ItemStack[] { aOutput1 }, + null, new FluidStack[] { aFluidInput }, null, aDuration, aEUt, 0); return true; } - - - - - - - - - - - - private boolean areItemsAndFluidsBothNull(final ItemStack[] items, final FluidStack[] fluids) { boolean itemsNull = true; if (items != null) { @@ -441,5 +517,4 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder { return itemsNull && fluidsNull; } - } diff --git a/src/resources/assets/gregtech/textures/blocks/fluids/fluid.nitrofuel_old.png b/src/resources/assets/gregtech/textures/blocks/fluids/fluid.nitrofuel_old.png Binary files differnew file mode 100644 index 0000000000..c563ca0021 --- /dev/null +++ b/src/resources/assets/gregtech/textures/blocks/fluids/fluid.nitrofuel_old.png diff --git a/src/resources/assets/gregtech/textures/blocks/fluids/fluid.nitrofuel_old.png.mcmeta b/src/resources/assets/gregtech/textures/blocks/fluids/fluid.nitrofuel_old.png.mcmeta new file mode 100644 index 0000000000..0df7234a79 --- /dev/null +++ b/src/resources/assets/gregtech/textures/blocks/fluids/fluid.nitrofuel_old.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation":{ + "frametime":2 + } +}
\ No newline at end of file |
