Gea/TAIGA
1
0
Fork 0
forked from TAIGA/TAIGA
Code Issues Pull Requests Releases Wiki Activity

reformat

Browse Source
This commit is contained in:
Giovanni Harting
2017-01-04 04:30:22 +01:00
parent 805eb1f5f3
commit f7b9c7f25a
3 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/sosnitzka/taiga/TAIGA.java
View File

@@ -127,8 +127,5 @@ public class TAIGA {
integrateOre("Jauxum", jauxumFluid); integrateOre("Jauxum", jauxumFluid);
// Community Wishlist // Community Wishlist
integrateOre("Dilithium", dilithiumFluid); integrateOre("Dilithium", dilithiumFluid);
} }
} }

7
src/main/java/com/sosnitzka/taiga/book/ContentOres.java
View File

@@ -43,16 +43,13 @@ public class ContentOres extends TinkerPage {
public static final transient ImageData IMG_SLOT_3 = new ImageData(ClientProxy.BOOK_MODIFY, 0, 119, 58, 22, TEX_SIZE, TEX_SIZE); public static final transient ImageData IMG_SLOT_3 = new ImageData(ClientProxy.BOOK_MODIFY, 0, 119, 58, 22, TEX_SIZE, TEX_SIZE);
public static final transient ImageData IMG_SLOT_5 = new ImageData(ClientProxy.BOOK_MODIFY, 0, 141, 58, 41, TEX_SIZE, TEX_SIZE); public static final transient ImageData IMG_SLOT_5 = new ImageData(ClientProxy.BOOK_MODIFY, 0, 141, 58, 41, TEX_SIZE, TEX_SIZE);
public static final transient ImageData IMG_TABLE = new ImageData(ClientProxy.BOOK_MODIFY, 214, 0, 42, 46, TEX_SIZE, TEX_SIZE); public static final transient ImageData IMG_TABLE = new ImageData(ClientProxy.BOOK_MODIFY, 214, 0, 42, 46, TEX_SIZE, TEX_SIZE);
private transient IModifier modifier;
private transient List<Item> tool;
public TextData[] text; public TextData[] text;
public String[] effects; public String[] effects;
@SerializedName("modifier") @SerializedName("modifier")
public String modifierName; public String modifierName;
public String[] demoTool = new String[]{Util.getResource("pickaxe").toString()}; public String[] demoTool = new String[]{Util.getResource("pickaxe").toString()};
private transient IModifier modifier;
private transient List<Item> tool;
public ContentOres() { public ContentOres() {
} }

3
src/main/java/com/sosnitzka/taiga/world/MeteorWorldSaveData.java
View File

@@ -55,7 +55,8 @@ public class MeteorWorldSaveData extends WorldSavedData {
@Override @Override
public void readFromNBT(NBTTagCompound nbt) { public void readFromNBT(NBTTagCompound nbt) {
if (nbt.hasKey("posData") && !nbt.getString("posData").isEmpty()) { if (nbt.hasKey("posData") && !nbt.getString("posData").isEmpty()) {
posList = new Gson().fromJson(nbt.getString("posData"), new TypeToken<List<BlockPos>>(){}.getType()); posList = new Gson().fromJson(nbt.getString("posData"), new TypeToken<List<BlockPos>>() {
}.getType());
} }
} }