update to 1.18.2?

gradle.properties

@@ -2,9 +2,9 @@
 org.gradle.jvmargs=-Xmx2G
 
 # Fabric Properties
-minecraft_version=1.18.1
+minecraft_version=1.18.2
-yarn_version=1.18.1+build.14
+yarn_version=1.18.2+build.1
-loader_version=0.12.12
+loader_version=0.13.3
 
 # Mod Properties
 mod_version = 0.2

src/main/java/anticope/rejects/gui/screens/InteractionScreen.java

@@ -10,8 +10,10 @@ import meteordevelopment.meteorclient.systems.modules.Modules;
 import meteordevelopment.meteorclient.utils.misc.MeteorStarscript;
 import meteordevelopment.meteorclient.utils.render.PeekScreen;
 import meteordevelopment.orbit.EventHandler;
+import meteordevelopment.starscript.Script;
 import meteordevelopment.starscript.compiler.Compiler;
 import meteordevelopment.starscript.compiler.Parser;
+import meteordevelopment.starscript.compiler.Parser.Result;
 import meteordevelopment.starscript.utils.Error;
 import meteordevelopment.starscript.utils.StarscriptError;
 
@@ -219,14 +221,14 @@ public class InteractionScreen extends Screen {
 
     public void tick() {
         if (Modules.get().get(InteractionMenu.class).keybind.get().isPressed())
-            onClose();
+            close();
     }
 
     private void closeScreen() {
         client.setScreen((Screen) null);
     }
 
-    public void onClose() {
+    public void close() {
         cursorMode(GLFW.GLFW_CURSOR_NORMAL);
         // This makes the magic
         if (focusedString != null) {
@@ -354,7 +356,7 @@ public class InteractionScreen extends Screen {
     private class StaticListener {
         @EventHandler
         private void onKey(KeyEvent event) {
-            if (client.options.keySneak.matchesKey(event.key, 0) || client.options.keySneak.matchesMouse(event.key)) {
+            if (client.options.sneakKey.matchesKey(event.key, 0) || client.options.sneakKey.matchesMouse(event.key)) {
                 client.setCameraEntity(client.player);
                 event.cancel();
                 MeteorClient.EVENT_BUS.unsubscribe(this);

src/main/java/anticope/rejects/gui/themes/rounded/widgets/WMeteorTopBar.java

@@ -35,11 +35,11 @@ public class WMeteorTopBar extends WTopBar implements MeteorWidget {
     @Override
     public void init() {
         for (Tab tab : Tabs.get()) {
-            add(new WTopBarButton(tab));
+            add(new anticope.rejects.gui.themes.rounded.widgets.WMeteorTopBar.WTopBarButton(tab));
         }
     }
 
-    protected int getState(WTopBarButton btn) {
+    protected int getState(anticope.rejects.gui.themes.rounded.widgets.WMeteorTopBar.WTopBarButton btn) {
         int a = 0;
         if (btn.equals(cells.get(0).widget()))
             a |= 1;

src/main/java/anticope/rejects/mixin/meteor/modules/FlightMixin.java

@@ -38,10 +38,10 @@ public class FlightMixin {
     private void onDeactivate(CallbackInfo ci) {
         if (mc.player == null || stopMomentum == null || !stopMomentum.get()) return;
 
-        mc.options.keyForward.setPressed(false);
+        mc.options.forwardKey.setPressed(false);
-        mc.options.keyLeft.setPressed(false);
+        mc.options.leftKey.setPressed(false);
-        mc.options.keyBack.setPressed(false);
+        mc.options.backKey.setPressed(false);
-        mc.options.keyRight.setPressed(false);
+        mc.options.rightKey.setPressed(false);
 
         mc.player.setVelocity(Vec3d.ZERO);
     }

src/main/java/anticope/rejects/modules/Auto32K.java

@@ -157,7 +157,6 @@ public class Auto32K extends Module {
                     mc.interactionManager.interactBlock(mc.player, mc.world, Hand.MAIN_HAND, new BlockHitResult(mc.player.getPos(), mc.player.getHorizontalFacing().getOpposite(), bestBlock.up(), false));
                     phase += 1;
                 }else if (phase == 4 && mc.currentScreen instanceof Generic3x3ContainerScreen) {
-                    mc.player.getSpeed();
                     InvUtils.move().from(shulkerSlot.slot()).toId(4);
                     phase += 1;
                 }else if (phase == 5 && mc.currentScreen instanceof Generic3x3ContainerScreen) {

src/main/java/anticope/rejects/modules/AutoPot.java

@@ -199,7 +199,7 @@ public class AutoPot extends Module {
         if (drinking) event.target = null;
     }
     private void setPressed(boolean pressed) {
-        mc.options.keyUse.setPressed(pressed);
+        mc.options.useKey.setPressed(pressed);
     }
     private void startDrinking() {
         prevSlot = mc.player.getInventory().selectedSlot;

src/main/java/anticope/rejects/modules/BoatGlitch.java

@@ -120,7 +120,7 @@ public class BoatGlitch extends Module {
     }
     @EventHandler
     private void onKey(KeyEvent event) {
-        if (event.key == mc.options.keySneak.getDefaultKey().getCode() && event.action == KeyAction.Press) {
+        if (event.key == mc.options.sneakKey.getDefaultKey().getCode() && event.action == KeyAction.Press) {
             if (mc.player.getVehicle() != null && mc.player.getVehicle().getType().equals(EntityType.BOAT)) {
                 dontPhase = false;
                 boat = null;

src/main/java/anticope/rejects/modules/BoatPhase.java

@@ -126,8 +126,8 @@ public class BoatPhase extends Module {
             double velZ = vel.z;
 
             if (verticalControl.get()) {
-                if (mc.options.keyJump.isPressed()) velY += verticalSpeed.get() / 20;
+                if (mc.options.jumpKey.isPressed()) velY += verticalSpeed.get() / 20;
-                if (mc.options.keySprint.isPressed()) velY -= verticalSpeed.get() / 20;
+                if (mc.options.sprintKey.isPressed()) velY -= verticalSpeed.get() / 20;
                 else if (fall.get()) velY -= fallSpeed.get() / 20;
             } else if (fall.get()) velY -= fallSpeed.get() / 20;
 

src/main/java/anticope/rejects/modules/OreSim.java

@@ -25,6 +25,7 @@ import net.minecraft.util.math.Direction;
 import net.minecraft.util.math.MathHelper;
 import net.minecraft.util.math.Vec3d;
 import net.minecraft.util.registry.Registry;
+import net.minecraft.util.registry.RegistryKey;
 import net.minecraft.world.Heightmap;
 import net.minecraft.world.chunk.ChunkStatus;
 import net.minecraft.world.gen.random.ChunkRandom;
@@ -275,7 +276,8 @@ public class OreSim extends Module {
 
         long populationSeed = random.setPopulationSeed(worldSeed.seed, chunkX, chunkZ);
 
-        Identifier id = world.getRegistryManager().get(Registry.BIOME_KEY).getId(world.getBiomeAccess().getBiomeForNoiseGen(new BlockPos(chunkX, 0, chunkZ)));
+        var optional = world.getBiomeAccess().getBiomeForNoiseGen(new BlockPos(chunkX, 0, chunkZ)).getKeyOrValue();
+        Identifier id = (optional.right().isPresent()) ? world.getRegistryManager().get(Registry.BIOME_KEY).getId(optional.right().get()) : optional.left().get().getValue();
         if (id == null) {
             error("Something went wrong, you may have some mods that mess with world generation");
             toggle();

src/main/java/anticope/rejects/modules/SkeletonESP.java

@@ -23,7 +23,6 @@ import net.minecraft.client.render.entity.LivingEntityRenderer;
 import net.minecraft.client.render.entity.PlayerEntityRenderer;
 import net.minecraft.client.render.entity.model.PlayerEntityModel;
 import net.minecraft.client.util.math.MatrixStack;
-import net.minecraft.util.math.Vec3f;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.util.math.*;

src/main/java/anticope/rejects/utils/Ore.java

@@ -9,8 +9,6 @@ import net.minecraft.util.math.intprovider.ConstantIntProvider;
 import net.minecraft.util.math.intprovider.IntProvider;
 import net.minecraft.util.math.intprovider.UniformIntProvider;
 import net.minecraft.world.dimension.DimensionType;
-
-import java.util.List;
 import java.util.*;
 
 public class Ore {