ci: 3.13.0.0!

Bumps [gradle/gradle-build-action](https://github.com/gradle/gradle-build-action) from 2 to 3.
- [Release notes](https://github.com/gradle/gradle-build-action/releases)
- [Commits](https://github.com/gradle/gradle-build-action/compare/v2...v3)

---
updated-dependencies:
- dependency-name: gradle/gradle-build-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

.github/workflows/auto-pull-request.yaml

@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: pull-request-action
-        uses: vsoch/pull-request-action@1.0.24
+        uses: vsoch/pull-request-action@1.1.0
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           PULL_REQUEST_BRANCH: "develop"

.github/workflows/create-release.yaml

@@ -17,7 +17,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Setup Gradle
-        uses: gradle/gradle-build-action@v2
+        uses: gradle/gradle-build-action@v3
 
       - name: Run build with Gradle Wrapper
         run: chmod +x ./gradlew && ./gradlew build

.gitignore

@@ -13,6 +13,9 @@ out
 *.iml
 .idea
 
+# jdk
+jdk-17.0.2
+
 # gradle
 build
 .gradle

CHANGELOG.md

@@ -1,3 +1,29 @@
+# 3.13.0.0
+
+Many thanks to @xyzminecraftserver for sponsoring the project!
+
+This release is only rudimentarily tested since I am not currently playing the pack. Please report any issues you run into.
+
+* Updated dependencies for Vault Hunters 3.13.
+
+# 3.12.4.0 (2023-11-19)
+
+* Updated dependencies for Vault Hunters 3.12.4.
+
+# 3.12.2.0 (2023-11-14)
+
+* Updated dependencies for Vault Hunters 3.12.2.
+
+# 3.12.1.1 (2023-11-09)
+
+* Added support for overriding the new Jeweler Expertise; disabling it now grants 3 free cuts by default.
+
+# 3.12.1.0 (2023-11-09)
+
+* Updated dependencies for Vault Hunters 3.12.1.
+* Fixed Transmog Table mixin for 3.12.1.
+* Updated Vault Altar tags to reflect the Lvl 40 → Lvl 50 pool change.
+
 # 3.11.4.0 (2023-09-10)
 
 * Updated dependencies for Vault Hunters 3.11.4.

build.gradle

@@ -24,9 +24,9 @@ apply plugin: 'eu.davidea.grabver'
 versioning {
     // Required (number)
     major 3
-    minor 11
+    minor 13
     // Optional, force custom patch (number)
-    // patch 1
+    patch 0
     // Optional (any string)
     //preRelease "RC1"
     // Optional, custom task name to trigger the increase of the version
@@ -186,11 +186,11 @@ dependencies {
     // Specify the version of Minecraft to use. If this is any group other than 'net.minecraft', it is assumed
     // that the dep is a ForgeGradle 'patcher' dependency, and its patches will be applied.
     // The userdev artifact is a special name and will get all sorts of transformations applied to it.
-    minecraft 'net.minecraftforge:forge:1.18.2-40.2.10'
+    minecraft 'net.minecraftforge:forge:1.18.2-40.2.17'
 
     annotationProcessor 'org.spongepowered:mixin:0.8.5:processor'
 
-    implementation fg.deobf('curse.maven:vault-hunters-official-mod-458203:4746774')
+    implementation fg.deobf('curse.maven:vault-hunters-official-mod-458203:5076087')
     // implementation fg.deobf('curse.maven:vault-integrations-867003:4570137')
     // implementation fg.deobf("curse.maven:refined-storage-243076:3712882")
     implementation fg.deobf('appeng:appliedenergistics2-forge:11.7.0')
@@ -200,6 +200,7 @@ dependencies {
     implementation fg.deobf("curse.maven:quark-243121:3840125")
     implementation fg.deobf("curse.maven:autoreglib-250363:3642382")
     implementation fg.deobf("curse.maven:ecologics-570463:4171283")
+    implementation fg.deobf("curse.maven:geckolib-388172:4181370")
     implementation fg.deobf("curse.maven:sophisticated-core-618298:4668692")
     implementation fg.deobf("curse.maven:sophisticated-backpacks-422301:4637292")
 

src/generated/resources/data/the_vault/tags/items/altar_requirements/40.json

@@ -1,9 +0,0 @@
-{
-  "replace": false,
-  "values": [
-    "#the_vault:altar_requirements/mob/40",
-    "#the_vault:altar_requirements/resource/40",
-    "#the_vault:altar_requirements/farmable/40",
-    "#the_vault:altar_requirements/misc/40"
-  ]
-}

src/generated/resources/data/the_vault/tags/items/altar_requirements/50.json

@@ -0,0 +1,9 @@
+{
+  "replace": false,
+  "values": [
+    "#the_vault:altar_requirements/mob/50",
+    "#the_vault:altar_requirements/resource/50",
+    "#the_vault:altar_requirements/farmable/50",
+    "#the_vault:altar_requirements/misc/50"
+  ]
+}

src/generated/resources/data/the_vault/tags/items/altar_requirements/farmable.json

@@ -4,7 +4,7 @@
     "#the_vault:altar_requirements/farmable/0",
     "#the_vault:altar_requirements/farmable/10",
     "#the_vault:altar_requirements/farmable/20",
-    "#the_vault:altar_requirements/farmable/40",
+    "#the_vault:altar_requirements/farmable/50",
     "#the_vault:altar_requirements/farmable/75"
   ]
 }

src/generated/resources/data/the_vault/tags/items/altar_requirements/misc.json

@@ -4,7 +4,7 @@
     "#the_vault:altar_requirements/misc/0",
     "#the_vault:altar_requirements/misc/10",
     "#the_vault:altar_requirements/misc/20",
-    "#the_vault:altar_requirements/misc/40",
+    "#the_vault:altar_requirements/misc/50",
     "#the_vault:altar_requirements/misc/75",
     "#the_vault:altar_requirements/misc/90"
   ]

src/generated/resources/data/the_vault/tags/items/altar_requirements/mob.json

@@ -4,7 +4,7 @@
     "#the_vault:altar_requirements/mob/0",
     "#the_vault:altar_requirements/mob/10",
     "#the_vault:altar_requirements/mob/20",
-    "#the_vault:altar_requirements/mob/40",
+    "#the_vault:altar_requirements/mob/50",
     "#the_vault:altar_requirements/mob/75"
   ]
 }

src/generated/resources/data/the_vault/tags/items/altar_requirements/resource.json

@@ -4,7 +4,7 @@
     "#the_vault:altar_requirements/resource/0",
     "#the_vault:altar_requirements/resource/10",
     "#the_vault:altar_requirements/resource/20",
-    "#the_vault:altar_requirements/resource/40",
+    "#the_vault:altar_requirements/resource/50",
     "#the_vault:altar_requirements/resource/75"
   ]
 }

