From 529810945619e79ba096ac76e24e1aae7b732716 Mon Sep 17 00:00:00 2001
From: alesto <alesto@ALESTO-PC>
Date: Wed, 6 Sep 2017 11:48:42 +0200
Subject: [PATCH 1/2] More fixes

---
 src/main/java/info/ata4/minecraft/dragon/DragonMounts.java     | 2 +-
 .../ata4/minecraft/dragon/client/render/DragonRenderer.java    | 2 +-
 .../minecraft/dragon/server/block/BlockDragonBreedEgg.java     | 3 ++-
 src/main/resources/mcmod.info                                  | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/main/java/info/ata4/minecraft/dragon/DragonMounts.java b/src/main/java/info/ata4/minecraft/dragon/DragonMounts.java
index 1d56087c..9800e63d 100644
--- a/src/main/java/info/ata4/minecraft/dragon/DragonMounts.java
+++ b/src/main/java/info/ata4/minecraft/dragon/DragonMounts.java
@@ -33,7 +33,7 @@
 public class DragonMounts {
     
     public static final String NAME = "Dragon Mounts";
-    public static final String ID = "DragonMounts";
+    public static final String ID = "dragonmounts";
     public static final String AID = ID.toLowerCase();
     public static final String VERSION = "@VERSION@";
     
diff --git a/src/main/java/info/ata4/minecraft/dragon/client/render/DragonRenderer.java b/src/main/java/info/ata4/minecraft/dragon/client/render/DragonRenderer.java
index 540088e9..4965aaac 100644
--- a/src/main/java/info/ata4/minecraft/dragon/client/render/DragonRenderer.java
+++ b/src/main/java/info/ata4/minecraft/dragon/client/render/DragonRenderer.java
@@ -183,7 +183,7 @@ protected void renderEgg(EntityTameableDragon dragon, double x, double y, double
     }
 
     @Override
-    protected void rotateCorpse(EntityTameableDragon dragon, float par2, float par3, float par4) {
+    protected void applyRotations(EntityTameableDragon dragon, float par2, float par3, float par4) {
         GlStateManager.rotate(180 - par3, 0, 1, 0);
     }
     
diff --git a/src/main/java/info/ata4/minecraft/dragon/server/block/BlockDragonBreedEgg.java b/src/main/java/info/ata4/minecraft/dragon/server/block/BlockDragonBreedEgg.java
index bc0301d5..07168875 100644
--- a/src/main/java/info/ata4/minecraft/dragon/server/block/BlockDragonBreedEgg.java
+++ b/src/main/java/info/ata4/minecraft/dragon/server/block/BlockDragonBreedEgg.java
@@ -20,6 +20,7 @@
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
+import net.minecraft.util.NonNullList;
 
 /**
  *
@@ -58,7 +59,7 @@ public int getMetaFromState(IBlockState state) {
     }
     
     @Override
-    public void getSubBlocks(Item itemIn, CreativeTabs tab, List<ItemStack> list) {
+    public void getSubBlocks(Item itemIn, CreativeTabs tab, NonNullList<ItemStack> list) {
         EnumDragonBreed.META_MAPPING.values().forEach(index -> list.add(new ItemStack(itemIn, 1, index)));
     }
 
diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info
index 2ef2fe97..83dd9376 100644
--- a/src/main/resources/mcmod.info
+++ b/src/main/resources/mcmod.info
@@ -1,6 +1,6 @@
 [
 {
-  "modid" : "DragonMounts",
+  "modid" : "dragonmounts",
   "name" : "Dragon Mounts",
   "description": "A mod that allows you to breed dragon eggs and foster them to ridable dragons.",
   "version": "${version}",

From 9ecf3b95f6d05819c2e3be41799da7f21c3916a8 Mon Sep 17 00:00:00 2001
From: alesto <alesto@ALESTO-PC>
Date: Wed, 6 Sep 2017 11:50:51 +0200
Subject: [PATCH 2/2] Different egg breeding activation. Egg is now collectable
 from End.

---
 .../server/handler/DragonEggBlockHandler.java  | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/main/java/info/ata4/minecraft/dragon/server/handler/DragonEggBlockHandler.java b/src/main/java/info/ata4/minecraft/dragon/server/handler/DragonEggBlockHandler.java
index 189a565f..27cb43a5 100644
--- a/src/main/java/info/ata4/minecraft/dragon/server/handler/DragonEggBlockHandler.java
+++ b/src/main/java/info/ata4/minecraft/dragon/server/handler/DragonEggBlockHandler.java
@@ -17,7 +17,12 @@
 import info.ata4.minecraft.dragon.server.entity.helper.EnumDragonLifeStage;
 import net.minecraft.block.Block;
 import net.minecraft.block.state.IBlockState;
+import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.init.Blocks;
+import net.minecraft.init.Items;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.EnumHand;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 import net.minecraftforge.event.entity.player.PlayerInteractEvent;
@@ -38,8 +43,8 @@ public void onPlayerInteract(PlayerInteractEvent evt) {
 //        if (evt.action != PlayerInteractEvent.Action.RIGHT_CLICK_BLOCK) {
 //            return;
 //        }
-        
-        BlockPos pos = evt.getPos();
+
+    	BlockPos pos = evt.getPos();
         World world = evt.getWorld();
         IBlockState state = world.getBlockState(pos);
         Block block = world.getBlockState(pos).getBlock();
@@ -55,6 +60,15 @@ public void onPlayerInteract(PlayerInteractEvent evt) {
             return;
         }
         
+        EntityPlayer player = evt.getEntityPlayer();
+        if( player == null )
+        	return;
+        ItemStack heldItem = player.getHeldItem(EnumHand.MAIN_HAND);
+        if( heldItem == null )
+        	return;
+        if( heldItem.getItem() != Items.FLINT_AND_STEEL )
+        	return;
+        
         // deny action
         evt.setResult(Event.Result.DENY);