From f3740763ff222465667fe237a2988f68ab15e67c Mon Sep 17 00:00:00 2001 From: Noaaan Date: Sat, 24 Aug 2024 18:04:25 +0200 Subject: [PATCH] Fix incorrect armor textures --- .../item/MythicDecorationsArmorMaterials.java | 6 +-- .../item/MythicDecorationsCrownMaterials.java | 37 +++++++++--------- .../models/armor/adamantite_crown_layer_1.png | Bin .../models/armor/aquarium_crown_layer_1.png | Bin .../models/armor/banglum_crown_layer_1.png | Bin .../models/armor/carmot_crown_layer_1.png | Bin .../models/armor/celestium_crown_layer_1.png | Bin .../models/armor/durasteel_crown_layer_1.png | Bin .../models/armor/hallowed_crown_layer_1.png | Bin .../models/armor/hydrargym_layer_1.png | Bin .../models/armor/hydrargym_layer_2.png | Bin .../models/armor/kyber_crown_layer_1.png | Bin .../armor/legendary_banglum_crown_layer_1.png | Bin .../models/armor/manganese_crown_layer_1.png | Bin .../armor/metallurgium_crown_layer_1.png | Bin .../models/armor/mythril_crown_layer_1.png | Bin .../models/armor/orichalcum_crown_layer_1.png | Bin .../models/armor/osmium_crown_layer_1.png | Bin .../models/armor/palladium_crown_layer_1.png | Bin .../models/armor/platinum_crown_layer_1.png | Bin .../models/armor/platinum_crown_layer_2.png | Bin .../models/armor/runite_crown_layer_1.png | Bin .../armor/star_platinum_crown_layer_1.png | Bin .../models/armor/steel_crown_layer_1.png | Bin 24 files changed, 22 insertions(+), 21 deletions(-) rename src/main/resources/assets/{minecraft => mythicmetals_decorations}/textures/models/armor/adamantite_crown_layer_1.png (100%) rename src/main/resources/assets/{minecraft => mythicmetals_decorations}/textures/models/armor/aquarium_crown_layer_1.png (100%) rename src/main/resources/assets/{minecraft => mythicmetals_decorations}/textures/models/armor/banglum_crown_layer_1.png (100%) rename src/main/resources/assets/{minecraft => mythicmetals_decorations}/textures/models/armor/carmot_crown_layer_1.png (100%) rename src/main/resources/assets/{minecraft => mythicmetals_decorations}/textures/models/armor/celestium_crown_layer_1.png (100%) rename src/main/resources/assets/{minecraft => mythicmetals_decorations}/textures/models/armor/durasteel_crown_layer_1.png (100%) rename src/main/resources/assets/{minecraft => mythicmetals_decorations}/textures/models/armor/hallowed_crown_layer_1.png (100%) rename src/main/resources/assets/{minecraft => mythicmetals_decorations}/textures/models/armor/hydrargym_layer_1.png (100%) rename src/main/resources/assets/{minecraft => mythicmetals_decorations}/textures/models/armor/hydrargym_layer_2.png (100%) rename src/main/resources/assets/{minecraft => mythicmetals_decorations}/textures/models/armor/kyber_crown_layer_1.png (100%) rename src/main/resources/assets/{minecraft => mythicmetals_decorations}/textures/models/armor/legendary_banglum_crown_layer_1.png (100%) rename src/main/resources/assets/{minecraft => mythicmetals_decorations}/textures/models/armor/manganese_crown_layer_1.png (100%) rename src/main/resources/assets/{minecraft => mythicmetals_decorations}/textures/models/armor/metallurgium_crown_layer_1.png (100%) rename src/main/resources/assets/{minecraft => mythicmetals_decorations}/textures/models/armor/mythril_crown_layer_1.png (100%) rename src/main/resources/assets/{minecraft => mythicmetals_decorations}/textures/models/armor/orichalcum_crown_layer_1.png (100%) rename src/main/resources/assets/{minecraft => mythicmetals_decorations}/textures/models/armor/osmium_crown_layer_1.png (100%) rename src/main/resources/assets/{minecraft => mythicmetals_decorations}/textures/models/armor/palladium_crown_layer_1.png (100%) rename src/main/resources/assets/{minecraft => mythicmetals_decorations}/textures/models/armor/platinum_crown_layer_1.png (100%) rename src/main/resources/assets/{minecraft => mythicmetals_decorations}/textures/models/armor/platinum_crown_layer_2.png (100%) rename src/main/resources/assets/{minecraft => mythicmetals_decorations}/textures/models/armor/runite_crown_layer_1.png (100%) rename src/main/resources/assets/{minecraft => mythicmetals_decorations}/textures/models/armor/star_platinum_crown_layer_1.png (100%) rename src/main/resources/assets/{minecraft => mythicmetals_decorations}/textures/models/armor/steel_crown_layer_1.png (100%) diff --git a/src/main/java/nourl/mythicmetalsdecorations/item/MythicDecorationsArmorMaterials.java b/src/main/java/nourl/mythicmetalsdecorations/item/MythicDecorationsArmorMaterials.java index 78a44c9..0b7a07e 100644 --- a/src/main/java/nourl/mythicmetalsdecorations/item/MythicDecorationsArmorMaterials.java +++ b/src/main/java/nourl/mythicmetalsdecorations/item/MythicDecorationsArmorMaterials.java @@ -24,16 +24,16 @@ public class MythicDecorationsArmorMaterials { ArmorItem.Type.LEGGINGS, 4, ArmorItem.Type.BOOTS, 2), 7, SoundEvents.ITEM_ARMOR_EQUIP_GENERIC, () -> { return Ingredient.ofItems(MythicItems.MANGANESE.getIngot()); - }, List.of(layer("manganese")), 0.0f, 0.0f); + }, List.of(layer("manganese_crown")), 0.0f, 0.0f); public static final ArmorMaterial PLATINUM = new ArmorMaterial(Map.of( ArmorItem.Type.HELMET, 2, ArmorItem.Type.CHESTPLATE, 6, ArmorItem.Type.LEGGINGS, 5, ArmorItem.Type.BOOTS, 2), 13, SoundEvents.ITEM_ARMOR_EQUIP_GOLD, () -> { return Ingredient.ofItems(MythicItems.PLATINUM.getIngot()); - }, List.of(layer("platinum")), 0.0f, 0.0f); + }, List.of(layer("platinum_crown")), 0.0f, 0.0f); - private static ArmorMaterial.Layer layer(String name) { + static ArmorMaterial.Layer layer(String name) { return new ArmorMaterial.Layer(RegHelper.id(name)); } } diff --git a/src/main/java/nourl/mythicmetalsdecorations/item/MythicDecorationsCrownMaterials.java b/src/main/java/nourl/mythicmetalsdecorations/item/MythicDecorationsCrownMaterials.java index 50d4a83..8fc62c0 100644 --- a/src/main/java/nourl/mythicmetalsdecorations/item/MythicDecorationsCrownMaterials.java +++ b/src/main/java/nourl/mythicmetalsdecorations/item/MythicDecorationsCrownMaterials.java @@ -2,33 +2,34 @@ import net.minecraft.item.ArmorMaterial; import nourl.mythicmetals.armor.MythicArmorMaterials; +import java.util.List; public class MythicDecorationsCrownMaterials { - public static final ArmorMaterial ADAMANTITE = fromMaterial(MythicArmorMaterials.ADAMANTITE); - public static final ArmorMaterial AQUARIUM = fromMaterial(MythicArmorMaterials.AQUARIUM); - public static final ArmorMaterial BANGLUM = fromMaterial(MythicArmorMaterials.BANGLUM); - public static final ArmorMaterial CARMOT = fromMaterial(MythicArmorMaterials.CARMOT); - public static final ArmorMaterial CELESTIUM = fromMaterial(MythicArmorMaterials.CELESTIUM); - public static final ArmorMaterial DURASTEEL = fromMaterial(MythicArmorMaterials.DURASTEEL); - public static final ArmorMaterial HALLOWED = fromMaterial(MythicArmorMaterials.HALLOWED); - public static final ArmorMaterial KYBER = fromMaterial(MythicArmorMaterials.KYBER); - public static final ArmorMaterial METALLURGIUM = fromMaterial(MythicArmorMaterials.METALLURGIUM); - public static final ArmorMaterial MYTHRIL = fromMaterial(MythicArmorMaterials.MYTHRIL); - public static final ArmorMaterial ORICHALCUM = fromMaterial(MythicArmorMaterials.ORICHALCUM); - public static final ArmorMaterial OSMIUM = fromMaterial(MythicArmorMaterials.OSMIUM); - public static final ArmorMaterial PALLADIUM = fromMaterial(MythicArmorMaterials.PALLADIUM); - public static final ArmorMaterial RUNITE = fromMaterial(MythicArmorMaterials.RUNITE); - public static final ArmorMaterial STAR_PLATINUM = fromMaterial(MythicArmorMaterials.STAR_PLATINUM); - public static final ArmorMaterial STEEL = fromMaterial(MythicArmorMaterials.STEEL); + public static final ArmorMaterial ADAMANTITE = fromMaterial(MythicArmorMaterials.ADAMANTITE, "adamantite_crown"); + public static final ArmorMaterial AQUARIUM = fromMaterial(MythicArmorMaterials.AQUARIUM, "aquarium_crown"); + public static final ArmorMaterial BANGLUM = fromMaterial(MythicArmorMaterials.BANGLUM, "banglum_crown"); + public static final ArmorMaterial CARMOT = fromMaterial(MythicArmorMaterials.CARMOT, "carmot_crown"); + public static final ArmorMaterial CELESTIUM = fromMaterial(MythicArmorMaterials.CELESTIUM, "celestium_crown"); + public static final ArmorMaterial DURASTEEL = fromMaterial(MythicArmorMaterials.DURASTEEL, "durasteel_crown"); + public static final ArmorMaterial HALLOWED = fromMaterial(MythicArmorMaterials.HALLOWED, "hallowed_crown"); + public static final ArmorMaterial KYBER = fromMaterial(MythicArmorMaterials.KYBER, "kyber_crown"); + public static final ArmorMaterial METALLURGIUM = fromMaterial(MythicArmorMaterials.METALLURGIUM, "metallurgium_crown"); + public static final ArmorMaterial MYTHRIL = fromMaterial(MythicArmorMaterials.MYTHRIL, "mythril_crown"); + public static final ArmorMaterial ORICHALCUM = fromMaterial(MythicArmorMaterials.ORICHALCUM, "orichalcum_crown"); + public static final ArmorMaterial OSMIUM = fromMaterial(MythicArmorMaterials.OSMIUM, "osmium_crown"); + public static final ArmorMaterial PALLADIUM = fromMaterial(MythicArmorMaterials.PALLADIUM, "palladium_crown"); + public static final ArmorMaterial RUNITE = fromMaterial(MythicArmorMaterials.RUNITE, "runite_crown"); + public static final ArmorMaterial STAR_PLATINUM = fromMaterial(MythicArmorMaterials.STAR_PLATINUM, "star_platinum_crown"); + public static final ArmorMaterial STEEL = fromMaterial(MythicArmorMaterials.STEEL, "steel_crown"); - public static ArmorMaterial fromMaterial(ArmorMaterial material) { + public static ArmorMaterial fromMaterial(ArmorMaterial material, String name) { return new ArmorMaterial( material.defense(), material.enchantability(), material.equipSound(), material.repairIngredient(), - material.layers(), + List.of(MythicDecorationsArmorMaterials.layer(name)), material.toughness(), material.knockbackResistance() ); diff --git a/src/main/resources/assets/minecraft/textures/models/armor/adamantite_crown_layer_1.png b/src/main/resources/assets/mythicmetals_decorations/textures/models/armor/adamantite_crown_layer_1.png similarity index 100% rename from src/main/resources/assets/minecraft/textures/models/armor/adamantite_crown_layer_1.png rename to src/main/resources/assets/mythicmetals_decorations/textures/models/armor/adamantite_crown_layer_1.png diff --git a/src/main/resources/assets/minecraft/textures/models/armor/aquarium_crown_layer_1.png b/src/main/resources/assets/mythicmetals_decorations/textures/models/armor/aquarium_crown_layer_1.png similarity index 100% rename from src/main/resources/assets/minecraft/textures/models/armor/aquarium_crown_layer_1.png rename to src/main/resources/assets/mythicmetals_decorations/textures/models/armor/aquarium_crown_layer_1.png diff --git a/src/main/resources/assets/minecraft/textures/models/armor/banglum_crown_layer_1.png b/src/main/resources/assets/mythicmetals_decorations/textures/models/armor/banglum_crown_layer_1.png similarity index 100% rename from src/main/resources/assets/minecraft/textures/models/armor/banglum_crown_layer_1.png rename to src/main/resources/assets/mythicmetals_decorations/textures/models/armor/banglum_crown_layer_1.png diff --git a/src/main/resources/assets/minecraft/textures/models/armor/carmot_crown_layer_1.png b/src/main/resources/assets/mythicmetals_decorations/textures/models/armor/carmot_crown_layer_1.png similarity index 100% rename from src/main/resources/assets/minecraft/textures/models/armor/carmot_crown_layer_1.png rename to src/main/resources/assets/mythicmetals_decorations/textures/models/armor/carmot_crown_layer_1.png diff --git a/src/main/resources/assets/minecraft/textures/models/armor/celestium_crown_layer_1.png b/src/main/resources/assets/mythicmetals_decorations/textures/models/armor/celestium_crown_layer_1.png similarity index 100% rename from src/main/resources/assets/minecraft/textures/models/armor/celestium_crown_layer_1.png rename to src/main/resources/assets/mythicmetals_decorations/textures/models/armor/celestium_crown_layer_1.png diff --git a/src/main/resources/assets/minecraft/textures/models/armor/durasteel_crown_layer_1.png b/src/main/resources/assets/mythicmetals_decorations/textures/models/armor/durasteel_crown_layer_1.png similarity index 100% rename from src/main/resources/assets/minecraft/textures/models/armor/durasteel_crown_layer_1.png rename to src/main/resources/assets/mythicmetals_decorations/textures/models/armor/durasteel_crown_layer_1.png diff --git a/src/main/resources/assets/minecraft/textures/models/armor/hallowed_crown_layer_1.png b/src/main/resources/assets/mythicmetals_decorations/textures/models/armor/hallowed_crown_layer_1.png similarity index 100% rename from src/main/resources/assets/minecraft/textures/models/armor/hallowed_crown_layer_1.png rename to src/main/resources/assets/mythicmetals_decorations/textures/models/armor/hallowed_crown_layer_1.png diff --git a/src/main/resources/assets/minecraft/textures/models/armor/hydrargym_layer_1.png b/src/main/resources/assets/mythicmetals_decorations/textures/models/armor/hydrargym_layer_1.png similarity index 100% rename from src/main/resources/assets/minecraft/textures/models/armor/hydrargym_layer_1.png rename to src/main/resources/assets/mythicmetals_decorations/textures/models/armor/hydrargym_layer_1.png diff --git a/src/main/resources/assets/minecraft/textures/models/armor/hydrargym_layer_2.png b/src/main/resources/assets/mythicmetals_decorations/textures/models/armor/hydrargym_layer_2.png similarity index 100% rename from src/main/resources/assets/minecraft/textures/models/armor/hydrargym_layer_2.png rename to src/main/resources/assets/mythicmetals_decorations/textures/models/armor/hydrargym_layer_2.png diff --git a/src/main/resources/assets/minecraft/textures/models/armor/kyber_crown_layer_1.png b/src/main/resources/assets/mythicmetals_decorations/textures/models/armor/kyber_crown_layer_1.png similarity index 100% rename from src/main/resources/assets/minecraft/textures/models/armor/kyber_crown_layer_1.png rename to src/main/resources/assets/mythicmetals_decorations/textures/models/armor/kyber_crown_layer_1.png diff --git a/src/main/resources/assets/minecraft/textures/models/armor/legendary_banglum_crown_layer_1.png b/src/main/resources/assets/mythicmetals_decorations/textures/models/armor/legendary_banglum_crown_layer_1.png similarity index 100% rename from src/main/resources/assets/minecraft/textures/models/armor/legendary_banglum_crown_layer_1.png rename to src/main/resources/assets/mythicmetals_decorations/textures/models/armor/legendary_banglum_crown_layer_1.png diff --git a/src/main/resources/assets/minecraft/textures/models/armor/manganese_crown_layer_1.png b/src/main/resources/assets/mythicmetals_decorations/textures/models/armor/manganese_crown_layer_1.png similarity index 100% rename from src/main/resources/assets/minecraft/textures/models/armor/manganese_crown_layer_1.png rename to src/main/resources/assets/mythicmetals_decorations/textures/models/armor/manganese_crown_layer_1.png diff --git a/src/main/resources/assets/minecraft/textures/models/armor/metallurgium_crown_layer_1.png b/src/main/resources/assets/mythicmetals_decorations/textures/models/armor/metallurgium_crown_layer_1.png similarity index 100% rename from src/main/resources/assets/minecraft/textures/models/armor/metallurgium_crown_layer_1.png rename to src/main/resources/assets/mythicmetals_decorations/textures/models/armor/metallurgium_crown_layer_1.png diff --git a/src/main/resources/assets/minecraft/textures/models/armor/mythril_crown_layer_1.png b/src/main/resources/assets/mythicmetals_decorations/textures/models/armor/mythril_crown_layer_1.png similarity index 100% rename from src/main/resources/assets/minecraft/textures/models/armor/mythril_crown_layer_1.png rename to src/main/resources/assets/mythicmetals_decorations/textures/models/armor/mythril_crown_layer_1.png diff --git a/src/main/resources/assets/minecraft/textures/models/armor/orichalcum_crown_layer_1.png b/src/main/resources/assets/mythicmetals_decorations/textures/models/armor/orichalcum_crown_layer_1.png similarity index 100% rename from src/main/resources/assets/minecraft/textures/models/armor/orichalcum_crown_layer_1.png rename to src/main/resources/assets/mythicmetals_decorations/textures/models/armor/orichalcum_crown_layer_1.png diff --git a/src/main/resources/assets/minecraft/textures/models/armor/osmium_crown_layer_1.png b/src/main/resources/assets/mythicmetals_decorations/textures/models/armor/osmium_crown_layer_1.png similarity index 100% rename from src/main/resources/assets/minecraft/textures/models/armor/osmium_crown_layer_1.png rename to src/main/resources/assets/mythicmetals_decorations/textures/models/armor/osmium_crown_layer_1.png diff --git a/src/main/resources/assets/minecraft/textures/models/armor/palladium_crown_layer_1.png b/src/main/resources/assets/mythicmetals_decorations/textures/models/armor/palladium_crown_layer_1.png similarity index 100% rename from src/main/resources/assets/minecraft/textures/models/armor/palladium_crown_layer_1.png rename to src/main/resources/assets/mythicmetals_decorations/textures/models/armor/palladium_crown_layer_1.png diff --git a/src/main/resources/assets/minecraft/textures/models/armor/platinum_crown_layer_1.png b/src/main/resources/assets/mythicmetals_decorations/textures/models/armor/platinum_crown_layer_1.png similarity index 100% rename from src/main/resources/assets/minecraft/textures/models/armor/platinum_crown_layer_1.png rename to src/main/resources/assets/mythicmetals_decorations/textures/models/armor/platinum_crown_layer_1.png diff --git a/src/main/resources/assets/minecraft/textures/models/armor/platinum_crown_layer_2.png b/src/main/resources/assets/mythicmetals_decorations/textures/models/armor/platinum_crown_layer_2.png similarity index 100% rename from src/main/resources/assets/minecraft/textures/models/armor/platinum_crown_layer_2.png rename to src/main/resources/assets/mythicmetals_decorations/textures/models/armor/platinum_crown_layer_2.png diff --git a/src/main/resources/assets/minecraft/textures/models/armor/runite_crown_layer_1.png b/src/main/resources/assets/mythicmetals_decorations/textures/models/armor/runite_crown_layer_1.png similarity index 100% rename from src/main/resources/assets/minecraft/textures/models/armor/runite_crown_layer_1.png rename to src/main/resources/assets/mythicmetals_decorations/textures/models/armor/runite_crown_layer_1.png diff --git a/src/main/resources/assets/minecraft/textures/models/armor/star_platinum_crown_layer_1.png b/src/main/resources/assets/mythicmetals_decorations/textures/models/armor/star_platinum_crown_layer_1.png similarity index 100% rename from src/main/resources/assets/minecraft/textures/models/armor/star_platinum_crown_layer_1.png rename to src/main/resources/assets/mythicmetals_decorations/textures/models/armor/star_platinum_crown_layer_1.png diff --git a/src/main/resources/assets/minecraft/textures/models/armor/steel_crown_layer_1.png b/src/main/resources/assets/mythicmetals_decorations/textures/models/armor/steel_crown_layer_1.png similarity index 100% rename from src/main/resources/assets/minecraft/textures/models/armor/steel_crown_layer_1.png rename to src/main/resources/assets/mythicmetals_decorations/textures/models/armor/steel_crown_layer_1.png