diff --git a/internal/v1_17_R1/pom.xml b/internal/v1_17_R1/pom.xml index 1059633..789a56e 100644 --- a/internal/v1_17_R1/pom.xml +++ b/internal/v1_17_R1/pom.xml @@ -1,6 +1,6 @@ + unknown @@ -144,6 +146,34 @@ net.md-5 specialsource-maven-plugin 1.2.2 + + + package + + remap + + remap-obf + + org.spigotmc:minecraft-server:${spigot.version}:txt:maps-mojang + true + org.spigotmc:spigot:${spigot.version}:jar:remapped-mojang + true + remapped-obf + + + + package + + remap + + remap-spigot + + ${project.build.directory}/${project.artifactId}-${project.version}-remapped-obf.jar + org.spigotmc:minecraft-server:${spigot.version}:csrg:maps-spigot + org.spigotmc:spigot:${spigot.version}:jar:remapped-obf + + + diff --git a/scripts/get_spigot_versions.sh b/scripts/get_spigot_versions.sh index 1e079f3..c4e7b26 100644 --- a/scripts/get_spigot_versions.sh +++ b/scripts/get_spigot_versions.sh @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (C) 2011-2021 lishid. All rights reserved. +# Copyright (C) 2011-2022 lishid. All rights reserved. # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -42,22 +42,10 @@ readarray -t modules <<< "$(mvn help:evaluate -Dexpression=project.modules -q -D declare -n versions="spigot_versions" for module in "${modules[@]}"; do - # Get number of dependencies declared in pom of specified internal module. - max_index=$(mvn help:evaluate -Dexpression=project.dependencies -q -DforceStdout -P all -pl "$module" | grep -c "") - - for ((i=0; i < max_index; i++)); do - # Get artifactId of dependency. - artifact_id=$(mvn help:evaluate -Dexpression=project.dependencies["$i"].artifactId -q -DforceStdout -P all -pl "$module") - - # Ensure dependency is Spigot. - if [[ "$artifact_id" == spigot ]]; then - # Get Spigot version. - spigot_version=$(mvn help:evaluate -Dexpression=project.dependencies["$i"].version -q -DforceStdout -P all -pl "$module") - versions+=("$spigot_version") - echo "$spigot_version" - break - fi - done + # Get Spigot version. + spigot_version=$(mvn help:evaluate -Dexpression=spigot.version -q -DforceStdout -P all -pl "$module") + versions+=("$spigot_version") + echo "$spigot_version" done # Reset JVM parameters