Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
75 changes: 26 additions & 49 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,68 +1,45 @@
plugins {
base
java
id("io.freefair.lombok") version "9.1.0"
}

buildscript {
repositories {
mavenCentral()
maven("https://plugins.gradle.org/m2/")
}
}

allprojects {
group = "net.swofty"
version = "1.0"

repositories {
mavenLocal()
mavenCentral()
}
}
group = "net.swofty"
version = "1.0"

subprojects {
apply(plugin = "io.freefair.lombok")
apply(plugin = "java")
apply(plugin = "java-library")
apply(plugin = "application")
apply(plugin = "io.freefair.lombok")

plugins.withType<JavaPlugin> {
repositories {
mavenLocal()
mavenCentral()
gradlePluginPortal()
repositories {
mavenCentral()
mavenLocal()
maven("https://repo.viaversion.com")
maven("https://jitpack.io")
}

maven("https://repo.viaversion.com")
maven("https://jitpack.io")
java {
toolchain {
languageVersion.set(JavaLanguageVersion.of(25))
}
}

dependencies {
"testImplementation"("org.junit.jupiter:junit-jupiter:6.0.2")

"implementation"("org.reflections:reflections:0.10.2")
"implementation"("com.fasterxml.jackson.core:jackson-databind:2.17.0")
"implementation"("com.fasterxml.jackson.core:jackson-annotations:2.17.0")
"implementation"("com.fasterxml.jackson.core:jackson-core:2.17.0")
"implementation"("org.json:json:20240303")
"compileOnly"("org.projectlombok:lombok:1.18.42")
}
dependencies {
testImplementation("org.junit.jupiter:junit-jupiter:6.0.2")

tasks.withType<JavaCompile> {
sourceCompatibility = JavaVersion.VERSION_25.toString()
targetCompatibility = JavaVersion.VERSION_25.toString()
options.encoding = "UTF-8"
}
implementation("org.reflections:reflections:0.10.2")
implementation("org.json:json:20240303")

tasks.withType<Test> {
useJUnitPlatform()
}
}
compileOnly("org.projectlombok:lombok:1.18.42")

tasks.named<Zip>("distZip") {
duplicatesStrategy = DuplicatesStrategy.INCLUDE
implementation(platform("tools.jackson:jackson-bom:3.0.3"))
implementation("tools.jackson.core:jackson-core")
implementation("tools.jackson.core:jackson-databind")
implementation("com.fasterxml.jackson.core:jackson-annotations:2.20")
}

tasks.named<Tar>("distTar") {
duplicatesStrategy = DuplicatesStrategy.INCLUDE
tasks.test {
useJUnitPlatform()
}
}
}
Original file line number Diff line number Diff line change
@@ -1,18 +1,19 @@
package net.swofty.commons.protocol;

import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.SerializationFeature;
import lombok.SneakyThrows;
import tools.jackson.databind.DeserializationFeature;
import tools.jackson.databind.SerializationFeature;
import tools.jackson.databind.json.JsonMapper;

public class JacksonSerializer<T> implements Serializer<T> {
private final ObjectMapper mapper;
private final JsonMapper mapper;
private final Class<T> clazz;

public JacksonSerializer(Class<T> clazz) {
this.mapper = new ObjectMapper()
this.mapper = JsonMapper.builder()
.configure(SerializationFeature.FAIL_ON_EMPTY_BEANS, false)
.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)
.build();
this.clazz = clazz;
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,17 +1,13 @@
package net.swofty.commons.protocol.serializers;

import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.databind.DeserializationContext;
import com.fasterxml.jackson.databind.JsonDeserializer;
import com.fasterxml.jackson.databind.JsonNode;
import com.google.gson.*;
import net.minestom.server.item.Material;

import java.io.IOException;
import java.lang.reflect.Type;

public class MaterialDeserializer extends JsonDeserializer<Material> {
public class MaterialDeserializer implements JsonDeserializer<Material> {
@Override
public Material deserialize(JsonParser p, DeserializationContext ctxt) throws IOException {
JsonNode node = p.getCodec().readTree(p);
return Material.fromKey(node.asText());
public Material deserialize(JsonElement jsonElement, Type type, JsonDeserializationContext jsonDeserializationContext) throws JsonParseException {
return Material.fromKey(jsonElement.getAsString());
}
}
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
package net.swofty.commons.protocol.serializers;

import com.fasterxml.jackson.core.JsonGenerator;
import com.fasterxml.jackson.databind.JsonSerializer;
import com.fasterxml.jackson.databind.SerializerProvider;
import com.google.gson.JsonElement;
import com.google.gson.JsonSerializationContext;
import com.google.gson.JsonSerializer;
import net.minestom.server.item.Material;
import java.lang.reflect.Type;

import java.io.IOException;

public class MaterialSerializer extends JsonSerializer<Material> {
public class MaterialSerializer implements JsonSerializer<Material> {
@Override
public void serialize(Material value, JsonGenerator gen, SerializerProvider serializers) throws IOException {
gen.writeString(value.key().asString());
public JsonElement serialize(Material src, Type typeOfSrc, JsonSerializationContext context) {
return context.serialize(src.key().asString());
}
}
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package net.swofty.commons.protocol.serializers;

import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import lombok.SneakyThrows;
import net.swofty.commons.skyblock.PlayerShopData;
import net.swofty.commons.protocol.Serializer;
import tools.jackson.databind.JsonNode;
import tools.jackson.databind.ObjectMapper;

import java.util.Map;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package net.swofty.type.generic.achievement;

import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import net.minestom.server.MinecraftServer;
import net.minestom.server.timer.TaskSchedule;
import net.swofty.type.generic.data.mongodb.UserDatabase;
import org.bson.Document;
import org.tinylog.Logger;
import tools.jackson.databind.JsonNode;
import tools.jackson.databind.ObjectMapper;

import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
Expand Down Expand Up @@ -110,7 +110,7 @@ private static void countPlayerAchievements(String achievementDataJson, Map<Stri

if (achievements == null || !achievements.isObject()) return;

achievements.fields().forEachRemaining(entry -> {
achievements.properties().forEach(entry -> {
String achievementId = entry.getKey();
JsonNode progress = entry.getValue();

Expand All @@ -131,7 +131,8 @@ private static void countPlayerAchievements(String achievementDataJson, Map<Stri
}
}
});
} catch (Exception e) {
} catch (Exception _) {
Logger.warn("Error parsing achievement data JSON");
}
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package net.swofty.type.generic.data;

import com.fasterxml.jackson.core.JsonProcessingException;
import lombok.Getter;
import lombok.SneakyThrows;
import net.minestom.server.MinecraftServer;
Expand All @@ -9,6 +8,7 @@
import net.swofty.type.generic.leaderboard.LeaderboardService;
import net.swofty.type.generic.leaderboard.LeaderboardTracked;
import net.swofty.type.generic.leaderboard.MapLeaderboardTracked;
import tools.jackson.core.JacksonException;

import java.util.Map;
import java.util.Objects;
Expand Down Expand Up @@ -42,7 +42,7 @@ public Datapoint<T> deepClone() {
public Datapoint<T> setUser(DataHandler dataHandler) { this.dataHandler = dataHandler; return this; }
public Datapoint<T> setData(Enum<?> data) { this.data = data; return this; }

public String getSerializedValue() throws JsonProcessingException { return serializer.serialize(value); }
public String getSerializedValue() throws JacksonException { return serializer.serialize(value); }
public void deserializeValue(String json) { this.value = serializer.deserialize(json); }

/** Copy value from another datapoint without triggering onChange. */
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package net.swofty.type.generic.data;

import com.fasterxml.jackson.core.JsonProcessingException;
import lombok.Getter;
import net.kyori.adventure.text.Component;
import net.minestom.server.MinecraftServer;
Expand All @@ -20,6 +19,7 @@
import org.jetbrains.annotations.Blocking;
import org.jetbrains.annotations.Nullable;
import org.tinylog.Logger;
import tools.jackson.core.JacksonException;

import java.util.UUID;
import java.util.function.BiConsumer;
Expand Down Expand Up @@ -76,7 +76,7 @@ public Document toDocument() {
for (Data data : Data.values()) {
try {
document.put(data.getKey(), getDatapoint(data.getKey()).getSerializedValue());
} catch (JsonProcessingException e) {
} catch (JacksonException e) {
Logger.error(e, "Failed to serialize datapoint {} for user {}", data.getKey(), this.uuid);
}
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,24 +1,19 @@
package net.swofty.type.generic.data.handlers;

import com.fasterxml.jackson.core.JsonProcessingException;
import lombok.Getter;
import net.swofty.commons.bedwars.BedwarsGameType;
import net.swofty.type.generic.data.DataHandler;
import net.swofty.type.generic.data.Datapoint;
import net.swofty.type.generic.data.GameDataHandler;
import net.swofty.commons.bedwars.BedWarsModeStats;
import net.swofty.commons.bedwars.LeaderboardPreferences;
import net.swofty.type.generic.data.HypixelDataHandler;
import net.swofty.type.generic.data.datapoints.*;
import net.swofty.type.generic.data.datapoints.DatapointBedWarsModeStats;
import net.swofty.type.generic.data.datapoints.DatapointBedWarsQuickBuy;
import net.swofty.type.generic.data.datapoints.DatapointLeaderboardPreferences;
import net.swofty.type.generic.data.mongodb.UserDatabase;
import net.swofty.type.generic.leaderboard.LeaderboardService;
import net.swofty.type.generic.user.HypixelPlayer;
import org.bson.Document;
import org.jetbrains.annotations.Nullable;
import org.tinylog.Logger;
import tools.jackson.core.JacksonException;

import java.util.HashMap;
import java.util.Map;
Expand Down Expand Up @@ -136,7 +131,7 @@ public Document toDocument() {
for (Data data : Data.values()) {
try {
document.put(data.getKey(), getDatapoint(data.getKey()).getSerializedValue());
} catch (JsonProcessingException e) {
} catch (JacksonException e) {
e.printStackTrace();
}
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
package net.swofty.type.generic.data.handlers;

import com.fasterxml.jackson.core.JsonProcessingException;
import lombok.Getter;
import net.swofty.type.generic.data.DataHandler;
import net.swofty.type.generic.data.Datapoint;
import net.swofty.type.generic.data.GameDataHandler;
import net.swofty.commons.murdermystery.MurderMysteryModeStats;
import net.swofty.type.generic.data.datapoints.*;
import net.swofty.type.generic.user.HypixelPlayer;
import org.bson.Document;
import org.jetbrains.annotations.Nullable;
import org.tinylog.Logger;
import tools.jackson.core.JacksonException;

import java.util.HashMap;
import java.util.Map;
Expand Down Expand Up @@ -120,7 +119,7 @@ public Document toDocument() {
for (Data data : Data.values()) {
try {
document.put(data.getKey(), getDatapoint(data.getKey()).getSerializedValue());
} catch (JsonProcessingException e) {
} catch (JacksonException e) {
e.printStackTrace();
}
}
Expand All @@ -132,7 +131,6 @@ public Datapoint<?> get(Data datapoint) {
return dp != null ? dp : datapoint.defaultDatapoint;
}

@SuppressWarnings("unchecked")
public <R extends Datapoint<?>> R get(Data datapoint, Class<R> type) {
Datapoint<?> dp = this.datapoints.get(datapoint.key);
return (R) (dp != null ? type.cast(dp) : type.cast(datapoint.defaultDatapoint));
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package net.swofty.type.generic.data.handlers;

import com.fasterxml.jackson.core.JsonProcessingException;
import lombok.Getter;
import net.swofty.type.generic.data.DataHandler;
import net.swofty.type.generic.data.Datapoint;
Expand All @@ -10,6 +9,7 @@
import org.bson.Document;
import org.jetbrains.annotations.Nullable;
import org.tinylog.Logger;
import tools.jackson.core.JacksonException;

import java.util.HashMap;
import java.util.Map;
Expand Down Expand Up @@ -113,7 +113,7 @@ public Document toDocument() {
for (Data data : Data.values()) {
try {
document.put(data.getKey(), getDatapoint(data.getKey()).getSerializedValue());
} catch (JsonProcessingException e) {
} catch (JacksonException e) {
Logger.error(e, "Failed to serialize datapoint {} for user {}", data.getKey(), this.uuid);
}
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
package net.swofty.type.generic.data.handlers;

import com.fasterxml.jackson.core.JsonProcessingException;
import lombok.Getter;
import net.swofty.commons.skywars.SkywarsModeStats;
import net.swofty.type.generic.data.DataHandler;
import net.swofty.type.generic.data.Datapoint;
import net.swofty.type.generic.data.GameDataHandler;
Expand All @@ -12,6 +10,7 @@
import org.bson.Document;
import org.jetbrains.annotations.Nullable;
import org.tinylog.Logger;
import tools.jackson.core.JacksonException;

import java.util.HashMap;
import java.util.Map;
Expand Down Expand Up @@ -127,7 +126,7 @@ public Document toDocument() {
for (Data data : Data.values()) {
try {
document.put(data.getKey(), getDatapoint(data.getKey()).getSerializedValue());
} catch (JsonProcessingException e) {
} catch (JacksonException e) {
e.printStackTrace();
}
}
Expand Down
Loading