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

Prerelease fixes

Browse source
This commit is contained in:
TheDarkDnKTv 2021-03-21 03:55:44 +02:00
parent a1d8d5f328
commit 1f67bf90ae
3 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/main/java/gregtechmod/api/GregTech_API.java
View file

@ -414,7 +414,10 @@ public class GregTech_API {
} catch(Throwable e) {/*Do nothing*/} } catch(Throwable e) {/*Do nothing*/}
try { try {
return (GT_Tool_Item)Class.forName("gregtechmod.api.items.GT_Crowbar_Item").getConstructors()[0].newInstance(aUnlocalized, aMaxDamage, aEntityDamage); 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); return new gregtechmod.api.items.GT_Tool_Item(aUnlocalized, "item.bug.tooltip", aMaxDamage, aEntityDamage, false);
} }

3
src/main/java/gregtechmod/api/items/GT_Crowbar_Item.java
View file

@ -7,6 +7,7 @@ import gregtechmod.api.util.GT_Utility;
import java.util.List; import java.util.List;
import cpw.mods.fml.common.Loader;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.client.resources.I18n; import net.minecraft.client.resources.I18n;
import net.minecraft.entity.player.EntityPlayer; 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.golden_rail);
addToBlockList(Blocks.detector_rail); addToBlockList(Blocks.detector_rail);
addToBlockList(Blocks.activator_rail); addToBlockList(Blocks.activator_rail);
if (Loader.isModLoaded("Railcraft")) {
addToBlockList(GT_ModHandler.getRCItem("track.boarding", 1)); addToBlockList(GT_ModHandler.getRCItem("track.boarding", 1));
addToBlockList(GT_ModHandler.getRCItem("track.elevator", 1)); addToBlockList(GT_ModHandler.getRCItem("track.elevator", 1));
}
setUsageAmounts(1, 2, 1); setUsageAmounts(1, 2, 1);
} }

5
src/main/java/gregtechmod/loaders/oreprocessing/ProcessingDust.java
View file

@ -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)) .input(aMaterial == Materials.Milk ? GT_Items.Cell_Water.get(1) : GT_Items.Cell_Empty.get(1))
.output(GT_OreDictUnificator.get(OrePrefixes.cell, aMaterial, 1)) .output(GT_OreDictUnificator.get(OrePrefixes.cell, aMaterial, 1))
.buildAndRegister(); .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) { if (aMaterial.mMaterialList.size() > 0 && (aMaterial.mExtraData & 3) != 0) {