Changes for Minecraft 1.12

Author: d0sboots

java/io/github/d0sboots/enchantmentrevealer/EnchantCount.java

@@ -27,17 +27,17 @@ public EnchantCount(int count, EnchantmentData enchant) {
     }
 
     public static int hashCode(EnchantmentData data) {
-        return data.enchantmentobj.hashCode() * 5 + data.enchantmentLevel;
+        return data.enchantment.hashCode() * 5 + data.enchantmentLevel;
     }
 
     public static boolean equals(EnchantmentData first, EnchantmentData second) {
         return first.enchantmentLevel == second.enchantmentLevel &&
-                first.enchantmentobj == second.enchantmentobj;
+                first.enchantment == second.enchantment;
     }
 
     public static String toString(EnchantmentData data) {
-        return "\"" + data.enchantmentobj.getTranslatedName(data.enchantmentLevel) +
-                "\" (0x" + Integer.toHexString(Enchantment.getEnchantmentID(data.enchantmentobj)) +
+        return "\"" + data.enchantment.getTranslatedName(data.enchantmentLevel) +
+                "\" (0x" + Integer.toHexString(Enchantment.getEnchantmentID(data.enchantment)) +
                 " " + data.enchantmentLevel + ")";
     }
 
@@ -61,8 +61,8 @@ public int compareTo(EnchantCount other) {
         if (enchant.enchantmentLevel != other.enchant.enchantmentLevel) {
             return enchant.enchantmentLevel - other.enchant.enchantmentLevel;
         }
-        return Enchantment.getEnchantmentID(enchant.enchantmentobj)
-                - Enchantment.getEnchantmentID(other.enchant.enchantmentobj);
+        return Enchantment.getEnchantmentID(enchant.enchantment)
+                - Enchantment.getEnchantmentID(other.enchant.enchantment);
     }
 
     @Override

java/io/github/d0sboots/enchantmentrevealer/EnchantmentWorker.java

@@ -438,7 +438,7 @@ static boolean testEnchants(Random rand, int seed, Observation observation,
                 return false;
             }
             EnchantmentData data = list.get(rand.nextInt(list.size()));
-            if (Enchantment.getEnchantmentByID(observation.enchants[i]) != data.enchantmentobj ||
+            if (Enchantment.getEnchantmentByID(observation.enchants[i]) != data.enchantment ||
                     observation.enchantLevels[i] != data.enchantmentLevel) {
                 return false;
             }
@@ -488,7 +488,7 @@ static boolean testEnchantFast(Random rand, int seed, Observation observation, b
             return false;
         }
         EnchantmentData data = list.get(rand.nextInt(list.size()));
-        return target == data.enchantmentobj &&
+        return target == data.enchantment &&
                 observation.enchantLevels[index] == data.enchantmentLevel;
     }
 
@@ -559,7 +559,7 @@ private boolean isEnchantConsistent(Observation observation) {
         if (enchants.size() != list.size())
             return false;
         for (EnchantmentData data : list) {
-            if (enchants.get(data.enchantmentobj) != data.enchantmentLevel)
+            if (enchants.get(data.enchantment) != data.enchantmentLevel)
                 return false;
         }
         return true;
@@ -595,7 +595,7 @@ private State generateRestingState(Observation observation) {
             int[] countTarget = new int[list.size()];
             for (int j = 0; j < list.size(); ++j) {
                 EnchantCount item = list.get(j);
-                enchantTarget[j] = item.enchant.enchantmentobj.getTranslatedName(item.enchant.enchantmentLevel);
+                enchantTarget[j] = item.enchant.enchantment.getTranslatedName(item.enchant.enchantmentLevel);
                 countTarget[j] = item.count;
             }
             enchants[i] = enchantTarget;

java/io/github/d0sboots/enchantmentrevealer/GuiEnchantmentWrapper.java

@@ -85,7 +85,7 @@ protected void drawGuiContainerBackgroundLayer(float partialTicks, int mouseX, i
         }
 
         if (clippedRenderer == null) {
-            clippedRenderer = new ClippedFontRenderer(mc.fontRendererObj);
+            clippedRenderer = new ClippedFontRenderer(mc.fontRenderer);
         }
 
         int midX = (width - xSize) / 2;
@@ -208,13 +208,13 @@ protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY)
         if (lastState != null) {
             message = lastState.statusMessage;
         }
-        fontRendererObj.drawString(message, 8, 4, 0x404040);
-        fontRendererObj.drawString(inventory.getDisplayName().getUnformattedText(),
+        fontRenderer.drawString(message, 8, 4, 0x404040);
+        fontRenderer.drawString(inventory.getDisplayName().getUnformattedText(),
                 8, ySize - 96 + 2, 0x404040);
     }
 
     @Override
-    protected void drawHoveringText(List<String> textLines, int x, int y) {
+    public void drawHoveringText(List<String> textLines, int x, int y) {
         // Rather than overriding all of drawScreen, it's easier to grab the tooltip
         // before it is rendered and tweak it to suit us.
         Observation lastObservation =

resources/mcmod.info

@@ -9,7 +9,7 @@
 
  "version": "1.2",
 
- "mcversion": "1.11.2",
+ "mcversion": "1.12",
 
  "url": "https://github.com/d0sboots/EnchantmentRevealer",