Skip to content

Commit 6ddf4be

Browse files
committed
Enable Tuinity data fixer, upstream
1 parent 67e1af9 commit 6ddf4be

File tree

5 files changed

+11
-19433
lines changed

5 files changed

+11
-19433
lines changed

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ version = 1.17.1-R0.1-SNAPSHOT
33

44
mcVersion = 1.17.1
55
packageVersion = 1_17_1_R1
6-
tuinityRef = 7b33cca34e573126df28f4327dc03a6639105d4e
6+
tuinityRef = dc9d19c9844477e324f01b803843c9b9b4016dbe
77

88
org.gradle.jvmargs=-Xmx2G
99

patches/server/0002-Airplane-Branding-Changes.patch

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,19 +20,19 @@ You should have received a copy of the GNU General Public License
2020
along with this program. If not, see <http://www.gnu.org/licenses/>.
2121

2222
diff --git a/build.gradle.kts b/build.gradle.kts
23-
index d658b7502185f1f7c938d510e2f8404fdaa66bb6..59fbec653b6a37b2b574faa7d38c3c6976335fd4 100644
23+
index f5a9c41fdbaede65cf4607737421571f0c344c1f..7df523aaf7f709dd2390fbd8217223022f2b361c 100644
2424
--- a/build.gradle.kts
2525
+++ b/build.gradle.kts
26-
@@ -34,7 +34,7 @@ repositories {
26+
@@ -35,7 +35,7 @@ repositories {
2727
}
2828

2929
dependencies {
3030
- implementation(project(":Tuinity-API")) // Tuinity
3131
+ implementation(project(":Airplane-API")) // Airplane // Tuinity
32-
implementation("com.destroystokyo.paper:paper-mojangapi:1.16.5-R0.1-SNAPSHOT") // Tuinity
32+
implementation("io.papermc.paper:paper-mojangapi:1.17.1-R0.1-SNAPSHOT") // Tuinity
3333
// Paper start
3434
implementation("org.jline:jline-terminal-jansi:3.12.1")
35-
@@ -86,7 +86,7 @@ tasks.jar {
35+
@@ -88,7 +88,7 @@ tasks.jar {
3636
attributes(
3737
"Main-Class" to "org.bukkit.craftbukkit.Main",
3838
"Implementation-Title" to "CraftBukkit",

patches/server/0004-Airplane-Configuration.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@ You should have received a copy of the GNU General Public License
2222
along with this program. If not, see <http://www.gnu.org/licenses/>.
2323

2424
diff --git a/build.gradle.kts b/build.gradle.kts
25-
index 59fbec653b6a37b2b574faa7d38c3c6976335fd4..6a5d66e6139aa157d62f71d606b9c7aa3b96f29d 100644
25+
index 7df523aaf7f709dd2390fbd8217223022f2b361c..dcf519b8076cd67146f1aba2464bcb482604a9a5 100644
2626
--- a/build.gradle.kts
2727
+++ b/build.gradle.kts
28-
@@ -69,6 +69,8 @@ dependencies {
29-
28+
@@ -71,6 +71,8 @@ dependencies {
3029
implementation("org.quiltmc:tiny-mappings-parser:0.3.0") // Paper - needed to read mappings for stacktrace deobfuscation
30+
implementation("com.velocitypowered:velocity-native:1.1.0-SNAPSHOT") // Tuinity
3131

3232
+ implementation("com.github.technove:AIR:fe3dbb4420") // Airplane - config
3333
+

patches/server/0014-Airplane-Profiler.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ You should have received a copy of the GNU General Public License
2020
along with this program. If not, see <http://www.gnu.org/licenses/>.
2121

2222
diff --git a/build.gradle.kts b/build.gradle.kts
23-
index 6a5d66e6139aa157d62f71d606b9c7aa3b96f29d..52c5de6a49054e4775c15f75d81c9a49e6b086ca 100644
23+
index dcf519b8076cd67146f1aba2464bcb482604a9a5..c5b4a4bd057909e30b57c4979f4b8b3657ebeb47 100644
2424
--- a/build.gradle.kts
2525
+++ b/build.gradle.kts
26-
@@ -70,6 +70,7 @@ dependencies {
27-
implementation("org.quiltmc:tiny-mappings-parser:0.3.0") // Paper - needed to read mappings for stacktrace deobfuscation
26+
@@ -72,6 +72,7 @@ dependencies {
27+
implementation("com.velocitypowered:velocity-native:1.1.0-SNAPSHOT") // Tuinity
2828

2929
implementation("com.github.technove:AIR:fe3dbb4420") // Airplane - config
3030
+ implementation("com.github.technove:Flare:21f20392b3") // Airplane - flare

0 commit comments

Comments
 (0)