Add maxRooms variable to limit increment to villager and find room ta…

…sks.

build.gradle

@@ -83,6 +83,11 @@ minecraft {
             property 'forge.enabledGameTestNamespaces', mod_id
         }
 
+        client2 {
+            parent runs.client
+            args '--username=Dev2'
+        }
+
         server {
             workingDirectory = project.file('run/server')
             property 'forge.enabledGameTestNamespaces', mod_id

gradle.properties

@@ -37,6 +37,6 @@ mod_description=Mod for Fixing Bingo Tasks
 # The version of Vault Hunters Mod
 vault_hunters_version=5601579
 # The mod version. See https://semver.org/
-mod_version=1.0.0
+mod_version=1.1.0
 # The change Log
 changelog=Check changelog in CurseForge page

src/main/java/lv/id/bonne/vaulthunters/bingofix/mixin/MixinBingoObjective.java

@@ -0,0 +1,39 @@
+//
+// Created by BONNe
+// Copyright - 2024
+//
+
+
+package lv.id.bonne.vaulthunters.bingofix.mixin;
+
+
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Redirect;
+
+import java.util.Optional;
+
+import iskallia.vault.core.data.adapter.Adapters;
+import iskallia.vault.core.vault.objective.BingoObjective;
+import iskallia.vault.task.counter.TargetTaskCounter;
+
+
+@Mixin(value = BingoObjective.class, remap = false)
+public class MixinBingoObjective
+{
+    @Redirect(method = "lambda$tickServer$4",
+        at = @At(value = "INVOKE", target = "Liskallia/vault/task/counter/TargetTaskCounter;setTarget(Ljava/lang/Object;)V"))
+    private void limitMaxRoomValue(TargetTaskCounter instance, Object target)
+    {
+        Optional<Integer> maxRooms = instance.get("maxRooms", Adapters.INT);
+
+        if (maxRooms.isPresent())
+        {
+            instance.setTarget(Math.min(maxRooms.get(), (int) target));
+        }
+        else
+        {
+            instance.setTarget(target);
+        }
+    }
+}

src/main/java/lv/id/bonne/vaulthunters/bingofix/mixin/MixinBingoTask.java

@@ -167,8 +167,19 @@ private static void readjustRoomTargetCounter(TaskCounter<?, ?> counter, int roo
 
                 // Reload tag
                 BingoFixMod.LOGGER.debug("Change target counter for task.");
-                counter.readNbt(tag);
             }
+            else
+            {
+                BingoFixMod.LOGGER.debug("Add maxRooms variable.");
+            }
+
+            if (tag.contains("variables"))
+            {
+                CompoundTag variables = tag.getCompound("variables");
+                variables.putInt("maxRooms", roomCount);
+            }
+
+            counter.readNbt(tag);
         });
     }
 }

src/main/resources/mixins.bingo_fix.vault_hunters.json

@@ -5,6 +5,7 @@
   "compatibilityLevel": "JAVA_8",
   "refmap": "bingo_fix.refmap.json",
   "mixins": [
+    "MixinBingoObjective",
     "MixinBingoTask"
   ],
   "client": [