Merge pull request #52 from Qwertygiy/dev

Dev
Qwertygiy · Feb 8, 2019 · d19d744 · d19d744
2 parents dd08e78 + d4daecb
commit d19d744
Show file tree

Hide file tree

Showing 21 changed files with 823 additions and 664 deletions.
diff --git a/build.gradle b/build.gradle
@@ -47,7 +47,7 @@ repositories {
 
 apply plugin: 'forge'
 
-version = "1.0.0-a.46"
+version = "1.0.0-a.47"
 group= "com.kbi.qwertech" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
 archivesBaseName = "qwertech"
 

diff --git a/src/main/java/com/kbi/qwertech/ClientProxy.java b/src/main/java/com/kbi/qwertech/ClientProxy.java
@@ -194,9 +194,10 @@ public void registerModels()
 		registerModel(EntityPhasianidae.class, 1, 3, new ModelGallusGallusJabouille());
 		//grey junglefowl
 		registerModel(EntityPhasianidae.class, 2, -1, new ModelGallusGallusJabouille());
-
 		//turkey
 		registerModel(EntityPhasianidae.class, 3, -1, new ModelTurkeyFat());
+		//sri lankan junglefowl
+		registerModel(EntityPhasianidae.class, 4, -1, new ModelGallusLafayetti());
 	}
 
 	@Override
@@ -213,6 +214,7 @@ public void onRenderPre(TickEvent.RenderTickEvent rte)
 	@SubscribeEvent
 	    public void onTooltip(ItemTooltipEvent event)
 	    {
+	    	if (event.itemStack == null || event.entity == null || event.isCanceled()) return;
 	    	if (ArmorUpgradeRegistry.instance.getUpgrade(event.itemStack) != null)
 	    	{
 	    		event.toolTip.add(LH.Chat.GOLD + "Can be used to upgrade armor");