Add folia support #77

RitaSister · 2025-07-13T18:22:11Z

First support for folia in this plugin. There may still be areas that require revision.

Jsinco

Everything else looks fine at a glance, just proposing changes to ticking those cauldrons

Jsinco · 2025-07-13T21:17:41Z

bukkit/src/main/java/dev/jsinco/brewery/bukkit/breweries/BukkitCauldron.java

-                .orElse(Color.GRAY);
-
-        this.playBrewingEffects();
+        Optional<World> optionalWorld = BukkitAdapter.toWorld(location);


Like Nadwey said, this shouldn't be creating a fixed-rate scheduler. I also don't think the folia scheduler object is needed here either

Suggested change

Optional<World> optionalWorld = BukkitAdapter.toWorld(location);

Location bukkitLocation = BukkitAdapter.toLocation(location);

SinglePositionStructure structure = this;

Bukkit.getRegionScheduler().run(TheBrewingProject.getInstance(), bukkitLocation, (task) -> {

if (!BlockUtil.isChunkLoaded(location)) {

return;

}

if (!Tag.CAULDRONS.isTagged(getBlock().getType()) || getBlock().getType() == Material.CAULDRON) {

ListenerUtil.removeActiveSinglePositionStructure(structure, TheBrewingProject.getInstance().getBreweryRegistry(), TheBrewingProject.getInstance().getDatabase());

return;

}

hot = isHeatSource(getBlock().getRelative(BlockFace.DOWN));

recalculateBrewTime();

Color baseParticleColor = computeBaseParticleColor(getBlock());

Optional<Recipe<ItemStack>> recipeOptional = brew.closestRecipe(TheBrewingProject.getInstance().getRecipeRegistry());

Color resultColor = computeResultColor(recipeOptional);

particleColor = recipeOptional.map(recipe -> computeParticleColor(baseParticleColor, resultColor, recipe))

.orElse(Color.GRAY);

playBrewingEffects();

});

Jsinco · 2025-07-13T21:23:16Z

bukkit/src/main/java/dev/jsinco/brewery/bukkit/util/FoliaRunnable.java

@@ -0,0 +1,156 @@
+package dev.jsinco.brewery.bukkit.util;


Accidentally left this comment out of my review:

I don't think this object needs to be here

…dronTask() once.

Thorinwasher

You need to have everything that is done on inventories in the proper thread, this is important because otherwise there's nothing saying what or how something could get duped. See

TheBrewingProject/bukkit/src/main/java/dev/jsinco/brewery/bukkit/TheBrewingProject.java

Lines 258 to 259 in e9dcc13

    
           List.copyOf(breweryRegistry.<BukkitBarrel>getOpened(StructureType.BARREL)).forEach(Barrel::tickInventory); 
        
           List.copyOf(breweryRegistry.<BukkitDistillery>getOpened(StructureType.DISTILLERY)).forEach(Distillery::tickInventory);

Thorinwasher · 2025-07-13T18:27:17Z

bukkit/src/main/java/dev/jsinco/brewery/bukkit/TheBrewingProject.java

+        Bukkit.getGlobalRegionScheduler().runAtFixedRate(this, task -> this.updateStructures(), 1, 1);
+        Bukkit.getGlobalRegionScheduler().runAtFixedRate(this, task -> this.otherTicking(), 1, 1);


These two methods would also by themself need to delegate to probably something like the local region scheduler for each structure.

Thorinwasher · 2025-07-14T07:53:21Z

bukkit/src/main/java/dev/jsinco/brewery/bukkit/breweries/BukkitCauldron.java

+                        .orElse(Color.GRAY);
+                playBrewingEffects();
+            }
+        }.runAtFixedRate(TheBrewingProject.getInstance(), 20, 1);


~~This is going to cause a memory leak~~. You could at least simplify it to runNow, no need for it to be more complicated than that

Thorinwasher · 2025-07-14T07:53:43Z

bukkit/src/main/java/dev/jsinco/brewery/bukkit/TheBrewingProject.java

+        Bukkit.getGlobalRegionScheduler().runAtFixedRate(this, task -> this.updateStructures(), 20, 1);
+        Bukkit.getGlobalRegionScheduler().runAtFixedRate(this, task -> this.otherTicking(), 20, 1);


Why are you delaying everything by 1 second?

this is everything is 1 tick, idk how u do your system tick and how u are watch then processing that

this.otherTicking(), 20, 1); ^ This is one second delay before everything starts

this.otherTicking(), 20, 1); ^ This is one second delay before everything starts

oh, if you mean that - I'm sorry

Thorinwasher · 2025-07-14T07:55:21Z

bukkit/src/main/java/dev/jsinco/brewery/bukkit/effect/event/NamedDrunkEventExecutor.java

                TheBrewingProject.getInstance().getActiveEventsRegistry().registerActiveEvent(playerUuid, event, Config.PUKE_TIME);
-                Bukkit.getScheduler().runTaskTimer(TheBrewingProject.getInstance(), pukeHandler::tick, 0, 1);
+
+                player.getScheduler().runAtFixedRate(TheBrewingProject.getInstance(), pukeHandler::tick,null ,1, 1);


