Anvilcraft/GregTech4
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Squash of pull request #151

Browse source 
Closes #149 and #150.

* Fix recipes not getting removed
* Fix LithiumPack not being registered properly

Co-authored-by: CrossVas <cross.wanted.1.4>
This commit is contained in:
CrossVas 2021-11-27 23:56:19 +09:00 committed by GitHub
parent 93db8a8803
commit 98967e51e9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/main/java/gregtechmod/loaders/postload/GT_CraftingRecipeLoader.java
View file

@ -464,12 +464,12 @@ public class GT_CraftingRecipeLoader implements Runnable {
GT_ModHandler.addCraftingRecipe(new ItemStack(GregTech_API.sBlockList[1], 1,113), new Object[] {"PCP", "GSG", "PMP", 'M', GT_OreDictNames.craftingRawMachineTier02, 'C', OrePrefixes.circuit.get(Materials.Advanced), 'G', OrePrefixes.gearGt.get(Materials.Steel), 'P', GT_OreDictNames.craftingPlateSteel, 'S', GT_OreDictNames.craftingDiamondBlade}); GT_ModHandler.addCraftingRecipe(new ItemStack(GregTech_API.sBlockList[1], 1,113), new Object[] {"PCP", "GSG", "PMP", 'M', GT_OreDictNames.craftingRawMachineTier02, 'C', OrePrefixes.circuit.get(Materials.Advanced), 'G', OrePrefixes.gearGt.get(Materials.Steel), 'P', GT_OreDictNames.craftingPlateSteel, 'S', GT_OreDictNames.craftingDiamondBlade});
GT_ModHandler.removeRecipe(GT_ModHandler.getIC2Item("canner", 1)); GT_ModHandler.removeRecipeByOutput(GT_ModHandler.getIC2Item("canner", 1));
GT_ModHandler.removeRecipe(GT_ModHandler.getIC2Item("macerator", 1)); GT_ModHandler.removeRecipeByOutput(GT_ModHandler.getIC2Item("macerator", 1));
GT_ModHandler.removeRecipe(GT_ModHandler.getIC2Item("extractor", 1)); GT_ModHandler.removeRecipeByOutput(GT_ModHandler.getIC2Item("extractor", 1));
GT_ModHandler.removeRecipe(GT_ModHandler.getIC2Item("compressor", 1)); GT_ModHandler.removeRecipeByOutput(GT_ModHandler.getIC2Item("compressor", 1));
GT_ModHandler.removeRecipe(GT_ModHandler.getIC2Item("recycler", 1)); GT_ModHandler.removeRecipeByOutput(GT_ModHandler.getIC2Item("recycler", 1));
GT_ModHandler.removeRecipe(GT_ModHandler.getIC2Item("electroFurnace", 1)); GT_ModHandler.removeRecipeByOutput(GT_ModHandler.getIC2Item("electroFurnace", 1));
GT_ModHandler.addCraftingRecipe(GT_ModHandler.getIC2Item("canner", 1), new Object[] {"PCP", "PMP", "PPP", 'M', tNeedsSteel?GT_OreDictNames.craftingRawMachineTier02:GT_OreDictNames.craftingRawMachineTier01, 'C', OrePrefixes.circuit.get(Materials.Basic), 'P', OrePrefixes.plate.get(Materials.Tin)}); GT_ModHandler.addCraftingRecipe(GT_ModHandler.getIC2Item("canner", 1), new Object[] {"PCP", "PMP", "PPP", 'M', tNeedsSteel?GT_OreDictNames.craftingRawMachineTier02:GT_OreDictNames.craftingRawMachineTier01, 'C', OrePrefixes.circuit.get(Materials.Basic), 'P', OrePrefixes.plate.get(Materials.Tin)});

2
src/main/java/gregtechmod/loaders/preload/GT_ItemLoader.java
View file

@ -452,6 +452,8 @@ public class GT_ItemLoader implements Runnable {
GameRegistry.registerItem(GregTech_API.sItemList[ 55], "debug_scanner"); GameRegistry.registerItem(GregTech_API.sItemList[ 55], "debug_scanner");
GameRegistry.registerItem(GregTech_API.sItemList[58], "lithiumpack");
GameRegistry.registerItem(GregTech_API.sItemList[ 60], "nak_coolantcell_60"); GameRegistry.registerItem(GregTech_API.sItemList[ 60], "nak_coolantcell_60");
GameRegistry.registerItem(GregTech_API.sItemList[ 61], "nak_coolantcell_180"); GameRegistry.registerItem(GregTech_API.sItemList[ 61], "nak_coolantcell_180");
GameRegistry.registerItem(GregTech_API.sItemList[ 62], "nak_coolantcell_360"); GameRegistry.registerItem(GregTech_API.sItemList[ 62], "nak_coolantcell_360");