diff options
| author | DotJason <SOleg413@mail.ru> | 2023-07-09 11:34:26 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-09 10:34:26 +0200 |
| commit | 7afca0b302c15777c10c4ad47f3341c5d492193f (patch) | |
| tree | 4b027bdf2507ff8cfa82317218d2baf72a96eea7 /src/main/java/gregtech/loaders/oreprocessing | |
| parent | 3f83b54ca64cc14f835e4d527ebf05597e4afaeb (diff) | |
| download | GT5-Unofficial-7afca0b302c15777c10c4ad47f3341c5d492193f.tar.gz GT5-Unofficial-7afca0b302c15777c10c4ad47f3341c5d492193f.tar.bz2 GT5-Unofficial-7afca0b302c15777c10c4ad47f3341c5d492193f.zip | |
Add soft material subtag (#2124)
* add soft subtag
* add soft subtag to Gaia Spirit
* clean code style
Diffstat (limited to 'src/main/java/gregtech/loaders/oreprocessing')
| -rw-r--r-- | src/main/java/gregtech/loaders/oreprocessing/ProcessingToolHead.java | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingToolHead.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingToolHead.java index 096c0ea7f8..11e60aed3a 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingToolHead.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingToolHead.java @@ -55,6 +55,8 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg boolean aSpecialRecipeReq2 = aMaterial.mUnificatable && (aMaterial.mMaterialInto == aMaterial) && !aMaterial.contains(SubTag.NO_WORKING); boolean aNoWorking = aMaterial.contains(SubTag.NO_WORKING); + boolean aProducesSoftMallet = aMaterial.contains(SubTag.BOUNCY) || aMaterial.contains(SubTag.WOOD) + || aMaterial.contains(SubTag.SOFT); switch (aPrefix) { case toolHeadArrow -> { if (aMaterial.mStandardMoltenFluid != null) @@ -1177,8 +1179,7 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg GT_Utility.getIntegratedCircuit(14)) .itemOutputs( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - (aMaterial.contains(SubTag.BOUNCY)) || (aMaterial.contains(SubTag.WOOD)) - ? GT_MetaGenerated_Tool_01.SOFTMALLET + aProducesSoftMallet ? GT_MetaGenerated_Tool_01.SOFTMALLET : GT_MetaGenerated_Tool_01.HARDHAMMER, 1, aMaterial, @@ -1193,8 +1194,7 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg if ((aMaterial != Materials.Stone) && (aMaterial != Materials.Flint)) { GT_ModHandler.addShapelessCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - (aMaterial.contains(SubTag.BOUNCY)) || (aMaterial.contains(SubTag.WOOD)) - ? GT_MetaGenerated_Tool_01.SOFTMALLET + aProducesSoftMallet ? GT_MetaGenerated_Tool_01.SOFTMALLET : GT_MetaGenerated_Tool_01.HARDHAMMER, 1, aMaterial, @@ -1204,8 +1204,7 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg new Object[] { aOreDictName, OrePrefixes.stick.get(aMaterial.mHandleMaterial) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - (aMaterial.contains(SubTag.BOUNCY)) || (aMaterial.contains(SubTag.WOOD)) - ? GT_MetaGenerated_Tool_01.SOFTMALLET + aProducesSoftMallet ? GT_MetaGenerated_Tool_01.SOFTMALLET : GT_MetaGenerated_Tool_01.HARDHAMMER, 1, aMaterial, @@ -1218,8 +1217,7 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg 'S', OrePrefixes.stick.get(aMaterial.mHandleMaterial) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - (aMaterial.contains(SubTag.BOUNCY)) || (aMaterial.contains(SubTag.WOOD)) - ? GT_MetaGenerated_Tool_01.SOFTMALLET + aProducesSoftMallet ? GT_MetaGenerated_Tool_01.SOFTMALLET : GT_MetaGenerated_Tool_01.HARDHAMMER, 1, aMaterial, |