From 8e1b671c1305649b1116021693759e8246deb87a Mon Sep 17 00:00:00 2001 From: Curle Date: Fri, 30 Jun 2023 03:30:03 +0100 Subject: [PATCH] Update language datagen --- build.gradle | 2 +- .../java/uk/gemwire/engage/data/lang/EnglishProvider.java | 1 + src/main/resources/assets/engage/lang/en_us.json | 5 ----- 3 files changed, 2 insertions(+), 6 deletions(-) delete mode 100644 src/main/resources/assets/engage/lang/en_us.json diff --git a/build.gradle b/build.gradle index a95e55c..8ad28b3 100644 --- a/build.gradle +++ b/build.gradle @@ -18,7 +18,7 @@ java.toolchain.languageVersion = JavaLanguageVersion.of(17) // Include resources generated by data generators. sourceSets { data - main.resources { srcDirs += 'src/generated/resources' } + main.resources { srcDirs += data.resources.srcDirs } } println "Java: ${System.getProperty 'java.version'}, JVM: ${System.getProperty 'java.vm.version'} (${System.getProperty 'java.vendor'}), Arch: ${System.getProperty 'os.arch'}" diff --git a/src/data/java/uk/gemwire/engage/data/lang/EnglishProvider.java b/src/data/java/uk/gemwire/engage/data/lang/EnglishProvider.java index ad34936..6e1dd09 100644 --- a/src/data/java/uk/gemwire/engage/data/lang/EnglishProvider.java +++ b/src/data/java/uk/gemwire/engage/data/lang/EnglishProvider.java @@ -15,6 +15,7 @@ public class EnglishProvider extends LanguageProvider { @Override protected void addTranslations() { add(Items.BERYLLITE_ORE_ITEM.get(), "Beryllite Ore"); + add(Items.RAW_BERYLLITE_ITEM.get(), "Beryllite"); add(Fluids.HEAVY_WATER_FLUID, "Heavy Water"); add(Fluids.PROPANE_FLUID, "Propane"); add(Fluids.DEUTERIUM_FLUID, "Deuterium"); diff --git a/src/main/resources/assets/engage/lang/en_us.json b/src/main/resources/assets/engage/lang/en_us.json deleted file mode 100644 index 6ddcd5d..0000000 --- a/src/main/resources/assets/engage/lang/en_us.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "block.engage.beryllite_ore": "Beryllite Ore", - "item.engage.beryllite_ore": "Beryllite Ore", - "item.engage.beryllite_raw": "Beryllite" -} \ No newline at end of file