diff --git a/common/src/main/resources/assets/megacells/lang/en_us.json b/common/src/main/resources/assets/megacells/lang/en_us.json new file mode 100644 index 00000000..aaad52a3 --- /dev/null +++ b/common/src/main/resources/assets/megacells/lang/en_us.json @@ -0,0 +1,101 @@ +{ + "itemGroup.megacells.tab": "MEGA Cells", + + "item.megacells.cell_component_1m": "1M MEGA Storage Component", + "item.megacells.cell_component_4m": "4M MEGA Storage Component", + "item.megacells.cell_component_16m": "16M MEGA Storage Component", + "item.megacells.cell_component_64m": "64M MEGA Storage Component", + "item.megacells.cell_component_256m": "256M MEGA Storage Component", + + "item.megacells.mega_item_cell_housing": "MEGA Item Cell Housing", + "item.megacells.mega_fluid_cell_housing": "MEGA Fluid Cell Housing", + "item.megacells.mega_mana_cell_housing": "MEGA Mana Cell Housing", + "item.megacells.mega_chemical_cell_housing": "MEGA Chemical Cell Housing", + + "item.megacells.item_storage_cell_1m": "1M MEGA Item Storage Cell", + "item.megacells.item_storage_cell_4m": "4M MEGA Item Storage Cell", + "item.megacells.item_storage_cell_16m": "16M MEGA Item Storage Cell", + "item.megacells.item_storage_cell_64m": "64M MEGA Item Storage Cell", + "item.megacells.item_storage_cell_256m": "256M MEGA Item Storage Cell", + + "item.megacells.fluid_storage_cell_1m": "1M MEGA Fluid Storage Cell", + "item.megacells.fluid_storage_cell_4m": "4M MEGA Fluid Storage Cell", + "item.megacells.fluid_storage_cell_16m": "16M MEGA Fluid Storage Cell", + "item.megacells.fluid_storage_cell_64m": "64M MEGA Fluid Storage Cell", + "item.megacells.fluid_storage_cell_256m": "256M MEGA Fluid Storage Cell", + + "item.megacells.mana_storage_cell_1m": "1M MEGA Mana Storage Cell", + "item.megacells.mana_storage_cell_4m": "4M MEGA Mana Storage Cell", + "item.megacells.mana_storage_cell_16m": "16M MEGA Mana Storage Cell", + "item.megacells.mana_storage_cell_64m": "64M MEGA Mana Storage Cell", + "item.megacells.mana_storage_cell_256m": "256M MEGA Mana Storage Cell", + + "item.megacells.chemical_storage_cell_1m": "1M MEGA Chemical Storage Cell", + "item.megacells.chemical_storage_cell_4m": "4M MEGA Chemical Storage Cell", + "item.megacells.chemical_storage_cell_16m": "16M MEGA Chemical Storage Cell", + "item.megacells.chemical_storage_cell_64m": "64M MEGA Chemical Storage Cell", + "item.megacells.chemical_storage_cell_256m": "256M MEGA Chemical Storage Cell", + + "item.megacells.bulk_cell_component": "MEGA Bulk Storage Component", + "item.megacells.bulk_item_cell": "MEGA Bulk Item Storage Cell", + + "item.megacells.radioactive_cell_component": "MEGA Radioactive Storage Component", + "item.megacells.radioactive_chemical_cell": "MEGA Radioactive Chemical Storage Cell", + + "item.megacells.portable_item_cell_1m": "1M Portable Item Cell", + "item.megacells.portable_item_cell_4m": "4M Portable Item Cell", + "item.megacells.portable_item_cell_16m": "16M Portable Item Cell", + "item.megacells.portable_item_cell_64m": "64M Portable Item Cell", + "item.megacells.portable_item_cell_256m": "256M Portable Item Cell", + + "item.megacells.portable_fluid_cell_1m": "1M Portable Fluid Cell", + "item.megacells.portable_fluid_cell_4m": "4M Portable Fluid Cell", + "item.megacells.portable_fluid_cell_16m": "16M Portable Fluid Cell", + "item.megacells.portable_fluid_cell_64m": "64M Portable Fluid Cell", + "item.megacells.portable_fluid_cell_256m": "256M Portable Fluid Cell", + + "item.megacells.portable_mana_cell_1m": "1M Portable Mana Cell", + "item.megacells.portable_mana_cell_4m": "4M Portable Mana Cell", + "item.megacells.portable_mana_cell_16m": "16M Portable Mana Cell", + "item.megacells.portable_mana_cell_64m": "64M Portable Mana Cell", + "item.megacells.portable_mana_cell_256m": "256M Portable Mana Cell", + + "item.megacells.portable_chemical_cell_1m": "1M Portable Chemical Cell", + "item.megacells.portable_chemical_cell_4m": "4M Portable Chemical Cell", + "item.megacells.portable_chemical_cell_16m": "16M Portable Chemical Cell", + "item.megacells.portable_chemical_cell_64m": "64M Portable Chemical Cell", + "item.megacells.portable_chemical_cell_256m": "256M Portable Chemical Cell", + + "item.megacells.compression_card": "Compression Card", + "item.megacells.greater_energy_card": "Greater Energy Card", + + "item.megacells.cable_mega_pattern_provider": "MEGA Pattern Provider", + "item.megacells.decompression_module": "MEGA Decompression Module", + + "item.megacells.decompression_pattern": "Decompression Pattern", + + "block.megacells.1m_crafting_storage": "1M MEGA Crafting Storage", + "block.megacells.4m_crafting_storage": "4M MEGA Crafting Storage", + "block.megacells.16m_crafting_storage": "16M MEGA Crafting Storage", + "block.megacells.64m_crafting_storage": "64M MEGA Crafting Storage", + "block.megacells.256m_crafting_storage": "256M MEGA Crafting Storage", + "block.megacells.mega_crafting_accelerator": "MEGA Crafting Co-Processing Unit", + "block.megacells.mega_crafting_monitor": "MEGA Crafting Monitor", + "block.megacells.mega_crafting_unit": "MEGA Crafting Unit", + "block.megacells.mega_energy_cell": "Superdense Energy Cell", + "block.megacells.mega_pattern_provider": "MEGA Pattern Provider", + + "gui.tooltips.megacells.ALot": "A lot.", + "gui.tooltips.megacells.AcceleratorThreads": "Provides 4 co-processing threads per block.", + "gui.tooltips.megacells.Compression": "Compression: %s", + "gui.tooltips.megacells.Contains": "Contains: %s", + "gui.tooltips.megacells.Disabled": "Disabled", + "gui.tooltips.megacells.Empty": "Empty", + "gui.tooltips.megacells.Enabled": "Enabled", + "gui.tooltips.megacells.FilterChemicalUnsupported": "Filter chemical unsupported!", + "gui.tooltips.megacells.MismatchedFilter": "Mismatched filter!", + "gui.tooltips.megacells.NotPartitioned": "Not Partitioned", + "gui.tooltips.megacells.PartitionedFor": "Partitioned for: %s", + "gui.tooltips.megacells.ProcessingOnly": "Supports processing patterns only.", + "gui.tooltips.megacells.Quantity": "Quantity: %s" +} diff --git a/fabric/src/data/java/gripe/_90/megacells/datagen/LocalisationProvider.java b/fabric/src/data/java/gripe/_90/megacells/datagen/LocalisationProvider.java deleted file mode 100644 index 33bba8b2..00000000 --- a/fabric/src/data/java/gripe/_90/megacells/datagen/LocalisationProvider.java +++ /dev/null @@ -1,25 +0,0 @@ -package gripe._90.megacells.datagen; - -import net.fabricmc.fabric.api.datagen.v1.FabricDataGenerator; -import net.fabricmc.fabric.api.datagen.v1.provider.FabricLanguageProvider; - -import gripe._90.megacells.definition.MEGABlocks; -import gripe._90.megacells.definition.MEGAItems; -import gripe._90.megacells.definition.MEGATranslations; - -class LocalisationProvider extends FabricLanguageProvider { - LocalisationProvider(FabricDataGenerator gen, String locale) { - super(gen, locale); - } - - @Override - public void generateTranslations(TranslationBuilder builder) { - builder.add(MEGAItems.CREATIVE_TAB, "MEGA Cells"); - MEGAItems.getItems().forEach(item -> builder.add(item.asItem(), item.getEnglishName())); - MEGABlocks.getBlocks().forEach(block -> builder.add(block.block(), block.getEnglishName())); - - for (var t : MEGATranslations.values()) { - builder.add(t.getTranslationKey(), t.getEnglishText()); - } - } -} diff --git a/fabric/src/data/java/gripe/_90/megacells/datagen/MEGADataGenerators.java b/fabric/src/data/java/gripe/_90/megacells/datagen/MEGADataGenerators.java index 5035ce78..88a4da03 100644 --- a/fabric/src/data/java/gripe/_90/megacells/datagen/MEGADataGenerators.java +++ b/fabric/src/data/java/gripe/_90/megacells/datagen/MEGADataGenerators.java @@ -13,9 +13,5 @@ public void onInitializeDataGenerator(FabricDataGenerator generator) { generator.addProvider(LootTableProvider::new); generator.addProvider(ModelProvider::new); generator.addProvider(RecipeProvider::new); - - for (var en : new String[] { "en_us", "en_gb", "en_au", "en_ca", "en_nz" }) { - generator.addProvider(new LocalisationProvider(generator, en)); - } } } diff --git a/forge/build.gradle.kts b/forge/build.gradle.kts index 7f3fbfe7..31822d9c 100644 --- a/forge/build.gradle.kts +++ b/forge/build.gradle.kts @@ -115,6 +115,4 @@ tasks.processResources { "ae2VersionEnd" to ae2Version.substringBefore('.').toInt() + 1 )) } - - duplicatesStrategy = DuplicatesStrategy.INCLUDE }