From c1713f16823b992e1af7d805c89b849232d2d86f Mon Sep 17 00:00:00 2001 From: Sebastian Hartte Date: Sat, 15 Aug 2020 14:32:53 +0200 Subject: [PATCH 1/2] Bump to Forge 33.0.5 --- gradle.properties | 2 +- src/main/resources/META-INF/mods.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index f9a070d3d..4ff19df19 100644 --- a/gradle.properties +++ b/gradle.properties @@ -11,7 +11,7 @@ artifact_basename=appliedenergistics2 minecraft_release=1.16 minecraft_version=1.16.2 mcp_mappings=20200723-1.16.1 -forge_version=33.0.2 +forge_version=33.0.5 ######################################################### # Provided APIs # diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index 0462de4a9..7f42b532b 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/mods.toml @@ -17,7 +17,7 @@ description="A Mod about Matter, Energy and using them to conquer the world.." [[dependencies.appliedenergistics2]] modId="forge" mandatory=true - versionRange="[33.0.0,34.0.0)" + versionRange="[33.0.5,34.0.0)" ordering="NONE" side="BOTH" From 73735c5cd5b50a2d7281fe8af881fe71f9d908d6 Mon Sep 17 00:00:00 2001 From: Sebastian Hartte Date: Sat, 15 Aug 2020 17:29:36 +0200 Subject: [PATCH 2/2] Remove use of func_244388_a, which is client-only. --- .../appeng/server/subcommands/SpatialStorageCommand.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/appeng/server/subcommands/SpatialStorageCommand.java b/src/main/java/appeng/server/subcommands/SpatialStorageCommand.java index 3394d9122..0721f9c1b 100644 --- a/src/main/java/appeng/server/subcommands/SpatialStorageCommand.java +++ b/src/main/java/appeng/server/subcommands/SpatialStorageCommand.java @@ -110,7 +110,7 @@ public class SpatialStorageCommand implements ISubCommand { } } - throw new CommandException(ITextComponent.func_244388_a("Couldn't find a plot for the current position.")); + throw new CommandException(new StringTextComponent("Couldn't find a plot for the current position.")); } @@ -120,7 +120,7 @@ public class SpatialStorageCommand implements ISubCommand { private void teleportBack(CommandSource source, SpatialStoragePlot plot) { TransitionInfo lastTransition = plot.getLastTransition(); if (lastTransition == null) { - throw new CommandException(ITextComponent.func_244388_a("This plot doesn't have a last known transition.")); + throw new CommandException(new StringTextComponent("This plot doesn't have a last known transition.")); } String command = getTeleportCommand(lastTransition.getWorldId(), lastTransition.getMin().add(0, 1, 0)); @@ -211,7 +211,7 @@ public class SpatialStorageCommand implements ISubCommand { if (!(cell.getItem() instanceof SpatialStorageCellItem)) { throw new CommandException( - ITextComponent.func_244388_a("Storage cell items don't implement the storage cell interface!")); + new StringTextComponent("Storage cell items don't implement the storage cell interface!")); } SpatialStorageCellItem spatialCellItem = (SpatialStorageCellItem) cell.getItem(); @@ -320,7 +320,7 @@ public class SpatialStorageCommand implements ISubCommand { } } - throw new CommandException(ITextComponent.func_244388_a("Couldn't find a plot for the current position.")); + throw new CommandException(new StringTextComponent("Couldn't find a plot for the current position.")); } }