summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGiovanni Harting <539@idlegandalf.com>2017-01-04 04:30:22 +0100
committerGiovanni Harting <539@idlegandalf.com>2017-01-04 04:30:22 +0100
commitf7b9c7f25a39b08fbf79a4d535076c3c514448e8 (patch)
treebb41898a87d003d7b089f002845126184dd006a2
parent805eb1f5f307974c030249fa8a79ba76f343b62f (diff)
reformat
-rw-r--r--src/main/java/com/sosnitzka/taiga/TAIGA.java3
-rw-r--r--src/main/java/com/sosnitzka/taiga/book/ContentOres.java7
-rw-r--r--src/main/java/com/sosnitzka/taiga/world/MeteorWorldSaveData.java3
3 files changed, 4 insertions, 9 deletions
diff --git a/src/main/java/com/sosnitzka/taiga/TAIGA.java b/src/main/java/com/sosnitzka/taiga/TAIGA.java
index f22bb15..4c69679 100644
--- a/src/main/java/com/sosnitzka/taiga/TAIGA.java
+++ b/src/main/java/com/sosnitzka/taiga/TAIGA.java
@@ -127,8 +127,5 @@ public class TAIGA {
integrateOre("Jauxum", jauxumFluid);
// Community Wishlist
integrateOre("Dilithium", dilithiumFluid);
-
-
-
}
} \ No newline at end of file
diff --git a/src/main/java/com/sosnitzka/taiga/book/ContentOres.java b/src/main/java/com/sosnitzka/taiga/book/ContentOres.java
index a8375d9..822ed51 100644
--- a/src/main/java/com/sosnitzka/taiga/book/ContentOres.java
+++ b/src/main/java/com/sosnitzka/taiga/book/ContentOres.java
@@ -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_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);
-
- private transient IModifier modifier;
- private transient List<Item> tool;
-
public TextData[] text;
public String[] effects;
-
@SerializedName("modifier")
public String modifierName;
public String[] demoTool = new String[]{Util.getResource("pickaxe").toString()};
+ private transient IModifier modifier;
+ private transient List<Item> tool;
public ContentOres() {
}
diff --git a/src/main/java/com/sosnitzka/taiga/world/MeteorWorldSaveData.java b/src/main/java/com/sosnitzka/taiga/world/MeteorWorldSaveData.java
index b1d49af..660f8d5 100644
--- a/src/main/java/com/sosnitzka/taiga/world/MeteorWorldSaveData.java
+++ b/src/main/java/com/sosnitzka/taiga/world/MeteorWorldSaveData.java
@@ -55,7 +55,8 @@ public class MeteorWorldSaveData extends WorldSavedData {
@Override
public void readFromNBT(NBTTagCompound nbt) {
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());
}
}