diff options
author | Draknyte1 <Draknyte1@hotmail.com> | 2016-09-15 15:50:54 +1000 |
---|---|---|
committer | Draknyte1 <Draknyte1@hotmail.com> | 2016-09-15 15:50:54 +1000 |
commit | a3aa117da7b7daedff109f826ec1e95cafaaad03 (patch) | |
tree | 4c90ae522ad0c5f08b4761956e649c8bf8b9074c /src/Java/gtPlusPlus/xmod/gregtech/loaders | |
parent | 2def9acccdf30a88947943673fcd695f1e59cb77 (diff) | |
download | GT5-Unofficial-a3aa117da7b7daedff109f826ec1e95cafaaad03.tar.gz GT5-Unofficial-a3aa117da7b7daedff109f826ec1e95cafaaad03.tar.bz2 GT5-Unofficial-a3aa117da7b7daedff109f826ec1e95cafaaad03.zip |
$ Fixed the Skookum Choocher, not it:
> Behaves like a wrench unless you hold shift
> While shift is held, it prospects like a Hard Hammer.
> It functions as a wrench when mining machines and a Hard Hammer when mining anything else.
> There are over 100 types available from GT's materials.
+ Added in the FluidItemBlock.class
Diffstat (limited to 'src/Java/gtPlusPlus/xmod/gregtech/loaders')
-rw-r--r-- | src/Java/gtPlusPlus/xmod/gregtech/loaders/ProcessingToolHeadChoocher.java | 36 |
1 files changed, 31 insertions, 5 deletions
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/ProcessingToolHeadChoocher.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/ProcessingToolHeadChoocher.java index 5b4d7be601..2e50a919c3 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/ProcessingToolHeadChoocher.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/ProcessingToolHeadChoocher.java @@ -4,7 +4,9 @@ import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.enums.SubTag; import gregtech.api.util.GT_ModHandler; +import gregtech.api.util.GT_OreDictUnificator; import gtPlusPlus.core.util.Utils; +import gtPlusPlus.core.util.recipe.UtilsRecipe; import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes; import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials; import gtPlusPlus.xmod.gregtech.api.interfaces.internal.Interface_OreRecipeRegistrator; @@ -37,20 +39,44 @@ public class ProcessingToolHeadChoocher implements Interface_OreRecipeRegistrato public void materialsLoops(){ Materials[] i = Materials.values(); int size = i.length; + Utils.LOG_INFO("Materials to attempt tool gen. with: "+size); + int used = 0; Materials aMaterial = null; for (int r=0;r<size;r++){ aMaterial = i[r]; - if ((aMaterial != Materials.Stone) && (aMaterial != Materials.Flint)) { - if (aMaterial != Materials.Rubber) - if ((!aMaterial.contains(SubTag.WOOD)) && (!aMaterial.contains(SubTag.BOUNCY)) && (!aMaterial.contains(SubTag.NO_SMASHING))) { - GT_ModHandler.addCraftingRecipe(MetaGeneratedGregtechTools.INSTANCE.getToolWithStats(7734, 1, aMaterial, aMaterial, null), GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"P H", "PIP", " I ", Character.valueOf('I'), OrePrefixes.ingot.get(aMaterial), Character.valueOf('P'), OrePrefixes.plate.get(aMaterial), Character.valueOf('H'), OrePrefixes.toolHeadHammer.get(aMaterial)}); + if ((aMaterial != Materials.Stone) && (aMaterial != Materials.Flint) && (aMaterial != Materials.Rubber) && (aMaterial != Materials._NULL)) { + if ((!aMaterial.contains(SubTag.WOOD)) && (!aMaterial.contains(SubTag.BOUNCY)) && (!aMaterial.contains(SubTag.NO_SMASHING))&& (!aMaterial.contains(SubTag.TRANSPARENT))&& (!aMaterial.contains(SubTag.FLAMMABLE))&& (!aMaterial.contains(SubTag.MAGICAL))&& (!aMaterial.contains(SubTag.NO_SMELTING))) { + Utils.LOG_INFO("Found "+aMaterial.name()+" as a valid Skookum Choocher Material."); + //Input 1 + ItemStack plate = GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L); + ItemStack ingot = GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L); + ItemStack hammerhead = GT_OreDictUnificator.get(OrePrefixes.toolHeadHammer, aMaterial, 1L); + + if (null != plate && null != ingot && null != hammerhead){ + UtilsRecipe.recipeBuilder( + plate, null, hammerhead, + plate, plate, ingot, + null, ingot, null, + MetaGeneratedGregtechTools.INSTANCE.getToolWithStats(MetaGeneratedGregtechTools.SKOOKUM_CHOOCHER, 1, aMaterial, null, null)); + used++; + } + else { + Utils.LOG_INFO(""+aMaterial.name()+" could not be used for all input compoenents. [3x"+aMaterial.name()+" plates, 2x"+aMaterial.name()+" ingots, 1x"+aMaterial.name()+" Hard Hammer Head."); + } + //GT_ModHandler.addCraftingRecipe(, GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"P H", "PIP", " I ", Character.valueOf('I'), OrePrefixes.ingot.get(aMaterial), Character.valueOf('P'), OrePrefixes.plate.get(aMaterial), Character.valueOf('H'), OrePrefixes.toolHeadHammer.get(aMaterial)}); } + else { + Utils.LOG_INFO(""+aMaterial.name()+" was not a valid Skookum Choocher Material."); + } } + else { + Utils.LOG_INFO(""+aMaterial.name()+" was not a valid Skookum Choocher Material."); + } } - + Utils.LOG_INFO("Materials used for tool gen: "+used); } @Override |