Skip to content

Commit 2d01abf

Browse files
EuphillyaEuphillya
committed
Fix build
1 parent d1876a7 commit 2d01abf

7 files changed

+168
-63
lines changed

‎patches/plugins/0001-Fix-support-1.21.4.patch‎

Lines changed: 93 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,93 @@
1+
From eca8d92e9d45c041905e67f705f8a19ed4363e1a Mon Sep 17 00:00:00 2001
2+
From: Euphyllia Bierque <[email protected]>
3+
Date: Sun, 26 Jan 2025 13:05:43 +0100
4+
Subject: [PATCH 1/6] Fix support 1.21.4
5+
6+
---
7+
Insights-NMS/Current/build.gradle.kts | 2 +-
8+
build.gradle.kts | 2 +-
9+
gradle/libs.versions.toml | 10 +++++-----
10+
gradle/wrapper/gradle-wrapper.properties | 2 +-
11+
settings.gradle.kts | 2 +-
12+
5 files changed, 9 insertions(+), 9 deletions(-)
13+
14+
diff --git a/Insights-NMS/Current/build.gradle.kts b/Insights-NMS/Current/build.gradle.kts
15+
index e127372..72bd78b 100644
16+
--- a/Insights-NMS/Current/build.gradle.kts
17+
+++ b/Insights-NMS/Current/build.gradle.kts
18+
@@ -1,3 +1,3 @@
19+
dependencies {
20+
- paperweight.paperDevBundle("1.21.3-R0.1-SNAPSHOT")
21+
+ paperweight.paperDevBundle("1.21.4-R0.1-SNAPSHOT")
22+
}
23+
diff --git a/build.gradle.kts b/build.gradle.kts
24+
index d722f44..63beab5 100644
25+
--- a/build.gradle.kts
26+
+++ b/build.gradle.kts
27+
@@ -46,7 +46,7 @@ subprojects {
28+
maven("https://repo.codemc.io/repository/maven-public")
29+
maven("https://oss.sonatype.org/content/repositories/snapshots/")
30+
maven("https://s01.oss.sonatype.org/content/repositories/snapshots/")
31+
- maven("https://papermc.io/repo/repository/maven-public/")
32+
+ maven("https://repo.papermc.io/repository/maven-public/")
33+
maven("https://libraries.minecraft.net")
34+
}
35+
36+
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
37+
index 6813cb2..d70842b 100644
38+
--- a/gradle/libs.versions.toml
39+
+++ b/gradle/libs.versions.toml
40+
@@ -1,11 +1,11 @@
41+
[versions]
42+
# libraries
43+
semver = "0.10.2"
44+
-minecraft = "1.21.3-R0.1-SNAPSHOT"
45+
+minecraft = "1.21.4-R0.1-SNAPSHOT"
46+
paperLib = "1.0.8"
47+
bStats = "3.0.0"
48+
-adventure = "4.17.0"
49+
-adventurePlatformBukkit = "4.3.3"
50+
+adventure = "4.18.0"
51+
+adventurePlatformBukkit = "4.3.4"
52+
assertj = "3.23.1"
53+
mockito = "4.11.0"
54+
jupiter = "5.9.1"
55+
@@ -16,8 +16,8 @@ cloudPaper = "2.0.0-beta.9"
56+
cloud = "2.0.0-rc.2"
57+
58+
# plugins
59+
-shadow = "9.0.0-beta2"
60+
-userdev = "1.7.5"
61+
+shadow = "9.0.0-beta6"
62+
+userdev = "2.0.0-beta.14"
63+
pluginYml = "0.6.0"
64+
65+
[libraries]
66+
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
67+
index 20db9ad..18362b7 100644
68+
--- a/gradle/wrapper/gradle-wrapper.properties
69+
+++ b/gradle/wrapper/gradle-wrapper.properties
70+
@@ -1,6 +1,6 @@
71+
distributionBase=GRADLE_USER_HOME
72+
distributionPath=wrapper/dists
73+
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
74+
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
75+
networkTimeout=10000
76+
zipStoreBase=GRADLE_USER_HOME
77+
zipStorePath=wrapper/dists
78+
diff --git a/settings.gradle.kts b/settings.gradle.kts
79+
index c36a94f..bd9922a 100644
80+
--- a/settings.gradle.kts
81+
+++ b/settings.gradle.kts
82+
@@ -3,7 +3,7 @@ import java.nio.file.Files
83+
pluginManagement {
84+
repositories {
85+
gradlePluginPortal()
86+
- maven("https://papermc.io/repo/repository/maven-public/")
87+
+ maven("https://repo.papermc.io/repository/maven-public/")
88+
}
89+
}
90+
91+
--
92+
2.47.1.windows.2
93+

