upgraded to forge 1.12.2-14.23.4.2757

Elite-Modding-Team · Sep 17, 2018 · 0dfedfb · 0dfedfb
1 parent ec00e04
commit 0dfedfb
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 13 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,10 +1,7 @@
 buildscript {
     repositories {
         jcenter()
-        maven {
-            name = "forge"
-            url = "http://files.minecraftforge.net/maven"
-        }
+        maven { url = "http://files.minecraftforge.net/maven" }
     }
     dependencies {
         classpath 'net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT'
@@ -16,29 +13,32 @@ version = "1.12.2-11"
 group= "net.torocraft.torohealth"
 archivesBaseName = "torohealth"
 
-sourceCompatibility = targetCompatibility = '1.8' // Need this here so eclipse task generates correctly.
+sourceCompatibility = targetCompatibility = '1.8'
 compileJava {
     sourceCompatibility = targetCompatibility = '1.8'
 }
 
 minecraft {
-    version = "1.12.2-14.23.0.2491"
+    version = "1.12.2-14.23.4.2757"
     runDir = "run"
-    mappings = "snapshot_20170624"
+    mappings = "snapshot_20171003"
 }
 
 dependencies {
-
+    compile 'junit:junit:4.12'
 }
 
 processResources {
     inputs.property "version", project.version
     inputs.property "mcversion", project.minecraft.version
+
     from(sourceSets.main.resources.srcDirs) {
         include 'mcmod.info'
-        expand 'version':project.version, 'mcversion':project.minecraft.version
+        expand 'version': project.version, 'mcversion': project.minecraft.version
     }
+
     from(sourceSets.main.resources.srcDirs) {
         exclude 'mcmod.info'
     }
 }
+
diff --git a/src/main/java/net/torocraft/torohealthmod/display/EntityDisplay.java b/src/main/java/net/torocraft/torohealthmod/display/EntityDisplay.java
@@ -92,7 +92,7 @@ private void glDraw() {
     RenderManager rendermanager = Minecraft.getMinecraft().getRenderManager();
     rendermanager.setPlayerViewY(180.0F);
     rendermanager.setRenderShadow(false);
-    rendermanager.doRenderEntity(entity, 0.0D, 0.0D, 0.0D, 0.0F, 1.0F, false);
+    rendermanager.renderEntity(entity, 0.0D, 0.0D, 0.0D, 0.0F, 1.0F, false);
     rendermanager.setRenderShadow(true);
 
     GlStateManager.popMatrix();
@@ -105,16 +105,16 @@ private void glDraw() {
 
   private void popEntityLeasedTo() {
     if (entity instanceof EntityLiving && leashedToEntity != null) {
-      ((EntityLiving) entity).setLeashedToEntity(leashedToEntity, false);
+      ((EntityLiving) entity).setLeashHolder(leashedToEntity, false);
       leashedToEntity = null;
     }
   }
 
   private void pushEntityLeasedTo() {
     if (entity instanceof EntityLiving) {
       if (((EntityLiving) entity).getLeashed()) {
-        leashedToEntity = ((EntityLiving) entity).getLeashedToEntity();
-        ((EntityLiving) entity).setLeashedToEntity(null, false);
+        leashedToEntity = ((EntityLiving) entity).getLeashHolder();
+        ((EntityLiving) entity).setLeashHolder(null, false);
       }
     }
   }