update to forge 2554

.travis.yml

@@ -5,13 +5,13 @@ before_deploy:
   - git config --global user.email "[email protected]"
   - git config --global user.name "Travis CI"
   - git tag ZyinsHUD-1.12-1.5.5.${TRAVIS_BUILD_NUMBER}
-  - git push -q ${GITHUB_REPO} --tags
+  - git push -q ${GITHUB_REPO} HEAD:$TRAVIS_BRANCH --tags
 deploy:
   provider: releases
   api_key:
     secure: HXomfzSScNHsqKBlgV4mLYrEoo/+19lIWoYtnngdq1S3kyKllbDrDGuw8jchpUD5PsFE42KMia6qOKWUXvcBNN6ZFH7WTlr+Tm9JvcmF/y5U1WmXyTTodmJggIG8SqCAt9hlwLapYY+b2X38U0BDDgv7886Kje4EhDr2jP4v9voSHLEJjI+U5SmtkRsehTJ73P3X2L3K12b6MDr/zGZ6QlWoS6gcBqC62Bm4Uyr+XcxSSU/Z1Wgh/qnQRBbz+sFfXWuzJhJig1jqFws7nJFBxDpai6I+5kOrZ0efZMDgR/tQVw6erZ58J4rxozfdCX9a05PFOeX5ddaeNmUqtm3r97+49I4fzZMHoDwX8gXrxO6k5LYixYYIUZfkLV/kvFll8aSL9UBVtEr3geVpicQ7J7lb2NLhNBdf3kmU9KT6XYDvzQjYrNd8F0e39YbW4pAhi7zVjbNbwcSkkxrDkE5vM9gFYX8VoAwHbRISXGBEVowNkokumSvv29QUyp1+Tcvxz5D+jDoo9QvTTHuJ4eWEaKxGlZi61FQQptqvTx2DqV6PiNsl7r/HPpPtjWofWVdYbxfZ8V0uGLI4h7sCg4GU2axKKp84wLXyosQHpEm2KGE61fSLfATLDLmnnfxLo40D21R5lzxTPNdJUyUMzA6+vgRvF709YXeu1cA5TRqekCg=
   file:
-  - build/libs/ZyinsHUD-1.12-1.5.5.${TRAVIS_BUILD_NUMBER}.jar
+  - build/libs/ZyinsHUD-1.12.2-1.5.5.${TRAVIS_BUILD_NUMBER}.jar
   on:
     repo: cyilin/zyinhud
     tags: false

build.gradle

@@ -26,7 +26,7 @@ plugins {
 */
 version = "1.5.5.%s"
 group= "com.zyin.zyinhud" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
-archivesBaseName = "ZyinsHUD-1.12"
+archivesBaseName = "ZyinsHUD-1.12.2"
 
 if (System.getenv("TRAVIS_BUILD_NUMBER") != null) {
     version = String.format(version, System.getenv("TRAVIS_BUILD_NUMBER"))
@@ -35,15 +35,15 @@ if (System.getenv("TRAVIS_BUILD_NUMBER") != null) {
 }
 
 minecraft {
-    version = "1.12-14.21.1.2387"
+    version = "1.12.2-14.23.1.2554"
     runDir = "run"
 
     // the mappings can be changed at any time, and must be in the following format.
     // snapshot_YYYYMMDD   snapshot are built nightly.
     // stable_#            stables are built at the discretion of the MCP team.
     // Use non-default mappings at your own risk. they may not allways work.
     // simply re-run your setup task after changing the mappings to update your workspace.
-    mappings = "snapshot_20170630"
+    mappings = "snapshot_20171125"
     // makeObfSourceJar = false // an Srg named sources jar is made by default. uncomment this to disable.
     replaceIn "com/zyin/zyinhud/ZyinHUD.java"
     replace "@VERSION@", project.version

src/main/java/com/zyin/zyinhud/ZyinHUD.java

@@ -68,7 +68,7 @@ public class ZyinHUD {
 
     public static final String updateJSON = "https://raw.githubusercontent.com/cyilin/zyinhud-update/master/update.json";
 
-    public static final String dependencies = "required-after:forge@[14.21.1.2387,);";
+    public static final String dependencies = "required-after:forge@[14.23.1.2554,);";
 
     public static final String buildTime = "@BUILD_TIME@";
 

src/main/java/com/zyin/zyinhud/mods/AnimalInfo.java

@@ -273,7 +273,7 @@ public static void RenderEntityInfoInWorld(Entity entity, float partialTickTime)
             }
 
             //only show entities that are close by
-            double distanceFromMe = mc.player.getDistanceToEntity(animal);
+            double distanceFromMe = mc.player.getDistance(animal);
 
             if (distanceFromMe > maxViewDistanceCutoff
                     || distanceFromMe > viewDistanceCutoff) {

src/main/java/com/zyin/zyinhud/mods/PlayerLocator.java

@@ -204,7 +204,7 @@ public static void RenderEntityInfoOnHUD(Entity entity, int x, int y) {
                 && !mc.gameSettings.showDebugInfo) {
 
             //only show entities that are close by
-            float distanceFromMe = mc.player.getDistanceToEntity(entity);
+            float distanceFromMe = mc.player.getDistance(entity);
 
             if (distanceFromMe > maxViewDistanceCutoff
                     || distanceFromMe < viewDistanceCutoff

src/main/java/com/zyin/zyinhud/util/InventoryUtil.java

@@ -597,7 +597,7 @@ public static boolean DepositAllMatchingItemsInMerchant() {
 
         //field_70473_e used to work in 1.6.4
         //field_147041_z works in 1.7.2
-        int currentRecipeIndex = ZyinHUDUtil.GetFieldByReflection(GuiMerchant.class, guiMerchant, "currentRecipeIndex", "field_70473_e", "field_147041_z");
+        int currentRecipeIndex = ZyinHUDUtil.GetFieldByReflection(GuiMerchant.class, guiMerchant, "selectedMerchantRecipe", "field_147041_z");
         MerchantRecipe merchantRecipe = merchantRecipeList.get(currentRecipeIndex);
 
         ItemStack buyingItemStack1 = merchantRecipe.getItemToBuy();