Skip to content

Commit 55d7bed

Browse files
committed
really remove GSON code this time
oops
1 parent ad6dd8d commit 55d7bed

10 files changed

Lines changed: 1 addition & 77 deletions

File tree

src/main/java/firemerald/mcms/Main.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ public class Main
8282
{
8383
public static final String ID = "mcms";
8484
public static final String VERSION = "0.2.1";
85-
public static final String BUILD_DATE = "03/14/2022 15:15";
85+
public static final String BUILD_DATE = "03/14/2022 15:25";
8686
public static final Logger LOGGER = LogManager.getLogger("MCMS"); //the main logger;
8787
public static Main instance;
8888
public static final int MIN_W = 640, MIN_H = 480;

src/main/java/firemerald/mcms/api/data/attributes/AttributeBoolean.java

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@
44
import java.io.InputStream;
55
import java.io.OutputStream;
66

7-
import com.google.gson.JsonElement;
8-
import com.google.gson.JsonPrimitive;
9-
107
import firemerald.mcms.api.data.BinaryFormat;
118
import firemerald.mcms.api.util.FileUtil;
129

@@ -89,10 +86,4 @@ public static AttributeBoolean read(InputStream in) throws IOException
8986
{
9087
return new AttributeBoolean(FileUtil.readBoolean(in));
9188
}
92-
93-
@Override
94-
public JsonElement makeElement()
95-
{
96-
return new JsonPrimitive(val);
97-
}
9889
}

src/main/java/firemerald/mcms/api/data/attributes/AttributeByte.java

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@
44
import java.io.InputStream;
55
import java.io.OutputStream;
66

7-
import com.google.gson.JsonElement;
8-
import com.google.gson.JsonPrimitive;
9-
107
import firemerald.mcms.api.data.BinaryFormat;
118
import firemerald.mcms.api.util.FileUtil;
129

@@ -89,10 +86,4 @@ public static AttributeByte read(InputStream in) throws IOException
8986
{
9087
return new AttributeByte(FileUtil.readByte(in));
9188
}
92-
93-
@Override
94-
public JsonElement makeElement()
95-
{
96-
return new JsonPrimitive(val);
97-
}
9889
}

src/main/java/firemerald/mcms/api/data/attributes/AttributeDouble.java

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@
44
import java.io.InputStream;
55
import java.io.OutputStream;
66

7-
import com.google.gson.JsonElement;
8-
import com.google.gson.JsonPrimitive;
9-
107
import firemerald.mcms.api.data.BinaryFormat;
118
import firemerald.mcms.api.util.FileUtil;
129

@@ -89,10 +86,4 @@ public static AttributeDouble read(InputStream in) throws IOException
8986
{
9087
return new AttributeDouble(FileUtil.readDouble(in));
9188
}
92-
93-
@Override
94-
public JsonElement makeElement()
95-
{
96-
return new JsonPrimitive(val);
97-
}
9889
}

src/main/java/firemerald/mcms/api/data/attributes/AttributeFloat.java

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@
44
import java.io.InputStream;
55
import java.io.OutputStream;
66

7-
import com.google.gson.JsonElement;
8-
import com.google.gson.JsonPrimitive;
9-
107
import firemerald.mcms.api.data.BinaryFormat;
118
import firemerald.mcms.api.util.FileUtil;
129

@@ -89,10 +86,4 @@ public static AttributeFloat read(InputStream in) throws IOException
8986
{
9087
return new AttributeFloat(FileUtil.readFloat(in));
9188
}
92-
93-
@Override
94-
public JsonElement makeElement()
95-
{
96-
return new JsonPrimitive(val);
97-
}
9889
}

src/main/java/firemerald/mcms/api/data/attributes/AttributeInt.java

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@
44
import java.io.InputStream;
55
import java.io.OutputStream;
66

7-
import com.google.gson.JsonElement;
8-
import com.google.gson.JsonPrimitive;
9-
107
import firemerald.mcms.api.data.BinaryFormat;
118
import firemerald.mcms.api.util.FileUtil;
129

@@ -89,10 +86,4 @@ public static AttributeInt read(InputStream in) throws IOException
8986
{
9087
return new AttributeInt(FileUtil.readInt(in));
9188
}
92-
93-
@Override
94-
public JsonElement makeElement()
95-
{
96-
return new JsonPrimitive(val);
97-
}
9889
}

src/main/java/firemerald/mcms/api/data/attributes/AttributeLong.java

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@
44
import java.io.InputStream;
55
import java.io.OutputStream;
66

7-
import com.google.gson.JsonElement;
8-
import com.google.gson.JsonPrimitive;
9-
107
import firemerald.mcms.api.data.BinaryFormat;
118
import firemerald.mcms.api.util.FileUtil;
129

@@ -89,10 +86,4 @@ public static AttributeLong read(InputStream in) throws IOException
8986
{
9087
return new AttributeLong(FileUtil.readLong(in));
9188
}
92-
93-
@Override
94-
public JsonElement makeElement()
95-
{
96-
return new JsonPrimitive(val);
97-
}
9889
}

src/main/java/firemerald/mcms/api/data/attributes/AttributeShort.java

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@
44
import java.io.InputStream;
55
import java.io.OutputStream;
66

7-
import com.google.gson.JsonElement;
8-
import com.google.gson.JsonPrimitive;
9-
107
import firemerald.mcms.api.data.BinaryFormat;
118
import firemerald.mcms.api.util.FileUtil;
129

@@ -89,10 +86,4 @@ public static AttributeShort read(InputStream in) throws IOException
8986
{
9087
return new AttributeShort(FileUtil.readShort(in));
9188
}
92-
93-
@Override
94-
public JsonElement makeElement()
95-
{
96-
return new JsonPrimitive(val);
97-
}
9889
}

src/main/java/firemerald/mcms/api/data/attributes/AttributeString.java

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@
44
import java.io.InputStream;
55
import java.io.OutputStream;
66

7-
import com.google.gson.JsonElement;
8-
import com.google.gson.JsonPrimitive;
9-
107
import firemerald.mcms.api.data.BinaryFormat;
118
import firemerald.mcms.api.util.FileUtil;
129

@@ -92,10 +89,4 @@ public static AttributeString read(InputStream in, BinaryFormat format) throws I
9289
{
9390
return new AttributeString(FileUtil.readString(in, format));
9491
}
95-
96-
@Override
97-
public JsonElement makeElement()
98-
{
99-
return new JsonPrimitive(val);
100-
}
10192
}

src/main/java/firemerald/mcms/api/data/attributes/IAttribute.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
import java.io.IOException;
44
import java.io.OutputStream;
55

6-
import com.google.gson.JsonElement;
7-
86
import firemerald.mcms.api.data.BinaryFormat;
97

108
public interface IAttribute
@@ -40,6 +38,4 @@ public interface IAttribute
4038
public <T extends Enum<?>> T getEnum(T[] values) throws Exception;
4139

4240
public void write(OutputStream out, BinaryFormat format) throws IOException;
43-
44-
public JsonElement makeElement();
4541
}

0 commit comments

Comments
 (0)