Bump Forge version, and clean up the ItemBlock determination a bit more

pahimar · Oct 4, 2016 · acc53ed · acc53ed
1 parent 18943d7
commit acc53ed
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 10 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -1,6 +1,6 @@
 # Build related properties
 minecraft_version = 1.10.2
-forge_version = 12.18.1.2094
+forge_version = 12.18.1.2095
 mcp_mappings_version = snapshot_20160518
 curseforge_plugin_version = 1.0.7
 

diff --git a/src/main/java/com/pahimar/ee3/block/base/BlockEE.java b/src/main/java/com/pahimar/ee3/block/base/BlockEE.java
@@ -3,10 +3,12 @@
 import com.pahimar.ee3.EquivalentExchange3;
 import com.pahimar.ee3.creativetab.CreativeTab;
 import com.pahimar.ee3.init.ModBlocks;
+import com.pahimar.ee3.item.base.ItemBlockEnumEE;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.block.model.ModelResourceLocation;
 import net.minecraft.item.Item;
+import net.minecraft.item.ItemBlock;
 import net.minecraftforge.client.model.ModelLoader;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
@@ -37,4 +39,8 @@ public String getUnlocalizedName() {
     public void initModelsAndVariants() {
         ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(this), 0, new ModelResourceLocation(getRegistryName().toString()));
     }
+
+    public static ItemBlock getItemBlockFor(BlockEE blockEE) {
+        return blockEE instanceof BlockEnumEE ? new ItemBlockEnumEE((BlockEnumEE) blockEE) : new ItemBlock(blockEE);
+    }
 }
diff --git a/src/main/java/com/pahimar/ee3/proxy/CommonProxy.java b/src/main/java/com/pahimar/ee3/proxy/CommonProxy.java
@@ -3,19 +3,16 @@
 import com.pahimar.ee3.EquivalentExchange3;
 import com.pahimar.ee3.blacklist.BlacklistRegistry;
 import com.pahimar.ee3.block.base.BlockEE;
-import com.pahimar.ee3.block.base.BlockEnumEE;
 import com.pahimar.ee3.command.CommandEE;
 import com.pahimar.ee3.exchange.EnergyValueRegistry;
 import com.pahimar.ee3.handler.*;
 import com.pahimar.ee3.init.*;
-import com.pahimar.ee3.item.base.ItemBlockEnumEE;
 import com.pahimar.ee3.knowledge.PlayerKnowledgeRegistry;
 import com.pahimar.ee3.network.Network;
 import com.pahimar.ee3.reference.Files;
 import com.pahimar.ee3.test.EETestSuite;
 import com.pahimar.ee3.test.VanillaTestSuite;
 import com.pahimar.ee3.util.FluidHelper;
-import net.minecraft.item.ItemBlock;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.fml.common.event.*;
 import net.minecraftforge.fml.common.network.NetworkRegistry;
@@ -33,12 +30,7 @@ public void onPreInit(FMLPreInitializationEvent event) {
 
         for (BlockEE blockEE : ModBlocks.getBlocks()) {
             GameRegistry.register(blockEE);
-            if (blockEE instanceof BlockEnumEE) {
-                GameRegistry.register(new ItemBlockEnumEE((BlockEnumEE) blockEE), blockEE.getRegistryName());
-            }
-            else {
-                GameRegistry.register(new ItemBlock(blockEE), blockEE.getRegistryName());
-            }
+            GameRegistry.register(BlockEE.getItemBlockFor(blockEE), blockEE.getRegistryName());
         }
         EnergyValues.init();
         AlchemyArrays.init();