added god axe trasmog
This commit is contained in:
parent
1d3a425c3f
commit
85e3021af1
2 changed files with 10 additions and 3 deletions
|
@ -1,6 +1,7 @@
|
||||||
# devel
|
# devel
|
||||||
|
|
||||||
* Updated dependencies for Vault Hunters 3.11.4.
|
* Updated dependencies for Vault Hunters 3.11.4.
|
||||||
|
* Added God Axe transmog to the super secret feature™.
|
||||||
|
|
||||||
# 3.11.3.0 (2023-09-03)
|
# 3.11.3.0 (2023-09-03)
|
||||||
|
|
||||||
|
|
|
@ -55,7 +55,8 @@ 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) {
|
||||||
long id = player.getUUID().getMostSignificantBits() ^ player.getUUID().getLeastSignificantBits();
|
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());
|
VaultModTweaks.LOGGER.debug(player.getName().getString());
|
||||||
if (armorModel.equals(ModDynamicModels.Armor.CHAMPION)) {
|
if (armorModel.equals(ModDynamicModels.Armor.CHAMPION)) {
|
||||||
return CHAMPION_LIST.contains(id) || Configuration.CHAMPIONS.get().contains(name);
|
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 GOBLIN_LIST.contains(id) || CHAMPION_LIST.contains(id) || Configuration.GOBLINS.get().contains(name) || Configuration.CHAMPIONS.get().contains(name);
|
||||||
}
|
}
|
||||||
return null;
|
return null;
|
||||||
}).orElseGet(() -> ModDynamicModels.Swords.REGISTRY.get(modelId).map(model -> {
|
}).or(() -> ModDynamicModels.Swords.REGISTRY.get(modelId).map(model -> {
|
||||||
if (model.equals(ModDynamicModels.Swords.GODSWORD)) {
|
if (model.equals(ModDynamicModels.Swords.GODSWORD)) {
|
||||||
return CHAMPION_LIST.contains(id) || Configuration.CHAMPIONS.get().contains(name);
|
return CHAMPION_LIST.contains(id) || Configuration.CHAMPIONS.get().contains(name);
|
||||||
}
|
}
|
||||||
return null;
|
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));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue