Port to 1.21

sakura-ryoko · Jan 25, 2025 · ff5fd2f · ff5fd2f
1 parent 8ec4f81
commit ff5fd2f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/src/main/java/fi/dy/masa/minihud/event/RenderHandler.java b/src/main/java/fi/dy/masa/minihud/event/RenderHandler.java
@@ -46,6 +46,7 @@
 import net.minecraft.server.world.OptionalChunk;
 import net.minecraft.server.world.ServerChunkManager;
 import net.minecraft.server.world.ServerWorld;
+import net.minecraft.text.Text;
 import net.minecraft.util.DyeColor;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.Util;
@@ -1471,6 +1472,8 @@ else if (entityType.equals(EntityType.RABBIT))
                             this.addLineI18n("minihud.info_line.entity_variant.rabbit", rabbitType.asString());
                         }
                     }
+                    // TODO 1.21.3+
+                    /*
                     else if (entityType.equals(EntityType.SALMON))
                     {
                         SalmonEntity.Variant salmonVariant = NbtEntityUtils.getSalmonVariantFromNbt(nbt);
@@ -1480,6 +1483,7 @@ else if (entityType.equals(EntityType.SALMON))
                             this.addLineI18n("minihud.info_line.entity_variant.salmon", salmonVariant.asString());
                         }
                     }
+                     */
                     else if (entityType.equals(EntityType.SHEEP))
                     {
                         DyeColor color = NbtEntityUtils.getSheepColorFromNbt(nbt);
@@ -1579,10 +1583,13 @@ else if (pair.getLeft() instanceof RabbitEntity rabbit)
                 {
                     this.addLineI18n("minihud.info_line.entity_variant.rabbit", rabbit.getVariant().asString());
                 }
+                // TODO 1.21.3+
+                /*
                 else if (pair.getLeft() instanceof SalmonEntity salmon)
                 {
                     this.addLineI18n("minihud.info_line.entity_variant.salmon", salmon.getVariant().asString());
                 }
+                 */
                 else if (pair.getLeft() instanceof SheepEntity sheep)
                 {
                     this.addLineI18n("minihud.info_line.entity_variant.sheep", sheep.getColor().getName());

diff --git a/src/main/java/fi/dy/masa/minihud/util/MiscUtils.java b/src/main/java/fi/dy/masa/minihud/util/MiscUtils.java
@@ -328,7 +328,7 @@ public static void addLodestoneTooltip(ItemStack stack, List<Text> lines)
         }
     }
 
-    public static int getFurnaceXpAmount(ServerWorld world, AbstractFurnaceBlockEntity be)
+    public static int getFurnaceXpAmount(World world, AbstractFurnaceBlockEntity be)
     {
         Object2IntOpenHashMap<Identifier> recipes = ((IMixinAbstractFurnaceBlockEntity) be).minihud_getUsedRecipes();
         double xp = 0.0;