feat: concatenated language provider

Zepalesque · Zepalesque · commit 21552de89764 · 2025-03-19T18:34:52.000-04:00
diff --git a/src/generated/resources/.cache/0faa503884c6f408c80f571cb8ca032f0614e819 b/src/generated/resources/.cache/0faa503884c6f408c80f571cb8ca032f0614e819
@@ -1,4 +1,4 @@
-// 1.21.1	2025-02-18T17:07:27.5259805	Block States: aether_unity
+// 1.21.1	2025-03-19T18:11:54.4026554	Block States: aether_unity
 133489778ce50978d7fbd2590c21abbdf05a022e assets/aether_unity/blockstates/aether_mud.json
 48538f93b8dfba4395c2eae484b89846b8e2ae28 assets/aether_unity/blockstates/aether_mud_bricks.json
 a1ed75c60de8b85837fd4dd5ec8e42ed40e5fd37 assets/aether_unity/blockstates/aether_mud_brick_slab.json
@@ -33,7 +33,7 @@ aca328c1872547536027b8eb97c735aae0352315 assets/aether_unity/models/block/aether
 73f76ccfab5d340041edd268266d61399e46ca81 assets/aether_unity/models/block/aether_mud_brick_wall_side.json
 4bb383654dfd1b46e1560f6d9269adf0fe98ea10 assets/aether_unity/models/block/aether_mud_brick_wall_side_tall.json
 f18b47792ac9399cd6501b8bf454daba8e4c70cc assets/aether_unity/models/block/ambrosium_campfire.json
-3c0cfe345c048c45879b0b63b2de13431b0e7e5d assets/aether_unity/models/block/ambrosium_campfire_off.json
+3ff986320169da428f052d4ed394b519a8d1968c assets/aether_unity/models/block/ambrosium_campfire_off.json
 47559ff06f33f3d568b17b247637305608934496 assets/aether_unity/models/block/coarse_aether_dirt.json
 a6bd08a7fdeb66a684958e89f5974572ab33398c assets/aether_unity/models/block/enchanted_skyfern.json
 98bad45fb6904ffbbfe280d9e16d7bbdb5bd226b assets/aether_unity/models/block/flutemoss_block.json
