Merge pull request #4115 from kosmolot-mods/fabric-1.20.6

Fabric 1.20.6

fabric-1.14.4/build.gradle

@@ -1,5 +1,5 @@
 plugins {
-	id 'fabric-loom' version '1.1.10'
+	id 'fabric-loom' version '1.6.11'
 }
 
 apply plugin: 'eclipse'

fabric-1.15.2/build.gradle

@@ -1,5 +1,5 @@
 plugins {
-	id 'fabric-loom' version '1.1.10'
+	id 'fabric-loom' version '1.6.11'
 }
 
 archivesBaseName = "Dynmap"

fabric-1.16.4/build.gradle

@@ -1,5 +1,5 @@
 plugins {
-	id 'fabric-loom' version '1.1.10'
+	id 'fabric-loom' version '1.6.11'
 }
 
 archivesBaseName = "Dynmap"

fabric-1.17.1/build.gradle

@@ -1,5 +1,5 @@
 plugins {
-	id 'fabric-loom' version '1.1.10'
+	id 'fabric-loom' version '1.6.11'
 }
 
 archivesBaseName = "Dynmap"

fabric-1.18.2/build.gradle

@@ -1,6 +1,6 @@
 
 plugins {
-	id 'fabric-loom' version '1.1.10'
+	id 'fabric-loom' version '1.6.11'
 }
 
 archivesBaseName = "Dynmap"

fabric-1.19.4/build.gradle

@@ -1,5 +1,5 @@
 plugins {
-	id 'fabric-loom' version '1.1.10'
+	id 'fabric-loom' version '1.6.11'
 }
 
 archivesBaseName = "Dynmap"

fabric-1.20.2/build.gradle

@@ -1,5 +1,5 @@
 plugins {
-	id 'fabric-loom' version '1.1.10'
+	id 'fabric-loom' version '1.6.11'
 }
 
 archivesBaseName = "Dynmap"

fabric-1.20.4/build.gradle

@@ -1,5 +1,5 @@
 plugins {
-	id 'fabric-loom' version '1.1.10'
+	id 'fabric-loom' version '1.6.11'
 }
 
 archivesBaseName = "Dynmap"

fabric-1.20.6/.gitignore

@@ -0,0 +1,32 @@
+# gradle
+
+.gradle/
+build/
+out/
+classes/
+
+# eclipse
+
+*.launch
+
+# idea
+
+.idea/
+*.iml
+*.ipr
+*.iws
+
+# vscode
+
+.settings/
+.vscode/
+bin/
+.classpath
+.project
+
+# fabric
+
+run/
+
+# other
+*.log

fabric-1.20.6/build.gradle

@@ -0,0 +1,73 @@
+plugins {
+	id 'fabric-loom' version '1.6.11'
+}
+
+archivesBaseName = "Dynmap"
+version = parent.version
+group = parent.group
+
+eclipse {
+    project {
+        name = "Dynmap(Fabric-1.20.6)"
+    }
+}
+
+sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = JavaLanguageVersion.of(21) // Need this here so eclipse task generates correctly.
+
+configurations {
+    shadow
+    implementation.extendsFrom(shadow)
+}
+
+repositories {
+    mavenCentral()
+    maven { url 'https://oss.sonatype.org/content/repositories/snapshots' }
+}
+
+dependencies {
+    minecraft "com.mojang:minecraft:${project.minecraft_version}"
+    mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
+    modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
+    modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
+
+    compileOnly group: 'com.google.code.findbugs', name: 'jsr305', version: '3.0.2'
+
+    shadow project(path: ':DynmapCore', configuration: 'shadow')
+
+    modCompileOnly "me.lucko:fabric-permissions-api:0.1-SNAPSHOT"
+    compileOnly 'net.luckperms:api:5.4'
+}
+
+loom {
+    accessWidenerPath = file("src/main/resources/dynmap.accesswidener")
+}
+
+processResources {
+    filesMatching('fabric.mod.json') {
+        expand "version": project.version
+    }
+}
+
+java {
+    // Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
+    // if it is present.
+    // If you remove this line, sources will not be generated.
+    withSourcesJar()
+}
+
+jar {
+    from "LICENSE"
+    from {
+        configurations.shadow.collect { it.toString().contains("guava") ? null : it.isDirectory() ? it : zipTree(it) }
+    }
+}
+
+remapJar {
+    archiveFileName = "${archivesBaseName}-${project.version}-fabric-${project.minecraft_version}.jar"
+    destinationDirectory = file '../target'
+}
+
+remapJar.doLast {
+    task ->
+        ant.checksum file: task.archivePath
+}

fabric-1.20.6/gradle.properties

@@ -0,0 +1,4 @@
+minecraft_version=1.20.6
+yarn_mappings=1.20.6+build.1
+loader_version=0.15.11
+fabric_version=0.98.0+1.20.6

fabric-1.20.6/src/main/java/org/dynmap/fabric_1_20_6/DynmapMod.java

@@ -0,0 +1,50 @@
+package org.dynmap.fabric_1_20_6;
+
+import net.fabricmc.api.ModInitializer;
+import net.fabricmc.loader.api.FabricLoader;
+import net.fabricmc.loader.api.ModContainer;
+import org.dynmap.DynmapCore;
+import org.dynmap.Log;
+
+import java.io.File;
+import java.net.URISyntaxException;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+public class DynmapMod implements ModInitializer {
+    private static final String MODID = "dynmap";
+    private static final ModContainer MOD_CONTAINER = FabricLoader.getInstance().getModContainer(MODID)
+            .orElseThrow(() -> new RuntimeException("Failed to get mod container: " + MODID));
+    // The instance of your mod that Fabric uses.
+    public static DynmapMod instance;
+
+    public static DynmapPlugin plugin;
+    public static File jarfile;
+    public static String ver;
+    public static boolean useforcedchunks;
+
+    @Override
+    public void onInitialize() {
+        instance = this;
+
+        Path path = MOD_CONTAINER.getRootPath();
+        try {
+            jarfile = new File(DynmapCore.class.getProtectionDomain().getCodeSource().getLocation().toURI());
+        } catch (URISyntaxException e) {
+            Log.severe("Unable to get DynmapCore jar path", e);
+        }
+
+        if (path.getFileSystem().provider().getScheme().equals("jar")) {
+            path = Paths.get(path.getFileSystem().toString());
+            jarfile = path.toFile();
+        }
+
+        ver = MOD_CONTAINER.getMetadata().getVersion().getFriendlyString();
+
+        Log.setLogger(new FabricLogger());
+        org.dynmap.modsupport.ModSupportImpl.init();
+
+        // Initialize the plugin, we will enable it fully when the server starts.
+        plugin = new DynmapPlugin();
+    }
+}