From e6cfaad85185fba85222da59a46a6a93d61204bc Mon Sep 17 00:00:00 2001
From: Mike Primm <mike@primmhome.com>
Date: Fri, 3 Dec 2021 10:28:12 -0600
Subject: [PATCH] Update shadow, add commons-codec to shaded uber for forge

---
 build.gradle            | 2 +-
 forge-1.18/build.gradle | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index 8c486e30..916fba79 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id  "com.github.johnrengelman.shadow" version "2.0.4"
+    id  "com.github.johnrengelman.shadow" version "7.1.0"
     id  'java'
     id  'maven-publish'
 }
diff --git a/forge-1.18/build.gradle b/forge-1.18/build.gradle
index fad1149d..3dfb2686 100644
--- a/forge-1.18/build.gradle
+++ b/forge-1.18/build.gradle
@@ -33,8 +33,9 @@ project.archivesBaseName = "${project.archivesBaseName}-forge-1.18"
 dependencies {
     implementation project(path: ":DynmapCore", configuration: "shadow")
     implementation project(path: ':DynmapCoreAPI')
+    implementation "commons-codec:commons-codec:1.15"
     
-    minecraft 'net.minecraftforge:forge:1.18-38.0.8'
+    minecraft 'net.minecraftforge:forge:1.18-38.0.12'
 }
 
 processResources
@@ -51,7 +52,10 @@ processResources
 shadowJar {
     dependencies {
         include(dependency(':DynmapCore'))
+        include(dependency("commons-codec:commons-codec:"))
     }
+	relocate('org.apache.commons.codec', 'org.dynmap.forge_1_18.commons.codec')
+    
     archiveName = "Dynmap-${parent.version}-forge-1.18.jar"
     destinationDir = file '../target'
 }