From 367e6fe822c87e1731b9923a388531f18dd85ee2 Mon Sep 17 00:00:00 2001 From: crazymoose77756 Date: Thu, 5 Sep 2024 16:18:19 -0400 Subject: [PATCH] 1.20.6 --- .github/workflows/checks.yml | 4 ++-- .github/workflows/devbuild.yml | 10 +++++----- build.gradle | 8 ++++---- gradle.properties | 8 ++++---- gradle/wrapper/gradle-wrapper.properties | 2 +- .../ghosttypes/orion/modules/chat/BurrowAlert.java | 4 ++-- .../me/ghosttypes/orion/modules/chat/ChatTweaks.java | 6 +++--- .../me/ghosttypes/orion/modules/chat/PopCounter.java | 10 +++++----- .../me/ghosttypes/orion/modules/main/AnchorAura.java | 5 +++-- .../ghosttypes/orion/modules/main/AutoCityPlus.java | 9 ++++++--- .../me/ghosttypes/orion/modules/main/BedAura.java | 12 ++++++++---- .../ghosttypes/orion/modules/main/BurrowBreaker.java | 6 +++--- .../me/ghosttypes/orion/utils/player/ItemHelper.java | 2 +- .../me/ghosttypes/orion/utils/world/BlockHelper.java | 3 ++- 14 files changed, 49 insertions(+), 40 deletions(-) diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index b0f3e77..83ead91 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -13,10 +13,10 @@ jobs: steps: - name: Checkout uses: actions/checkout@v2 - - name: Setup JDK 17 + - name: Setup JDK 21 uses: actions/setup-java@v2 with: - java-version: 17 + java-version: 21 distribution: zulu - name: Build run: | diff --git a/.github/workflows/devbuild.yml b/.github/workflows/devbuild.yml index c8f5b37..8766350 100644 --- a/.github/workflows/devbuild.yml +++ b/.github/workflows/devbuild.yml @@ -1,7 +1,7 @@ name: devbuild concurrency: - group: "build-1.20.2" + group: "build-1.20.4" cancel-in-progress: true on: @@ -16,10 +16,10 @@ jobs: steps: - name: Checkout uses: actions/checkout@v2 - - name: Setup JDK 17 + - name: Setup JDK 21 uses: actions/setup-java@v2 with: - java-version: 17 + java-version: 21 distribution: zulu - name: Build run: | @@ -30,8 +30,8 @@ jobs: - uses: "marvinpinto/action-automatic-releases@latest" with: repo_token: "${{ secrets.GITHUB_TOKEN }}" - automatic_release_tag: "latest-1.20.2" + automatic_release_tag: "latest-1.20.6" prerelease: false - title: "1.20.2 Build" + title: "1.20.6 Build" files: | ./build/libs/*.jar diff --git a/build.gradle b/build.gradle index 15f55b9..a67fae0 100644 --- a/build.gradle +++ b/build.gradle @@ -1,8 +1,8 @@ plugins { - id 'fabric-loom' version '1.4-SNAPSHOT' + id 'fabric-loom' version '1.7-SNAPSHOT' } -sourceCompatibility = targetCompatibility = JavaVersion.VERSION_17 +sourceCompatibility = targetCompatibility = JavaVersion.VERSION_21 archivesBaseName = project.archives_base_name version = project.mod_version @@ -29,7 +29,7 @@ dependencies { modImplementation "meteordevelopment:meteor-client:${project.meteor_version}-SNAPSHOT" // Required for loading logo hud element images - modImplementation "net.fabricmc.fabric-api:fabric-resource-loader-v0:+" + modCompileOnly "net.fabricmc.fabric-api:fabric-resource-loader-v0:+" include "net.fabricmc.fabric-api:fabric-resource-loader-v0:+" } @@ -46,5 +46,5 @@ processResources { tasks.withType(JavaCompile).configureEach { it.options.encoding = "UTF-8" - it.options.release = 17 + it.options.release = 21 } diff --git a/gradle.properties b/gradle.properties index cc9ef74..5ab5034 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,13 +1,13 @@ org.gradle.jvmargs=-Xmx2G # Fabric (https://fabricmc.net/develop/) -minecraft_version=1.20.2 -yarn_version=1.20.2+build.4 -loader_version=0.14.23 +minecraft_version=1.20.6 +yarn_version=1.20.6+build.3 +loader_version=0.16.4 # Mod Properties mod_version=0.2 maven_group=meteordevelopment.addons archives_base_name=orion -meteor_version=0.5.5 +meteor_version=0.5.7 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index db9a6b8..0d18421 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-8.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/src/main/java/me/ghosttypes/orion/modules/chat/BurrowAlert.java b/src/main/java/me/ghosttypes/orion/modules/chat/BurrowAlert.java index 40dd1c2..ba93cda 100644 --- a/src/main/java/me/ghosttypes/orion/modules/chat/BurrowAlert.java +++ b/src/main/java/me/ghosttypes/orion/modules/chat/BurrowAlert.java @@ -36,11 +36,11 @@ private void onTick(TickEvent.Post event) { for (PlayerEntity player : mc.world.getPlayers()) { if (isValid(player)) { burrowedPlayers.add(player); - warning(player.getEntityName() + " is burrowed!"); + warning(player.getDisplayName() + " is burrowed!"); } if (burrowedPlayers.contains(player) && !AutomationUtils.isBurrowed(player, true)) { burrowedPlayers.remove(player); - warning(player.getEntityName() + " is no longer burrowed."); + warning(player.getDisplayName() + " is no longer burrowed."); } } } diff --git a/src/main/java/me/ghosttypes/orion/modules/chat/ChatTweaks.java b/src/main/java/me/ghosttypes/orion/modules/chat/ChatTweaks.java index aae1553..d0cfe93 100644 --- a/src/main/java/me/ghosttypes/orion/modules/chat/ChatTweaks.java +++ b/src/main/java/me/ghosttypes/orion/modules/chat/ChatTweaks.java @@ -9,8 +9,8 @@ import meteordevelopment.meteorclient.utils.render.color.RainbowColor; import meteordevelopment.meteorclient.utils.render.color.SettingColor; import meteordevelopment.orbit.EventHandler; -import net.minecraft.text.LiteralTextContent; import net.minecraft.text.MutableText; +import net.minecraft.text.PlainTextContent; import net.minecraft.text.Text; import net.minecraft.text.TextColor; import net.minecraft.util.Formatting; @@ -53,8 +53,8 @@ public void onActivate() { public Text getPrefix() { - MutableText logo = MutableText.of(new LiteralTextContent("")); - MutableText prefix = MutableText.of(new LiteralTextContent("")); + MutableText logo = MutableText.of(PlainTextContent.of("")); + MutableText prefix = MutableText.of(PlainTextContent.of("")); String logoT = "Orion"; if (customPrefix.get()) logoT = prefixText.get(); if (customPrefixColor.get() && !chromaPrefix.get()) logo.append(Text.literal(logoT).setStyle(logo.getStyle().withColor(TextColor.fromRgb(prefixColor.get().getPacked())))); diff --git a/src/main/java/me/ghosttypes/orion/modules/chat/PopCounter.java b/src/main/java/me/ghosttypes/orion/modules/chat/PopCounter.java index 2aadda5..a4f4664 100644 --- a/src/main/java/me/ghosttypes/orion/modules/chat/PopCounter.java +++ b/src/main/java/me/ghosttypes/orion/modules/chat/PopCounter.java @@ -123,7 +123,7 @@ private void onReceivePacket(PacketEvent.Receive event) { int pops = totemPops.getOrDefault(entity.getUuid(), 0); totemPops.put(entity.getUuid(), ++pops); - ChatUtils.sendMsg(getChatId(entity), Formatting.GRAY, "(highlight)%s (default)popped (highlight)%d (default)%s.", entity.getEntityName(), pops, pops == 1 ? "totem" : "totems"); + ChatUtils.sendMsg(getChatId(entity), Formatting.GRAY, "(highlight)%s (default)popped (highlight)%d (default)%s.", entity.getName(), pops, pops == 1 ? "totem" : "totems"); } if (announceOthers.get() && announceWait <= 1 && mc.player.distanceTo(entity) <= announceRange.get()) { if (dontAnnounceFriends.get() && Friends.get().isFriend((PlayerEntity) entity)) return; @@ -134,7 +134,7 @@ private void onReceivePacket(PacketEvent.Receive event) { ChatUtils.sendPlayerMsg(popMessage); if (pmOthers.get()) { - String name = entity.getEntityName(); + String name = entity.getName().toString(); Wrapper.messagePlayer(name, StringHelper.stripName(name, popMessage)); } } catch (StarscriptError error) { @@ -160,9 +160,9 @@ private void onTick(TickEvent.Post event) { if (player.deathTime > 0 || player.getHealth() <= 0) { int pops = totemPops.removeInt(player.getUuid()); - ChatUtils.sendMsg(getChatId(player), Formatting.GRAY, "(highlight)%s (default)popped (highlight)%d (default)%s.", player.getEntityName(), pops, pops == 1 ? "totem" : "totems"); + ChatUtils.sendMsg(getChatId(player), Formatting.GRAY, "(highlight)%s (default)popped (highlight)%d (default)%s.", player.getName(), pops, pops == 1 ? "totem" : "totems"); chatIds.removeInt(player.getUuid()); - if (EzUtil.currentTargets.contains(player.getEntityName())) EzUtil.sendAutoEz(player.getEntityName()); + if (EzUtil.currentTargets.contains(player.getName().toString())) EzUtil.sendAutoEz(player.getName().toString()); } } } @@ -174,7 +174,7 @@ private int getChatId(Entity entity) throws StarscriptError { private String getPopMessage(PlayerEntity p) { MeteorStarscript.ss.set("pops", totemPops.getOrDefault(p.getUuid(), 0)); - MeteorStarscript.ss.set("killed", p.getEntityName()); + MeteorStarscript.ss.set("killed", p.getName().toString()); if (popScripts.isEmpty()) { ChatUtils.warning("Your pop message list is empty!"); diff --git a/src/main/java/me/ghosttypes/orion/modules/main/AnchorAura.java b/src/main/java/me/ghosttypes/orion/modules/main/AnchorAura.java index 97ab865..7e64407 100644 --- a/src/main/java/me/ghosttypes/orion/modules/main/AnchorAura.java +++ b/src/main/java/me/ghosttypes/orion/modules/main/AnchorAura.java @@ -11,6 +11,7 @@ import meteordevelopment.meteorclient.settings.*; import meteordevelopment.meteorclient.systems.modules.Module; import meteordevelopment.meteorclient.utils.Utils; +import meteordevelopment.meteorclient.utils.entity.DamageUtils; import meteordevelopment.meteorclient.utils.entity.EntityUtils; import meteordevelopment.meteorclient.utils.entity.SortPriority; import meteordevelopment.meteorclient.utils.entity.TargetUtils; @@ -141,7 +142,7 @@ private void onTick(TickEvent.Post event) { FindItemResult pick = ItemHelper.findPick(); if (pick.found()) { Wrapper.updateSlot(pick.slot()); - info("Breaking " + target.getEntityName() + "'s self-trap."); + info("Breaking " + target.getDisplayName() + "'s self-trap."); AutomationUtils.doPacketMine(target.getBlockPos().up(2)); sentTrapMine = true; return; @@ -158,7 +159,7 @@ private void onTick(TickEvent.Post event) { FindItemResult pick = ItemHelper.findPick(); if (pick.found()) { Wrapper.updateSlot(pick.slot()); - info("Breaking " + target.getEntityName() + "'s burrow"); + info("Breaking " + target.getDisplayName() + "'s burrow"); AutomationUtils.doPacketMine(target.getBlockPos()); sentBurrowMine = true; return; diff --git a/src/main/java/me/ghosttypes/orion/modules/main/AutoCityPlus.java b/src/main/java/me/ghosttypes/orion/modules/main/AutoCityPlus.java index 1638b1f..91be9d0 100644 --- a/src/main/java/me/ghosttypes/orion/modules/main/AutoCityPlus.java +++ b/src/main/java/me/ghosttypes/orion/modules/main/AutoCityPlus.java @@ -19,6 +19,7 @@ import meteordevelopment.meteorclient.utils.world.BlockUtils; import meteordevelopment.orbit.EventHandler; import net.minecraft.block.Blocks; +import net.minecraft.entity.attribute.EntityAttributes; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.Items; import net.minecraft.network.packet.c2s.play.PlayerActionC2SPacket; @@ -32,6 +33,8 @@ import net.minecraft.util.math.Vec3d; import net.minecraft.world.RaycastContext; +import static meteordevelopment.meteorclient.MeteorClient.mc; + public class AutoCityPlus extends Module { private final SettingGroup sgGeneral = settings.getDefaultGroup(); @@ -124,7 +127,7 @@ private void onTick(TickEvent.Post event) { if (!isMining) { isMining = true; if (!didFirstMine) didFirstMine = true; - info("Citying " + target.getEntityName() + "."); + info("Citying " + target.getDisplayName() + "."); if (rotate.get()) { Rotations.rotate(Rotations.getYaw(cityBlock), Rotations.getPitch(cityBlock), () -> mine(cityBlock)); } else { @@ -142,7 +145,7 @@ private void onTick(TickEvent.Post event) { private boolean outOfRange() { - return MathHelper.sqrt((float) mc.player.squaredDistanceTo(cityBlock.getX(), cityBlock.getY(), cityBlock.getZ())) > mc.interactionManager.getReachDistance(); + return MathHelper.sqrt((float) mc.player.squaredDistanceTo(cityBlock.getX(), cityBlock.getY(), cityBlock.getZ())) > mc.player.getAttributes().getBaseValue(EntityAttributes.PLAYER_BLOCK_INTERACTION_RANGE); } private void mine(BlockPos blockPos) { @@ -209,7 +212,7 @@ private void onRender(Render3DEvent event) { @Override public String getInfoString() { - if (target != null) return target.getEntityName(); + if (target != null) return target.getNameForScoreboard(); return null; } } diff --git a/src/main/java/me/ghosttypes/orion/modules/main/BedAura.java b/src/main/java/me/ghosttypes/orion/modules/main/BedAura.java index 9128c99..f45b3b0 100644 --- a/src/main/java/me/ghosttypes/orion/modules/main/BedAura.java +++ b/src/main/java/me/ghosttypes/orion/modules/main/BedAura.java @@ -14,6 +14,7 @@ import meteordevelopment.meteorclient.systems.modules.Modules; import meteordevelopment.meteorclient.systems.modules.combat.CrystalAura; import meteordevelopment.meteorclient.utils.Utils; +import meteordevelopment.meteorclient.utils.entity.DamageUtils; import meteordevelopment.meteorclient.utils.entity.EntityUtils; import meteordevelopment.meteorclient.utils.entity.SortPriority; import meteordevelopment.meteorclient.utils.entity.TargetUtils; @@ -26,6 +27,7 @@ import net.minecraft.block.Blocks; import net.minecraft.block.entity.BedBlockEntity; import net.minecraft.block.entity.BlockEntity; +import net.minecraft.entity.attribute.EntityAttributes; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.BedItem; import net.minecraft.item.Item; @@ -36,6 +38,8 @@ import net.minecraft.util.math.Direction; import net.minecraft.util.math.Vec3d; +import static meteordevelopment.meteorclient.MeteorClient.mc; + public class BedAura extends Module { private final SettingGroup sgGeneral = settings.getDefaultGroup(); private final SettingGroup sgTargeting = settings.createGroup("Targeting"); @@ -172,7 +176,7 @@ private void onTick(TickEvent.Post event) { FindItemResult pick = ItemHelper.findPick(); if (pick.found()) { Wrapper.updateSlot(pick.slot()); - info("Breaking " + target.getEntityName() + "'s self-trap."); + info("Breaking " + target.getDisplayName() + "'s self-trap."); stb = BedUtils.getSelfTrapBlock(target, preventEscape.get()); AutomationUtils.doPacketMine(stb); sentTrapMine = true; @@ -183,7 +187,7 @@ private void onTick(TickEvent.Post event) { FindItemResult pick = ItemHelper.findPick(); if (pick.found()) { Wrapper.updateSlot(pick.slot()); - info("Breaking " + target.getEntityName() + "'s burrow."); + info("Breaking " + target.getDisplayName() + "'s burrow."); AutomationUtils.doPacketMine(target.getBlockPos()); sentBurrowMine = true; return; @@ -194,7 +198,7 @@ private void onTick(TickEvent.Post event) { if (sword.found()) { Wrapper.updateSlot(sword.slot()); if (webTimer <= 0) { - info("Breaking " + target.getEntityName() + "'s web."); + info("Breaking " + target.getDisplayName() + "'s web."); webTimer = 100; } else { webTimer--; @@ -251,7 +255,7 @@ private BlockPos findBreak() { if (!(blockEntity instanceof BedBlockEntity)) continue; BlockPos bedPos = blockEntity.getPos(); Vec3d bedVec = Utils.vec3d(bedPos); - if (PlayerUtils.distanceTo(bedVec) <= mc.interactionManager.getReachDistance() + if (PlayerUtils.distanceTo(bedVec) <= mc.player.getAttributes().getBaseValue(EntityAttributes.PLAYER_BLOCK_INTERACTION_RANGE) && DamageUtils.bedDamage(target, bedVec) >= minDamage.get() && DamageUtils.bedDamage(mc.player, bedVec) < maxSelfDamage.get() && (!antiSuicide.get() || PlayerUtils.getTotalHealth() - DamageUtils.bedDamage(mc.player, bedVec) > 0)) { diff --git a/src/main/java/me/ghosttypes/orion/modules/main/BurrowBreaker.java b/src/main/java/me/ghosttypes/orion/modules/main/BurrowBreaker.java index e795573..8945f14 100644 --- a/src/main/java/me/ghosttypes/orion/modules/main/BurrowBreaker.java +++ b/src/main/java/me/ghosttypes/orion/modules/main/BurrowBreaker.java @@ -66,7 +66,7 @@ private void onTick(TickEvent.Pre event) { wasBurrowed = true; BlockPos burrowBlock = target.getBlockPos(); if (!alertedTarget) { - info("Breaking " + target.getEntityName() + "'s burrow!"); + info("Breaking " + target.getDisplayName() + "'s burrow!"); alertedTarget = true; } Wrapper.updateSlot(pickSlot.slot()); @@ -77,7 +77,7 @@ private void onTick(TickEvent.Pre event) { return; } if (!AutomationUtils.isBurrowed(target, true) && wasBurrowed) { - info("Broke " + target.getEntityName() + "'s burrow!"); + info("Broke " + target.getDisplayName() + "'s burrow!"); if (preventAfter.get()) { FindItemResult floorBlock = InvUtils.findInHotbar(itemStack -> Block.getBlockFromItem(itemStack.getItem()) instanceof AbstractPressurePlateBlock || Block.getBlockFromItem(itemStack.getItem()) instanceof ButtonBlock); if (!floorBlock.found()) { @@ -85,7 +85,7 @@ private void onTick(TickEvent.Pre event) { toggle(); } BlockUtils.place(target.getBlockPos(), floorBlock, true, 0, false); - info("Blocked " + target.getEntityName() + " from re-burrowing!"); + info("Blocked " + target.getDisplayName() + " from re-burrowing!"); } toggle(); } diff --git a/src/main/java/me/ghosttypes/orion/utils/player/ItemHelper.java b/src/main/java/me/ghosttypes/orion/utils/player/ItemHelper.java index f1dc071..29c37ae 100644 --- a/src/main/java/me/ghosttypes/orion/utils/player/ItemHelper.java +++ b/src/main/java/me/ghosttypes/orion/utils/player/ItemHelper.java @@ -103,8 +103,8 @@ public static String getCommonName(Item item) { if (item instanceof BedItem) return "Beds"; if (item instanceof ExperienceBottleItem) return "XP"; if (item instanceof EndCrystalItem) return "Crystals"; - if (item instanceof EnchantedGoldenAppleItem) return "EGaps"; if (item instanceof EnderPearlItem) return "Pearls"; + if (item.equals(Items.ENCHANTED_GOLDEN_APPLE)) return "EGaps"; if (item.equals(Items.TOTEM_OF_UNDYING)) return "Totems"; if (Block.getBlockFromItem(item) == Blocks.OBSIDIAN) return "Obby"; if (Block.getBlockFromItem(item) instanceof EnderChestBlock) return "Echests"; diff --git a/src/main/java/me/ghosttypes/orion/utils/world/BlockHelper.java b/src/main/java/me/ghosttypes/orion/utils/world/BlockHelper.java index bb7d36a..46b5936 100644 --- a/src/main/java/me/ghosttypes/orion/utils/world/BlockHelper.java +++ b/src/main/java/me/ghosttypes/orion/utils/world/BlockHelper.java @@ -4,6 +4,7 @@ import meteordevelopment.meteorclient.utils.player.PlayerUtils; import net.minecraft.block.Block; import net.minecraft.block.Blocks; +import net.minecraft.entity.attribute.EntityAttributes; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; @@ -108,6 +109,6 @@ public static boolean isOurSurroundBlock(BlockPos bp) { } public static boolean outOfRange(BlockPos cityBlock) { - return MathHelper.sqrt((float) mc.player.squaredDistanceTo(cityBlock.getX(), cityBlock.getY(), cityBlock.getZ())) > mc.interactionManager.getReachDistance(); + return MathHelper.sqrt((float) mc.player.squaredDistanceTo(cityBlock.getX(), cityBlock.getY(), cityBlock.getZ())) > mc.player.getAttributes().getBaseValue(EntityAttributes.PLAYER_BLOCK_INTERACTION_RANGE); } }