From 1ec5b4337ca3da93667807cab7cd91452842089f Mon Sep 17 00:00:00 2001 From: gigaherz Date: Mon, 30 Jan 2017 21:04:20 +0100 Subject: [PATCH] Prefer vanilla nuggets when available (that is, in 1.11.2) --- build.gradle | 2 +- src/main/java/gigaherz/survivalist/Survivalist.java | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 0b0d4df..9df50e4 100644 --- a/build.gradle +++ b/build.gradle @@ -28,7 +28,7 @@ apply plugin: 'net.minecraftforge.gradle.forge' version = "1.8.3" group= "gigaherz.survivalist" // http://maven.apache.org/guides/mini/guide-naming-conventions.html -archivesBaseName = "Survivalist-1.11.0" +archivesBaseName = "Survivalist-1.11.2" minecraft { version = "1.11.2-13.20.0.2201" diff --git a/src/main/java/gigaherz/survivalist/Survivalist.java b/src/main/java/gigaherz/survivalist/Survivalist.java index 6347c03..e302a19 100644 --- a/src/main/java/gigaherz/survivalist/Survivalist.java +++ b/src/main/java/gigaherz/survivalist/Survivalist.java @@ -48,6 +48,7 @@ import net.minecraftforge.fml.common.network.NetworkRegistry; import net.minecraftforge.fml.common.network.simpleimpl.SimpleNetworkWrapper; import net.minecraftforge.fml.common.registry.EntityRegistry; +import net.minecraftforge.fml.common.registry.ForgeRegistries; import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.oredict.OreDictionary; @@ -235,6 +236,13 @@ public void getSubItems(Item itemIn, CreativeTabs tab, NonNullList su private static void registerOredictNames() { + // Make sure to register the vanilla iron nugget if it isn't registered. + Item item = ForgeRegistries.ITEMS.getValue(new ResourceLocation("minecraft","iron_nugget")); + if (item != null && OreDictionary.getOreIDs(new ItemStack(item)).length == 0) + { + OreDictionary.registerOre("nuggetIron", item); + } + OreDictionary.registerOre("materialLeather", tanned_leather); OreDictionary.registerOre("materialTannedLeather", tanned_leather); OreDictionary.registerOre("materialHardenedLeather", tanned_leather);