‎patches/plugins/0001-Add-Folia-Supported-plugin.yml.patch‎ renamed to ‎patches/plugins/0002-Add-Folia-Supported-plugin.yml.patch‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
From 5126eda91465965fb17815554df07986bd7b3ed5 Mon Sep 17 00:00:00 2001
1+
From e1904538c65507078e0f5fdae305b06207653ec4 Mon Sep 17 00:00:00 2001
22
From: Euphyllia Bierque <[email protected]>
3-
Date: Mon, 9 Dec 2024 14:08:22 +0100
4-
Subject: [PATCH 1/5] Add Folia Supported plugin.yml
3+
Date: Sun, 26 Jan 2025 13:05:43 +0100
4+
Subject: [PATCH 2/6] Add Folia Supported plugin.yml
55

66
---
77
Insights/build.gradle.kts | 1 +
@@ -20,5 +20,5 @@ index a4387ce..bfe41c8 100644
2020
register("insights.info") {
2121
description = "Allows you to see information about insights"
2222
--
23-
2.47.1.windows.1
23+
2.47.1.windows.2
2424

‎patches/plugins/0002-Replace-Scheduler.patch‎ renamed to ‎patches/plugins/0003-Replace-Scheduler.patch‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
From 4294fabb0f7b69e2e7b3628b06bcab8b16657df4 Mon Sep 17 00:00:00 2001
1+
From 4ae432c3962a8941cf2e7ea65c6dd4cf0c44c5b3 Mon Sep 17 00:00:00 2001
22
From: Euphyllia Bierque <[email protected]>
3-
Date: Mon, 9 Dec 2024 14:08:22 +0100
4-
Subject: [PATCH 2/5] Replace Scheduler
3+
Date: Sun, 26 Jan 2025 13:05:43 +0100
4+
Subject: [PATCH 3/6] Replace Scheduler
55

66
---
77
.../api/concurrent/ChunkTeleport.java | 2 +-
@@ -189,5 +189,5 @@ index 9603f13..871003a 100644
189189
for (ChunkLocation loc : locations) {
190190
var world = loc.getWorld();
191191
--
192-
2.47.1.windows.1
192+
2.47.1.windows.2
193193

‎patches/plugins/0003-Fix-for-use-on-Folia.patch‎ renamed to ‎patches/plugins/0004-Fix-for-use-on-Folia.patch‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
From 5b7e0c3d6d9ec46b7ddad7e51eb88969482d45a6 Mon Sep 17 00:00:00 2001
1+
From e90a1a174b78b4d6b4987893281821be979a7041 Mon Sep 17 00:00:00 2001
22
From: Euphyllia Bierque <[email protected]>
3-
Date: Mon, 9 Dec 2024 14:08:23 +0100
4-
Subject: [PATCH 3/5] Fix for use on Folia
3+
Date: Sun, 26 Jan 2025 13:05:43 +0100
4+
Subject: [PATCH 4/6] Fix for use on Folia
55

66
---
77
.../api/concurrent/count/TickResetCount.java | 2 +-
@@ -64,12 +64,12 @@ index f8f178e..07ce1aa 100644
6464
plugin.getSettings().SCANS_ITERATION_INTERVAL_TICKS);
6565
}
6666
diff --git a/Insights-NMS/Current/build.gradle.kts b/Insights-NMS/Current/build.gradle.kts
67-
index e127372..6d63432 100644
67+
index 72bd78b..6424cdd 100644
6868
--- a/Insights-NMS/Current/build.gradle.kts
6969
+++ b/Insights-NMS/Current/build.gradle.kts
7070
@@ -1,3 +1,4 @@
7171
dependencies {
72-
paperweight.paperDevBundle("1.21.3-R0.1-SNAPSHOT")
72+
paperweight.paperDevBundle("1.21.4-R0.1-SNAPSHOT")
7373
+ compileOnly(project(":Insights-API"))
7474
}
7575
diff --git a/Insights-NMS/Current/src/main/java/dev/frankheijden/insights/nms/impl/InsightsNMSImpl.java b/Insights-NMS/Current/src/main/java/dev/frankheijden/insights/nms/impl/InsightsNMSImpl.java
@@ -119,5 +119,5 @@ index b130732..cffb34a 100644
119119
import org.incendo.cloud.execution.ExecutionCoordinator;
120120
import org.incendo.cloud.paper.PaperCommandManager;
121121
--
122-
2.47.1.windows.1
122+
2.47.1.windows.2
123123

