Cleanup translation nonsense

ekulxam · ekulxam · commit 70361c5695d7 · 2026-02-06T22:29:14.000-08:00
diff --git a/src/main/java/survivalblock/atmosphere/atmospheric_api/not_mixin/datagen/language/AtmosphericLanguageGenerator.java b/src/main/java/survivalblock/atmosphere/atmospheric_api/not_mixin/datagen/language/AtmosphericLanguageGenerator.java
@@ -0,0 +1,27 @@
+package survivalblock.atmosphere.atmospheric_api.not_mixin.datagen.language;
+
+import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput;
+import net.fabricmc.fabric.api.datagen.v1.provider.FabricLanguageProvider;
+import net.minecraft.core.HolderLookup;
+
+import java.util.concurrent.CompletableFuture;
+
+@SuppressWarnings("unused")
+public abstract class AtmosphericLanguageGenerator extends FabricLanguageProvider {
+    protected AtmosphericLanguageGenerator(FabricDataOutput dataOutput, CompletableFuture<HolderLookup.Provider> registryLookup) {
+        super(dataOutput, registryLookup);
+    }
+
+    protected AtmosphericLanguageGenerator(FabricDataOutput dataOutput, String languageCode, CompletableFuture<HolderLookup.Provider> registryLookup) {
+        super(dataOutput, languageCode, registryLookup);
+    }
+
+    @Override
+    public final void generateTranslations(HolderLookup.Provider registryLookup, TranslationBuilder translationBuilder) {
+        this.generateTranslations(registryLookup, new AtmosphericTranslationBuilder(translationBuilder));
+    }
+
+    public void generateTranslations(HolderLookup.Provider registryLookup, AtmosphericTranslationBuilder translationBuilder) {
+
+    }
+}
diff --git a/src/main/java/survivalblock/atmosphere/atmospheric_api/not_mixin/datagen/language/AtmosphericTranslationBuilder.java b/src/main/java/survivalblock/atmosphere/atmospheric_api/not_mixin/datagen/language/AtmosphericTranslationBuilder.java
@@ -0,0 +1,57 @@
+package survivalblock.atmosphere.atmospheric_api.not_mixin.datagen.language;
+
+import net.fabricmc.fabric.api.datagen.v1.provider.FabricLanguageProvider.TranslationBuilder;
+import net.minecraft.core.HolderLookup;
+import net.minecraft.core.registries.BuiltInRegistries;
+import net.minecraft.resources.ResourceKey;
+import net.minecraft.world.damagesource.DamageType;
+import net.minecraft.world.item.CreativeModeTab;
+import net.minecraft.world.item.enchantment.Enchantment;
+import net.minecraft.world.level.GameRules;
+import org.jetbrains.annotations.Nullable;
+
+@SuppressWarnings("NonExtendableApiUsage") // this is fineeee
+public record AtmosphericTranslationBuilder(TranslationBuilder delegate) implements TranslationBuilder {
+
+    @Override
+    public void add(String translationKey, String value) {
+        this.delegate.add(translationKey, value);
+    }
+
+    public void add(CreativeModeTab itemGroup, String value) {
+        this.add(BuiltInRegistries.CREATIVE_MODE_TAB.getResourceKey(itemGroup).orElseThrow(() -> new IllegalStateException("ItemGroup " + value + " was not found in the registry!")), value);
+    }
+
+    public void add(GameRules.Key<?> rule, String value) {
+        this.add(rule.getDescriptionId(), value);
+    }
+
+    public String getDamageTypeTranslationKey(HolderLookup.Provider lookup, ResourceKey<DamageType> key) {
+        return "death.attack." + lookup.getOrThrow(key).value().msgId();
+    }
+
+    @SuppressWarnings("unused")
+    public void addDamageType(HolderLookup.Provider lookup, ResourceKey<DamageType> key, String value) {
+        this.addDamageType(lookup, key, value, null);
+    }
+
+    public void addDamageType(HolderLookup.Provider lookup, ResourceKey<DamageType> key, String value, @Nullable String player) {
+        this.addDamageType(lookup, key, value, null, null);
+    }
+
+    public void addDamageType(HolderLookup.Provider lookup, ResourceKey<DamageType> key, String value, @Nullable String player, @Nullable String item) {
+        String translation = this.getDamageTypeTranslationKey(lookup, key);
+        this.add(translation, value);
+        if (player != null) {
+            this.add(translation + ".player", value);
+        }
+        if (item != null) {
+            this.add(translation + ".item", value);
+        }
+    }
+
+    @SuppressWarnings("unused")
+    public void addEnchantment(ResourceKey<Enchantment> key, String value) {
+        this.add("enchantment." + key.location().toLanguageKey(), value);
+    }
+}
diff --git a/src/main/java/survivalblock/atmosphere/atmospheric_api/not_mixin/registrant/BlockRegistrant.java b/src/main/java/survivalblock/atmosphere/atmospheric_api/not_mixin/registrant/BlockRegistrant.java
@@ -37,9 +37,4 @@ public <T extends Block, S extends BlockBehaviour.Properties> T register(String
         T block = blockFunction.apply(/*? >=1.21.2 {*/(S)/*?}*/ settings /*? >=1.21.2 {*/.setId(ResourceKey.create(this.registry.key(), this.idFunction.apply(name))) /*?}*/);
         return this.register(name, block);
     }
-
-    @Override
-    public String getTranslationKey(Block block) {
-        return block.getDescriptionId();
-    }
 }
diff --git a/src/main/java/survivalblock/atmosphere/atmospheric_api/not_mixin/registrant/EntityTypeRegistrant.java b/src/main/java/survivalblock/atmosphere/atmospheric_api/not_mixin/registrant/EntityTypeRegistrant.java
@@ -40,9 +40,4 @@ public <T extends Entity> EntityType<T> register(String name, EntityType.Builder
     public <T extends Entity> EntityType<T> register(String name, EntityType<T> entityType) {
         return super.register(name, entityType);
     }
-
-    @Override
-    public String getTranslationKey(EntityType<?> entityType) {
-        return entityType.getDescriptionId();
-    }
 }
diff --git a/src/main/java/survivalblock/atmosphere/atmospheric_api/not_mixin/registrant/ItemGroupRegistrant.java b/src/main/java/survivalblock/atmosphere/atmospheric_api/not_mixin/registrant/ItemGroupRegistrant.java
@@ -7,7 +7,6 @@
 
 import net.minecraft.core.Registry;
 import net.minecraft.core.registries.BuiltInRegistries;
-import net.minecraft.network.chat.contents.TranslatableContents;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.item.CreativeModeTab;
 
@@ -34,12 +33,4 @@ public ItemGroupRegistrant(Function<String, ResourceLocation> idFunction) {
     public CreativeModeTab register(String name, CreativeModeTab.Builder builder) {
         return this.register(name, builder.build());
     }
-
-    @Override
-    public String getTranslationKey(CreativeModeTab itemGroup) {
-        if (itemGroup.getDisplayName().getContents() instanceof TranslatableContents translatable) {
-            return translatable.getKey();
-        }
-        return "itemGroup." + this.registry.getKey(itemGroup).getPath();
-    }
 }
diff --git a/src/main/java/survivalblock/atmosphere/atmospheric_api/not_mixin/registrant/ItemRegistrant.java b/src/main/java/survivalblock/atmosphere/atmospheric_api/not_mixin/registrant/ItemRegistrant.java
@@ -54,9 +54,4 @@ public <T extends Item, S extends Item.Properties> T register(Block block, Funct
         }
         return item;
     }
-
-    @Override
-    public String getTranslationKey(Item item) {
-        return item.getDescriptionId();
-    }
 }
