Allow to use plotsquared with Paper-Folia #4009

TheMeinerLP · 2023-04-05T11:14:21Z

Overview

Experimental folia support for plotsquared

Description

This PR implements a experimental version of plotsquared into folia

Submitter Checklist

Make sure you are opening from a topic branch (/feature/fix/docs/ branch (right side)) and not your main branch.
Ensure that the pull request title represents the desired changelog entry.
New public fields and methods are annotated with @since TODO.
I read and followed the contribution guidelines.

NotMyFault

Can't be tested properly until FAWE or WE supports Folia.

NotMyFault · 2023-04-07T13:00:06Z

Bukkit/build.gradle.kts

@@ -24,7 +24,7 @@ dependencies {
    implementation("org.bstats:bstats-bukkit")

    // Paper
-    compileOnly("io.papermc.paper:paper-api")
+    compileOnly("dev.folia:folia-api:1.19.4-R0.1-SNAPSHOT")


Suggested change

compileOnly("dev.folia:folia-api:1.19.4-R0.1-SNAPSHOT")

compileOnly("dev.folia:folia-api:1.19.4-R0.1-SNAPSHOT")

This doesn't look right to me. The bukkit module has to stick to Paper for compatibility and compiling reasons.

When i allow both. The the API support for folia will break in IJ

But this breaks compatibility with Spigot and Paper.

Okay. Let me check that how we can handle it

NotMyFault · 2023-04-07T13:00:31Z

Bukkit/src/main/java/com/plotsquared/bukkit/BukkitPlatform.java

-import com.google.inject.Singleton;
-import com.google.inject.Stage;
-import com.google.inject.TypeLiteral;
+import com.google.inject.*;


Don't use asterisk imports. Please configure your IDE to respect the .editorconfig file placed in the root directory.

My ide dont respect the settings 😂 Idk why but all the default settings

NotMyFault · 2023-04-07T13:01:22Z

Bukkit/src/main/java/com/plotsquared/bukkit/generator/BukkitPlotGenerator.java

+            if (PlotSquared.platform().serverVersion()[1] <= 19) {
+                biomes.remove(Biome.CHERRY_GROVE);
+            }


What is that supposed to do? Does folia not support cherry groves?

Some 1.19.4 servers tries to generate plots without 1.20 datapacks.

I don't understand the issue. CHERRY_GROVE exist in 1.19.4, what does Folia or 1.20 have to do with it?

[13:21:06] [pool-13-thread-1/WARN]: [PlotSquared/BukkitPlatform] This message may also be a false positive and could be ignored. [13:21:06] [Server thread/INFO]: [PlotSquared/BukkitPlatform] (UUID) 0 UUIDs will be cached [13:21:06] [Server thread/INFO]: Preparing level "world" [13:21:06] [Server thread/ERROR]: Encountered an unexpected exception java.lang.IllegalStateException: Missing key in ResourceKey[minecraft:root / minecraft:worldgen/biome]: ResourceKey[minecraft:worldgen/biome / minecraft:cherry_grove] at net.minecraft.core.Registry.getHolderOrThrow(Registry.java:162) ~[folia-1.19.4.jar:git-Folia-22] at java.util.Optional.orElseThrow(Optional.java:403) ~[?:?] at net.minecraft.core.Registry.getHolderOrThrow(Registry.java:162) ~[folia-1.19.4.jar:git-Folia-22] at org.bukkit.craftbukkit.v1_19_R3.block.CraftBlock.biomeToBiomeBase(CraftBlock.java:407) ~[folia-1.19.4.jar:git-Folia-22] at org.bukkit.craftbukkit.v1_19_R3.generator.CustomWorldChunkManager.biomeListToBiomeBaseList(CustomWorldChunkManager.java:28) ~[folia-1.19.4.jar:git-Folia-22] at org.bukkit.craftbukkit.v1_19_R3.generator.CustomWorldChunkManager.b(CustomWorldChunkManager.java:55) ~[folia-1.19.4.jar:git-Folia-22] at net.minecraft.world.level.biome.BiomeSource.d(BiomeSource.java:29) ~[?:?] at com.google.common.base.Suppliers$NonSerializableMemoizingSupplier.get(Suppliers.java:183) ~[guava-31.1-jre.jar:?] at net.minecraft.world.level.biome.BiomeSource.possibleBiomes(BiomeSource.java:40) ~[?:?] at net.minecraft.world.level.chunk.ChunkGeneratorStructureState.hasBiomesForStructureSet(ChunkGeneratorStructureState.java:157) ~[folia-1.19.4.jar:git-Folia-22] at net.minecraft.world.level.chunk.ChunkGeneratorStructureState.lambda$createForNormal$1(ChunkGeneratorStructureState.java:65) ~[folia-1.19.4.jar:git-Folia-22] at java.util.stream.ReferencePipeline$2$1.accept(ReferencePipeline.java:178) ~[?:?] at java.util.AbstractList$RandomAccessSpliterator.forEachRemaining(AbstractList.java:720) ~[?:?] at java.util.stream.AbstractPipeline.copyInto(AbstractPipeline.java:509) ~[?:?] at java.util.stream.AbstractPipeline.wrapAndCopyInto(AbstractPipeline.java:499) ~[?:?] at java.util.stream.ReduceOps$ReduceOp.evaluateSequential(ReduceOps.java:921) ~[?:?] at java.util.stream.AbstractPipeline.evaluate(AbstractPipeline.java:234) ~[?:?] at java.util.stream.ReferencePipeline.collect(ReferencePipeline.java:682) ~[?:?] at net.minecraft.world.level.chunk.ChunkGeneratorStructureState.createForNormal(ChunkGeneratorStructureState.java:66) ~[folia-1.19.4.jar:git-Folia-22] at net.minecraft.world.level.chunk.ChunkGenerator.createState(ChunkGenerator.java:106) ~[folia-1.19.4.jar:git-Folia-22] at net.minecraft.server.level.ChunkMap.<init>(ChunkMap.java:305) ~[folia-1.19.4.jar:git-Folia-22] at net.minecraft.server.level.ServerChunkCache.<init>(ServerChunkCache.java:276) ~[?:?] at net.minecraft.server.level.ServerLevel.<init>(ServerLevel.java:645) ~[?:?] at net.minecraft.server.MinecraftServer.loadWorld0(MinecraftServer.java:616) ~[folia-1.19.4.jar:git-Folia-22] at net.minecraft.server.MinecraftServer.loadLevel(MinecraftServer.java:465) ~[folia-1.19.4.jar:git-Folia-22] at net.minecraft.server.dedicated.DedicatedServer.initServer(DedicatedServer.java:308) ~[folia-1.19.4.jar:git-Folia-22] at net.minecraft.server.MinecraftServer.runServer(MinecraftServer.java:1191) ~[folia-1.19.4.jar:git-Folia-22] at net.minecraft.server.MinecraftServer.lambda$spin$0(MinecraftServer.java:348) ~[folia-1.19.4.jar:git-Folia-22] at java.lang.Thread.run(Thread.java:833) ~[?:?] [13:21:07] [Server thread/ERROR]: This crash report has been saved to: /Users/pglanz/development/workspace/gitlab_themeinerlp_dev/onelitefeather/PlotSquared/run-folia/./crash-reports/crash-2023-04-05_13.21.07-server.txt [13:21:07] [Region shutdown thread/INFO]: [RegionShutdownThread] Awaiting scheduler termination for 60s [13:21:07] [Region shutdown thread/INFO]: [RegionShutdownThread] Scheduler halted [13:21:07] [Region shutdown thread/INFO]: Stopping server

Thats the generic issue on the main branch of PS.
I prepared also already a non folia fix of it.

NotMyFault · 2023-04-07T13:02:08Z

Bukkit/src/main/java/com/plotsquared/bukkit/managers/BukkitWorldManager.java

+        if (!FoliaSupport.isFolia()) {
+            final WorldCreator wc = new WorldCreator(worldName);
+            wc.environment(World.Environment.NORMAL);
+            if (generator != null) {
+                wc.generator(generator);
+                wc.type(WorldType.FLAT);
+            }


There's an issue within the default branch preventing world generation atm, so this can't be tested and verified safely.

Folia have not yet a API for create worlds. Before we run in issues, I removed that option for folia

NotMyFault · 2023-04-07T13:03:41Z

Bukkit/src/main/java/com/plotsquared/bukkit/util/FoliaSupport.java

+        return IS_FOLIA;
+    }
+
+    public static boolean isTickThread() {


Yeah. Currently

NotMyFault · 2023-04-07T13:04:29Z

Bukkit/src/main/resources/plugin.yml

@@ -420,3 +420,4 @@ permissions:
      plots.done: true
      plots.continue: true
      plots.middle: true
+folia-supported: true


Format, please put this in a higher location.

I will change that

TheMeinerLP · 2023-04-07T13:13:42Z

To testing it @NotMyFault download the FAWE jar from folia support branch PR IntellectualSites/FastAsyncWorldEdit#2171. I some issues still there. Thats very experimental

# Conflicts: # .gitignore # build.gradle.kts

roggy666 · 2023-08-20T10:13:22Z

Hello! Will there be further development for Folia?

github-actions · 2023-10-22T10:56:03Z

Please take a moment and address the merge conflicts of your pull request. Thanks!

WarSkyGod · 2024-02-15T10:51:37Z

Hello, is there any new progress in folia?

TheMeinerLP added 8 commits April 5, 2023 13:07

Use folia api against paper api

6305db8

Implement run paper for folia

1ddeec6

Add folia support class

f5c606f

Add specialized folia task manager

6727d85

Enable folia support

c6bab2a

Add snapshot support for run paper

accce89

Implement folia support

dcb11e1

Extend git ignore

19cde40

TheMeinerLP requested a review from a team as a code owner April 5, 2023 11:14

github-actions bot added the Feature This PR proposes a new feature label Apr 5, 2023

TheMeinerLP added 2 commits April 5, 2023 13:32

Exclude 1.20 biome for 1.19

0e0b4e2

Check if world creation folia api

c31aea7

NotMyFault reviewed Apr 7, 2023

View reviewed changes

TheMeinerLP added 16 commits June 5, 2023 20:56

Fix command processing for folia servers

129859e

Fix chunk coordinator for folia

fe47580

Remove unused code

654c48e

Use folia api against paper api

3138d67

Implement run paper for folia

c09d842

Add folia support class

402805d

Add specialized folia task manager

e104e0f

Enable folia support

1fa9d0c

Add snapshot support for run paper

43d71fe

Implement folia support

086138b

Extend git ignore

b72001c

Exclude 1.20 biome for 1.19

963a921

Check if world creation folia api

aba3a92

Fix command processing for folia servers

75361b9

Fix chunk coordinator for folia

15d8027

Remove unused code

1e691f5

Merge remote-tracking branch 'origin/feature/folia' into feature/folia

a5371aa

# Conflicts: # .gitignore # build.gradle.kts

github-actions bot added the unresolved-merge-conflict label Oct 22, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Allow to use plotsquared with Paper-Folia #4009

Allow to use plotsquared with Paper-Folia #4009

TheMeinerLP commented Apr 5, 2023

NotMyFault left a comment

NotMyFault Apr 7, 2023

TheMeinerLP Apr 7, 2023

NotMyFault Apr 7, 2023

TheMeinerLP Apr 7, 2023

NotMyFault Apr 7, 2023

TheMeinerLP Apr 7, 2023

NotMyFault Apr 7, 2023

TheMeinerLP Apr 7, 2023

NotMyFault Apr 7, 2023

TheMeinerLP Apr 7, 2023

NotMyFault Apr 7, 2023

TheMeinerLP Apr 7, 2023

NotMyFault Apr 7, 2023

TheMeinerLP Apr 7, 2023

NotMyFault Apr 7, 2023

TheMeinerLP Apr 7, 2023

TheMeinerLP commented Apr 7, 2023

roggy666 commented Aug 20, 2023

github-actions bot commented Oct 22, 2023

WarSkyGod commented Feb 15, 2024

	compileOnly("dev.folia:folia-api:1.19.4-R0.1-SNAPSHOT")
	compileOnly("dev.folia:folia-api:1.19.4-R0.1-SNAPSHOT")

Allow to use plotsquared with Paper-Folia #4009

Are you sure you want to change the base?

Allow to use plotsquared with Paper-Folia #4009

Conversation

TheMeinerLP commented Apr 5, 2023

Overview

Description

Submitter Checklist

NotMyFault left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

TheMeinerLP commented Apr 7, 2023

roggy666 commented Aug 20, 2023

github-actions bot commented Oct 22, 2023

WarSkyGod commented Feb 15, 2024