From 870f870653512971eecd22c0812e7a773872e946 Mon Sep 17 00:00:00 2001 From: alterNERDtive Date: Sun, 3 Sep 2023 16:20:22 +0200 Subject: [PATCH] =?UTF-8?q?added=20sword=20support=20to=20super=20secret?= =?UTF-8?q?=20feature=E2=84=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../integration/mixin/MixinTransmogTableBlock.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) 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 b15bc79..f6710c7 100644 --- a/src/main/java/tv/alterNERD/VaultModTweaks/integration/mixin/MixinTransmogTableBlock.java +++ b/src/main/java/tv/alterNERD/VaultModTweaks/integration/mixin/MixinTransmogTableBlock.java @@ -54,10 +54,9 @@ public abstract class MixinTransmogTableBlock { */ @Overwrite(remap = false) public static boolean canTransmogModel(Player player, Collection discoveredModelIds, ResourceLocation modelId) { - return ModDynamicModels.Armor.PIECE_REGISTRY.get(modelId).map(ArmorPieceModel::getArmorModel).map(armorModel -> { + 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()); - long id = player.getUUID().getMostSignificantBits() ^ player.getUUID().getLeastSignificantBits(); - String name = player.getName().getString(); if (armorModel.equals(ModDynamicModels.Armor.CHAMPION)) { return CHAMPION_LIST.contains(id) || Configuration.CHAMPIONS.get().contains(name); } @@ -65,6 +64,11 @@ 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; - }).orElse(discoveredModelIds.contains(modelId)); + }).orElseGet(() -> 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))); } }