From 9c53317ef6cd08396eb61f2569ebee53016a08d9 Mon Sep 17 00:00:00 2001
From: Zacharias <zacharias@4zellen.se>
Date: Tue, 15 Jul 2025 23:18:07 +0200
Subject: [PATCH] Merging master into testing/no-hard-org-json in preperation
 for back merge

---
 fabric/build.gradle   | 4 +++-
 neoforge/build.gradle | 7 +++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/fabric/build.gradle b/fabric/build.gradle
index 162b039..4b15358 100644
--- a/fabric/build.gradle
+++ b/fabric/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id "com.github.johnrengelman.shadow" version "7.1.2"
+    id "com.github.johnrengelman.shadow" version "8.1.1"
 }
 
 architectury {
@@ -35,6 +35,7 @@ dependencies {
     shadowCommon(project(path: ":common", configuration: "transformProductionFabric")) { transitive false }
 
     include("org.json:json:${json_version}")
+    shadowCommon("org.json:json:${json_version}")
 }
 
 processResources {
@@ -48,6 +49,7 @@ processResources {
 shadowJar {
     configurations = [project.configurations.shadowCommon]
     archiveClassifier.set("dev-shadow")
+    relocate 'org.json', 'speedometer.shaded.org.json'
 }
 
 remapJar {
diff --git a/neoforge/build.gradle b/neoforge/build.gradle
index 6c68e30..ccfd449 100644
--- a/neoforge/build.gradle
+++ b/neoforge/build.gradle
@@ -12,6 +12,10 @@ repositories{
         url = 'https://maven.neoforged.net/releases'
     }
     maven { url "https://maven.shedaniel.me/" }
+    maven {
+        name "CreeperHost"
+        url "https://maven.creeperhost.net"
+    }
 }
 
 configurations {
@@ -34,6 +38,7 @@ dependencies {
 
     forgeRuntimeLibrary "org.json:json:${json_version}"
     include("org.json:json:${json_version}")
+    shadowCommon("org.json:json:${json_version}")
 }
 
 processResources {
@@ -49,6 +54,8 @@ shadowJar {
 
     configurations = [project.configurations.shadowCommon]
     archiveClassifier.set("dev-shadow")
+
+    relocate 'org.json', 'speedometer.shaded.org.json'
 }
 
 remapJar {