diff options
author | boubou19 <miisterunknown@gmail.com> | 2024-07-02 20:48:44 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-07-02 20:48:44 +0200 |
commit | 84a6dabdcc9936aaeece6d74952157996fc6bc58 (patch) | |
tree | 846e5ff24ebbac4f5783f32497c69731f263e72e /src/main/java/gregtech/loaders/oreprocessing | |
parent | b2cbfcf522d9dd13ce89a38d8a5767a8a64cecd8 (diff) | |
download | GT5-Unofficial-84a6dabdcc9936aaeece6d74952157996fc6bc58.tar.gz GT5-Unofficial-84a6dabdcc9936aaeece6d74952157996fc6bc58.tar.bz2 GT5-Unofficial-84a6dabdcc9936aaeece6d74952157996fc6bc58.zip |
Removal of the GT Arrows (#2692)
* remove arrows
* remove arrow classes
* remove arrow usages in ItemList
* less bullshit
* sa
---------
Co-authored-by: Martin Robertz <dream-master@gmx.net>
Diffstat (limited to 'src/main/java/gregtech/loaders/oreprocessing')
-rw-r--r-- | src/main/java/gregtech/loaders/oreprocessing/ProcessingArrows.java | 135 | ||||
-rw-r--r-- | src/main/java/gregtech/loaders/oreprocessing/ProcessingToolHead.java | 25 |
2 files changed, 0 insertions, 160 deletions
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingArrows.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingArrows.java deleted file mode 100644 index 11d1b1e1b8..0000000000 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingArrows.java +++ /dev/null @@ -1,135 +0,0 @@ -package gregtech.loaders.oreprocessing; - -import static gregtech.api.recipe.RecipeMaps.chemicalBathRecipes; -import static gregtech.api.util.GT_RecipeBuilder.SECONDS; - -import net.minecraft.enchantment.Enchantment; -import net.minecraft.enchantment.EnchantmentHelper; -import net.minecraft.item.ItemStack; - -import gregtech.api.enums.GT_Values; -import gregtech.api.enums.Materials; -import gregtech.api.enums.OreDictNames; -import gregtech.api.enums.OrePrefixes; -import gregtech.api.enums.SubTag; -import gregtech.api.util.GT_ModHandler; -import gregtech.api.util.GT_OreDictUnificator; -import gregtech.api.util.GT_Utility; -import gregtech.common.GT_Proxy; - -public class ProcessingArrows implements gregtech.api.interfaces.IOreRecipeRegistrator { - - public ProcessingArrows() { - OrePrefixes.arrowGtWood.add(this); - OrePrefixes.arrowGtPlastic.add(this); - } - - @Override - public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, - ItemStack aStack) { - ItemStack tOutput = GT_Utility.copyAmount(1, aStack); - GT_Utility.updateItemStack(tOutput); - GT_Utility.ItemNBT.addEnchantment( - tOutput, - Enchantment.smite, - EnchantmentHelper.getEnchantmentLevel(Enchantment.smite.effectId, tOutput) + 3); - - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack)) - .itemOutputs(tOutput) - .fluidInputs(Materials.HolyWater.getFluid(25L)) - .duration(5 * SECONDS) - .eut(2) - .addTo(chemicalBathRecipes); - - tOutput = GT_Utility.copyAmount(1, aStack); - GT_Utility.updateItemStack(tOutput); - GT_Utility.ItemNBT.addEnchantment( - tOutput, - Enchantment.fireAspect, - EnchantmentHelper.getEnchantmentLevel(Enchantment.fireAspect.effectId, tOutput) + 3); - - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack)) - .itemOutputs(tOutput) - .fluidInputs(Materials.FierySteel.getFluid(25L)) - .duration(5 * SECONDS) - .eut(2) - .addTo(chemicalBathRecipes); - - tOutput = GT_Utility.copyAmount(1, aStack); - GT_Utility.updateItemStack(tOutput); - GT_Utility.ItemNBT.addEnchantment( - tOutput, - Enchantment.fireAspect, - EnchantmentHelper.getEnchantmentLevel(Enchantment.fireAspect.effectId, tOutput) + 1); - - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack)) - .itemOutputs(tOutput) - .fluidInputs(Materials.Blaze.getMolten(18L)) - .duration(5 * SECONDS) - .eut(2) - .addTo(chemicalBathRecipes); - - tOutput = GT_Utility.copyAmount(1, aStack); - GT_Utility.updateItemStack(tOutput); - GT_Utility.ItemNBT.addEnchantment( - tOutput, - Enchantment.knockback, - EnchantmentHelper.getEnchantmentLevel(Enchantment.knockback.effectId, tOutput) + 1); - - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack)) - .itemOutputs(tOutput) - .fluidInputs(Materials.Rubber.getMolten(18L)) - .duration(5 * SECONDS) - .eut(2) - .addTo(chemicalBathRecipes); - - tOutput = GT_Utility.copyAmount(1, aStack); - GT_Utility.updateItemStack(tOutput); - GT_Utility.ItemNBT.addEnchantment( - tOutput, - gregtech.api.enchants.Enchantment_EnderDamage.INSTANCE, - EnchantmentHelper - .getEnchantmentLevel(gregtech.api.enchants.Enchantment_EnderDamage.INSTANCE.effectId, tOutput) + 1); - - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack)) - .itemOutputs(tOutput) - .fluidInputs(Materials.Mercury.getFluid(25L)) - .duration(5 * SECONDS) - .eut(2) - .addTo(chemicalBathRecipes); - - if (!aMaterial.mUnificatable) { - return; - } - if (aMaterial.mMaterialInto != aMaterial) { - return; - } - - if (aMaterial.contains(SubTag.NO_WORKING)) { - return; - } - - switch (aPrefix) { - case arrowGtWood: - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.arrowGtWood, aMaterial, 1L), - GT_Proxy.tBits, - new Object[] { " A", " S ", "F ", 'S', OrePrefixes.stick.get(Materials.Wood), 'F', - OreDictNames.craftingFeather, 'A', OrePrefixes.toolHeadArrow.get(aMaterial) }); - case arrowGtPlastic: - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.arrowGtPlastic, aMaterial, 1L), - GT_Proxy.tBits, - new Object[] { " A", " S ", "F ", 'S', OrePrefixes.stick.get(Materials.Plastic), 'F', - OreDictNames.craftingFeather, 'A', OrePrefixes.toolHeadArrow.get(aMaterial) }); - default: - break; - } - - } -} diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingToolHead.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingToolHead.java index 9b6e4edc68..db3175279d 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingToolHead.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingToolHead.java @@ -6,7 +6,6 @@ import static gregtech.api.recipe.RecipeMaps.fluidSolidifierRecipes; import static gregtech.api.recipe.RecipeMaps.formingPressRecipes; import static gregtech.api.util.GT_RecipeBuilder.MINUTES; import static gregtech.api.util.GT_RecipeBuilder.SECONDS; -import static gregtech.api.util.GT_RecipeBuilder.TICKS; import static gregtech.api.util.GT_Utility.calculateRecipeEU; import net.minecraft.item.ItemStack; @@ -29,7 +28,6 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg // HEAD??? generator public ProcessingToolHead() { - OrePrefixes.toolHeadArrow.add(this); OrePrefixes.toolHeadAxe.add(this); OrePrefixes.toolHeadBuzzSaw.add(this); OrePrefixes.toolHeadChainsaw.add(this); @@ -59,29 +57,6 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg boolean aProducesSoftMallet = aMaterial.contains(SubTag.BOUNCY) || aMaterial.contains(SubTag.WOOD) || aMaterial.contains(SubTag.SOFT); switch (aPrefix) { - case toolHeadArrow -> { - if (aMaterial.mStandardMoltenFluid != null) - if (!(aMaterial == Materials.AnnealedCopper || aMaterial == Materials.WroughtIron)) { - GT_Values.RA.stdBuilder() - .itemInputs(ItemList.Shape_Mold_Arrow.get(0L)) - .itemOutputs(GT_Utility.copyAmount(1, aStack)) - .fluidInputs(aMaterial.getMolten(36L)) - .duration(16 * TICKS) - .eut(8) - .addTo(fluidSolidifierRecipes); - } - if (aSpecialRecipeReq2) { - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.toolHeadArrow, aMaterial, 1L), - GT_Proxy.tBits, - new Object[] { "Xf", 'X', OrePrefixes.gemChipped.get(aMaterial) }); - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.toolHeadArrow, aMaterial, 3L), - GT_Proxy.tBits, - new Object[] { (aMaterial.contains(SubTag.WOOD) ? 115 : 'x') + "Pf", 'P', - OrePrefixes.plate.get(aMaterial) }); - } - } case toolHeadAxe -> { GT_ModHandler.addShapelessCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE |