From 50027ba3b21aa5dc652291ae7af52d128c43ab03 Mon Sep 17 00:00:00 2001 From: CrazyCloudCraft | Argantiu <95505222+CrazyCloudCraft@users.noreply.github.com> Date: Mon, 8 Aug 2022 17:03:32 +0200 Subject: [PATCH 1/9] Update build.gradle --- build.gradle | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index f74439c..5bab0e6 100644 --- a/build.gradle +++ b/build.gradle @@ -9,7 +9,7 @@ buildscript { plugins { id 'com.github.johnrengelman.shadow' version '7.1.2' - id 'kr.entree.spigradle' version '2.2.4' + id 'kr.entree.spigradle' version '2.4.2' id 'io.freefair.lombok' version '6.5.0.3' id 'java' id 'jacoco' @@ -203,7 +203,8 @@ dependencies { compileOnly 'me.clip:placeholderapi:2.11.2' compileOnly 'com.github.MilkBowl:VaultAPI:1.7.1' compileOnly 'com.mojang:authlib:1.5.25' - compileOnly 'org.projectlombok:lombok:1.18.24' + compileOnly 'org.projectlombok:lombok:1.18.24' + // compileOnly spigot('1.19') compileOnly 'com.sk89q.worldedit:worldedit-bukkit:7.2.11-SNAPSHOT' compileOnly 'com.sk89q.worldedit:worldedit-core:7.2.11-SNAPSHOT' compileOnly("com.fastasyncworldedit:FastAsyncWorldEdit-Bukkit:2.4.2") From e88d6e1ffd13d1907fc5cf902b19117b68e4af25 Mon Sep 17 00:00:00 2001 From: CrazyCloudCraft | Argantiu <95505222+CrazyCloudCraft@users.noreply.github.com> Date: Mon, 8 Aug 2022 17:10:04 +0200 Subject: [PATCH 2/9] Update build.gradle --- build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/build.gradle b/build.gradle index 5bab0e6..39a14e9 100644 --- a/build.gradle +++ b/build.gradle @@ -182,6 +182,7 @@ dependencies { } } + compileOnly spigot('1.19.2') compileOnly lombok() annotationProcessor lombok() From f0386bab55f972a8363a383d1d755807f9d4fc3e Mon Sep 17 00:00:00 2001 From: CrazyCloudCraft | Argantiu <95505222+CrazyCloudCraft@users.noreply.github.com> Date: Mon, 8 Aug 2022 17:31:37 +0200 Subject: [PATCH 3/9] Update AsyncCreatorAdapter.java --- .../de/butzlabben/world/wrapper/AsyncCreatorAdapter.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/de/butzlabben/world/wrapper/AsyncCreatorAdapter.java b/src/main/java/de/butzlabben/world/wrapper/AsyncCreatorAdapter.java index c9693ce..c163fac 100644 --- a/src/main/java/de/butzlabben/world/wrapper/AsyncCreatorAdapter.java +++ b/src/main/java/de/butzlabben/world/wrapper/AsyncCreatorAdapter.java @@ -1,4 +1,4 @@ -package de.butzlabben.world.wrapper; +/* package de.butzlabben.world.wrapper; import com.boydti.fawe.bukkit.wrapper.AsyncWorld; //import com.boydti.fawe.util.TaskManager; @@ -10,11 +10,11 @@ import org.bukkit.block.Block; import java.util.Objects; -/** +/* * @author Butzlabben * @since 08.06.2018 */ -public class AsyncCreatorAdapter implements CreatorAdapter { +/* public class AsyncCreatorAdapter implements CreatorAdapter { // Create worlds async to close #16 @Override @@ -43,3 +43,4 @@ public class AsyncCreatorAdapter implements CreatorAdapter { } } +*/ From 8e8924e75ec0db6a7a24f2a6a1b835bfcb1c78a6 Mon Sep 17 00:00:00 2001 From: CrazyCloudCraft | Argantiu <95505222+CrazyCloudCraft@users.noreply.github.com> Date: Mon, 8 Aug 2022 17:36:58 +0200 Subject: [PATCH 4/9] Update build.gradle --- build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/build.gradle b/build.gradle index 39a14e9..8d784d1 100644 --- a/build.gradle +++ b/build.gradle @@ -206,6 +206,7 @@ dependencies { compileOnly 'com.mojang:authlib:1.5.25' compileOnly 'org.projectlombok:lombok:1.18.24' // compileOnly spigot('1.19') + compileOnly 'org.spigotmc:spigot-api:jar:1.19-R0.1-SNAPSHOT' compileOnly 'com.sk89q.worldedit:worldedit-bukkit:7.2.11-SNAPSHOT' compileOnly 'com.sk89q.worldedit:worldedit-core:7.2.11-SNAPSHOT' compileOnly("com.fastasyncworldedit:FastAsyncWorldEdit-Bukkit:2.4.2") From 6137015d11d0e8538ab33b3fe7a16789e1399110 Mon Sep 17 00:00:00 2001 From: CrazyCloudCraft | Argantiu <95505222+CrazyCloudCraft@users.noreply.github.com> Date: Mon, 8 Aug 2022 17:37:57 +0200 Subject: [PATCH 5/9] Update gradle.properties --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 9020fed..9da571b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ group = de.butzlabben pluginName = WorldSystem author = Trainerlord, Butzlabben & CrazyCloudCraft mcVersion = 1.19 -apiVersion = 1.19 +apiVersion = 1.17 version = 2.4.31-beta2 Vault = Vault WorldEdit = WorldEdit From 5e0529ee9d42d2f76b97dc80a4d26e9cbe67e8f1 Mon Sep 17 00:00:00 2001 From: CrazyCloudCraft | Argantiu <95505222+CrazyCloudCraft@users.noreply.github.com> Date: Mon, 8 Aug 2022 17:50:08 +0200 Subject: [PATCH 6/9] Update build.gradle --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 8d784d1..9c56621 100644 --- a/build.gradle +++ b/build.gradle @@ -206,7 +206,7 @@ dependencies { compileOnly 'com.mojang:authlib:1.5.25' compileOnly 'org.projectlombok:lombok:1.18.24' // compileOnly spigot('1.19') - compileOnly 'org.spigotmc:spigot-api:jar:1.19-R0.1-SNAPSHOT' + compileOnly 'org.spigotmc:spigot-api:1.19-R0.1-SNAPSHOT' compileOnly 'com.sk89q.worldedit:worldedit-bukkit:7.2.11-SNAPSHOT' compileOnly 'com.sk89q.worldedit:worldedit-core:7.2.11-SNAPSHOT' compileOnly("com.fastasyncworldedit:FastAsyncWorldEdit-Bukkit:2.4.2") From f5691640b64a8bfe6948dd35d53e8f6186a67ac8 Mon Sep 17 00:00:00 2001 From: CrazyCloudCraft | Argantiu <95505222+CrazyCloudCraft@users.noreply.github.com> Date: Mon, 8 Aug 2022 18:06:21 +0200 Subject: [PATCH 7/9] Update build.gradle --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 9c56621..046a11d 100644 --- a/build.gradle +++ b/build.gradle @@ -9,7 +9,7 @@ buildscript { plugins { id 'com.github.johnrengelman.shadow' version '7.1.2' - id 'kr.entree.spigradle' version '2.4.2' + id 'kr.entree.spigradle' version '2.2.4' id 'io.freefair.lombok' version '6.5.0.3' id 'java' id 'jacoco' From b1cc06eeee79b8895de9f3a63a35bcc84a8b3a51 Mon Sep 17 00:00:00 2001 From: CrazyCloudCraft | Argantiu <95505222+CrazyCloudCraft@users.noreply.github.com> Date: Mon, 8 Aug 2022 18:10:13 +0200 Subject: [PATCH 8/9] Update WorldSystem.java --- src/main/java/de/butzlabben/world/WorldSystem.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/de/butzlabben/world/WorldSystem.java b/src/main/java/de/butzlabben/world/WorldSystem.java index 1390d01..1a4a0b2 100644 --- a/src/main/java/de/butzlabben/world/WorldSystem.java +++ b/src/main/java/de/butzlabben/world/WorldSystem.java @@ -8,7 +8,7 @@ import de.butzlabben.world.util.PapiExtension; import de.butzlabben.world.util.PlayerPositions; import de.butzlabben.world.util.VersionUtil; import de.butzlabben.world.util.database.DatabaseProvider; -import de.butzlabben.world.wrapper.AsyncCreatorAdapter; +// import de.butzlabben.world.wrapper.AsyncCreatorAdapter; // Since FAWE 2.0 this do nothing import de.butzlabben.world.wrapper.CreatorAdapter; import de.butzlabben.world.wrapper.SystemWorld; // import org.bstats.bukkit.Metrics; // Argantiu Development hates bstats, cause of data privecy. Also it isn't working. @@ -168,7 +168,7 @@ public class WorldSystem extends JavaPlugin { && PluginConfig.loadWorldsASync() && !is1_13Plus) { - creator = new AsyncCreatorAdapter(); + // creator = new AsyncCreatorAdapter(); // Since FAWE 2.0 this do nothing Bukkit.getConsoleSender() .sendMessage(PluginConfig.getPrefix() + "Found FAWE! Worlds now will be created asynchronously"); } else { From 2eff28f3d44c0b9924be04212f64bbe5f8790727 Mon Sep 17 00:00:00 2001 From: CrazyCloudCraft | Argantiu <95505222+CrazyCloudCraft@users.noreply.github.com> Date: Mon, 8 Aug 2022 20:18:52 +0200 Subject: [PATCH 9/9] Update gradlewcommand.txt --- .github/gradlewcommand.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/gradlewcommand.txt b/.github/gradlewcommand.txt index 6290017..3be09f5 100644 --- a/.github/gradlewcommand.txt +++ b/.github/gradlewcommand.txt @@ -1 +1,3 @@ git clone https://github.com/CrazyCloudCraft/worldsystem-depecated.git && cd worldsystem-depecated && chmod +x gradlew && ./gradlew build + +#git clone