From 2c63ae0c6003d1115691180fc137d8cf132e0699 Mon Sep 17 00:00:00 2001 From: Michael Hillcox Date: Sat, 28 Nov 2020 18:08:18 +0000 Subject: [PATCH] Language Generator --- .../common/items/ActuallyItems.java | 26 ++- .../data/GeneratorItemModels.java | 1 + .../data/GeneratorLanguage.java | 148 ++++++++++++++++++ 3 files changed, 174 insertions(+), 1 deletion(-) diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/items/ActuallyItems.java b/src/main/java/de/ellpeck/actuallyadditions/common/items/ActuallyItems.java index 485416ac7..820c21c7b 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/items/ActuallyItems.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/items/ActuallyItems.java @@ -209,7 +209,31 @@ public final class ActuallyItems { VOID_CRYSTAL, EMERADIC_CRYSTAL, ENORI_CRYSTAL, // All in one tools WOODEN_PAXEL, STONE_PAXEL, IRON_PAXEL, GOLD_PAXEL, DIAMOND_PAXEL, NETHERITE_PAXEL, QUARTZ_PAXEL, ENORI_PAXEL, - EMERADIC_PAXEL, VOID_PAXEL, DIAMATINE_PAXEL, PALIS_PAXEL, RESTONIA_PAXEL + EMERADIC_PAXEL, VOID_PAXEL, DIAMATINE_PAXEL, PALIS_PAXEL, RESTONIA_PAXEL, + // The rest? + RED_CRYSTAL_SHARD, BLUE_CRYSTAL_SHARD, LIGHT_BLUE_CRYSTAL_SHARD, BLACK_CRYSTAL_SHARD, GREEN_CRYSTAL_SHARD, + WHITE_CRYSTAL_SHARD, ENGINEERS_GOGGLES, ENGINEERS_GOGGLES_INFRARED, LASER_RELAY_MODIFIER_RANGE, LASER_RELAY_MODIFIER_INVISIBILITY, + HANDHELD_FILLER, TRAVELERS_SACK, VOID_SACK, WORM, PLAYER_PROBE, ITEM_FILTER, BOWL_OF_WATER, PAPER_CONE, DOUGH, + RING, BASIC_COIL, ADVANCED_COIL, RICE_DOUGH, TINY_COAL, TINY_CHARCOAL, RICE_SLIMEBALL, CANOLA, EMPTY_CUP, + BATS_WING, DRILL_CORE, LENS, ENDER_STAR, CRYSTALLIZED_CANOLA_SEED, EMPOWERED_CANOLA_SEED, LENS_OF_COLOR, + LENS_OF_DETONATION, LENS_OF_CERTAIN_DEATH, LENS_OF_THE_KILLER, LENS_OF_DISENCHANTING, LENS_OF_THE_MINER, LASER_WRENCH, + TELEPORT_STAFF, WINGS_OF_THE_BATS, SINGLE_BATTERY, DOUBLE_BATTERY, TRIPLE_BATTERY, QUADRUPLE_BATTERY, QUINTUPLE_BATTERY, + DRILL_BLACK, DRILL_BLUE, DRILL_BROWN, DRILL_CYAN, DRILL_GRAY, DRILL_GREEN, DRILL_LIGHT_BLUE, DRILL_LIGHT_GRAY, + DRILL_LIME, DRILL_MAGENTA, DRILL_ORANGE, DRILL_PINK, DRILL_PURPLE, DRILL_RED, DRILL_WHITE, DRILL_YELLOW, DRILL_SPEED_AUGMENT_I, + DRILL_SPEED_AUGMENT_II, DRILL_SPEED_AUGMENT_III, DRILL_SILK_TOUCH_AUGMENT, DRILL_FORTUNE_AUGMENT_I, DRILL_FORTUNE_AUGMENT_II, + DRILL_MINING_AUGMENT_I, DRILL_MINING_AUGMENT_II, DRILL_BLOCK_PLACING_AUGMENT, FERTILIZER, CUP_WITH_COFFEE, PHANTOM_CONNECTOR, + RESONANT_RICE, FOOD_CHEESE, FOOD_PUMPKIN_STEW, FOOD_CARROT_JUICE, FOOD_FISH_N_CHIPS, FOOD_FRENCH_FRIES, FOOD_FRENCH_FRY, + FOOD_SPAGHETTI, FOOD_NOODLE, FOOD_CHOCOLATE_CAKE, FOOD_CHOCOLATE, FOOD_TOAST, FOOD_SUBMARINE_SANDWICH, FOOD_BIG_COOKIE, + FOOD_HAMBURGER, FOOD_PIZZA, FOOD_BAGUETTE, FOOD_RICE, FOOD_RICE_BREAD, FOOD_DOUGHNUT, FOOD_TOAST_O_CHOCOLATE, + FOOD_BACON, CU_BA_RA_JAM, GRA_KI_BA_JAM, PL_AP_LE_JAM, CH_AP_CI_JAM, HO_ME_KI_JAM, PI_CO_JAM, HO_ME_CO_JAM, + KNIFE, CRAFTING_TABLE_ON_A_STICK, CRUSHED_IRON, CRUSHED_GOLD, CRUSHED_DIAMOND, CRUSHED_EMERALD, CRUSHED_LAPIS, + CRUSHED_QUARTZ, CRUSHED_COAL, CRUSHED_BLACK_QUARTZ, SOLIDIFIED_EXPERIENCE, LEAF_BLOWER, ADVANCED_LEAF_BLOWER, + RING_OF_GROWTH, RING_OF_MAGNETIZING, RING_OF_SPEED, RING_OF_HASTE, RING_OF_STRENGTH, RING_OF_JUMP_BOOST, + RING_OF_REGENERATION, RING_OF_RESISTANCE, RING_OF_FIRE_RESISTANCE, RING_OF_WATER_BREATHING, RING_OF_INVISIBILITY, + RING_OF_NIGHT_VISION, ADVANCED_RING_OF_SPEED, ADVANCED_RING_OF_HASTE, ADVANCED_RING_OF_STRENGTH, + ADVANCED_RING_OF_JUMP_BOOST, ADVANCED_RING_OF_REGENERATION, ADVANCED_RING_OF_RESISTANCE, ADVANCED_RING_OF_FIRE_RESISTANCE, + ADVANCED_RING_OF_WATER_BREATHING, ADVANCED_RING_OF_INVISIBILITY, ADVANCED_RING_OF_NIGHT_VISION, FUR_BALL, + COFFEE_BEANS, RICE_SEEDS, CANOLA_SEEDS, FLAX_SEEDS, COFFEE_SEEDS ); private static Supplier basicItem() { diff --git a/src/main/java/de/ellpeck/actuallyadditions/data/GeneratorItemModels.java b/src/main/java/de/ellpeck/actuallyadditions/data/GeneratorItemModels.java index 6c23479b5..ce867bd5d 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/data/GeneratorItemModels.java +++ b/src/main/java/de/ellpeck/actuallyadditions/data/GeneratorItemModels.java @@ -27,6 +27,7 @@ public class GeneratorItemModels extends ItemModelProvider { // Items simpleItem(ActuallyItems.BOOKLET); // will require complex I think + // All items? ActuallyItems.SIMPLE_ITEMS.forEach(this::simpleItem); // Toolsets diff --git a/src/main/java/de/ellpeck/actuallyadditions/data/GeneratorLanguage.java b/src/main/java/de/ellpeck/actuallyadditions/data/GeneratorLanguage.java index 68e1019f1..559a45e28 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/data/GeneratorLanguage.java +++ b/src/main/java/de/ellpeck/actuallyadditions/data/GeneratorLanguage.java @@ -162,6 +162,154 @@ public class GeneratorLanguage extends LanguageProvider { addItem(ActuallyItems.EMERADIC_CRYSTAL, "Emeradic Crystal"); addItem(ActuallyItems.ENORI_CRYSTAL, "Enori Crystal"); + // Remaining Items? + addItem(ActuallyItems.RED_CRYSTAL_SHARD, "Red Crystal Shard"); + addItem(ActuallyItems.BLUE_CRYSTAL_SHARD, "Blue Crystal Shard"); + addItem(ActuallyItems.LIGHT_BLUE_CRYSTAL_SHARD, "Light Blue Crystal"); + addItem(ActuallyItems.BLACK_CRYSTAL_SHARD, "Black Crystal Shard"); + addItem(ActuallyItems.GREEN_CRYSTAL_SHARD, "Green Crystal Shard"); + addItem(ActuallyItems.WHITE_CRYSTAL_SHARD, "White Crystal Shard"); + addItem(ActuallyItems.ENGINEERS_GOGGLES, "Engineer's Goggles"); + addItem(ActuallyItems.ENGINEERS_GOGGLES_INFRARED, "Engineer's Infrared Goggles"); + addItem(ActuallyItems.LASER_RELAY_MODIFIER_RANGE, "Laser Relay Modifier: Range"); + addItem(ActuallyItems.LASER_RELAY_MODIFIER_INVISIBILITY, "Laser Relay Modifier: Invisibility"); + addItem(ActuallyItems.HANDHELD_FILLER, "Handheld Filler"); + addItem(ActuallyItems.TRAVELERS_SACK, "Traveler's Sack"); + addItem(ActuallyItems.VOID_SACK, "Void Sack"); + addItem(ActuallyItems.WORM, "Worm"); + addItem(ActuallyItems.PLAYER_PROBE, "Player Probe"); + addItem(ActuallyItems.ITEM_FILTER, "Item Filter"); + addItem(ActuallyItems.BOWL_OF_WATER, "Bowl of Water"); + addItem(ActuallyItems.PAPER_CONE, "Paper Cone"); + addItem(ActuallyItems.DOUGH, "Dough"); + addItem(ActuallyItems.RING, "Ring"); + addItem(ActuallyItems.BASIC_COIL, "Basic Coil"); + addItem(ActuallyItems.ADVANCED_COIL, "Advanced Coil"); + addItem(ActuallyItems.RICE_DOUGH, "Rice Dough"); + addItem(ActuallyItems.TINY_COAL, "Tiny Coal"); + addItem(ActuallyItems.TINY_CHARCOAL, "Tiny Charcoal"); + addItem(ActuallyItems.RICE_SLIMEBALL, "Rice Slimeball"); + addItem(ActuallyItems.CANOLA, "Canola"); + addItem(ActuallyItems.EMPTY_CUP, "Empty Cup"); + addItem(ActuallyItems.BATS_WING, "Bat's Wing"); + addItem(ActuallyItems.DRILL_CORE, "Drill Core"); + addItem(ActuallyItems.LENS, "Lens"); + addItem(ActuallyItems.ENDER_STAR, "Ender Star"); + addItem(ActuallyItems.CRYSTALLIZED_CANOLA_SEED, "Crystallized Canola Seed"); + addItem(ActuallyItems.EMPOWERED_CANOLA_SEED, "Empowered Canola Seed"); + addItem(ActuallyItems.LENS_OF_COLOR, "Lens of Color"); + addItem(ActuallyItems.LENS_OF_DETONATION, "Lens of Detonation"); + addItem(ActuallyItems.LENS_OF_CERTAIN_DEATH, "Lens of Certain Death"); + addItem(ActuallyItems.LENS_OF_THE_KILLER, "Lens of the Killer"); + addItem(ActuallyItems.LENS_OF_DISENCHANTING, "Lens of Disenchanting"); + addItem(ActuallyItems.LENS_OF_THE_MINER, "Lens of the Miner"); + addItem(ActuallyItems.LASER_WRENCH, "Laser Wrench"); + addItem(ActuallyItems.TELEPORT_STAFF, "Teleport Staff"); + addItem(ActuallyItems.WINGS_OF_THE_BATS, "Wings Of The Bats"); + addItem(ActuallyItems.SINGLE_BATTERY, "Single Battery"); + addItem(ActuallyItems.DOUBLE_BATTERY, "Double Battery"); + addItem(ActuallyItems.TRIPLE_BATTERY, "Triple Battery"); + addItem(ActuallyItems.QUADRUPLE_BATTERY, "Quadruple Battery"); + addItem(ActuallyItems.QUINTUPLE_BATTERY, "Quintuple Battery"); + addItem(ActuallyItems.DRILL_BLACK, "Black Drill"); + addItem(ActuallyItems.DRILL_BLUE, "Blue Drill"); + addItem(ActuallyItems.DRILL_BROWN, "Brown Drill"); + addItem(ActuallyItems.DRILL_CYAN, "Cyan Drill"); + addItem(ActuallyItems.DRILL_GRAY, "Gray Drill"); + addItem(ActuallyItems.DRILL_GREEN, "Green Drill"); + addItem(ActuallyItems.DRILL_LIGHT_BLUE, "Light Blue Drill"); + addItem(ActuallyItems.DRILL_LIGHT_GRAY, "Light Gray Drill"); + addItem(ActuallyItems.DRILL_LIME, "Lime Drill"); + addItem(ActuallyItems.DRILL_MAGENTA, "Magenta Drill"); + addItem(ActuallyItems.DRILL_ORANGE, "Orange Drill"); + addItem(ActuallyItems.DRILL_PINK, "Pink Drill"); + addItem(ActuallyItems.DRILL_PURPLE, "Purple Drill"); + addItem(ActuallyItems.DRILL_RED, "Red Drill"); + addItem(ActuallyItems.DRILL_WHITE, "White Drill"); + addItem(ActuallyItems.DRILL_YELLOW, "Yellow Drill"); + addItem(ActuallyItems.DRILL_SPEED_AUGMENT_I, "Drill Speed Augment I"); + addItem(ActuallyItems.DRILL_SPEED_AUGMENT_II, "Drill Speed Augment II"); + addItem(ActuallyItems.DRILL_SPEED_AUGMENT_III, "Drill Speed Augment III"); + addItem(ActuallyItems.DRILL_SILK_TOUCH_AUGMENT, "Drill Silk Touch Augment"); + addItem(ActuallyItems.DRILL_FORTUNE_AUGMENT_I, "Drill Fortune Augment I"); + addItem(ActuallyItems.DRILL_FORTUNE_AUGMENT_II, "Drill Fortune Augment II (Gives Fortune III!)"); + addItem(ActuallyItems.DRILL_MINING_AUGMENT_I, "Drill Mining Augment I"); + addItem(ActuallyItems.DRILL_MINING_AUGMENT_II, "Drill Mining Augment II"); + addItem(ActuallyItems.DRILL_BLOCK_PLACING_AUGMENT, "Drill Block Placing Augment"); + addItem(ActuallyItems.FERTILIZER, "Fertilizer"); + addItem(ActuallyItems.CUP_WITH_COFFEE, "Cup with Coffee"); + addItem(ActuallyItems.PHANTOM_CONNECTOR, "Phantom Connector"); + addItem(ActuallyItems.RESONANT_RICE, "Resonant Rice"); + addItem(ActuallyItems.FOOD_CHEESE, "Cheese"); + addItem(ActuallyItems.FOOD_PUMPKIN_STEW, "Pumpkin Stew"); + addItem(ActuallyItems.FOOD_CARROT_JUICE, "Carrot Juice"); + addItem(ActuallyItems.FOOD_FISH_N_CHIPS, "Fish 'N' Chips"); + addItem(ActuallyItems.FOOD_FRENCH_FRIES, "French Fries"); + addItem(ActuallyItems.FOOD_FRENCH_FRY, "French Fry"); + addItem(ActuallyItems.FOOD_SPAGHETTI, "Spaghetti"); + addItem(ActuallyItems.FOOD_NOODLE, "Noodle"); + addItem(ActuallyItems.FOOD_CHOCOLATE_CAKE, "Chocolate Cake"); + addItem(ActuallyItems.FOOD_CHOCOLATE, "Chocolate"); + addItem(ActuallyItems.FOOD_TOAST, "Toast"); + addItem(ActuallyItems.FOOD_SUBMARINE_SANDWICH, "Submarine Sandwich"); + addItem(ActuallyItems.FOOD_BIG_COOKIE, "Big Cookie"); + addItem(ActuallyItems.FOOD_HAMBURGER, "Hamburger"); + addItem(ActuallyItems.FOOD_PIZZA, "Pizza"); + addItem(ActuallyItems.FOOD_BAGUETTE, "Baguette"); + addItem(ActuallyItems.FOOD_RICE, "Rice"); + addItem(ActuallyItems.FOOD_RICE_BREAD, "Rice Bread"); + addItem(ActuallyItems.FOOD_DOUGHNUT, "Doughnut"); + addItem(ActuallyItems.FOOD_TOAST_O_CHOCOLATE, "Toast o' Chocolate"); + addItem(ActuallyItems.FOOD_BACON, "Bacon"); + addItem(ActuallyItems.CU_BA_RA_JAM, "CuBaRa-Jam"); + addItem(ActuallyItems.GRA_KI_BA_JAM, "GraKiBa-Jam"); + addItem(ActuallyItems.PL_AP_LE_JAM, "PlApLe-Jam"); + addItem(ActuallyItems.CH_AP_CI_JAM, "ChApCi-Jam"); + addItem(ActuallyItems.HO_ME_KI_JAM, "HoMeKi-Jam"); + addItem(ActuallyItems.PI_CO_JAM, "PiCo-Jam"); + addItem(ActuallyItems.HO_ME_CO_JAM, "HoMeCo-Jam"); + addItem(ActuallyItems.KNIFE, "Knife"); + addItem(ActuallyItems.CRAFTING_TABLE_ON_A_STICK, "Crafting Table On A Stick"); + addItem(ActuallyItems.CRUSHED_IRON, "Crushed Iron"); + addItem(ActuallyItems.CRUSHED_GOLD, "Crushed Gold"); + addItem(ActuallyItems.CRUSHED_DIAMOND, "Crushed Diamond"); + addItem(ActuallyItems.CRUSHED_EMERALD, "Crushed Emerald"); + addItem(ActuallyItems.CRUSHED_LAPIS, "Crushed Lapis"); + addItem(ActuallyItems.CRUSHED_QUARTZ, "Crushed Quartz"); + addItem(ActuallyItems.CRUSHED_COAL, "Crushed Coal"); + addItem(ActuallyItems.CRUSHED_BLACK_QUARTZ, "Crushed Black Quartz"); + addItem(ActuallyItems.SOLIDIFIED_EXPERIENCE, "Solidified Experience"); + addItem(ActuallyItems.LEAF_BLOWER, "Leaf Blower"); + addItem(ActuallyItems.ADVANCED_LEAF_BLOWER, "Advanced Leaf Blower"); + addItem(ActuallyItems.RING_OF_GROWTH, "Ring of Growth"); + addItem(ActuallyItems.RING_OF_MAGNETIZING, "Ring of Magnetizing"); + addItem(ActuallyItems.RING_OF_SPEED, "Ring of Speed"); + addItem(ActuallyItems.RING_OF_HASTE, "Ring of Haste"); + addItem(ActuallyItems.RING_OF_STRENGTH, "Ring of Strength"); + addItem(ActuallyItems.RING_OF_JUMP_BOOST, "Ring of Jump Boost"); + addItem(ActuallyItems.RING_OF_REGENERATION, "Ring of Regeneration"); + addItem(ActuallyItems.RING_OF_RESISTANCE, "Ring of Resistance"); + addItem(ActuallyItems.RING_OF_FIRE_RESISTANCE, "Ring of Fire Resistance"); + addItem(ActuallyItems.RING_OF_WATER_BREATHING, "Ring of Water Breathing"); + addItem(ActuallyItems.RING_OF_INVISIBILITY, "Ring of Invisibility"); + addItem(ActuallyItems.RING_OF_NIGHT_VISION, "Ring of Night Vision"); + addItem(ActuallyItems.ADVANCED_RING_OF_SPEED, "Advanced Ring of Speed"); + addItem(ActuallyItems.ADVANCED_RING_OF_HASTE, "Advanced Ring of Haste"); + addItem(ActuallyItems.ADVANCED_RING_OF_STRENGTH, "Advanced Ring of Strength"); + addItem(ActuallyItems.ADVANCED_RING_OF_JUMP_BOOST, "Advanced Ring of Jump Boost"); + addItem(ActuallyItems.ADVANCED_RING_OF_REGENERATION, "Advanced Ring of Regeneration"); + addItem(ActuallyItems.ADVANCED_RING_OF_RESISTANCE, "Advanced Ring of Resistance"); + addItem(ActuallyItems.ADVANCED_RING_OF_FIRE_RESISTANCE, "Advanced Ring of Fire Resistance"); + addItem(ActuallyItems.ADVANCED_RING_OF_WATER_BREATHING, "Advanced Ring of Water Breathing"); + addItem(ActuallyItems.ADVANCED_RING_OF_INVISIBILITY, "Advanced Ring of Invisibility"); + addItem(ActuallyItems.ADVANCED_RING_OF_NIGHT_VISION, "Advanced Ring of Night Vision"); + addItem(ActuallyItems.FUR_BALL, "Fur Ball"); + addItem(ActuallyItems.COFFEE_BEANS, "Coffee Beans"); + addItem(ActuallyItems.RICE_SEEDS, "Rice Seeds"); + addItem(ActuallyItems.CANOLA_SEEDS, "Canola Seeds"); + addItem(ActuallyItems.FLAX_SEEDS, "Flax Seeds"); + addItem(ActuallyItems.COFFEE_SEEDS, "Coffee Seeds"); + // Booklet addItem(ActuallyItems.BOOKLET, "Actually Additions Manual"); addPrefixed("tooltip.booklet.manual.one", "Or \"Booklet\", if you will");