From 2d97ed39163b350514732d01908df26749df8b89 Mon Sep 17 00:00:00 2001 From: Michael Hillcox Date: Sat, 28 Nov 2020 14:29:17 +0000 Subject: [PATCH] AIO & Tools language --- src/generated/resources/.cache/cache | 2 +- .../assets/actuallyadditions/lang/en_us.json | 84 +++++++++++++++++++ .../data/GeneratorLanguage.java | 37 ++++++++ 3 files changed, 122 insertions(+), 1 deletion(-) diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache index c1cbc3425..3dd40d0ec 100644 --- a/src/generated/resources/.cache/cache +++ b/src/generated/resources/.cache/cache @@ -121,7 +121,7 @@ e2c81adfe240117fa0ce2e3dfcfd04f4e1034153 assets/actuallyadditions/blockstates/wh 3670535838b4c26d01afe7ee4807c53a6cbaba12 assets/actuallyadditions/blockstates/white_wall_block.json 78e89628e3c6e891f2994b2a1794672f69826516 assets/actuallyadditions/blockstates/wood_casing_block.json 207adf3d139369e983100a6002f6f77d36d40916 assets/actuallyadditions/blockstates/xp_solidifier_block.json -9f9c34e44b248dba7b5cf4bc8104cf1a6954073e assets/actuallyadditions/lang/en_us.json +b806b272595e2091dcdb3880910cb3284fbe393b assets/actuallyadditions/lang/en_us.json 8ce3f2af3288773fb581a3668c2cb90b64c9ee2f assets/actuallyadditions/models/block/advanced_item_laser_relay_block.json de74eda6290d47ef2b26961693e537d7b8795a06 assets/actuallyadditions/models/block/atomic_reconstructor_block.json 16a76926a07fc8fa10e4a3949d15ad2ca6920bb8 assets/actuallyadditions/models/block/battery_box_block.json diff --git a/src/generated/resources/assets/actuallyadditions/lang/en_us.json b/src/generated/resources/assets/actuallyadditions/lang/en_us.json index a3db331f9..c54498877 100644 --- a/src/generated/resources/assets/actuallyadditions/lang/en_us.json +++ b/src/generated/resources/assets/actuallyadditions/lang/en_us.json @@ -122,6 +122,90 @@ "block.actuallyadditions.white_wall_block": "Ethentic Quartz Wall", "block.actuallyadditions.wood_casing_block": "Wood Casing", "block.actuallyadditions.xp_solidifier_block": "XP Solidifier", + "item.actuallyadditions.black_quartz": "Black Quarts", + "item.actuallyadditions.booklet": "Booklet", + "item.actuallyadditions.diamatine_axe": "Diamatine Axe", + "item.actuallyadditions.diamatine_boots": "Diamatine Boots", + "item.actuallyadditions.diamatine_chest": "Diamatine Chestplate", + "item.actuallyadditions.diamatine_crystal": "Diamatine Crystal", + "item.actuallyadditions.diamatine_helmet": "Diamatine Helmet", + "item.actuallyadditions.diamatine_hoe": "Diamatine Hoe", + "item.actuallyadditions.diamatine_leggings": "Diamatine Leggings", + "item.actuallyadditions.diamatine_paxel": "Diamatine Paxel", + "item.actuallyadditions.diamatine_pickaxe": "Diamatine Pickaxe", + "item.actuallyadditions.diamatine_shovel": "Diamatine Shovel", + "item.actuallyadditions.diamatine_sword": "Diamatine Sword", + "item.actuallyadditions.diamond_paxel": "Diamond Paxel", + "item.actuallyadditions.emeradic_axe": "Emeradic Axe", + "item.actuallyadditions.emeradic_boots": "Emeradic Boots", + "item.actuallyadditions.emeradic_chest": "Emeradic Chestplate", + "item.actuallyadditions.emeradic_crystal": "Emeradic Crystal", + "item.actuallyadditions.emeradic_helmet": "Emeradic Helmet", + "item.actuallyadditions.emeradic_hoe": "Emeradic Hoe", + "item.actuallyadditions.emeradic_leggings": "Emeradic Leggings", + "item.actuallyadditions.emeradic_paxel": "Emeradic Paxel", + "item.actuallyadditions.emeradic_pickaxe": "Emeradic Pickaxe", + "item.actuallyadditions.emeradic_shovel": "Emeradic Shovel", + "item.actuallyadditions.emeradic_sword": "Emeradic Sword", + "item.actuallyadditions.enori_axe": "Enori Axe", + "item.actuallyadditions.enori_boots": "Enori Boots", + "item.actuallyadditions.enori_chest": "Enori Chestplate", + "item.actuallyadditions.enori_crystal": "Enori Crystal", + "item.actuallyadditions.enori_helmet": "Enori Helmet", + "item.actuallyadditions.enori_hoe": "Enori Hoe", + "item.actuallyadditions.enori_leggings": "Enori Leggings", + "item.actuallyadditions.enori_paxel": "Enori Paxel", + "item.actuallyadditions.enori_pickaxe": "Enori Pickaxe", + "item.actuallyadditions.enori_shovel": "Enori Shovel", + "item.actuallyadditions.enori_sword": "Enori Sword", + "item.actuallyadditions.gold_paxel": "Gold Paxel", + "item.actuallyadditions.iron_paxel": "Iron Paxel", + "item.actuallyadditions.netherite_paxel": "Netherite Paxel", + "item.actuallyadditions.palis_axe": "Palis Axe", + "item.actuallyadditions.palis_boots": "Palis Boots", + "item.actuallyadditions.palis_chest": "Palis Chestplate", + "item.actuallyadditions.palis_crystal": "Palis Crystal", + "item.actuallyadditions.palis_helmet": "Palis Helmet", + "item.actuallyadditions.palis_hoe": "Palis Hoe", + "item.actuallyadditions.palis_leggings": "Palis Leggings", + "item.actuallyadditions.palis_paxel": "Palis Paxel", + "item.actuallyadditions.palis_pickaxe": "Palis Pickaxe", + "item.actuallyadditions.palis_shovel": "Palis Shovel", + "item.actuallyadditions.palis_sword": "Palis Sword", + "item.actuallyadditions.quartz_axe": "Quartz Axe", + "item.actuallyadditions.quartz_boots": "Quartz Boots", + "item.actuallyadditions.quartz_chest": "Quartz Chestplate", + "item.actuallyadditions.quartz_helmet": "Quartz Helmet", + "item.actuallyadditions.quartz_hoe": "Quartz Hoe", + "item.actuallyadditions.quartz_leggings": "Quartz Leggings", + "item.actuallyadditions.quartz_paxel": "Quartz Paxel", + "item.actuallyadditions.quartz_pickaxe": "Quartz Pickaxe", + "item.actuallyadditions.quartz_shovel": "Quartz Shovel", + "item.actuallyadditions.quartz_sword": "Quartz Sword", + "item.actuallyadditions.restonia_axe": "Restonia Axe", + "item.actuallyadditions.restonia_boots": "Restonia Boots", + "item.actuallyadditions.restonia_chest": "Restonia Chestplate", + "item.actuallyadditions.restonia_crystal": "Restonia Crystal", + "item.actuallyadditions.restonia_helmet": "Restonia Helmet", + "item.actuallyadditions.restonia_hoe": "Restonia Hoe", + "item.actuallyadditions.restonia_leggings": "Restonia Leggings", + "item.actuallyadditions.restonia_paxel": "Restonia Paxel", + "item.actuallyadditions.restonia_pickaxe": "Restonia Pickaxe", + "item.actuallyadditions.restonia_shovel": "Restonia Shovel", + "item.actuallyadditions.restonia_sword": "Restonia Sword", + "item.actuallyadditions.stone_paxel": "Stone Paxel", + "item.actuallyadditions.void_axe": "Void Axe", + "item.actuallyadditions.void_boots": "Void Boots", + "item.actuallyadditions.void_chest": "Void Chestplate", + "item.actuallyadditions.void_crystal": "Void Crystal", + "item.actuallyadditions.void_helmet": "Void Helmet", + "item.actuallyadditions.void_hoe": "Void Hoe", + "item.actuallyadditions.void_leggings": "Void Leggings", + "item.actuallyadditions.void_paxel": "Void Paxel", + "item.actuallyadditions.void_pickaxe": "Void Pickaxe", + "item.actuallyadditions.void_shovel": "Void Shovel", + "item.actuallyadditions.void_sword": "Void Sword", + "item.actuallyadditions.wooden_paxel": "Wooden Paxel", "itemGroup.actuallyadditions": "Actually Additions", "misc.message.so_cute": "So cute!" } \ No newline at end of file diff --git a/src/main/java/de/ellpeck/actuallyadditions/data/GeneratorLanguage.java b/src/main/java/de/ellpeck/actuallyadditions/data/GeneratorLanguage.java index ea8727582..abb8e69a3 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/data/GeneratorLanguage.java +++ b/src/main/java/de/ellpeck/actuallyadditions/data/GeneratorLanguage.java @@ -2,6 +2,8 @@ package de.ellpeck.actuallyadditions.data; import de.ellpeck.actuallyadditions.common.ActuallyAdditions; import de.ellpeck.actuallyadditions.common.blocks.ActuallyBlocks; +import de.ellpeck.actuallyadditions.common.items.ActuallyItems; +import de.ellpeck.actuallyadditions.common.items.ToolSet; import net.minecraft.data.DataGenerator; import net.minecraftforge.common.data.LanguageProvider; @@ -137,6 +139,37 @@ public class GeneratorLanguage extends LanguageProvider { addBlock(ActuallyBlocks.LAVA_FACTORY_CASE, "Casing"); addBlock(ActuallyBlocks.WOOD_CASING, "Wood Casing"); + // -- Items + // Tools + ActuallyItems.ALL_TOOL_SETS.forEach(this::addToolSet); + + // Paxels + addItem(ActuallyItems.WOODEN_PAXEL, "Wooden Paxel"); + addItem(ActuallyItems.STONE_PAXEL, "Stone Paxel"); + addItem(ActuallyItems.IRON_PAXEL, "Iron Paxel"); + addItem(ActuallyItems.GOLD_PAXEL, "Gold Paxel"); + addItem(ActuallyItems.DIAMOND_PAXEL, "Diamond Paxel"); + addItem(ActuallyItems.NETHERITE_PAXEL, "Netherite Paxel"); + addItem(ActuallyItems.QUARTZ_PAXEL, "Quartz Paxel"); + addItem(ActuallyItems.ENORI_PAXEL, "Enori Paxel"); + addItem(ActuallyItems.EMERADIC_PAXEL, "Emeradic Paxel"); + addItem(ActuallyItems.VOID_PAXEL, "Void Paxel"); + addItem(ActuallyItems.DIAMATINE_PAXEL, "Diamatine Paxel"); + addItem(ActuallyItems.PALIS_PAXEL, "Palis Paxel"); + addItem(ActuallyItems.RESTONIA_PAXEL, "Restonia Paxel"); + + // Crystals + addItem(ActuallyItems.BLACK_QUARTS, "Black Quarts"); + addItem(ActuallyItems.RESTONIA_CRYSTAL, "Restonia Crystal"); + addItem(ActuallyItems.PALIS_CRYSTAL, "Palis Crystal"); + addItem(ActuallyItems.DIAMATINE_CRYSTAL, "Diamatine Crystal"); + addItem(ActuallyItems.VOID_CRYSTAL, "Void Crystal"); + addItem(ActuallyItems.EMERADIC_CRYSTAL, "Emeradic Crystal"); + addItem(ActuallyItems.ENORI_CRYSTAL, "Enori Crystal"); + + // Misc + addItem(ActuallyItems.BOOKLET, "Booklet"); + add("itemGroup.actuallyadditions", "Actually Additions"); // Mics @@ -150,4 +183,8 @@ public class GeneratorLanguage extends LanguageProvider { private void addPrefixed(String key, String text) { add(String.format("%s.%s", ActuallyAdditions.MOD_ID, key), text); } + + private void addToolSet(ToolSet set) { + set.items.forEach(e -> addItem(e::getItem, String.format("%s %s", set.name.substring(0, 1).toUpperCase() + set.name.substring(1), e.getPretty()))); + } }