bump forge version

way2muchnoise · Apr 3, 2016 · 9a676bb · 9a676bb
1 parent a0775d0
commit 9a676bb
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git 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
+version_jei=3.2.5.178
diff --git 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
@@ -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
@@ -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)