Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changed strange list access for items and liquids

Browse Source
This commit is contained in:
Anuken
2017-12-29 19:35:34 -05:00
parent 43e728739a
commit e39f9c624d
6 changed files with 27 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
core/src/io/anuke/mindustry/resource/Item.java
View File

@@ -4,16 +4,16 @@ import com.badlogic.gdx.utils.Array;
import io.anuke.ucore.util.Bundles;
public class Item{
private static final Array<Item> items = new Array<>();
public static final Array<Item> items = new Array<>();
public static final Item stone = new Item("stone");
public static final Item iron = new Item("iron");
public static final Item coal = new Item("coal");
public static final Item steel = new Item("steel");
public static final Item titanium = new Item("titanium");
public static final Item dirium = new Item("dirium");
public static final Item uranium = new Item("uranium");
public static final Item
stone = new Item("stone"),
iron = new Item("iron"),
coal = new Item("coal"),
steel = new Item("steel"),
titanium = new Item("titanium"),
dirium = new Item("dirium"),
uranium = new Item("uranium");
public final int id;
public final String name;
@@ -37,4 +37,8 @@ public class Item{
public static Array<Item> getAllItems() {
return Item.items;
}
public static Item getByID(int id){
return items.get(id);
}
}

15
core/src/io/anuke/mindustry/resource/Liquid.java
View File

@@ -6,12 +6,13 @@ import io.anuke.ucore.util.Bundles;
public class Liquid {
public static final Array<Liquid> liquids = new Array<>();
private static final Array<Liquid> liquids = new Array<>();
public static final Liquid water = new Liquid("water", Color.ROYAL);
public static final Liquid plasma = new Liquid("plasma", Color.CORAL);
public static final Liquid lava = new Liquid("lava", Color.valueOf("ed5334"));
public static final Liquid oil = new Liquid("oil", Color.valueOf("292929"));
public static final Liquid
water = new Liquid("water", Color.ROYAL),
plasma = new Liquid("plasma", Color.CORAL),
lava = new Liquid("lava", Color.valueOf("ed5334")),
oil = new Liquid("oil", Color.valueOf("292929"));
public final Color color;
public final String name;
@@ -38,4 +39,8 @@ public class Liquid {
public static Array<Liquid> getAllLiquids() {
return Liquid.liquids;
}
public static Liquid getByID(int id){
return liquids.get(id);
}
}