Skip to content

Commit

Permalink
Port to 1.21.4.
Browse files Browse the repository at this point in the history
  • Loading branch information
Crystal-Spider committed Dec 17, 2024
1 parent dfe7699 commit d7e42c3
Show file tree
Hide file tree
Showing 9 changed files with 23 additions and 21 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ and this project adheres to [Crystal Nest Semantic Versioning](https://crystalne

## [Unreleased]

- Nothing new.
- Port to 1.21.4.

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

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://raw.githubusercontent.com/crystal-nest/mod-fancy-assets/main/minecraft/minecraft.svg "Minecraft")[![1.21.3](https://raw.githubusercontent.com/crystal-nest/mod-fancy-assets/main/minecraft/1-21-3.svg "1.21.3")](https://modrinth.com/mod/pyrotechnic-elytra/versions?g=1.21.3)![Separator](https://raw.githubusercontent.com/crystal-nest/mod-fancy-assets/main/separator.svg)[![1.21.1](https://raw.githubusercontent.com/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://raw.githubusercontent.com/crystal-nest/mod-fancy-assets/main/separator.svg)[![1.21](https://raw.githubusercontent.com/crystal-nest/mod-fancy-assets/main/minecraft/1-21.svg "1.21")](https://modrinth.com/mod/pyrotechnic-elytra/versions?g=1.21)![Separator](https://raw.githubusercontent.com/crystal-nest/mod-fancy-assets/main/separator.svg)[![1.20.4](https://raw.githubusercontent.com/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://raw.githubusercontent.com/crystal-nest/mod-fancy-assets/main/separator.svg)[![1.20.2](https://raw.githubusercontent.com/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://raw.githubusercontent.com/crystal-nest/mod-fancy-assets/main/separator.svg)[![1.20.1](https://raw.githubusercontent.com/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://raw.githubusercontent.com/crystal-nest/mod-fancy-assets/main/separator.svg)[![1.19.4](https://raw.githubusercontent.com/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://raw.githubusercontent.com/crystal-nest/mod-fancy-assets/main/separator.svg)[![1.19.2](https://raw.githubusercontent.com/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://raw.githubusercontent.com/crystal-nest/mod-fancy-assets/main/separator.svg)[![1.18.2](https://raw.githubusercontent.com/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://raw.githubusercontent.com/crystal-nest/mod-fancy-assets/main/minecraft/minecraft.svg "Minecraft")[![1.21.4](https://raw.githubusercontent.com/crystal-nest/mod-fancy-assets/main/minecraft/1-21-4.svg "1.21.4")](https://www.patreon.com/crystalspider/membership)![Separator](https://raw.githubusercontent.com/crystal-nest/mod-fancy-assets/main/separator.svg)[![1.21.3](https://raw.githubusercontent.com/crystal-nest/mod-fancy-assets/main/minecraft/1-21-3.svg "1.21.3")](https://modrinth.com/mod/pyrotechnic-elytra/versions?g=1.21.3)![Separator](https://raw.githubusercontent.com/crystal-nest/mod-fancy-assets/main/separator.svg)[![1.21.1](https://raw.githubusercontent.com/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://raw.githubusercontent.com/crystal-nest/mod-fancy-assets/main/separator.svg)[![1.21](https://raw.githubusercontent.com/crystal-nest/mod-fancy-assets/main/minecraft/1-21.svg "1.21")](https://modrinth.com/mod/pyrotechnic-elytra/versions?g=1.21)![Separator](https://raw.githubusercontent.com/crystal-nest/mod-fancy-assets/main/separator.svg)[![1.20.4](https://raw.githubusercontent.com/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://raw.githubusercontent.com/crystal-nest/mod-fancy-assets/main/separator.svg)[![1.20.2](https://raw.githubusercontent.com/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://raw.githubusercontent.com/crystal-nest/mod-fancy-assets/main/separator.svg)[![1.20.1](https://raw.githubusercontent.com/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://raw.githubusercontent.com/crystal-nest/mod-fancy-assets/main/separator.svg)[![1.19.4](https://raw.githubusercontent.com/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://raw.githubusercontent.com/crystal-nest/mod-fancy-assets/main/separator.svg)[![1.19.2](https://raw.githubusercontent.com/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://raw.githubusercontent.com/crystal-nest/mod-fancy-assets/main/separator.svg)[![1.18.2](https://raw.githubusercontent.com/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://raw.githubusercontent.com/crystal-nest/mod-fancy-assets/main/loader/loader.svg "Loader")[![NeoForge](https://raw.githubusercontent.com/crystal-nest/mod-fancy-assets/main/loader/neoforge.svg "NeoForge")](https://modrinth.com/mod/pyrotechnic-elytra/versions?l=neoforge)![Separator](https://raw.githubusercontent.com/crystal-nest/mod-fancy-assets/main/separator.svg)[![Forge](https://raw.githubusercontent.com/crystal-nest/mod-fancy-assets/main/loader/forge.svg "Forge")](https://modrinth.com/mod/pyrotechnic-elytra/versions?l=forge)![Separator](https://raw.githubusercontent.com/crystal-nest/mod-fancy-assets/main/separator.svg)[![Fabric](https://raw.githubusercontent.com/crystal-nest/mod-fancy-assets/main/loader/fabric.svg "Fabric")](https://modrinth.com/mod/pyrotechnic-elytra/versions?l=fabric)

Expand Down
6 changes: 4 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
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 "2.0.49-beta" apply false
id "fabric-loom" version "1.8-SNAPSHOT" apply false
// https://projects.neoforged.net/neoforged/moddevgradle
id "net.neoforged.moddev" version "2.0.61-beta" apply false
// https://fabricmc.net/develop/
id "fabric-loom" version "1.9-SNAPSHOT" apply false
}

