Added data translations for origins and layers

apace100 · Aug 11, 2020 · 5e1eaaf · 5e1eaaf
1 parent 0e22028
commit 5e1eaaf
Show file tree

Hide file tree

Showing 5 changed files with 75 additions and 7 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -8,7 +8,7 @@ org.gradle.jvmargs=-Xmx1G
 	loader_version=0.9.1+build.205
 
 # Mod Properties
-	mod_version = 1.16.2-0.3.4
+	mod_version = 1.16.2-0.3.5
 	maven_group = io.github.apace100.origins
 	archives_base_name = Origins
 

diff --git a/src/main/java/io/github/apace100/origins/origin/Origin.java b/src/main/java/io/github/apace100/origins/origin/Origin.java
@@ -65,6 +65,9 @@ public static HashMap<OriginLayer, Origin> get(PlayerEntity player) {
     private final int loadingPriority;
     private List<OriginUpgrade> upgrades = new LinkedList<>();
 
+    private String nameTranslationKey;
+    private String descriptionTranslationKey;
+
     protected Origin(Identifier id, ItemConvertible item, Impact impact, int order, int loadingPriority) {
         this.identifier = id;
         this.displayItem = new ItemStack(item);
@@ -106,6 +109,16 @@ protected Origin setUnchoosable() {
         return this;
     }
 
+    private Origin setName(String name) {
+        this.nameTranslationKey = name;
+        return this;
+    }
+
+    private Origin setDescription(String description) {
+        this.descriptionTranslationKey = description;
+        return this;
+    }
+
     public boolean hasPowerType(PowerType<?> powerType) {
         return this.powerTypes.contains(powerType);
     }
@@ -130,12 +143,28 @@ public ItemStack getDisplayItem() {
         return displayItem;
     }
 
+    public String getOrCreateNameTranslationKey() {
+        if(nameTranslationKey == null || nameTranslationKey.isEmpty()) {
+            nameTranslationKey =
+                "origin." + identifier.getNamespace() + "." + identifier.getPath() + ".name";
+        }
+        return nameTranslationKey;
+    }
+
     public TranslatableText getName() {
-        return new TranslatableText("origin." + identifier.getNamespace() + "." + identifier.getPath() + ".name");
+        return new TranslatableText(getOrCreateNameTranslationKey());
+    }
+
+    public String getOrCreateDescriptionTranslationKey() {
+        if(descriptionTranslationKey == null || descriptionTranslationKey.isEmpty()) {
+            descriptionTranslationKey =
+                "origin." + identifier.getNamespace() + "." + identifier.getPath() + ".description";
+        }
+        return descriptionTranslationKey;
     }
 
     public TranslatableText getDescription() {
-        return new TranslatableText("origin." + identifier.getNamespace() + "." + identifier.getPath() + ".description");
+        return new TranslatableText(getOrCreateDescriptionTranslationKey());
     }
 
     public int getOrder() {
@@ -155,6 +184,8 @@ public void write(PacketByteBuf buffer) {
         }
         buffer.writeInt(this.upgrades.size());
         this.upgrades.forEach(upgrade -> upgrade.write(buffer));
+        buffer.writeString(getOrCreateNameTranslationKey());
+        buffer.writeString(getOrCreateDescriptionTranslationKey());
     }
 
     @Environment(EnvType.CLIENT)
@@ -195,6 +226,9 @@ public static Origin read(PacketByteBuf buffer) {
             origin.addUpgrade(OriginUpgrade.read(buffer));
         }
 
+        origin.setName(buffer.readString());
+        origin.setDescription(buffer.readString());
+
         return origin;
     }
 
@@ -244,6 +278,14 @@ public static Origin fromJson(Identifier id, JsonObject json) {
             JsonArray array = json.getAsJsonArray("upgrades");
             array.forEach(jsonElement -> origin.addUpgrade(OriginUpgrade.fromJson(jsonElement)));
         }
+
+        if(json.has("name")) {
+            origin.setName(JsonHelper.getString(json, "name", ""));
+        }
+
+        if(json.has("description")) {
+            origin.setDescription(JsonHelper.getString(json, "description", ""));
+        }
         return origin;
     }
 

