Compare commits

..

46 commits

Author SHA1 Message Date
75a4b232ed
ci: 3.13.0.0! 2024-02-06 18:17:30 +01:00
dad4c9e637
feat: updated dependencies for vault hunters 3.13 2024-02-06 18:07:04 +01:00
3b396dfec3
sponsor time! 2024-02-06 18:06:18 +01:00
895ac522d4
CHANGELOG: typo 2024-02-06 18:06:18 +01:00
alterNERDtive
f2051de488
Merge pull request #15 from alterNERDtive/dependabot/github_actions/develop/gradle/gradle-build-action-3 2024-01-29 14:06:00 +01:00
dependabot[bot]
56c50c21f3
Bump gradle/gradle-build-action from 2 to 3
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>
2024-01-29 09:15:58 +00:00
alterNERDtive
3403f7060c
Merge pull request #14 from alterNERDtive/dependabot/github_actions/develop/vsoch/pull-request-action-1.1.0 2023-12-08 18:16:00 +01:00
dependabot[bot]
c249cdf432
Bump vsoch/pull-request-action from 1.0.24 to 1.1.0
Bumps [vsoch/pull-request-action](https://github.com/vsoch/pull-request-action) from 1.0.24 to 1.1.0.
- [Release notes](https://github.com/vsoch/pull-request-action/releases)
- [Changelog](https://github.com/vsoch/pull-request-action/blob/master/CHANGELOG.md)
- [Commits](https://github.com/vsoch/pull-request-action/compare/1.0.24...1.1.0)

---
updated-dependencies:
- dependency-name: vsoch/pull-request-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-12-08 09:58:29 +00:00
e2f88e025f
version bump 2023-11-19 15:52:57 +01:00
78e9cfa1af
3.12.4.0! 2023-11-19 15:52:16 +01:00
1c1dfdf311
updated dependencies for vh 3.12.4 2023-11-19 15:48:46 +01:00
279f5d9075
fixed version number <.< 2023-11-14 22:48:21 +01:00
978d6532f3
version bump 2023-11-14 22:41:06 +01:00
e47ac6c54b
3.12.2.0! 2023-11-14 22:40:25 +01:00
5ff77edd71
updated dependencies for vh 3.12.2 2023-11-14 22:38:56 +01:00
178230a9b6
version bump 2023-11-09 19:07:47 +01:00
8eb9b8b509
3.12.1.1! 2023-11-09 19:03:19 +01:00
9da664ac78
added support for overridingnew Jeweler expertise 2023-11-09 19:01:05 +01:00
7dacc559a8
typo :-/ 2023-11-09 03:18:37 +01:00
409eed99c4
version bump 2023-11-09 03:11:47 +01:00
4c49d3ed2a
3.12.1.0! 2023-11-09 03:09:12 +01:00
bc0d5110cb
updated missing CHANGELOG entries
I’m sick, that’s my excuse.
2023-11-09 03:08:14 +01:00
8611b209e2
fixed build.gradle version number 2023-11-09 02:58:16 +01:00
6e6d53560a
updated gitignore for vscode being dumb 2023-11-09 02:57:36 +01:00
597d6397b3
fixed transmog mixin 2023-11-09 02:57:23 +01:00
2e70ead3a1
updated vault altar tags 2023-11-09 02:57:10 +01:00
5b4e2bb40f
updated dependencies for Vault Hunters 3.12.1 2023-11-09 02:14:05 +01:00
d2b64f7eb5
version bump 2023-09-10 20:35:37 +02:00
7f3f5bb2b2
3.11.4.0! 2023-09-10 20:34:28 +02:00
85e3021af1
added god axe trasmog 2023-09-10 20:31:40 +02:00
1d3a425c3f
updated dependencies for vault hunters 3.11.4 2023-09-10 20:31:14 +02:00
alterNERDtive
8ddab808a4
Merge pull request #11 from alterNERDtive:dependabot/github_actions/develop/actions/checkout-4
Bump actions/checkout from 3 to 4
2023-09-05 14:09:13 +00:00
dependabot[bot]
318848c220
Bump actions/checkout from 3 to 4
Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v3...v4)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-09-05 09:28:48 +00:00
2f560e802b
version bump 2023-09-03 16:22:55 +02:00
e29be7bad5
3.11.3.0! 2023-09-03 16:21:51 +02:00
870f870653
added sword support to super secret feature™ 2023-09-03 16:20:22 +02:00
0a60a0bdfb
added livingrock bricks to the trash tag 2023-09-03 16:19:44 +02:00
fd8f5b399b
updated dependencies for vh 3.11.3 2023-09-03 16:18:24 +02:00
76b794b14d
version bump 2023-08-20 20:51:59 +02:00
319c3e5cdf
3.11.2.2! 2023-08-20 20:49:31 +02:00
4116287f00
fixed config loading race condition
fixes #9
2023-08-20 20:46:51 +02:00
8c074239af
extra mods for debugging purposes 2023-08-20 19:47:55 +02:00
ff6cd430f2
fixed jewel cutting config option 2023-08-20 19:10:33 +02:00
9f8da672b1
updated dependencies for vh 3.11.2.2 2023-08-20 18:45:42 +02:00
6512902bb1
README: trash tags 2023-08-07 20:09:02 +02:00
66caf42f2d
version bump 2023-08-07 20:00:55 +02:00
28 changed files with 222 additions and 51 deletions

View file

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

View file

@ -1,4 +1,4 @@
name: Create release on tag push name: Create release on tag push
on: on:
push: push:
@ -14,10 +14,10 @@ jobs:
steps: steps:
- name: Checkout source code - name: Checkout source code
uses: actions/checkout@v3 uses: actions/checkout@v4
- name: Setup Gradle - name: Setup Gradle
uses: gradle/gradle-build-action@v2 uses: gradle/gradle-build-action@v3
- name: Run build with Gradle Wrapper - name: Run build with Gradle Wrapper
run: chmod +x ./gradlew && ./gradlew build run: chmod +x ./gradlew && ./gradlew build

View file

@ -1,4 +1,4 @@
name: Publish to Curseforge on release name: Publish to Curseforge on release
on: on:
release: release:
@ -16,7 +16,7 @@ jobs:
run: echo "RELEASE_VERSION=${GITHUB_REF_NAME#release/}" >> $GITHUB_ENV run: echo "RELEASE_VERSION=${GITHUB_REF_NAME#release/}" >> $GITHUB_ENV
- name: Checkout source code - name: Checkout source code
uses: actions/checkout@v3 uses: actions/checkout@v4
- name: Download release artifacts - name: Download release artifacts
env: env:

3
.gitignore vendored
View file

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

View file

@ -1,3 +1,45 @@
# 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.
* Added God Axe transmog to the super secret feature™.
# 3.11.3.0 (2023-09-03)
* Updated dependencies for Vault Hunters 3.11.3.
* Added Livingrock Bricks to the `the_vault:trash` tag, now that it has soul value.
# 3.11.2.2 (2023-08-20)
* Updated dependencies for Vault Hunters 3.11.2.2.
* Fixed jewel cutting tweaks being en-/disabled via the Jeweller expertise switch, the dedicated option now takes effect.
* Fixed race condition between Vault Mod config loading and Tweaks Mod config loading; the Vault Mod config is now reloaded whenever the Tweaks Mod config is (re-)loaded. (fixes #9)
# 3.11.2.1 (2023-08-07) # 3.11.2.1 (2023-08-07)
* Updated dependencies for Vault Hunters 3.11.2.1. * Updated dependencies for Vault Hunters 3.11.2.1.

View file

@ -24,6 +24,7 @@ Bug fixes are enabled, balance changes disabled by default.
## Miscellaneous ## Miscellaneous
* Added tags for the new Vault trash items found in loot chests (`the_vault:trash`).
* Added support for making Vault Portals out of arbitrary blocks. * Added support for making Vault Portals out of arbitrary blocks.
* Added tags to all Vault Altar requirements: * Added tags to all Vault Altar requirements:
* `the_vault:altar_requirements` * `the_vault:altar_requirements`

View file

@ -24,9 +24,9 @@ apply plugin: 'eu.davidea.grabver'
versioning { versioning {
// Required (number) // Required (number)
major 3 major 3
minor 11 minor 13
// Optional, force custom patch (number) // Optional, force custom patch (number)
// patch 1 patch 0
// Optional (any string) // Optional (any string)
//preRelease "RC1" //preRelease "RC1"
// Optional, custom task name to trigger the increase of the version // 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 // 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. // 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. // 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' annotationProcessor 'org.spongepowered:mixin:0.8.5:processor'
implementation fg.deobf('curse.maven:vault-hunters-official-mod-458203:4686889') 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:vault-integrations-867003:4570137')
// implementation fg.deobf("curse.maven:refined-storage-243076:3712882") // implementation fg.deobf("curse.maven:refined-storage-243076:3712882")
implementation fg.deobf('appeng:appliedenergistics2-forge:11.7.0') 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:quark-243121:3840125")
implementation fg.deobf("curse.maven:autoreglib-250363:3642382") implementation fg.deobf("curse.maven:autoreglib-250363:3642382")
implementation fg.deobf("curse.maven:ecologics-570463:4171283") 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-core-618298:4668692")
implementation fg.deobf("curse.maven:sophisticated-backpacks-422301:4637292") implementation fg.deobf("curse.maven:sophisticated-backpacks-422301:4637292")
@ -207,6 +208,8 @@ dependencies {
implementation fg.deobf("curse.maven:lazydfu-433518:3209972") implementation fg.deobf("curse.maven:lazydfu-433518:3209972")
implementation fg.deobf("curse.maven:modernfix-790626:4593891") implementation fg.deobf("curse.maven:modernfix-790626:4593891")
implementation fg.deobf("curse.maven:configured-457570:4462832") implementation fg.deobf("curse.maven:configured-457570:4462832")
implementation fg.deobf("curse.maven:better-mods-button-541584:4608772")
implementation fg.deobf("curse.maven:fore-config-screens-544048:3671318")
// Real mod deobf dependency examples - these get remapped to your current mappings // Real mod deobf dependency examples - these get remapped to your current mappings
// compileOnly fg.deobf("mezz.jei:jei-${mc_version}:${jei_version}:api") // Adds JEI API as a compile dependency // compileOnly fg.deobf("mezz.jei:jei-${mc_version}:${jei_version}:api") // Adds JEI API as a compile dependency

View file

@ -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"
]
}

View file

@ -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"
]
}

View file

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

View file

@ -4,7 +4,7 @@
"#the_vault:altar_requirements/misc/0", "#the_vault:altar_requirements/misc/0",
"#the_vault:altar_requirements/misc/10", "#the_vault:altar_requirements/misc/10",
"#the_vault:altar_requirements/misc/20", "#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/75",
"#the_vault:altar_requirements/misc/90" "#the_vault:altar_requirements/misc/90"
] ]

View file

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

View file

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

View file

@ -18,7 +18,6 @@
package tv.alterNERD.VaultModTweaks; package tv.alterNERD.VaultModTweaks;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays;
import java.util.List; import java.util.List;
import net.minecraft.resources.ResourceLocation; import net.minecraft.resources.ResourceLocation;
@ -41,6 +40,7 @@ public class Configuration {
public static BooleanValue JEWELER_ENABLED; public static BooleanValue JEWELER_ENABLED;
public static DoubleValue JEWELER_CHANCE; public static DoubleValue JEWELER_CHANCE;
public static IntValue JEWELER_FREE_CUTS;
public static BooleanValue JEWELS_ENABLED; public static BooleanValue JEWELS_ENABLED;
public static IntValue JEWELS_SIZE; public static IntValue JEWELS_SIZE;
@ -96,8 +96,11 @@ public class Configuration {
.comment("Remove the Jeweler Expertise and change the default cutting chance accordingly") .comment("Remove the Jeweler Expertise and change the default cutting chance accordingly")
.define("disableJeweler", false); .define("disableJeweler", false);
JEWELER_CHANCE = builder 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); .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(); builder.pop();
// Budding Crystal // Budding Crystal

View file

@ -26,10 +26,13 @@ import net.minecraft.data.tags.BlockTagsProvider;
import net.minecraftforge.fml.ModLoadingContext; import net.minecraftforge.fml.ModLoadingContext;
import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.config.ModConfig; import net.minecraftforge.fml.config.ModConfig;
import net.minecraftforge.fml.event.config.ModConfigEvent;
import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent; import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent;
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
import net.minecraftforge.forge.event.lifecycle.GatherDataEvent; import net.minecraftforge.forge.event.lifecycle.GatherDataEvent;
import iskallia.vault.init.ModConfigs;
import tv.alterNERD.VaultModTweaks.integration.TagManager; import tv.alterNERD.VaultModTweaks.integration.TagManager;
import tv.alterNERD.VaultModTweaks.util.I18n;
@Mod("the_vault_tweaks") @Mod("the_vault_tweaks")
public class VaultModTweaks public class VaultModTweaks
@ -40,6 +43,7 @@ public class VaultModTweaks
public VaultModTweaks() { public VaultModTweaks() {
FMLJavaModLoadingContext.get().getModEventBus().addListener(this::setup); FMLJavaModLoadingContext.get().getModEventBus().addListener(this::setup);
FMLJavaModLoadingContext.get().getModEventBus().addListener(this::gatherData); FMLJavaModLoadingContext.get().getModEventBus().addListener(this::gatherData);
FMLJavaModLoadingContext.get().getModEventBus().addListener(this::configLoaded);
ModLoadingContext.get().registerConfig(ModConfig.Type.SERVER, Configuration.CONFIG); ModLoadingContext.get().registerConfig(ModConfig.Type.SERVER, Configuration.CONFIG);
ModLoadingContext.get().registerConfig(ModConfig.Type.CLIENT, Configuration.CLIENTCONFIG); ModLoadingContext.get().registerConfig(ModConfig.Type.CLIENT, Configuration.CLIENTCONFIG);
} }
@ -59,4 +63,11 @@ public class VaultModTweaks
event.getExistingFileHelper()) event.getExistingFileHelper())
); );
} }
private void configLoaded(final ModConfigEvent event) {
if (event.getConfig().getType() == ModConfig.Type.SERVER) {
LOGGER.info(I18n.get("the_vault_tweaks.log.config.reloadvaultconfig"));
ModConfigs.register();
}
}
} }