sonar {
Expand Down
6 changes: 3 additions & 3 deletions common/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,6 @@ artifacts {
}

// Disable publishing tasks where common is not published
tasks.named('publishModrinth').get().setEnabled(false)
tasks.named('publishCurseforge').get().setEnabled(false)
tasks.named('publishGitHub').get().setEnabled(false)
tasks.named("publishModrinth").get().setEnabled(false)
tasks.named("publishCurseforge").get().setEnabled(false)
tasks.named("publishGitHub").get().setEnabled(false)
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
@Mixin(FireworkRocketEntity.class)
public abstract class FireworkRocketEntityMixin {
/**
* Redirects the call to {@link LivingEntity#hurt(DamageSource, float)} in the method {@link FireworkRocketEntity#dealExplosionDamage(ServerLevel)}.<br />
* Redirects the call to {@link LivingEntity#hurtServer(ServerLevel, DamageSource, float)} in the method {@link FireworkRocketEntity#dealExplosionDamage(ServerLevel)}.<br />
* Prevents firework damage when boosting one's flight.
*
* @param instance entity owning the redirected method.
Expand Down
2 changes: 1 addition & 1 deletion fabric/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ loom {
server()
setConfigName("Fabric Server")
ideConfigGenerated(true)
runDir("run/client")
runDir("run/server")
}
}
}
Expand Down
16 changes: 8 additions & 8 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -13,23 +13,23 @@ description = Create a show everywhere you fly!
credits =
github_user = crystal-nest
curseforge_id = 968105
minecraft_version = 1.21.3
minecraft_version = 1.21.4
# https://parchmentmc.org/docs/getting-started#choose-a-version
parchment_minecraft = 1.21.1
parchment_version = 2024.11.17
parchment_minecraft = 1.21.4
parchment_version = 2024.12.07
# https://projects.neoforged.net/neoforged/neoform
neo_form_version = 1.21.3-20241023.131943
neo_form_version = 1.21.4-20241203.161809

# Fabric (https://fabricmc.net/develop/)
fabric_version = 0.110.0+1.21.3
fabric_version = 0.112.0+1.21.4
fabric_loader_version = 0.16.9

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

# Dependencies
cobweb_version = 1.1.4
cobweb_version = 1.3.0

# Gradle
org.gradle.jvmargs = -Xmx4G
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.10-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
6 changes: 3 additions & 3 deletions neoforge/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ plugins {

neoForge {
version = neoforge_version
def at = project(':common').file('src/main/resources/META-INF/accesstransformer.cfg')
def at = project(":common").file("src/main/resources/META-INF/accesstransformer.cfg")
if (at.exists()) {
accessTransformers.from(at.absolutePath)
}
Expand All @@ -15,14 +15,14 @@ neoForge {
}
runs {
configureEach {
systemProperty('neoforge.enabledGameTestNamespaces', mod_id)
systemProperty("neoforge.enabledGameTestNamespaces", mod_id)
ideName = "NeoForge ${it.name.capitalize()} (${project.path})" // Unify the run config names with fabric
}
client {
client()
}
data {
data()
clientData()
}
server {
server()
Expand Down

0 comments on commit d7e42c3

Please sign in to comment.