diff --git a/src/main/java/survivalblock/atmosphere/atmospheric_api/not_mixin/registrant/Registrant.java b/src/main/java/survivalblock/atmosphere/atmospheric_api/not_mixin/registrant/Registrant.java
@@ -5,7 +5,6 @@
  */
 package survivalblock.atmosphere.atmospheric_api.not_mixin.registrant;
 
-import net.minecraft.Util;
 import net.minecraft.core.Registry;
 import net.minecraft.resources.ResourceLocation;
 
@@ -27,9 +26,4 @@ public Registrant(Function<String, ResourceLocation> idFunction, Registry<T> reg
     public <U extends T> U register(String name, U obj) {
         return Registry.register(this.registry, this.idFunction.apply(name), obj);
     }
-
-    @SuppressWarnings("unused")
-    public String getTranslationKey(T obj) {
-        return Util.makeDescriptionId(this.registry.key().location().getPath(), this.registry.getKey(obj));
-    }
 }
diff --git a/src/main/java/survivalblock/atmosphere/atmospheric_api/not_mixin/registrant/StatusEffectRegistrant.java b/src/main/java/survivalblock/atmosphere/atmospheric_api/not_mixin/registrant/StatusEffectRegistrant.java
@@ -34,9 +34,4 @@ public StatusEffectRegistrant(Function<String, ResourceLocation> idFunction) {
     public Holder.Reference<MobEffect> registerReference(String name, MobEffect effect) {
         return Registry.registerForHolder(this.registry, this.idFunction.apply(name), effect);
     }
-
-    @Override
-    public String getTranslationKey(MobEffect effect) {
-        return effect.getDescriptionId();
-    }
 }
diff --git a/src/main/java/survivalblock/atmosphere/atmospheric_api/not_mixin/registrant/delayed/DelayedBlockRegistrant.java b/src/main/java/survivalblock/atmosphere/atmospheric_api/not_mixin/registrant/delayed/DelayedBlockRegistrant.java
@@ -37,9 +37,4 @@ public <T extends Block, S extends BlockBehaviour.Properties> T register(String
         T block = blockFunction.apply(/*? >=1.21.2 {*/(S)/*?}*/ settings /*? >=1.21.2 {*/.setId(ResourceKey.create(this.registry.key(), this.idFunction.apply(name))) /*?}*/);
         return this.register(name, block);
     }
-
-    @Override
-    public String getTranslationKey(Block block) {
-        return block.getDescriptionId();
-    }
 }
diff --git a/src/main/java/survivalblock/atmosphere/atmospheric_api/not_mixin/registrant/delayed/DelayedEntityTypeRegistrant.java b/src/main/java/survivalblock/atmosphere/atmospheric_api/not_mixin/registrant/delayed/DelayedEntityTypeRegistrant.java
@@ -40,9 +40,4 @@ public <T extends Entity> EntityType<T> register(String name, EntityType.Builder
     public <T extends Entity> EntityType<T> register(String name, EntityType<T> entityType) {
         return super.register(name, entityType);
     }
-
-    @Override
-    public String getTranslationKey(EntityType<?> entityType) {
-        return entityType.getDescriptionId();
-    }
 }
diff --git a/src/main/java/survivalblock/atmosphere/atmospheric_api/not_mixin/registrant/delayed/DelayedItemGroupRegistrant.java b/src/main/java/survivalblock/atmosphere/atmospheric_api/not_mixin/registrant/delayed/DelayedItemGroupRegistrant.java
@@ -7,7 +7,6 @@
 
 import net.minecraft.core.Registry;
 import net.minecraft.core.registries.BuiltInRegistries;
-import net.minecraft.network.chat.contents.TranslatableContents;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.item.CreativeModeTab;
 
@@ -34,12 +33,4 @@ public DelayedItemGroupRegistrant(Function<String, ResourceLocation> idFunction)
     public CreativeModeTab register(String name, CreativeModeTab.Builder builder) {
         return this.register(name, builder.build());
     }
-
-    @Override
-    public String getTranslationKey(CreativeModeTab itemGroup) {
-        if (itemGroup.getDisplayName().getContents() instanceof TranslatableContents translatable) {
-            return translatable.getKey();
-        }
-        return "itemGroup." + this.registry.getKey(itemGroup).getPath();
-    }
 }
diff --git a/src/main/java/survivalblock/atmosphere/atmospheric_api/not_mixin/registrant/delayed/DelayedItemRegistrant.java b/src/main/java/survivalblock/atmosphere/atmospheric_api/not_mixin/registrant/delayed/DelayedItemRegistrant.java
@@ -54,9 +54,4 @@ public <T extends Item, S extends Item.Properties> T register(Block block, Funct
         }
         return item;
     }
-
-    @Override
-    public String getTranslationKey(Item item) {
-        return item.getDescriptionId();
-    }
 }
diff --git a/src/main/java/survivalblock/atmosphere/atmospheric_api/not_mixin/registrant/delayed/DelayedStatusEffectRegistrant.java b/src/main/java/survivalblock/atmosphere/atmospheric_api/not_mixin/registrant/delayed/DelayedStatusEffectRegistrant.java
@@ -34,9 +34,4 @@ public DelayedStatusEffectRegistrant(Function<String, ResourceLocation> idFuncti
     public Holder.Reference<MobEffect> registerReference(String name, MobEffect effect) {
         return Registry.registerForHolder(this.registry, this.idFunction.apply(name), effect);
     }
-
-    @Override
-    public String getTranslationKey(MobEffect effect) {
-        return effect.getDescriptionId();
-    }
 }
diff --git a/src/main/java/survivalblock/atmosphere/atmospheric_api/not_mixin/registrant/dynamic/DamageTypeRegistrant.java b/src/main/java/survivalblock/atmosphere/atmospheric_api/not_mixin/registrant/dynamic/DamageTypeRegistrant.java
@@ -11,7 +11,6 @@
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.damagesource.DamageType;
 
-import java.util.Objects;
 import java.util.function.Function;
 
 @SuppressWarnings("unused")
@@ -39,17 +38,4 @@ public ResourceKey<DamageType> register(String path, String message) {
     public ResourceKey<DamageType> register(String path, String message, float exhaustion) {
         return this.register(path, new DamageType(message, exhaustion));
     }
-
-    @Override
-    public String getTranslationKey(ResourceKey<DamageType> key) {
-        return "death.attack." + Objects.requireNonNull(this.registered.get(key)).msgId();
-    }
-
-    public String getTranslationKeyPlayer(ResourceKey<DamageType> key) {
-        return this.getTranslationKeyWithSuffix(key, "player");
-    }
-
-    public String getTranslationKeyItem(ResourceKey<DamageType> key) {
-        return this.getTranslationKeyWithSuffix(key, "item");
-    }
 }
diff --git a/src/main/java/survivalblock/atmosphere/atmospheric_api/not_mixin/registrant/dynamic/DynamicRegistrant.java b/src/main/java/survivalblock/atmosphere/atmospheric_api/not_mixin/registrant/dynamic/DynamicRegistrant.java
@@ -6,7 +6,6 @@
 package survivalblock.atmosphere.atmospheric_api.not_mixin.registrant.dynamic;
 
 import net.fabricmc.fabric.impl.datagen.FabricDataGenHelper;
-import net.minecraft.Util;
 import net.minecraft.core.HolderGetter;
 import net.minecraft.core.Registry;
 import net.minecraft.core.RegistrySetBuilder;
@@ -29,7 +28,6 @@ public class DynamicRegistrant<T> {
     protected final ResourceKey<? extends Registry<T>> registry;
 
     protected final Map<ResourceKey<T>, Function<BootstrapContext<T>, T>> toRegister = new HashMap<>();
-    protected final Map<ResourceKey<T>, T> registered = new HashMap<>();
 
     public DynamicRegistrant(String modId, ResourceKey<? extends Registry<T>> registry) {
         this(path -> ResourceLocation.fromNamespaceAndPath(modId, path), registry);
@@ -68,23 +66,11 @@ protected boolean runningDatagen() {
     @SuppressWarnings("unused")
     public void bootstrap(BootstrapContext<T> registerable) {
         for (Map.Entry<ResourceKey<T>, Function<BootstrapContext<T>, T>> entry : this.toRegister.entrySet()) {
-            ResourceKey<T> key = entry.getKey();
-            T value = entry.getValue().apply(registerable);
-
-            registerable.register(key, value);
-            this.registered.put(key, value);
+            registerable.register(entry.getKey(), entry.getValue().apply(registerable));
         }
         this.toRegister.clear();
     }
 
-    public String getTranslationKey(ResourceKey<T> key) {
-        return Util.makeDescriptionId(key.registry().getPath(), key.location());
-    }
-    
-    protected String getTranslationKeyWithSuffix(ResourceKey<T> key, String suffix) {
-        return this.getTranslationKey(key) + "." + suffix;
-    }
-
     public interface Creator<T> {
         BootstrapContext<T> registerable();
 
diff --git a/src/main/java/survivalblock/atmosphere/atmospheric_api/not_mixin/registrant/dynamic/EnchantmentRegistrant.java b/src/main/java/survivalblock/atmosphere/atmospheric_api/not_mixin/registrant/dynamic/EnchantmentRegistrant.java
@@ -54,10 +54,6 @@ public ResourceKey<Enchantment> register(String path, Consumer<EnchantmentCreato
         return key;
     }
 
-    public String getDescriptionKey(ResourceKey<Enchantment> key) {
-        return this.getTranslationKeyWithSuffix(key, "desc");
-    }
-
     @SuppressWarnings("UnusedReturnValue")
     public interface EnchantmentCreator extends Creator<Enchantment> {
 

Original file line number	Diff line number	Diff line change
`@@ -37,9 +37,4 @@ public <T extends Block, S extends BlockBehaviour.Properties> T register(String`
`37`	`37`	`T block = blockFunction.apply(/? >=1.21.2 {/(S)/?}/ settings /? >=1.21.2 {/.setId(ResourceKey.create(this.registry.key(), this.idFunction.apply(name))) /?}/);`
`38`	`38`	`return this.register(name, block);`
`39`	`39`	`}`
`40`		`-`
`41`		`- @Override`
`42`		`- public String getTranslationKey(Block block) {`
`43`		`- return block.getDescriptionId();`
`44`		`- }`
`45`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -40,9 +40,4 @@ public <T extends Entity> EntityType<T> register(String name, EntityType.Builder`
`40`	`40`	`public <T extends Entity> EntityType<T> register(String name, EntityType<T> entityType) {`
`41`	`41`	`return super.register(name, entityType);`
`42`	`42`	`}`
`43`		`-`
`44`		`- @Override`
`45`		`- public String getTranslationKey(EntityType<?> entityType) {`
`46`		`- return entityType.getDescriptionId();`
`47`		`- }`
`48`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -54,9 +54,4 @@ public <T extends Item, S extends Item.Properties> T register(Block block, Funct`
`54`	`54`	`}`
`55`	`55`	`return item;`
`56`	`56`	`}`
`57`		`-`
`58`		`- @Override`
`59`		`- public String getTranslationKey(Item item) {`
`60`		`- return item.getDescriptionId();`
`61`		`- }`
`62`	`57`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,9 +34,4 @@ public StatusEffectRegistrant(Function<String, ResourceLocation> idFunction) {`
`34`	`34`	`public Holder.Reference<MobEffect> registerReference(String name, MobEffect effect) {`
`35`	`35`	`return Registry.registerForHolder(this.registry, this.idFunction.apply(name), effect);`
`36`	`36`	`}`
`37`		`-`
`38`		`- @Override`
`39`		`- public String getTranslationKey(MobEffect effect) {`
`40`		`- return effect.getDescriptionId();`
`41`		`- }`
`42`	`37`	`}`