From 85e3021af110f9980fa37ca651da9478da90adb9 Mon Sep 17 00:00:00 2001 From: alterNERDtive Date: Sun, 10 Sep 2023 20:31:40 +0200 Subject: [PATCH] added god axe trasmog --- CHANGELOG.md | 1 + .../integration/mixin/MixinTransmogTableBlock.java | 12 +++++++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 06cf802..37feb17 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ # devel * Updated dependencies for Vault Hunters 3.11.4. +* Added God Axe transmog to the super secret feature™. # 3.11.3.0 (2023-09-03) diff --git a/src/main/java/tv/alterNERD/VaultModTweaks/integration/mixin/MixinTransmogTableBlock.java b/src/main/java/tv/alterNERD/VaultModTweaks/integration/mixin/MixinTransmogTableBlock.java index f6710c7..2e31a18 100644 --- a/src/main/java/tv/alterNERD/VaultModTweaks/integration/mixin/MixinTransmogTableBlock.java +++ b/src/main/java/tv/alterNERD/VaultModTweaks/integration/mixin/MixinTransmogTableBlock.java @@ -55,7 +55,8 @@ public abstract class MixinTransmogTableBlock { @Overwrite(remap = false) public static boolean canTransmogModel(Player player, Collection 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 -> { + String name = player.getName().getString(); + return ModDynamicModels.Armor.PIECE_REGISTRY.get(modelId).map(ArmorPieceModel::getArmorModel).map(armorModel -> { VaultModTweaks.LOGGER.debug(player.getName().getString()); if (armorModel.equals(ModDynamicModels.Armor.CHAMPION)) { return CHAMPION_LIST.contains(id) || Configuration.CHAMPIONS.get().contains(name); @@ -64,11 +65,16 @@ public abstract class MixinTransmogTableBlock { return GOBLIN_LIST.contains(id) || CHAMPION_LIST.contains(id) || Configuration.GOBLINS.get().contains(name) || Configuration.CHAMPIONS.get().contains(name); } return null; - }).orElseGet(() -> ModDynamicModels.Swords.REGISTRY.get(modelId).map(model -> { + }).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; - }).orElse(discoveredModelIds.contains(modelId))); + })).or(() -> ModDynamicModels.Axes.REGISTRY.get(modelId).map(model -> { + if (model.equals(ModDynamicModels.Axes.GODAXE)) { + return CHAMPION_LIST.contains(id) || Configuration.CHAMPIONS.get().contains(name); + } + return null; + })).orElse(discoveredModelIds.contains(modelId)); } }