diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 44f5dad..add41f3 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -33,8 +33,8 @@ jobs: - uses: "marvinpinto/action-automatic-releases@latest" with: repo_token: "${{ secrets.GITHUB_TOKEN }}" - automatic_release_tag: "latest-1.19" + automatic_release_tag: "latest-1.19.4" prerelease: false - title: "1.19 Build" + title: "1.19.4 Build" files: | ./build/libs/*.jar diff --git a/build.gradle b/build.gradle index b022c66..6f6ba55 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'fabric-loom' version '0.12-SNAPSHOT' + id 'fabric-loom' version '1.2-SNAPSHOT' id 'maven-publish' } @@ -17,11 +17,11 @@ repositories { dependencies { // Minecraft minecraft "com.mojang:minecraft:${project.minecraft_version}" - mappings "net.fabricmc:yarn:${project.yarn_version}:v2" + mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2" modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" // Meteor - modImplementation "meteordevelopment:meteor-client:0.5.2-SNAPSHOT" + modImplementation "meteordevelopment:meteor-client:0.5.3-SNAPSHOT" } processResources { diff --git a/gradle.properties b/gradle.properties index a098796..7ce02dc 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,10 +1,9 @@ org.gradle.jvmargs=-Xmx2G -# Fabric Properties -minecraft_version=1.19.3 -yarn_version=1.19.3+build.3 -loader_version=0.14.11 - +# Fabric Properties (https://fabricmc.net/versions.html) +minecraft_version=1.19.4 +yarn_mappings=1.19.4+build.2 +loader_version=0.14.19 # Mod Properties mod_version = 0.6 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 00e33ed..fae0804 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/src/main/java/widecat/meteorcrashaddon/CrashAddon.java b/src/main/java/widecat/meteorcrashaddon/CrashAddon.java index a5c0fdc..52a372b 100644 --- a/src/main/java/widecat/meteorcrashaddon/CrashAddon.java +++ b/src/main/java/widecat/meteorcrashaddon/CrashAddon.java @@ -2,7 +2,7 @@ import meteordevelopment.meteorclient.addons.GithubRepo; import meteordevelopment.meteorclient.addons.MeteorAddon; -import meteordevelopment.meteorclient.systems.commands.Commands; +import meteordevelopment.meteorclient.commands.Commands; import meteordevelopment.meteorclient.systems.modules.Category; import meteordevelopment.meteorclient.systems.modules.Modules; @@ -37,7 +37,7 @@ public void onInitialize() { Modules.get().add(new PacketSpammer()); Modules.get().add(new SequenceCrash()); - Commands.get().add(new CrashItemCommand()); + Commands.add(new CrashItemCommand()); } @Override diff --git a/src/main/java/widecat/meteorcrashaddon/commands/CrashItemCommand.java b/src/main/java/widecat/meteorcrashaddon/commands/CrashItemCommand.java index d7a674d..b97c5fa 100644 --- a/src/main/java/widecat/meteorcrashaddon/commands/CrashItemCommand.java +++ b/src/main/java/widecat/meteorcrashaddon/commands/CrashItemCommand.java @@ -1,7 +1,7 @@ package widecat.meteorcrashaddon.commands; import com.mojang.brigadier.builder.LiteralArgumentBuilder; -import meteordevelopment.meteorclient.systems.commands.Command; +import meteordevelopment.meteorclient.commands.Command; import net.minecraft.command.CommandSource; import net.minecraft.item.ItemStack; import net.minecraft.item.Items; @@ -11,6 +11,7 @@ import net.minecraft.network.packet.c2s.play.CreativeInventoryActionC2SPacket; import static com.mojang.brigadier.Command.SINGLE_SUCCESS; +import static meteordevelopment.meteorclient.MeteorClient.mc; public class CrashItemCommand extends Command { diff --git a/src/main/java/widecat/meteorcrashaddon/modules/InteractCrash.java b/src/main/java/widecat/meteorcrashaddon/modules/InteractCrash.java index 0580859..77b18f1 100644 --- a/src/main/java/widecat/meteorcrashaddon/modules/InteractCrash.java +++ b/src/main/java/widecat/meteorcrashaddon/modules/InteractCrash.java @@ -45,12 +45,12 @@ private void onTick(TickEvent.Post event) { case NoCom -> { for (int i = 0; i < amount.get(); i++) { Vec3d cpos = pickRandomPos(); - mc.getNetworkHandler().sendPacket(new PlayerInteractBlockC2SPacket(Hand.MAIN_HAND, new BlockHitResult(cpos, Direction.DOWN, new BlockPos(cpos), false), 0)); + mc.getNetworkHandler().sendPacket(new PlayerInteractBlockC2SPacket(Hand.MAIN_HAND, new BlockHitResult(cpos, Direction.DOWN, BlockPos.ofFloored(cpos), false), 0)); } } case OOB -> { Vec3d oob = new Vec3d(Double.POSITIVE_INFINITY, 255, Double.NEGATIVE_INFINITY); - mc.getNetworkHandler().sendPacket(new PlayerInteractBlockC2SPacket(Hand.MAIN_HAND, new BlockHitResult(oob, Direction.DOWN, new BlockPos(oob), false), 0)); + mc.getNetworkHandler().sendPacket(new PlayerInteractBlockC2SPacket(Hand.MAIN_HAND, new BlockHitResult(oob, Direction.DOWN, BlockPos.ofFloored(oob), false), 0)); } case Item -> { for (int i = 0; i < amount.get(); i++) { diff --git a/src/main/java/widecat/meteorcrashaddon/modules/SequenceCrash.java b/src/main/java/widecat/meteorcrashaddon/modules/SequenceCrash.java index 49f256f..664dfcc 100644 --- a/src/main/java/widecat/meteorcrashaddon/modules/SequenceCrash.java +++ b/src/main/java/widecat/meteorcrashaddon/modules/SequenceCrash.java @@ -50,7 +50,7 @@ private void onTick(TickEvent.Post event) { } case Block -> { Vec3d pos = new Vec3d(mc.player.getX(), mc.player.getY(), mc.player.getZ()); - BlockHitResult bhr = new BlockHitResult(pos, Direction.DOWN, new BlockPos(pos), false); + BlockHitResult bhr = new BlockHitResult(pos, Direction.DOWN, BlockPos.ofFloored(pos), false); for (int i = 0; i < amount.get(); i++) { mc.getNetworkHandler().sendPacket(new PlayerInteractBlockC2SPacket(Hand.MAIN_HAND, bhr, -1)); }