diff --git a/.github/workflows/build-and-release.yml b/.github/workflows/build-and-release.yml
deleted file mode 100644
index 1840b8c..0000000
--- a/.github/workflows/build-and-release.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-name: Build JAR on Every Commit
-
-on:
- push:
- branches:
- - main
-
-jobs:
- build:
- runs-on: ubuntu-latest
-
- steps:
- - name: Checkout code
- uses: actions/checkout@v3
-
- - name: Set up Java
- uses: actions/setup-java@v3
- with:
- distribution: 'temurin'
- java-version: '21'
-
- - name: Build with Maven
- run: mvn clean package
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
new file mode 100644
index 0000000..cd36807
--- /dev/null
+++ b/.github/workflows/maven.yml
@@ -0,0 +1,54 @@
+name: Build Plugin
+
+on:
+ workflow_dispatch:
+ push:
+ branches: [main]
+ pull_request:
+
+permissions:
+ contents: write
+ actions: read
+
+concurrency:
+ group: ${{ github.workflow }}-${{ github.ref }}
+ cancel-in-progress: true
+
+jobs:
+ build:
+ runs-on: ubuntu-latest
+
+ steps:
+ - name: Checkout code
+ uses: actions/checkout@v3
+
+ - name: Set up JDK 17
+ uses: actions/setup-java@v3
+ with:
+ distribution: temurin
+ java-version: 17
+
+ - name: Build Plugin
+ run: mvn clean package
+
+ - name: Get short commit hash
+ id: vars
+ run: echo "hash=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
+
+ - name: Upload build
+ uses: actions/upload-artifact@v4
+ with:
+ name: TuffX_${{ steps.vars.outputs.hash }}
+ path: target/TuffX.jar
+
+ - name: Create Release
+ if: github.event_name == 'push' && github.ref == 'refs/heads/main'
+ uses: softprops/action-gh-release@v2
+ with:
+ tag_name: ${{ steps.vars.outputs.hash }}
+ name: Release ${{ steps.vars.outputs.hash }}
+ files: target/TuffX.jar
+ prerelease: true
+ generate_release_notes: true
+ env:
+ GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..0b49d31
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+**/.DS_Store
+**/target/
+/.idea/
\ No newline at end of file
diff --git a/.idea/.gitignore b/.idea/.gitignore
deleted file mode 100644
index a0ccf77..0000000
--- a/.idea/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml
-# Environment-dependent path to Maven home directory
-/mavenHomeManager.xml
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
deleted file mode 100644
index f9233ca..0000000
--- a/.idea/compiler.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
deleted file mode 100644
index aa00ffa..0000000
--- a/.idea/encodings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
deleted file mode 100644
index cbf8af3..0000000
--- a/.idea/jarRepositories.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
deleted file mode 100644
index 9e0563e..0000000
--- a/.idea/misc.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
deleted file mode 100644
index e9a16ca..0000000
--- a/.idea/modules.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
deleted file mode 100644
index 35eb1dd..0000000
--- a/.idea/vcs.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/README.md b/README.md
index 0c4c0d0..0b10282 100644
--- a/README.md
+++ b/README.md
@@ -1 +1,20 @@
-# TuffXPlugin
+# TuffX
+
+
+:-:
+TuffX allowing players to see and beat a trial chamber.
+
+> [!WARNING]
+> This is not a "crack" for Minecraft, it simply allows for better TuffClient integration on servers.
+
+## Quick Start
+Install the latest jar from [releases](https://github.com/TuffNetwork/TuffX-Plugin/releases/latest/) into your server's `plugins` folder. Then, restart your server, and join via TuffClient. You should now be able to use extra features such as below y0 and ViaBlocks!
+
+## Compiling
+```sh
+$ git clone https://github.com/TuffNetwork/TuffX-Plugin
+$ cd TuffX-Plugin
+$ mvn clean install
+```
+
+The built plugin jar will be in the `target` folder.
\ No newline at end of file
diff --git a/dependency-reduced-pom.xml b/dependency-reduced-pom.xml
index e2333d1..b88e45e 100644
--- a/dependency-reduced-pom.xml
+++ b/dependency-reduced-pom.xml
@@ -90,7 +90,7 @@
- 17
UTF-8
+ 17
diff --git a/img/showcase.png b/img/showcase.png
new file mode 100644
index 0000000..50eac91
Binary files /dev/null and b/img/showcase.png differ
diff --git a/src/main/java/net/potato/tuff/ChunkPacketListener.java b/src/main/java/net/potato/tuff/ChunkPacketListener.java
index d8784b9..a6088a8 100644
--- a/src/main/java/net/potato/tuff/ChunkPacketListener.java
+++ b/src/main/java/net/potato/tuff/ChunkPacketListener.java
@@ -8,48 +8,46 @@
import org.bukkit.Chunk;
import org.bukkit.World;
import org.bukkit.entity.Player;
-import net.potato.tuff.TuffX;
public class ChunkPacketListener {
- private static boolean initialized = false;
-
- public static void initialize(TuffX plugin) {
- if (initialized) {
- return;
- }
-
- ProtocolManager protocolManager = ProtocolLibrary.getProtocolManager();
- if (protocolManager == null) {
- plugin.getLogger().severe("Could not initialize ChunkPacketListener because ProtocolManager is null!");
- return;
- }
-
- protocolManager.addPacketListener(
- new PacketAdapter(plugin, PacketType.Play.Server.MAP_CHUNK) {
- @Override
- public void onPacketSending(PacketEvent event) {
- Player player = event.getPlayer();
-
- if (!((TuffX) this.plugin).isPlayerReady(player)) {
- return;
- }
-
- World world = player.getWorld();
- int chunkX = event.getPacket().getIntegers().read(0);
- int chunkZ = event.getPacket().getIntegers().read(1);
-
- plugin.getServer().getScheduler().runTaskAsynchronously(plugin, () -> {
- if (player.isOnline() && world.isChunkLoaded(chunkX, chunkZ)) {
- Chunk chunk = world.getChunkAt(chunkX, chunkZ);
- ((TuffX) this.plugin).processAndSendChunk(player, chunk);
- }
- });
- }
- }
- );
+ private static boolean initialized = false;
+
+ public static void initialize(TuffX plugin) {
+ if (initialized) {
+ return;
+ }
- plugin.getLogger().info("ProtocolLib listener for chunks registered successfully.");
- initialized = true;
+ ProtocolManager protocolManager = ProtocolLibrary.getProtocolManager();
+ if (protocolManager == null) {
+ plugin.getLogger().severe("Could not initialize ChunkPacketListener because ProtocolManager is null!");
+ return;
}
+
+ protocolManager.addPacketListener(
+ new PacketAdapter(plugin, PacketType.Play.Server.MAP_CHUNK) {
+ @Override
+ public void onPacketSending(PacketEvent event) {
+ Player player = event.getPlayer();
+
+ if (!((TuffX) this.plugin).isPlayerReady(player)) {
+ return;
+ }
+
+ World world = player.getWorld();
+ int chunkX = event.getPacket().getIntegers().read(0);
+ int chunkZ = event.getPacket().getIntegers().read(1);
+
+ plugin.getServer().getScheduler().runTaskAsynchronously(plugin, () -> {
+ if (player.isOnline() && world.isChunkLoaded(chunkX, chunkZ)) {
+ Chunk chunk = world.getChunkAt(chunkX, chunkZ);
+ ((TuffX) this.plugin).processAndSendChunk(player, chunk);
+ }
+ });
+ }
+ });
+
+ plugin.getLogger().info("ProtocolLib listener for chunks registered successfully.");
+ initialized = true;
+ }
}
\ No newline at end of file
diff --git a/src/main/java/net/potato/tuff/ChunkSectionKey.java b/src/main/java/net/potato/tuff/ChunkSectionKey.java
index 4814e7c..daf2698 100644
--- a/src/main/java/net/potato/tuff/ChunkSectionKey.java
+++ b/src/main/java/net/potato/tuff/ChunkSectionKey.java
@@ -4,64 +4,66 @@
import java.util.UUID;
public final class ChunkSectionKey {
- private final UUID p;
- private final String w;
- private final int x;
- private final int z;
- private final int y;
+ private final UUID p;
+ private final String w;
+ private final int x;
+ private final int z;
+ private final int y;
- public ChunkSectionKey(UUID p, String w, int x, int z, int y) {
- this.p = p;
- this.w = w;
- this.x = x;
- this.z = z;
- this.y = y;
- }
+ public ChunkSectionKey(UUID p, String w, int x, int z, int y) {
+ this.p = p;
+ this.w = w;
+ this.x = x;
+ this.z = z;
+ this.y = y;
+ }
- public UUID p() {
- return p;
- }
+ public UUID p() {
+ return p;
+ }
- public String w() {
- return w;
- }
+ public String w() {
+ return w;
+ }
- public int x() {
- return x;
- }
+ public int x() {
+ return x;
+ }
- public int z() {
- return z;
- }
+ public int z() {
+ return z;
+ }
- public int y() {
- return y;
- }
+ public int y() {
+ return y;
+ }
- @Override
- public boolean equals(Object o) {
- if (o == this) return true;
- if (o == null || o.getClass() != this.getClass()) return false;
- var t = (ChunkSectionKey) o;
- return Objects.equals(p, t.p) &&
- Objects.equals(w, t.w) &&
- x == t.x &&
- z == t.z &&
- y == t.y;
- }
+ @Override
+ public boolean equals(Object o) {
+ if (o == this)
+ return true;
+ if (o == null || o.getClass() != this.getClass())
+ return false;
+ var t = (ChunkSectionKey) o;
+ return Objects.equals(p, t.p) &&
+ Objects.equals(w, t.w) &&
+ x == t.x &&
+ z == t.z &&
+ y == t.y;
+ }
- @Override
- public int hashCode() {
- return Objects.hash(p, w, x, z, y);
- }
+ @Override
+ public int hashCode() {
+ return Objects.hash(p, w, x, z, y);
+ }
- @Override
- public String toString() {
- return "ChunkSectionKey[" +
- "p=" + p + ", " +
- "w=" + w + ", " +
- "x=" + x + ", " +
- "z=" + z + ", " +
- "y=" + y + ']';
- }
+ @Override
+ public String toString() {
+ return "ChunkSectionKey[" +
+ "p=" + p + ", " +
+ "w=" + w + ", " +
+ "x=" + x + ", " +
+ "z=" + z + ", " +
+ "y=" + y + ']';
+ }
}
diff --git a/src/main/java/net/potato/tuff/LegacyBlockIdManager.java b/src/main/java/net/potato/tuff/LegacyBlockIdManager.java
index 52fe3de..d7bd49a 100644
--- a/src/main/java/net/potato/tuff/LegacyBlockIdManager.java
+++ b/src/main/java/net/potato/tuff/LegacyBlockIdManager.java
@@ -6,38 +6,39 @@
public class LegacyBlockIdManager {
- private static final short[] IC = new short[Material.values().length];
- private static final ObjectOpenHashSet UB = new ObjectOpenHashSet<>();
- private static boolean I = false;
-
- public static void initialize(Plugin p) {
- if (I) return;
-
- for (Material m : Material.values()) {
- if (!m.isBlock()) {
- IC[m.ordinal()] = 0;
- continue;
- }
-
- String bn = m.name().toLowerCase();
- int id = LegacyBlockIds.BLOCK_ID_MAP.getOrDefault(bn, -1);
- int mt = LegacyBlockIds.BLOCK_META_MAP.getOrDefault(bn, 0);
-
- if (id == -1) {
- id = 1;
- if (UB.add(bn)) {
- p.getLogger().warning("Unmapped block: " + bn + ". Defaulting to stone (ID=1).");
- }
- }
-
- IC[m.ordinal()] = (short) ((id & 0xFFF) | ((mt & 0xF) << 12));
+ private static final short[] IC = new short[Material.values().length];
+ private static final ObjectOpenHashSet UB = new ObjectOpenHashSet<>();
+ private static boolean I = false;
+
+ public static void initialize(Plugin p) {
+ if (I)
+ return;
+
+ for (Material m : Material.values()) {
+ if (!m.isBlock()) {
+ IC[m.ordinal()] = 0;
+ continue;
+ }
+
+ String bn = m.name().toLowerCase();
+ int id = LegacyBlockIds.BLOCK_ID_MAP.getOrDefault(bn, -1);
+ int mt = LegacyBlockIds.BLOCK_META_MAP.getOrDefault(bn, 0);
+
+ if (id == -1) {
+ id = 1;
+ if (UB.add(bn)) {
+ p.getLogger().warning("Unmapped block: " + bn + ". Defaulting to stone (ID=1).");
}
-
- I = true;
- p.getLogger().info("Legacy Block ID cache initialized successfully.");
- }
+ }
- public static short getLegacyShort(Material m) {
- return IC[m.ordinal()];
+ IC[m.ordinal()] = (short) ((id & 0xFFF) | ((mt & 0xF) << 12));
}
+
+ I = true;
+ p.getLogger().info("Legacy Block ID cache initialized successfully.");
+ }
+
+ public static short getLegacyShort(Material m) {
+ return IC[m.ordinal()];
+ }
}
diff --git a/src/main/java/net/potato/tuff/LegacyBlockIds.java b/src/main/java/net/potato/tuff/LegacyBlockIds.java
index 2778a83..3b99bc9 100644
--- a/src/main/java/net/potato/tuff/LegacyBlockIds.java
+++ b/src/main/java/net/potato/tuff/LegacyBlockIds.java
@@ -8,329 +8,334 @@
//I forced chatgpt to generate this for me
// I made gemini explain some stuff to me - coleis1op
public class LegacyBlockIds {
- public static final Map BLOCK_ID_MAP = new HashMap<>();
- // Corresponding metadata (0–15) where needed
- public static final Map BLOCK_META_MAP = new HashMap<>();
+ public static final Map BLOCK_ID_MAP = new HashMap<>();
+ // Corresponding metadata (0–15) where needed
+ public static final Map BLOCK_META_MAP = new HashMap<>();
- private static final Set unmapped = new HashSet<>();
+ private static final Set unmapped = new HashSet<>();
- static {
- // —— 0–15 —— basic blocks
- put("air", 0, 0);
- put("stone", 1, 0);
- put("deepslate", 1, 0);
- put("deepslate_tuff", 1, 0);
- put("deepslate_coal_ore", 16, 0);
- put("deepslate_iron_ore", 15, 0);
- put("deepslate_gold_ore", 14, 0);
- put("deepslate_diamond_ore", 56, 0);
- put("deepslate_redstone_ore", 73, 0);
- put("deepslate_lapis_ore", 21, 0);
- put("deepslate_emerald_ore", 129, 0);
- put("grass", 2, 0);
- put("dirt", 3, 0);
- put("cobblestone", 4, 0);
- BLOCK_ID_MAP.put("magma", 87);
- BLOCK_ID_MAP.put("bone_block", 155);
- BLOCK_META_MAP.put("bone_block", 0);
- put("flower_pot_item", 140, 0);
- BLOCK_ID_MAP.put("bed_block", 26);
- BLOCK_META_MAP.put("bed_block", 0);
- BLOCK_ID_MAP.put("red_glazed_terracotta", 159);
- BLOCK_META_MAP.put("red_glazed_terracotta", 14);
- put("wood", 5, 0);
- BLOCK_ID_MAP.put("planks_spruce", 5);
- BLOCK_META_MAP.put("planks_spruce", 1);
+ static {
+ // —— 0–15 —— basic blocks
+ put("air", 0, 0);
+ put("stone", 1, 0);
+ put("deepslate", 1, 0);
+ put("deepslate_tuff", 1, 0);
+ put("deepslate_coal_ore", 16, 0);
+ put("deepslate_iron_ore", 15, 0);
+ put("deepslate_gold_ore", 14, 0);
+ put("deepslate_diamond_ore", 56, 0);
+ put("deepslate_redstone_ore", 73, 0);
+ put("deepslate_lapis_ore", 21, 0);
+ put("deepslate_emerald_ore", 129, 0);
+ put("grass", 2, 0);
+ put("dirt", 3, 0);
+ put("cobblestone", 4, 0);
+ BLOCK_ID_MAP.put("magma", 87);
+ BLOCK_ID_MAP.put("bone_block", 155);
+ BLOCK_META_MAP.put("bone_block", 0);
+ put("flower_pot_item", 140, 0);
+ BLOCK_ID_MAP.put("bed_block", 26);
+ BLOCK_META_MAP.put("bed_block", 0);
+ BLOCK_ID_MAP.put("red_glazed_terracotta", 159);
+ BLOCK_META_MAP.put("red_glazed_terracotta", 14);
+ put("wood", 5, 0);
+ BLOCK_ID_MAP.put("planks_spruce", 5);
+ BLOCK_META_MAP.put("planks_spruce", 1);
- BLOCK_ID_MAP.put("planks_birch", 5);
- BLOCK_META_MAP.put("planks_birch", 2);
+ BLOCK_ID_MAP.put("planks_birch", 5);
+ BLOCK_META_MAP.put("planks_birch", 2);
- BLOCK_ID_MAP.put("planks_jungle", 5);
- BLOCK_META_MAP.put("planks_jungle", 3);
+ BLOCK_ID_MAP.put("planks_jungle", 5);
+ BLOCK_META_MAP.put("planks_jungle", 3);
- BLOCK_ID_MAP.put("planks_acacia", 5);
- BLOCK_META_MAP.put("planks_acacia", 4);
+ BLOCK_ID_MAP.put("planks_acacia", 5);
+ BLOCK_META_MAP.put("planks_acacia", 4);
- BLOCK_ID_MAP.put("planks_dark_oak", 5);
- BLOCK_META_MAP.put("planks_dark_oak", 5);
-
- put("sapling", 6, 0); // meta: 0=oak,1=spruce,2=birch,3=jungle,4=acacia,5=dark_oak
- put("bedrock", 7, 0);
- put("flowing_water", 8, 0);
- put("water", 9, 0);
- put("flowing_lava", 10, 0);
- put("lava", 11, 0);
- put("sand", 12, 0); // meta: 0=sand,1=red_sand
- BLOCK_META_MAP.put("sand_red", 12); // meta 1
- put("gravel", 13, 0);
- put("gold_ore", 14, 0);
- put("iron_ore", 15, 0);
+ BLOCK_ID_MAP.put("planks_dark_oak", 5);
+ BLOCK_META_MAP.put("planks_dark_oak", 5);
- // —— 16–35 —— wood & stone variants
- put("coal_ore", 16, 0);
- put("log", 17, 0); // meta: 0=oak,1=spruce,2=birch,3=jungle
- BLOCK_META_MAP.put("log_spruce",17);
- BLOCK_META_MAP.put("log_birch", 17);
- BLOCK_META_MAP.put("log_jungle",17);
+ put("sapling", 6, 0); // meta: 0=oak,1=spruce,2=birch,3=jungle,4=acacia,5=dark_oak
+ put("bedrock", 7, 0);
+ put("flowing_water", 8, 0);
+ put("water", 9, 0);
+ put("flowing_lava", 10, 0);
+ put("lava", 11, 0);
+ put("sand", 12, 0); // meta: 0=sand,1=red_sand
+ BLOCK_META_MAP.put("sand_red", 12); // meta 1
+ put("gravel", 13, 0);
+ put("gold_ore", 14, 0);
+ put("iron_ore", 15, 0);
- put("leaves", 18, 0); // meta: 0=oak,1=spruce,2=birch,3=jungle
- BLOCK_META_MAP.put("leaves_spruce",18);
- BLOCK_META_MAP.put("leaves_birch", 18);
- BLOCK_META_MAP.put("leaves_jungle",18);
+ // —— 16–35 —— wood & stone variants
+ put("coal_ore", 16, 0);
+ put("log", 17, 0); // meta: 0=oak,1=spruce,2=birch,3=jungle
+ BLOCK_META_MAP.put("log_spruce", 17);
+ BLOCK_META_MAP.put("log_birch", 17);
+ BLOCK_META_MAP.put("log_jungle", 17);
- put("sponge", 19, 0); // meta 1 = wet
- put("glass", 20, 0);
- put("lapis_ore", 21, 0);
- put("lapis_block", 22, 0);
- put("dispenser", 23, 0);
- put("sandstone", 24, 0); // meta: 0=normal,1=chiseled,2=cut
- BLOCK_META_MAP.put("sandstone_chiseled", 24);
- BLOCK_META_MAP.put("sandstone_cut", 24);
+ put("leaves", 18, 0); // meta: 0=oak,1=spruce,2=birch,3=jungle
+ BLOCK_META_MAP.put("leaves_spruce", 18);
+ BLOCK_META_MAP.put("leaves_birch", 18);
+ BLOCK_META_MAP.put("leaves_jungle", 18);
- put("noteblock", 25, 0);
- put("bed", 26, 0);
- put("golden_rail", 27, 0);
- put("detector_rail", 28, 0);
- put("sticky_piston", 29, 0);
- put("web", 30, 0);
- put("tallgrass", 31, 2); // meta 1=fern,2=grass
- put("deadbush", 32, 0);
- put("piston", 33, 0);
- put("wool", 35, 0); // meta 0=white …15=black
+ put("sponge", 19, 0); // meta 1 = wet
+ put("glass", 20, 0);
+ put("lapis_ore", 21, 0);
+ put("lapis_block", 22, 0);
+ put("dispenser", 23, 0);
+ put("sandstone", 24, 0); // meta: 0=normal,1=chiseled,2=cut
+ BLOCK_META_MAP.put("sandstone_chiseled", 24);
+ BLOCK_META_MAP.put("sandstone_cut", 24);
- // —— 36–59 —— decoration & ores
- put("yellow_flower", 37, 0);
- put("red_flower", 38, 0); // meta 0=dandelion,1=poppy… etc.
- put("brown_mushroom", 39, 0);
- put("red_mushroom", 40, 0);
- put("gold_block", 41, 0);
- put("iron_block", 42, 0);
- put("double_stone_slab", 43, 0); // meta: various stone slab types
- put("stone_slab", 44, 0);
- put("brick_block", 45, 0);
- put("tnt", 46, 0);
- put("bookshelf", 47, 0);
- put("mossy_cobblestone", 48, 0);
- put("obsidian", 49, 0);
- put("torch", 50, 0);
- put("fire", 51, 0);
- put("mob_spawner", 52, 0);
- put("oak_stairs", 53, 0);
- put("chest", 54, 0);
- put("redstone_wire", 55, 0);
- put("diamond_ore", 56, 0);
- put("diamond_block", 57, 0);
- put("crafting_table", 58, 0);
- put("wheat", 59, 0);
+ put("noteblock", 25, 0);
+ put("bed", 26, 0);
+ put("golden_rail", 27, 0);
+ put("detector_rail", 28, 0);
+ put("sticky_piston", 29, 0);
+ put("web", 30, 0);
+ put("tallgrass", 31, 2); // meta 1=fern,2=grass
+ put("deadbush", 32, 0);
+ put("piston", 33, 0);
+ put("wool", 35, 0); // meta 0=white …15=black
- // —— 60–80 —— functional blocks
- put("farmland", 60, 0);
- put("furnace", 61, 0);
- put("lit_furnace", 62, 0);
- put("standing_sign", 63, 0);
- put("wooden_door", 64, 0);
- put("ladder", 65, 0);
- put("rail", 66, 0);
- put("rails", 66, 0);
- put("stone_stairs", 67, 0);
- put("wall_sign", 68, 0);
- put("lever", 69, 0);
- put("stone_pressure_plate", 70, 0);
- put("iron_door", 71, 0);
- put("wooden_pressure_plate", 72, 0);
- put("redstone_ore", 73, 0);
- put("lit_redstone_ore", 74, 0);
- put("unlit_redstone_torch", 75, 0);
- put("redstone_torch", 76, 0);
- put("stone_button", 77, 0);
- put("snow_layer", 78, 0);
- put("ice", 79, 0);
- put("snow", 80, 0);
+ // —— 36–59 —— decoration & ores
+ put("yellow_flower", 37, 0);
+ put("red_flower", 38, 0); // meta 0=dandelion,1=poppy… etc.
+ put("brown_mushroom", 39, 0);
+ put("red_mushroom", 40, 0);
+ put("gold_block", 41, 0);
+ put("iron_block", 42, 0);
+ put("double_stone_slab", 43, 0); // meta: various stone slab types
+ put("stone_slab", 44, 0);
+ put("brick_block", 45, 0);
+ put("tnt", 46, 0);
+ put("bookshelf", 47, 0);
+ put("mossy_cobblestone", 48, 0);
+ put("obsidian", 49, 0);
+ put("torch", 50, 0);
+ put("fire", 51, 0);
+ put("mob_spawner", 52, 0);
+ put("oak_stairs", 53, 0);
+ put("chest", 54, 0);
+ put("redstone_wire", 55, 0);
+ put("diamond_ore", 56, 0);
+ put("diamond_block", 57, 0);
+ put("crafting_table", 58, 0);
+ put("wheat", 59, 0);
- // —— 81–100 —— natural & craft blocks
- put("cactus", 81, 0);
- put("clay", 82, 0);
- put("reeds", 83, 0);
- put("jukebox", 84, 0);
- put("fence", 85, 0);
- put("pumpkin", 86, 0);
- put("netherrack", 87, 0);
- put("soul_sand", 88, 0);
- put("glowstone", 89, 0);
- put("portal", 90, 0);
- put("lit_pumpkin", 91, 0);
- put("cake", 92, 0);
- put("unpowered_repeater", 93, 0);
- put("powered_repeater", 94, 0);
- put("stained_glass", 95, 0); // meta 0–15 colored glass
- put("trapdoor", 96, 0);
- put("monster_egg", 97, 0);
- put("stone_brick", 98, 0);
- put("brown_mushroom_block", 99, 0);
- put("red_mushroom_block", 100, 0);
+ // —— 60–80 —— functional blocks
+ put("farmland", 60, 0);
+ put("furnace", 61, 0);
+ put("lit_furnace", 62, 0);
+ put("standing_sign", 63, 0);
+ put("wooden_door", 64, 0);
+ put("ladder", 65, 0);
+ put("rail", 66, 0);
+ put("rails", 66, 0);
+ put("stone_stairs", 67, 0);
+ put("wall_sign", 68, 0);
+ put("lever", 69, 0);
+ put("stone_pressure_plate", 70, 0);
+ put("iron_door", 71, 0);
+ put("wooden_pressure_plate", 72, 0);
+ put("redstone_ore", 73, 0);
+ put("lit_redstone_ore", 74, 0);
+ put("unlit_redstone_torch", 75, 0);
+ put("redstone_torch", 76, 0);
+ put("stone_button", 77, 0);
+ put("snow_layer", 78, 0);
+ put("ice", 79, 0);
+ put("snow", 80, 0);
- // —— 101–120 —— iron & panes & fruit
- put("iron_bars", 101, 0);
- put("glass_pane", 102, 0);
- put("melon_block", 103, 0);
- put("pumpkin_stem", 104, 0);
- put("melon_stem", 105, 0);
- put("vine", 106, 0);
- put("fence_gate", 107, 0);
- put("brick_stairs", 108, 0);
- put("stone_brick_stairs", 109, 0);
- put("mycelium", 110, 0);
- put("waterlily", 111, 0);
- put("nether_brick", 112, 0);
- put("nether_brick_fence", 113, 0);
- put("nether_brick_stairs", 114, 0);
- put("nether_wart", 115, 0);
- put("enchanting_table", 116, 0);
- put("brewing_stand", 117, 0);
- put("cauldron", 118, 0);
- put("end_portal", 119, 0);
- put("end_portal_frame", 120, 0);
+ // —— 81–100 —— natural & craft blocks
+ put("cactus", 81, 0);
+ put("clay", 82, 0);
+ put("reeds", 83, 0);
+ put("jukebox", 84, 0);
+ put("fence", 85, 0);
+ put("pumpkin", 86, 0);
+ put("netherrack", 87, 0);
+ put("soul_sand", 88, 0);
+ put("glowstone", 89, 0);
+ put("portal", 90, 0);
+ put("lit_pumpkin", 91, 0);
+ put("cake", 92, 0);
+ put("unpowered_repeater", 93, 0);
+ put("powered_repeater", 94, 0);
+ put("stained_glass", 95, 0); // meta 0–15 colored glass
+ put("trapdoor", 96, 0);
+ put("monster_egg", 97, 0);
+ put("stone_brick", 98, 0);
+ put("brown_mushroom_block", 99, 0);
+ put("red_mushroom_block", 100, 0);
- // —— 121–140 —— end & redstone lamps
- put("end_stone", 121, 0);
- put("dragon_egg", 122, 0);
- put("redstone_lamp", 123, 0);
- put("lit_redstone_lamp", 124, 0);
- put("double_wooden_slab", 125, 0);
- put("wooden_slab", 126, 0);
- put("cocoa", 127, 0);
- put("sandstone_stairs", 128, 0);
- put("emerald_ore", 129, 0);
- put("ender_chest", 130, 0);
- put("tripwire_hook", 131, 0);
- put("tripwire", 132, 0);
- put("emerald_block", 133, 0);
- put("spruce_stairs", 134, 0);
- put("birch_stairs", 135, 0);
- put("jungle_stairs", 136, 0);
- put("command_block", 137, 0);
- put("beacon", 138, 0);
- put("cobblestone_wall", 139, 0);
- put("flower_pot", 140, 0);
+ // —— 101–120 —— iron & panes & fruit
+ put("iron_bars", 101, 0);
+ put("glass_pane", 102, 0);
+ put("melon_block", 103, 0);
+ put("pumpkin_stem", 104, 0);
+ put("melon_stem", 105, 0);
+ put("vine", 106, 0);
+ put("fence_gate", 107, 0);
+ put("brick_stairs", 108, 0);
+ put("stone_brick_stairs", 109, 0);
+ put("mycelium", 110, 0);
+ put("waterlily", 111, 0);
+ put("nether_brick", 112, 0);
+ put("nether_brick_fence", 113, 0);
+ put("nether_brick_stairs", 114, 0);
+ put("nether_wart", 115, 0);
+ put("enchanting_table", 116, 0);
+ put("brewing_stand", 117, 0);
+ put("cauldron", 118, 0);
+ put("end_portal", 119, 0);
+ put("end_portal_frame", 120, 0);
- // —— 141–160 —— crops & comparators & banners
- put("carrots", 141, 0);
- put("potatoes", 142, 0);
- put("wooden_button", 143, 0);
- put("wood_button", 143, 0);
- put("skull", 144, 0);
- put("anvil", 145, 0);
- put("trapped_chest", 146, 0);
- put("light_weighted_pressure_plate", 147, 0);
- put("heavy_weighted_pressure_plate", 148, 0);
- put("unpowered_comparator", 149, 0);
- put("powered_comparator", 150, 0);
- put("daylight_detector", 151, 0);
- put("redstone_block", 152, 0);
- put("quartz_ore", 153, 0);
- put("hopper", 154, 0);
- put("quartz_block", 155, 0); // meta: 0=default,1=chiseled,2=lines
- BLOCK_META_MAP.put("quartz_block_chiseled", 155);
- BLOCK_META_MAP.put("quartz_block_lines", 155);
+ // —— 121–140 —— end & redstone lamps
+ put("end_stone", 121, 0);
+ put("dragon_egg", 122, 0);
+ put("redstone_lamp", 123, 0);
+ put("lit_redstone_lamp", 124, 0);
+ put("double_wooden_slab", 125, 0);
+ put("wooden_slab", 126, 0);
+ put("cocoa", 127, 0);
+ put("sandstone_stairs", 128, 0);
+ put("emerald_ore", 129, 0);
+ put("ender_chest", 130, 0);
+ put("tripwire_hook", 131, 0);
+ put("tripwire", 132, 0);
+ put("emerald_block", 133, 0);
+ put("spruce_stairs", 134, 0);
+ put("birch_stairs", 135, 0);
+ put("jungle_stairs", 136, 0);
+ put("command_block", 137, 0);
+ put("beacon", 138, 0);
+ put("cobblestone_wall", 139, 0);
+ put("flower_pot", 140, 0);
- put("quartz_stairs", 156, 0);
- put("activator_rail", 157, 0);
- put("dropper", 158, 0);
- put("stained_hardened_clay",159, 0); // meta 0–15
- put("stained_glass_pane", 160, 0); // meta 0–15
+ // —— 141–160 —— crops & comparators & banners
+ put("carrots", 141, 0);
+ put("potatoes", 142, 0);
+ put("wooden_button", 143, 0);
+ put("wood_button", 143, 0);
+ put("skull", 144, 0);
+ put("anvil", 145, 0);
+ put("trapped_chest", 146, 0);
+ put("light_weighted_pressure_plate", 147, 0);
+ put("heavy_weighted_pressure_plate", 148, 0);
+ put("unpowered_comparator", 149, 0);
+ put("powered_comparator", 150, 0);
+ put("daylight_detector", 151, 0);
+ put("redstone_block", 152, 0);
+ put("quartz_ore", 153, 0);
+ put("hopper", 154, 0);
+ put("quartz_block", 155, 0); // meta: 0=default,1=chiseled,2=lines
+ BLOCK_META_MAP.put("quartz_block_chiseled", 155);
+ BLOCK_META_MAP.put("quartz_block_lines", 155);
- // —— 161–192 —— newer fence/doors remapped
- put("leaves2", 161, 0);
- put("log2", 162, 0);
- // acacia stairs → jungle_stairs (136)
- BLOCK_ID_MAP.put("acacia_stairs", 136); BLOCK_META_MAP.put("acacia_stairs", 0);
- // dark_oak stairs → spruce_stairs (134)
- BLOCK_ID_MAP.put("dark_oak_stairs", 134); BLOCK_META_MAP.put("dark_oak_stairs", 0);
+ put("quartz_stairs", 156, 0);
+ put("activator_rail", 157, 0);
+ put("dropper", 158, 0);
+ put("stained_hardened_clay", 159, 0); // meta 0–15
+ put("stained_glass_pane", 160, 0); // meta 0–15
- // wood gates/fences → map to oak variants
- put("spruce_fence_gate", 107, 0);
- put("birch_fence_gate", 107, 0);
- put("jungle_fence_gate", 107, 0);
- put("acacia_fence_gate", 107, 0);
- put("dark_oak_fence_gate", 107, 0);
+ // —— 161–192 —— newer fence/doors remapped
+ put("leaves2", 161, 0);
+ put("log2", 162, 0);
+ // acacia stairs → jungle_stairs (136)
+ BLOCK_ID_MAP.put("acacia_stairs", 136);
+ BLOCK_META_MAP.put("acacia_stairs", 0);
+ // dark_oak stairs → spruce_stairs (134)
+ BLOCK_ID_MAP.put("dark_oak_stairs", 134);
+ BLOCK_META_MAP.put("dark_oak_stairs", 0);
- put("spruce_fence", 85, 0);
- put("birch_fence", 85, 0);
- put("jungle_fence", 85, 0);
- put("acacia_fence", 85, 0);
- put("dark_oak_fence", 85, 0);
+ // wood gates/fences → map to oak variants
+ put("spruce_fence_gate", 107, 0);
+ put("birch_fence_gate", 107, 0);
+ put("jungle_fence_gate", 107, 0);
+ put("acacia_fence_gate", 107, 0);
+ put("dark_oak_fence_gate", 107, 0);
- put("spruce_door", 64, 0);
- put("birch_door", 64, 0);
- put("jungle_door", 64, 0);
- put("acacia_door", 64, 0);
- put("dark_oak_door", 64, 0);
+ put("spruce_fence", 85, 0);
+ put("birch_fence", 85, 0);
+ put("jungle_fence", 85, 0);
+ put("acacia_fence", 85, 0);
+ put("dark_oak_fence", 85, 0);
- // —— 193–211 —— 1.13+ → lookalikes
- // end_rod → torch (50)
- BLOCK_ID_MAP.put("end_rod", 50);
- // chorus → deadbush (32)
- BLOCK_ID_MAP.put("chorus_plant", 32);
- BLOCK_ID_MAP.put("chorus_flower", 32);
- // purpur → quartz_block/stairs/slabs
- BLOCK_ID_MAP.put("purpur_block", 155);
- BLOCK_ID_MAP.put("purpur_pillar", 155);
- BLOCK_ID_MAP.put("purpur_stairs", 156);
- BLOCK_ID_MAP.put("purpur_double_slab", 43);
- BLOCK_ID_MAP.put("purpur_slab", 44);
- // sea lantern → glowstone (89)
- BLOCK_ID_MAP.put("sea_lantern", 89);
- // hay_block → pumpkin (86)
- BLOCK_ID_MAP.put("hay_block", 86);
- // carpet → wool (35)
- BLOCK_ID_MAP.put("carpet", 35);
- // hardened_clay → stained_hardened_clay (159)
- BLOCK_ID_MAP.put("hardened_clay", 159);
- // coal_block → coal_block (173)
- put("coal_block", 173, 0);
- // packed_ice → ice (79)
- BLOCK_ID_MAP.put("packed_ice", 79);
- // double_plant → tallgrass (31)
- BLOCK_ID_MAP.put("double_plant", 31);
- BLOCK_ID_MAP.put("long_grass", 31);
- // banners → standing_sign (63)
- BLOCK_ID_MAP.put("standing_banner",63);
- BLOCK_ID_MAP.put("wall_banner", 68);
- // red_sandstone → sandstone (24) meta 1
- BLOCK_ID_MAP.put("red_sandstone", 24); BLOCK_META_MAP.put("red_sandstone", 1);
- BLOCK_ID_MAP.put("red_sandstone_stairs", 24); BLOCK_META_MAP.put("red_sandstone_stairs", 1);
- // stone_slab2 (sandstone double slab) → double_stone_slab (43)
- BLOCK_ID_MAP.put("double_stone_slab2", 43);
- // stone_slab2 (sandstone slab) → stone_slab (44)
- BLOCK_ID_MAP.put("stone_slab2", 44);
+ put("spruce_door", 64, 0);
+ put("birch_door", 64, 0);
+ put("jungle_door", 64, 0);
+ put("acacia_door", 64, 0);
+ put("dark_oak_door", 64, 0);
- // sea_pickle → red_flower (38) meta 8
- BLOCK_ID_MAP.put("sea_pickle", 38); BLOCK_META_MAP.put("sea_pickle", 8);
- // grass_path → dirt (3)
- BLOCK_ID_MAP.put("grass_path", 3);
- // end_bricks → stone_brick (98)
- BLOCK_ID_MAP.put("end_bricks", 98);
- // beetroots → carrots (141)
- BLOCK_ID_MAP.put("beetroots", 141);
- // stonecutter → crafting_table (58)
- BLOCK_ID_MAP.put("stonecutter", 58);
- // glow_lichen → glowstone (89)
- BLOCK_ID_MAP.put("glow_lichen", 89);
- }
+ // —— 193–211 —— 1.13+ → lookalikes
+ // end_rod → torch (50)
+ BLOCK_ID_MAP.put("end_rod", 50);
+ // chorus → deadbush (32)
+ BLOCK_ID_MAP.put("chorus_plant", 32);
+ BLOCK_ID_MAP.put("chorus_flower", 32);
+ // purpur → quartz_block/stairs/slabs
+ BLOCK_ID_MAP.put("purpur_block", 155);
+ BLOCK_ID_MAP.put("purpur_pillar", 155);
+ BLOCK_ID_MAP.put("purpur_stairs", 156);
+ BLOCK_ID_MAP.put("purpur_double_slab", 43);
+ BLOCK_ID_MAP.put("purpur_slab", 44);
+ // sea lantern → glowstone (89)
+ BLOCK_ID_MAP.put("sea_lantern", 89);
+ // hay_block → pumpkin (86)
+ BLOCK_ID_MAP.put("hay_block", 86);
+ // carpet → wool (35)
+ BLOCK_ID_MAP.put("carpet", 35);
+ // hardened_clay → stained_hardened_clay (159)
+ BLOCK_ID_MAP.put("hardened_clay", 159);
+ // coal_block → coal_block (173)
+ put("coal_block", 173, 0);
+ // packed_ice → ice (79)
+ BLOCK_ID_MAP.put("packed_ice", 79);
+ // double_plant → tallgrass (31)
+ BLOCK_ID_MAP.put("double_plant", 31);
+ BLOCK_ID_MAP.put("long_grass", 31);
+ // banners → standing_sign (63)
+ BLOCK_ID_MAP.put("standing_banner", 63);
+ BLOCK_ID_MAP.put("wall_banner", 68);
+ // red_sandstone → sandstone (24) meta 1
+ BLOCK_ID_MAP.put("red_sandstone", 24);
+ BLOCK_META_MAP.put("red_sandstone", 1);
+ BLOCK_ID_MAP.put("red_sandstone_stairs", 24);
+ BLOCK_META_MAP.put("red_sandstone_stairs", 1);
+ // stone_slab2 (sandstone double slab) → double_stone_slab (43)
+ BLOCK_ID_MAP.put("double_stone_slab2", 43);
+ // stone_slab2 (sandstone slab) → stone_slab (44)
+ BLOCK_ID_MAP.put("stone_slab2", 44);
- private static void put(String name, int id, int meta) {
- BLOCK_ID_MAP.put(name, id);
- BLOCK_META_MAP.put(name, meta);
- }
+ // sea_pickle → red_flower (38) meta 8
+ BLOCK_ID_MAP.put("sea_pickle", 38);
+ BLOCK_META_MAP.put("sea_pickle", 8);
+ // grass_path → dirt (3)
+ BLOCK_ID_MAP.put("grass_path", 3);
+ // end_bricks → stone_brick (98)
+ BLOCK_ID_MAP.put("end_bricks", 98);
+ // beetroots → carrots (141)
+ BLOCK_ID_MAP.put("beetroots", 141);
+ // stonecutter → crafting_table (58)
+ BLOCK_ID_MAP.put("stonecutter", 58);
+ // glow_lichen → glowstone (89)
+ BLOCK_ID_MAP.put("glow_lichen", 89);
+ }
- public static int getId(String name) {
- if (!BLOCK_ID_MAP.containsKey(name) && unmapped.add(name)) {
- System.out.println("Unmapped block: " + name);
- }
- return BLOCK_ID_MAP.getOrDefault(name, 1);
- }
+ private static void put(String name, int id, int meta) {
+ BLOCK_ID_MAP.put(name, id);
+ BLOCK_META_MAP.put(name, meta);
+ }
- public static int getMeta(String name) {
- return BLOCK_META_MAP.getOrDefault(name, 0);
+ public static int getId(String name) {
+ if (!BLOCK_ID_MAP.containsKey(name) && unmapped.add(name)) {
+ System.out.println("Unmapped block: " + name);
}
+ return BLOCK_ID_MAP.getOrDefault(name, 1);
+ }
+
+ public static int getMeta(String name) {
+ return BLOCK_META_MAP.getOrDefault(name, 0);
+ }
}
diff --git a/src/main/java/net/potato/tuff/TuffX.java b/src/main/java/net/potato/tuff/TuffX.java
index a67a477..a12c3cf 100644
--- a/src/main/java/net/potato/tuff/TuffX.java
+++ b/src/main/java/net/potato/tuff/TuffX.java
@@ -39,519 +39,535 @@
public class TuffX extends JavaPlugin implements Listener, PluginMessageListener {
- public static final String CH = "eagler:below_y0";
- public ViaBlockIds v;
-
- private final ObjectOpenHashSet aib = new ObjectOpenHashSet<>();
- private ObjectOpenHashSet ew;
- private Cache> cc;
- private boolean d;
- private ExecutorService cp;
-
- private final ThreadLocal> tlcc = ThreadLocal.withInitial(() -> new Object2ObjectOpenHashMap<>(256));
- private final ThreadLocal tlba = ThreadLocal.withInitial(() -> new ShortArrayList(4096));
- private final ThreadLocal tlla = ThreadLocal.withInitial(() -> new ByteArrayList(4096));
- private final ThreadLocal tlos = ThreadLocal.withInitial(() -> new ByteArrayOutputStream(8256));
-
- private static final int[] EMPTY_LEGACY = {1, 0};
-
- private void ld(String m) {
- if (d) getLogger().log(Level.INFO, "[TuffX-Debug] " + m);
+ public static final String CH = "eagler:below_y0";
+ public ViaBlockIds v;
+
+ private final ObjectOpenHashSet aib = new ObjectOpenHashSet<>();
+ private ObjectOpenHashSet ew;
+ private Cache> cc;
+ private boolean d;
+ private ExecutorService cp;
+
+ private final ThreadLocal> tlcc = ThreadLocal
+ .withInitial(() -> new Object2ObjectOpenHashMap<>(256));
+ private final ThreadLocal tlba = ThreadLocal.withInitial(() -> new ShortArrayList(4096));
+ private final ThreadLocal tlla = ThreadLocal.withInitial(() -> new ByteArrayList(4096));
+ private final ThreadLocal tlos = ThreadLocal
+ .withInitial(() -> new ByteArrayOutputStream(8256));
+
+ private static final int[] EMPTY_LEGACY = { 1, 0 };
+
+ private void ld(String m) {
+ if (d)
+ getLogger().log(Level.INFO, "[TuffX-Debug] " + m);
+ }
+
+ public record WCK(String w, int x, int z) {
+ }
+
+ @Override
+ public void onEnable() {
+ saveDefaultConfig();
+ d = getConfig().getBoolean("debug-mode", false);
+ ObjectArrayList ewList = new ObjectArrayList<>(getConfig().getStringList("enabled-worlds"));
+ ew = new ObjectOpenHashSet<>(ewList.size());
+ ew.addAll(ewList);
+
+ Plugin protocolLib = getServer().getPluginManager().getPlugin("ProtocolLib");
+ if (protocolLib == null) {
+ getLogger().severe("ProtocolLib not found! This plugin is required for proactive chunk sending.");
+ getLogger().severe("TuffX will not be able to send below y=0 data.");
+ getServer().getPluginManager().disablePlugin(this);
+ return;
+ }
+ ChunkPacketListener.initialize(this);
+
+ cc = CacheBuilder.newBuilder()
+ .maximumSize(getConfig().getInt("cache-size", 1024))
+ .expireAfterAccess(getConfig().getInt("cache-expiration", 5), TimeUnit.MINUTES)
+ .concurrencyLevel(Runtime.getRuntime().availableProcessors())
+ .initialCapacity(256)
+ .build();
+
+ getServer().getMessenger().registerOutgoingPluginChannel(this, CH);
+ getServer().getMessenger().registerIncomingPluginChannel(this, CH, this);
+ getServer().getPluginManager().registerEvents(this, this);
+ if (v == null)
+ v = new ViaBlockIds(this);
+ lfe();
+
+ int ct = getConfig().getInt("chunk-processor-threads", -1);
+ int tc;
+ if (ct <= 0) {
+ tc = Math.max(1, Runtime.getRuntime().availableProcessors() / 2);
+ } else {
+ tc = ct;
}
- public record WCK(String w, int x, int z) {}
-
- @Override
- public void onEnable() {
- saveDefaultConfig();
- d = getConfig().getBoolean("debug-mode", false);
- ObjectArrayList ewList = new ObjectArrayList<>(getConfig().getStringList("enabled-worlds"));
- ew = new ObjectOpenHashSet<>(ewList.size());
- ew.addAll(ewList);
-
- Plugin protocolLib = getServer().getPluginManager().getPlugin("ProtocolLib");
- if (protocolLib == null) {
- getLogger().severe("ProtocolLib not found! This plugin is required for proactive chunk sending.");
- getLogger().severe("TuffX will not be able to send below y=0 data.");
- getServer().getPluginManager().disablePlugin(this);
- return;
- }
- ChunkPacketListener.initialize(this);
-
- cc = CacheBuilder.newBuilder()
- .maximumSize(getConfig().getInt("cache-size", 1024))
- .expireAfterAccess(getConfig().getInt("cache-expiration", 5), TimeUnit.MINUTES)
- .concurrencyLevel(Runtime.getRuntime().availableProcessors())
- .initialCapacity(256)
- .build();
-
- getServer().getMessenger().registerOutgoingPluginChannel(this, CH);
- getServer().getMessenger().registerIncomingPluginChannel(this, CH, this);
- getServer().getPluginManager().registerEvents(this, this);
- if (v == null) v = new ViaBlockIds(this);
- lfe();
-
- int ct = getConfig().getInt("chunk-processor-threads", -1);
- int tc;
- if (ct <= 0) {
- tc = Math.max(1, Runtime.getRuntime().availableProcessors() / 2);
- } else {
- tc = ct;
+ cp = Executors.newFixedThreadPool(tc, r -> {
+ Thread t = new Thread(r, "TuffX-Chunk-" + System.nanoTime());
+ t.setDaemon(true);
+ t.setPriority(Thread.NORM_PRIORITY + 1);
+ return t;
+ });
+ }
+
+ public record CSC(int x, int y, int z) {
+ }
+
+ @Override
+ public void onDisable() {
+ if (cp != null) {
+ cp.shutdown();
+ try {
+ if (!cp.awaitTermination(10, TimeUnit.SECONDS)) {
+ cp.shutdownNow();
+ if (!cp.awaitTermination(5, TimeUnit.SECONDS)) {
+ getLogger().severe("Failed to shutdown chunk processor pool!");
+ }
}
-
- cp = Executors.newFixedThreadPool(tc, r -> {
- Thread t = new Thread(r, "TuffX-Chunk-" + System.nanoTime());
- t.setDaemon(true);
- t.setPriority(Thread.NORM_PRIORITY + 1);
- return t;
- });
+ } catch (InterruptedException e) {
+ cp.shutdownNow();
+ Thread.currentThread().interrupt();
+ } finally {
+ cp = null;
+ }
}
- public record CSC(int x, int y, int z) {}
-
- @Override
- public void onDisable() {
- if (cp != null) {
- cp.shutdown();
- try {
- if (!cp.awaitTermination(10, TimeUnit.SECONDS)) {
- cp.shutdownNow();
- if (!cp.awaitTermination(5, TimeUnit.SECONDS)) {
- getLogger().severe("Failed to shutdown chunk processor pool!");
- }
- }
- } catch (InterruptedException e) {
- cp.shutdownNow();
- Thread.currentThread().interrupt();
- } finally {
- cp = null;
- }
- }
+ if (cc != null) {
+ cc.invalidateAll();
+ cc = null;
+ }
- if (cc != null) {
- cc.invalidateAll();
- cc = null;
- }
+ aib.clear();
- aib.clear();
-
- if (v != null) {
- v = null;
- }
+ if (v != null) {
+ v = null;
}
-
- public boolean isPlayerReady(Player p) {
- if (p == null) return false;
- return aib.contains(p.getUniqueId());
+ }
+
+ public boolean isPlayerReady(Player p) {
+ if (p == null)
+ return false;
+ return aib.contains(p.getUniqueId());
+ }
+
+ @Override
+ public void onPluginMessageReceived(String ch, Player p, byte[] m) {
+ if (!ch.equals(CH) || !p.isOnline())
+ return;
+ try (DataInputStream i = new DataInputStream(new ByteArrayInputStream(m))) {
+ int x = i.readInt();
+ int y = i.readInt();
+ int z = i.readInt();
+ int al = i.readUnsignedByte();
+ byte[] ab = new byte[al];
+ i.readFully(ab);
+ String a = new String(ab, StandardCharsets.UTF_8);
+ hip(p, new Location(p.getWorld(), x, y, z), a);
+ } catch (IOException e) {
+ getLogger().warning("Failed to parse plugin message from " + p.getName() + ": " + e.getMessage());
}
+ }
- @Override
- public void onPluginMessageReceived(String ch, Player p, byte[] m) {
- if (!ch.equals(CH) || !p.isOnline()) return;
- try (DataInputStream i = new DataInputStream(new ByteArrayInputStream(m))) {
- int x = i.readInt();
- int y = i.readInt();
- int z = i.readInt();
- int al = i.readUnsignedByte();
- byte[] ab = new byte[al];
- i.readFully(ab);
- String a = new String(ab, StandardCharsets.UTF_8);
- hip(p, new Location(p.getWorld(), x, y, z), a);
- } catch (IOException e) {
- getLogger().warning("Failed to parse plugin message from " + p.getName() + ": " + e.getMessage());
- }
+ private void hip(Player p, Location l, String a) {
+ if (!ew.contains(p.getWorld().getName()) && !a.equalsIgnoreCase("ready")) {
+ p.sendPluginMessage(this, CH, cby0sp(false));
+ return;
}
- private void hip(Player p, Location l, String a) {
- if (!ew.contains(p.getWorld().getName()) && !a.equalsIgnoreCase("ready")) {
- p.sendPluginMessage(this, CH, cby0sp(false));
- return;
+ switch (a.toLowerCase()) {
+ case "ready2":
+ ld("Player " + p.getName() + " is READY.");
+ aib.add(p.getUniqueId());
+ if (ew.contains(p.getWorld().getName())) {
+ aib.add(p.getUniqueId());
+ p.sendPluginMessage(this, CH, cby0sp(true));
+ resendChunksInView(p);
+ } else {
+ p.sendPluginMessage(this, CH, cby0sp(false));
}
-
- switch (a.toLowerCase()) {
- case "ready2":
- ld("Player " + p.getName() + " is READY.");
- aib.add(p.getUniqueId());
- if (ew.contains(p.getWorld().getName())) {
- aib.add(p.getUniqueId());
- p.sendPluginMessage(this, CH, cby0sp(true));
- resendChunksInView(p);
- } else {
- p.sendPluginMessage(this, CH, cby0sp(false));
- }
- break;
- case "use_on_block":
- new BukkitRunnable() {
- @Override
- public void run() {
- Block b = l.getBlock();
- ItemStack it = p.getInventory().getItemInMainHand();
- getServer().getPluginManager().callEvent(new PlayerInteractEvent(p, Action.RIGHT_CLICK_BLOCK, it, b, b.getFace(p.getLocation().getBlock())));
- }
- }.runTask(this);
- break;
- case "ready":
- p.kickPlayer("§cYour client is not compatible with the version of §6TuffX §cthe server has installed!\n§7Please update your client.");
+ break;
+ case "use_on_block":
+ new BukkitRunnable() {
+ @Override
+ public void run() {
+ Block b = l.getBlock();
+ ItemStack it = p.getInventory().getItemInMainHand();
+ getServer().getPluginManager().callEvent(
+ new PlayerInteractEvent(p, Action.RIGHT_CLICK_BLOCK, it, b, b.getFace(p.getLocation().getBlock())));
+ }
+ }.runTask(this);
+ break;
+ case "ready":
+ if (getConfig().getBoolean("kick-outdated-clients", true))
+ p.kickPlayer(
+ "§cYour client is not compatible with the version of §6TuffX §cthe server has installed!\n§7Please update your client.");
+ }
+ }
+
+ public void resendChunksInView(Player p) {
+ World world = p.getWorld();
+ int viewDistance = p.getClientViewDistance();
+ int playerChunkX = p.getLocation().getChunk().getX();
+ int playerChunkZ = p.getLocation().getChunk().getZ();
+
+ getServer().getScheduler().runTaskAsynchronously(this, () -> {
+ for (int x = -viewDistance; x <= viewDistance; x++) {
+ for (int z = -viewDistance; z <= viewDistance; z++) {
+ int currentChunkX = playerChunkX + x;
+ int currentChunkZ = playerChunkZ + z;
+
+ if (world.isChunkLoaded(currentChunkX, currentChunkZ)) {
+ Chunk chunk = world.getChunkAt(currentChunkX, currentChunkZ);
+ processAndSendChunk(p, chunk);
+ }
}
+ }
+ });
+ }
+
+ private byte[] cby0sp(boolean s) {
+ try (ByteArrayOutputStream b = new ByteArrayOutputStream(); DataOutputStream o = new DataOutputStream(b)) {
+ o.writeUTF("y0_status");
+ o.writeBoolean(s);
+ return b.toByteArray();
+ } catch (IOException e) {
+ return null;
}
-
- public void resendChunksInView(Player p) {
- World world = p.getWorld();
- int viewDistance = p.getClientViewDistance();
- int playerChunkX = p.getLocation().getChunk().getX();
- int playerChunkZ = p.getLocation().getChunk().getZ();
-
- getServer().getScheduler().runTaskAsynchronously(this, () -> {
- for (int x = -viewDistance; x <= viewDistance; x++) {
- for (int z = -viewDistance; z <= viewDistance; z++) {
- int currentChunkX = playerChunkX + x;
- int currentChunkZ = playerChunkZ + z;
-
- if (world.isChunkLoaded(currentChunkX, currentChunkZ)) {
- Chunk chunk = world.getChunkAt(currentChunkX, currentChunkZ);
- processAndSendChunk(p, chunk);
- }
- }
- }
- });
+ }
+
+ private byte[] cdp() {
+ try (ByteArrayOutputStream b = new ByteArrayOutputStream(); DataOutputStream o = new DataOutputStream(b)) {
+ o.writeUTF("dimension_change");
+ return b.toByteArray();
+ } catch (IOException e) {
+ return null;
}
-
- private byte[] cby0sp(boolean s) {
- try (ByteArrayOutputStream b = new ByteArrayOutputStream(); DataOutputStream o = new DataOutputStream(b)) {
- o.writeUTF("y0_status");
- o.writeBoolean(s);
- return b.toByteArray();
- } catch (IOException e) { return null; }
+ }
+
+ @EventHandler(priority = EventPriority.MONITOR)
+ public void onPlayerChangeWorld(PlayerChangedWorldEvent e) {
+ Player p = e.getPlayer();
+ p.sendPluginMessage(this, CH, cdp());
+ boolean isEnabledWorld = ew.contains(p.getWorld().getName());
+ p.sendPluginMessage(this, CH, cby0sp(isEnabledWorld));
+ if (isPlayerReady(p) && isEnabledWorld) {
+ resendChunksInView(p);
}
-
- private byte[] cdp() {
- try (ByteArrayOutputStream b = new ByteArrayOutputStream(); DataOutputStream o = new DataOutputStream(b)) {
- o.writeUTF("dimension_change");
- return b.toByteArray();
- } catch (IOException e) { return null; }
+ }
+
+ @EventHandler(priority = EventPriority.MONITOR)
+ public void onPlayerJoin(PlayerJoinEvent e) {
+ Player p = e.getPlayer();
+ p.sendPluginMessage(this, CH, cdp());
+ boolean isEnabledWorld = ew.contains(p.getWorld().getName());
+ p.sendPluginMessage(this, CH, cby0sp(isEnabledWorld));
+ }
+
+ public void processAndSendChunk(final Player p, final Chunk c) {
+ if (c == null || p == null || !p.isOnline() || cp == null || cp.isShutdown()) {
+ return;
}
-
- @EventHandler(priority = EventPriority.MONITOR)
- public void onPlayerChangeWorld(PlayerChangedWorldEvent e) {
- Player p = e.getPlayer();
- p.sendPluginMessage(this, CH, cdp());
- boolean isEnabledWorld = ew.contains(p.getWorld().getName());
- p.sendPluginMessage(this, CH, cby0sp(isEnabledWorld));
- if (isPlayerReady(p) && isEnabledWorld) {
- resendChunksInView(p);
+ final WCK k = new WCK(c.getWorld().getName(), c.getX(), c.getZ());
+ ObjectArrayList cachedData = cc.getIfPresent(k);
+ if (cachedData != null) {
+ if (p.isOnline()) {
+ for (byte[] py : cachedData) {
+ p.sendPluginMessage(TuffX.this, CH, py);
}
+ }
+ return;
}
-
- @EventHandler(priority = EventPriority.MONITOR)
- public void onPlayerJoin(PlayerJoinEvent e) {
- Player p = e.getPlayer();
- p.sendPluginMessage(this, CH, cdp());
- boolean isEnabledWorld = ew.contains(p.getWorld().getName());
- p.sendPluginMessage(this, CH, cby0sp(isEnabledWorld));
- }
-
- public void processAndSendChunk(final Player p, final Chunk c) {
- if (c == null || p == null || !p.isOnline() || cp == null || cp.isShutdown()) {
- return;
+ cp.submit(() -> {
+ final ObjectArrayList pp = new ObjectArrayList<>(4);
+ final ChunkSnapshot s = c.getChunkSnapshot(true, false, false);
+ final Object2ObjectOpenHashMap cvt = tlcc.get();
+ cvt.clear();
+ for (int sy = -4; sy < 0; sy++) {
+ if (!p.isOnline()) {
+ return;
}
- final WCK k = new WCK(c.getWorld().getName(), c.getX(), c.getZ());
- ObjectArrayList cachedData = cc.getIfPresent(k);
- if (cachedData != null) {
- if (p.isOnline()) {
- for (byte[] py : cachedData) {
- p.sendPluginMessage(TuffX.this, CH, py);
- }
- }
- return;
+ try {
+ byte[] py = csp(s, c.getX(), c.getZ(), sy, cvt);
+ if (py != null) {
+ pp.add(py);
+ }
+ } catch (IOException e) {
+ getLogger().severe("Payload creation failed for " + c.getX() + "," + c.getZ() + ": " + e.getMessage());
}
- cp.submit(() -> {
- final ObjectArrayList pp = new ObjectArrayList<>(4);
- final ChunkSnapshot s = c.getChunkSnapshot(true, false, false);
- final Object2ObjectOpenHashMap cvt = tlcc.get();
- cvt.clear();
- for (int sy = -4; sy < 0; sy++) {
- if (!p.isOnline()) {
- return;
- }
- try {
- byte[] py = csp(s, c.getX(), c.getZ(), sy, cvt);
- if (py != null) {
- pp.add(py);
- }
- } catch (IOException e) {
- getLogger().severe("Payload creation failed for " + c.getX() + "," + c.getZ() + ": " + e.getMessage());
- }
+ }
+ TuffX.this.cc.put(k, pp);
+ new BukkitRunnable() {
+ @Override
+ public void run() {
+ if (p.isOnline()) {
+ for (byte[] py : pp) {
+ p.sendPluginMessage(TuffX.this, CH, py);
}
- TuffX.this.cc.put(k, pp);
- new BukkitRunnable() {
- @Override
- public void run() {
- if (p.isOnline()) {
- for (byte[] py : pp) {
- p.sendPluginMessage(TuffX.this, CH, py);
- }
- }
- }
- }.runTask(TuffX.this);
- });
+ }
+ }
+ }.runTask(TuffX.this);
+ });
+ }
+
+ private void icc(World w, int x, int z) {
+ WCK k = new WCK(w.getName(), x >> 4, z >> 4);
+ cc.invalidate(k);
+ }
+
+ private void cp(UUID id) {
+ aib.remove(id);
+ }
+
+ @EventHandler
+ public void onPlayerQuit(PlayerQuitEvent e) {
+ cp(e.getPlayer().getUniqueId());
+ }
+
+ private byte[] csp(ChunkSnapshot s, int x, int z, int sy, Object2ObjectOpenHashMap c)
+ throws IOException {
+ ShortArrayList ba = tlba.get();
+ ByteArrayList la = tlla.get();
+ ba.clear();
+ la.clear();
+ ba.ensureCapacity(4096);
+ la.ensureCapacity(4096);
+
+ boolean h = false;
+ int by = sy << 4;
+
+ for (int y = 0; y < 16; y++) {
+ int wy = by + y;
+ for (int zz = 0; zz < 16; zz++) {
+ for (int xx = 0; xx < 16; xx++) {
+ BlockData bd = s.getBlockData(xx, wy, zz);
+ int[] ld = c.getOrDefault(bd, EMPTY_LEGACY);
+ if (ld == EMPTY_LEGACY && v != null) {
+ ld = v.toLegacy(bd);
+ c.put(bd, ld);
+ }
+
+ short lb = (short) ((ld[1] << 12) | (ld[0] & 0xFFF));
+ byte pl = (byte) ((s.getBlockSkyLight(xx, wy, zz) << 4) | s.getBlockEmittedLight(xx, wy, zz));
+
+ ba.add(lb);
+ la.add(pl);
+
+ if (lb != 0 || pl != 0) {
+ h = true;
+ }
+ }
+ }
}
- private void icc(World w, int x, int z) {
- WCK k = new WCK(w.getName(), x >> 4, z >> 4);
- cc.invalidate(k);
- }
-
- private void cp(UUID id) {
- aib.remove(id);
+ if (!h) {
+ return null;
}
- @EventHandler
- public void onPlayerQuit(PlayerQuitEvent e) {
- cp(e.getPlayer().getUniqueId());
+ ByteArrayOutputStream b = tlos.get();
+ b.reset();
+
+ try (DataOutputStream o = new DataOutputStream(b)) {
+ o.writeUTF("chunk_data");
+ o.writeInt(x);
+ o.writeInt(z);
+ o.writeInt(sy);
+
+ int sz = ba.size();
+ for (int j = 0; j < sz; j++) {
+ o.writeShort(ba.getShort(j));
+ o.writeByte(la.getByte(j));
+ }
+ return b.toByteArray();
}
-
- private byte[] csp(ChunkSnapshot s, int x, int z, int sy, Object2ObjectOpenHashMap c) throws IOException {
- ShortArrayList ba = tlba.get();
- ByteArrayList la = tlla.get();
- ba.clear();
- la.clear();
- ba.ensureCapacity(4096);
- la.ensureCapacity(4096);
-
- boolean h = false;
- int by = sy << 4;
-
- for (int y = 0; y < 16; y++) {
- int wy = by + y;
- for (int zz = 0; zz < 16; zz++) {
- for (int xx = 0; xx < 16; xx++) {
- BlockData bd = s.getBlockData(xx, wy, zz);
- int[] ld = c.getOrDefault(bd, EMPTY_LEGACY);
- if (ld == EMPTY_LEGACY && v != null) {
- ld = v.toLegacy(bd);
- c.put(bd, ld);
- }
-
- short lb = (short) ((ld[1] << 12) | (ld[0] & 0xFFF));
- byte pl = (byte) ((s.getBlockSkyLight(xx, wy, zz) << 4) | s.getBlockEmittedLight(xx, wy, zz));
-
- ba.add(lb);
- la.add(pl);
-
- if (lb != 0 || pl != 0) {
- h = true;
- }
- }
- }
- }
+ }
- if (!h) {
- return null;
- }
-
- ByteArrayOutputStream b = tlos.get();
- b.reset();
-
- try (DataOutputStream o = new DataOutputStream(b)) {
- o.writeUTF("chunk_data");
- o.writeInt(x);
- o.writeInt(z);
- o.writeInt(sy);
-
- int sz = ba.size();
- for (int j = 0; j < sz; j++) {
- o.writeShort(ba.getShort(j));
- o.writeByte(la.getByte(j));
- }
- return b.toByteArray();
- }
+ @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
+ public void onBlockBreak(BlockBreakEvent e) {
+ if (e.getBlock().getY() < 0) {
+ hbc(e.getBlock().getLocation(), e.getBlock().getBlockData(), Material.AIR.createBlockData());
+ icc(e.getBlock().getWorld(), e.getBlock().getX(), e.getBlock().getZ());
}
+ }
- @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
- public void onBlockBreak(BlockBreakEvent e) {
- if (e.getBlock().getY() < 0) {
- hbc(e.getBlock().getLocation(), e.getBlock().getBlockData(), Material.AIR.createBlockData());
- icc(e.getBlock().getWorld(), e.getBlock().getX(), e.getBlock().getZ());
- }
+ @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
+ public void onBlockPlace(BlockPlaceEvent e) {
+ if (e.getBlock().getY() < 0) {
+ hbc(e.getBlock().getLocation(), e.getBlockReplacedState().getBlockData(), e.getBlock().getBlockData());
+ icc(e.getBlock().getWorld(), e.getBlock().getX(), e.getBlock().getZ());
}
-
- @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
- public void onBlockPlace(BlockPlaceEvent e) {
- if (e.getBlock().getY() < 0) {
- hbc(e.getBlock().getLocation(), e.getBlockReplacedState().getBlockData(), e.getBlock().getBlockData());
- icc(e.getBlock().getWorld(), e.getBlock().getX(), e.getBlock().getZ());
+ }
+
+ @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
+ public void onBlockPhysics(BlockPhysicsEvent e) {
+ final Block b = e.getBlock();
+ if (b.getY() < 0) {
+ final Location l = b.getLocation();
+ final World w = l.getWorld();
+ new BukkitRunnable() {
+ @Override
+ public void run() {
+ BlockData ud = w.getBlockData(l);
+ ssbu(l, ud);
+ icc(w, l.getBlockX(), l.getBlockZ());
}
+ }.runTask(this);
}
-
- @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
- public void onBlockPhysics(BlockPhysicsEvent e) {
- final Block b = e.getBlock();
- if (b.getY() < 0) {
- final Location l = b.getLocation();
- final World w = l.getWorld();
- new BukkitRunnable() {
- @Override
- public void run() {
- BlockData ud = w.getBlockData(l);
- ssbu(l, ud);
- icc(w, l.getBlockX(), l.getBlockZ());
- }
- }.runTask(this);
+ }
+
+ @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
+ public void onBlockExplode(BlockExplodeEvent e) {
+ final ObjectOpenHashSet ac = new ObjectOpenHashSet<>();
+ final List btu = new ArrayList<>(e.blockList());
+ new BukkitRunnable() {
+ @Override
+ public void run() {
+ for (Block b : btu) {
+ if (b.getY() < 0) {
+ ssbu(b.getLocation(), Material.AIR.createBlockData());
+ ac.add(new WCK(b.getWorld().getName(), b.getX() >> 4, b.getZ() >> 4));
+ }
+ }
+ if (!ac.isEmpty()) {
+ ac.forEach(cc::invalidate);
+ }
+ }
+ }.runTask(this);
+ }
+
+ @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
+ public void onBlockFromTo(BlockFromToEvent e) {
+ final Block b = e.getToBlock();
+ if (b.getY() < 0) {
+ new BukkitRunnable() {
+ @Override
+ public void run() {
+ ssbu(b.getLocation(), b.getBlockData());
+ icc(b.getWorld(), b.getX(), b.getZ());
}
+ }.runTask(this);
}
-
- @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
- public void onBlockExplode(BlockExplodeEvent e) {
- final ObjectOpenHashSet ac = new ObjectOpenHashSet<>();
- final List btu = new ArrayList<>(e.blockList());
- new BukkitRunnable() {
- @Override
- public void run() {
- for (Block b : btu) {
- if (b.getY() < 0) {
- ssbu(b.getLocation(), Material.AIR.createBlockData());
- ac.add(new WCK(b.getWorld().getName(), b.getX() >> 4, b.getZ() >> 4));
- }
- }
- if (!ac.isEmpty()) {
- ac.forEach(cc::invalidate);
- }
+ }
+
+ private void ssbu(Location l, BlockData d) {
+ try (ByteArrayOutputStream b = new ByteArrayOutputStream(64);
+ DataOutputStream o = new DataOutputStream(b)) {
+
+ o.writeUTF("block_update");
+ o.writeInt(l.getBlockX());
+ o.writeInt(l.getBlockY());
+ o.writeInt(l.getBlockZ());
+
+ int[] ld = v.toLegacy(d);
+ o.writeShort((short) ((ld[1] << 12) | (ld[0] & 0xFFF)));
+ byte[] py = b.toByteArray();
+
+ new BukkitRunnable() {
+ @Override
+ public void run() {
+ for (Player p : l.getWorld().getPlayers()) {
+ if (p.getLocation().distanceSquared(l) < 4096) {
+ p.sendPluginMessage(TuffX.this, CH, py);
}
- }.runTask(this);
- }
-
- @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
- public void onBlockFromTo(BlockFromToEvent e) {
- final Block b = e.getToBlock();
- if (b.getY() < 0) {
- new BukkitRunnable() {
- @Override
- public void run() {
- ssbu(b.getLocation(), b.getBlockData());
- icc(b.getWorld(), b.getX(), b.getZ());
- }
- }.runTask(this);
+ }
}
- }
-
- private void ssbu(Location l, BlockData d) {
- try (ByteArrayOutputStream b = new ByteArrayOutputStream(64);
- DataOutputStream o = new DataOutputStream(b)) {
+ }.runTask(this);
- o.writeUTF("block_update");
- o.writeInt(l.getBlockX());
- o.writeInt(l.getBlockY());
- o.writeInt(l.getBlockZ());
-
- int[] ld = v.toLegacy(d);
- o.writeShort((short) ((ld[1] << 12) | (ld[0] & 0xFFF)));
- byte[] py = b.toByteArray();
-
- new BukkitRunnable() {
- @Override
- public void run() {
- for (Player p : l.getWorld().getPlayers()) {
- if (p.getLocation().distanceSquared(l) < 4096) {
- p.sendPluginMessage(TuffX.this, CH, py);
- }
- }
- }
- }.runTask(this);
-
- } catch (IOException e) {
- getLogger().severe("Failed to create single block update payload: " + e.getMessage());
- }
+ } catch (IOException e) {
+ getLogger().severe("Failed to create single block update payload: " + e.getMessage());
}
-
- private void hbc(Location l, BlockData od, BlockData nd) {
- ssbu(l, nd);
- boolean oe = od.getLightEmission() > 0;
- boolean ne = nd.getLightEmission() > 0;
- boolean oo = od.getMaterial().isOccluding();
- boolean no = nd.getMaterial().isOccluding();
- if (oe != ne || oo != no) {
- slu(l);
- }
+ }
+
+ private void hbc(Location l, BlockData od, BlockData nd) {
+ ssbu(l, nd);
+ boolean oe = od.getLightEmission() > 0;
+ boolean ne = nd.getLightEmission() > 0;
+ boolean oo = od.getMaterial().isOccluding();
+ boolean no = nd.getMaterial().isOccluding();
+ if (oe != ne || oo != no) {
+ slu(l);
}
-
- private void slu(Location l) {
- ObjectOpenHashSet stu = new ObjectOpenHashSet<>();
- World w = l.getWorld();
- for (int dx = -1; dx <= 1; dx++) {
- for (int dy = -1; dy <= 1; dy++) {
- for (int dz = -1; dz <= 1; dz++) {
- Location n = l.clone().add(dx, dy, dz);
- if (n.getY() < -64 || n.getY() >= 0) continue;
-
- stu.add(new CSC(
- n.getBlockX() >> 4,
- n.getBlockY() >> 4,
- n.getBlockZ() >> 4
- ));
- }
- }
+ }
+
+ private void slu(Location l) {
+ ObjectOpenHashSet stu = new ObjectOpenHashSet<>();
+ World w = l.getWorld();
+ for (int dx = -1; dx <= 1; dx++) {
+ for (int dy = -1; dy <= 1; dy++) {
+ for (int dz = -1; dz <= 1; dz++) {
+ Location n = l.clone().add(dx, dy, dz);
+ if (n.getY() < -64 || n.getY() >= 0)
+ continue;
+
+ stu.add(new CSC(
+ n.getBlockX() >> 4,
+ n.getBlockY() >> 4,
+ n.getBlockZ() >> 4));
}
- for (CSC sc : stu) {
- ChunkSnapshot s = w.getChunkAt(sc.x, sc.z).getChunkSnapshot(true, false, false);
+ }
+ }
+ for (CSC sc : stu) {
+ ChunkSnapshot s = w.getChunkAt(sc.x, sc.z).getChunkSnapshot(true, false, false);
+ new BukkitRunnable() {
+ @Override
+ public void run() {
+ try {
+ byte[] py = clp(s, sc);
new BukkitRunnable() {
- @Override
- public void run() {
- try {
- byte[] py = clp(s, sc);
- new BukkitRunnable() {
- @Override
- public void run() {
- for (Player p : w.getPlayers()) {
- if (p.getLocation().distanceSquared(l) < 4096) {
- p.sendPluginMessage(TuffX.this, CH, py);
- }
- }
- }
- }.runTask(TuffX.this);
- } catch (IOException e) {
- getLogger().severe("Failed to create lighting payload: " + e.getMessage());
- }
+ @Override
+ public void run() {
+ for (Player p : w.getPlayers()) {
+ if (p.getLocation().distanceSquared(l) < 4096) {
+ p.sendPluginMessage(TuffX.this, CH, py);
+ }
}
- }.runTaskAsynchronously(this);
+ }
+ }.runTask(TuffX.this);
+ } catch (IOException e) {
+ getLogger().severe("Failed to create lighting payload: " + e.getMessage());
+ }
}
+ }.runTaskAsynchronously(this);
}
-
- private byte[] clp(ChunkSnapshot s, CSC sc) throws IOException {
- try (ByteArrayOutputStream b = new ByteArrayOutputStream(4120);
- DataOutputStream o = new DataOutputStream(b)) {
- o.writeUTF("lighting_update");
- o.writeInt(sc.x);
- o.writeInt(sc.z);
- o.writeInt(sc.y);
-
- byte[] ld = new byte[4096];
- int by = sc.y * 16;
- int i = 0;
-
- for (int y = 0; y < 16; y++) {
- for (int z = 0; z < 16; z++) {
- for (int x = 0; x < 16; x++) {
- int wy = by + y;
- int bl = s.getBlockEmittedLight(x, wy, z);
- int sl = s.getBlockSkyLight(x, wy, z);
- ld[i++] = (byte) ((sl << 4) | bl);
- }
- }
- }
- o.write(ld);
- return b.toByteArray();
+ }
+
+ private byte[] clp(ChunkSnapshot s, CSC sc) throws IOException {
+ try (ByteArrayOutputStream b = new ByteArrayOutputStream(4120);
+ DataOutputStream o = new DataOutputStream(b)) {
+ o.writeUTF("lighting_update");
+ o.writeInt(sc.x);
+ o.writeInt(sc.z);
+ o.writeInt(sc.y);
+
+ byte[] ld = new byte[4096];
+ int by = sc.y * 16;
+ int i = 0;
+
+ for (int y = 0; y < 16; y++) {
+ for (int z = 0; z < 16; z++) {
+ for (int x = 0; x < 16; x++) {
+ int wy = by + y;
+ int bl = s.getBlockEmittedLight(x, wy, z);
+ int sl = s.getBlockSkyLight(x, wy, z);
+ ld[i++] = (byte) ((sl << 4) | bl);
+ }
}
+ }
+ o.write(ld);
+ return b.toByteArray();
}
-
- private void lfe() {
- getLogger().info("");
- getLogger().info("████████╗██╗ ██╗███████╗ ███████╗ ██╗ ██╗");
- getLogger().info("╚══██╔══╝██║ ██║██╔════╝ ██╔════╝ ╚██╗██╔╝");
- getLogger().info(" ██║ ██║ ██║██████╗ ██████╗ ╚███╔╝ ");
- getLogger().info(" ██║ ██║ ██║██╔═══╝ ██╔═══╝ ██╔██╗ ");
- getLogger().info(" ██║ ╚██████╔╝██║ ██║ ██╔╝╚██╗");
- getLogger().info(" ╚═╝ ╚═════╝ ╚═╝ ╚═╝ ╚═╝ ╚═╝");
- getLogger().info("");
- getLogger().info("Below y0 and TuffX programmed by Potato");
- }
-}
\ No newline at end of file
+ }
+
+ private void lfe() {
+ getLogger().info("");
+ getLogger().info("████████╗██╗ ██╗███████╗ ███████╗ ██╗ ██╗");
+ getLogger().info("╚══██╔══╝██║ ██║██╔════╝ ██╔════╝ ╚██╗██╔╝");
+ getLogger().info(" ██║ ██║ ██║██████╗ ██████╗ ╚███╔╝ ");
+ getLogger().info(" ██║ ██║ ██║██╔═══╝ ██╔═══╝ ██╔██╗ ");
+ getLogger().info(" ██║ ╚██████╔╝██║ ██║ ██╔╝╚██╗");
+ getLogger().info(" ╚═╝ ╚═════╝ ╚═╝ ╚═╝ ╚═╝ ╚═╝");
+ getLogger().info("");
+ getLogger().info("Below y0 and TuffX programmed by Potato");
+ }
+}
diff --git a/src/main/java/net/potato/tuff/ViaBlockIds.java b/src/main/java/net/potato/tuff/ViaBlockIds.java
index 288d768..d597d29 100644
--- a/src/main/java/net/potato/tuff/ViaBlockIds.java
+++ b/src/main/java/net/potato/tuff/ViaBlockIds.java
@@ -17,232 +17,232 @@
import it.unimi.dsi.fastutil.objects.*;
public class ViaBlockIds {
- private final JavaPlugin p;
- private final String sv;
- private final File mf;
- private Object2ObjectOpenHashMap lm = new Object2ObjectOpenHashMap<>();
-
- public ViaBlockIds(JavaPlugin pl) {
- p = pl;
- sv = gsmv();
- mf = new File(pl.getDataFolder(), sv + "-mappings.json");
-
- Bukkit.getLogger().info("[TuffX] Server Minecraft Version: " + sv);
-
- new BukkitRunnable() {
- @Override
- public void run() {
- im();
- }
- }.runTaskLater(pl, 1L);
+ private final JavaPlugin p;
+ private final String sv;
+ private final File mf;
+ private Object2ObjectOpenHashMap lm = new Object2ObjectOpenHashMap<>();
+
+ public ViaBlockIds(JavaPlugin pl) {
+ p = pl;
+ sv = gsmv();
+ mf = new File(pl.getDataFolder(), sv + "-mappings.json");
+
+ Bukkit.getLogger().info("[TuffX] Server Minecraft Version: " + sv);
+
+ new BukkitRunnable() {
+ @Override
+ public void run() {
+ im();
+ }
+ }.runTaskLater(pl, 1L);
+ }
+
+ private void im() {
+ if (Via.getAPI() == null) {
+ Bukkit.getLogger().severe("[TuffX] ViaVersion API not found! Is ViaVersion installed?");
+ return;
}
- private void im() {
- if (Via.getAPI() == null) {
- Bukkit.getLogger().severe("[TuffX] ViaVersion API not found! Is ViaVersion installed?");
- return;
- }
-
- if (!mf.exists()) {
- Bukkit.getLogger().info("[TuffX] Mapping file not found, generating...");
- if (!p.getDataFolder().exists()) {
- p.getDataFolder().mkdirs();
- }
- gasm(mf);
- } else {
- Bukkit.getLogger().info("[TuffX] Loading mappings from " + mf.getName());
- lm(mf);
- }
+ if (!mf.exists()) {
+ Bukkit.getLogger().info("[TuffX] Mapping file not found, generating...");
+ if (!p.getDataFolder().exists()) {
+ p.getDataFolder().mkdirs();
+ }
+ gasm(mf);
+ } else {
+ Bukkit.getLogger().info("[TuffX] Loading mappings from " + mf.getName());
+ lm(mf);
}
+ }
- private static final int[] DEFAULT_LEGACY = {1, 0};
-
- public int[] toLegacy(String k) {
- int[] result = lm.get(k);
- return result != null ? result : DEFAULT_LEGACY;
- }
+ private static final int[] DEFAULT_LEGACY = { 1, 0 };
- public int[] toLegacy(Block b) {
- String k = b.getBlockData().getAsString();
- if (k.startsWith("minecraft:")) {
- k = k.substring(10);
- }
- int[] result = lm.get(k);
- return result != null ? result : DEFAULT_LEGACY;
- }
+ public int[] toLegacy(String k) {
+ int[] result = lm.get(k);
+ return result != null ? result : DEFAULT_LEGACY;
+ }
- public int[] toLegacy(BlockData bd) {
- String k = bd.getAsString();
- if (k.startsWith("minecraft:")) {
- k = k.substring(10);
- }
- int[] result = lm.get(k);
- return result != null ? result : DEFAULT_LEGACY;
+ public int[] toLegacy(Block b) {
+ String k = b.getBlockData().getAsString();
+ if (k.startsWith("minecraft:")) {
+ k = k.substring(10);
}
-
- private String gsmv() {
- String vs = Bukkit.getServer().getVersion();
- int mi = vs.indexOf("MC: ");
- if (mi != -1) {
- int ei = vs.indexOf(')', mi);
- return ei != -1 ? vs.substring(mi + 4, ei) : vs.substring(mi + 4);
- }
- Bukkit.getLogger().warning("[TuffX] Could not detect Minecraft version. Defaulting to 1.21.");
- return "1.21";
+ int[] result = lm.get(k);
+ return result != null ? result : DEFAULT_LEGACY;
+ }
+
+ public int[] toLegacy(BlockData bd) {
+ String k = bd.getAsString();
+ if (k.startsWith("minecraft:")) {
+ k = k.substring(10);
}
-
- private InputStream fmf() {
- String[] vp = sv.split("\\.");
-
- int maj, min, pat;
-
- try {
- maj = Integer.parseInt(vp[0]);
- min = Integer.parseInt(vp[1]);
- pat = vp.length > 2 ? Integer.parseInt(vp[2]) : 0;
- } catch (NumberFormatException | ArrayIndexOutOfBoundsException e) {
- Bukkit.getLogger().severe("[TuffX] Could not parse server version string: " + sv);
- return p.getResource("mapping-" + sv + ".json");
- }
-
- Bukkit.getLogger().info("[TuffX] Searching for mappings, starting from " + sv + " and going down.");
-
- for (int m = min; m >= 16; m--) {
- int sp = (m == min) ? pat : 9;
-
- for (int pt = sp; pt >= 0; pt--) {
- String vtt = maj + "." + m + "." + pt;
- String fn = "mapping-" + vtt + ".json";
-
- InputStream is = p.getResource(fn);
-
- if (is != null) {
- if (!vtt.equals(sv)) {
- Bukkit.getLogger().info("[TuffX] Using fallback mapping file: " + fn);
- } else {
- Bukkit.getLogger().info("[TuffX] Found exact mapping file: " + fn);
- }
- return is;
- }
- }
-
- String mvfn = "mapping-" + maj + "." + m + ".json";
- InputStream is = p.getResource(mvfn);
- if (is != null) {
- Bukkit.getLogger().info("[TuffX] Using fallback mapping file: " + mvfn);
- return is;
- }
- }
-
- Bukkit.getLogger().severe("[TuffX] Could not find any suitable mapping file after checking all versions down to " + maj + ".16.0");
- return null;
+ int[] result = lm.get(k);
+ return result != null ? result : DEFAULT_LEGACY;
+ }
+
+ private String gsmv() {
+ String vs = Bukkit.getServer().getVersion();
+ int mi = vs.indexOf("MC: ");
+ if (mi != -1) {
+ int ei = vs.indexOf(')', mi);
+ return ei != -1 ? vs.substring(mi + 4, ei) : vs.substring(mi + 4);
+ }
+ Bukkit.getLogger().warning("[TuffX] Could not detect Minecraft version. Defaulting to 1.21.");
+ return "1.21";
+ }
+
+ private InputStream fmf() {
+ String[] vp = sv.split("\\.");
+
+ int maj, min, pat;
+
+ try {
+ maj = Integer.parseInt(vp[0]);
+ min = Integer.parseInt(vp[1]);
+ pat = vp.length > 2 ? Integer.parseInt(vp[2]) : 0;
+ } catch (NumberFormatException | ArrayIndexOutOfBoundsException e) {
+ Bukkit.getLogger().severe("[TuffX] Could not parse server version string: " + sv);
+ return p.getResource("mapping-" + sv + ".json");
}
- private void gasm(File f) {
- try (InputStream is = fmf()) {
- if (is == null) {
- Bukkit.getLogger().severe("[TuffX] Failed to find mapping-" + sv + ".json in plugin resources!");
- return;
- }
+ Bukkit.getLogger().info("[TuffX] Searching for mappings, starting from " + sv + " and going down.");
- ObjectMapper m = new ObjectMapper();
- @SuppressWarnings("unchecked")
- Map r = m.readValue(is, Map.class);
- @SuppressWarnings("unchecked")
- List s = (List) r.get("blockstates");
+ for (int m = min; m >= 16; m--) {
+ int sp = (m == min) ? pat : 9;
- if (s == null) {
- Bukkit.getLogger().severe("[TuffX] 'blockstates' key not found in JSON.");
- return;
- }
+ for (int pt = sp; pt >= 0; pt--) {
+ String vtt = maj + "." + m + "." + pt;
+ String fn = "mapping-" + vtt + ".json";
- Object2ObjectOpenHashMap nlm = new Object2ObjectOpenHashMap<>();
- Bukkit.getLogger().info("[TuffX] Generating legacy mappings for " + s.size() + " block states...");
+ InputStream is = p.getResource(fn);
- for (int i = 0; i < s.size(); i++) {
- String k = s.get(i).replace("minecraft:", "");
- int[] l = ctl(i);
- nlm.put(k, l);
- }
+ if (is != null) {
+ if (!vtt.equals(sv)) {
+ Bukkit.getLogger().info("[TuffX] Using fallback mapping file: " + fn);
+ } else {
+ Bukkit.getLogger().info("[TuffX] Found exact mapping file: " + fn);
+ }
+ return is;
+ }
+ }
+
+ String mvfn = "mapping-" + maj + "." + m + ".json";
+ InputStream is = p.getResource(mvfn);
+ if (is != null) {
+ Bukkit.getLogger().info("[TuffX] Using fallback mapping file: " + mvfn);
+ return is;
+ }
+ }
- lm = nlm;
+ Bukkit.getLogger().severe(
+ "[TuffX] Could not find any suitable mapping file after checking all versions down to " + maj + ".16.0");
+ return null;
+ }
+
+ private void gasm(File f) {
+ try (InputStream is = fmf()) {
+ if (is == null) {
+ Bukkit.getLogger().severe("[TuffX] Failed to find mapping-" + sv + ".json in plugin resources!");
+ return;
+ }
+
+ ObjectMapper m = new ObjectMapper();
+ @SuppressWarnings("unchecked")
+ Map r = m.readValue(is, Map.class);
+ @SuppressWarnings("unchecked")
+ List s = (List) r.get("blockstates");
+
+ if (s == null) {
+ Bukkit.getLogger().severe("[TuffX] 'blockstates' key not found in JSON.");
+ return;
+ }
+
+ Object2ObjectOpenHashMap nlm = new Object2ObjectOpenHashMap<>();
+ Bukkit.getLogger().info("[TuffX] Generating legacy mappings for " + s.size() + " block states...");
+
+ for (int i = 0; i < s.size(); i++) {
+ String k = s.get(i).replace("minecraft:", "");
+ int[] l = ctl(i);
+ nlm.put(k, l);
+ }
+
+ lm = nlm;
+
+ Map o = new Object2ObjectOpenHashMap<>();
+ o.put("blockstates", lm);
+
+ f.getParentFile().mkdirs();
+ m.writerWithDefaultPrettyPrinter().writeValue(f, o);
+ Bukkit.getLogger().info("[TuffX] Successfully wrote mappings to " + f.getName());
+
+ } catch (Exception e) {
+ Bukkit.getLogger().log(Level.SEVERE, "[TuffX] Error generating legacy mappings.", e);
+ }
+ }
+
+ private void lm(File f) {
+ try {
+ ObjectMapper m = new ObjectMapper();
+ @SuppressWarnings("unchecked")
+ Map r = m.readValue(f, Map.class);
+ @SuppressWarnings("unchecked")
+ Map> rm = (Map>) r.get("blockstates");
+
+ if (rm == null) {
+ Bukkit.getLogger().severe("[TuffX] Invalid format in mappings file. Regenerating...");
+ gasm(f);
+ return;
+ }
+
+ lm = new Object2ObjectOpenHashMap<>();
+ for (Map.Entry> e : rm.entrySet()) {
+ List ll = e.getValue();
+ if (ll != null && ll.size() == 2) {
+ lm.put(e.getKey(), new int[] { ll.get(0), ll.get(1) });
+ }
+ }
+ Bukkit.getLogger().info("[TuffX] Loaded " + lm.size() + " legacy mappings.");
+ } catch (IOException e) {
+ Bukkit.getLogger().log(Level.SEVERE, "[TuffX] Failed to load mappings file.", e);
+ }
+ }
- Map o = new Object2ObjectOpenHashMap<>();
- o.put("blockstates", lm);
+ public int[] ctl(int mbsi) {
+ ProtocolVersion sp = Via.getAPI().getServerVersion().highestSupportedProtocolVersion();
+ ProtocolVersion cp = ProtocolVersion.v1_12_2;
- f.getParentFile().mkdirs();
- m.writerWithDefaultPrettyPrinter().writeValue(f, o);
- Bukkit.getLogger().info("[TuffX] Successfully wrote mappings to " + f.getName());
+ List pt = Via.getManager()
+ .getProtocolManager()
+ .getProtocolPath(
+ cp.getVersion(),
+ sp.getVersion());
- } catch (Exception e) {
- Bukkit.getLogger().log(Level.SEVERE, "[TuffX] Error generating legacy mappings.", e);
- }
+ if (pt == null) {
+ Bukkit.getLogger().warning("[TuffX] Protocol path is null!");
+ return new int[] { 1, 0 };
}
- private void lm(File f) {
- try {
- ObjectMapper m = new ObjectMapper();
- @SuppressWarnings("unchecked")
- Map r = m.readValue(f, Map.class);
- @SuppressWarnings("unchecked")
- Map> rm = (Map>) r.get("blockstates");
-
- if (rm == null) {
- Bukkit.getLogger().severe("[TuffX] Invalid format in mappings file. Regenerating...");
- gasm(f);
- return;
- }
-
- lm = new Object2ObjectOpenHashMap<>();
- for (Map.Entry> e : rm.entrySet()) {
- List ll = e.getValue();
- if (ll != null && ll.size() == 2) {
- lm.put(e.getKey(), new int[]{ll.get(0), ll.get(1)});
- }
- }
- Bukkit.getLogger().info("[TuffX] Loaded " + lm.size() + " legacy mappings.");
- } catch (IOException e) {
- Bukkit.getLogger().log(Level.SEVERE, "[TuffX] Failed to load mappings file.", e);
- }
- }
+ int csi = mbsi;
- public int[] ctl(int mbsi) {
- ProtocolVersion sp = Via.getAPI().getServerVersion().highestSupportedProtocolVersion();
- ProtocolVersion cp = ProtocolVersion.v1_12_2;
+ for (int i = pt.size() - 1; i >= 0; i--) {
+ ProtocolPathEntry e = pt.get(i);
+ Protocol pr = e.protocol();
- List pt = Via.getManager()
- .getProtocolManager()
- .getProtocolPath(
- cp.getVersion(),
- sp.getVersion()
- );
+ if (pr instanceof BackwardsProtocol) {
+ BackwardsMappingData md = ((BackwardsProtocol) pr).getMappingData();
+ if (md != null && md.getBlockStateMappings() != null) {
+ int ni = md.getBlockStateMappings().getNewId(csi);
- if (pt == null) {
- Bukkit.getLogger().warning("[TuffX] Protocol path is null!");
- return new int[]{1, 0};
- }
-
- int csi = mbsi;
-
- for (int i = pt.size() - 1; i >= 0; i--) {
- ProtocolPathEntry e = pt.get(i);
- Protocol pr = e.protocol();
-
- if (pr instanceof BackwardsProtocol) {
- BackwardsMappingData md = ((BackwardsProtocol) pr).getMappingData();
- if (md != null && md.getBlockStateMappings() != null) {
- int ni = md.getBlockStateMappings().getNewId(csi);
-
- if (ni != -1) {
- csi = ni;
- }
- }
- }
+ if (ni != -1) {
+ csi = ni;
+ }
}
+ }
+ }
- int bi = csi >> 4;
- int mt = csi & 0xF;
+ int bi = csi >> 4;
+ int mt = csi & 0xF;
- return new int[]{bi, mt};
- }
+ return new int[] { bi, mt };
+ }
}
diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml
index a9ffa27..a66e08b 100644
--- a/src/main/resources/config.yml
+++ b/src/main/resources/config.yml
@@ -1,15 +1,18 @@
-#debug mode
+# debug mode
debug-mode: false
-#worlds for y0 to be enabled in
+# worlds for y0 to be enabled in
enabled-worlds:
- - 'world'
+ - 'world'
-#the amount of threads for the chunk processor to use - using more threads processes chunks faster, but increases CPU usage
-#-1 is automatic
+# the amount of threads for the chunk processor to use - using more threads processes chunks faster, but increases CPU usage
+# -1 is automatic
chunk-processor-threads: -1
-#the size of the cache
+# the size of the cache
cache-size: 512
-#how long until the cache expires (minutes)
+# how long until the cache expires (minutes)
cache-expiration: 5
+
+# if the plugin should kick outdated versions of tuffclient
+kick-outdated-clients: true
\ No newline at end of file
diff --git a/target/TuffX.jar b/target/TuffX.jar
deleted file mode 100644
index d3501ab..0000000
Binary files a/target/TuffX.jar and /dev/null differ
diff --git a/target/classes/config.yml b/target/classes/config.yml
deleted file mode 100644
index a9ffa27..0000000
--- a/target/classes/config.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-#debug mode
-debug-mode: false
-
-#worlds for y0 to be enabled in
-enabled-worlds:
- - 'world'
-
-#the amount of threads for the chunk processor to use - using more threads processes chunks faster, but increases CPU usage
-#-1 is automatic
-chunk-processor-threads: -1
-
-#the size of the cache
-cache-size: 512
-#how long until the cache expires (minutes)
-cache-expiration: 5