Update to 1.20.2 (#43)

.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

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

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

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

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

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() {

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;

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;
 

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;

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<Logo> INFO = new HudElementInfo<>(Orion.HUD_GROUP, "Orion-logo", "Displays the Orion logo.", Logo::new);
 

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;

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<RecipeResultCollection> 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);

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;

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;

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;

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;
 

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;

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;

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 {

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;

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;