View file

@ -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);
}
}
}

View file

@ -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;
}
}

View file

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

View file

@ -51,10 +51,14 @@ public abstract class MixinVaultJewelCuttingConfig extends Config {
@Override @Override
protected void onLoad(Config oldConfigInstance) { protected void onLoad(Config oldConfigInstance) {
super.onLoad(oldConfigInstance); super.onLoad(oldConfigInstance);
if (Configuration.JEWELER_ENABLED.get()) { if (Configuration.JEWELER_ENABLED.get()) {
float chance = Configuration.JEWELER_CHANCE.get().floatValue(); float chance = Configuration.JEWELER_CHANCE.get().floatValue();
VaultModTweaks.LOGGER.info(I18n.get("the_vault_tweaks.log.inject.jewelcutting.failurechance", chance)); VaultModTweaks.LOGGER.info(I18n.get("the_vault_tweaks.log.inject.jewelcutting.failurechance", chance));
this.jewelCuttingModifierRemovalChance = chance; this.jewelCuttingModifierRemovalChance = chance;
}
if (Configuration.JEWELS_ENABLED.get()) {
int min = Configuration.JEWELS_MIN.get(); int min = Configuration.JEWELS_MIN.get();
int max = Configuration.JEWELS_MAX.get(); int max = Configuration.JEWELS_MAX.get();
VaultModTweaks.LOGGER.info(I18n.get("the_vault_tweaks.log.inject.jewelcutting.sizes", min, max)); VaultModTweaks.LOGGER.info(I18n.get("the_vault_tweaks.log.inject.jewelcutting.sizes", min, max));

View file

@ -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]] [[dependencies.the_vault_tweaks]]
modId="the_vault" modId="the_vault"
mandatory=true mandatory=true
versionRange="[1.18.2-3.11.0.2551]" versionRange="[1.18.2-3.11.0.3011]"
ordering="AFTER" ordering="AFTER"
side="BOTH" side="BOTH"

View file

@ -8,6 +8,7 @@
"the_vault_tweaks.log.inject.fortune.level": "Injecting maximum Fortune level: %1$d …", "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.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.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.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.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 …", "the_vault_tweaks.log.inject.relicfragments": "Balancing relic fragment weights …",
@ -15,6 +16,8 @@
"the_vault_tweaks.log.inject.vaultar.infusion": "Injecting Vault Altar infusion time: %1$ds …", "the_vault_tweaks.log.inject.vaultar.infusion": "Injecting Vault Altar infusion time: %1$ds …",
"the_vault_tweaks.log.inject.vaultar.rock": "Injecting fake player interaction with Vault Altar …", "the_vault_tweaks.log.inject.vaultar.rock": "Injecting fake player interaction with Vault Altar …",
"the_vault_tweaks.log.config.reloadvaultconfig": "Config has changed, reloading Vault Mod configs …",
"block.minecraft.andesite": "Andesite", "block.minecraft.andesite": "Andesite",
"block.minecraft.polished_andesite": "Polished Andesite", "block.minecraft.polished_andesite": "Polished Andesite",
"block.minecraft.andesite_stairs": "Andesite Stairs", "block.minecraft.andesite_stairs": "Andesite Stairs",

View file

@ -7,6 +7,7 @@
"the_vault:gilded_ingot", "the_vault:gilded_ingot",
"the_vault:gilded_sconce", "the_vault:gilded_sconce",
"the_vault:living_rock", "the_vault:living_rock",
"the_vault:living_rock_block_cobble",
"the_vault:mossy_bone", "the_vault:mossy_bone",
"the_vault:mossy_bone_block", "the_vault:mossy_bone_block",
"the_vault:ornate_block", "the_vault:ornate_block",

View file

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

View file

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