+ * Caching assumes that all Vec3d's are inside the same block + */ + private boolean isVisible(Vec3d start, Vec3d[] targets, int size) { + // start cell coordinate + int x = cameraPos[0]; + int y = cameraPos[1]; + int z = cameraPos[2]; + + for (int v = 0; v < size; v++) { + // ray-casting target + Vec3d target = targets[v]; + + double relativeX = start.x - target.getX(); + double relativeY = start.y - target.getY(); + double relativeZ = start.z - target.getZ(); + + if (allowRayChecks && rayIntersection(lastHitBlock, start, new Vec3d(relativeX, relativeY, relativeZ).normalize())) { + continue; + } + + // horizontal and vertical cell amount spanned + double dimensionX = Math.abs(relativeX); + double dimensionY = Math.abs(relativeY); + double dimensionZ = Math.abs(relativeZ); + + // distance between horizontal intersection points with cell border as a + // fraction of the total Vec3d length + double dimFracX = 1f / dimensionX; + // distance between vertical intersection points with cell border as a fraction + // of the total Vec3d length + double dimFracY = 1f / dimensionY; + double dimFracZ = 1f / dimensionZ; + + // total amount of intersected cells + int intersectCount = 1; + + // 1, 0 or -1 + // determines the direction of the next cell (horizontally / vertically) + int x_inc, y_inc, z_inc; + + // the distance to the next horizontal / vertical intersection point with a cell + // border as a fraction of the total Vec3d length + double t_next_y, t_next_x, t_next_z; + + if (dimensionX == 0f) { + x_inc = 0; + t_next_x = dimFracX; // don't increment horizontally because the Vec3d is perfectly vertical + } else if (target.x > start.x) { + x_inc = 1; // target point is horizontally greater than starting point so increment every + // step by 1 + intersectCount += MathUtilities.floor(target.x) - x; // increment total amount of intersecting cells + t_next_x = (float) ((x + 1 - start.x) * dimFracX); // calculate the next horizontal + // intersection + // point based on the position inside + // the first cell + } else { + x_inc = -1; // target point is horizontally smaller than starting point so reduce every step + // by 1 + intersectCount += x - MathUtilities.floor(target.x); // increment total amount of intersecting cells + t_next_x = (float) ((start.x - x) + * dimFracX); // calculate the next horizontal + // intersection point + // based on the position inside + // the first cell + } + + if (dimensionY == 0f) { + y_inc = 0; + t_next_y = dimFracY; // don't increment vertically because the Vec3d is perfectly horizontal + } else if (target.y > start.y) { + y_inc = 1; // target point is vertically greater than starting point so increment every + // step by 1 + intersectCount += MathUtilities.floor(target.y) - y; // increment total amount of intersecting cells + t_next_y = (float) ((y + 1 - start.y) + * dimFracY); // calculate the next vertical + // intersection + // point based on the position inside + // the first cell + } else { + y_inc = -1; // target point is vertically smaller than starting point so reduce every step + // by 1 + intersectCount += y - MathUtilities.floor(target.y); // increment total amount of intersecting cells + t_next_y = (float) ((start.y - y) + * dimFracY); // calculate the next vertical intersection + // point + // based on the position inside + // the first cell + } + + if (dimensionZ == 0f) { + z_inc = 0; + t_next_z = dimFracZ; // don't increment vertically because the Vec3d is perfectly horizontal + } else if (target.z > start.z) { + z_inc = 1; // target point is vertically greater than starting point so increment every + // step by 1 + intersectCount += MathUtilities.floor(target.z) - z; // increment total amount of intersecting cells + t_next_z = (float) ((z + 1 - start.z) + * dimFracZ); // calculate the next vertical + // intersection + // point based on the position inside + // the first cell + } else { + z_inc = -1; // target point is vertically smaller than starting point so reduce every step + // by 1 + intersectCount += z - MathUtilities.floor(target.z); // increment total amount of intersecting cells + t_next_z = (float) ((start.z - z) + * dimFracZ); // calculate the next vertical intersection + // point + // based on the position inside + // the first cell + } + + boolean finished = stepRay(start, x, y, z, + dimFracX, dimFracY, dimFracZ, intersectCount, x_inc, y_inc, + z_inc, t_next_y, t_next_x, t_next_z); + provider.cleanup(); + if (finished) { + cacheResult(targets[0], true); + return true; + } else { + allowRayChecks = true; + } + } + cacheResult(targets[0], false); + return false; + } + + private boolean stepRay(Vec3d start, int currentX, int currentY, + int currentZ, double distInX, double distInY, + double distInZ, int n, int x_inc, int y_inc, + int z_inc, double t_next_y, double t_next_x, + double t_next_z) { + allowWallClipping = true; // initially allow rays to go through walls till they are on the outside + // iterate through all intersecting cells (n times) + for (; n > 1; n--) { // n-1 times because we don't want to check the last block + // towards - where from + + + // get cached value, 0 means uncached (default) + int cVal = getCacheValue(currentX, currentY, currentZ); + + if (cVal == 2 && !allowWallClipping) { + // block cached as occluding, stop ray + lastHitBlock[0] = currentX; + lastHitBlock[1] = currentY; + lastHitBlock[2] = currentZ; + return false; + } + + if (cVal == 0) { + // save current cell + int chunkX = currentX >> 4; + int chunkZ = currentZ >> 4; + + if (!provider.prepareChunk(chunkX, chunkZ)) { // Chunk not ready + return false; + } + + if (provider.isOpaqueFullCube(currentX, currentY, currentZ)) { + if (!allowWallClipping) { + cache.setLastHidden(); + lastHitBlock[0] = currentX; + lastHitBlock[1] = currentY; + lastHitBlock[2] = currentZ; + return false; + } + } else { + // outside of wall, now clipping is not allowed + allowWallClipping = false; + cache.setLastVisible(); + } + } + + if (cVal == 1) { + // outside of wall, now clipping is not allowed + allowWallClipping = false; + } + + + if (t_next_y < t_next_x && t_next_y < t_next_z) { // next cell is upwards/downwards because the distance to + // the next vertical + // intersection point is smaller than to the next horizontal intersection point + currentY += y_inc; // move up/down + t_next_y += distInY; // update next vertical intersection point + } else if (t_next_x < t_next_y && t_next_x < t_next_z) { // next cell is right/left + currentX += x_inc; // move right/left + t_next_x += distInX; // update next horizontal intersection point + } else { + currentZ += z_inc; // move right/left + t_next_z += distInZ; // update next horizontal intersection point + } + + } + return true; + } + + // -1 = invalid location, 0 = not checked yet, 1 = visible, 2 = occluding + private int getCacheValue(int x, int y, int z) { + x -= cameraPos[0]; + y -= cameraPos[1]; + z -= cameraPos[2]; + if (Math.abs(x) > reach - 2 || Math.abs(y) > reach - 2 + || Math.abs(z) > reach - 2) { + return -1; + } + + // check if target is already known + return cache.getState(x + reach, y + reach, z + reach); + } + + + private void cacheResult(int x, int y, int z, boolean result) { + int cx = x - cameraPos[0] + reach; + int cy = y - cameraPos[1] + reach; + int cz = z - cameraPos[2] + reach; + if (result) { + cache.setVisible(cx, cy, cz); + } else { + cache.setHidden(cx, cy, cz); + } + } + + private void cacheResult(Vec3d vector, boolean result) { + int cx = MathUtilities.floor(vector.x) - cameraPos[0] + reach; + int cy = MathUtilities.floor(vector.y) - cameraPos[1] + reach; + int cz = MathUtilities.floor(vector.z) - cameraPos[2] + reach; + if (result) { + cache.setVisible(cx, cy, cz); + } else { + cache.setHidden(cx, cy, cz); + } + } + + public void resetCache() { + this.cache.resetCache(); + } + + private enum Relative { + INSIDE, POSITIVE, NEGATIVE; + + public static Relative from(int min, int max, int pos) { + if (max > pos && min > pos) { + return POSITIVE; + } else if (min < pos && max < pos) { + return NEGATIVE; + } + return INSIDE; + } + } + +} \ No newline at end of file diff --git a/lophine-server/src/main/java/com/logisticscraft/occlusionculling/cache/ArrayOcclusionCache.java b/lophine-server/src/main/java/com/logisticscraft/occlusionculling/cache/ArrayOcclusionCache.java new file mode 100644 index 0000000..595bf54 --- /dev/null +++ b/lophine-server/src/main/java/com/logisticscraft/occlusionculling/cache/ArrayOcclusionCache.java @@ -0,0 +1,57 @@ +package com.logisticscraft.occlusionculling.cache; + +import java.util.Arrays; + +public class ArrayOcclusionCache implements OcclusionCache { + + private final int reachX2; + private final byte[] cache; + private int positionKey; + private int entry; + private int offset; + + public ArrayOcclusionCache(int reach) { + this.reachX2 = reach * 2; + this.cache = new byte[(reachX2 * reachX2 * reachX2) / 4]; + } + + @Override + public void resetCache() { + Arrays.fill(cache, (byte) 0); + } + + @Override + public void setVisible(int x, int y, int z) { + positionKey = x + y * reachX2 + z * reachX2 * reachX2; + entry = positionKey / 4; + offset = (positionKey % 4) * 2; + cache[entry] |= 1 << offset; + } + + @Override + public void setHidden(int x, int y, int z) { + positionKey = x + y * reachX2 + z * reachX2 * reachX2; + entry = positionKey / 4; + offset = (positionKey % 4) * 2; + cache[entry] |= 1 << offset + 1; + } + + @Override + public int getState(int x, int y, int z) { + positionKey = x + y * reachX2 + z * reachX2 * reachX2; + entry = positionKey / 4; + offset = (positionKey % 4) * 2; + return cache[entry] >> offset & 3; + } + + @Override + public void setLastVisible() { + cache[entry] |= 1 << offset; + } + + @Override + public void setLastHidden() { + cache[entry] |= 1 << offset + 1; + } + +} \ No newline at end of file diff --git a/lophine-server/src/main/java/com/logisticscraft/occlusionculling/cache/OcclusionCache.java b/lophine-server/src/main/java/com/logisticscraft/occlusionculling/cache/OcclusionCache.java new file mode 100644 index 0000000..a5af322 --- /dev/null +++ b/lophine-server/src/main/java/com/logisticscraft/occlusionculling/cache/OcclusionCache.java @@ -0,0 +1,17 @@ +package com.logisticscraft.occlusionculling.cache; + +public interface OcclusionCache { + + void resetCache(); + + void setVisible(int x, int y, int z); + + void setHidden(int x, int y, int z); + + int getState(int x, int y, int z); + + void setLastHidden(); + + void setLastVisible(); + +} \ No newline at end of file diff --git a/lophine-server/src/main/java/com/logisticscraft/occlusionculling/util/MathUtilities.java b/lophine-server/src/main/java/com/logisticscraft/occlusionculling/util/MathUtilities.java new file mode 100644 index 0000000..f044e72 --- /dev/null +++ b/lophine-server/src/main/java/com/logisticscraft/occlusionculling/util/MathUtilities.java @@ -0,0 +1,25 @@ +package com.logisticscraft.occlusionculling.util; + +/** + * Contains MathHelper methods + */ +public final class MathUtilities { + + private MathUtilities() { + } + + public static int floor(double d) { + int i = (int) d; + return d < (double) i ? i - 1 : i; + } + + public static int fastFloor(double d) { + return (int) (d + 1024.0) - 1024; + } + + public static int ceil(double d) { + int i = (int) d; + return d > (double) i ? i + 1 : i; + } + +} \ No newline at end of file diff --git a/lophine-server/src/main/java/com/logisticscraft/occlusionculling/util/Vec3d.java b/lophine-server/src/main/java/com/logisticscraft/occlusionculling/util/Vec3d.java new file mode 100644 index 0000000..4875c46 --- /dev/null +++ b/lophine-server/src/main/java/com/logisticscraft/occlusionculling/util/Vec3d.java @@ -0,0 +1,87 @@ +package com.logisticscraft.occlusionculling.util; + +public class Vec3d { + + public double x; + public double y; + public double z; + + public Vec3d(double x, double y, double z) { + this.x = x; + this.y = y; + this.z = z; + } + + public double getX() { + return x; + } + + public double getY() { + return y; + } + + public double getZ() { + return z; + } + + public void set(double x, double y, double z) { + this.x = x; + this.y = y; + this.z = z; + } + + public void setAdd(Vec3d vec, double x, double y, double z) { + this.x = vec.x + x; + this.y = vec.y + y; + this.z = vec.z + z; + } + + public Vec3d div(Vec3d rayDir) { + this.x /= rayDir.x; + this.z /= rayDir.z; + this.y /= rayDir.y; + return this; + } + + public Vec3d normalize() { + double mag = Math.sqrt(x * x + y * y + z * z); + this.x /= mag; + this.y /= mag; + this.z /= mag; + return this; + } + + public boolean equals(Object other) { + if (this == other) { + return true; + } + if (!(other instanceof Vec3d)) { + return false; + } + Vec3d vec3d = (Vec3d) other; + if (Double.compare(vec3d.x, x) != 0) { + return false; + } + if (Double.compare(vec3d.y, y) != 0) { + return false; + } + return Double.compare(vec3d.z, z) == 0; + } + + @Override + public int hashCode() { + long l = Double.doubleToLongBits(x); + int i = (int) (l ^ l >>> 32); + l = Double.doubleToLongBits(y); + i = 31 * i + (int) (l ^ l >>> 32); + l = Double.doubleToLongBits(z); + i = 31 * i + (int) (l ^ l >>> 32); + return i; + } + + @Override + public String toString() { + return "(" + x + ", " + y + ", " + z + ")"; + } + +} \ No newline at end of file diff --git a/lophine-server/src/main/java/fun/bm/lophine/config/modules/experiment/CommandConfig.java b/lophine-server/src/main/java/fun/bm/lophine/config/modules/experiment/CommandConfig.java index a26fd95..f5c95d4 100644 --- a/lophine-server/src/main/java/fun/bm/lophine/config/modules/experiment/CommandConfig.java +++ b/lophine-server/src/main/java/fun/bm/lophine/config/modules/experiment/CommandConfig.java @@ -2,8 +2,10 @@ package fun.bm.lophine.config.modules.experiment; import me.earthme.luminol.config.EnumConfigCategory; import me.earthme.luminol.config.IConfigModule; +import me.earthme.luminol.config.flags.ConfigClassInfo; import me.earthme.luminol.config.flags.ConfigInfo; +@ConfigClassInfo(configAttribution = EnumConfigCategory.EXPERIMENT, mainName = "command") public class CommandConfig implements IConfigModule { @ConfigInfo(baseName = "tick_command_enabled", comments = """ @@ -15,14 +17,4 @@ public class CommandConfig implements IConfigModule { Allow to use datapack command --- datapack hot-update unsupported, please restart server""") public static boolean datapack = false; - - @Override - public EnumConfigCategory getCategory() { - return EnumConfigCategory.EXPERIMENT; - } - - @Override - public String getBaseName() { - return "command"; - } } \ No newline at end of file diff --git a/lophine-server/src/main/java/fun/bm/lophine/config/modules/experiment/EntityDamageSourceTraceConfig.java b/lophine-server/src/main/java/fun/bm/lophine/config/modules/experiment/EntityDamageSourceTraceConfig.java index b8f810c..3cdaf84 100644 --- a/lophine-server/src/main/java/fun/bm/lophine/config/modules/experiment/EntityDamageSourceTraceConfig.java +++ b/lophine-server/src/main/java/fun/bm/lophine/config/modules/experiment/EntityDamageSourceTraceConfig.java @@ -2,21 +2,13 @@ package fun.bm.lophine.config.modules.experiment; import me.earthme.luminol.config.EnumConfigCategory; import me.earthme.luminol.config.IConfigModule; +import me.earthme.luminol.config.flags.ConfigClassInfo; import me.earthme.luminol.config.flags.ConfigInfo; +@ConfigClassInfo(configAttribution = EnumConfigCategory.EXPERIMENT, mainName = "entity_damage_source_trace") public class EntityDamageSourceTraceConfig implements IConfigModule { @ConfigInfo(baseName = "enabled", comments = """ Allow trace damage source cross different Region Scheduler.""") public static boolean enabled = false; - - @Override - public EnumConfigCategory getCategory() { - return EnumConfigCategory.EXPERIMENT; - } - - @Override - public String getBaseName() { - return "entity_damage_source_trace"; - } } \ No newline at end of file diff --git a/lophine-server/src/main/java/fun/bm/lophine/config/modules/experiment/RayTrackingEntityTrackerConfig.java b/lophine-server/src/main/java/fun/bm/lophine/config/modules/experiment/RayTrackingEntityTrackerConfig.java index 356458f..1bba7c6 100644 --- a/lophine-server/src/main/java/fun/bm/lophine/config/modules/experiment/RayTrackingEntityTrackerConfig.java +++ b/lophine-server/src/main/java/fun/bm/lophine/config/modules/experiment/RayTrackingEntityTrackerConfig.java @@ -2,8 +2,10 @@ package fun.bm.lophine.config.modules.experiment; import me.earthme.luminol.config.EnumConfigCategory; import me.earthme.luminol.config.IConfigModule; +import me.earthme.luminol.config.flags.ConfigClassInfo; import me.earthme.luminol.config.flags.ConfigInfo; +@ConfigClassInfo(configAttribution = EnumConfigCategory.EXPERIMENT, mainName = "ray_tracking_entity_tracker") public class RayTrackingEntityTrackerConfig implements IConfigModule { @ConfigInfo(baseName = "enabled") public static boolean enabled = false; @@ -15,14 +17,4 @@ public class RayTrackingEntityTrackerConfig implements IConfigModule { public static int tracingDistance = 48; @ConfigInfo(baseName = "hitbox_limit") public static int hitboxLimit = 50; - - @Override - public EnumConfigCategory getCategory() { - return EnumConfigCategory.EXPERIMENT; - } - - @Override - public String getBaseName() { - return "ray_tracking_entity_tracker"; - } } \ No newline at end of file diff --git a/lophine-server/src/main/java/fun/bm/lophine/config/modules/experiment/WaypointConfig.java b/lophine-server/src/main/java/fun/bm/lophine/config/modules/experiment/WaypointConfig.java index 699f7e1..90d8917 100644 --- a/lophine-server/src/main/java/fun/bm/lophine/config/modules/experiment/WaypointConfig.java +++ b/lophine-server/src/main/java/fun/bm/lophine/config/modules/experiment/WaypointConfig.java @@ -2,23 +2,15 @@ package fun.bm.lophine.config.modules.experiment; import me.earthme.luminol.config.EnumConfigCategory; import me.earthme.luminol.config.IConfigModule; +import me.earthme.luminol.config.flags.ConfigClassInfo; import me.earthme.luminol.config.flags.ConfigInfo; import me.earthme.luminol.config.flags.TransformedConfig; +@ConfigClassInfo(configAttribution = EnumConfigCategory.EXPERIMENT, mainName = "waypoint_bar") public class WaypointConfig implements IConfigModule { @TransformedConfig(name = "enable-waypoint", category = {"experiment", "waypoint bar"}) @ConfigInfo(baseName = "enabled", comments = """ Enable waypoint bar unsafe""") public static boolean forceEnableWaypointUnsafe = false; - - @Override - public EnumConfigCategory getCategory() { - return EnumConfigCategory.EXPERIMENT; - } - - @Override - public String getBaseName() { - return "waypoint_bar"; - } } diff --git a/lophine-server/src/main/java/fun/bm/lophine/config/modules/misc/ContainerExpansionConfig.java b/lophine-server/src/main/java/fun/bm/lophine/config/modules/misc/ContainerExpansionConfig.java index 7b57f4b..b13e714 100644 --- a/lophine-server/src/main/java/fun/bm/lophine/config/modules/misc/ContainerExpansionConfig.java +++ b/lophine-server/src/main/java/fun/bm/lophine/config/modules/misc/ContainerExpansionConfig.java @@ -2,8 +2,10 @@ package fun.bm.lophine.config.modules.misc; import me.earthme.luminol.config.EnumConfigCategory; import me.earthme.luminol.config.IConfigModule; +import me.earthme.luminol.config.flags.ConfigClassInfo; import me.earthme.luminol.config.flags.ConfigInfo; +@ConfigClassInfo(configAttribution = EnumConfigCategory.MISC, mainName = "container_expansion") public class ContainerExpansionConfig implements IConfigModule { @ConfigInfo(baseName = "barrel_rows", comments = """ @@ -22,14 +24,4 @@ public class ContainerExpansionConfig implements IConfigModule { @ConfigInfo(baseName = "same_nbt_shulker_stackable") public static boolean nbtShulkerStackable = false; - - @Override - public EnumConfigCategory getCategory() { - return EnumConfigCategory.MISC; - } - - @Override - public String getBaseName() { - return "container_expansion"; - } } \ No newline at end of file diff --git a/lophine-server/src/main/java/fun/bm/lophine/config/modules/misc/DisableCheckConfig.java b/lophine-server/src/main/java/fun/bm/lophine/config/modules/misc/DisableCheckConfig.java index 50e9c14..d5a67d4 100644 --- a/lophine-server/src/main/java/fun/bm/lophine/config/modules/misc/DisableCheckConfig.java +++ b/lophine-server/src/main/java/fun/bm/lophine/config/modules/misc/DisableCheckConfig.java @@ -2,8 +2,10 @@ package fun.bm.lophine.config.modules.misc; import me.earthme.luminol.config.EnumConfigCategory; import me.earthme.luminol.config.IConfigModule; +import me.earthme.luminol.config.flags.ConfigClassInfo; import me.earthme.luminol.config.flags.ConfigInfo; +@ConfigClassInfo(configAttribution = EnumConfigCategory.MISC, mainName = "disable_check") public class DisableCheckConfig implements IConfigModule { @ConfigInfo(baseName = "disable-op-move-check", comments = """ Disable the check for the operator's move check""") @@ -12,14 +14,4 @@ public class DisableCheckConfig implements IConfigModule { @ConfigInfo(baseName = "disable-op-fly-check", comments = """ Disable the check for the operator's fly check""") public static boolean disableOpFlyCheck = false; - - @Override - public EnumConfigCategory getCategory() { - return EnumConfigCategory.MISC; - } - - @Override - public String getBaseName() { - return "disable-check"; - } } diff --git a/lophine-server/src/main/java/fun/bm/lophine/config/modules/misc/OldFeatureConfig.java b/lophine-server/src/main/java/fun/bm/lophine/config/modules/misc/OldFeatureConfig.java index a0bddbd..033133a 100644 --- a/lophine-server/src/main/java/fun/bm/lophine/config/modules/misc/OldFeatureConfig.java +++ b/lophine-server/src/main/java/fun/bm/lophine/config/modules/misc/OldFeatureConfig.java @@ -2,9 +2,11 @@ package fun.bm.lophine.config.modules.misc; import me.earthme.luminol.config.EnumConfigCategory; import me.earthme.luminol.config.IConfigModule; +import me.earthme.luminol.config.flags.ConfigClassInfo; import me.earthme.luminol.config.flags.ConfigInfo; import me.earthme.luminol.config.flags.TransformedConfig; +@ConfigClassInfo(configAttribution = EnumConfigCategory.MISC, mainName = "old_feature") public class OldFeatureConfig implements IConfigModule { @ConfigInfo(baseName = "spawn_invulnerable_time") public static boolean spawnInvulnerableTime = false; @@ -18,14 +20,4 @@ public class OldFeatureConfig implements IConfigModule { @TransformedConfig(name = "give_bad_omen_when_kill_raid_captain", category = {"misc", "revert_raid_changes"}, transformComments = false) @ConfigInfo(baseName = "old_raid_behavior") public static boolean oldRaidBehavior = false; - - @Override - public EnumConfigCategory getCategory() { - return EnumConfigCategory.MISC; - } - - @Override - public String getBaseName() { - return "old-feature"; - } } \ No newline at end of file diff --git a/lophine-server/src/main/java/fun/bm/lophine/config/modules/misc/RedStoneConfig.java b/lophine-server/src/main/java/fun/bm/lophine/config/modules/misc/RedStoneConfig.java index 3a200fa..2e5c6c7 100644 --- a/lophine-server/src/main/java/fun/bm/lophine/config/modules/misc/RedStoneConfig.java +++ b/lophine-server/src/main/java/fun/bm/lophine/config/modules/misc/RedStoneConfig.java @@ -2,23 +2,15 @@ package fun.bm.lophine.config.modules.misc; import me.earthme.luminol.config.EnumConfigCategory; import me.earthme.luminol.config.IConfigModule; +import me.earthme.luminol.config.flags.ConfigClassInfo; import me.earthme.luminol.config.flags.ConfigInfo; import me.earthme.luminol.config.flags.TransformedConfig; +@ConfigClassInfo(configAttribution = EnumConfigCategory.MISC, mainName = "redstone") public class RedStoneConfig implements IConfigModule { @TransformedConfig(name = "allow_skip_cooldown", category = {"misc", "redstone"}) @ConfigInfo(baseName = "shears_rotate", comments = """ Allows you to use the Shears to right-click to rotate the block.""") public static boolean shears = false; - - @Override - public EnumConfigCategory getCategory() { - return EnumConfigCategory.MISC; - } - - @Override - public String getBaseName() { - return "redstone"; - } } \ No newline at end of file diff --git a/lophine-server/src/main/java/fun/bm/lophine/config/modules/misc/SurvuxProtocolConfig.java b/lophine-server/src/main/java/fun/bm/lophine/config/modules/misc/SurvuxProtocolConfig.java index d2099f9..fd735e2 100644 --- a/lophine-server/src/main/java/fun/bm/lophine/config/modules/misc/SurvuxProtocolConfig.java +++ b/lophine-server/src/main/java/fun/bm/lophine/config/modules/misc/SurvuxProtocolConfig.java @@ -2,10 +2,12 @@ package fun.bm.lophine.config.modules.misc; import me.earthme.luminol.config.EnumConfigCategory; import me.earthme.luminol.config.IConfigModule; +import me.earthme.luminol.config.flags.ConfigClassInfo; import me.earthme.luminol.config.flags.ConfigInfo; import java.util.List; +@ConfigClassInfo(configAttribution = EnumConfigCategory.MISC, mainName = "survux_protocol") public class SurvuxProtocolConfig implements IConfigModule { @ConfigInfo(baseName = "entity-protocol") public static boolean entityProtocol = false; @@ -33,14 +35,4 @@ public class SurvuxProtocolConfig implements IConfigModule { @ConfigInfo(baseName = "litematics-max-nbt-size") public static int litematicsMaxNbtSize = 2097152; - - @Override - public EnumConfigCategory getCategory() { - return EnumConfigCategory.MISC; - } - - @Override - public String getBaseName() { - return "servux-protocol"; - } } diff --git a/lophine-server/src/main/java/fun/bm/lophine/config/modules/misc/VillagerConfig.java b/lophine-server/src/main/java/fun/bm/lophine/config/modules/misc/VillagerConfig.java index 0fd4d76..201fede 100644 --- a/lophine-server/src/main/java/fun/bm/lophine/config/modules/misc/VillagerConfig.java +++ b/lophine-server/src/main/java/fun/bm/lophine/config/modules/misc/VillagerConfig.java @@ -2,22 +2,16 @@ package fun.bm.lophine.config.modules.misc; import me.earthme.luminol.config.EnumConfigCategory; import me.earthme.luminol.config.IConfigModule; +import me.earthme.luminol.config.flags.ConfigClassInfo; import me.earthme.luminol.config.flags.ConfigInfo; +import me.earthme.luminol.config.flags.TransformedConfig; +@ConfigClassInfo(configAttribution = EnumConfigCategory.MISC, mainName = "villager") public class VillagerConfig implements IConfigModule { + @TransformedConfig(name = "villager-infinite-trade", category = {"misc", "villager-config"}) @ConfigInfo(baseName = "villager-infinite-trade", comments = """ Allow villager infinite trade (limit of 524288 times) ---- we won't edit saved data, only edit in send data to client.""") public static boolean villagerInfiniteTrade = false; - - @Override - public EnumConfigCategory getCategory() { - return EnumConfigCategory.MISC; - } - - @Override - public String getBaseName() { - return "villager-config"; - } } diff --git a/lophine-server/src/main/java/fun/bm/lophine/config/modules/optimizations/LanguageConfig.java b/lophine-server/src/main/java/fun/bm/lophine/config/modules/optimizations/LanguageConfig.java index a8c0ad5..6929d20 100644 --- a/lophine-server/src/main/java/fun/bm/lophine/config/modules/optimizations/LanguageConfig.java +++ b/lophine-server/src/main/java/fun/bm/lophine/config/modules/optimizations/LanguageConfig.java @@ -2,21 +2,13 @@ package fun.bm.lophine.config.modules.optimizations; import me.earthme.luminol.config.EnumConfigCategory; import me.earthme.luminol.config.IConfigModule; +import me.earthme.luminol.config.flags.ConfigClassInfo; import me.earthme.luminol.config.flags.ConfigInfo; +@ConfigClassInfo(configAttribution = EnumConfigCategory.OPTIMIZATIONS, mainName = "language") public class LanguageConfig implements IConfigModule { @ConfigInfo(baseName = "lang", comments = """ Please use the key from https://minecraft.wiki/w/Language Sample of format: en_us zh_cn zh_hk zh_tw""") public static String lang = "en_us"; - - @Override - public EnumConfigCategory getCategory() { - return EnumConfigCategory.OPTIMIZATIONS; - } - - @Override - public String getBaseName() { - return "language"; - } } \ No newline at end of file diff --git a/lophine-server/src/main/java/fun/bm/lophine/config/modules/removed/RemovedConfig.java b/lophine-server/src/main/java/fun/bm/lophine/config/modules/removed/RemovedConfig.java index 8d65f9a..3783fde 100644 --- a/lophine-server/src/main/java/fun/bm/lophine/config/modules/removed/RemovedConfig.java +++ b/lophine-server/src/main/java/fun/bm/lophine/config/modules/removed/RemovedConfig.java @@ -2,9 +2,11 @@ package fun.bm.lophine.config.modules.removed; import me.earthme.luminol.config.EnumConfigCategory; import me.earthme.luminol.config.IConfigModule; +import me.earthme.luminol.config.flags.ConfigClassInfo; import me.earthme.luminol.config.flags.ConfigInfo; import me.earthme.luminol.config.flags.TransformedConfig; +@ConfigClassInfo(configAttribution = EnumConfigCategory.REMOVED, mainName = "removed_config") public class RemovedConfig implements IConfigModule { @TransformedConfig(name = "disable_end_crystal_check", category = {"fixes", "end_crystal"}, transform = false) @TransformedConfig(name = "disable_end_crystal_check", category = {"misc", "end_crystal"}, transform = false) @@ -21,14 +23,4 @@ public class RemovedConfig implements IConfigModule { """ RemovedConfig redirect to here, no any function.""") public static boolean enabled = true; - - @Override - public EnumConfigCategory getCategory() { - return EnumConfigCategory.REMOVED; - } - - @Override - public String getBaseName() { - return "removed_config"; - } } \ No newline at end of file