src/main/java/tv/alterNERD/VaultModTweaks/Configuration.java

@@ -18,7 +18,6 @@
 package tv.alterNERD.VaultModTweaks;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 
 import net.minecraft.resources.ResourceLocation;
@@ -41,6 +40,7 @@ public class Configuration {
 
     public static BooleanValue JEWELER_ENABLED;
     public static DoubleValue JEWELER_CHANCE;
+    public static IntValue JEWELER_FREE_CUTS;
 
     public static BooleanValue JEWELS_ENABLED;
     public static IntValue JEWELS_SIZE;
@@ -96,8 +96,11 @@ public class Configuration {
             .comment("Remove the Jeweler Expertise and change the default cutting chance accordingly")
             .define("disableJeweler", false);
         JEWELER_CHANCE = builder
-            .comment("Chance to break the jewel / remove a modifier")
+            .comment("Chance to break the jewel / remove a modifier (DEPRECATED since Vault Hunters 3.12.1)")
             .defineInRange("breakChance", 0.25d, 0d, 0.5d);
+        JEWELER_FREE_CUTS = builder
+            .comment("Number of free cuts (pack default: up to 3 with Jeweler Expetise)")
+            .defineInRange("free_cuts", 3, 0, 10);
         builder.pop();
 
         // Budding Crystal

src/main/java/tv/alterNERD/VaultModTweaks/integration/mixin/MixinJewelExpertise.java

@@ -0,0 +1,50 @@
+/**
+ * Copyright 2023 alterNERDtive.
+ * 
+ * This file is part of Vault Mod Tweaks.
+ * 
+ * Vault Mod Tweaks is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Vault Mod Tweaks is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with Vault Mod Tweaks.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package tv.alterNERD.VaultModTweaks.integration.mixin;
+
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+import iskallia.vault.skill.expertise.type.JewelExpertise;
+import tv.alterNERD.VaultModTweaks.Configuration;
+import tv.alterNERD.VaultModTweaks.VaultModTweaks;
+import tv.alterNERD.VaultModTweaks.util.I18n;
+
+@Mixin(JewelExpertise.class)
+public abstract class MixinJewelExpertise {
+
+    @Shadow
+    private int numberOfFreeCuts;
+
+    @Inject(
+        method = "getNumberOfFreeCuts()I",
+        at = @At("RETURN"),
+        cancellable = true,
+        remap = false
+    )
+    private void getNumberOfFreeCuts$return(CallbackInfoReturnable<Integer> ci) {
+        if (Configuration.JEWELER_ENABLED.get()) {
+            int cuts = Configuration.JEWELER_FREE_CUTS.get();
+            VaultModTweaks.LOGGER.info(I18n.get("the_vault_tweaks.log.inject.jewelcutting.freecuts", cuts));
+            ci.setReturnValue(cuts);
+        }
+     }
+}

src/main/java/tv/alterNERD/VaultModTweaks/integration/mixin/MixinPlayerExpertisesData.java

@@ -0,0 +1,42 @@
+/**
+ * Copyright 2023 alterNERDtive.
+ * 
+ * This file is part of Vault Mod Tweaks.
+ * 
+ * Vault Mod Tweaks is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Vault Mod Tweaks is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with Vault Mod Tweaks.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package tv.alterNERD.VaultModTweaks.integration.mixin;
+
+import java.util.UUID;
+
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Overwrite;
+import org.spongepowered.asm.mixin.Shadow;
+import iskallia.vault.skill.tree.ExpertiseTree;
+import iskallia.vault.world.data.PlayerExpertisesData;
+import net.minecraft.world.entity.player.Player;
+
+@Mixin(PlayerExpertisesData.class)
+public abstract class MixinPlayerExpertisesData {
+    @Overwrite(remap=false)
+    ExpertiseTree getExpertises(Player player) {
+        // SkillContext.of(player)
+        // something something LearnableSkill.learn(context) auf den Expertise skill für jeweler
+        return this.getExpertises(player.getUUID());
+    }
+
+    @Shadow(remap=false)
+    ExpertiseTree getExpertises(UUID uuid) {
+        return null;
+    }
+}

src/main/java/tv/alterNERD/VaultModTweaks/integration/mixin/MixinTransmogTableBlock.java

@@ -18,17 +18,19 @@
 package tv.alterNERD.VaultModTweaks.integration.mixin;
 
 import java.util.Collection;
-import java.util.Set;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Overwrite;
-import org.spongepowered.asm.mixin.Shadow;
 import iskallia.vault.block.TransmogTableBlock;
 import iskallia.vault.dynamodel.model.armor.ArmorPieceModel;
-import iskallia.vault.init.ModDynamicModels;
+import iskallia.vault.init.ModDynamicModels.Armor;
+import iskallia.vault.init.ModDynamicModels.Axes;
+import iskallia.vault.init.ModDynamicModels.Swords;
+import iskallia.vault.patreon.PatreonManager;
+import iskallia.vault.patreon.PatreonPlayerData;
+import iskallia.vault.patreon.PatreonTier;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.entity.player.Player;
 import tv.alterNERD.VaultModTweaks.Configuration;
-import tv.alterNERD.VaultModTweaks.VaultModTweaks;
 
 /**
  * Changes the {@link iskallia.vault.block.TransmogTableBlock} class for
@@ -38,12 +40,6 @@ import tv.alterNERD.VaultModTweaks.VaultModTweaks;
  */
 @Mixin(TransmogTableBlock.class)
 public abstract class MixinTransmogTableBlock {
-    @Shadow(remap = false)
-    private static Set<Long> CHAMPION_LIST;
-    
-    @Shadow(remap = false)
-    private static Set<Long> GOBLIN_LIST;
-
     /***
      * Injects some new Goblin / Champion tier patrons into the transmogajigga
      * thing.
@@ -56,25 +52,26 @@ public abstract class MixinTransmogTableBlock {
     public static boolean canTransmogModel(Player player, Collection<ResourceLocation> discoveredModelIds, ResourceLocation modelId)  {
         long id = player.getUUID().getMostSignificantBits() ^ player.getUUID().getLeastSignificantBits();
         String name = player.getName().getString();
-        return ModDynamicModels.Armor.PIECE_REGISTRY.get(modelId).map(ArmorPieceModel::getArmorModel).map(armorModel -> {
+
-            VaultModTweaks.LOGGER.debug(player.getName().getString());
+        PatreonPlayerData data = PatreonManager.getInstance().getPlayerData(player.getUUID());
-            if (armorModel.equals(ModDynamicModels.Armor.CHAMPION)) {
+        return (Boolean)Armor.PIECE_REGISTRY.get(modelId).map(ArmorPieceModel::getArmorModel).map((armorModel) -> {
-                return CHAMPION_LIST.contains(id) || Configuration.CHAMPIONS.get().contains(name);
+            if (armorModel.equals(Armor.CHAMPION)) {
-            }
+                return data.isAtLeastTier(PatreonTier.CHAMPION) || Configuration.CHAMPIONS.get().contains(name);
-            if (armorModel.equals(ModDynamicModels.Armor.GOBLIN)) {
+            } else if (armorModel.equals(Armor.GOBLIN)) {
-                return GOBLIN_LIST.contains(id) || CHAMPION_LIST.contains(id) || Configuration.GOBLINS.get().contains(name) || Configuration.CHAMPIONS.get().contains(name);
+                return data.isAtLeastTier(PatreonTier.GOBLIN) || Configuration.GOBLINS.get().contains(name) || Configuration.CHAMPIONS.get().contains(name);
-            }
+            } else {
                 return null;
-        }).or(() -> ModDynamicModels.Swords.REGISTRY.get(modelId).map(model -> {
-            if (model.equals(ModDynamicModels.Swords.GODSWORD)) {
-                return CHAMPION_LIST.contains(id) || Configuration.CHAMPIONS.get().contains(name);
             }
-            return null;
+        }).or(() -> {
-        })).or(() -> ModDynamicModels.Axes.REGISTRY.get(modelId).map(model -> {
+            return Swords.REGISTRY.get(modelId).map((model) -> {
-            if (model.equals(ModDynamicModels.Axes.GODAXE)) {
+                return model.equals(Swords.GODSWORD) ? data.isAtLeastTier(PatreonTier.CHAMPION) || Configuration.CHAMPIONS.get().contains(name) : null;
-                return CHAMPION_LIST.contains(id) || Configuration.CHAMPIONS.get().contains(name);
+            });
-            }
+        }).or(() -> {
-            return null;
+            return Axes.REGISTRY.get(modelId).map((model) -> {
-        })).orElse(discoveredModelIds.contains(modelId));
+                return model.equals(Axes.GODAXE) ? data.isAtLeastTier(PatreonTier.CHAMPION) || Configuration.CHAMPIONS.get().contains(name) : null;
+            });
+        }).orElseGet(() -> {
+            return discoveredModelIds.contains(modelId);
+        });
     }
 }

src/main/resources/META-INF/mods.toml

@@ -35,6 +35,6 @@ There are some bug fixes and a lot of QoL and balance changes. See https://git.a
 [[dependencies.the_vault_tweaks]]
     modId="the_vault"
     mandatory=true
-    versionRange="[1.18.2-3.11.0.2625]"
+    versionRange="[1.18.2-3.11.0.3011]"
     ordering="AFTER"
     side="BOTH"

src/main/resources/assets/the_vault_tweaks/lang/en_us.json

@@ -8,6 +8,7 @@
     "the_vault_tweaks.log.inject.fortune.level": "Injecting maximum Fortune level: %1$d …",
     "the_vault_tweaks.log.inject.fortune.valid": "Overwriting validity check for Fortune …",
     "the_vault_tweaks.log.inject.jewelcutting.failurechance": "Injecting jewel cutting failure chance: %1$.2f …",
+    "the_vault_tweaks.log.inject.jewelcutting.freecuts": "Injecting free jewel cuts: %1$d …",
     "the_vault_tweaks.log.inject.jewelcutting.sizes": "Injecting jewel cutting size values: %1$d–%2$d …",
     "the_vault_tweaks.log.inject.junkmgmt.upgrades": "Injecting Vault Junk Upgrade multipliers: %1$d, %2$d, %3$d, %4$d …",
     "the_vault_tweaks.log.inject.relicfragments": "Balancing relic fragment weights …",

src/main/resources/mixins.the_vault_tweaks.json

@@ -9,6 +9,7 @@
         "MixinCrystalBuddingConfig",
         "MixinEnchantmentEntry",
         "MixinExpertisesGuiConfig",
+        "MixinJewelExpertise",
         "MixinPlayerResearchesData",
         "MixinStageManager",
         "MixinToolType",

version.properties

@@ -1,7 +1,7 @@
-#Tue Jul 25 01:22:57 CEST 2023
+#Sun Nov 19 15:47:56 CET 2023
 MAJOR=3
-MINOR=11
+MINOR=13
-PATCH=4
+PATCH=0
 PRE_RELEASE=
 BUILD=-1
 CODE=1