From e930cd193192dbf368beba40b53990c12ddb0ea1 Mon Sep 17 00:00:00 2001 From: brnbrd Date: Thu, 26 Sep 2024 16:05:12 -0700 Subject: [PATCH] Initial pearl armor trim material --- .editorconfig | 10 ++++ .../103d9f3f36b01595f1aa5172191e60eff02e6924 | 2 + .../2e975a526352ade1ad4fb90b352cd5fb8d2e73d8 | 3 +- .../4d9bdf6f3a0c6e917590cb2a69ac26c5a7d7ed8e | 2 +- .../59eb3dbb5f86130e09b3c62d89b9525ee01cf52d | 2 +- .../9bf8104d8e3a11f81440eb1852d0ecce8871456e | 2 +- .../9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e | 2 +- .../b126f8ac5dcbc64ddca16855f1a05200758ac108 | 2 +- .../c5fd7cc2a72bfa43784da084dc700dcde7db9bc3 | 2 +- .../c622617f6fabf890a00b9275cd5f643584a8a2c8 | 4 +- .../cc4167302f34ab27f1cddc28e41e05620e830393 | 2 +- .../fbd245114a09f38b156d9da7e5324fd159bd1a13 | 2 +- .../assets/collectorsreap/lang/en_us.json | 3 +- .../collectorsreap/trim_material/pearl.json | 9 ++++ .../minecraft/tags/items/trim_materials.json | 5 ++ .../common/item/CRTrimMaterials.java | 29 +++++++++++ .../collectorsreap/data/CRRegistries.java | 20 ++++++++ .../data/gen/CRItemTagProvider.java | 2 + .../data/gen/CRLanguageProvider.java | 1 + .../collectorsreap/data/gen/Generators.java | 6 ++- .../assets/collectorsreap/lang/es_es.json | 3 +- .../assets/collectorsreap/lang/es_mx.json | 3 +- .../assets/collectorsreap/lang/ja_jp.json | 3 +- .../assets/collectorsreap/lang/ko_kr.json | 3 +- .../assets/collectorsreap/lang/ru_ru.json | 3 +- .../assets/collectorsreap/lang/uk_ua.json | 3 +- .../assets/collectorsreap/lang/vi_vn.json | 3 +- .../assets/collectorsreap/lang/zh_cn.json | 3 +- .../textures/trims/color_palettes/pearl.png | Bin 0 -> 119 bytes .../assets/minecraft/atlases/armor_trims.json | 45 ++++++++++++++++++ update.json | 2 +- 31 files changed, 159 insertions(+), 22 deletions(-) create mode 100644 .editorconfig create mode 100644 src/generated/resources/.cache/103d9f3f36b01595f1aa5172191e60eff02e6924 create mode 100644 src/generated/resources/data/collectorsreap/trim_material/pearl.json create mode 100644 src/generated/resources/data/minecraft/tags/items/trim_materials.json create mode 100644 src/main/java/net/brdle/collectorsreap/common/item/CRTrimMaterials.java create mode 100644 src/main/java/net/brdle/collectorsreap/data/CRRegistries.java create mode 100644 src/main/resources/assets/collectorsreap/textures/trims/color_palettes/pearl.png create mode 100644 src/main/resources/assets/minecraft/atlases/armor_trims.json diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 00000000..71b29350 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,10 @@ +root = true + +[*] +trim_trailing_whitespace = true +indent_style = tab +charset = utf-8 + +[*.json] +indent_style = space +indent_size = 2 \ No newline at end of file diff --git a/src/generated/resources/.cache/103d9f3f36b01595f1aa5172191e60eff02e6924 b/src/generated/resources/.cache/103d9f3f36b01595f1aa5172191e60eff02e6924 new file mode 100644 index 00000000..a072eb50 --- /dev/null +++ b/src/generated/resources/.cache/103d9f3f36b01595f1aa5172191e60eff02e6924 @@ -0,0 +1,2 @@ +// 1.20.1 2024-09-26T16:03:32.4885541 Registries +651bae8e70e104c165df481284c6d470552634a3 data/collectorsreap/trim_material/pearl.json diff --git a/src/generated/resources/.cache/2e975a526352ade1ad4fb90b352cd5fb8d2e73d8 b/src/generated/resources/.cache/2e975a526352ade1ad4fb90b352cd5fb8d2e73d8 index e4892063..73e88b9e 100644 --- a/src/generated/resources/.cache/2e975a526352ade1ad4fb90b352cd5fb8d2e73d8 +++ b/src/generated/resources/.cache/2e975a526352ade1ad4fb90b352cd5fb8d2e73d8 @@ -1,4 +1,4 @@ -// 1.20.1 2024-09-25T08:53:46.9087565 Tags for minecraft:item mod id collectorsreap +// 1.20.1 2024-09-26T15:26:29.3472308 Tags for minecraft:item mod id collectorsreap ae7e08f92dd075f34544c04d30c8a274b27bd792 data/atmospheric/tags/items/aloe_leaves.json b1c02044b6eb4060b19a0ed4f40cbeaca19822c9 data/atmospheric/tags/items/passion_fruit.json a740abeb613a7024a35910efe912a50a6ee62045 data/atmospheric/tags/items/yucca_fruit.json @@ -38,6 +38,7 @@ e6d2989abc0c43896cdeb48a0dd883c7342c8f1c data/forge/tags/items/tea_leaves/green. 9aa06359ea3eada70b33c83e1ffa8fac6e76c216 data/minecraft/tags/items/fishes.json 461e5b7194fed599f65c8db456e0e887d9bf8e06 data/minecraft/tags/items/slabs.json 9c66ee8eeb0c17ffabd4bed3839f9fead6387d5b data/minecraft/tags/items/stairs.json +e5ffb0c75e97537674ebc22513bfc35356fc0fce data/minecraft/tags/items/trim_materials.json 7d41522df67a59e91f4c46fc5b09bdd8baf8eff7 data/minecraft/tags/items/walls.json 731ca67ac60192e9e45681303589c863b7d3ef83 data/neapolitan/tags/items/banana.json 25093b4c17b8b5f98c63dc3e27ae9a68bd9d68a8 data/neapolitan/tags/items/chocolate_bar.json diff --git a/src/generated/resources/.cache/4d9bdf6f3a0c6e917590cb2a69ac26c5a7d7ed8e b/src/generated/resources/.cache/4d9bdf6f3a0c6e917590cb2a69ac26c5a7d7ed8e index d20dad5c..797d7595 100644 --- a/src/generated/resources/.cache/4d9bdf6f3a0c6e917590cb2a69ac26c5a7d7ed8e +++ b/src/generated/resources/.cache/4d9bdf6f3a0c6e917590cb2a69ac26c5a7d7ed8e @@ -1,4 +1,4 @@ -// 1.20.1 2024-09-22T03:16:22.9196187 Block States: collectorsreap +// 1.20.1 2024-09-26T15:26:29.3342198 Block States: collectorsreap e674cff0fcbb19f9b0afff4f1e477315d0cae326 assets/collectorsreap/blockstates/black_candle_lime_cake.json 8dfd84c574e9c7ee59198b0943b5aac0e8b28740 assets/collectorsreap/blockstates/black_candle_pomegranate_cake.json 6d6114f63bd694ebbf674057ebd45184487bbaf1 assets/collectorsreap/blockstates/blue_candle_lime_cake.json diff --git a/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d b/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d index ab7e0f83..6bcc5530 100644 --- a/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d +++ b/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d @@ -1,4 +1,4 @@ -// 1.20.1 2024-09-22T03:16:22.9256235 Loot Tables +// 1.20.1 2024-09-26T15:26:29.3402251 Loot Tables f4a3c88fc95a893f684db7cc68e3f910e18b85fe data/collectorsreap/loot_tables/blocks/black_candle_lime_cake.json d1c4a614122d59c6e0b808daecf41bda624609db data/collectorsreap/loot_tables/blocks/black_candle_pomegranate_cake.json f88a0ece599f6eb71b969a4b3262f221540435a9 data/collectorsreap/loot_tables/blocks/blue_candle_lime_cake.json diff --git a/src/generated/resources/.cache/9bf8104d8e3a11f81440eb1852d0ecce8871456e b/src/generated/resources/.cache/9bf8104d8e3a11f81440eb1852d0ecce8871456e index bab5a0e5..271c5855 100644 --- a/src/generated/resources/.cache/9bf8104d8e3a11f81440eb1852d0ecce8871456e +++ b/src/generated/resources/.cache/9bf8104d8e3a11f81440eb1852d0ecce8871456e @@ -1,4 +1,4 @@ -// 1.20.1 2024-09-22T03:16:22.9296279 Tags for minecraft:worldgen/biome mod id collectorsreap +// 1.20.1 2024-09-26T15:26:29.3462306 Tags for minecraft:worldgen/biome mod id collectorsreap 5caa141a3a5eff8ee89b5e2092eac7253dd52f57 data/collectorsreap/tags/worldgen/biome/has_spawn/chieftain_crab.json 74a855e481dd684fc14e843ffbf7634328669190 data/collectorsreap/tags/worldgen/biome/has_spawn/clam.json 4301fee991060a44225e5c74bedfd95e386538e1 data/collectorsreap/tags/worldgen/biome/has_spawn/lime.json diff --git a/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e b/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e index a4f388cc..d1743b0f 100644 --- a/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e +++ b/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e @@ -1,4 +1,4 @@ -// 1.20.1 2024-09-22T03:16:22.9266246 Recipes +// 1.20.1 2024-09-26T15:26:29.3422267 Recipes 6bed5b7d715399840f10473875efca57540c42e3 data/collectorsreap/advancements/recipes/chiseled_urchin_test_bricks.json ffff41205e9b83cc8ab9d38ce39c06fa7e8f6ae7 data/collectorsreap/advancements/recipes/cutting/chieftain_claw.json 51d613fd6d246740518e1ed57afea6e6deea518e data/collectorsreap/advancements/recipes/cutting/chieftain_crab.json diff --git a/src/generated/resources/.cache/b126f8ac5dcbc64ddca16855f1a05200758ac108 b/src/generated/resources/.cache/b126f8ac5dcbc64ddca16855f1a05200758ac108 index bc4a827e..cacc11ef 100644 --- a/src/generated/resources/.cache/b126f8ac5dcbc64ddca16855f1a05200758ac108 +++ b/src/generated/resources/.cache/b126f8ac5dcbc64ddca16855f1a05200758ac108 @@ -1,4 +1,4 @@ -// 1.20.1 2024-09-22T03:16:22.9266246 Global Loot Modifiers : collectorsreap +// 1.20.1 2024-09-26T15:26:29.3412262 Global Loot Modifiers : collectorsreap 48ba606dd1af587f71212a0501539edb8b011f1e data/collectorsreap/loot_modifiers/cr_fishing.json fc90485601f70b14ac274d5d5179aa07d47b040f data/collectorsreap/loot_modifiers/lime_in_abandoned_mineshaft.json 753e8d670c790ed4fa156b208d70e62856229cf5 data/collectorsreap/loot_modifiers/lime_seeds_in_dungeon.json diff --git a/src/generated/resources/.cache/c5fd7cc2a72bfa43784da084dc700dcde7db9bc3 b/src/generated/resources/.cache/c5fd7cc2a72bfa43784da084dc700dcde7db9bc3 index 270581c4..671ec456 100644 --- a/src/generated/resources/.cache/c5fd7cc2a72bfa43784da084dc700dcde7db9bc3 +++ b/src/generated/resources/.cache/c5fd7cc2a72bfa43784da084dc700dcde7db9bc3 @@ -1,4 +1,4 @@ -// 1.20.1 2024-09-22T03:16:22.9226215 Tags for minecraft:block mod id collectorsreap +// 1.20.1 2024-09-26T15:26:29.3372228 Tags for minecraft:block mod id collectorsreap 748e9338cb0e08e973af854da7e0a45c328db6fb data/autumnity/tags/blocks/snail_snacks.json 69bfc567eebda2cc6321f420e07d43720e9719f7 data/collectorsreap/tags/blocks/crab_spawnable_on.json 057d34c386714f69ae8324b835cfdb749a33f4c1 data/collectorsreap/tags/blocks/pomegranate_fast_on.json diff --git a/src/generated/resources/.cache/c622617f6fabf890a00b9275cd5f643584a8a2c8 b/src/generated/resources/.cache/c622617f6fabf890a00b9275cd5f643584a8a2c8 index f053ce3b..eb77500d 100644 --- a/src/generated/resources/.cache/c622617f6fabf890a00b9275cd5f643584a8a2c8 +++ b/src/generated/resources/.cache/c622617f6fabf890a00b9275cd5f643584a8a2c8 @@ -1,2 +1,2 @@ -// 1.20.1 2024-09-22T03:16:22.9306283 Languages: en_us -60c48c5d7fed07d88cf6eb45354eb393f1284deb assets/collectorsreap/lang/en_us.json +// 1.20.1 2024-09-26T15:26:29.3462306 Languages: en_us +0cd020b9b831cd70d17561421c698f7165352bc6 assets/collectorsreap/lang/en_us.json diff --git a/src/generated/resources/.cache/cc4167302f34ab27f1cddc28e41e05620e830393 b/src/generated/resources/.cache/cc4167302f34ab27f1cddc28e41e05620e830393 index b78f8b33..538e80c6 100644 --- a/src/generated/resources/.cache/cc4167302f34ab27f1cddc28e41e05620e830393 +++ b/src/generated/resources/.cache/cc4167302f34ab27f1cddc28e41e05620e830393 @@ -1,3 +1,3 @@ -// 1.20.1 2024-09-22T03:16:22.9236226 Tags for minecraft:entity_type mod id collectorsreap +// 1.20.1 2024-09-26T15:26:29.3382234 Tags for minecraft:entity_type mod id collectorsreap ddd907b6cb1b03c93f42247088b1f1fa5a81084f data/collectorsreap/tags/entity_types/involatile.json 01c3f5cebabec10bf259b13ce1d6ce40be8bda20 data/collectorsreap/tags/entity_types/volatility_immune.json diff --git a/src/generated/resources/.cache/fbd245114a09f38b156d9da7e5324fd159bd1a13 b/src/generated/resources/.cache/fbd245114a09f38b156d9da7e5324fd159bd1a13 index 6f45e3b5..4337e75b 100644 --- a/src/generated/resources/.cache/fbd245114a09f38b156d9da7e5324fd159bd1a13 +++ b/src/generated/resources/.cache/fbd245114a09f38b156d9da7e5324fd159bd1a13 @@ -1,4 +1,4 @@ -// 1.20.1 2024-09-22T03:16:22.9236226 Item Models: collectorsreap +// 1.20.1 2024-09-26T15:26:29.3392242 Item Models: collectorsreap b183daae948efe76cbf209119af41701e5b72e95 assets/collectorsreap/models/item/adzuki_gummy.json 56db9a7317e6d5a63c63af71a4011b16c66c00e7 assets/collectorsreap/models/item/aloe_gummy.json b27cb012c75da3137768f12a8074eab65874647a assets/collectorsreap/models/item/apple_gummy.json diff --git a/src/generated/resources/assets/collectorsreap/lang/en_us.json b/src/generated/resources/assets/collectorsreap/lang/en_us.json index 55ca214f..1af990b3 100644 --- a/src/generated/resources/assets/collectorsreap/lang/en_us.json +++ b/src/generated/resources/assets/collectorsreap/lang/en_us.json @@ -197,5 +197,6 @@ "item.collectorsreap.vanilla_gummy": "Vanilla Gummy", "item.collectorsreap.yellow_tea_gummy": "Yellow Tea Gummy", "item.collectorsreap.yucca_gummy": "Yucca Gummy", - "tooltip.requires_modid": "Requires modid:" + "tooltip.requires_modid": "Requires modid:", + "trim_material.collectorsreap.pearl": "Pearl Material" } \ No newline at end of file diff --git a/src/generated/resources/data/collectorsreap/trim_material/pearl.json b/src/generated/resources/data/collectorsreap/trim_material/pearl.json new file mode 100644 index 00000000..cb7b8f81 --- /dev/null +++ b/src/generated/resources/data/collectorsreap/trim_material/pearl.json @@ -0,0 +1,9 @@ +{ + "asset_name": "pearl", + "description": { + "color": "#EFCBEC", + "translate": "trim_material.collectorsreap.pearl" + }, + "ingredient": "collectorsreap:shimmering_pearl", + "item_model_index": 0.2 +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/items/trim_materials.json b/src/generated/resources/data/minecraft/tags/items/trim_materials.json new file mode 100644 index 00000000..d96afbfe --- /dev/null +++ b/src/generated/resources/data/minecraft/tags/items/trim_materials.json @@ -0,0 +1,5 @@ +{ + "values": [ + "collectorsreap:shimmering_pearl" + ] +} \ No newline at end of file diff --git a/src/main/java/net/brdle/collectorsreap/common/item/CRTrimMaterials.java b/src/main/java/net/brdle/collectorsreap/common/item/CRTrimMaterials.java new file mode 100644 index 00000000..178e7d3f --- /dev/null +++ b/src/main/java/net/brdle/collectorsreap/common/item/CRTrimMaterials.java @@ -0,0 +1,29 @@ +package net.brdle.collectorsreap.common.item; + +import net.brdle.collectorsreap.Util; +import net.minecraft.core.registries.Registries; +import net.minecraft.data.worldgen.BootstapContext; +import net.minecraft.network.chat.Component; +import net.minecraft.network.chat.Style; +import net.minecraft.resources.ResourceKey; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.armortrim.TrimMaterial; +import net.minecraftforge.registries.RegistryObject; +import java.util.Map; + +public class CRTrimMaterials { + public static final ResourceKey PEARL = register("pearl"); + + private static ResourceKey register(final String name) { + return ResourceKey.create(Registries.TRIM_MATERIAL, Util.cr(name)); + } + + public static void bootstrap(BootstapContext context) { + register(context, PEARL, CRItems.SHIMMERING_PEARL, Style.EMPTY.withColor(15715308), 0.2F); + } + + private static void register(BootstapContext context, ResourceKey trimKey, RegistryObject trimItem, Style color, float itemModelIndex) { + TrimMaterial material = new TrimMaterial(trimKey.location().getPath(), trimItem.getHolder().get(), itemModelIndex, Map.of(), Component.translatable("trim_material." + trimKey.location().toLanguageKey()).withStyle(color)); + context.register(trimKey, material); + } +} diff --git a/src/main/java/net/brdle/collectorsreap/data/CRRegistries.java b/src/main/java/net/brdle/collectorsreap/data/CRRegistries.java new file mode 100644 index 00000000..8e4066e6 --- /dev/null +++ b/src/main/java/net/brdle/collectorsreap/data/CRRegistries.java @@ -0,0 +1,20 @@ +package net.brdle.collectorsreap.data; + +import net.brdle.collectorsreap.CollectorsReap; +import net.brdle.collectorsreap.common.item.CRTrimMaterials; +import net.minecraft.core.HolderLookup; +import net.minecraft.core.RegistrySetBuilder; +import net.minecraft.core.registries.Registries; +import net.minecraft.data.PackOutput; +import net.minecraftforge.common.data.DatapackBuiltinEntriesProvider; +import java.util.Set; +import java.util.concurrent.CompletableFuture; + +public class CRRegistries extends DatapackBuiltinEntriesProvider { + public static final RegistrySetBuilder BUILDER = new RegistrySetBuilder() + .add(Registries.TRIM_MATERIAL, CRTrimMaterials::bootstrap); + + public CRRegistries(PackOutput output, CompletableFuture future) { + super(output, future, BUILDER, Set.of("minecraft", CollectorsReap.MODID)); + } +} diff --git a/src/main/java/net/brdle/collectorsreap/data/gen/CRItemTagProvider.java b/src/main/java/net/brdle/collectorsreap/data/gen/CRItemTagProvider.java index 5da46761..e6e953de 100644 --- a/src/main/java/net/brdle/collectorsreap/data/gen/CRItemTagProvider.java +++ b/src/main/java/net/brdle/collectorsreap/data/gen/CRItemTagProvider.java @@ -43,6 +43,8 @@ public void addTags(HolderLookup.@NotNull Provider provider) { this.tag(ItemTags.FISHES) .addTag(CRItemTags.RAW_FISHES_BASS) .addTag(CRItemTags.COOKED_FISHES_BASS); + this.tag(ItemTags.TRIM_MATERIALS) + .add(CRItems.SHIMMERING_PEARL.get()); // Forge this.tag(CRItemTags.FRUITS_POMEGRANATE) diff --git a/src/main/java/net/brdle/collectorsreap/data/gen/CRLanguageProvider.java b/src/main/java/net/brdle/collectorsreap/data/gen/CRLanguageProvider.java index ea7b014b..9ada8492 100644 --- a/src/main/java/net/brdle/collectorsreap/data/gen/CRLanguageProvider.java +++ b/src/main/java/net/brdle/collectorsreap/data/gen/CRLanguageProvider.java @@ -34,6 +34,7 @@ private void addEntities() { } private void addText() { + add("trim_material." + CollectorsReap.MODID + ".pearl", "Pearl Material"); add("fluid_type." + CollectorsReap.MODID + ".lime_green_tea_type", "Lime Green Tea"); add("fluid_type." + CollectorsReap.MODID + ".pomegranate_black_tea_type", "Pomegranate Black Tea"); add("tooltip.requires_modid", "Requires modid:"); diff --git a/src/main/java/net/brdle/collectorsreap/data/gen/Generators.java b/src/main/java/net/brdle/collectorsreap/data/gen/Generators.java index da987b4e..51a28f37 100644 --- a/src/main/java/net/brdle/collectorsreap/data/gen/Generators.java +++ b/src/main/java/net/brdle/collectorsreap/data/gen/Generators.java @@ -1,8 +1,10 @@ package net.brdle.collectorsreap.data.gen; +import net.brdle.collectorsreap.data.CRRegistries; import net.minecraft.core.HolderLookup; import net.minecraft.data.DataGenerator; import net.minecraft.data.PackOutput; +import net.minecraftforge.common.data.DatapackBuiltinEntriesProvider; import net.minecraftforge.common.data.ExistingFileHelper; import net.minecraftforge.data.event.GatherDataEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; @@ -15,9 +17,11 @@ public class Generators { public void gatherData(GatherDataEvent e) { DataGenerator gen = e.getGenerator(); PackOutput output = gen.getPackOutput(); - CompletableFuture lookup = e.getLookupProvider(); ExistingFileHelper helper = e.getExistingFileHelper(); + DatapackBuiltinEntriesProvider datapackProvider = new CRRegistries(output, e.getLookupProvider()); + CompletableFuture lookup = datapackProvider.getRegistryProvider(); + gen.addProvider(e.includeServer(), datapackProvider); CRBlockTagProvider blockTags = new CRBlockTagProvider(output, lookup, helper); gen.addProvider(e.includeServer(), blockTags); gen.addProvider(e.includeServer(), new CRItemTagProvider(output, lookup, blockTags.contentsGetter(), helper)); diff --git a/src/main/resources/assets/collectorsreap/lang/es_es.json b/src/main/resources/assets/collectorsreap/lang/es_es.json index 126c4119..e5268af1 100644 --- a/src/main/resources/assets/collectorsreap/lang/es_es.json +++ b/src/main/resources/assets/collectorsreap/lang/es_es.json @@ -197,5 +197,6 @@ "item.collectorsreap.vanilla_gummy": "Gominola de vainilla", "item.collectorsreap.yellow_tea_gummy": "Gominola de té amarillo", "item.collectorsreap.yucca_gummy": "Gominola de yuca", - "tooltip.requires_modid": "Requiere el modid:" + "tooltip.requires_modid": "Requiere el modid:", + "trim_material.collectorsreap.pearl": "Pearl Material" } \ No newline at end of file diff --git a/src/main/resources/assets/collectorsreap/lang/es_mx.json b/src/main/resources/assets/collectorsreap/lang/es_mx.json index 90cf23a1..59c7c9cd 100644 --- a/src/main/resources/assets/collectorsreap/lang/es_mx.json +++ b/src/main/resources/assets/collectorsreap/lang/es_mx.json @@ -197,5 +197,6 @@ "item.collectorsreap.vanilla_gummy": "Gomita de vainilla", "item.collectorsreap.yellow_tea_gummy": "Gomita de té amarillo", "item.collectorsreap.yucca_gummy": "Gomita de yuca", - "tooltip.requires_modid": "Requiere el modid:" + "tooltip.requires_modid": "Requiere el modid:", + "trim_material.collectorsreap.pearl": "Pearl Material" } \ No newline at end of file diff --git a/src/main/resources/assets/collectorsreap/lang/ja_jp.json b/src/main/resources/assets/collectorsreap/lang/ja_jp.json index a08074f6..9df0b742 100644 --- a/src/main/resources/assets/collectorsreap/lang/ja_jp.json +++ b/src/main/resources/assets/collectorsreap/lang/ja_jp.json @@ -197,5 +197,6 @@ "item.collectorsreap.vanilla_gummy": "Vanilla Gummy", "item.collectorsreap.yellow_tea_gummy": "Yellow Tea Gummy", "item.collectorsreap.yucca_gummy": "Yucca Gummy", - "tooltip.requires_modid": "MODが必要" + "tooltip.requires_modid": "MODが必要", + "trim_material.collectorsreap.pearl": "Pearl Material" } \ No newline at end of file diff --git a/src/main/resources/assets/collectorsreap/lang/ko_kr.json b/src/main/resources/assets/collectorsreap/lang/ko_kr.json index 688b0f08..63ad9f03 100644 --- a/src/main/resources/assets/collectorsreap/lang/ko_kr.json +++ b/src/main/resources/assets/collectorsreap/lang/ko_kr.json @@ -197,5 +197,6 @@ "item.collectorsreap.vanilla_gummy": "Vanilla Gummy", "item.collectorsreap.yellow_tea_gummy": "Yellow Tea Gummy", "item.collectorsreap.yucca_gummy": "Yucca Gummy", - "tooltip.requires_modid": "Requires modid:" + "tooltip.requires_modid": "Requires modid:", + "trim_material.collectorsreap.pearl": "Pearl Material" } \ No newline at end of file diff --git a/src/main/resources/assets/collectorsreap/lang/ru_ru.json b/src/main/resources/assets/collectorsreap/lang/ru_ru.json index cecc60a1..d80db78d 100644 --- a/src/main/resources/assets/collectorsreap/lang/ru_ru.json +++ b/src/main/resources/assets/collectorsreap/lang/ru_ru.json @@ -197,5 +197,6 @@ "item.collectorsreap.vanilla_gummy": "Желе из ванили", "item.collectorsreap.yellow_tea_gummy": "Желе из желтого чая", "item.collectorsreap.yucca_gummy": "Желе из юкки", - "tooltip.requires_modid": "Необходима модификация:" + "tooltip.requires_modid": "Необходима модификация:", + "trim_material.collectorsreap.pearl": "Pearl Material" } \ No newline at end of file diff --git a/src/main/resources/assets/collectorsreap/lang/uk_ua.json b/src/main/resources/assets/collectorsreap/lang/uk_ua.json index c9042b85..fd0adb99 100644 --- a/src/main/resources/assets/collectorsreap/lang/uk_ua.json +++ b/src/main/resources/assets/collectorsreap/lang/uk_ua.json @@ -197,5 +197,6 @@ "item.collectorsreap.vanilla_gummy": "Ванільна желейка", "item.collectorsreap.yellow_tea_gummy": "Желейка з жовтого чаю", "item.collectorsreap.yucca_gummy": "Юкова желейка", - "tooltip.requires_modid": "Потрібен мод:" + "tooltip.requires_modid": "Потрібен мод:", + "trim_material.collectorsreap.pearl": "Pearl Material" } \ No newline at end of file diff --git a/src/main/resources/assets/collectorsreap/lang/vi_vn.json b/src/main/resources/assets/collectorsreap/lang/vi_vn.json index 4c2d23a5..38ef6d66 100644 --- a/src/main/resources/assets/collectorsreap/lang/vi_vn.json +++ b/src/main/resources/assets/collectorsreap/lang/vi_vn.json @@ -197,5 +197,6 @@ "item.collectorsreap.vanilla_gummy": "Kẹo Vanilla", "item.collectorsreap.yellow_tea_gummy": "Kẹo Trà Vàng", "item.collectorsreap.yucca_gummy": "Kẹo Yucca", - "tooltip.requires_modid": "Requires modid:" + "tooltip.requires_modid": "Requires modid:", + "trim_material.collectorsreap.pearl": "Pearl Material" } \ No newline at end of file diff --git a/src/main/resources/assets/collectorsreap/lang/zh_cn.json b/src/main/resources/assets/collectorsreap/lang/zh_cn.json index 4df41908..169a25bb 100644 --- a/src/main/resources/assets/collectorsreap/lang/zh_cn.json +++ b/src/main/resources/assets/collectorsreap/lang/zh_cn.json @@ -197,5 +197,6 @@ "item.collectorsreap.vanilla_gummy": "香草软糖", "item.collectorsreap.yellow_tea_gummy": "黄茶软糖", "item.collectorsreap.yucca_gummy": "丝兰果软糖", - "tooltip.requires_modid": "需安装模组：" + "tooltip.requires_modid": "需安装模组：", + "trim_material.collectorsreap.pearl": "Pearl Material" } \ No newline at end of file diff --git a/src/main/resources/assets/collectorsreap/textures/trims/color_palettes/pearl.png b/src/main/resources/assets/collectorsreap/textures/trims/color_palettes/pearl.png new file mode 100644 index 0000000000000000000000000000000000000000..b58fcbfc6be73c00d0852a0f9bb85b1e51bb97be GIT binary patch literal 119 zcmeAS@N?(olHy`uVBq!ia0vp^96-#-!2~38k}5=il!~W|V~B(#qa?$#{|rC>{eAoC z{kuDF-k*N+eDC9{%WmwNa%pDPChjT1=T3DMlmXTArABzB`T8gTe~DWM4fYLzB9 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/minecraft/atlases/armor_trims.json b/src/main/resources/assets/minecraft/atlases/armor_trims.json new file mode 100644 index 00000000..58cfb7b4 --- /dev/null +++ b/src/main/resources/assets/minecraft/atlases/armor_trims.json @@ -0,0 +1,45 @@ +{ + "sources": [ + { + "type": "paletted_permutations", + "textures": [ + "trims/models/armor/coast", + "trims/models/armor/coast_leggings", + "trims/models/armor/sentry", + "trims/models/armor/sentry_leggings", + "trims/models/armor/dune", + "trims/models/armor/dune_leggings", + "trims/models/armor/wild", + "trims/models/armor/wild_leggings", + "trims/models/armor/ward", + "trims/models/armor/ward_leggings", + "trims/models/armor/eye", + "trims/models/armor/eye_leggings", + "trims/models/armor/vex", + "trims/models/armor/vex_leggings", + "trims/models/armor/tide", + "trims/models/armor/tide_leggings", + "trims/models/armor/snout", + "trims/models/armor/snout_leggings", + "trims/models/armor/rib", + "trims/models/armor/rib_leggings", + "trims/models/armor/spire", + "trims/models/armor/spire_leggings", + "trims/models/armor/wayfinder", + "trims/models/armor/wayfinder_leggings", + "trims/models/armor/shaper", + "trims/models/armor/shaper_leggings", + "trims/models/armor/silence", + "trims/models/armor/silence_leggings", + "trims/models/armor/raiser", + "trims/models/armor/raiser_leggings", + "trims/models/armor/host", + "trims/models/armor/host_leggings" + ], + "palette_key": "trims/color_palettes/trim_palette", + "permutations": { + "pearl": "collectorsreap:trims/color_palettes/pearl" + } + } + ] +} \ No newline at end of file diff --git a/update.json b/update.json index 34f5c465..b5252030 100644 --- a/update.json +++ b/update.json @@ -19,7 +19,7 @@ "1.3": "Added Chieftain Crab, Platinum Bass, Tide Clam, Tiger Prawn, Urchin and related foods. Added support for My Nether's Delight.", "1.3.1": "Fixed Lime, Pomegranate, and Portobello spawns. Added Gummies for Seasonals. Decreased mob spawns to prevent bloating spawn cap.", "1.3.2": "Update bush textures and growth mechanics. Removed colonies from Portobello patch spawns. Add Jade support to bushes.", - "1.3.3": "Added Urchin Dart, Shimmering Apple, and Shimmering Pearl. Item tags and more descriptive JEI information. Recipe fixes." + "1.3.3": "Added Urchin Dart, Shimmering Apple, and Shimmering Pearl, and Pearl armor trim material." }, "promos": { "1.19-latest": "1.2.4",