From 1f67bf90aeeef0db89af1834cda59bad2037cabb Mon Sep 17 00:00:00 2001 From: TheDarkDnKTv Date: Sun, 21 Mar 2021 03:55:44 +0200 Subject: [PATCH] Prerelease fixes --- src/main/java/gregtechmod/api/GregTech_API.java | 5 ++++- src/main/java/gregtechmod/api/items/GT_Crowbar_Item.java | 7 +++++-- .../gregtechmod/loaders/oreprocessing/ProcessingDust.java | 5 +++++ 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/src/main/java/gregtechmod/api/GregTech_API.java b/src/main/java/gregtechmod/api/GregTech_API.java index 1b46a15..6779547 100644 --- a/src/main/java/gregtechmod/api/GregTech_API.java +++ b/src/main/java/gregtechmod/api/GregTech_API.java @@ -414,7 +414,10 @@ public class GregTech_API { } catch(Throwable e) {/*Do nothing*/} try { return (GT_Tool_Item)Class.forName("gregtechmod.api.items.GT_Crowbar_Item").getConstructors()[0].newInstance(aUnlocalized, aMaxDamage, aEntityDamage); - } catch(Throwable e) {/*Do nothing*/} + } catch(Throwable e) { + GT_Log.log.error("Unable to construct Crowbar!"); + GT_Log.log.catching(e); + } return new gregtechmod.api.items.GT_Tool_Item(aUnlocalized, "item.bug.tooltip", aMaxDamage, aEntityDamage, false); } diff --git a/src/main/java/gregtechmod/api/items/GT_Crowbar_Item.java b/src/main/java/gregtechmod/api/items/GT_Crowbar_Item.java index baf182e..a8d0b9e 100644 --- a/src/main/java/gregtechmod/api/items/GT_Crowbar_Item.java +++ b/src/main/java/gregtechmod/api/items/GT_Crowbar_Item.java @@ -7,6 +7,7 @@ import gregtechmod.api.util.GT_Utility; import java.util.List; +import cpw.mods.fml.common.Loader; import net.minecraft.block.Block; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.EntityPlayer; @@ -23,8 +24,10 @@ public class GT_Crowbar_Item extends GT_Tool_Item { addToBlockList(Blocks.golden_rail); addToBlockList(Blocks.detector_rail); addToBlockList(Blocks.activator_rail); - addToBlockList(GT_ModHandler.getRCItem("track.boarding", 1)); - addToBlockList(GT_ModHandler.getRCItem("track.elevator", 1)); + if (Loader.isModLoaded("Railcraft")) { + addToBlockList(GT_ModHandler.getRCItem("track.boarding", 1)); + addToBlockList(GT_ModHandler.getRCItem("track.elevator", 1)); + } setUsageAmounts(1, 2, 1); } diff --git a/src/main/java/gregtechmod/loaders/oreprocessing/ProcessingDust.java b/src/main/java/gregtechmod/loaders/oreprocessing/ProcessingDust.java index 3a37187..8bb104a 100644 --- a/src/main/java/gregtechmod/loaders/oreprocessing/ProcessingDust.java +++ b/src/main/java/gregtechmod/loaders/oreprocessing/ProcessingDust.java @@ -78,6 +78,11 @@ public class ProcessingDust implements IOreRecipeRegistrator { .input(aMaterial == Materials.Milk ? GT_Items.Cell_Water.get(1) : GT_Items.Cell_Empty.get(1)) .output(GT_OreDictUnificator.get(OrePrefixes.cell, aMaterial, 1)) .buildAndRegister(); + if (aMaterial != Materials.Milk) RecipeMaps.CANINNING.factory().EUt(1).duration(100) + .input(OrePrefixes.cell, aMaterial) + .output(GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 1)) + .output(GT_OreDictUnificator.get(GT_Items.Cell_Empty.get(1))) + .buildAndRegister(); } if (aMaterial.mMaterialList.size() > 0 && (aMaterial.mExtraData & 3) != 0) {