Temp fix : #40

Euphillya · May 23, 2024 · 0c1e0c0 · 0c1e0c0
1 parent c88c56e
commit 0c1e0c0
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 9 deletions.
diff --git a/nms/v1_19_R2/build.gradle.kts b/nms/v1_19_R2/build.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
     id("java")
-    id("io.papermc.paperweight.userdev") version "1.7.1" // Check for new versions at https://plugins.gradle.org/plugin/io.papermc.paperweight.userdev
+    id("io.papermc.paperweight.userdev")
 }
 
 dependencies {
@@ -14,7 +14,6 @@ tasks {
     }
     compileJava {
         options.encoding = "UTF-8"
-        options.release = 17
     }
 }
 

diff --git a/nms/v1_19_R3/build.gradle.kts b/nms/v1_19_R3/build.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
     id("java")
-    id("io.papermc.paperweight.userdev") version "1.7.1" // Check for new versions at https://plugins.gradle.org/plugin/io.papermc.paperweight.userdev
+    id("io.papermc.paperweight.userdev")
 }
 
 dependencies {

diff --git a/nms/v1_20_R1/build.gradle.kts b/nms/v1_20_R1/build.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
     id("java")
-    id("io.papermc.paperweight.userdev") version "1.7.1" // Check for new versions at https://plugins.gradle.org/plugin/io.papermc.paperweight.userdev
+    id("io.papermc.paperweight.userdev")
 }
 
 dependencies {

diff --git a/nms/v1_20_R2/build.gradle.kts b/nms/v1_20_R2/build.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
     id("java")
-    id("io.papermc.paperweight.userdev") version "1.7.1" // Check for new versions at https://plugins.gradle.org/plugin/io.papermc.paperweight.userdev
+    id("io.papermc.paperweight.userdev")
 }
 
 dependencies {

diff --git a/nms/v1_20_R3/build.gradle.kts b/nms/v1_20_R3/build.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
     id("java")
-    id("io.papermc.paperweight.userdev") version "1.7.1" // Check for new versions at https://plugins.gradle.org/plugin/io.papermc.paperweight.userdev
+    id("io.papermc.paperweight.userdev")
 }
 
 dependencies {

diff --git a/nms/v1_20_R4/build.gradle.kts b/nms/v1_20_R4/build.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
     id("java")
-    id("io.papermc.paperweight.userdev") version "1.7.1" // Check for new versions at https://plugins.gradle.org/plugin/io.papermc.paperweight.userdev
+    id("io.papermc.paperweight.userdev")
 }
 
 dependencies {

diff --git a/nms/v1_20_R4/src/main/java/fr/euphyllia/skyllia/utils/nms/v1_20_R4/WorldNMS.java b/nms/v1_20_R4/src/main/java/fr/euphyllia/skyllia/utils/nms/v1_20_R4/WorldNMS.java
@@ -200,7 +200,7 @@ public WorldFeedback.FeedbackWorld createWorld(WorldCreator creator) {
 
         // Paper start - fix and optimise world upgrading
         if (console.options.has("forceUpgrade")) {
-            net.minecraft.server.Main.convertWorldButItWorks(actualDimension, worldSession, DataFixers.getDataFixer(), iregistrycustom_dimension, worlddimension.generator().getTypeNameForDataFixer(), console.options.has("eraseCache"), console.options.has("recreateRegionFiles"));
+            net.minecraft.server.Main.forceUpgrade(worldSession, DataFixers.getDataFixer(), console.options.has("eraseCache"), () -> true, iregistrycustom_dimension, console.options.has("recreateRegionFiles"));
         }
         // Paper end - fix and optimise world upgrading
         ResourceKey<net.minecraft.world.level.Level> worldKey;

diff --git a/...n/java/fr/euphyllia/skyllia/listeners/bukkitevents/paper/PortalAlternativePaperEvent.java b/...n/java/fr/euphyllia/skyllia/listeners/bukkitevents/paper/PortalAlternativePaperEvent.java
@@ -29,7 +29,7 @@ public void onPlayerInsidePortal(final EntityInsideBlockEvent event) {
             Block block = event.getBlock();
             World world = block.getWorld();
             if (!SkylliaAPI.isWorldSkyblock(world)) return;
-            event.setCancelled(true);
+            //event.setCancelled(true); Todo ? Je ne sais plus pourquoi il est là
             Material blockType = block.getType();
             switch (blockType) {
                 case NETHER_PORTAL -> {