added support for overridingnew Jeweler expertise
This commit is contained in:
parent
7dacc559a8
commit
9da664ac78
5 changed files with 58 additions and 3 deletions
|
@ -1,6 +1,6 @@
|
||||||
# devel
|
# devel
|
||||||
|
|
||||||
*
|
* Added support for overriding the new Jeweler Expertise; disabling it now grants 3 free cuts by default.
|
||||||
|
|
||||||
# 3.12.1.0 (2023-11-09)
|
# 3.12.1.0 (2023-11-09)
|
||||||
|
|
||||||
|
|
|
@ -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
|
||||||
|
|
|
@ -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);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
|
@ -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 …",
|
||||||
|
|
|
@ -9,6 +9,7 @@
|
||||||
"MixinCrystalBuddingConfig",
|
"MixinCrystalBuddingConfig",
|
||||||
"MixinEnchantmentEntry",
|
"MixinEnchantmentEntry",
|
||||||
"MixinExpertisesGuiConfig",
|
"MixinExpertisesGuiConfig",
|
||||||
|
"MixinJewelExpertise",
|
||||||
"MixinPlayerResearchesData",
|
"MixinPlayerResearchesData",
|
||||||
"MixinStageManager",
|
"MixinStageManager",
|
||||||
"MixinToolType",
|
"MixinToolType",
|
||||||
|
|
Loading…
Reference in a new issue