Merge branch '1.9' into 1.9.4

ata4 · Jun 8, 2016 · de64e5a · de64e5a
2 parents cb29a26 + 1cc9270
commit de64e5a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/src/main/java/info/ata4/minecraft/dragon/server/CommonProxy.java b/src/main/java/info/ata4/minecraft/dragon/server/CommonProxy.java
@@ -38,7 +38,8 @@ public class CommonProxy {
     private final boolean ENTITY_SEND_VELO_UPDATES = true;
 
     public void onPreInit(FMLPreInitializationEvent event) {
-        GameRegistry.registerBlock(BlockDragonBreedEgg.INSTANCE, ItemDragonBreedEgg.class, "dragon_egg");
+        GameRegistry.register(BlockDragonBreedEgg.INSTANCE.setRegistryName("dragon_egg"));
+        GameRegistry.register(ItemDragonBreedEgg.INSTANCE.setRegistryName("dragon_egg"));
     }
 
     public void onInit(FMLInitializationEvent evt) {

diff --git a/src/main/java/info/ata4/minecraft/dragon/server/item/ItemDragonBreedEgg.java b/src/main/java/info/ata4/minecraft/dragon/server/item/ItemDragonBreedEgg.java
@@ -9,8 +9,8 @@
  */
 package info.ata4.minecraft.dragon.server.item;
 
+import info.ata4.minecraft.dragon.server.block.BlockDragonBreedEgg;
 import info.ata4.minecraft.dragon.server.entity.breeds.EnumDragonBreed;
-import net.minecraft.block.Block;
 import net.minecraft.item.ItemBlock;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.text.translation.I18n;
@@ -21,8 +21,10 @@
  */
 public class ItemDragonBreedEgg extends ItemBlock {
 
-    public ItemDragonBreedEgg(Block block) {
-        super(block);
+    public static final ItemDragonBreedEgg INSTANCE = new ItemDragonBreedEgg();
+
+    public ItemDragonBreedEgg() {
+        super(BlockDragonBreedEgg.INSTANCE);
         setMaxDamage(0);
         setHasSubtypes(true);
     }