Update to 1.16.2 (#286)

* FurnaceTileEntity replaced with AbstractFurnaceTileEntity * Update Forge and set minimum version The minimum version must be set because a new event has been introduced since forge 32.0.68 that we use for commands. If we don't, it may crash for those who use outdated versions of Forge * Update gradle.properties * Update gradle.properties * Update to 1.16.2 * Update mods.json * Update GuiOptions.java
TehNut-Mods · Aug 15, 2020 · b96b8c3 · b96b8c3
1 parent 91bd169
commit b96b8c3
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 19 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -1,8 +1,8 @@
 org.gradle.daemon=false
 org.gradle.jvmargs=-Xmx3G
 
-mc_version=1.16.1
-forge_version=32.0.75
+mc_version=1.16.2
+forge_version=33.0.0
 
 waila_version=1.10.9
-curse_id=253449
+curse_id=253449
diff --git a/src/main/java/mcp/mobius/waila/addons/minecraft/HUDHandlerFurnace.java b/src/main/java/mcp/mobius/waila/addons/minecraft/HUDHandlerFurnace.java
@@ -6,7 +6,7 @@
 import net.minecraft.nbt.CompoundNBT;
 import net.minecraft.nbt.ListNBT;
 import net.minecraft.state.properties.BlockStateProperties;
-import net.minecraft.tileentity.FurnaceTileEntity;
+import net.minecraft.tileentity.AbstractFurnaceTileEntity;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.NonNullList;
 import net.minecraft.util.text.ITextComponent;
@@ -48,7 +48,7 @@ public void appendBody(List<ITextComponent> tooltip, IDataAccessor accessor, IPl
 
     @Override
     public void appendServerData(CompoundNBT data, ServerPlayerEntity player, World world, TileEntity blockEntity) {
-        FurnaceTileEntity furnace = (FurnaceTileEntity) blockEntity;
+        AbstractFurnaceTileEntity furnace = (AbstractFurnaceTileEntity) blockEntity;
         ListNBT items = new ListNBT();
         items.add(furnace.getStackInSlot(0).write(new CompoundNBT()));
         items.add(furnace.getStackInSlot(1).write(new CompoundNBT()));

diff --git a/src/main/java/mcp/mobius/waila/addons/minecraft/HUDHandlerVanilla.java b/src/main/java/mcp/mobius/waila/addons/minecraft/HUDHandlerVanilla.java
@@ -51,9 +51,9 @@ public void appendHead(List<ITextComponent> tooltip, IDataAccessor accessor, IPl
         if (accessor.getBlock() == Blocks.SPAWNER && config.get(PluginMinecraft.CONFIG_SPAWNER_TYPE)) {
             MobSpawnerTileEntity spawner = (MobSpawnerTileEntity) accessor.getTileEntity();
             ((ITaggableList<ResourceLocation, ITextComponent>) tooltip).setTag(OBJECT_NAME_TAG, new TranslationTextComponent(accessor.getBlock().getTranslationKey())
-                    .append(new StringTextComponent(" ("))
+                    .appendString(" (")
                     .append(spawner.getSpawnerBaseLogic().getCachedEntity().getDisplayName())
-                    .append(new StringTextComponent(")"))
+                    .appendString(")")
             );
         }
     }
@@ -79,7 +79,7 @@ public void appendBody(List<ITextComponent> tooltip, IDataAccessor accessor, IPl
 
         if (config.get(PluginMinecraft.CONFIG_REPEATER) && accessor.getBlock() == Blocks.REPEATER) {
             int delay = accessor.getBlockState().get(BlockStateProperties.DELAY_1_4);
-            tooltip.add(new TranslationTextComponent("waila.tooltip.delay", delay));
+            tooltip.add(new TranslationTextComponent("tooltip.waila.delay", delay));
             return;
         }
 

diff --git a/src/main/java/mcp/mobius/waila/addons/minecraft/PluginMinecraft.java b/src/main/java/mcp/mobius/waila/addons/minecraft/PluginMinecraft.java
@@ -12,7 +12,7 @@
 import net.minecraft.entity.item.LeashKnotEntity;
 import net.minecraft.entity.item.PaintingEntity;
 import net.minecraft.entity.item.minecart.MinecartEntity;
-import net.minecraft.tileentity.FurnaceTileEntity;
+import net.minecraft.tileentity.AbstractFurnaceTileEntity;
 import net.minecraft.tileentity.JukeboxTileEntity;
 import net.minecraft.tileentity.MobSpawnerTileEntity;
 import net.minecraft.util.ResourceLocation;
@@ -68,7 +68,7 @@ public void register(IRegistrar registrar) {
         registrar.registerEntityStackProvider(HUDHandlerEntityIcon.INSTANCE, ItemFrameEntity.class);
         registrar.registerEntityStackProvider(HUDHandlerEntityIcon.INSTANCE, PaintingEntity.class);
         registrar.registerEntityStackProvider(HUDHandlerEntityIcon.INSTANCE, LeashKnotEntity.class);
-        registrar.registerComponentProvider(HUDHandlerFurnace.INSTANCE, TooltipPosition.BODY, FurnaceTileEntity.class);
-        registrar.registerBlockDataProvider(HUDHandlerFurnace.INSTANCE, FurnaceTileEntity.class);
+        registrar.registerComponentProvider(HUDHandlerFurnace.INSTANCE, TooltipPosition.BODY, AbstractFurnaceTileEntity.class);
+        registrar.registerBlockDataProvider(HUDHandlerFurnace.INSTANCE, AbstractFurnaceTileEntity.class);
     }
 }
diff --git a/src/main/java/mcp/mobius/waila/command/CommandDumpHandlers.java b/src/main/java/mcp/mobius/waila/command/CommandDumpHandlers.java
@@ -20,7 +20,7 @@ public static void register(CommandDispatcher<CommandSource> dispatcher) {
                     File file = new File("waila_handlers.md");
                     try (FileWriter writer = new FileWriter(file)) {
                         writer.write(DumpGenerator.generateInfoDump());
-                        context.getSource().sendFeedback(new TranslationTextComponent("command.waila.dump_success"), false);
+                        context.getSource().sendFeedback(new TranslationTextComponent("command.dump.success"), false);
                         return 1;
                     } catch (IOException e) {
                         context.getSource().sendErrorMessage(new StringTextComponent(e.getClass().getSimpleName() + ": " + e.getMessage()));

diff --git a/src/main/java/mcp/mobius/waila/gui/GuiOptions.java b/src/main/java/mcp/mobius/waila/gui/GuiOptions.java
@@ -1,6 +1,5 @@
 package mcp.mobius.waila.gui;
 
-import com.google.common.collect.Lists;
 import com.mojang.blaze3d.matrix.MatrixStack;
 import mcp.mobius.waila.gui.config.OptionsListWidget;
 import mcp.mobius.waila.gui.config.value.OptionsEntryValue;
@@ -9,8 +8,10 @@
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.gui.widget.button.Button;
 import net.minecraft.client.resources.I18n;
+import net.minecraft.util.IReorderingProcessor;
 import net.minecraft.util.text.*;
 
+import java.util.Arrays;
 import java.util.List;
 
 public abstract class GuiOptions extends Screen {
@@ -78,7 +79,7 @@ public void render(MatrixStack matrixStack, int mouseX, int mouseY, float partia
                 if (mouseX < valueX || mouseX > valueX + font.getStringWidth(title))
                     return;
 
-                List<ITextProperties> tooltip = Lists.newArrayList(new StringTextComponent(title));
+                List<IReorderingProcessor> tooltip = Arrays.asList(new StringTextComponent(title).func_241878_f());
                 tooltip.addAll(font.func_238425_b_(new TranslationTextComponent(value.getDescription()), 200));
                 renderTooltip(matrixStack, tooltip, mouseX, mouseY);
             }

diff --git a/src/main/resources/META-INF/mods.json b/src/main/resources/META-INF/mods.json
@@ -1,6 +1,6 @@
 {
   "modLoader": "javafml",
-  "loaderVersion": "[32,)",
+  "loaderVersion": "[33,)",
   "issueTrackerURL": "https://github.com/TehNut/Hwyla/issues",
   "displayURL": "https://github.com/TehNut/Hwyla",
   "authors": "TehNut, ProfMobius",
@@ -18,17 +18,17 @@
       {
         "modId": "forge",
         "mandatory": true,
-        "versionRange": "[32.0.0,)",
+        "versionRange": "[33.0.0,)",
         "ordering": "NONE",
         "side": "BOTH"
       },
       {
         "modId": "minecraft",
         "mandatory": true,
-        "versionRange": "[1.16.1,)",
+        "versionRange": "[1.16.2,)",
         "ordering": "NONE",
         "side": "BOTH"
       }
     ]
   }
-}
+}
diff --git a/src/main/resources/pack.mcmeta b/src/main/resources/pack.mcmeta
@@ -1,6 +1,6 @@
 {
     "pack": {
         "description": "Hwyla resources",
-        "pack_format": 5
+        "pack_format": 6
     }
 }