diff --git a/src/generated/resources/.cache/27a1529de9b95479f8a1c1de1b2510352436ee2a b/src/generated/resources/.cache/27a1529de9b95479f8a1c1de1b2510352436ee2a
@@ -0,0 +1,11 @@
+// 1.21.1	2025-03-19T18:11:54.3966591	tintable_grass/Block States: aether_unity
+54bda3da23042866a8a48c23b585500ffae81306 packs/aether_unity/resource/tintable_grass/assets/aether/blockstates/aether_grass_block.json
+5a3296139f1dc40700dd3f7dbb45c427b1527854 packs/aether_unity/resource/tintable_grass/assets/aether/blockstates/potted_purple_flower.json
+246b4825d65adc36de81e9a5d1d5750e602e1cfe packs/aether_unity/resource/tintable_grass/assets/aether/blockstates/potted_white_flower.json
+50e657b3bc95a2e0aa7488afe4e01ab9118346c3 packs/aether_unity/resource/tintable_grass/assets/aether/blockstates/purple_flower.json
+982c370ae4cc072d982c5d82a5a6fe0c15f365a3 packs/aether_unity/resource/tintable_grass/assets/aether/blockstates/white_flower.json
+af636e0d141cf5a1eceb691520d58bfb589f4657 packs/aether_unity/resource/tintable_grass/assets/aether_unity/models/block/aether_grass_block.json
+3345af44435cb732d473c9d1dfb1780b9407f805 packs/aether_unity/resource/tintable_grass/assets/aether_unity/models/block/potted_purple_flower.json
+db76544c675e3c9b2a5728ae1fbadd4d07b20841 packs/aether_unity/resource/tintable_grass/assets/aether_unity/models/block/potted_white_flower.json
+a1a3bf0421e573899bc1bde1b77796eb96f7fd1f packs/aether_unity/resource/tintable_grass/assets/aether_unity/models/block/purple_flower.json
+b8c617e08fc1c7f1c523e57e654ead656f918710 packs/aether_unity/resource/tintable_grass/assets/aether_unity/models/block/white_flower.json
diff --git a/src/generated/resources/assets/aether_unity/models/block/ambrosium_campfire_off.json b/src/generated/resources/assets/aether_unity/models/block/ambrosium_campfire_off.json
@@ -1,5 +1,6 @@
 {
   "parent": "aether_unity:block/template/campfire_off",
+  "render_type": "minecraft:cutout",
   "textures": {
     "log": "aether_unity:block/utility/ambrosium_campfire_log"
   }
diff --git a/src/generated/resources/packs/aether_unity/resource/tintable_grass/assets/aether/blockstates/aether_grass_block.json b/src/generated/resources/packs/aether_unity/resource/tintable_grass/assets/aether/blockstates/aether_grass_block.json
@@ -0,0 +1,72 @@
+{
+  "variants": {
+    "double_drops=false,snowy=false": [
+      {
+        "model": "aether_unity:block/aether_grass_block"
+      },
+      {
+        "model": "aether_unity:block/aether_grass_block",
+        "y": 90
+      },
+      {
+        "model": "aether_unity:block/aether_grass_block",
+        "y": 180
+      },
+      {
+        "model": "aether_unity:block/aether_grass_block",
+        "y": 270
+      }
+    ],
+    "double_drops=false,snowy=true": [
+      {
+        "model": "aether:block/aether_grass_block_snow"
+      },
+      {
+        "model": "aether:block/aether_grass_block_snow",
+        "y": 90
+      },
+      {
+        "model": "aether:block/aether_grass_block_snow",
+        "y": 180
+      },
+      {
+        "model": "aether:block/aether_grass_block_snow",
+        "y": 270
+      }
+    ],
+    "double_drops=true,snowy=false": [
+      {
+        "model": "aether_unity:block/aether_grass_block"
+      },
+      {
+        "model": "aether_unity:block/aether_grass_block",
+        "y": 90
+      },
+      {
+        "model": "aether_unity:block/aether_grass_block",
+        "y": 180
+      },
+      {
+        "model": "aether_unity:block/aether_grass_block",
+        "y": 270
+      }
+    ],
+    "double_drops=true,snowy=true": [
+      {
+        "model": "aether:block/aether_grass_block_snow"
+      },
+      {
+        "model": "aether:block/aether_grass_block_snow",
+        "y": 90
+      },
+      {
+        "model": "aether:block/aether_grass_block_snow",
+        "y": 180
+      },
+      {
+        "model": "aether:block/aether_grass_block_snow",
+        "y": 270
+      }
+    ]
+  }
+}
diff --git a/src/generated/resources/packs/aether_unity/resource/tintable_grass/assets/aether/blockstates/potted_purple_flower.json b/src/generated/resources/packs/aether_unity/resource/tintable_grass/assets/aether/blockstates/potted_purple_flower.json
@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "aether_unity:block/potted_purple_flower"
+    }
+  }
+}
diff --git a/src/generated/resources/packs/aether_unity/resource/tintable_grass/assets/aether/blockstates/potted_white_flower.json b/src/generated/resources/packs/aether_unity/resource/tintable_grass/assets/aether/blockstates/potted_white_flower.json
@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "aether_unity:block/potted_white_flower"
+    }
+  }
+}
diff --git a/src/generated/resources/packs/aether_unity/resource/tintable_grass/assets/aether/blockstates/purple_flower.json b/src/generated/resources/packs/aether_unity/resource/tintable_grass/assets/aether/blockstates/purple_flower.json
@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "aether_unity:block/purple_flower"
+    }
+  }
+}
diff --git a/src/generated/resources/packs/aether_unity/resource/tintable_grass/assets/aether/blockstates/white_flower.json b/src/generated/resources/packs/aether_unity/resource/tintable_grass/assets/aether/blockstates/white_flower.json
@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "aether_unity:block/white_flower"
+    }
+  }
+}
diff --git a/src/generated/resources/packs/aether_unity/resource/tintable_grass/assets/aether_unity/models/block/aether_grass_block.json b/src/generated/resources/packs/aether_unity/resource/tintable_grass/assets/aether_unity/models/block/aether_grass_block.json
@@ -0,0 +1,10 @@
+{
+  "parent": "aether_unity:block/template/tinted_grass_block",
+  "textures": {
+    "bottom": "aether:block/natural/aether_dirt",
+    "overlay": "aether:block/natural/aether_grass_block_side_overlay",
+    "particle": "aether:block/natural/aether_dirt",
+    "side": "aether:block/natural/aether_grass_block_top",
+    "top": "aether:block/natural/aether_grass_block_side"
+  }
+}
diff --git a/src/generated/resources/packs/aether_unity/resource/tintable_grass/assets/aether_unity/models/block/potted_purple_flower.json b/src/generated/resources/packs/aether_unity/resource/tintable_grass/assets/aether_unity/models/block/potted_purple_flower.json
@@ -0,0 +1,8 @@
+{
+  "parent": "aether_unity:block/template/pot/flower_pot_tinted_overlay",
+  "render_type": "minecraft:cutout",
+  "textures": {
+    "overlay": "aether_unity:block/natural/purple_flower_overlay",
+    "plant": "aether_unity:block/natural/purple_flower"
+  }
+}
diff --git a/src/generated/resources/packs/aether_unity/resource/tintable_grass/assets/aether_unity/models/block/potted_white_flower.json b/src/generated/resources/packs/aether_unity/resource/tintable_grass/assets/aether_unity/models/block/potted_white_flower.json
@@ -0,0 +1,8 @@
+{
+  "parent": "aether_unity:block/template/pot/flower_pot_tinted_overlay",
+  "render_type": "minecraft:cutout",
+  "textures": {
+    "overlay": "aether_unity:block/natural/white_flower_overlay",
+    "plant": "aether_unity:block/natural/white_flower"
+  }
+}
diff --git a/src/generated/resources/packs/aether_unity/resource/tintable_grass/assets/aether_unity/models/block/purple_flower.json b/src/generated/resources/packs/aether_unity/resource/tintable_grass/assets/aether_unity/models/block/purple_flower.json
@@ -0,0 +1,8 @@
+{
+  "parent": "aether_unity:block/template/cross/cross_tinted_overlay",
+  "render_type": "minecraft:cutout",
+  "textures": {
+    "cross": "aether_unity:block/natural/purple_flower",
+    "overlay": "aether_unity:block/natural/purple_flower_overlay"
+  }
+}
diff --git a/src/generated/resources/packs/aether_unity/resource/tintable_grass/assets/aether_unity/models/block/white_flower.json b/src/generated/resources/packs/aether_unity/resource/tintable_grass/assets/aether_unity/models/block/white_flower.json
@@ -0,0 +1,8 @@
+{
+  "parent": "aether_unity:block/template/cross/cross_tinted_overlay",
+  "render_type": "minecraft:cutout",
+  "textures": {
+    "cross": "aether_unity:block/natural/white_flower",
+    "overlay": "aether_unity:block/natural/white_flower_overlay"
+  }
+}
diff --git a/src/main/java/net/zepalesque/unity/data/prov/ConcatenatedLanguageProvider.java b/src/main/java/net/zepalesque/unity/data/prov/ConcatenatedLanguageProvider.java
@@ -0,0 +1,46 @@
+package net.zepalesque.unity.data.prov;
+
+import net.minecraft.data.CachedOutput;
+import net.minecraft.data.DataProvider;
+import net.minecraft.data.PackOutput;
+import net.neoforged.neoforge.common.data.LanguageProvider;
+import net.zepalesque.unity.mixin.mixins.common.datagen.LangProvAccessor;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.CompletableFuture;
+import java.util.function.BiFunction;
+import java.util.stream.Collectors;
+
+// TODO: use for some stuff
+public abstract class ConcatenatedLanguageProvider<T extends LanguageProvider> implements DataProvider {
+    protected final PackOutput output;
+    protected final String baseModid;
+    protected final BiFunction<PackOutput, String, ? extends T> factory;
+    private final Map<String, T> map = new HashMap<>();
+    
+    public ConcatenatedLanguageProvider(PackOutput output, String baseModid, BiFunction<PackOutput, String, ? extends T> factory) {
+        this.output = output;
+        this.baseModid = baseModid;
+        this.factory = factory;
+    }
+    
+    public abstract void addTranslations();
+    
+    @Override
+    public CompletableFuture<?> run(CachedOutput output) {
+        addTranslations();
+        return CompletableFuture.allOf(this.map.values().stream().map(lang -> lang.run(output)).toArray(CompletableFuture[]::new));
+    }
+    
+    public T get(String modid) {
+        return this.map.computeIfAbsent(modid, s -> factory.apply(this.output, s));
+    }
+    
+    @Override
+    public String getName() {
+        return String.format("Concatenated Languages for %s: %s", baseModid, map.entrySet().stream().map(entry ->
+            String.format("(modid: %s, locale: %s)", entry.getKey(), ((LangProvAccessor)entry.getValue()).getLocale())
+        ).collect(Collectors.toSet()));
+    }
+}
diff --git a/src/main/java/net/zepalesque/unity/mixin/mixins/common/datagen/LangProvAccessor.java b/src/main/java/net/zepalesque/unity/mixin/mixins/common/datagen/LangProvAccessor.java
@@ -0,0 +1,12 @@
+package net.zepalesque.unity.mixin.mixins.common.datagen;
+
+import net.neoforged.neoforge.common.data.LanguageProvider;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Accessor;
+
+@Mixin(LanguageProvider.class)
+public interface LangProvAccessor {
+    
+    @Accessor
+    String getLocale();
+}
diff --git a/src/main/resources/META-INF/accesstransformer.cfg b/src/main/resources/META-INF/accesstransformer.cfg
@@ -2,6 +2,7 @@ public-f net.minecraft.world.level.block.state.BlockBehaviour properties # prope
 public-f net.minecraft.world.level.block.state.BlockBehaviour$Properties destroyTime # destroyTime
 public-f net.minecraft.world.level.block.state.BlockBehaviour$Properties soundType # soundType
 public net.minecraft.data.DataGenerator$PackGenerator <init>(Lnet/minecraft/data/DataGenerator;ZLjava/lang/String;Lnet/minecraft/data/PackOutput;)V # PackGenerator
+#public net.neoforged.neoforge.common.data.LanguageProvider locale # locale
 public net.minecraft.world.level.levelgen.SurfaceRules$SequenceRuleSource
 public-f net.minecraft.world.level.levelgen.NoiseBasedChunkGenerator settings # settings
 public-f net.minecraft.world.level.block.state.BlockBehaviour soundType # soundType
diff --git a/src/main/resources/aether_unity.mixins.json b/src/main/resources/aether_unity.mixins.json
@@ -6,6 +6,7 @@
   "compatibilityLevel": "JAVA_21",
   "refmap": "aether_unity.refmap.json",
   "mixins": [
+    "common.datagen.LangProvAccessor"
   ],
   "client": [
     "client.color.AetherColorResolversMixin"

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"parent": "aether_unity:block/template/campfire_off",`
	`3`	`+ "render_type": "minecraft:cutout",`
`3`	`4`	`"textures": {`
`4`	`5`	`"log": "aether_unity:block/utility/ambrosium_campfire_log"`
`5`	`6`	`}`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,7 @@ @@
 +{
 +  "variants": {
 +    "": {
 +      "model": "aether_unity:block/potted_purple_flower"
 +    }
 +  }
 +}