feat: Update to 26.1.2

[granny]

No testing for this PR was done other than running ./gradlew assemble and ./gradlew runServer. closes #107

[DereC4]

Yes please

[DereC4]

Closes #107

[DereC4]

ill test this for u by using it on my server lol

[DereC4]

[U5B]

Error occurred when spawning a wandering villager: https://mclo.gs/BlI6LIu
Fix is to add a null check to this.secondaryCost != Material.AIR

[U5B]

Tested:

• AFKDisplay
• ArmoredElytra
• Back
• CauldronConcrete
• CauldronMud
• ConfettiCreepers
• CoordinatesHUD
• CountMobDeaths
• CustomNetherPortals
• DurabilityPing
• Elevators
• FastLeafDecay
• GemVillagers
• Graves
• Homes
• KillEmptyBoats
• MobGriefing
• MoreMobHeads (potentially extremely rare to drop?)
• MultiplayerSleep
• NetherPortalCoords
• PersistentHeads
• PillagerTools (technically bad omen toggle does nothing because ominous bottle is dropped instead)
• PlayerHeadDrops
• RealTimeClock
• RotationWrenches
• SilenceMobs
• Spawn
• SpawningSpheres
• SpectatorEffects
• Tag
• ThunderShrine
• TPA
• TrackRawStats
• TrackStats
• TreasureGems
• UnlockAllRecipes
• VillagerDeathMessages
• VillagerWorkstationHighlights
• WanderingTrades
• XPManagement (cooks really fast)

[U5B]

The following patch should fix the issues with WanderingTrades

diff --git a/src/main/java/me/machinemaker/papertweaks/modules/hermitcraft/wanderingtrades/Trade.java b/src/main/java/me/machinemaker/papertweaks/modules/hermitcraft/wanderingtrades/Trade.java
index dcc1663..eac4ee3 100644
--- a/src/main/java/me/machinemaker/papertweaks/modules/hermitcraft/wanderingtrades/Trade.java
+++ b/src/main/java/me/machinemaker/papertweaks/modules/hermitcraft/wanderingtrades/Trade.java
@@ -40,13 +40,13 @@ class Trade {
     }
 
     public boolean isBlockTrade() {
-        return this.secondaryCost != Material.AIR;
+        return this.secondaryCost != null && this.secondaryCost != Material.AIR;
     }
 
     public MerchantRecipe createTrade() {
         final MerchantRecipe recipe = new MerchantRecipe(this.skull.clone(), this.maxUses);
         recipe.addIngredient(new ItemStack(Material.EMERALD, 1));
-        if (this.secondaryCost != Material.AIR) {
+        if (this.isBlockTrade()) {
             recipe.addIngredient(new ItemStack(this.secondaryCost, 1));
         }
         return recipe;

[granny]

The following patch should fix the issues with WanderingTrades

diff --git a/src/main/java/me/machinemaker/papertweaks/modules/hermitcraft/wanderingtrades/Trade.java b/src/main/java/me/machinemaker/papertweaks/modules/hermitcraft/wanderingtrades/Trade.java
index dcc1663..eac4ee3 100644
--- a/src/main/java/me/machinemaker/papertweaks/modules/hermitcraft/wanderingtrades/Trade.java
+++ b/src/main/java/me/machinemaker/papertweaks/modules/hermitcraft/wanderingtrades/Trade.java
@@ -40,13 +40,13 @@ class Trade {
     }
 
     public boolean isBlockTrade() {
-        return this.secondaryCost != Material.AIR;
+        return this.secondaryCost != null && this.secondaryCost != Material.AIR;
     }
 
     public MerchantRecipe createTrade() {
         final MerchantRecipe recipe = new MerchantRecipe(this.skull.clone(), this.maxUses);
         recipe.addIngredient(new ItemStack(Material.EMERALD, 1));
-        if (this.secondaryCost != Material.AIR) {
+        if (this.isBlockTrade()) {
             recipe.addIngredient(new ItemStack(this.secondaryCost, 1));
         }
         return recipe;

committed

[DereC4]

@granny could you add a "closes #107 " in the PR to link it ?

[Machine-Maker]

Run ./gradlew spotlessApply to fix the build issues.

[DereC4]

Nothing has broken after 1 week of running this on my server btw (mc.longhorns.dev)

[granny]

Run ./gradlew spotlessApply to fix the build issues.

Done.

[Machine-Maker]

There are still some test failures it seems.

[Techcable]

The test failure is caused by ByteBuddy not understanding Java 25 bytecode.

Upgrading Mockito to the latest version (5.23.0) resolves it.

[U5B]

The following patch fixes an issue with cloud upstream that hasn't been merged yet which fixes an error when starting up on Paper 26.2

diff --git a/build.gradle.kts b/build.gradle.kts
index 9768c95..af252b8 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -187,7 +187,7 @@ tasks {
         systemProperty("com.mojang.eula.agree", "true")
 
         downloadPlugins {
-            url("https://download.luckperms.net/1631/bukkit/loader/LuckPerms-Bukkit-5.5.42.jar")
+            url("https://download.luckperms.net/1647/bukkit/loader/LuckPerms-Bukkit-5.5.59.jar")
         }
     }
 
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index a3ac7d2..3d4fe3c 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -2,7 +2,7 @@
 minecraft = "26.1.2"
 mm-mirror = "0.2.0"
 mm-lectern = "0.3.0" # deprecated
-cloud = "2.0.0-SNAPSHOT"
+cloud = "2.0.0-beta.17" # fix 26.2 error https://github.com/Incendo/cloud-minecraft/pull/158
 bstats = "3.0.2"
 moonshine = "2.0.4"
 guice = "7.0.0"
@@ -65,4 +65,3 @@ mockito = { module = "org.mockito:mockito-core", version.ref = "mockito" }
 shadow = { id = "com.gradleup.shadow", version.ref = "shadow" }
 indra-licenser-spotless = { id = "net.kyori.indra.licenser.spotless", version.ref = "indra" }
 runPaper = { id = "xyz.jpenilla.run-paper", version.ref = "runPaper" }
-

[DereC4]

yo does this work 26.2?

[DereC4]

Missing It fails because it is missing a required dependency class: net.kyori.adventure.text.serializer.plain.PlainComponentSerializer.

[DereC4]

@granny could we update for 26.2 too?

[DereC4]

idk what else is needed but when i tried running that error happened

[Alex1337F]

Working 26.2 build if anyone needs it while this PR is pending. Was done with Claude, so I do not guarantee that all modules work. However, I've run it in production for a little over a week with no issues. https://github.com/Alex1337F/PaperTweaks/releases/tag/Release