diff --git a/src/main/java/io/github/apace100/origins/origin/OriginLayer.java b/src/main/java/io/github/apace100/origins/origin/OriginLayer.java
@@ -12,6 +12,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 public class OriginLayer implements Comparable<OriginLayer> {
 
@@ -20,8 +21,17 @@ public class OriginLayer implements Comparable<OriginLayer> {
     private List<Identifier> origins;
     private boolean enabled = false;
 
+    private String nameTranslationKey;
+
+    public String getOrCreateTranslationKey() {
+        if(nameTranslationKey == null || nameTranslationKey.isEmpty()) {
+            this.nameTranslationKey = "layer." + identifier.getNamespace() + "." + identifier.getPath();
+        }
+        return nameTranslationKey;
+    }
+
     public String getTranslationKey() {
-        return "layer." + identifier.getNamespace() + "." + identifier.getPath();
+        return getOrCreateTranslationKey();
     }
 
     public Identifier getIdentifier() {
@@ -33,7 +43,15 @@ public boolean isEnabled() {
     }
 
     public List<Identifier> getOrigins() {
-        return origins;
+        List<Identifier> filteredOrigins = origins.stream().filter(OriginRegistry::contains).collect(Collectors.toList());
+        if(filteredOrigins.size() < origins.size()) {
+            for (Identifier id : origins) {
+                if(!OriginRegistry.contains(id)) {
+                    Origins.LOGGER.error("Origin layer \"" + identifier.toString() + "\" contained unregistered origin: \"" + id.toString() + "\" (skipping)");
+                }
+            }
+        }
+        return filteredOrigins;
     }
 
     public boolean contains(Origin origin) {
@@ -55,6 +73,9 @@ public void merge(JsonObject json) {
                 Origins.LOGGER.info("Added origin " + identifier.toString() + " to layer " + this.identifier.toString());
             });
         }
+        if(json.has("name")) {
+            this.nameTranslationKey = JsonHelper.getString(json, "name", "");
+        }
     }
 
     @Override
@@ -84,6 +105,7 @@ public void write(PacketByteBuf buffer) {
         buffer.writeBoolean(enabled);
         buffer.writeInt(origins.size());
         origins.forEach(id -> buffer.writeString(id.toString()));
+        buffer.writeString(getOrCreateTranslationKey());
     }
 
     @Environment(EnvType.CLIENT)
@@ -97,6 +119,7 @@ public static OriginLayer read(PacketByteBuf buffer) {
         for(int i = 0; i < originCount; i++) {
             layer.origins.add(Identifier.tryParse(buffer.readString()));
         }
+        layer.nameTranslationKey = buffer.readString();
         return layer;
     }
 
@@ -117,6 +140,7 @@ public static OriginLayer fromJson(Identifier id, JsonObject json) {
         layer.origins = list;
         layer.enabled = enabled;
         layer.identifier = id;
+        layer.nameTranslationKey = JsonHelper.getString(json, "name", "");
         return layer;
     }
 }
diff --git a/src/main/java/io/github/apace100/origins/screen/ChooseOriginScreen.java b/src/main/java/io/github/apace100/origins/screen/ChooseOriginScreen.java
@@ -20,6 +20,7 @@
 import net.minecraft.text.*;
 import net.minecraft.util.Formatting;
 import net.minecraft.util.Identifier;
+import net.minecraft.util.Language;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -189,7 +190,7 @@ private void renderOriginContent(MatrixStack matrices, int mouseX, int mouseY) {
 			if(p.isHidden()) {
 				continue;
 			}
-			MutableText name = (MutableText) textRenderer.trimToWidth(p.getName().formatted(Formatting.UNDERLINE), windowWidth - 36);
+			OrderedText name = Language.getInstance().reorder(textRenderer.trimToWidth(p.getName().formatted(Formatting.UNDERLINE), windowWidth - 36));
 			Text desc = p.getDescription();
 			List<OrderedText> drawLines = textRenderer.wrapLines(desc, windowWidth - 36);
 			if(y >= startY - 24 && y <= endY + 12) {

diff --git a/src/main/java/io/github/apace100/origins/screen/ViewOriginScreen.java b/src/main/java/io/github/apace100/origins/screen/ViewOriginScreen.java
@@ -16,6 +16,7 @@
 import net.minecraft.text.*;
 import net.minecraft.util.Formatting;
 import net.minecraft.util.Identifier;
+import net.minecraft.util.Language;
 import net.minecraft.util.Pair;
 
 import java.util.ArrayList;
@@ -165,7 +166,7 @@ private void renderOriginContent(MatrixStack matrices, int mouseX, int mouseY) {
 			if(p.isHidden()) {
 				continue;
 			}
-			MutableText name = (MutableText) textRenderer.trimToWidth(p.getName().formatted(Formatting.UNDERLINE), windowWidth - 36);
+			OrderedText name = Language.getInstance().reorder(textRenderer.trimToWidth(p.getName().formatted(Formatting.UNDERLINE), windowWidth - 36));
 			Text desc = p.getDescription();
 			List<OrderedText> drawLines = textRenderer.wrapLines(desc, windowWidth - 36);
 			if(y >= startY - 24 && y <= endY + 12) {