From d8fe269327a1a51f2588a3573a4764613da16388 Mon Sep 17 00:00:00 2001 From: Trumeet Date: Tue, 26 Jul 2022 19:06:11 -0700 Subject: Move the mod to mod/ --- src/main/java/moe/ymc/acron/common/Vec2f.java | 25 ----------------- src/main/java/moe/ymc/acron/common/Vec3d.java | 34 ----------------------- src/main/java/moe/ymc/acron/common/WorldKey.java | 35 ------------------------ 3 files changed, 94 deletions(-) delete mode 100644 src/main/java/moe/ymc/acron/common/Vec2f.java delete mode 100644 src/main/java/moe/ymc/acron/common/Vec3d.java delete mode 100644 src/main/java/moe/ymc/acron/common/WorldKey.java (limited to 'src/main/java/moe/ymc/acron/common') diff --git a/src/main/java/moe/ymc/acron/common/Vec2f.java b/src/main/java/moe/ymc/acron/common/Vec2f.java deleted file mode 100644 index 5ab3dfd..0000000 --- a/src/main/java/moe/ymc/acron/common/Vec2f.java +++ /dev/null @@ -1,25 +0,0 @@ -package moe.ymc.acron.common; - -import com.google.gson.*; -import com.google.gson.annotations.SerializedName; - -import java.lang.reflect.Type; - -public record Vec2f(@SerializedName("x") float x, - @SerializedName("y") float y) { - public static class Vec2fDeserializer implements JsonDeserializer { - @Override - public Vec2f deserialize(JsonElement json, - Type typeOfT, - JsonDeserializationContext context) throws JsonParseException { - final JsonObject object = json.getAsJsonObject(); - final float x = object.has("x") ? - object.get("x").getAsFloat() : - 0.0f; - final float y = object.has("y") ? - object.get("y").getAsFloat() : - 0.0f; - return new Vec2f(x, y); - } - } -} \ No newline at end of file diff --git a/src/main/java/moe/ymc/acron/common/Vec3d.java b/src/main/java/moe/ymc/acron/common/Vec3d.java deleted file mode 100644 index 593019f..0000000 --- a/src/main/java/moe/ymc/acron/common/Vec3d.java +++ /dev/null @@ -1,34 +0,0 @@ -package moe.ymc.acron.common; - -import com.google.gson.*; -import com.google.gson.annotations.SerializedName; -import org.jetbrains.annotations.NotNull; - -import java.lang.reflect.Type; - -public record Vec3d(@SerializedName("x") double x, - @SerializedName("y") double y, - @SerializedName("z") double z) { - public Vec3d(@NotNull net.minecraft.util.math.Vec3d vec3d) { - this(vec3d.x, vec3d.y, vec3d.z); - } - - public static class Vec3dDeserializer implements JsonDeserializer { - @Override - public Vec3d deserialize(JsonElement json, - Type typeOfT, - JsonDeserializationContext context) throws JsonParseException { - final JsonObject object = json.getAsJsonObject(); - final double x = object.has("x") ? - object.get("x").getAsDouble() : - 0.0; - final double y = object.has("y") ? - object.get("y").getAsDouble() : - 0.0; - final double z = object.has("z") ? - object.get("z").getAsDouble() : - 0.0; - return new Vec3d(x, y, z); - } - } -} \ No newline at end of file diff --git a/src/main/java/moe/ymc/acron/common/WorldKey.java b/src/main/java/moe/ymc/acron/common/WorldKey.java deleted file mode 100644 index fa10d54..0000000 --- a/src/main/java/moe/ymc/acron/common/WorldKey.java +++ /dev/null @@ -1,35 +0,0 @@ -package moe.ymc.acron.common; - -import com.google.gson.annotations.SerializedName; -import net.minecraft.util.Identifier; -import net.minecraft.world.dimension.DimensionType; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; - -public enum WorldKey { - @SerializedName("overworld") - OVERWORLD, - @SerializedName("nether") - NETHER, - @SerializedName("end") - END; - - private static final Logger LOGGER = LogManager.getLogger(); - - public static @Nullable WorldKey create(@NotNull Identifier identifier) { - if (identifier.equals(DimensionType.OVERWORLD_ID)) { - return OVERWORLD; - } else if (identifier.equals(DimensionType.THE_NETHER_ID)) { - return NETHER; - } else if (identifier.equals(DimensionType.THE_END_ID)) { - return END; - } else { - LOGGER.warn("Unknown world {}:{}. Returning NULL to the client.", - identifier.getNamespace(), - identifier.getPath()); - return null; - } - } -} \ No newline at end of file -- cgit v1.2.3