Merge pull request #31 from Big-Iron-Cheems/1.20.2-update

Update to 1.20.2

build.gradle

@@ -1,6 +1,6 @@
 plugins {
     id 'org.ajoberstar.grgit' version '5.0.0'
-    id 'fabric-loom' version '1.0-SNAPSHOT'
+    id 'fabric-loom' version '1.4-SNAPSHOT'
 }
 
 sourceCompatibility = targetCompatibility = JavaVersion.VERSION_17

gradle.properties

@@ -1,13 +1,13 @@
 org.gradle.jvmargs=-Xmx4G
 
 # Fabric (https://fabricmc.net/versions.html)
-minecraft_version=1.20.1
-yarn_mappings=1.20.1+build.2
-loader_version=0.14.21
+minecraft_version=1.20.2
+yarn_mappings=1.20.2+build.4
+loader_version=0.14.23
 
 # Mod Properties
-mod_version=1.4.2
+mod_version=1.4.3
 maven_group=maxsuperman.addons
 archives_base_name=villager-roller
 
-meteor_version=0.5.4-SNAPSHOT
+meteor_version=0.5.5-SNAPSHOT

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/main/java/maxsuperman/addons/roller/VillagerRollerAddon.java

@@ -2,27 +2,24 @@
 
 import maxsuperman.addons.roller.modules.VillagerRoller;
 import meteordevelopment.meteorclient.addons.MeteorAddon;
-import meteordevelopment.meteorclient.MeteorClient;
 import meteordevelopment.meteorclient.systems.modules.Modules;
-
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import java.lang.invoke.MethodHandles;
 
 public class VillagerRollerAddon extends MeteorAddon {
-	public static final Logger LOG = LogManager.getLogger();
+    public static final Logger LOG = LogManager.getLogger();
+
+    @Override
+    public void onInitialize() {
+        LOG.info("Initializing Meteor Villager Roller");
 
-	@Override
-	public void onInitialize() {
-		LOG.info("Initializing Meteor Villager Roller");
+        // Modules
+        Modules.get().add(new VillagerRoller());
+    }
 
-		// Modules
-		Modules.get().add(new VillagerRoller());
-	}
-
     @Override
     public void onRegisterCategories() {
-        //Modules.registerCategory(CATEGORY);
+        // Custom category not defined
     }
 
     @Override

src/main/java/maxsuperman/addons/roller/mixins/VillagerInteractMixin.java

@@ -14,8 +14,8 @@ class VillagerInteractMixin {
     @Inject(at = @At("HEAD"), method = "interactMob(Lnet/minecraft/entity/player/PlayerEntity;Lnet/minecraft/util/Hand;)Lnet/minecraft/util/ActionResult;", cancellable = true)
     public void interactMob(CallbackInfoReturnable<ActionResult> cir) {
         VillagerRoller roller = Modules.get().get(VillagerRoller.class);
-        if (VillagerRoller.currentState == VillagerRoller.State.WaitingForTargetVillager) {
-            VillagerRoller.currentState = VillagerRoller.State.RollingBreakingBlock;
+        if (roller.currentState == VillagerRoller.State.WaitingForTargetVillager) {
+            roller.currentState = VillagerRoller.State.RollingBreakingBlock;
             roller.rollingVillager = (VillagerEntity) (Object) this;
             roller.info("We got your villager");
             cir.setReturnValue(ActionResult.CONSUME);