diff --git a/src/generated/resources/.cache/93943142017732f21fbc4fa325d116c728b69767 b/src/generated/resources/.cache/93943142017732f21fbc4fa325d116c728b69767 index 352a5e6f..65163a3f 100644 --- a/src/generated/resources/.cache/93943142017732f21fbc4fa325d116c728b69767 +++ b/src/generated/resources/.cache/93943142017732f21fbc4fa325d116c728b69767 @@ -1,2 +1,2 @@ -// 1.20.1 2024-04-06T13:10:03.6022487 ModKit Language: en_us for mod 'exdeorum' -4b68dbaeed3f208ea57105e1c24d1284ed62ebae assets/exdeorum/lang/en_us.json +// 1.20.1 2024-04-06T20:16:35.8200268 ModKit Language: en_us for mod 'exdeorum' +07ffbafb65842c17196b7a8f9571cd9f03e6bbde assets/exdeorum/lang/en_us.json diff --git a/src/generated/resources/assets/exdeorum/lang/en_us.json b/src/generated/resources/assets/exdeorum/lang/en_us.json index 9d9c4227..b2913bc8 100644 --- a/src/generated/resources/assets/exdeorum/lang/en_us.json +++ b/src/generated/resources/assets/exdeorum/lang/en_us.json @@ -296,6 +296,28 @@ "item.exdeorum.zinc_ore_chunk": "Zinc Ore Chunk", "itemGroup.exdeorum.main": "Ex Deorum", "tag.item.exdeorum.barrels": "Barrels", + "tag.item.exdeorum.compressed.andesite": "Compressed Andesite", + "tag.item.exdeorum.compressed.blackstone": "Compressed Blackstone", + "tag.item.exdeorum.compressed.cobbled_deepslate": "Compressed Cobbled Deepslate", + "tag.item.exdeorum.compressed.cobblestone": "Compressed Cobblestone", + "tag.item.exdeorum.compressed.crushed_blackstone": "Compressed Crushed Blackstone", + "tag.item.exdeorum.compressed.crushed_deepslate": "Compressed Crushed Deepslate", + "tag.item.exdeorum.compressed.crushed_end_stone": "Compressed Crushed End Stone", + "tag.item.exdeorum.compressed.crushed_netherrack": "Compressed Crushed Netherrack", + "tag.item.exdeorum.compressed.deepslate": "Compressed Deepslate", + "tag.item.exdeorum.compressed.diorite": "Compressed Diorite", + "tag.item.exdeorum.compressed.dirt": "Compressed Dirt", + "tag.item.exdeorum.compressed.dust": "Compressed Dust", + "tag.item.exdeorum.compressed.end_stone": "Compressed End Stone", + "tag.item.exdeorum.compressed.granite": "Compressed Granite", + "tag.item.exdeorum.compressed.gravel": "Compressed Gravel", + "tag.item.exdeorum.compressed.moss_block": "Compressed Moss Block", + "tag.item.exdeorum.compressed.netherrack": "Compressed Netherrack", + "tag.item.exdeorum.compressed.red_sand": "Compressed Red Sand", + "tag.item.exdeorum.compressed.sand": "Compressed Sand", + "tag.item.exdeorum.compressed.sands": "Compressed Sands", + "tag.item.exdeorum.compressed.soul_sand": "Compressed Soul Sand", + "tag.item.exdeorum.compressed_hammers": "Compressed Hammers", "tag.item.exdeorum.crooks": "Crooks", "tag.item.exdeorum.end_cake_materials": "End Cake Materials", "tag.item.exdeorum.hammers": "Hammers", diff --git a/src/main/java/thedarkcolour/exdeorum/block/CompressedBlockType.java b/src/main/java/thedarkcolour/exdeorum/block/CompressedBlockType.java index 58e0c39e..77205366 100644 --- a/src/main/java/thedarkcolour/exdeorum/block/CompressedBlockType.java +++ b/src/main/java/thedarkcolour/exdeorum/block/CompressedBlockType.java @@ -32,6 +32,7 @@ import thedarkcolour.exdeorum.registry.EBlocks; import thedarkcolour.exdeorum.registry.EItems; import thedarkcolour.exdeorum.tag.EItemTags; +import java.net.URI; import java.util.function.Supplier; public class CompressedBlockType implements ItemLike { @@ -99,4 +100,8 @@ public class CompressedBlockType implements ItemLike { public Block getBase() { return this.base.get(); } + + public ResourceLocation getId() { + return this.block.getId(); + } } diff --git a/src/main/java/thedarkcolour/exdeorum/data/English.java b/src/main/java/thedarkcolour/exdeorum/data/English.java index 7d2d494b..6390558b 100644 --- a/src/main/java/thedarkcolour/exdeorum/data/English.java +++ b/src/main/java/thedarkcolour/exdeorum/data/English.java @@ -19,8 +19,10 @@ package thedarkcolour.exdeorum.data; import net.minecraft.tags.TagKey; +import org.apache.commons.lang3.text.WordUtils; import thedarkcolour.exdeorum.client.screen.RedstoneControlWidget; import thedarkcolour.exdeorum.material.DefaultMaterials; +import thedarkcolour.exdeorum.registry.ECompressedBlocks; import thedarkcolour.exdeorum.registry.EFluids; import thedarkcolour.exdeorum.tag.EItemTags; import thedarkcolour.modkit.data.MKEnglishProvider; @@ -31,6 +33,7 @@ class English { english.add(EItemTags.CROOKS, "Crooks"); english.add(EItemTags.HAMMERS, "Hammers"); + english.add(EItemTags.COMPRESSED_HAMMERS, "Compressed Hammers"); english.add(EItemTags.SIEVE_MESHES, "Sieve Meshes"); english.add(EItemTags.PEBBLES, "Pebbles"); english.add(EItemTags.END_CAKE_MATERIAL, "End Cake Materials"); @@ -38,6 +41,13 @@ class English { english.add(EItemTags.STONE_BARRELS, "Stone Barrels"); english.add(EItemTags.BARRELS, "Barrels"); + for (var variant : ECompressedBlocks.ALL_VARIANTS) { + // todo add a "capitalize ID" method to ModKit so I don't have to keep track of this code + //noinspection deprecation + english.add(variant.getTag(), WordUtils.capitalize(variant.getId().getPath().replace('_', ' '))); + } + english.add(EItemTags.COMPRESSED_SANDS, "Compressed Sands"); + english.add(EFluids.WITCH_WATER_TYPE.get(), "Witch Water"); english.add(TranslationKeys.MAIN_CREATIVE_TAB, "Ex Deorum");