From 3b66d81d7623c10619c200e677e4144c5ed868ac Mon Sep 17 00:00:00 2001 From: RedCarlos <58893097+RedCarlos26@users.noreply.github.com> Date: Mon, 23 Oct 2023 04:34:19 -0400 Subject: [PATCH] Update to 1.20.2 (#43) --- .github/workflows/devbuild.yml | 6 ++-- README.md | 9 ++---- build.gradle | 2 +- gradle.properties | 10 +++---- gradle/wrapper/gradle-wrapper.properties | 2 +- src/main/java/me/ghosttypes/orion/Orion.java | 12 +++----- .../orion/modules/chat/BurrowAlert.java | 1 - .../orion/modules/chat/ChatTweaks.java | 2 +- .../orion/modules/chat/PopCounter.java | 3 +- .../me/ghosttypes/orion/modules/hud/Logo.java | 5 ++-- .../orion/modules/main/AnchorAura.java | 2 +- .../orion/modules/main/AutoBedCraft.java | 8 ++--- .../orion/modules/main/AutoCityPlus.java | 2 +- .../orion/modules/main/BedAura.java | 5 +--- .../orion/modules/main/BedDisabler.java | 1 - .../orion/modules/main/BurrowBreaker.java | 2 +- .../me/ghosttypes/orion/modules/main/RPC.java | 4 +-- .../orion/utils/misc/ItemCounter.java | 29 ------------------- .../orion/utils/player/BedUtils.java | 1 - .../orion/utils/player/InvHelper.java | 2 -- .../orion/utils/player/ItemHelper.java | 1 - .../orion/utils/world/BlockHelper.java | 5 +++- 22 files changed, 33 insertions(+), 81 deletions(-) delete mode 100644 src/main/java/me/ghosttypes/orion/utils/misc/ItemCounter.java diff --git a/.github/workflows/devbuild.yml b/.github/workflows/devbuild.yml index f1ba828..c8f5b37 100644 --- a/.github/workflows/devbuild.yml +++ b/.github/workflows/devbuild.yml @@ -1,7 +1,7 @@ name: devbuild concurrency: - group: "build-1.20.1" + group: "build-1.20.2" cancel-in-progress: true on: @@ -30,8 +30,8 @@ jobs: - uses: "marvinpinto/action-automatic-releases@latest" with: repo_token: "${{ secrets.GITHUB_TOKEN }}" - automatic_release_tag: "latest-1.20.1" + automatic_release_tag: "latest-1.20.2" prerelease: false - title: "1.20.1 Build" + title: "1.20.2 Build" files: | ./build/libs/*.jar diff --git a/README.md b/README.md index 4fcf09a..90d3d3f 100644 --- a/README.md +++ b/README.md @@ -22,14 +22,14 @@ # How to use Download the [latest release](https://github.com/AntiCope/orion/releases/latest) and put it in your mods folder with Latest version of [Meteor Client](https://meteorclient.com) -Launch fabric loader for 1.19.x. +Launch fabric loader for 1.20.x. # Discord GhostTypes has retired from both Orion and Ion. Ion went to new ownership, and Orion has been left unmaintained. # Suggestions & Bugs If you have a suggestion, please check if the feature already exists before making a suggestion. -If you have a bug to report, please makesure you have the latest dev build of both Meteor and Orion. +If you have a bug to report, please make sure you have the latest dev build of both Meteor and Orion. To top it all off, please provide as much information as you can (eg. Screenshots, Version, Settings/Configs, Crash reports/logs). @@ -57,11 +57,6 @@ To top it all off, please provide as much information as you can (eg. Screenshot ### Hud - Welcome Message -- Item Counter - - Beds - - Crystals - - Golden Apples - - Experience Bottles - Kill Counter - Killstreak Counter - Death Counter diff --git a/build.gradle b/build.gradle index f427e13..15f55b9 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'fabric-loom' version '1.1-SNAPSHOT' + id 'fabric-loom' version '1.4-SNAPSHOT' } sourceCompatibility = targetCompatibility = JavaVersion.VERSION_17 diff --git a/gradle.properties b/gradle.properties index ee500c3..cc9ef74 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,13 +1,13 @@ org.gradle.jvmargs=-Xmx2G -# Fabric (https://fabricmc.net/versions.html) -minecraft_version=1.20.1 -yarn_version=1.20.1+build.1 -loader_version=0.14.21 +# Fabric (https://fabricmc.net/develop/) +minecraft_version=1.20.2 +yarn_version=1.20.2+build.4 +loader_version=0.14.23 # Mod Properties mod_version=0.2 maven_group=meteordevelopment.addons archives_base_name=orion -meteor_version=0.5.4 +meteor_version=0.5.5 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e1bef7e..db9a6b8 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.0.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/src/main/java/me/ghosttypes/orion/Orion.java b/src/main/java/me/ghosttypes/orion/Orion.java index 975cb57..8ea8b2e 100644 --- a/src/main/java/me/ghosttypes/orion/Orion.java +++ b/src/main/java/me/ghosttypes/orion/Orion.java @@ -1,6 +1,5 @@ package me.ghosttypes.orion; - import com.mojang.logging.LogUtils; import me.ghosttypes.orion.modules.chat.*; import me.ghosttypes.orion.modules.hud.Logo; @@ -9,22 +8,19 @@ import meteordevelopment.meteorclient.addons.GithubRepo; import meteordevelopment.meteorclient.addons.MeteorAddon; import meteordevelopment.meteorclient.systems.Systems; -import meteordevelopment.meteorclient.systems.modules.Category; -import meteordevelopment.meteorclient.systems.modules.Modules; import meteordevelopment.meteorclient.systems.hud.Hud; import meteordevelopment.meteorclient.systems.hud.HudGroup; - -import org.slf4j.Logger; - +import meteordevelopment.meteorclient.systems.modules.Category; +import meteordevelopment.meteorclient.systems.modules.Modules; import net.fabricmc.loader.api.FabricLoader; import net.minecraft.item.Items; - +import org.slf4j.Logger; public class Orion extends MeteorAddon { public static final Logger LOG = LogUtils.getLogger(); public static final Category CATEGORY = new Category("Orion", Items.OBSIDIAN.getDefaultStack()); public static final HudGroup HUD_GROUP = new HudGroup("Orion"); - public static final String VERSION = "0.1"; + public static final String VERSION = "0.2"; @Override public void onInitialize() { 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 fff9001..40dd1c2 100644 --- a/src/main/java/me/ghosttypes/orion/modules/chat/BurrowAlert.java +++ b/src/main/java/me/ghosttypes/orion/modules/chat/BurrowAlert.java @@ -4,7 +4,6 @@ import me.ghosttypes.orion.utils.Wrapper; import me.ghosttypes.orion.utils.player.AutomationUtils; import meteordevelopment.meteorclient.events.world.TickEvent; -import meteordevelopment.meteorclient.settings.BoolSetting; import meteordevelopment.meteorclient.settings.IntSetting; import meteordevelopment.meteorclient.settings.Setting; import meteordevelopment.meteorclient.settings.SettingGroup; 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 307e9a0..aae1553 100644 --- a/src/main/java/me/ghosttypes/orion/modules/chat/ChatTweaks.java +++ b/src/main/java/me/ghosttypes/orion/modules/chat/ChatTweaks.java @@ -9,9 +9,9 @@ import meteordevelopment.meteorclient.utils.render.color.RainbowColor; import meteordevelopment.meteorclient.utils.render.color.SettingColor; import meteordevelopment.orbit.EventHandler; -import net.minecraft.text.Text; import net.minecraft.text.LiteralTextContent; import net.minecraft.text.MutableText; +import net.minecraft.text.Text; import net.minecraft.text.TextColor; import net.minecraft.util.Formatting; 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 6766565..2aadda5 100644 --- a/src/main/java/me/ghosttypes/orion/modules/chat/PopCounter.java +++ b/src/main/java/me/ghosttypes/orion/modules/chat/PopCounter.java @@ -18,9 +18,8 @@ import meteordevelopment.meteorclient.utils.player.ChatUtils; import meteordevelopment.orbit.EventHandler; import meteordevelopment.starscript.Script; -import meteordevelopment.starscript.compiler.Parser; import meteordevelopment.starscript.compiler.Compiler; - +import meteordevelopment.starscript.compiler.Parser; import meteordevelopment.starscript.utils.StarscriptError; import net.minecraft.entity.Entity; import net.minecraft.entity.player.PlayerEntity; diff --git a/src/main/java/me/ghosttypes/orion/modules/hud/Logo.java b/src/main/java/me/ghosttypes/orion/modules/hud/Logo.java index b9eaada..3561ea9 100644 --- a/src/main/java/me/ghosttypes/orion/modules/hud/Logo.java +++ b/src/main/java/me/ghosttypes/orion/modules/hud/Logo.java @@ -1,18 +1,17 @@ package me.ghosttypes.orion.modules.hud; +import me.ghosttypes.orion.Orion; import meteordevelopment.meteorclient.renderer.GL; import meteordevelopment.meteorclient.renderer.Renderer2D; import meteordevelopment.meteorclient.settings.*; -import meteordevelopment.meteorclient.systems.hud.HudRenderer; import meteordevelopment.meteorclient.systems.hud.HudElement; import meteordevelopment.meteorclient.systems.hud.HudElementInfo; +import meteordevelopment.meteorclient.systems.hud.HudRenderer; import meteordevelopment.meteorclient.utils.Utils; import meteordevelopment.meteorclient.utils.render.color.RainbowColor; import meteordevelopment.meteorclient.utils.render.color.SettingColor; import net.minecraft.util.Identifier; -import me.ghosttypes.orion.Orion; - public class Logo extends HudElement { public static final HudElementInfo INFO = new HudElementInfo<>(Orion.HUD_GROUP, "Orion-logo", "Displays the Orion logo.", Logo::new); 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 7467455..97ab865 100644 --- a/src/main/java/me/ghosttypes/orion/modules/main/AnchorAura.java +++ b/src/main/java/me/ghosttypes/orion/modules/main/AnchorAura.java @@ -2,9 +2,9 @@ import me.ghosttypes.orion.Orion; import me.ghosttypes.orion.utils.Wrapper; -import me.ghosttypes.orion.utils.world.BlockHelper; import me.ghosttypes.orion.utils.player.AutomationUtils; import me.ghosttypes.orion.utils.player.ItemHelper; +import me.ghosttypes.orion.utils.world.BlockHelper; import meteordevelopment.meteorclient.events.render.Render3DEvent; import meteordevelopment.meteorclient.events.world.TickEvent; import meteordevelopment.meteorclient.renderer.ShapeMode; diff --git a/src/main/java/me/ghosttypes/orion/modules/main/AutoBedCraft.java b/src/main/java/me/ghosttypes/orion/modules/main/AutoBedCraft.java index b1b65ae..deb5071 100644 --- a/src/main/java/me/ghosttypes/orion/modules/main/AutoBedCraft.java +++ b/src/main/java/me/ghosttypes/orion/modules/main/AutoBedCraft.java @@ -17,9 +17,7 @@ import net.minecraft.client.gui.screen.recipebook.RecipeResultCollection; import net.minecraft.client.recipebook.RecipeBookGroup; import net.minecraft.item.BedItem; -import net.minecraft.item.Item; -import net.minecraft.item.Items; -import net.minecraft.recipe.Recipe; +import net.minecraft.recipe.RecipeEntry; import net.minecraft.registry.DynamicRegistryManager; import net.minecraft.screen.CraftingScreenHandler; import net.minecraft.screen.ScreenHandler; @@ -125,8 +123,8 @@ private void onTick(TickEvent.Post event) { } List recipeResultCollectionList = mc.player.getRecipeBook().getResultsForGroup(RecipeBookGroup.CRAFTING_MISC); for (RecipeResultCollection recipeResultCollection : recipeResultCollectionList) { - for (Recipe recipe : recipeResultCollection.getRecipes(true)) { - if (recipe.getOutput((DynamicRegistryManager) BedItem.BLOCK_ITEMS).getItem() instanceof BedItem) { + for (RecipeEntry recipe : recipeResultCollection.getRecipes(true)) { + if (recipe.value().getResult((DynamicRegistryManager) BedItem.BLOCK_ITEMS).getItem() instanceof BedItem) { assert mc.interactionManager != null; mc.interactionManager.clickRecipe(currentScreenHandler.syncId, recipe, false); windowClick(currentScreenHandler, 0, SlotActionType.QUICK_MOVE, 1); 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 38dfee9..1638b1f 100644 --- a/src/main/java/me/ghosttypes/orion/modules/main/AutoCityPlus.java +++ b/src/main/java/me/ghosttypes/orion/modules/main/AutoCityPlus.java @@ -2,9 +2,9 @@ import me.ghosttypes.orion.Orion; import me.ghosttypes.orion.utils.Wrapper; -import me.ghosttypes.orion.utils.world.BlockHelper; import me.ghosttypes.orion.utils.player.AutomationUtils; import me.ghosttypes.orion.utils.player.ItemHelper; +import me.ghosttypes.orion.utils.world.BlockHelper; import meteordevelopment.meteorclient.events.render.Render3DEvent; import meteordevelopment.meteorclient.events.world.TickEvent; import meteordevelopment.meteorclient.renderer.ShapeMode; 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 e1b5da9..9128c99 100644 --- a/src/main/java/me/ghosttypes/orion/modules/main/BedAura.java +++ b/src/main/java/me/ghosttypes/orion/modules/main/BedAura.java @@ -1,14 +1,11 @@ package me.ghosttypes.orion.modules.main; import me.ghosttypes.orion.Orion; -import me.ghosttypes.orion.modules.chat.PopCounter; import me.ghosttypes.orion.utils.Wrapper; -import me.ghosttypes.orion.utils.chat.EzUtil; -import me.ghosttypes.orion.utils.world.BlockHelper; -import me.ghosttypes.orion.utils.misc.Stats; import me.ghosttypes.orion.utils.player.AutomationUtils; import me.ghosttypes.orion.utils.player.BedUtils; import me.ghosttypes.orion.utils.player.ItemHelper; +import me.ghosttypes.orion.utils.world.BlockHelper; import meteordevelopment.meteorclient.events.render.Render3DEvent; import meteordevelopment.meteorclient.events.world.TickEvent; import meteordevelopment.meteorclient.renderer.ShapeMode; diff --git a/src/main/java/me/ghosttypes/orion/modules/main/BedDisabler.java b/src/main/java/me/ghosttypes/orion/modules/main/BedDisabler.java index cd884f4..047fbbf 100644 --- a/src/main/java/me/ghosttypes/orion/modules/main/BedDisabler.java +++ b/src/main/java/me/ghosttypes/orion/modules/main/BedDisabler.java @@ -15,7 +15,6 @@ import meteordevelopment.orbit.EventHandler; import net.minecraft.item.Items; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.Vec3d; import net.minecraft.util.math.Vec3i; import java.util.ArrayList; 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 95a5ca7..e795573 100644 --- a/src/main/java/me/ghosttypes/orion/modules/main/BurrowBreaker.java +++ b/src/main/java/me/ghosttypes/orion/modules/main/BurrowBreaker.java @@ -16,9 +16,9 @@ import meteordevelopment.meteorclient.utils.player.InvUtils; import meteordevelopment.meteorclient.utils.world.BlockUtils; import meteordevelopment.orbit.EventHandler; -import net.minecraft.block.ButtonBlock; import net.minecraft.block.AbstractPressurePlateBlock; import net.minecraft.block.Block; +import net.minecraft.block.ButtonBlock; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/me/ghosttypes/orion/modules/main/RPC.java b/src/main/java/me/ghosttypes/orion/modules/main/RPC.java index d107a80..0e322da 100644 --- a/src/main/java/me/ghosttypes/orion/modules/main/RPC.java +++ b/src/main/java/me/ghosttypes/orion/modules/main/RPC.java @@ -14,10 +14,10 @@ import meteordevelopment.meteorclient.utils.misc.MeteorStarscript; import meteordevelopment.meteorclient.utils.player.ChatUtils; import meteordevelopment.orbit.EventHandler; -import meteordevelopment.starscript.compiler.Parser; -import meteordevelopment.starscript.utils.StarscriptError; import meteordevelopment.starscript.Script; import meteordevelopment.starscript.compiler.Compiler; +import meteordevelopment.starscript.compiler.Parser; +import meteordevelopment.starscript.utils.StarscriptError; import java.util.Collections; import java.util.List; diff --git a/src/main/java/me/ghosttypes/orion/utils/misc/ItemCounter.java b/src/main/java/me/ghosttypes/orion/utils/misc/ItemCounter.java deleted file mode 100644 index 9b52c65..0000000 --- a/src/main/java/me/ghosttypes/orion/utils/misc/ItemCounter.java +++ /dev/null @@ -1,29 +0,0 @@ -package me.ghosttypes.orion.utils.misc; - -import meteordevelopment.meteorclient.utils.player.InvUtils; -import net.minecraft.item.BedItem; -import net.minecraft.item.Items; - -public class ItemCounter { - - public static int crystals() { - return InvUtils.find(Items.END_CRYSTAL).count(); - } - - public static int egaps() { - return InvUtils.find(Items.ENCHANTED_GOLDEN_APPLE).count(); - } - - public static int xp() { - return InvUtils.find(Items.EXPERIENCE_BOTTLE).count(); - } - - public static int totem() { - return InvUtils.find(Items.TOTEM_OF_UNDYING).count(); - } - - public static int beds() { - return InvUtils.find(itemStack -> itemStack.getItem() instanceof BedItem).count(); - } - -} diff --git a/src/main/java/me/ghosttypes/orion/utils/player/BedUtils.java b/src/main/java/me/ghosttypes/orion/utils/player/BedUtils.java index ccfeab8..40c3c4c 100644 --- a/src/main/java/me/ghosttypes/orion/utils/player/BedUtils.java +++ b/src/main/java/me/ghosttypes/orion/utils/player/BedUtils.java @@ -2,7 +2,6 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.Vec3d; import net.minecraft.util.math.Vec3i; import java.util.ArrayList; diff --git a/src/main/java/me/ghosttypes/orion/utils/player/InvHelper.java b/src/main/java/me/ghosttypes/orion/utils/player/InvHelper.java index f8e6096..29afe1b 100644 --- a/src/main/java/me/ghosttypes/orion/utils/player/InvHelper.java +++ b/src/main/java/me/ghosttypes/orion/utils/player/InvHelper.java @@ -2,10 +2,8 @@ import net.minecraft.item.AirBlockItem; - import net.minecraft.item.ItemStack; - import static meteordevelopment.meteorclient.MeteorClient.mc; public class InvHelper { 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 7b93cda..f1dc071 100644 --- a/src/main/java/me/ghosttypes/orion/utils/player/ItemHelper.java +++ b/src/main/java/me/ghosttypes/orion/utils/player/ItemHelper.java @@ -7,7 +7,6 @@ import net.minecraft.block.Blocks; import net.minecraft.block.EnderChestBlock; import net.minecraft.block.ShulkerBoxBlock; -import net.minecraft.entity.decoration.EndCrystalEntity; import net.minecraft.item.*; import java.util.ArrayList; 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 019fe82..bb7d36a 100644 --- a/src/main/java/me/ghosttypes/orion/utils/world/BlockHelper.java +++ b/src/main/java/me/ghosttypes/orion/utils/world/BlockHelper.java @@ -5,7 +5,10 @@ import net.minecraft.block.Block; import net.minecraft.block.Blocks; import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.util.math.*; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Direction; +import net.minecraft.util.math.MathHelper; +import net.minecraft.util.math.Vec3i; import java.util.ArrayList; import java.util.Comparator;