mirror of
https://github.com/Anuken/Mindustry.git
synced 2026-10-02 11:10:50 +03:00
Fixed compilation
This commit is contained in:
@@ -798,6 +798,7 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
|
||||
updateField(jsonData.get("minimap"));
|
||||
updateField(jsonData.get("light"));
|
||||
json.readFields(this, jsonData);
|
||||
if(jsonData.has("textureName")) setTexture(jsonData.getString("textureName"));
|
||||
}
|
||||
|
||||
public static String fetchText(String text){
|
||||
@@ -825,17 +826,6 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
|
||||
return UI.formatIcons(text);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void write(Json json){
|
||||
json.writeFields(this);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void read(Json json, JsonValue jsonData){
|
||||
json.readFields(this, jsonData);
|
||||
if(jsonData.has("textureName")) setTexture(jsonData.getString("textureName"));
|
||||
}
|
||||
}
|
||||
|
||||
/** A marker that has a position in the world in world coordinates. */
|
||||
@@ -1463,7 +1453,7 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
private static void lookupRegion(Object texture, TextureRegion out){
|
||||
if(texture instanceof String name){
|
||||
TextureRegion region = Core.atlas.find(name);
|
||||
|
||||
@@ -124,7 +124,7 @@ public class ItemSeq implements Iterable<ItemStack>, JsonSerializable{
|
||||
}
|
||||
|
||||
public void add(Item item, int amount){
|
||||
if(item.id >= values.length) return; //content patches can change ID length
|
||||
if(item.id >= values.length) return; //data patches can change item array length
|
||||
values[item.id] += amount;
|
||||
total += amount;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user