Fabric 26.x support

DynmapCore/build.gradle

@@ -8,7 +8,10 @@ eclipse {
     }
 }
 
-sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = '1.8' // Need this here so eclipse task generates correctly.
+java {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+} // Need this here so eclipse task generates correctly.
 
 dependencies {
     implementation project(':DynmapCoreAPI')
@@ -64,21 +67,27 @@ jar {
 }
 
 shadowJar {
+    configurations = [project.configurations.runtimeClasspath]
     dependencies {
         include(dependency('com.googlecode.json-simple:json-simple:'))
         include(dependency('org.yaml:snakeyaml:'))
         include(dependency('com.googlecode.owasp-java-html-sanitizer:owasp-java-html-sanitizer:'))
-        include(dependency('javax.servlet::'))
-        include(dependency('org.eclipse.jetty::'))
+        include(dependency('javax.servlet:javax.servlet-api:'))
+        include(dependency('org.eclipse.jetty:jetty-server:'))
+        include(dependency('org.eclipse.jetty:jetty-servlet:'))
+        include(dependency('org.eclipse.jetty:jetty-util:'))
+        include(dependency('org.eclipse.jetty:jetty-http:'))
+        include(dependency('org.eclipse.jetty:jetty-io:'))
+        include(dependency('org.eclipse.jetty:jetty-security:'))
         include(dependency('org.eclipse.jetty.orbit:javax.servlet:'))
         include(dependency('org.postgresql:postgresql:'))
         include(dependency('io.github.linktosriram.s3lite:core:'))
         include(dependency('io.github.linktosriram.s3lite:api:'))
         include(dependency('io.github.linktosriram.s3lite:http-client-url-connection:'))
         include(dependency('io.github.linktosriram.s3lite:http-client-spi:'))
         include(dependency('io.github.linktosriram.s3lite:util:'))
-        include(dependency('jakarta.xml.bind::'))
-        include(dependency('com.sun.xml.bind::'))
+        include(dependency('jakarta.xml.bind:jakarta.xml.bind-api:'))
+        include(dependency('com.sun.xml.bind:jaxb-impl:'))
         include(dependency(':DynmapCoreAPI'))
         exclude("META-INF/maven/**")
         exclude("META-INF/services/**")

DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/acacia_leaves.png.mcmeta

@@ -0,0 +1,5 @@
+{
+  "texture": {
+    "mipmap_strategy": "dark_cutout"
+  }
+}

DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/allium.png.mcmeta

@@ -0,0 +1,5 @@
+{
+    "texture": {
+        "mipmap_strategy": "strict_cutout"
+    }
+}

DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/amethyst_cluster.png.mcmeta

@@ -0,0 +1,5 @@
+{
+    "texture": {
+        "mipmap_strategy": "strict_cutout"
+    }
+}

DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/azalea_leaves.png.mcmeta

@@ -0,0 +1,5 @@
+{
+  "texture": {
+      "mipmap_strategy": "dark_cutout"
+  }
+}

DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/azure_bluet.png.mcmeta

@@ -0,0 +1,5 @@
+{
+    "texture": {
+        "mipmap_strategy": "strict_cutout"
+    }
+}

DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/birch_leaves.png.mcmeta

@@ -0,0 +1,5 @@
+{
+  "texture": {
+      "mipmap_strategy": "dark_cutout"
+  }
+}

DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/blue_orchid.png.mcmeta

@@ -0,0 +1,5 @@
+{
+    "texture": {
+        "mipmap_strategy": "strict_cutout"
+    }
+}

DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/brown_mushroom.png.mcmeta

@@ -0,0 +1,5 @@
+{
+    "texture": {
+        "mipmap_strategy": "strict_cutout"
+    }
+}

DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/cactus_flower.png.mcmeta

@@ -0,0 +1,5 @@
+{
+    "texture": {
+        "mipmap_strategy": "strict_cutout"
+    }
+}

DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/cactus_side.png.mcmeta

@@ -0,0 +1,5 @@
+{
+    "texture": {
+        "alpha_cutoff_bias": 0.1
+    }
+}

DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/cactus_top.png.mcmeta

@@ -0,0 +1,5 @@
+{
+    "texture": {
+        "alpha_cutoff_bias": 0.1
+    }
+}

DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/cherry_leaves.png.mcmeta

@@ -0,0 +1,5 @@
+{
+  "texture": {
+      "mipmap_strategy": "dark_cutout"
+  }
+}

DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/closed_eyeblossom.png.mcmeta

@@ -0,0 +1,5 @@
+{
+    "texture": {
+        "mipmap_strategy": "strict_cutout"
+    }
+}

DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/cornflower.png.mcmeta

@@ -0,0 +1,5 @@
+{
+    "texture": {
+        "mipmap_strategy": "strict_cutout"
+    }
+}

DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/crimson_fungus.png.mcmeta

@@ -0,0 +1,5 @@
+{
+    "texture": {
+        "mipmap_strategy": "strict_cutout"
+    }
+}

DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/dandelion.png.mcmeta

@@ -0,0 +1,5 @@
+{
+    "texture": {
+        "mipmap_strategy": "strict_cutout"
+    }
+}

DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/dark_oak_leaves.png.mcmeta

@@ -0,0 +1,5 @@
+{
+  "texture": {
+      "mipmap_strategy": "dark_cutout"
+  }
+}

DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/flowering_azalea_leaves.png.mcmeta

@@ -0,0 +1,5 @@
+{
+  "texture": {
+      "mipmap_strategy": "dark_cutout"
+  }
+}

DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/glass.png.mcmeta

@@ -0,0 +1,5 @@
+{
+    "texture": {
+        "mipmap_strategy": "mean"
+    }
+}

DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/jungle_leaves.png.mcmeta

@@ -0,0 +1,5 @@
+{
+  "texture": {
+      "mipmap_strategy": "dark_cutout"
+  }
+}

DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/large_amethyst_bud.png.mcmeta

@@ -0,0 +1,5 @@
+{
+    "texture": {
+        "mipmap_strategy": "strict_cutout"
+    }
+}

DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/lily_of_the_valley.png.mcmeta

@@ -0,0 +1,5 @@
+{
+    "texture": {
+        "mipmap_strategy": "strict_cutout"
+    }
+}

DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/mangrove_leaves.png.mcmeta

@@ -0,0 +1,5 @@
+{
+  "texture": {
+      "mipmap_strategy": "dark_cutout"
+  }
+}

DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/mangrove_roots_side.png.mcmeta

@@ -0,0 +1,5 @@
+{
+  "texture": {
+      "mipmap_strategy": "dark_cutout"
+  }
+}

DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/mangrove_roots_top.png.mcmeta

@@ -0,0 +1,5 @@
+{
+  "texture": {
+      "mipmap_strategy": "dark_cutout"
+  }
+}

DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/medium_amethyst_bud.png.mcmeta

@@ -0,0 +1,5 @@
+{
+    "texture": {
+        "mipmap_strategy": "strict_cutout"
+    }
+}

DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/nether_sprouts.png.mcmeta

@@ -0,0 +1,5 @@
+{
+    "texture": {
+        "mipmap_strategy": "strict_cutout"
+    }
+}

DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/oak_leaves.png.mcmeta

@@ -0,0 +1,5 @@
+{
+  "texture": {
+      "mipmap_strategy": "dark_cutout"
+  }
+}

DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/open_eyeblossom.png.mcmeta

@@ -0,0 +1,5 @@
+{
+    "texture": {
+        "mipmap_strategy": "strict_cutout"
+    }
+}

DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/orange_tulip.png.mcmeta

@@ -0,0 +1,5 @@
+{
+    "texture": {
+        "mipmap_strategy": "strict_cutout"
+    }
+}

DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/oxeye_daisy.png.mcmeta

@@ -0,0 +1,5 @@
+{
+    "texture": {
+        "mipmap_strategy": "strict_cutout"
+    }
+}

DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/pale_oak_leaves.png.mcmeta

@@ -0,0 +1,5 @@
+{
+  "texture": {
+      "mipmap_strategy": "dark_cutout"
+  }
+}

DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/pink_tulip.png.mcmeta

@@ -0,0 +1,5 @@
+{
+    "texture": {
+        "mipmap_strategy": "strict_cutout"
+    }
+}

DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/poppy.png.mcmeta

@@ -0,0 +1,5 @@
+{
+    "texture": {
+        "mipmap_strategy": "strict_cutout"
+    }
+}

DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/red_mushroom.png.mcmeta

@@ -0,0 +1,5 @@
+{
+    "texture": {
+        "mipmap_strategy": "strict_cutout"
+    }
+}

DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/red_tulip.png.mcmeta

@@ -0,0 +1,5 @@
+{
+    "texture": {
+        "mipmap_strategy": "strict_cutout"
+    }
+}

DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/redstone_dust_dot.png.mcmeta

@@ -0,0 +1,5 @@
+{
+    "texture": {
+        "mipmap_strategy": "mean"
+    }
+}

DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/redstone_dust_line0.png.mcmeta

@@ -0,0 +1,5 @@
+{
+    "texture": {
+        "mipmap_strategy": "mean"
+    }
+}

DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/redstone_dust_line1.png.mcmeta

@@ -0,0 +1,5 @@
+{
+    "texture": {
+        "mipmap_strategy": "mean"
+    }
+}

DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/redstone_dust_overlay.png.mcmeta

@@ -0,0 +1,5 @@
+{
+    "texture": {
+        "mipmap_strategy": "mean"
+    }
+}

DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/small_amethyst_bud.png.mcmeta

@@ -0,0 +1,5 @@
+{
+    "texture": {
+        "mipmap_strategy": "strict_cutout"
+    }
+}

DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/spruce_leaves.png.mcmeta

@@ -0,0 +1,5 @@
+{
+  "texture": {
+      "mipmap_strategy": "dark_cutout"
+  }
+}

DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/sweet_berry_bush_stage0.png.mcmeta

@@ -0,0 +1,5 @@
+{
+    "texture": {
+        "mipmap_strategy": "strict_cutout"
+    }
+}

DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/torchflower.png.mcmeta

@@ -0,0 +1,5 @@
+{
+    "texture": {
+        "mipmap_strategy": "strict_cutout"
+    }
+}

DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/tripwire.png.mcmeta

@@ -0,0 +1,5 @@
+{
+  "texture": {
+    "alpha_cutoff_bias": 0.1
+  }
+}

DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/warped_fungus.png.mcmeta

@@ -0,0 +1,5 @@
+{
+    "texture": {
+        "mipmap_strategy": "strict_cutout"
+    }
+}

DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/white_tulip.png.mcmeta

@@ -0,0 +1,5 @@
+{
+    "texture": {
+        "mipmap_strategy": "strict_cutout"
+    }
+}

DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/wither_rose.png.mcmeta

@@ -0,0 +1,5 @@
+{
+    "texture": {
+        "mipmap_strategy": "strict_cutout"
+    }
+}

DynmapCoreAPI/build.gradle

@@ -6,7 +6,10 @@ eclipse {
         name = "Dynmap(DynmapCoreAPI)"
     }
 }
-sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = '1.8' // Need this here so eclipse task generates correctly.
+java {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+} // Need this here so eclipse task generates correctly.
 
 description = "DynmapCoreAPI"
 

build.gradle

@@ -1,21 +1,8 @@
-// Workaround for Shadow not supporting Java 19 classes.
-// Remove this once Shadow updates.
-// See: https://github.com/johnrengelman/shadow/pull/770
-// See: https://discord.com/channels/722722769950998560/793019909055578113/978939925061857315
-buildscript {
-    configurations.all {
-        resolutionStrategy {
-            force("org.ow2.asm:asm:9.5")
-            force("org.ow2.asm:asm-commons:9.5")
-        }
-    }
-}
-
 plugins {
-    //id  "com.github.johnrengelman.shadow" version "7.1.0"
-    id  "io.github.goooler.shadow" version "8.1.7"
+    id  "com.gradleup.shadow" version "9.4.2"
     id  'java'
     id  'maven-publish'
+    id  'io.papermc.paperweight.userdev' version '2.0.0-beta.21' apply false
 }
 
 apply plugin: 'eclipse'
@@ -35,6 +22,7 @@ allprojects  {
      maven { url "https://repo.mikeprimm.com" }
      maven { url "https://repo.maven.apache.org/maven2" }
      maven { url "https://hub.spigotmc.org/nexus/content/repositories/snapshots/" }
+     maven { url "https://repo.papermc.io/repository/maven-public/" }
      maven { url "https://repo.codemc.org/repository/maven-public/" }
   }
 
@@ -52,13 +40,17 @@ ext {
   globals = new Globals()
 }
 
-subprojects {  
-  apply plugin: "io.github.goooler.shadow"
+subprojects {
+  if (!it.name.startsWith('fabric-') && !it.name.startsWith('forge-')) {
+    apply plugin: "com.gradleup.shadow"
+  }
   apply plugin: 'java'
   apply plugin: 'maven-publish'
 
-  sourceCompatibility = 1.8
-  targetCompatibility = 1.8
+  java {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+  }
   tasks.withType(JavaCompile) {
   	options.encoding = 'UTF-8'
   }