Skip to content

Commit

Permalink
Fix incorrect armor textures
Browse files Browse the repository at this point in the history
  • Loading branch information
Noaaan committed Aug 24, 2024
1 parent d3eda8a commit f374076
Show file tree
Hide file tree
Showing 24 changed files with 22 additions and 21 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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));
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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()
);
Expand Down

0 comments on commit f374076

Please sign in to comment.