Skip to content

Commit 0fa15c7

Browse files
committed
move Gson types to own class
1 parent 61f6c0f commit 0fa15c7

6 files changed

Lines changed: 13 additions & 11 deletions

File tree

src/main/java/me/mrnavastar/sqlib/SQLib.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public static Database getDatabase() {
2828
Velocity.init();
2929
return database;
3030
} catch (ClassNotFoundException ignore) {
31-
throw new RuntimeException("SQLib currently only support Fabric, Quilt, and Velocity!");
31+
throw new RuntimeException("SQLib currently only supports Fabric, Quilt, and Velocity!");
3232
}
3333
}
3434

src/main/java/me/mrnavastar/sqlib/api/types/AdventureTypes.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
import net.kyori.adventure.text.minimessage.MiniMessage;
77

88
public class AdventureTypes {
9-
109
public static final SQLibType<Key> KEY = new SQLibType<>(SQLPrimitive.STRING, Key::asMinimalString, Key::key);
1110
public static final SQLibType<Component> COMPONENT = new SQLibType<>(SQLPrimitive.STRING, v -> MiniMessage.miniMessage().serialize(v), v -> MiniMessage.miniMessage().deserialize(v));
1211
}
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
package me.mrnavastar.sqlib.api.types;
2+
3+
import com.google.gson.*;
4+
import me.mrnavastar.sqlib.impl.SQLPrimitive;
5+
6+
public class GsonTypes {
7+
public static final SQLibType<JsonElement> ELEMENT = new SQLibType<>(SQLPrimitive.STRING, JsonElement::toString, JsonParser::parseString);
8+
public static final SQLibType<JsonObject> OBJECT = new SQLibType<>(ELEMENT, v -> v, v -> (JsonObject) v);
9+
public static final SQLibType<JsonArray> ARRAY = new SQLibType<>(ELEMENT, v -> v, v -> (JsonArray) v);
10+
public static final SQLibType<JsonPrimitive> PRIMITIVE = new SQLibType<>(ELEMENT, v -> v, v -> (JsonPrimitive) v);
11+
}

src/main/java/me/mrnavastar/sqlib/api/types/JavaTypes.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
import java.util.Date;
88

99
public class JavaTypes {
10-
1110
// Primitives
1211
public static final SQLibType<Byte> BYTE = new SQLibType<>(SQLPrimitive.INT, Byte::intValue, Integer::byteValue);
1312
public static final SQLibType<byte[]> BYTES = new SQLibType<>(SQLPrimitive.BYTES, v -> v, v -> v);
@@ -19,7 +18,6 @@ public class JavaTypes {
1918
public static final SQLibType<Long> LONG = new SQLibType<>(SQLPrimitive.LONG, v -> v, v -> v);
2019
public static final SQLibType<String> STRING = new SQLibType<>(SQLPrimitive.STRING, v -> v, v -> v);
2120
public static final SQLibType<Character> CHAR = new SQLibType<>(SQLPrimitive.CHAR, v -> v, v -> v);
22-
2321
// Java Data Types
2422
public static final SQLibType<Date> DATE = new SQLibType<>(SQLPrimitive.LONG, Date::getTime, Date::new);
2523
public static final SQLibType<Color> COLOR = new SQLibType<>(SQLPrimitive.INT, Color::getRGB, Color::new);

src/main/java/me/mrnavastar/sqlib/api/types/MinecraftTypes.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
package me.mrnavastar.sqlib.api.types;
22

3-
import com.google.gson.JsonElement;
4-
import com.google.gson.JsonParser;
53
import com.mojang.brigadier.exceptions.CommandSyntaxException;
64
import me.mrnavastar.sqlib.impl.SQLPrimitive;
75
import me.mrnavastar.sqlib.impl.TextParser;
@@ -15,7 +13,6 @@
1513
import net.minecraft.util.math.Vec3i;
1614

1715
public class MinecraftTypes {
18-
1916
public static final SQLibType<Vec3i> VEC3I = new SQLibType<>(SQLPrimitive.LONG, v -> BlockPos.asLong(v.getX(), v.getY(), v.getZ()), v -> new Vec3i(BlockPos.unpackLongX(v), BlockPos.unpackLongY(v), BlockPos.unpackLongZ(v)));
2017
public static final SQLibType<BlockPos> BLOCKPOS = new SQLibType<>(SQLPrimitive.LONG, BlockPos::asLong, BlockPos::fromLong);
2118
public static final SQLibType<ChunkPos> CHUNKPOS = new SQLibType<>(SQLPrimitive.LONG, ChunkPos::toLong, ChunkPos::new);
@@ -24,7 +21,6 @@ public class MinecraftTypes {
2421
public static final SQLibType<Identifier> IDENTIFIER = new SQLibType<>(SQLPrimitive.STRING, Identifier::toString, Identifier::tryParse);
2522
public static final SQLibType<SoundEvent> SOUND = new SQLibType<>(IDENTIFIER, SoundEvent::getId, SoundEvent::of);
2623

27-
public static final SQLibType<JsonElement> JSON = new SQLibType<>(SQLPrimitive.STRING, JsonElement::toString, JsonParser::parseString);
2824
public static final SQLibType<NbtElement> NBT = new SQLibType<>(SQLPrimitive.STRING, NbtElement::toString, v -> {
2925
try {
3026
return StringNbtReader.parse(v);

src/main/java/me/mrnavastar/sqlib/impl/SQLConnection.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,7 @@ public void close() {
4747
}
4848

4949
public void createTable(DataStore store) {
50-
try {
51-
sql.useHandle(h -> h.execute(store.getDatabase().getTableCreationQuery(store.toString())));
52-
} catch (Exception ignore) {}
50+
sql.useHandle(h -> h.execute(store.getDatabase().getTableCreationQuery(store.toString())));
5351
}
5452

5553
public int createRow(DataStore store) {

0 commit comments

Comments
 (0)