From 9f49b3e9c6568e3f18bc0b9f409f85d5afc16c20 Mon Sep 17 00:00:00 2001 From: dhyces <10985914+dhyces@users.noreply.github.com> Date: Sat, 1 Jun 2024 02:28:59 -0700 Subject: [PATCH] Update neo test mod --- .../item_model_overrides/adamantium_boots.json | 8 ++++++++ .../adamantium_chestplate.json | 8 ++++++++ .../adamantium_helmet.json | 8 ++++++++ .../adamantium_leggings.json | 8 ++++++++ .../trim_material_overrides/adamantium.json | 5 +++++ .../trim_overlays/adamantium_armor.json | 8 ++++++++ .../model_generators/adamantium_armor.json | 6 ++++++ .../darker_material_suffixes.json | 5 +++++ .../texture/trim_material_overrides.json | 6 ++++++ .../maps/trimmed/texture/trim_overlays.json | 6 ++++++ .../data/testmod/trim_material/adamantium.json | 5 ++++- .../testmod/client/TestClientMapKeys.java | 16 ++++++++++------ .../dev/dhyces/testmod/data/TestDatagen.java | 7 +++++-- .../dhyces/testmod/data/TestModelProvider.java | 5 +++-- .../data/trimmed/TestClientMapProvider.java | 14 ++++++++++++++ .../data/trimmed/TestItemOverrideProvider.java | 4 ++++ .../data/trimmed/TestModelSourceProvider.java | 18 ++++++++++++++++++ .../testmod/registry/ModArmorMaterials.java | 2 +- 18 files changed, 127 insertions(+), 12 deletions(-) create mode 100644 testmods/neo/src/generated/resources/assets/testmod/trimmed/item_model_overrides/adamantium_boots.json create mode 100644 testmods/neo/src/generated/resources/assets/testmod/trimmed/item_model_overrides/adamantium_chestplate.json create mode 100644 testmods/neo/src/generated/resources/assets/testmod/trimmed/item_model_overrides/adamantium_helmet.json create mode 100644 testmods/neo/src/generated/resources/assets/testmod/trimmed/item_model_overrides/adamantium_leggings.json create mode 100644 testmods/neo/src/generated/resources/assets/testmod/trimmed/maps/trimmed/texture/trim_material_overrides/adamantium.json create mode 100644 testmods/neo/src/generated/resources/assets/testmod/trimmed/maps/trimmed/texture/trim_overlays/adamantium_armor.json create mode 100644 testmods/neo/src/generated/resources/assets/testmod/trimmed/model_generators/adamantium_armor.json create mode 100644 testmods/neo/src/generated/resources/assets/trimmed/trimmed/maps/trimmed/texture/material_suffixes/darker_material_suffixes.json create mode 100644 testmods/neo/src/generated/resources/assets/trimmed/trimmed/maps/trimmed/texture/trim_material_overrides.json create mode 100644 testmods/neo/src/generated/resources/assets/trimmed/trimmed/maps/trimmed/texture/trim_overlays.json create mode 100644 testmods/neo/src/main/java/dev/dhyces/testmod/data/trimmed/TestModelSourceProvider.java diff --git a/testmods/neo/src/generated/resources/assets/testmod/trimmed/item_model_overrides/adamantium_boots.json b/testmods/neo/src/generated/resources/assets/testmod/trimmed/item_model_overrides/adamantium_boots.json new file mode 100644 index 00000000..868a4e87 --- /dev/null +++ b/testmods/neo/src/generated/resources/assets/testmod/trimmed/item_model_overrides/adamantium_boots.json @@ -0,0 +1,8 @@ +{ + "values": [ + { + "type": "trimmed:any_trim", + "model_id_template": "testmod:item/adamantium_boots_${material_suffix}_trim" + } + ] +} \ No newline at end of file diff --git a/testmods/neo/src/generated/resources/assets/testmod/trimmed/item_model_overrides/adamantium_chestplate.json b/testmods/neo/src/generated/resources/assets/testmod/trimmed/item_model_overrides/adamantium_chestplate.json new file mode 100644 index 00000000..e56d4639 --- /dev/null +++ b/testmods/neo/src/generated/resources/assets/testmod/trimmed/item_model_overrides/adamantium_chestplate.json @@ -0,0 +1,8 @@ +{ + "values": [ + { + "type": "trimmed:any_trim", + "model_id_template": "testmod:item/adamantium_chestplate_${material_suffix}_trim" + } + ] +} \ No newline at end of file diff --git a/testmods/neo/src/generated/resources/assets/testmod/trimmed/item_model_overrides/adamantium_helmet.json b/testmods/neo/src/generated/resources/assets/testmod/trimmed/item_model_overrides/adamantium_helmet.json new file mode 100644 index 00000000..1b98bdc6 --- /dev/null +++ b/testmods/neo/src/generated/resources/assets/testmod/trimmed/item_model_overrides/adamantium_helmet.json @@ -0,0 +1,8 @@ +{ + "values": [ + { + "type": "trimmed:any_trim", + "model_id_template": "testmod:item/adamantium_helmet_${material_suffix}_trim" + } + ] +} \ No newline at end of file diff --git a/testmods/neo/src/generated/resources/assets/testmod/trimmed/item_model_overrides/adamantium_leggings.json b/testmods/neo/src/generated/resources/assets/testmod/trimmed/item_model_overrides/adamantium_leggings.json new file mode 100644 index 00000000..6371856f --- /dev/null +++ b/testmods/neo/src/generated/resources/assets/testmod/trimmed/item_model_overrides/adamantium_leggings.json @@ -0,0 +1,8 @@ +{ + "values": [ + { + "type": "trimmed:any_trim", + "model_id_template": "testmod:item/adamantium_leggings_${material_suffix}_trim" + } + ] +} \ No newline at end of file diff --git a/testmods/neo/src/generated/resources/assets/testmod/trimmed/maps/trimmed/texture/trim_material_overrides/adamantium.json b/testmods/neo/src/generated/resources/assets/testmod/trimmed/maps/trimmed/texture/trim_material_overrides/adamantium.json new file mode 100644 index 00000000..0fce1158 --- /dev/null +++ b/testmods/neo/src/generated/resources/assets/testmod/trimmed/maps/trimmed/texture/trim_material_overrides/adamantium.json @@ -0,0 +1,5 @@ +{ + "values": { + "testmod:trims/color_palettes/adamantium": "testmod:trims/color_palettes/adamantium_darker" + } +} \ No newline at end of file diff --git a/testmods/neo/src/generated/resources/assets/testmod/trimmed/maps/trimmed/texture/trim_overlays/adamantium_armor.json b/testmods/neo/src/generated/resources/assets/testmod/trimmed/maps/trimmed/texture/trim_overlays/adamantium_armor.json new file mode 100644 index 00000000..aaf25b6c --- /dev/null +++ b/testmods/neo/src/generated/resources/assets/testmod/trimmed/maps/trimmed/texture/trim_overlays/adamantium_armor.json @@ -0,0 +1,8 @@ +{ + "values": { + "testmod:item/adamantium_boots": "minecraft:trims/items/boots_trim", + "testmod:item/adamantium_chestplate": "minecraft:trims/items/chestplate_trim", + "testmod:item/adamantium_helmet": "minecraft:trims/items/helmet_trim", + "testmod:item/adamantium_leggings": "minecraft:trims/items/leggings_trim" + } +} \ No newline at end of file diff --git a/testmods/neo/src/generated/resources/assets/testmod/trimmed/model_generators/adamantium_armor.json b/testmods/neo/src/generated/resources/assets/testmod/trimmed/model_generators/adamantium_armor.json new file mode 100644 index 00000000..e6db7b0d --- /dev/null +++ b/testmods/neo/src/generated/resources/assets/testmod/trimmed/model_generators/adamantium_armor.json @@ -0,0 +1,6 @@ +{ + "type": "trimmed:trims", + "override_textures": "testmod:trim_material_overrides/adamantium", + "template": "trimmed:item/two_layer_trim", + "textures": "testmod:trim_overlays/adamantium_armor" +} \ No newline at end of file diff --git a/testmods/neo/src/generated/resources/assets/trimmed/trimmed/maps/trimmed/texture/material_suffixes/darker_material_suffixes.json b/testmods/neo/src/generated/resources/assets/trimmed/trimmed/maps/trimmed/texture/material_suffixes/darker_material_suffixes.json new file mode 100644 index 00000000..f225c76b --- /dev/null +++ b/testmods/neo/src/generated/resources/assets/trimmed/trimmed/maps/trimmed/texture/material_suffixes/darker_material_suffixes.json @@ -0,0 +1,5 @@ +{ + "values": { + "testmod:trims/color_palettes/adamantium_darker": "testmod_adamantium_darker" + } +} \ No newline at end of file diff --git a/testmods/neo/src/generated/resources/assets/trimmed/trimmed/maps/trimmed/texture/trim_material_overrides.json b/testmods/neo/src/generated/resources/assets/trimmed/trimmed/maps/trimmed/texture/trim_material_overrides.json new file mode 100644 index 00000000..07c51533 --- /dev/null +++ b/testmods/neo/src/generated/resources/assets/trimmed/trimmed/maps/trimmed/texture/trim_material_overrides.json @@ -0,0 +1,6 @@ +{ + "append": [ + "testmod:adamantium" + ], + "values": {} +} \ No newline at end of file diff --git a/testmods/neo/src/generated/resources/assets/trimmed/trimmed/maps/trimmed/texture/trim_overlays.json b/testmods/neo/src/generated/resources/assets/trimmed/trimmed/maps/trimmed/texture/trim_overlays.json new file mode 100644 index 00000000..f9671755 --- /dev/null +++ b/testmods/neo/src/generated/resources/assets/trimmed/trimmed/maps/trimmed/texture/trim_overlays.json @@ -0,0 +1,6 @@ +{ + "append": [ + "testmod:adamantium_armor" + ], + "values": {} +} \ No newline at end of file diff --git a/testmods/neo/src/generated/resources/data/testmod/trim_material/adamantium.json b/testmods/neo/src/generated/resources/data/testmod/trim_material/adamantium.json index c46d62a3..2be7cfae 100644 --- a/testmods/neo/src/generated/resources/data/testmod/trim_material/adamantium.json +++ b/testmods/neo/src/generated/resources/data/testmod/trim_material/adamantium.json @@ -5,5 +5,8 @@ "translate": "trim_pattern.testmod.adamantium" }, "ingredient": "testmod:adamantium", - "item_model_index": -1.0 + "item_model_index": -1.0, + "override_armor_materials": { + "testmod:adamantium": "testmod_adamantium_darker" + } } \ No newline at end of file diff --git a/testmods/neo/src/main/java/dev/dhyces/testmod/client/TestClientMapKeys.java b/testmods/neo/src/main/java/dev/dhyces/testmod/client/TestClientMapKeys.java index cadf8607..a3a487a6 100644 --- a/testmods/neo/src/main/java/dev/dhyces/testmod/client/TestClientMapKeys.java +++ b/testmods/neo/src/main/java/dev/dhyces/testmod/client/TestClientMapKeys.java @@ -1,6 +1,8 @@ package dev.dhyces.testmod.client; import dev.dhyces.testmod.TrimmedTest; +import dev.dhyces.trimmed.api.client.map.ClientMapKeys; +import dev.dhyces.trimmed.api.client.map.ClientMapTypes; import dev.dhyces.trimmed.api.maps.MapKey; import dev.dhyces.trimmed.impl.client.maps.KeyResolvers; import net.minecraft.resources.ResourceLocation; @@ -10,15 +12,17 @@ public class TestClientMapKeys { // MANUAL - public static final MapKey MANUAL_TEST_MAP = MapKey.of(TestClientMapTypes.CLIENT_RESOLVER_TEST, TrimmedTest.id("test_map")); - public static final MapKey MANUAL_SCANNER_DESCS = MapKey.of(TestClientMapTypes.SCANNER_DESCRIPTORS, TrimmedTest.id("scanner_descriptors")); - public static final MapKey MANUAL_TEST_ITEM_MAP = MapKey.of(TestClientMapTypes.ITEM_TEST, TrimmedTest.id("checked_item_map")); + public static final MapKey MANUAL_TEST_MAP = MapKey.baseKeyOf(TestClientMapTypes.CLIENT_RESOLVER_TEST, TrimmedTest.id("test_map")); + public static final MapKey MANUAL_SCANNER_DESCS = MapKey.baseKeyOf(TestClientMapTypes.SCANNER_DESCRIPTORS, TrimmedTest.id("scanner_descriptors")); + public static final MapKey MANUAL_TEST_ITEM_MAP = MapKey.baseKeyOf(TestClientMapTypes.ITEM_TEST, TrimmedTest.id("checked_item_map")); // public static final MapKey MANUAL_TEST_BIOME_MAP = MapKey.of(TestClientMapTypes.BIOME_TEST, TrimmedTest.id("checked_biome_map")); // DATAGENNED - public static final MapKey DATAGEN_TEST_MAP_2 = MapKey.of(TestClientMapTypes.CLIENT_RESOLVER_TEST, TrimmedTest.id("test_map_2")); - public static final MapKey DATAGEN_TEST_BLOCK_MAP = MapKey.of(TestClientMapTypes.BLOCK_TEST, TrimmedTest.id("registry_block_map")); - public static final MapKey, EntityType> DATAGEN_ENTITY_TRANSFORM = MapKey.of(TestClientMapTypes.ENTITY_CONVERSION, TrimmedTest.id("entity_transform")); + public static final MapKey ADAMANTIUM_ARMOR = ClientMapKeys.TRIM_OVERLAYS.makeSubKey(TrimmedTest.id("adamantium_armor")); + public static final MapKey ADAMANTIUM_MATERIAL_OVERRIDES = ClientMapKeys.TRIM_MATERIAL_OVERRIDES.makeSubKey(TrimmedTest.id("adamantium")); + public static final MapKey DATAGEN_TEST_MAP_2 = MapKey.baseKeyOf(TestClientMapTypes.CLIENT_RESOLVER_TEST, TrimmedTest.id("test_map_2")); + public static final MapKey DATAGEN_TEST_BLOCK_MAP = MapKey.baseKeyOf(TestClientMapTypes.BLOCK_TEST, TrimmedTest.id("registry_block_map")); + public static final MapKey, EntityType> DATAGEN_ENTITY_TRANSFORM = MapKey.baseKeyOf(TestClientMapTypes.ENTITY_CONVERSION, TrimmedTest.id("entity_transform")); // public static final ClientRegistryMapKey DATAGEN_TEST_DAMAGE_TYPE_MAP = ClientRegistryMapKey.of(Registries.DAMAGE_TYPE, TrimmedTest.id("datapacked_damage_type_map")); } diff --git a/testmods/neo/src/main/java/dev/dhyces/testmod/data/TestDatagen.java b/testmods/neo/src/main/java/dev/dhyces/testmod/data/TestDatagen.java index ae129342..5a43385f 100644 --- a/testmods/neo/src/main/java/dev/dhyces/testmod/data/TestDatagen.java +++ b/testmods/neo/src/main/java/dev/dhyces/testmod/data/TestDatagen.java @@ -1,5 +1,7 @@ package dev.dhyces.testmod.data; +import dev.dhyces.testmod.data.trimmed.TestModelSourceProvider; +import dev.dhyces.testmod.registry.ModArmorMaterials; import dev.dhyces.testmod.registry.ModItems; import dev.dhyces.testmod.ModTrimMaterials; import dev.dhyces.testmod.ModTrimPatterns; @@ -47,15 +49,16 @@ protected void addTranslations() {} .makeMaterial(ModTrimMaterials.SHELL, Items.NAUTILUS_SHELL, 0xD17E7E) .makeMaterial(ModTrimMaterials.PRISMARINE, Items.PRISMARINE_CRYSTALS, 0xB2D5C8) .makeMaterial(ModTrimMaterials.GLOW, Items.GLOW_INK_SAC, 0x7EFCBE) - .makeMaterial(ModTrimMaterials.ADAMANTIUM, ModItems.ADAMANTIUM.asItem(), 0x9d2638) + .makeMaterial(ModTrimMaterials.ADAMANTIUM, ModItems.ADAMANTIUM.asItem(), 0x9d2638, materialConfig -> materialConfig.armorOverride(ModArmorMaterials.ADAMANTIUM, "testmod_adamantium_darker")) .makePattern(ModTrimPatterns.SPIRAL, ModItems.SPIRAL_PATTERN.asItem(), false, patternConfig -> patternConfig.createCopyRecipe(Items.NAUTILUS_SHELL)); // new TestTrimDatagenSuite(event, TrimmedTest.MODID, langProvider::add); generator.addProvider(event.includeClient(), langProvider); - generator.addProvider(event.includeClient(), new TestModelProvider(packOutput, TrimmedTest.MODID, event.getExistingFileHelper())); + generator.addProvider(event.includeClient(), new TestModelProvider(packOutput, event.getExistingFileHelper())); generator.addProvider(event.includeClient(), new TestItemOverrideProvider(packOutput)); + generator.addProvider(event.includeClient(), new TestModelSourceProvider(packOutput, event.getExistingFileHelper())); generator.addProvider(event.includeClient(), new TestClientTagProvider(packOutput, event.getExistingFileHelper())); generator.addProvider(event.includeClient(), new TestClientItemTagProvider(packOutput, lookupProvider, event.getExistingFileHelper())); generator.addProvider(event.includeClient(), new TestClientCustomObjTagProvider(packOutput, lookupProvider, event.getExistingFileHelper())); diff --git a/testmods/neo/src/main/java/dev/dhyces/testmod/data/TestModelProvider.java b/testmods/neo/src/main/java/dev/dhyces/testmod/data/TestModelProvider.java index d560b3fc..204ba228 100644 --- a/testmods/neo/src/main/java/dev/dhyces/testmod/data/TestModelProvider.java +++ b/testmods/neo/src/main/java/dev/dhyces/testmod/data/TestModelProvider.java @@ -1,13 +1,14 @@ package dev.dhyces.testmod.data; +import dev.dhyces.testmod.TrimmedTest; import dev.dhyces.testmod.registry.ModItems; import net.minecraft.data.PackOutput; import net.neoforged.neoforge.client.model.generators.ItemModelProvider; import net.neoforged.neoforge.common.data.ExistingFileHelper; public class TestModelProvider extends ItemModelProvider { - public TestModelProvider(PackOutput output, String modid, ExistingFileHelper existingFileHelper) { - super(output, modid, existingFileHelper); + public TestModelProvider(PackOutput output, ExistingFileHelper existingFileHelper) { + super(output, TrimmedTest.MODID, existingFileHelper); } @Override diff --git a/testmods/neo/src/main/java/dev/dhyces/testmod/data/trimmed/TestClientMapProvider.java b/testmods/neo/src/main/java/dev/dhyces/testmod/data/trimmed/TestClientMapProvider.java index 9b0caa68..1ab54d49 100644 --- a/testmods/neo/src/main/java/dev/dhyces/testmod/data/trimmed/TestClientMapProvider.java +++ b/testmods/neo/src/main/java/dev/dhyces/testmod/data/trimmed/TestClientMapProvider.java @@ -3,6 +3,7 @@ import dev.dhyces.testmod.TrimmedTest; import dev.dhyces.testmod.client.TestClientKeyResolvers; import dev.dhyces.testmod.client.TestClientMapKeys; +import dev.dhyces.trimmed.api.client.map.ClientMapKeys; import dev.dhyces.trimmed.api.data.map.ClientMapDataProvider; import net.minecraft.data.PackOutput; import net.minecraft.resources.ResourceLocation; @@ -16,5 +17,18 @@ public TestClientMapProvider(PackOutput packOutput, ExistingFileHelper existingF @Override protected void addMaps() { map(TestClientMapKeys.DATAGEN_TEST_MAP_2).put(TrimmedTest.id("some/kind/of/key"), "aValue"); + map(TestClientMapKeys.ADAMANTIUM_ARMOR) + .put(TrimmedTest.id("item/adamantium_helmet"), new ResourceLocation("trims/items/helmet_trim")) + .put(TrimmedTest.id("item/adamantium_chestplate"), new ResourceLocation("trims/items/chestplate_trim")) + .put(TrimmedTest.id("item/adamantium_leggings"), new ResourceLocation("trims/items/leggings_trim")) + .put(TrimmedTest.id("item/adamantium_boots"), new ResourceLocation("trims/items/boots_trim")); + map(ClientMapKeys.TRIM_OVERLAYS) + .append(TestClientMapKeys.ADAMANTIUM_ARMOR); + map(TestClientMapKeys.ADAMANTIUM_MATERIAL_OVERRIDES) + .put(TrimmedTest.id("trims/color_palettes/adamantium"), TrimmedTest.id("trims/color_palettes/adamantium_darker")); + map(ClientMapKeys.TRIM_MATERIAL_OVERRIDES) + .append(TestClientMapKeys.ADAMANTIUM_MATERIAL_OVERRIDES); + map(ClientMapKeys.DARKER_MATERIAL_SUFFIXES) + .put(TrimmedTest.id("trims/color_palettes/adamantium_darker"), "testmod_adamantium_darker"); } } diff --git a/testmods/neo/src/main/java/dev/dhyces/testmod/data/trimmed/TestItemOverrideProvider.java b/testmods/neo/src/main/java/dev/dhyces/testmod/data/trimmed/TestItemOverrideProvider.java index 5f81d0f3..e3d40461 100644 --- a/testmods/neo/src/main/java/dev/dhyces/testmod/data/trimmed/TestItemOverrideProvider.java +++ b/testmods/neo/src/main/java/dev/dhyces/testmod/data/trimmed/TestItemOverrideProvider.java @@ -2,6 +2,7 @@ import dev.dhyces.testmod.TrimmedTest; import dev.dhyces.testmod.client.providers.BlockStateItemOverrideProvider; +import dev.dhyces.testmod.registry.ModItems; import dev.dhyces.trimmed.api.data.ItemOverrideDataProvider; import net.minecraft.client.resources.model.ModelResourceLocation; import net.minecraft.core.component.DataComponents; @@ -20,5 +21,8 @@ public TestItemOverrideProvider(PackOutput output) { protected void addItemOverrides() { addComponentOverride(Blocks.GRASS_BLOCK, builder -> builder.set(DataComponents.BLOCK_STATE, BlockItemStateProperties.EMPTY.with(GrassBlock.SNOWY, true)), new ModelResourceLocation("minecraft", "grass_block", "snowy=true")); addItemOverrides(Blocks.BAMBOO_STAIRS, new BlockStateItemOverrideProvider()); + anyTrimBuilder(new ArmorSet(ModItems.ADAMANTIUM_HELMET, ModItems.ADAMANTIUM_CHESTPLATE, ModItems.ADAMANTIUM_LEGGINGS, ModItems.ADAMANTIUM_BOOTS)) + .defaultTemplate() + .end(); } } diff --git a/testmods/neo/src/main/java/dev/dhyces/testmod/data/trimmed/TestModelSourceProvider.java b/testmods/neo/src/main/java/dev/dhyces/testmod/data/trimmed/TestModelSourceProvider.java new file mode 100644 index 00000000..24c3baca --- /dev/null +++ b/testmods/neo/src/main/java/dev/dhyces/testmod/data/trimmed/TestModelSourceProvider.java @@ -0,0 +1,18 @@ +package dev.dhyces.testmod.data.trimmed; + +import dev.dhyces.testmod.TrimmedTest; +import dev.dhyces.testmod.registry.ModArmorMaterials; +import dev.dhyces.trimmed.api.data.model.source.ModelSourceDataProvider; +import net.minecraft.data.PackOutput; +import net.neoforged.neoforge.common.data.ExistingFileHelper; + +public class TestModelSourceProvider extends ModelSourceDataProvider { + public TestModelSourceProvider(PackOutput packOutput, ExistingFileHelper existingFileHelper) { + super(packOutput, TrimmedTest.MODID, existingFileHelper); + } + + @Override + protected void addModelSources() { + addTwoLayerTrimsSource(ModArmorMaterials.ADAMANTIUM.value()); + } +} diff --git a/testmods/neo/src/main/java/dev/dhyces/testmod/registry/ModArmorMaterials.java b/testmods/neo/src/main/java/dev/dhyces/testmod/registry/ModArmorMaterials.java index ebbdbcf1..50e63ca0 100644 --- a/testmods/neo/src/main/java/dev/dhyces/testmod/registry/ModArmorMaterials.java +++ b/testmods/neo/src/main/java/dev/dhyces/testmod/registry/ModArmorMaterials.java @@ -17,6 +17,6 @@ public class ModArmorMaterials { public static final Holder ADAMANTIUM = REGISTER.register("adamantium", () -> new ArmorMaterial( Util.make(new Object2IntOpenHashMap<>(), map -> map.defaultReturnValue(4)), - 2, SoundEvents.ARMOR_EQUIP_DIAMOND, () -> Ingredient.of(ModItems.ADAMANTIUM.get()), List.of(), 3, 5 + 2, SoundEvents.ARMOR_EQUIP_DIAMOND, () -> Ingredient.of(ModItems.ADAMANTIUM.get()), List.of(new ArmorMaterial.Layer(TrimmedTest.id("adamantium"))), 3, 5 )); }