upstream/MinecraftForge
1
0 Fork 0
mirror of https://github.com/MinecraftForge/MinecraftForge.git synced 2026-11-12 16:27:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix substitutions for recipes and oredict recipes. Should mean that substitutions start working properly.

Browse Source
This commit is contained in:
cpw committed 2015-10-29 08:46:23 -04:00
1 parent 605457deec
commit 945d3887d2
3 files changed
+43 -8
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/net/minecraftforge/oredict/OreDictionary.java
+5 -2
View File
@@ -29,6 +29,7 @@ import com.google.common.collect.Maps;
import cpw.mods.fml.common.FMLLog;
import cpw.mods.fml.common.eventhandler.Event;
import cpw.mods.fml.common.registry.GameData;
public class OreDictionary
{
@@ -493,7 +494,8 @@ public class OreDictionary
}
int oreID = getOreID(name);
int hash = Item.getIdFromItem(ore.getItem());
// HACK: use the registry name's ID. It is unique and it knows about substitutions
int hash = GameData.getItemRegistry().getId(ore.getItem().delegate.name());
if (ore.getItemDamage() != WILDCARD_VALUE)
{
hash |= ((ore.getItemDamage() + 1) << 16); // +1 so 0 is significant
@@ -537,7 +539,8 @@ public class OreDictionary
if (ores == null) continue;
for (ItemStack ore : ores)
{
int hash = Item.getIdFromItem(ore.getItem());
// HACK: use the registry name's ID. It is unique and it knows about substitutions
int hash = GameData.getItemRegistry().getId(ore.getItem().delegate.name());
if (ore.getItemDamage() != WILDCARD_VALUE)
{
hash |= ((ore.getItemDamage() + 1) << 16); // +1 so meta 0 is significant