‎patches/plugins/0004-Fix-piston-push.patch‎ renamed to ‎patches/plugins/0005-Fix-piston-push.patch‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
From 9635d66988a8fbbfbe3da6682239afc71592321d Mon Sep 17 00:00:00 2001
1+
From 40796357f4a7a339385828c29ac3f2a72b6bc7ee Mon Sep 17 00:00:00 2001
22
From: Euphyllia Bierque <[email protected]>
3-
Date: Mon, 9 Dec 2024 14:08:23 +0100
4-
Subject: [PATCH 4/5] Fix piston push
3+
Date: Sun, 26 Jan 2025 13:05:44 +0100
4+
Subject: [PATCH 5/6] Fix piston push
55

66
---
77
.../insights/listeners/BlockListener.java | 13 ++++++++-----
@@ -32,5 +32,5 @@ index 4ecf365..6cd374d 100644
3232
}, 3L); // Ensures blocks have been updated after piston move
3333
}
3434
--
35-
2.47.1.windows.1
35+
2.47.1.windows.2
3636

‎patches/plugins/0005-Fix-scheduler.patch‎

Lines changed: 0 additions & 45 deletions
This file was deleted.

‎patches/plugins/0006-Fix-scheduler.patch‎

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
From 345fd7ebed26c8271d770f376ad9bfbd3bf10605 Mon Sep 17 00:00:00 2001
2+
From: Euphyllia Bierque <[email protected]>
3+
Date: Sun, 26 Jan 2025 13:05:44 +0100
4+
Subject: [PATCH 6/6] Fix scheduler
5+
6+
---
7+
.../insights/tasks/PlayerTrackerTask.java | 33 ++++++++++---------
8+
1 file changed, 17 insertions(+), 16 deletions(-)
9+
10+
diff --git a/Insights/src/main/java/dev/frankheijden/insights/tasks/PlayerTrackerTask.java b/Insights/src/main/java/dev/frankheijden/insights/tasks/PlayerTrackerTask.java
11+
index 871003a..9e73126 100644
12+
--- a/Insights/src/main/java/dev/frankheijden/insights/tasks/PlayerTrackerTask.java
13+
+++ b/Insights/src/main/java/dev/frankheijden/insights/tasks/PlayerTrackerTask.java
14+
@@ -52,23 +52,24 @@ public class PlayerTrackerTask extends InsightsAsyncTask {
15+
var world = loc.getWorld();
16+
if (world.isChunkLoaded(loc.getX(), loc.getZ())) {
17+
this.scanLocations.put(loc, now);
18+
-
19+
- var chunk = world.getChunkAt(loc.getX(), loc.getZ());
20+
- plugin.getChunkContainerExecutor().submit(chunk, ScanOptions.all()).whenComplete((s, e) -> {
21+
- if (s == null) {
22+
- int hash = e.getStackTrace()[0].hashCode();
23+
- if (!knownErrorStackTraceHashes.contains(hash)) {
24+
- knownErrorStackTraceHashes.add(hash);
25+
- plugin.getLogger().log(
26+
- Level.SEVERE,
27+
- "Error occurred while scanning "
28+
- + loc
29+
- + " (future errors with the same stacktrace are suppressed)",
30+
- e
31+
- );
32+
+ org.bukkit.Bukkit.getRegionScheduler().execute(plugin, world, loc.getX(), loc.getZ(), () -> {
33+
+ var chunk = world.getChunkAt(loc.getX(), loc.getZ());
34+
+ plugin.getChunkContainerExecutor().submit(chunk, ScanOptions.all()).whenComplete((s, e) -> {
35+
+ if (s == null) {
36+
+ int hash = e.getStackTrace()[0].hashCode();
37+
+ if (!knownErrorStackTraceHashes.contains(hash)) {
38+
+ knownErrorStackTraceHashes.add(hash);
39+
+ plugin.getLogger().log(
40+
+ Level.SEVERE,
41+
+ "Error occurred while scanning "
42+
+ + loc
43+
+ + " (future errors with the same stacktrace are suppressed)",
44+
+ e
45+
+ );
46+
+ }
47+
}
48+
- }
49+
- this.scanLocations.remove(loc);
50+
+ this.scanLocations.remove(loc);
51+
+ });
52+
});
53+
}
54+
}
55+
--
56+
2.47.1.windows.2
57+

0 commit comments

Comments
 (0)