From cf1567a1dbdc2c0209048024f4e90088a3d844b4 Mon Sep 17 00:00:00 2001 From: BuildTools Date: Sun, 22 Sep 2019 01:48:39 -0600 Subject: [PATCH] Temporary fix on the ChunkSnapshot for 1.12 and lower until I recode it --- .classpath | 5 ++++ build.gradle | 2 ++ .../levelling/LegacyChunkSnapshotData.java | 23 ------------------- .../levelling/LegacyChunkSnapshotFetcher.java | 13 ----------- 4 files changed, 7 insertions(+), 36 deletions(-) delete mode 100644 src/main/java/com/songoda/skyblock/levelling/LegacyChunkSnapshotData.java delete mode 100644 src/main/java/com/songoda/skyblock/levelling/LegacyChunkSnapshotFetcher.java diff --git a/.classpath b/.classpath index 9410146b..ac8dc245 100644 --- a/.classpath +++ b/.classpath @@ -147,4 +147,9 @@ + + + + + diff --git a/build.gradle b/build.gradle index 6f25076c..71737dc2 100644 --- a/build.gradle +++ b/build.gradle @@ -88,6 +88,8 @@ dependencies { // Songoda Updater shade (group: 'com.songoda', name: 'songodaupdater', version: '1') + shade fileTree(dir: 'libraries', include: '*.jar') + } processResources { diff --git a/src/main/java/com/songoda/skyblock/levelling/LegacyChunkSnapshotData.java b/src/main/java/com/songoda/skyblock/levelling/LegacyChunkSnapshotData.java deleted file mode 100644 index 60014d74..00000000 --- a/src/main/java/com/songoda/skyblock/levelling/LegacyChunkSnapshotData.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.songoda.skyblock.levelling; - -import org.bukkit.Material; - -public class LegacyChunkSnapshotData { - - private Material material; - private int data; - - public LegacyChunkSnapshotData(Material material, int data) { - this.material = material; - this.data = data; - } - - public Material getMaterial() { - return this.material; - } - - public int getData() { - return this.data; - } - -} diff --git a/src/main/java/com/songoda/skyblock/levelling/LegacyChunkSnapshotFetcher.java b/src/main/java/com/songoda/skyblock/levelling/LegacyChunkSnapshotFetcher.java deleted file mode 100644 index ae93c1d5..00000000 --- a/src/main/java/com/songoda/skyblock/levelling/LegacyChunkSnapshotFetcher.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.songoda.skyblock.levelling; - -import org.bukkit.ChunkSnapshot; - -public class LegacyChunkSnapshotFetcher { - - // Uses a 1.12.2 jar in a separate project to avoid needing to use reflection during level scanning, much faster. - @SuppressWarnings("deprecation") - public static LegacyChunkSnapshotData fetch(ChunkSnapshot snapshot, int x, int y, int z) { - return new LegacyChunkSnapshotData(snapshot.getBlockType(x, y, z), snapshot.getData(x, y, z)); - } - -} \ No newline at end of file