From 22ae5ec796a607afed93dd71ea7d6ef2c92f27e6 Mon Sep 17 00:00:00 2001 From: Marcel Konrad Date: Thu, 28 Jul 2022 16:22:24 +0200 Subject: [PATCH] Update to 1.19.1 --- build.gradle | 6 ++---- gradle.properties | 6 +++--- src/main/java/exopandora/worldhandler/util/BlockHelper.java | 2 +- .../java/exopandora/worldhandler/util/CommandHelper.java | 2 +- src/main/resources/META-INF/mods.toml | 6 +++--- 5 files changed, 10 insertions(+), 12 deletions(-) diff --git a/build.gradle b/build.gradle index 6759901..e576e58 100644 --- a/build.gradle +++ b/build.gradle @@ -4,7 +4,7 @@ plugins { id 'net.minecraftforge.gradle' version '5.1.+' } -version = "${minecraft_version}-${mod_version}" +version = "${minecraft_version}-${version}" archivesBaseName = project.name java.toolchain.languageVersion = JavaLanguageVersion.of(17) @@ -107,9 +107,7 @@ minecraft { } } -sourceSets.main.resources { - srcDir 'src/generated/resources' -} +sourceSets.main.resources.srcDir 'src/generated/resources' repositories { // Put repositories for dependencies here diff --git a/gradle.properties b/gradle.properties index ab1d8c3..40d8da4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,8 +1,8 @@ # WorldHandler mod_id=worldhandler -mod_version=3.3 -minecraft_version=1.19 -forge_version=41.0.100 +version=3.3 +minecraft_version=1.19.1 +forge_version=42.0.0 group=exopandora.worldhandler main_class=exopandora.worldhandler.Main diff --git a/src/main/java/exopandora/worldhandler/util/BlockHelper.java b/src/main/java/exopandora/worldhandler/util/BlockHelper.java index 1952572..2bca085 100644 --- a/src/main/java/exopandora/worldhandler/util/BlockHelper.java +++ b/src/main/java/exopandora/worldhandler/util/BlockHelper.java @@ -97,7 +97,7 @@ public class BlockHelper remove.to().setZ(new Coordinate.Ints(0, Coordinate.Type.RELATIVE)); remove.block().set(Blocks.AIR); - Minecraft.getInstance().player.command(place.toCommand(FillCommandBuilder.Label.FILL, false).substring(1)); + Minecraft.getInstance().player.commandUnsigned(place.toCommand(FillCommandBuilder.Label.FILL, false).substring(1)); ExecuteCommandBuilder execute = new ExecuteCommandBuilder(); AtOptionalArgument at = new AtOptionalArgument(AtOptionalArgument.Label.AT); diff --git a/src/main/java/exopandora/worldhandler/util/CommandHelper.java b/src/main/java/exopandora/worldhandler/util/CommandHelper.java index ff1ec46..123cb01 100644 --- a/src/main/java/exopandora/worldhandler/util/CommandHelper.java +++ b/src/main/java/exopandora/worldhandler/util/CommandHelper.java @@ -51,7 +51,7 @@ public class CommandHelper } else if(Minecraft.getInstance().player != null) { - Minecraft.getInstance().player.command(command.substring(1)); + Minecraft.getInstance().player.commandUnsigned(command.substring(1)); } WorldHandler.LOGGER.info("Command: " + command); diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index 5442769..17febf1 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/mods.toml @@ -1,5 +1,5 @@ modLoader="javafml" -loaderVersion="[41,)" +loaderVersion="[42,)" updateJSONURL="https://raw.githubusercontent.com/Exopandora/worldhandler/master/version.json" issueTrackerURL="https://github.com/Exopandora/WorldHandler/issues" displayURL="https://minecraft.curseforge.com/projects/world-handler-command-gui" @@ -11,13 +11,13 @@ license="GPL v3.0" [[mods]] modId="worldhandler" - version="${minecraft_version}-${mod_version}" + version="1.19.1-${version}" displayName="World Handler" description="The World Handler provides a simple and easy to use graphical user interface for commands. It lets you create powerful and complex sub-commands alongside NBT-structures within seconds." [[dependencies.worldhandler]] modId="minecraft" mandatory=true - versionRange="[1.19,)" + versionRange="[1.19.1,)" ordering="NONE" side="BOTH"