Bugfixes / Added tool to re-format bundles with missing text

cdc0215 · Jul 9, 2018 · b7e28a7 · b7e28a7
1 parent 1e82067
commit b7e28a7
Show file tree

Hide file tree

Showing 19 changed files with 5,563 additions and 5,522 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,6 +2,7 @@
 
 /core/assets/mindustry-saves/
 /core/assets/mindustry-maps/
+/core/assets/bundles/output/
 /deploy/
 /desktop/packr-out/
 /desktop/packr-export/

diff --git a/annotations/src/io/anuke/annotations/Annotations.java b/annotations/src/io/anuke/annotations/Annotations.java
@@ -21,7 +21,7 @@ public class Annotations {
         Variant variants() default Variant.all;
         /**The local locations where this method is called locally, when invoked.*/
         Loc called() default Loc.none;
-        /**Whether to forward this packet to all other clients upon recieval. Server only.*/
+        /**Whether to forward this packet to all other clients upon recieval. Client only.*/
         boolean forward() default false;
         /**Whether the packet for this method is sent with UDP instead of TCP.
          * UDP is faster, but is prone to packet loss and duplication.*/

diff --git a/core/assets/bundles/bundle_de.properties b/core/assets/bundles/bundle_de.properties
diff --git a/core/assets/bundles/bundle_es.properties b/core/assets/bundles/bundle_es.properties
diff --git a/core/assets/bundles/bundle_fr.properties b/core/assets/bundles/bundle_fr.properties
diff --git a/core/assets/bundles/bundle_in_ID.properties b/core/assets/bundles/bundle_in_ID.properties
diff --git a/core/assets/bundles/bundle_ita.properties b/core/assets/bundles/bundle_ita.properties
diff --git a/core/assets/bundles/bundle_ko.properties b/core/assets/bundles/bundle_ko.properties
diff --git a/core/assets/bundles/bundle_pl.properties b/core/assets/bundles/bundle_pl.properties
diff --git a/core/assets/bundles/bundle_pt_BR.properties b/core/assets/bundles/bundle_pt_BR.properties
diff --git a/core/assets/bundles/bundle_ru.properties b/core/assets/bundles/bundle_ru.properties
diff --git a/core/assets/bundles/bundle_tk.properties b/core/assets/bundles/bundle_tk.properties
diff --git a/core/assets/bundles/bundle_uk_UA.properties b/core/assets/bundles/bundle_uk_UA.properties
diff --git a/core/src/io/anuke/mindustry/entities/effect/Fire.java b/core/src/io/anuke/mindustry/entities/effect/Fire.java
@@ -94,6 +94,7 @@ public void update() {
         if(time >= lifetime() || tile == null){
             CallEntity.onFireRemoved(getID());
             remove();
+            return;
         }
 
         TileEntity entity = tile.target().entity;

diff --git a/core/src/io/anuke/mindustry/type/Recipe.java b/core/src/io/anuke/mindustry/type/Recipe.java
@@ -73,6 +73,11 @@ public Recipe setDebug(){
         return this;
     }
 
+    @Override
+    public boolean isHidden() {
+        return debugOnly;
+    }
+
     @Override
     public void displayInfo(Table table) {
         ContentDisplay.displayRecipe(table, this);

diff --git a/core/src/io/anuke/mindustry/world/consumers/Consume.java b/core/src/io/anuke/mindustry/world/consumers/Consume.java
@@ -6,7 +6,7 @@
 
 public abstract class Consume {
     private boolean optional;
-    private boolean update;
+    private boolean update = true;
 
     public Consume optional(boolean optional) {
         this.optional = optional;

diff --git a/core/src/io/anuke/mindustry/world/consumers/ConsumeItems.java b/core/src/io/anuke/mindustry/world/consumers/ConsumeItems.java
@@ -20,9 +20,7 @@ public ItemStack[] getItems() {
 
     @Override
     public void update(Block block, TileEntity entity) {
-        for(ItemStack stack : items){
-            entity.items.remove(stack);
-        }
+
     }
 
     @Override

diff --git a/core/src/io/anuke/mindustry/world/modules/InventoryModule.java b/core/src/io/anuke/mindustry/world/modules/InventoryModule.java
@@ -60,7 +60,6 @@ public boolean hasOne(ItemStack[] stacks){
         return true;
     }
 
-    //TODO optimize!
     public int total(){
         return total;
     }

diff --git a/packer/src/io/anuke/mindustry/BundleLauncher.java b/packer/src/io/anuke/mindustry/BundleLauncher.java
@@ -1,16 +1,73 @@
 package io.anuke.mindustry;
 
+import com.badlogic.gdx.utils.Array;
+import com.badlogic.gdx.utils.ObjectMap;
+import com.badlogic.gdx.utils.OrderedMap;
+import com.badlogic.gdx.utils.PropertiesUtils;
 import io.anuke.ucore.util.Log;
 
 import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.nio.file.Files;
+import java.nio.file.Path;
 import java.nio.file.Paths;
 
 public class BundleLauncher {
 
-    public static void main(String[] args){
+    public static void main(String[] args) throws Exception{
         File file = new File("bundle.properties");
-        Paths.get("").forEach(child -> {
-            Log.info("Directory: {0}", child);
+        OrderedMap<String, String> base = new OrderedMap<>();
+        PropertiesUtils.load(base, new InputStreamReader(new FileInputStream(file)));
+        Array<String> removals = new Array<>();
+
+        Files.walk(Paths.get("")).forEach(child -> {
+            try {
+                if (child.getFileName().toString().equals("bundle.properties") || Files.isDirectory(child) || child.toString().contains("output")) return;
+
+                Log.info("Parsing bundle: {0}", child);
+
+                OrderedMap<String, String> other = new OrderedMap<>();
+                PropertiesUtils.load(other, Files.newBufferedReader(child));
+                removals.clear();
+
+                for(String key : other.orderedKeys()){
+                    if(!base.containsKey(key)){
+                        removals.add(key);
+                        Log.info("&lr- Removing unused key '{0}'...", key);
+                    }
+                }
+                Log.info("&lr{0} keys removed.", removals.size);
+                for(String s : removals){
+                    other.remove(s);
+                }
+
+                int added = 0;
+
+                for(String key : base.orderedKeys()){
+                    if(!other.containsKey(key)){
+                        other.put(key, base.get(key));
+                        added ++;
+                        Log.info("&lc- Adding missing key '{0}'...", key);
+                    }
+                }
+
+                Path output = child.resolveSibling("output/" + child.getFileName());
+
+                Log.info("&lc{0} keys added.", added);
+                Log.info("Writing bundle to {0}", output);
+                StringBuilder result = new StringBuilder();
+                for(ObjectMap.Entry<String, String> e : other.entries()){
+                    result.append(e.toString().replace("\\", "\\\\").replace("\n", "\\n"));
+                    result.append("\n");
+                }
+                Files.write(output, result.toString().getBytes());
+                //PropertiesUtils.store(other, Files.newBufferedWriter(output), null);
+
+            }catch (IOException e){
+                throw new RuntimeException(e);
+            }
         });
     }