diff --git a/.github/workflows/gradle.yml b/.github/workflows/build.yml similarity index 99% rename from .github/workflows/gradle.yml rename to .github/workflows/build.yml index 1d9ddad3..c2256157 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/build.yml @@ -1,4 +1,4 @@ -name: Java CI +name: Build on: push: diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml new file mode 100644 index 00000000..2ebc3786 --- /dev/null +++ b/.github/workflows/publish.yml @@ -0,0 +1,29 @@ +name: Publish + +on: + release: + types: [published] + workflow_dispatch: + +jobs: + publish: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + with: + submodules: recursive + fetch-depth: 0 # needed for versioning + - name: Set up JDK 1.17 + uses: actions/setup-java@v1 + with: + java-version: 17 + - uses: actions/cache@v2 + with: + path: | + ~/.gradle/caches + ~/.gradle/wrapper + key: "${{ runner.os }}-bluemap-${{ hashFiles('**/*.gradle*') }}" + restore-keys: | + ${{ runner.os }}-bluemap- + - name: Build with Gradle + run: ./gradlew publish diff --git a/build.gradle.kts b/build.gradle.kts index 8f68555d..63e5fca5 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -27,3 +27,9 @@ tasks.register("spotlessApply") { dependsOn(it.task(":spotlessApply")) } } + +tasks.register("publish") { + gradle.includedBuilds.forEach { + dependsOn(it.task(":publish")) + } +} diff --git a/implementations/cli/build.gradle.kts b/implementations/cli/build.gradle.kts index 1e00a9ce..93b9ceb2 100644 --- a/implementations/cli/build.gradle.kts +++ b/implementations/cli/build.gradle.kts @@ -92,3 +92,7 @@ tasks.shadowJar { tasks.register("release") { dependsOn(tasks.shadowJar) } + +tasks.register("publish") { + +} diff --git a/implementations/fabric-1.15.2/build.gradle.kts b/implementations/fabric-1.15.2/build.gradle.kts index 99d805e6..de9ab858 100644 --- a/implementations/fabric-1.15.2/build.gradle.kts +++ b/implementations/fabric-1.15.2/build.gradle.kts @@ -7,6 +7,7 @@ plugins { id ("com.github.node-gradle.node") version "3.0.1" id ("com.github.johnrengelman.shadow") version "7.1.2" id ("fabric-loom") version "0.12-SNAPSHOT" + id ("com.modrinth.minotaur") version "2.+" } group = "de.bluecolored.bluemap.fabric" @@ -128,3 +129,20 @@ tasks.register("remappedShadowJar", type = RemapJarTask::class) { tasks.register("release") { dependsOn("remappedShadowJar") } + +modrinth { + token.set(System.getenv("MODRINTH_TOKEN")) + projectId.set("swbUV1cr") + versionNumber.set("${project.version}-${project.name}") + changelog.set("Releasenotes and Changelog:\nhttps://github.com/BlueMap-Minecraft/BlueMap/releases/tag/v${project.version}") + uploadFile.set(tasks.findByName("remappedShadowJar")) + gameVersions.addAll("1.15.2") + dependencies { + required.project("P7dR8mSH") // Fabric API + } + debugMode.set(true) +} + +tasks.register("publish") { + dependsOn("modrinth") +} diff --git a/implementations/fabric-1.16.1/build.gradle.kts b/implementations/fabric-1.16.1/build.gradle.kts index f143c1a4..576113ed 100644 --- a/implementations/fabric-1.16.1/build.gradle.kts +++ b/implementations/fabric-1.16.1/build.gradle.kts @@ -7,6 +7,7 @@ plugins { id ("com.github.node-gradle.node") version "3.0.1" id ("com.github.johnrengelman.shadow") version "7.1.2" id ("fabric-loom") version "0.12-SNAPSHOT" + id ("com.modrinth.minotaur") version "2.+" } group = "de.bluecolored.bluemap.fabric" @@ -128,3 +129,20 @@ tasks.register("remappedShadowJar", type = RemapJarTask::class) { tasks.register("release") { dependsOn("remappedShadowJar") } + +modrinth { + token.set(System.getenv("MODRINTH_TOKEN")) + projectId.set("swbUV1cr") + versionNumber.set("${project.version}-${project.name}") + changelog.set("Releasenotes and Changelog:\nhttps://github.com/BlueMap-Minecraft/BlueMap/releases/tag/v${project.version}") + uploadFile.set(tasks.findByName("remappedShadowJar")) + gameVersions.addAll("1.16.1") + dependencies { + required.project("P7dR8mSH") // Fabric API + } + debugMode.set(true) +} + +tasks.register("publish") { + dependsOn("modrinth") +} diff --git a/implementations/fabric-1.16.2/build.gradle.kts b/implementations/fabric-1.16.2/build.gradle.kts index b735a07c..86f36fe6 100644 --- a/implementations/fabric-1.16.2/build.gradle.kts +++ b/implementations/fabric-1.16.2/build.gradle.kts @@ -7,6 +7,7 @@ plugins { id ("com.github.node-gradle.node") version "3.0.1" id ("com.github.johnrengelman.shadow") version "7.1.2" id ("fabric-loom") version "0.12-SNAPSHOT" + id ("com.modrinth.minotaur") version "2.+" } group = "de.bluecolored.bluemap.fabric" @@ -128,3 +129,20 @@ tasks.register("remappedShadowJar", type = RemapJarTask::class) { tasks.register("release") { dependsOn("remappedShadowJar") } + +modrinth { + token.set(System.getenv("MODRINTH_TOKEN")) + projectId.set("swbUV1cr") + versionNumber.set("${project.version}-${project.name}") + changelog.set("Releasenotes and Changelog:\nhttps://github.com/BlueMap-Minecraft/BlueMap/releases/tag/v${project.version}") + uploadFile.set(tasks.findByName("remappedShadowJar")) + gameVersions.addAll("1.16.2", "1.16.3", "1.16.4", "1.16.5") + dependencies { + required.project("P7dR8mSH") // Fabric API + } + debugMode.set(true) +} + +tasks.register("publish") { + dependsOn("modrinth") +} diff --git a/implementations/fabric-1.17/build.gradle.kts b/implementations/fabric-1.17/build.gradle.kts index aecc39c1..05792b0a 100644 --- a/implementations/fabric-1.17/build.gradle.kts +++ b/implementations/fabric-1.17/build.gradle.kts @@ -7,6 +7,7 @@ plugins { id ("com.github.node-gradle.node") version "3.0.1" id ("com.github.johnrengelman.shadow") version "7.1.2" id ("fabric-loom") version "0.12-SNAPSHOT" + id ("com.modrinth.minotaur") version "2.+" } group = "de.bluecolored.bluemap.fabric" @@ -128,3 +129,20 @@ tasks.register("remappedShadowJar", type = RemapJarTask::class) { tasks.register("release") { dependsOn("remappedShadowJar") } + +modrinth { + token.set(System.getenv("MODRINTH_TOKEN")) + projectId.set("swbUV1cr") + versionNumber.set("${project.version}-${project.name}") + changelog.set("Releasenotes and Changelog:\nhttps://github.com/BlueMap-Minecraft/BlueMap/releases/tag/v${project.version}") + uploadFile.set(tasks.findByName("remappedShadowJar")) + gameVersions.addAll("1.17", "1.17.1") + dependencies { + required.project("P7dR8mSH") // Fabric API + } + debugMode.set(true) +} + +tasks.register("publish") { + dependsOn("modrinth") +} diff --git a/implementations/fabric-1.18/build.gradle.kts b/implementations/fabric-1.18/build.gradle.kts index ccf132d3..902f98e8 100644 --- a/implementations/fabric-1.18/build.gradle.kts +++ b/implementations/fabric-1.18/build.gradle.kts @@ -7,6 +7,7 @@ plugins { id ("com.github.node-gradle.node") version "3.0.1" id ("com.github.johnrengelman.shadow") version "7.1.2" id ("fabric-loom") version "0.12-SNAPSHOT" + id ("com.modrinth.minotaur") version "2.+" } group = "de.bluecolored.bluemap.fabric" @@ -128,3 +129,20 @@ tasks.register("remappedShadowJar", type = RemapJarTask::class) { tasks.register("release") { dependsOn("remappedShadowJar") } + +modrinth { + token.set(System.getenv("MODRINTH_TOKEN")) + projectId.set("swbUV1cr") + versionNumber.set("${project.version}-${project.name}") + changelog.set("Releasenotes and Changelog:\nhttps://github.com/BlueMap-Minecraft/BlueMap/releases/tag/v${project.version}") + uploadFile.set(tasks.findByName("remappedShadowJar")) + gameVersions.addAll("1.18", "1.18.1", "1.18.2") + dependencies { + required.project("P7dR8mSH") // Fabric API + } + debugMode.set(true) +} + +tasks.register("publish") { + dependsOn("modrinth") +} diff --git a/implementations/fabric-1.19/build.gradle.kts b/implementations/fabric-1.19/build.gradle.kts index 5a6bd3ea..314b8a51 100644 --- a/implementations/fabric-1.19/build.gradle.kts +++ b/implementations/fabric-1.19/build.gradle.kts @@ -7,6 +7,7 @@ plugins { id ("com.github.node-gradle.node") version "3.0.1" id ("com.github.johnrengelman.shadow") version "7.1.2" id ("fabric-loom") version "0.12-SNAPSHOT" + id ("com.modrinth.minotaur") version "2.+" } group = "de.bluecolored.bluemap.fabric" @@ -128,3 +129,20 @@ tasks.register("remappedShadowJar", type = RemapJarTask::class) { tasks.register("release") { dependsOn("remappedShadowJar") } + +modrinth { + token.set(System.getenv("MODRINTH_TOKEN")) + projectId.set("swbUV1cr") + versionNumber.set("${project.version}-${project.name}") + changelog.set("Releasenotes and Changelog:\nhttps://github.com/BlueMap-Minecraft/BlueMap/releases/tag/v${project.version}") + uploadFile.set(tasks.findByName("remappedShadowJar")) + gameVersions.addAll("1.19", "1.19.1", "1.19.2") + dependencies { + required.project("P7dR8mSH") // Fabric API + } + debugMode.set(true) +} + +tasks.register("publish") { + dependsOn("modrinth") +} diff --git a/implementations/forge-1.14.4/build.gradle b/implementations/forge-1.14.4/build.gradle index e866ab3d..ebfd14e5 100644 --- a/implementations/forge-1.14.4/build.gradle +++ b/implementations/forge-1.14.4/build.gradle @@ -15,6 +15,7 @@ plugins { id "com.diffplug.spotless" version "6.1.2" id "com.github.node-gradle.node" version "3.0.1" id "com.github.johnrengelman.shadow" version "7.1.2" + id "com.modrinth.minotaur" version "2.+" } apply plugin: "net.minecraftforge.gradle" @@ -165,3 +166,17 @@ afterEvaluate { task release { dependsOn(build) } + +modrinth { + token = System.getenv("MODRINTH_TOKEN") + projectId = "swbUV1cr" + versionNumber = "${project.version}-${project.name}" + changelog = "Releasenotes and Changelog:\nhttps://github.com/BlueMap-Minecraft/BlueMap/releases/tag/v${project.version}" + uploadFile = shadowJar + gameVersions = ["1.14.4"] + debugMode = true +} + +task publish { + dependsOn(tasks.findByName("modrinth")) +} diff --git a/implementations/forge-1.15.2/build.gradle b/implementations/forge-1.15.2/build.gradle index 1532610b..fa5880a4 100644 --- a/implementations/forge-1.15.2/build.gradle +++ b/implementations/forge-1.15.2/build.gradle @@ -15,6 +15,7 @@ plugins { id "com.diffplug.spotless" version "6.1.2" id "com.github.node-gradle.node" version "3.0.1" id "com.github.johnrengelman.shadow" version "7.1.2" + id "com.modrinth.minotaur" version "2.+" } apply plugin: "net.minecraftforge.gradle" @@ -165,3 +166,17 @@ afterEvaluate { task release { dependsOn(build) } + +modrinth { + token = System.getenv("MODRINTH_TOKEN") + projectId = "swbUV1cr" + versionNumber = "${project.version}-${project.name}" + changelog = "Releasenotes and Changelog:\nhttps://github.com/BlueMap-Minecraft/BlueMap/releases/tag/v${project.version}" + uploadFile = shadowJar + gameVersions = ["1.15.2"] + debugMode = true +} + +task publish { + dependsOn(tasks.findByName("modrinth")) +} diff --git a/implementations/forge-1.16.2/build.gradle b/implementations/forge-1.16.2/build.gradle index 5928100b..fb7b6586 100644 --- a/implementations/forge-1.16.2/build.gradle +++ b/implementations/forge-1.16.2/build.gradle @@ -15,6 +15,7 @@ plugins { id "com.diffplug.spotless" version "6.1.2" id "com.github.node-gradle.node" version "3.0.1" id "com.github.johnrengelman.shadow" version "7.1.2" + id "com.modrinth.minotaur" version "2.+" } apply plugin: "net.minecraftforge.gradle" @@ -165,3 +166,17 @@ afterEvaluate { task release { dependsOn(build) } + +modrinth { + token = System.getenv("MODRINTH_TOKEN") + projectId = "swbUV1cr" + versionNumber = "${project.version}-${project.name}" + changelog = "Releasenotes and Changelog:\nhttps://github.com/BlueMap-Minecraft/BlueMap/releases/tag/v${project.version}" + uploadFile = shadowJar + gameVersions = ["1.16.2", "1.16.3", "1.16.4", "1.16.5"] + debugMode = true +} + +task publish { + dependsOn(tasks.findByName("modrinth")) +} diff --git a/implementations/forge-1.17.1/build.gradle b/implementations/forge-1.17.1/build.gradle index b41e03dc..65ac6fec 100644 --- a/implementations/forge-1.17.1/build.gradle +++ b/implementations/forge-1.17.1/build.gradle @@ -15,6 +15,7 @@ plugins { id "com.diffplug.spotless" version "6.1.2" id "com.github.node-gradle.node" version "3.0.1" id "com.github.johnrengelman.shadow" version "7.1.2" + id "com.modrinth.minotaur" version "2.+" } apply plugin: "net.minecraftforge.gradle" @@ -165,3 +166,17 @@ afterEvaluate { task release { dependsOn(build) } + +modrinth { + token = System.getenv("MODRINTH_TOKEN") + projectId = "swbUV1cr" + versionNumber = "${project.version}-${project.name}" + changelog = "Releasenotes and Changelog:\nhttps://github.com/BlueMap-Minecraft/BlueMap/releases/tag/v${project.version}" + uploadFile = shadowJar + gameVersions = ["1.17.1"] + debugMode = true +} + +task publish { + dependsOn(tasks.findByName("modrinth")) +} diff --git a/implementations/forge-1.18.1/build.gradle b/implementations/forge-1.18.1/build.gradle index ee2d3563..5f3baec2 100644 --- a/implementations/forge-1.18.1/build.gradle +++ b/implementations/forge-1.18.1/build.gradle @@ -15,6 +15,7 @@ plugins { id "com.diffplug.spotless" version "6.1.2" id "com.github.node-gradle.node" version "3.0.1" id "com.github.johnrengelman.shadow" version "7.1.2" + id "com.modrinth.minotaur" version "2.+" } apply plugin: "net.minecraftforge.gradle" @@ -165,3 +166,17 @@ afterEvaluate { task release { dependsOn(build) } + +modrinth { + token = System.getenv("MODRINTH_TOKEN") + projectId = "swbUV1cr" + versionNumber = "${project.version}-${project.name}" + changelog = "Releasenotes and Changelog:\nhttps://github.com/BlueMap-Minecraft/BlueMap/releases/tag/v${project.version}" + uploadFile = shadowJar + gameVersions = ["1.18.1", "1.18.2"] + debugMode = true +} + +task publish { + dependsOn(tasks.findByName("modrinth")) +} diff --git a/implementations/forge-1.19.1/build.gradle b/implementations/forge-1.19.1/build.gradle index 3df108a7..2b36c3df 100644 --- a/implementations/forge-1.19.1/build.gradle +++ b/implementations/forge-1.19.1/build.gradle @@ -15,6 +15,7 @@ plugins { id "com.diffplug.spotless" version "6.1.2" id "com.github.node-gradle.node" version "3.0.1" id "com.github.johnrengelman.shadow" version "7.1.2" + id "com.modrinth.minotaur" version "2.+" } apply plugin: "net.minecraftforge.gradle" @@ -166,3 +167,17 @@ afterEvaluate { task release { dependsOn(build) } + +modrinth { + token = System.getenv("MODRINTH_TOKEN") + projectId = "swbUV1cr" + versionNumber = "${project.version}-${project.name}" + changelog = "Releasenotes and Changelog:\nhttps://github.com/BlueMap-Minecraft/BlueMap/releases/tag/v${project.version}" + uploadFile = shadowJar + gameVersions = ["1.19", "1.19.1", "1.19.2"] + debugMode = true +} + +task publish { + dependsOn(tasks.findByName("modrinth")) +} diff --git a/implementations/forge-1.19/build.gradle b/implementations/forge-1.19/build.gradle deleted file mode 100644 index dcadc099..00000000 --- a/implementations/forge-1.19/build.gradle +++ /dev/null @@ -1,168 +0,0 @@ -buildscript { - repositories { - // These repositories are only for Gradle plugins, put any other repositories in the repository block further below - maven { url = 'https://maven.minecraftforge.net' } - mavenCentral() - } - dependencies { - classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.1.+', changing: true - } -} - -plugins { - id "java" - id "java-library" - id "com.diffplug.spotless" version "6.1.2" - id "com.github.node-gradle.node" version "3.0.1" - id "com.github.johnrengelman.shadow" version "7.1.2" -} - -apply plugin: "net.minecraftforge.gradle" - -group = "de.bluecolored.bluemap.forge" -version = System.getProperty("bluemap.version") ?: "?" // set by BlueMapCore -archivesBaseName = 'bluemap' - -def javaTarget = 17 -java { - sourceCompatibility = JavaVersion.toVersion(javaTarget) - targetCompatibility = JavaVersion.toVersion(javaTarget) -} - -minecraft { - mappings channel: 'official', version: '1.19' - - runs { - server { - workingDirectory project.file('run') - property 'forge.logging.markers', 'REGISTRIES' - property 'forge.logging.console.level', 'debug' - - mods { - bluemap { - source sourceSets.main - } - } - } - } -} - -sourceSets.main.resources { srcDir 'src/generated/resources' } - -repositories { - mavenCentral() - maven { - setUrl("https://libraries.minecraft.net") - } - maven { - setUrl("https://jitpack.io") - } -} - -configurations { - implementation.extendsFrom(shadowInclude) -} - -dependencies { - minecraft 'net.minecraftforge:forge:1.19-41.0.16' - - shadowInclude ("de.bluecolored.bluemap.common:BlueMapCommon") { - //exclude dependencies provided by forge - exclude (group: "com.google.guava", module: "guava") - exclude (group: "com.google.code.gson", module: "gson") - exclude (group: "org.apache.commons", module: "commons-lang3") - exclude (group: "commons-io", module: "commons-io") - exclude (group: "com.mojang", module: "brigadier") - } - - testImplementation ("org.junit.jupiter:junit-jupiter:5.8.2") - testRuntimeOnly ("org.junit.jupiter:junit-jupiter-engine:5.8.2") -} - -spotless { - java { - target ("src/*/java/**/*.java") - - licenseHeaderFile("../../HEADER") - indentWithSpaces() - trimTrailingWhitespace() - } -} - -jar { - manifest { - attributes([ - "Specification-Title" : "bluemap", - "Specification-Vendor" : "bluemap", - "Specification-Version" : "1", // We are version 1 of ourselves - "Implementation-Title" : project.name, - "Implementation-Version" : project.jar.archiveVersion, - "Implementation-Vendor" : "bluemap", - "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ") - ]) - } -} - -jar.finalizedBy('reobfJar') - -tasks.withType(JavaCompile).configureEach { - options.encoding = "utf-8" -} - -tasks.withType(AbstractArchiveTask).configureEach { - setReproducibleFileOrder(true) - setPreserveFileTimestamps(false) -} - -test { - useJUnitPlatform() -} - -shadowJar { - def version = System.getProperty("bluemap.version") ?: "" // set by BlueMapCore - destinationDirectory.set(file("../../build/release")) - archiveFileName.set("BlueMap-${project.version}-${project.name}.jar") - - configurations = [project.configurations.shadowInclude] - - //relocate ("com.flowpowered.math", "de.bluecolored.shadow.flowpowered.math") //DON"T relocate this, because the API depends on it - relocate ("com.typesafe.config", "de.bluecolored.shadow.typesafe.config") - relocate ("net.querz.nbt", "de.bluecolored.shadow.querz.nbt") - relocate ("org.spongepowered.configurate", "de.bluecolored.shadow.configurate") - relocate ("com.github.benmanes.caffeine", "de.bluecolored.shadow.benmanes.caffeine") - relocate ("org.aopalliance", "de.bluecolored.shadow.aopalliance") - relocate ("javax.inject", "de.bluecolored.shadow.javax.inject") - relocate ("org.checkerframework", "de.bluecolored.shadow.checkerframework") - relocate ("org.codehaus", "de.bluecolored.shadow.codehaus") - relocate ("io.leangen.geantyref", "de.bluecolored.shadow.geantyref") - - relocate ("com.google.errorprone", "de.bluecolored.shadow.google.errorprone") - relocate ("com.google.inject", "de.bluecolored.shadow.google.inject") - - relocate ("org.apache.commons.dbcp2", "de.bluecolored.shadow.apache.commons.dbcp2") - relocate ("org.apache.commons.logging", "de.bluecolored.shadow.apache.commons.logging") - relocate ("org.apache.commons.pool2", "de.bluecolored.shadow.apache.commons.pool2") -} - -processResources { - from(sourceSets.main.resources.srcDirs) { - include 'mcmod.info','META-INF/mods.toml' - duplicatesStrategy = DuplicatesStrategy.WARN - - expand ( - version: project.version - ) - } -} - -afterEvaluate { - reobf { - shadowJar { - mappings = createMcpToSrg.output - } - } -} - -task release { - dependsOn(build) -} diff --git a/implementations/forge-1.19/gradle/wrapper/gradle-wrapper.jar b/implementations/forge-1.19/gradle/wrapper/gradle-wrapper.jar deleted file mode 100644 index 7454180f..00000000 Binary files a/implementations/forge-1.19/gradle/wrapper/gradle-wrapper.jar and /dev/null differ diff --git a/implementations/forge-1.19/gradle/wrapper/gradle-wrapper.properties b/implementations/forge-1.19/gradle/wrapper/gradle-wrapper.properties deleted file mode 100644 index 41dfb879..00000000 --- a/implementations/forge-1.19/gradle/wrapper/gradle-wrapper.properties +++ /dev/null @@ -1,5 +0,0 @@ -distributionBase=GRADLE_USER_HOME -distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip -zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists diff --git a/implementations/forge-1.19/gradlew b/implementations/forge-1.19/gradlew deleted file mode 100644 index c53aefaa..00000000 --- a/implementations/forge-1.19/gradlew +++ /dev/null @@ -1,234 +0,0 @@ -#!/bin/sh - -# -# Copyright © 2015-2021 the original authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# https://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -############################################################################## -# -# Gradle start up script for POSIX generated by Gradle. -# -# Important for running: -# -# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is -# noncompliant, but you have some other compliant shell such as ksh or -# bash, then to run this script, type that shell name before the whole -# command line, like: -# -# ksh Gradle -# -# Busybox and similar reduced shells will NOT work, because this script -# requires all of these POSIX shell features: -# * functions; -# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», -# «${var#prefix}», «${var%suffix}», and «$( cmd )»; -# * compound commands having a testable exit status, especially «case»; -# * various built-in commands including «command», «set», and «ulimit». -# -# Important for patching: -# -# (2) This script targets any POSIX shell, so it avoids extensions provided -# by Bash, Ksh, etc; in particular arrays are avoided. -# -# The "traditional" practice of packing multiple parameters into a -# space-separated string is a well documented source of bugs and security -# problems, so this is (mostly) avoided, by progressively accumulating -# options in "$@", and eventually passing that to Java. -# -# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, -# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; -# see the in-line comments for details. -# -# There are tweaks for specific operating systems such as AIX, CygWin, -# Darwin, MinGW, and NonStop. -# -# (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt -# within the Gradle project. -# -# You can find Gradle at https://github.com/gradle/gradle/. -# -############################################################################## - -# Attempt to set APP_HOME - -# Resolve links: $0 may be a link -app_path=$0 - -# Need this for daisy-chained symlinks. -while - APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path - [ -h "$app_path" ] -do - ls=$( ls -ld "$app_path" ) - link=${ls#*' -> '} - case $link in #( - /*) app_path=$link ;; #( - *) app_path=$APP_HOME$link ;; - esac -done - -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit - -APP_NAME="Gradle" -APP_BASE_NAME=${0##*/} - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' - -# Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD=maximum - -warn () { - echo "$*" -} >&2 - -die () { - echo - echo "$*" - echo - exit 1 -} >&2 - -# OS specific support (must be 'true' or 'false'). -cygwin=false -msys=false -darwin=false -nonstop=false -case "$( uname )" in #( - CYGWIN* ) cygwin=true ;; #( - Darwin* ) darwin=true ;; #( - MSYS* | MINGW* ) msys=true ;; #( - NONSTOP* ) nonstop=true ;; -esac - -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar - - -# Determine the Java command to use to start the JVM. -if [ -n "$JAVA_HOME" ] ; then - if [ -x "$JAVA_HOME/jre/sh/java" ] ; then - # IBM's JDK on AIX uses strange locations for the executables - JAVACMD=$JAVA_HOME/jre/sh/java - else - JAVACMD=$JAVA_HOME/bin/java - fi - if [ ! -x "$JAVACMD" ] ; then - die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." - fi -else - JAVACMD=java - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." -fi - -# Increase the maximum file descriptors if we can. -if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then - case $MAX_FD in #( - max*) - MAX_FD=$( ulimit -H -n ) || - warn "Could not query maximum file descriptor limit" - esac - case $MAX_FD in #( - '' | soft) :;; #( - *) - ulimit -n "$MAX_FD" || - warn "Could not set maximum file descriptor limit to $MAX_FD" - esac -fi - -# Collect all arguments for the java command, stacking in reverse order: -# * args from the command line -# * the main class name -# * -classpath -# * -D...appname settings -# * --module-path (only if needed) -# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. - -# For Cygwin or MSYS, switch paths to Windows format before running java -if "$cygwin" || "$msys" ; then - APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) - CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) - - JAVACMD=$( cygpath --unix "$JAVACMD" ) - - # Now convert the arguments - kludge to limit ourselves to /bin/sh - for arg do - if - case $arg in #( - -*) false ;; # don't mess with options #( - /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath - [ -e "$t" ] ;; #( - *) false ;; - esac - then - arg=$( cygpath --path --ignore --mixed "$arg" ) - fi - # Roll the args list around exactly as many times as the number of - # args, so each arg winds up back in the position where it started, but - # possibly modified. - # - # NB: a `for` loop captures its iteration list before it begins, so - # changing the positional parameters here affects neither the number of - # iterations, nor the values presented in `arg`. - shift # remove old arg - set -- "$@" "$arg" # push replacement arg - done -fi - -# Collect all arguments for the java command; -# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of -# shell script including quotes and variable substitutions, so put them in -# double quotes to make sure that they get re-expanded; and -# * put everything else in single quotes, so that it's not re-expanded. - -set -- \ - "-Dorg.gradle.appname=$APP_BASE_NAME" \ - -classpath "$CLASSPATH" \ - org.gradle.wrapper.GradleWrapperMain \ - "$@" - -# Use "xargs" to parse quoted args. -# -# With -n1 it outputs one arg per line, with the quotes and backslashes removed. -# -# In Bash we could simply go: -# -# readarray ARGS < <( xargs -n1 <<<"$var" ) && -# set -- "${ARGS[@]}" "$@" -# -# but POSIX shell has neither arrays nor command substitution, so instead we -# post-process each arg (as a line of input to sed) to backslash-escape any -# character that might be a shell metacharacter, then use eval to reverse -# that process (while maintaining the separation between arguments), and wrap -# the whole thing up as a single "set" statement. -# -# This will of course break if any of these variables contains a newline or -# an unmatched quote. -# - -eval "set -- $( - printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | - xargs -n1 | - sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | - tr '\n' ' ' - )" '"$@"' - -exec "$JAVACMD" "$@" diff --git a/implementations/forge-1.19/gradlew.bat b/implementations/forge-1.19/gradlew.bat deleted file mode 100644 index 107acd32..00000000 --- a/implementations/forge-1.19/gradlew.bat +++ /dev/null @@ -1,89 +0,0 @@ -@rem -@rem Copyright 2015 the original author or authors. -@rem -@rem Licensed under the Apache License, Version 2.0 (the "License"); -@rem you may not use this file except in compliance with the License. -@rem You may obtain a copy of the License at -@rem -@rem https://www.apache.org/licenses/LICENSE-2.0 -@rem -@rem Unless required by applicable law or agreed to in writing, software -@rem distributed under the License is distributed on an "AS IS" BASIS, -@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -@rem See the License for the specific language governing permissions and -@rem limitations under the License. -@rem - -@if "%DEBUG%" == "" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Resolve any "." and ".." in APP_HOME to make it shorter. -for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto execute - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega diff --git a/implementations/forge-1.19/settings.gradle.kts b/implementations/forge-1.19/settings.gradle.kts deleted file mode 100644 index 3af000a6..00000000 --- a/implementations/forge-1.19/settings.gradle.kts +++ /dev/null @@ -1,3 +0,0 @@ -rootProject.name = "forge-1.19" - -includeBuild("../../BlueMapCommon") \ No newline at end of file diff --git a/implementations/forge-1.19/src/main/java/de/bluecolored/bluemap/forge/ForgeCommandSource.java b/implementations/forge-1.19/src/main/java/de/bluecolored/bluemap/forge/ForgeCommandSource.java deleted file mode 100644 index 5bc17ce9..00000000 --- a/implementations/forge-1.19/src/main/java/de/bluecolored/bluemap/forge/ForgeCommandSource.java +++ /dev/null @@ -1,79 +0,0 @@ -/* - * This file is part of BlueMap, licensed under the MIT License (MIT). - * - * Copyright (c) Blue (Lukas Rieger) - * Copyright (c) contributors - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ -package de.bluecolored.bluemap.forge; - -import com.flowpowered.math.vector.Vector3d; -import de.bluecolored.bluemap.common.plugin.Plugin; -import de.bluecolored.bluemap.common.plugin.text.Text; -import de.bluecolored.bluemap.common.serverinterface.CommandSource; -import de.bluecolored.bluemap.core.world.World; -import net.minecraft.commands.CommandSourceStack; -import net.minecraft.network.chat.Component; - -import java.io.IOException; -import java.util.Optional; - -public class ForgeCommandSource implements CommandSource { - - private final ForgeMod mod; - private final Plugin plugin; - private final CommandSourceStack delegate; - - public ForgeCommandSource(ForgeMod mod, Plugin plugin, CommandSourceStack delegate) { - this.mod = mod; - this.plugin = plugin; - this.delegate = delegate; - } - - @Override - public void sendMessage(Text text) { - var component = Component.Serializer.fromJsonLenient(text.toJSONString()); - if (component != null) - delegate.sendSuccess(component, false); - } - - @Override - public boolean hasPermission(String permission) { - return delegate.hasPermission(1); - } - - @Override - public Optional getPosition() { - var pos = delegate.getPosition(); - return Optional.of(new Vector3d(pos.x, pos.y, pos.z)); - } - - @Override - public Optional getWorld() { - try { - var serverWorld = mod.getWorld(delegate.getLevel()); - String worldId = plugin.getBlueMap().getWorldId(serverWorld.getSaveFolder()); - return Optional.ofNullable(plugin.getWorlds().get(worldId)); - } catch (IOException ignore) {} - - return Optional.empty(); - } - -} diff --git a/implementations/forge-1.19/src/main/java/de/bluecolored/bluemap/forge/ForgeEventForwarder.java b/implementations/forge-1.19/src/main/java/de/bluecolored/bluemap/forge/ForgeEventForwarder.java deleted file mode 100644 index ff54d23a..00000000 --- a/implementations/forge-1.19/src/main/java/de/bluecolored/bluemap/forge/ForgeEventForwarder.java +++ /dev/null @@ -1,67 +0,0 @@ -/* - * This file is part of BlueMap, licensed under the MIT License (MIT). - * - * Copyright (c) Blue (Lukas Rieger) - * Copyright (c) contributors - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ -package de.bluecolored.bluemap.forge; - -import de.bluecolored.bluemap.common.serverinterface.ServerEventListener; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.event.entity.player.PlayerEvent.PlayerLoggedInEvent; -import net.minecraftforge.event.entity.player.PlayerEvent.PlayerLoggedOutEvent; -import net.minecraftforge.eventbus.api.SubscribeEvent; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.UUID; - -public class ForgeEventForwarder { - - private final Collection eventListeners; - - public ForgeEventForwarder() { - this.eventListeners = new ArrayList<>(1); - - MinecraftForge.EVENT_BUS.register(this); - } - - public synchronized void addEventListener(ServerEventListener listener) { - this.eventListeners.add(listener); - } - - public synchronized void removeAllListeners() { - this.eventListeners.clear(); - } - - @SubscribeEvent - public synchronized void onPlayerJoin(PlayerLoggedInEvent evt) { - UUID uuid = evt.getPlayer().getUUID(); - for (ServerEventListener listener : eventListeners) listener.onPlayerJoin(uuid); - } - - @SubscribeEvent - public synchronized void onPlayerLeave(PlayerLoggedOutEvent evt) { - UUID uuid = evt.getPlayer().getUUID(); - for (ServerEventListener listener : eventListeners) listener.onPlayerLeave(uuid); - } - -} diff --git a/implementations/forge-1.19/src/main/java/de/bluecolored/bluemap/forge/ForgeMod.java b/implementations/forge-1.19/src/main/java/de/bluecolored/bluemap/forge/ForgeMod.java deleted file mode 100644 index a9843367..00000000 --- a/implementations/forge-1.19/src/main/java/de/bluecolored/bluemap/forge/ForgeMod.java +++ /dev/null @@ -1,268 +0,0 @@ -/* - * This file is part of BlueMap, licensed under the MIT License (MIT). - * - * Copyright (c) Blue (Lukas Rieger) - * Copyright (c) contributors - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ -package de.bluecolored.bluemap.forge; - -import com.github.benmanes.caffeine.cache.Caffeine; -import com.github.benmanes.caffeine.cache.LoadingCache; -import de.bluecolored.bluemap.common.plugin.Plugin; -import de.bluecolored.bluemap.common.plugin.commands.Commands; -import de.bluecolored.bluemap.common.serverinterface.Player; -import de.bluecolored.bluemap.common.serverinterface.ServerEventListener; -import de.bluecolored.bluemap.common.serverinterface.ServerInterface; -import de.bluecolored.bluemap.common.serverinterface.ServerWorld; -import de.bluecolored.bluemap.core.BlueMap; -import de.bluecolored.bluemap.core.MinecraftVersion; -import de.bluecolored.bluemap.core.logger.Logger; -import net.minecraft.SharedConstants; -import net.minecraft.core.Registry; -import net.minecraft.resources.ResourceKey; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.server.MinecraftServer; -import net.minecraft.server.level.ServerLevel; -import net.minecraft.server.level.ServerPlayer; -import net.minecraft.world.level.Level; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.event.RegisterCommandsEvent; -import net.minecraftforge.event.TickEvent.ServerTickEvent; -import net.minecraftforge.event.entity.player.PlayerEvent.PlayerLoggedInEvent; -import net.minecraftforge.event.entity.player.PlayerEvent.PlayerLoggedOutEvent; -import net.minecraftforge.event.server.ServerStartedEvent; -import net.minecraftforge.event.server.ServerStartingEvent; -import net.minecraftforge.event.server.ServerStoppingEvent; -import net.minecraftforge.eventbus.api.SubscribeEvent; -import net.minecraftforge.fml.IExtensionPoint; -import net.minecraftforge.fml.ModLoadingContext; -import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.network.NetworkConstants; -import org.apache.logging.log4j.LogManager; - -import java.io.IOException; -import java.nio.file.Path; -import java.util.*; -import java.util.concurrent.ConcurrentHashMap; - -@Mod(Plugin.PLUGIN_ID) -public class ForgeMod implements ServerInterface { - - private final Plugin pluginInstance; - private MinecraftServer serverInstance = null; - - private final ForgeEventForwarder eventForwarder; - private final LoadingCache worlds; - - private int playerUpdateIndex = 0; - private final Map onlinePlayerMap; - private final List onlinePlayerList; - - public ForgeMod() { - Logger.global = new Log4jLogger(LogManager.getLogger(Plugin.PLUGIN_NAME)); - - this.onlinePlayerMap = new ConcurrentHashMap<>(); - this.onlinePlayerList = Collections.synchronizedList(new ArrayList<>()); - - this.pluginInstance = new Plugin("forge-1.19", this); - - this.eventForwarder = new ForgeEventForwarder(); - this.worlds = Caffeine.newBuilder() - .executor(BlueMap.THREAD_POOL) - .weakKeys() - .maximumSize(1000) - .build(ForgeWorld::new); - - MinecraftForge.EVENT_BUS.register(this); - - //Make sure the mod being absent on the other network side does not cause the client to display the server as incompatible - ModLoadingContext.get().registerExtensionPoint(IExtensionPoint.DisplayTest.class, () -> new IExtensionPoint.DisplayTest(() -> NetworkConstants.IGNORESERVERONLY, (a, b) -> true)); - } - - @SubscribeEvent - public void onServerStarting(ServerStartingEvent event) { - this.serverInstance = event.getServer(); - } - - @SubscribeEvent - public void onRegisterCommands(RegisterCommandsEvent event) { - //register commands - new Commands<>(pluginInstance, event.getDispatcher(), forgeSource -> - new ForgeCommandSource(this, pluginInstance, forgeSource) - ); - } - - @SubscribeEvent - public void onServerStarted(ServerStartedEvent event) { - //save worlds to generate level.dat files - serverInstance.saveAllChunks(false, true, true); - - new Thread(() -> { - Logger.global.logInfo("Loading..."); - - try { - pluginInstance.load(); - if (pluginInstance.isLoaded()) Logger.global.logInfo("Loaded!"); - } catch (IOException e) { - Logger.global.logError("Failed to load bluemap!", e); - pluginInstance.unload(); - } - }).start(); - } - - @SubscribeEvent - public void onServerStopping(ServerStoppingEvent event) { - pluginInstance.unload(); - Logger.global.logInfo("BlueMap unloaded!"); - } - - @SubscribeEvent - public void onTick(ServerTickEvent evt) { - updateSomePlayers(); - } - - @Override - public MinecraftVersion getMinecraftVersion() { - try { - return MinecraftVersion.of(SharedConstants.getCurrentVersion().getReleaseTarget()); - } catch (IllegalArgumentException ex) { - return new MinecraftVersion(1, 19, 1); - } - } - - @Override - public void registerListener(ServerEventListener listener) { - eventForwarder.addEventListener(listener); - } - - @Override - public void unregisterAllListeners() { - eventForwarder.removeAllListeners(); - } - - @Override - public Collection getLoadedWorlds() { - Collection loadedWorlds = new ArrayList<>(3); - for (ServerLevel serverWorld : serverInstance.getAllLevels()) { - loadedWorlds.add(worlds.get(serverWorld)); - } - return loadedWorlds; - } - - @SuppressWarnings("unchecked") - @Override - public Optional getWorld(Object world) { - if (world instanceof Path) - return getWorld((Path) world); - - if (world instanceof String) { - ResourceLocation resourceLocation = ResourceLocation.tryParse((String) world); - if (resourceLocation != null) world = serverInstance.getLevel(ResourceKey.create(Registry.DIMENSION_REGISTRY, resourceLocation)); - } - - if (world instanceof ResourceKey) { - try { - world = serverInstance.getLevel((ResourceKey) world); - } catch (ClassCastException ignored) {} - } - - if (world instanceof ServerLevel) - return Optional.of(getWorld((ServerLevel) world)); - - return Optional.empty(); - } - - public ServerWorld getWorld(ServerLevel world) { - return worlds.get(world); - } - - @Override - public Path getConfigFolder() { - return Path.of("config", "bluemap"); - } - - @Override - public Optional getModsFolder() { - return Optional.of(Path.of("mods")); - } - - @SubscribeEvent - public void onPlayerJoin(PlayerLoggedInEvent evt) { - var playerInstance = evt.getPlayer(); - if (!(playerInstance instanceof ServerPlayer)) return; - - ForgePlayer player = new ForgePlayer(playerInstance.getUUID(), this); - onlinePlayerMap.put(player.getUuid(), player); - onlinePlayerList.add(player); - } - - @SubscribeEvent - public void onPlayerLeave(PlayerLoggedOutEvent evt) { - var player = evt.getPlayer(); - if (!(player instanceof ServerPlayer)) return; - - UUID playerUUID = player.getUUID(); - onlinePlayerMap.remove(playerUUID); - synchronized (onlinePlayerList) { - onlinePlayerList.removeIf(p -> p.getUuid().equals(playerUUID)); - } - } - - public MinecraftServer getServer() { - return this.serverInstance; - } - - public Plugin getPlugin() { - return this.pluginInstance; - } - - @Override - public Collection getOnlinePlayers() { - return onlinePlayerMap.values(); - } - - @Override - public Optional getPlayer(UUID uuid) { - return Optional.ofNullable(onlinePlayerMap.get(uuid)); - } - - /** - * Only update some of the online players each tick to minimize performance impact on the server-thread. - * Only call this method on the server-thread. - */ - private void updateSomePlayers() { - int onlinePlayerCount = onlinePlayerList.size(); - if (onlinePlayerCount == 0) return; - - int playersToBeUpdated = onlinePlayerCount / 20; //with 20 tps, each player is updated once a second - if (playersToBeUpdated == 0) playersToBeUpdated = 1; - - for (int i = 0; i < playersToBeUpdated; i++) { - playerUpdateIndex++; - if (playerUpdateIndex >= 20 && playerUpdateIndex >= onlinePlayerCount) playerUpdateIndex = 0; - - if (playerUpdateIndex < onlinePlayerCount) { - onlinePlayerList.get(playerUpdateIndex).update(); - } - } - } - -} diff --git a/implementations/forge-1.19/src/main/java/de/bluecolored/bluemap/forge/ForgePlayer.java b/implementations/forge-1.19/src/main/java/de/bluecolored/bluemap/forge/ForgePlayer.java deleted file mode 100644 index a739b0da..00000000 --- a/implementations/forge-1.19/src/main/java/de/bluecolored/bluemap/forge/ForgePlayer.java +++ /dev/null @@ -1,172 +0,0 @@ -/* - * This file is part of BlueMap, licensed under the MIT License (MIT). - * - * Copyright (c) Blue (Lukas Rieger) - * Copyright (c) contributors - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ -package de.bluecolored.bluemap.forge; - -import com.flowpowered.math.vector.Vector3d; -import de.bluecolored.bluemap.common.plugin.text.Text; -import de.bluecolored.bluemap.common.serverinterface.Gamemode; -import de.bluecolored.bluemap.common.serverinterface.Player; -import net.minecraft.core.BlockPos; -import net.minecraft.server.MinecraftServer; -import net.minecraft.server.level.ServerPlayer; -import net.minecraft.world.effect.MobEffectInstance; -import net.minecraft.world.effect.MobEffects; -import net.minecraft.world.level.GameType; -import net.minecraft.world.level.LightLayer; -import net.minecraft.world.phys.Vec3; - -import java.io.IOException; -import java.util.EnumMap; -import java.util.Map; -import java.util.UUID; - -public class ForgePlayer implements Player { - - private static final Map GAMEMODE_MAP = new EnumMap<>(GameType.class); - static { - GAMEMODE_MAP.put(GameType.ADVENTURE, Gamemode.ADVENTURE); - GAMEMODE_MAP.put(GameType.SURVIVAL, Gamemode.SURVIVAL); - GAMEMODE_MAP.put(GameType.CREATIVE, Gamemode.CREATIVE); - GAMEMODE_MAP.put(GameType.SPECTATOR, Gamemode.SPECTATOR); - } - - private final UUID uuid; - private Text name; - private String world; - private Vector3d position; - private Vector3d rotation; - private int skyLight; - private int blockLight; - private boolean online; - private boolean sneaking; - private boolean invisible; - private Gamemode gamemode; - - private final ForgeMod mod; - - public ForgePlayer(UUID playerUuid, ForgeMod mod) { - this.uuid = playerUuid; - this.mod = mod; - - update(); - } - - @Override - public UUID getUuid() { - return this.uuid; - } - - @Override - public Text getName() { - return this.name; - } - - @Override - public String getWorld() { - return this.world; - } - - @Override - public Vector3d getPosition() { - return this.position; - } - - @Override - public Vector3d getRotation() { - return rotation; - } - - @Override - public int getSkyLight() { - return skyLight; - } - - @Override - public int getBlockLight() { - return blockLight; - } - - @Override - public boolean isOnline() { - return this.online; - } - - @Override - public boolean isSneaking() { - return this.sneaking; - } - - @Override - public boolean isInvisible() { - return this.invisible; - } - - @Override - public Gamemode getGamemode() { - return this.gamemode; - } - - /** - * Only call on server thread! - */ - public void update() { - MinecraftServer server = mod.getServer(); - if (server == null) { - this.online = false; - return; - } - - ServerPlayer player = server.getPlayerList().getPlayer(uuid); - if (player == null) { - this.online = false; - return; - } - - this.gamemode = GAMEMODE_MAP.getOrDefault(player.gameMode.getGameModeForPlayer(), Gamemode.SURVIVAL); - if (this.gamemode == null) this.gamemode = Gamemode.SURVIVAL; - - MobEffectInstance invis = player.getEffect(MobEffects.INVISIBILITY); - this.invisible = invis != null && invis.getDuration() > 0; - - this.name = Text.of(player.getName().getString()); - this.online = true; - - Vec3 pos = player.getPosition(1f); - this.position = new Vector3d(pos.x(), pos.y(), pos.z()); - this.rotation = new Vector3d(player.getXRot(), player.getYHeadRot(), 0); - this.sneaking = player.isCrouching(); - - this.skyLight = player.getLevel().getChunkSource().getLightEngine().getLayerListener(LightLayer.SKY).getLightValue(new BlockPos(player.getX(), player.getY(), player.getZ())); - this.blockLight = player.getLevel().getChunkSource().getLightEngine().getLayerListener(LightLayer.BLOCK).getLightValue(new BlockPos(player.getX(), player.getY(), player.getZ())); - - try { - var world = mod.getWorld(player.getLevel()); - this.world = mod.getPlugin().getBlueMap().getWorldId(world.getSaveFolder()); - } catch (IOException | NullPointerException e) { // NullPointerException -> the plugin isn't fully loaded - this.world = "unknown"; - } - } - -} diff --git a/implementations/forge-1.19/src/main/java/de/bluecolored/bluemap/forge/ForgeWorld.java b/implementations/forge-1.19/src/main/java/de/bluecolored/bluemap/forge/ForgeWorld.java deleted file mode 100644 index ce92b260..00000000 --- a/implementations/forge-1.19/src/main/java/de/bluecolored/bluemap/forge/ForgeWorld.java +++ /dev/null @@ -1,100 +0,0 @@ -/* - * This file is part of BlueMap, licensed under the MIT License (MIT). - * - * Copyright (c) Blue (Lukas Rieger) - * Copyright (c) contributors - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ -package de.bluecolored.bluemap.forge; - -import de.bluecolored.bluemap.common.serverinterface.Dimension; -import de.bluecolored.bluemap.common.serverinterface.ServerWorld; -import net.minecraft.server.MinecraftServer; -import net.minecraft.server.level.ServerLevel; -import net.minecraft.world.level.Level; -import net.minecraft.world.level.dimension.DimensionType; -import net.minecraft.world.level.storage.LevelResource; - -import java.io.IOException; -import java.lang.ref.WeakReference; -import java.nio.file.Path; -import java.util.concurrent.CompletableFuture; -import java.util.concurrent.CompletionException; -import java.util.concurrent.ExecutionException; - -public class ForgeWorld implements ServerWorld { - - private final WeakReference delegate; - private final Path saveFolder; - - public ForgeWorld(ServerLevel delegate) { - this.delegate = new WeakReference<>(delegate); - - MinecraftServer server = delegate.getServer(); - Path worldFolder = delegate.getServer().getServerDirectory().toPath().resolve(server.getWorldPath(LevelResource.ROOT)); - this.saveFolder = DimensionType.getStorageFolder(delegate.dimension(), worldFolder) - .toAbsolutePath().normalize(); - } - - @Override - public Dimension getDimension() { - ServerLevel world = delegate.get(); - if (world != null) { - if (world.dimension().equals(Level.NETHER)) return Dimension.NETHER; - if (world.dimension().equals(Level.END)) return Dimension.END; - if (world.dimension().equals(Level.OVERWORLD)) return Dimension.OVERWORLD; - } - - return ServerWorld.super.getDimension(); - } - - @Override - public boolean persistWorldChanges() throws IOException { - ServerLevel world = delegate.get(); - if (world == null) return false; - - var taskResult = CompletableFuture.supplyAsync(() -> { - try { - world.save(null, true, false); - return true; - } catch (Exception e) { - throw new CompletionException(e); - } - }, world.getServer()); - - try { - return taskResult.get(); - } catch (InterruptedException e) { - Thread.currentThread().interrupt(); - throw new IOException(e); - } catch (ExecutionException e) { - Throwable t = e.getCause(); - if (t instanceof IOException) throw (IOException) t; - if (t instanceof IllegalArgumentException) throw (IllegalArgumentException) t; - throw new IOException(t); - } - } - - @Override - public Path getSaveFolder() { - return this.saveFolder; - } - -} diff --git a/implementations/forge-1.19/src/main/java/de/bluecolored/bluemap/forge/Log4jLogger.java b/implementations/forge-1.19/src/main/java/de/bluecolored/bluemap/forge/Log4jLogger.java deleted file mode 100644 index fa6664ec..00000000 --- a/implementations/forge-1.19/src/main/java/de/bluecolored/bluemap/forge/Log4jLogger.java +++ /dev/null @@ -1,69 +0,0 @@ -/* - * This file is part of BlueMap, licensed under the MIT License (MIT). - * - * Copyright (c) Blue (Lukas Rieger) - * Copyright (c) contributors - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ -package de.bluecolored.bluemap.forge; - -import org.apache.logging.log4j.Logger; - -import de.bluecolored.bluemap.core.logger.AbstractLogger; - -public class Log4jLogger extends AbstractLogger { - - private Logger out; - - public Log4jLogger(Logger out) { - this.out = out; - } - - @Override - public void logError(String message, Throwable throwable) { - out.error(message, throwable); - } - - @Override - public void logWarning(String message) { - out.warn(message); - } - - @Override - public void logInfo(String message) { - out.info(message); - } - - @Override - public void logDebug(String message) { - if (out.isDebugEnabled()) out.debug(message); - } - - @Override - public void noFloodDebug(String message) { - if (out.isDebugEnabled()) super.noFloodDebug(message); - } - - @Override - public void noFloodDebug(String key, String message) { - if (out.isDebugEnabled()) super.noFloodDebug(key, message); - } - -} diff --git a/implementations/forge-1.19/src/main/resources/META-INF/mods.toml b/implementations/forge-1.19/src/main/resources/META-INF/mods.toml deleted file mode 100644 index be1b4710..00000000 --- a/implementations/forge-1.19/src/main/resources/META-INF/mods.toml +++ /dev/null @@ -1,26 +0,0 @@ -modLoader="javafml" -loaderVersion="[41,)" -license="MIT" -issueTrackerURL="https://github.com/BlueMap-Minecraft/BlueMap/issues" -[[mods]] -modId="bluemap" -version="${version}" -displayName="BlueMap" -displayURL="https://github.com/BlueMap-Minecraft/BlueMap" -authors="Blue (TBlueF, Lukas Rieger)" -description=''' -A 3d-map of your Minecraft worlds view-able in your browser using three.js (WebGL) -''' - -[[dependencies.bluemap]] - modId="forge" - mandatory=true - versionRange="[41,)" - ordering="NONE" - side="SERVER" -[[dependencies.bluemap]] - modId="minecraft" - mandatory=true - versionRange="[1.19,)" - ordering="NONE" - side="SERVER" diff --git a/implementations/forge-1.19/src/main/resources/pack.mcmeta b/implementations/forge-1.19/src/main/resources/pack.mcmeta deleted file mode 100644 index 0f95ce1c..00000000 --- a/implementations/forge-1.19/src/main/resources/pack.mcmeta +++ /dev/null @@ -1,6 +0,0 @@ -{ - "pack": { - "description": "BlueMap - A 3d-map of your Minecraft worlds view-able in your browser using three.js (WebGL)", - "pack_format": 8 - } -} diff --git a/implementations/spigot/build.gradle.kts b/implementations/spigot/build.gradle.kts index 5513a42e..ff7ba0ee 100644 --- a/implementations/spigot/build.gradle.kts +++ b/implementations/spigot/build.gradle.kts @@ -4,6 +4,7 @@ plugins { id("com.diffplug.spotless") version "6.1.2" id ("com.github.node-gradle.node") version "3.0.1" id ("com.github.johnrengelman.shadow") version "7.1.2" + id ("com.modrinth.minotaur") version "2.+" } group = "de.bluecolored.bluemap.bukkit" @@ -114,3 +115,26 @@ tasks.shadowJar { tasks.register("release") { dependsOn(tasks.shadowJar) } + +modrinth { + token.set(System.getenv("MODRINTH_TOKEN")) + projectId.set("swbUV1cr") + versionNumber.set("${project.version}-${project.name}") + changelog.set("Releasenotes and Changelog:\nhttps://github.com/BlueMap-Minecraft/BlueMap/releases/tag/v${project.version}") + uploadFile.set(tasks.findByName("shadowJar")) + loaders.addAll("spigot") + gameVersions.addAll( + "1.13.2", + "1.13.2", "1.13.2", "1.13.2", "1.13.2", "1.13.2", + "1.13.2", "1.13.2", "1.13.2", + "1.13.2","1.13.2","1.13.2","1.13.2","1.13.2","1.13.2", + "1.13.2","1.13.2", + "1.13.2","1.13.2","1.13.2", + "1.19", "1.19.1", "1.19.2" + ) + debugMode.set(true) +} + +tasks.register("publish") { + dependsOn("modrinth") +} diff --git a/implementations/sponge-8.0.0/build.gradle.kts b/implementations/sponge-8.0.0/build.gradle.kts index ffdbabbe..82fc360d 100644 --- a/implementations/sponge-8.0.0/build.gradle.kts +++ b/implementations/sponge-8.0.0/build.gradle.kts @@ -7,6 +7,7 @@ plugins { id ("com.github.node-gradle.node") version "3.0.1" id ("com.github.johnrengelman.shadow") version "7.1.2" id ("org.spongepowered.gradle.plugin") version "2.0.0" + id ("com.modrinth.minotaur") version "2.+" } group = "de.bluecolored.bluemap.bukkit" @@ -127,3 +128,18 @@ tasks.shadowJar { tasks.register("release") { dependsOn(tasks.shadowJar) } + +modrinth { + token.set(System.getenv("MODRINTH_TOKEN")) + projectId.set("swbUV1cr") + versionNumber.set("${project.version}-${project.name}") + changelog.set("Releasenotes and Changelog:\nhttps://github.com/BlueMap-Minecraft/BlueMap/releases/tag/v${project.version}") + uploadFile.set(tasks.findByName("shadowJar")) + loaders.addAll("sponge") + gameVersions.addAll("1.16.5") + debugMode.set(true) +} + +tasks.register("publish") { + dependsOn("modrinth") +} diff --git a/implementations/sponge-9.0.0/build.gradle.kts b/implementations/sponge-9.0.0/build.gradle.kts index bdcb3b19..c74f8b87 100644 --- a/implementations/sponge-9.0.0/build.gradle.kts +++ b/implementations/sponge-9.0.0/build.gradle.kts @@ -7,6 +7,7 @@ plugins { id ("com.github.node-gradle.node") version "3.0.1" id ("com.github.johnrengelman.shadow") version "7.1.2" id ("org.spongepowered.gradle.plugin") version "2.0.0" + id ("com.modrinth.minotaur") version "2.+" } group = "de.bluecolored.bluemap.bukkit" @@ -127,3 +128,18 @@ tasks.shadowJar { tasks.register("release") { dependsOn(tasks.shadowJar) } + +modrinth { + token.set(System.getenv("MODRINTH_TOKEN")) + projectId.set("swbUV1cr") + versionNumber.set("${project.version}-${project.name}") + changelog.set("Releasenotes and Changelog:\nhttps://github.com/BlueMap-Minecraft/BlueMap/releases/tag/v${project.version}") + uploadFile.set(tasks.findByName("shadowJar")) + loaders.addAll("sponge") + gameVersions.addAll("1.18.2") + debugMode.set(true) +} + +tasks.register("publish") { + dependsOn("modrinth") +} diff --git a/settings.gradle.kts b/settings.gradle.kts index 068e6f0c..afd7618f 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -14,7 +14,6 @@ includeBuild("implementations/forge-1.15.2") includeBuild("implementations/forge-1.16.2") includeBuild("implementations/forge-1.17.1") includeBuild("implementations/forge-1.18.1") -includeBuild("implementations/forge-1.19") includeBuild("implementations/forge-1.19.1") includeBuild("implementations/spigot")