Why change the delay from 0 ticks to 1 ticks?

Why change the delay from 0 ticks to 1 ticks?

when folia scheduler don't allow set 0 on delay ticks. this is must be > 0 like 1 or more

Alright, I did not know that. Good to know

like something:
[11:57:23] [Server thread/ERROR]: Error occurred while enabling TheBrewingProject v1.7.0 (Is it up to date?) -- | java.lang.IllegalArgumentException: Initial delay ticks may not be <= 0

RitaSister · 2025-07-14T08:47:08Z

You need to have everything that is done on inventories in the proper thread, this is important because otherwise there's nothing saying what or how something could get duped. See

TheBrewingProject/bukkit/src/main/java/dev/jsinco/brewery/bukkit/TheBrewingProject.java

Lines 258 to 259 in e9dcc13

List.copyOf(breweryRegistry.<BukkitBarrel>getOpened(StructureType.BARREL)).forEach(Barrel::tickInventory);

List.copyOf(breweryRegistry.<BukkitDistillery>getOpened(StructureType.DISTILLERY)).forEach(Distillery::tickInventory);

I will look later that

…o feat/folia-support # Conflicts: # bukkit/src/main/java/dev/jsinco/brewery/bukkit/breweries/BukkitCauldron.java # bukkit/src/main/java/dev/jsinco/brewery/bukkit/effect/event/NamedDrunkEventExecutor.java

Add runFolia task to BreweryTeam#77

RitaSister and others added 6 commits July 13, 2025 21:21

add support folia

caad01a

build(run-task): Add a bukkit:runFolia task

c95544f

Fixed issue in region where blocks and particles are present

0a09066

change value of initial delay ticks from 1 to 20

33fc5e4

add FoliaRunnable for better performance on Folia

507b119

Merge branch 'feat/folia-support' into build/run-folia-task

3cb9d91

Jsinco reviewed Jul 13, 2025

View reviewed changes

Fix memory leak by rewriting the tick() method to only call startCaul…

1223f11

…dronTask() once.

Thorinwasher requested changes Jul 14, 2025

View reviewed changes

Nadwey and others added 5 commits July 14, 2025 11:00

Merge branch 'feat/folia-support' into build/run-folia-task

16444b3

update upstream

6cfe372

Merge branch 'master' of github.com:BreweryTeam/TheBrewingProject int…

5b8dbf5

…o feat/folia-support # Conflicts: # bukkit/src/main/java/dev/jsinco/brewery/bukkit/breweries/BukkitCauldron.java # bukkit/src/main/java/dev/jsinco/brewery/bukkit/effect/event/NamedDrunkEventExecutor.java

try fix update structures method for adapting for Folia

49f65fc

Update upstream

b1bd932

Add runFolia task to BreweryTeam#77

-        Optional<World> optionalWorld = BukkitAdapter.toWorld(location);
+         Location bukkitLocation = BukkitAdapter.toLocation(location);
+        SinglePositionStructure structure = this;
+        Bukkit.getRegionScheduler().run(TheBrewingProject.getInstance(), bukkitLocation, (task) -> {
+            if (!BlockUtil.isChunkLoaded(location)) {
+                return;
+            }
+            if (!Tag.CAULDRONS.isTagged(getBlock().getType()) || getBlock().getType() == Material.CAULDRON) {
+                ListenerUtil.removeActiveSinglePositionStructure(structure, TheBrewingProject.getInstance().getBreweryRegistry(), TheBrewingProject.getInstance().getDatabase());
+                return;
+            }
+            hot = isHeatSource(getBlock().getRelative(BlockFace.DOWN));
+            recalculateBrewTime();
+            Color baseParticleColor = computeBaseParticleColor(getBlock());
+            Optional<Recipe<ItemStack>> recipeOptional = brew.closestRecipe(TheBrewingProject.getInstance().getRecipeRegistry());
+            Color resultColor = computeResultColor(recipeOptional);
+            particleColor = recipeOptional.map(recipe -> computeParticleColor(baseParticleColor, resultColor, recipe))
+                    .orElse(Color.GRAY);
+            playBrewingEffects();
+        });

	List.copyOf(breweryRegistry.<BukkitBarrel>getOpened(StructureType.BARREL)).forEach(Barrel::tickInventory);
	List.copyOf(breweryRegistry.<BukkitDistillery>getOpened(StructureType.DISTILLERY)).forEach(Distillery::tickInventory);

		Bukkit.getGlobalRegionScheduler().runAtFixedRate(this, task -> this.updateStructures(), 1, 1);
		Bukkit.getGlobalRegionScheduler().runAtFixedRate(this, task -> this.otherTicking(), 1, 1);

Add folia support #77

Are you sure you want to change the base?

Add folia support #77

Uh oh!

Conversation

RitaSister commented Jul 13, 2025

Uh oh!

Jsinco left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Thorinwasher left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Thorinwasher Jul 14, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Thorinwasher Jul 14, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

RitaSister commented Jul 14, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Thorinwasher Jul 14, 2025 •

edited

Loading

Thorinwasher Jul 14, 2025 •

edited

Loading