From 9a676bb7177399f59da5bb2a8e02cc65efbe4f4b Mon Sep 17 00:00:00 2001 From: way2muchnoise Date: Sun, 3 Apr 2016 21:08:13 +0200 Subject: [PATCH] bump forge version --- gradle.properties | 6 +++--- src/main/java/jeresources/json/WorldGenAdapter.java | 5 +++-- src/main/java/jeresources/profiling/ChunkProfiler.java | 2 +- src/main/java/jeresources/util/MapKeys.java | 2 +- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/gradle.properties b/gradle.properties index b2b34cad..f60dc6fd 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,7 @@ -version_forge=12.16.0.1813-1.9 +version_forge=12.16.0.1832-1.9 version_minecraft=1.9 version_major=0 version_minor=4 -version_revis=2 +version_revis=3 version_mappings=snapshot_20160312 -version_jei=3.1.2.172 \ No newline at end of file +version_jei=3.2.5.178 \ No newline at end of file diff --git a/src/main/java/jeresources/json/WorldGenAdapter.java b/src/main/java/jeresources/json/WorldGenAdapter.java index d8436721..2271fd1b 100644 --- a/src/main/java/jeresources/json/WorldGenAdapter.java +++ b/src/main/java/jeresources/json/WorldGenAdapter.java @@ -15,6 +15,7 @@ import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.common.Loader; import net.minecraftforge.fml.common.registry.GameRegistry; @@ -64,7 +65,7 @@ public static boolean readDIYData() String[] blockParts = block.split(":"); - Block blockBlock = GameRegistry.findBlock(blockParts[0], blockParts[1]); + Block blockBlock = Block.blockRegistry.getObject(new ResourceLocation(blockParts[0], blockParts[1])); if (blockBlock == null || Item.getItemFromBlock(blockBlock) == null) continue; int oreMeta = blockParts.length == 3 ? Integer.parseInt(blockParts[2]) : 0; ItemStack blockStack = new ItemStack(blockBlock, 1, oreMeta); @@ -83,7 +84,7 @@ public static boolean readDIYData() for (String drop : drops.split(",")) { String[] dropSplit = drop.split(":"); - Item item = GameRegistry.findItem(dropSplit[0], dropSplit[1]); + Item item = Item.itemRegistry.getObject(new ResourceLocation(dropSplit[0], dropSplit[1])); if (item == null) continue; int meta = 0; diff --git a/src/main/java/jeresources/profiling/ChunkProfiler.java b/src/main/java/jeresources/profiling/ChunkProfiler.java index 5cd975bd..ecc2d86e 100644 --- a/src/main/java/jeresources/profiling/ChunkProfiler.java +++ b/src/main/java/jeresources/profiling/ChunkProfiler.java @@ -68,7 +68,7 @@ private void profileChunk(Chunk chunk) ItemStack pickBlock = block.getPickBlock(blockState, rayTraceResult, world, blockPos, player); final String key; if (pickBlock == null || pickBlock.getItem() == null) { - key = block.getRegistryName() + ':' + meta; + key = block.getRegistryName().toString() + ':' + meta; } else { key = MapKeys.getKey(pickBlock); diff --git a/src/main/java/jeresources/util/MapKeys.java b/src/main/java/jeresources/util/MapKeys.java index dd641257..30b67490 100644 --- a/src/main/java/jeresources/util/MapKeys.java +++ b/src/main/java/jeresources/util/MapKeys.java @@ -16,7 +16,7 @@ public static String getKey(ItemStack drop) Item item = drop.getItem(); if (item == null) return null; - return item.getRegistryName() + ':' + drop.getMetadata(); + return item.getRegistryName().toString() + ':' + drop.getMetadata(); } public static String getKey(IPlantable plant)