firstdarkdev/CraterLib
1
0
Fork 0
Code Issues 3 Pull Requests Actions Projects Activity

[DEV] Rebuild Porting Patches

Browse Source
This commit is contained in:
HypherionSA
2025-03-25 19:49:02 +02:00
parent 9da963f3c8
commit 327a60c806
56 changed files with 137 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
commit.sha
View File

@@ -1 +1 @@
771d43853358f76b0df6a1ce0956501c3d7a7649 79b2277a77ff03dc7622f58b024431572d6967a9

2
patches/1.18.2/.jenkins/Jenkinsfile.snapshot.patch
View File

@@ -6,7 +6,7 @@
-def JDK = "21"; -def JDK = "21";
-def majorMc = "1.21.5"; -def majorMc = "1.21.5";
-def modLoaders = "neoforge|fabric|quilt|paper"; -def modLoaders = "neoforge|fabric|quilt|paper";
-def supportedMc = "25w10a"; -def supportedMc = "1.21.5-rc1";
-def reltype = "experimental"; -def reltype = "experimental";
+def JDK = "17"; +def JDK = "17";
+def majorMc = "1.18.2"; +def majorMc = "1.18.2";

6
patches/1.18.2/NeoForge/build.gradle.patch
View File

@@ -42,11 +42,11 @@
- -
-unimined.minecraft { -unimined.minecraft {
- neoForged { - neoForged {
- /*if (isPort) { - if (isPort) {
- loader "net.neoforged:neoforge:${neoforge_version}:universal" - loader "net.neoforged:neoforge:${neoforge_version}:universal"
- } else {*/ - } else {
- loader neoforge_version - loader neoforge_version
- //} - }
- -
- mixinConfig("${mod_id}.mixins.json", "${mod_id}.neoforge.mixins.json") - mixinConfig("${mod_id}.mixins.json", "${mod_id}.neoforge.mixins.json")
- } - }

4
patches/1.18.2/NeoForge/src/main/java/com/hypherionmc/craterlib/client/NeoForgeClientHelper.java.patch
View File

@@ -1,12 +1,10 @@
--- a/NeoForge/src/main/java/com/hypherionmc/craterlib/client/NeoForgeClientHelper.java --- a/NeoForge/src/main/java/com/hypherionmc/craterlib/client/NeoForgeClientHelper.java
+++ /dev/null +++ /dev/null
@@ -1,68 +1,0 @@ @@ -1,66 +1,0 @@
-package com.hypherionmc.craterlib.client; -package com.hypherionmc.craterlib.client;
- -
-import com.hypherionmc.craterlib.api.events.client.LateInitEvent; -import com.hypherionmc.craterlib.api.events.client.LateInitEvent;
-import com.hypherionmc.craterlib.client.gui.config.ClothConfigScreenBuilder; -import com.hypherionmc.craterlib.client.gui.config.ClothConfigScreenBuilder;
-import com.hypherionmc.craterlib.client.gui.config.CraterConfigScreen;
-import com.hypherionmc.craterlib.core.config.AbstractConfig;
-import com.hypherionmc.craterlib.core.config.ConfigController; -import com.hypherionmc.craterlib.core.config.ConfigController;
-import com.hypherionmc.craterlib.core.config.annotations.ClothScreen; -import com.hypherionmc.craterlib.core.config.annotations.ClothScreen;
-import com.hypherionmc.craterlib.core.config.annotations.NoConfigScreen; -import com.hypherionmc.craterlib.core.config.annotations.NoConfigScreen;

2
patches/1.18.2/NeoForge/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java.patch
View File

@@ -25,7 +25,7 @@
- public ServerPlayer player; - public ServerPlayer player;
- -
- @Inject( - @Inject(
- method = "lambda$handleChat$5", - method = "lambda$handleChat$6",
- at = @At("HEAD"), - at = @At("HEAD"),
- cancellable = true - cancellable = true
- ) - )

4
patches/1.18.2/build.gradle.patch
View File

@@ -7,14 +7,14 @@
-var relType = project.properties["releaseType"] ?: "${release_type}" -var relType = project.properties["releaseType"] ?: "${release_type}"
- -
-ext { -ext {
- isPort = (relType == 'experimental') - isPort = false //(relType == 'experimental')
-} -}
- -
orion.setup { orion.setup {
multiProject = true multiProject = true
enableMirrorMaven = true enableMirrorMaven = true
enableReleasesMaven = true enableReleasesMaven = true
- //enableSnapshotsMaven = isPort - enableSnapshotsMaven = isPort
dopplerToken = System.getenv("DOPPLER_KEY") dopplerToken = System.getenv("DOPPLER_KEY")

6
patches/1.18.2/gradle.properties.patch
View File

@@ -4,13 +4,13 @@
mod_name=CraterLib mod_name=CraterLib
# Shared # Shared
-minecraft_version=25w10a -minecraft_version=1.21.5
+minecraft_version=1.18.2 +minecraft_version=1.18.2
project_group=com.hypherionmc.craterlib project_group=com.hypherionmc.craterlib
# Fabric # Fabric
-fabric_loader=0.16.10 -fabric_loader=0.16.10
-fabric_api=0.118.4+1.21.5 -fabric_api=0.119.5+1.21.5
+fabric_loader=0.15.11 +fabric_loader=0.15.11
+fabric_api=0.76.0+1.18.2 +fabric_api=0.76.0+1.18.2
@@ -18,7 +18,7 @@
-forge_version=50.0.6 -forge_version=50.0.6
- -
-# NeoForged -# NeoForged
-neoforge_version=16-beta -neoforge_version=0-beta
+forge_version=40.2.0 +forge_version=40.2.0
# Dependencies # Dependencies

2
patches/1.18.2/settings.gradle.patch
View File

@@ -5,7 +5,7 @@
} }
-rootProject.name = 'CraterLib' -rootProject.name = 'CraterLib'
-include("Common", "Fabric"/*, "NeoForge"*/) -include("Common", "Fabric", "NeoForge")
-//include 'Paper' -//include 'Paper'
- -
+rootProject.name = 'CraterLib-1.18.2' +rootProject.name = 'CraterLib-1.18.2'

2
patches/1.19.2/.jenkins/Jenkinsfile.snapshot.patch
View File

@@ -6,7 +6,7 @@
-def JDK = "21"; -def JDK = "21";
-def majorMc = "1.21.5"; -def majorMc = "1.21.5";
-def modLoaders = "neoforge|fabric|quilt|paper"; -def modLoaders = "neoforge|fabric|quilt|paper";
-def supportedMc = "25w10a"; -def supportedMc = "1.21.5-rc1";
-def reltype = "experimental"; -def reltype = "experimental";
+def JDK = "17"; +def JDK = "17";
+def majorMc = "1.19.2"; +def majorMc = "1.19.2";

6
patches/1.19.2/NeoForge/build.gradle.patch
View File

@@ -42,11 +42,11 @@
- -
-unimined.minecraft { -unimined.minecraft {
- neoForged { - neoForged {
- /*if (isPort) { - if (isPort) {
- loader "net.neoforged:neoforge:${neoforge_version}:universal" - loader "net.neoforged:neoforge:${neoforge_version}:universal"
- } else {*/ - } else {
- loader neoforge_version - loader neoforge_version
- //} - }
- -
- mixinConfig("${mod_id}.mixins.json", "${mod_id}.neoforge.mixins.json") - mixinConfig("${mod_id}.mixins.json", "${mod_id}.neoforge.mixins.json")
- } - }

4
patches/1.19.2/NeoForge/src/main/java/com/hypherionmc/craterlib/client/NeoForgeClientHelper.java.patch
View File

@@ -1,12 +1,10 @@
--- a/NeoForge/src/main/java/com/hypherionmc/craterlib/client/NeoForgeClientHelper.java --- a/NeoForge/src/main/java/com/hypherionmc/craterlib/client/NeoForgeClientHelper.java
+++ /dev/null +++ /dev/null
@@ -1,68 +1,0 @@ @@ -1,66 +1,0 @@
-package com.hypherionmc.craterlib.client; -package com.hypherionmc.craterlib.client;
- -
-import com.hypherionmc.craterlib.api.events.client.LateInitEvent; -import com.hypherionmc.craterlib.api.events.client.LateInitEvent;
-import com.hypherionmc.craterlib.client.gui.config.ClothConfigScreenBuilder; -import com.hypherionmc.craterlib.client.gui.config.ClothConfigScreenBuilder;
-import com.hypherionmc.craterlib.client.gui.config.CraterConfigScreen;
-import com.hypherionmc.craterlib.core.config.AbstractConfig;
-import com.hypherionmc.craterlib.core.config.ConfigController; -import com.hypherionmc.craterlib.core.config.ConfigController;
-import com.hypherionmc.craterlib.core.config.annotations.ClothScreen; -import com.hypherionmc.craterlib.core.config.annotations.ClothScreen;
-import com.hypherionmc.craterlib.core.config.annotations.NoConfigScreen; -import com.hypherionmc.craterlib.core.config.annotations.NoConfigScreen;

2
patches/1.19.2/NeoForge/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java.patch
View File

@@ -25,7 +25,7 @@
- public ServerPlayer player; - public ServerPlayer player;
- -
- @Inject( - @Inject(
- method = "lambda$handleChat$5", - method = "lambda$handleChat$6",
- at = @At("HEAD"), - at = @At("HEAD"),
- cancellable = true - cancellable = true
- ) - )

4
patches/1.19.2/build.gradle.patch
View File

@@ -7,14 +7,14 @@
-var relType = project.properties["releaseType"] ?: "${release_type}" -var relType = project.properties["releaseType"] ?: "${release_type}"
- -
-ext { -ext {
- isPort = (relType == 'experimental') - isPort = false //(relType == 'experimental')
-} -}
- -
orion.setup { orion.setup {
multiProject = true multiProject = true
enableMirrorMaven = true enableMirrorMaven = true
enableReleasesMaven = true enableReleasesMaven = true
- //enableSnapshotsMaven = isPort - enableSnapshotsMaven = isPort
dopplerToken = System.getenv("DOPPLER_KEY") dopplerToken = System.getenv("DOPPLER_KEY")

6
patches/1.19.2/gradle.properties.patch
View File

@@ -4,13 +4,13 @@
mod_name=CraterLib mod_name=CraterLib
# Shared # Shared
-minecraft_version=25w10a -minecraft_version=1.21.5
+minecraft_version=1.19.2 +minecraft_version=1.19.2
project_group=com.hypherionmc.craterlib project_group=com.hypherionmc.craterlib
# Fabric # Fabric
-fabric_loader=0.16.10 -fabric_loader=0.16.10
-fabric_api=0.118.4+1.21.5 -fabric_api=0.119.5+1.21.5
+fabric_loader=0.15.11 +fabric_loader=0.15.11
+fabric_api=0.76.0+1.19.2 +fabric_api=0.76.0+1.19.2
@@ -18,7 +18,7 @@
-forge_version=50.0.6 -forge_version=50.0.6
- -
-# NeoForged -# NeoForged
-neoforge_version=16-beta -neoforge_version=0-beta
+forge_version=43.4.0 +forge_version=43.4.0
# Dependencies # Dependencies

2
patches/1.19.2/settings.gradle.patch
View File

@@ -5,7 +5,7 @@
} }
-rootProject.name = 'CraterLib' -rootProject.name = 'CraterLib'
-include("Common", "Fabric"/*, "NeoForge"*/) -include("Common", "Fabric", "NeoForge")
-//include 'Paper' -//include 'Paper'
- -
+rootProject.name = 'CraterLib-1.19.2' +rootProject.name = 'CraterLib-1.19.2'

2
patches/1.19.3/.jenkins/Jenkinsfile.snapshot.patch
View File

@@ -6,7 +6,7 @@
-def JDK = "21"; -def JDK = "21";
-def majorMc = "1.21.5"; -def majorMc = "1.21.5";
-def modLoaders = "neoforge|fabric|quilt|paper"; -def modLoaders = "neoforge|fabric|quilt|paper";
-def supportedMc = "25w10a"; -def supportedMc = "1.21.5-rc1";
-def reltype = "experimental"; -def reltype = "experimental";
+def JDK = "17"; +def JDK = "17";
+def majorMc = "1.19.3"; +def majorMc = "1.19.3";

6
patches/1.19.3/NeoForge/build.gradle.patch
View File

@@ -42,11 +42,11 @@
- -
-unimined.minecraft { -unimined.minecraft {
- neoForged { - neoForged {
- /*if (isPort) { - if (isPort) {
- loader "net.neoforged:neoforge:${neoforge_version}:universal" - loader "net.neoforged:neoforge:${neoforge_version}:universal"
- } else {*/ - } else {
- loader neoforge_version - loader neoforge_version
- //} - }
- -
- mixinConfig("${mod_id}.mixins.json", "${mod_id}.neoforge.mixins.json") - mixinConfig("${mod_id}.mixins.json", "${mod_id}.neoforge.mixins.json")
- } - }

4
patches/1.19.3/NeoForge/src/main/java/com/hypherionmc/craterlib/client/NeoForgeClientHelper.java.patch
View File

@@ -1,12 +1,10 @@
--- a/NeoForge/src/main/java/com/hypherionmc/craterlib/client/NeoForgeClientHelper.java --- a/NeoForge/src/main/java/com/hypherionmc/craterlib/client/NeoForgeClientHelper.java
+++ /dev/null +++ /dev/null
@@ -1,68 +1,0 @@ @@ -1,66 +1,0 @@
-package com.hypherionmc.craterlib.client; -package com.hypherionmc.craterlib.client;
- -
-import com.hypherionmc.craterlib.api.events.client.LateInitEvent; -import com.hypherionmc.craterlib.api.events.client.LateInitEvent;
-import com.hypherionmc.craterlib.client.gui.config.ClothConfigScreenBuilder; -import com.hypherionmc.craterlib.client.gui.config.ClothConfigScreenBuilder;
-import com.hypherionmc.craterlib.client.gui.config.CraterConfigScreen;
-import com.hypherionmc.craterlib.core.config.AbstractConfig;
-import com.hypherionmc.craterlib.core.config.ConfigController; -import com.hypherionmc.craterlib.core.config.ConfigController;
-import com.hypherionmc.craterlib.core.config.annotations.ClothScreen; -import com.hypherionmc.craterlib.core.config.annotations.ClothScreen;
-import com.hypherionmc.craterlib.core.config.annotations.NoConfigScreen; -import com.hypherionmc.craterlib.core.config.annotations.NoConfigScreen;

2
patches/1.19.3/NeoForge/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java.patch
View File

@@ -25,7 +25,7 @@
- public ServerPlayer player; - public ServerPlayer player;
- -
- @Inject( - @Inject(
- method = "lambda$handleChat$5", - method = "lambda$handleChat$6",
- at = @At("HEAD"), - at = @At("HEAD"),
- cancellable = true - cancellable = true
- ) - )

4
patches/1.19.3/build.gradle.patch
View File

@@ -7,14 +7,14 @@
-var relType = project.properties["releaseType"] ?: "${release_type}" -var relType = project.properties["releaseType"] ?: "${release_type}"
- -
-ext { -ext {
- isPort = (relType == 'experimental') - isPort = false //(relType == 'experimental')
-} -}
- -
orion.setup { orion.setup {
multiProject = true multiProject = true
enableMirrorMaven = true enableMirrorMaven = true
enableReleasesMaven = true enableReleasesMaven = true
- //enableSnapshotsMaven = isPort - enableSnapshotsMaven = isPort
dopplerToken = System.getenv("DOPPLER_KEY") dopplerToken = System.getenv("DOPPLER_KEY")

6
patches/1.19.3/gradle.properties.patch
View File

@@ -4,13 +4,13 @@
mod_name=CraterLib mod_name=CraterLib
# Shared # Shared
-minecraft_version=25w10a -minecraft_version=1.21.5
+minecraft_version=1.19.4 +minecraft_version=1.19.4
project_group=com.hypherionmc.craterlib project_group=com.hypherionmc.craterlib
# Fabric # Fabric
-fabric_loader=0.16.10 -fabric_loader=0.16.10
-fabric_api=0.118.4+1.21.5 -fabric_api=0.119.5+1.21.5
+fabric_loader=0.15.11 +fabric_loader=0.15.11
+fabric_api=0.87.2+1.19.4 +fabric_api=0.87.2+1.19.4
@@ -18,7 +18,7 @@
-forge_version=50.0.6 -forge_version=50.0.6
- -
-# NeoForged -# NeoForged
-neoforge_version=16-beta -neoforge_version=0-beta
+forge_version=45.3.0 +forge_version=45.3.0
# Dependencies # Dependencies

2
patches/1.19.3/settings.gradle.patch
View File

@@ -5,7 +5,7 @@
} }
-rootProject.name = 'CraterLib' -rootProject.name = 'CraterLib'
-include("Common", "Fabric"/*, "NeoForge"*/) -include("Common", "Fabric", "NeoForge")
-//include 'Paper' -//include 'Paper'
- -
+rootProject.name = 'CraterLib-1.19.3' +rootProject.name = 'CraterLib-1.19.3'

2
patches/1.20.2/.jenkins/Jenkinsfile.snapshot.patch
View File

@@ -6,7 +6,7 @@
-def JDK = "21"; -def JDK = "21";
-def majorMc = "1.21.5"; -def majorMc = "1.21.5";
-def modLoaders = "neoforge|fabric|quilt|paper"; -def modLoaders = "neoforge|fabric|quilt|paper";
-def supportedMc = "25w10a"; -def supportedMc = "1.21.5-rc1";
-def reltype = "experimental"; -def reltype = "experimental";
+def JDK = "17"; +def JDK = "17";
+def majorMc = "1.20.2"; +def majorMc = "1.20.2";

6
patches/1.20.2/NeoForge/build.gradle.patch
View File

@@ -42,11 +42,11 @@
- -
-unimined.minecraft { -unimined.minecraft {
- neoForged { - neoForged {
- /*if (isPort) { - if (isPort) {
- loader "net.neoforged:neoforge:${neoforge_version}:universal" - loader "net.neoforged:neoforge:${neoforge_version}:universal"
- } else {*/ - } else {
- loader neoforge_version - loader neoforge_version
- //} - }
- -
- mixinConfig("${mod_id}.mixins.json", "${mod_id}.neoforge.mixins.json") - mixinConfig("${mod_id}.mixins.json", "${mod_id}.neoforge.mixins.json")
- } - }

4
patches/1.20.2/NeoForge/src/main/java/com/hypherionmc/craterlib/client/NeoForgeClientHelper.java.patch
View File

@@ -1,12 +1,10 @@
--- a/NeoForge/src/main/java/com/hypherionmc/craterlib/client/NeoForgeClientHelper.java --- a/NeoForge/src/main/java/com/hypherionmc/craterlib/client/NeoForgeClientHelper.java
+++ /dev/null +++ /dev/null
@@ -1,68 +1,0 @@ @@ -1,66 +1,0 @@
-package com.hypherionmc.craterlib.client; -package com.hypherionmc.craterlib.client;
- -
-import com.hypherionmc.craterlib.api.events.client.LateInitEvent; -import com.hypherionmc.craterlib.api.events.client.LateInitEvent;
-import com.hypherionmc.craterlib.client.gui.config.ClothConfigScreenBuilder; -import com.hypherionmc.craterlib.client.gui.config.ClothConfigScreenBuilder;
-import com.hypherionmc.craterlib.client.gui.config.CraterConfigScreen;
-import com.hypherionmc.craterlib.core.config.AbstractConfig;
-import com.hypherionmc.craterlib.core.config.ConfigController; -import com.hypherionmc.craterlib.core.config.ConfigController;
-import com.hypherionmc.craterlib.core.config.annotations.ClothScreen; -import com.hypherionmc.craterlib.core.config.annotations.ClothScreen;
-import com.hypherionmc.craterlib.core.config.annotations.NoConfigScreen; -import com.hypherionmc.craterlib.core.config.annotations.NoConfigScreen;

2
patches/1.20.2/NeoForge/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java.patch
View File

@@ -25,7 +25,7 @@
- public ServerPlayer player; - public ServerPlayer player;
- -
- @Inject( - @Inject(
- method = "lambda$handleChat$5", - method = "lambda$handleChat$6",
- at = @At("HEAD"), - at = @At("HEAD"),
- cancellable = true - cancellable = true
- ) - )

4
patches/1.20.2/build.gradle.patch
View File

@@ -7,14 +7,14 @@
-var relType = project.properties["releaseType"] ?: "${release_type}" -var relType = project.properties["releaseType"] ?: "${release_type}"
- -
-ext { -ext {
- isPort = (relType == 'experimental') - isPort = false //(relType == 'experimental')
-} -}
- -
orion.setup { orion.setup {
multiProject = true multiProject = true
enableMirrorMaven = true enableMirrorMaven = true
enableReleasesMaven = true enableReleasesMaven = true
- //enableSnapshotsMaven = isPort - enableSnapshotsMaven = isPort
dopplerToken = System.getenv("DOPPLER_KEY") dopplerToken = System.getenv("DOPPLER_KEY")

6
patches/1.20.2/gradle.properties.patch
View File

@@ -4,13 +4,13 @@
mod_name=CraterLib mod_name=CraterLib
# Shared # Shared
-minecraft_version=25w10a -minecraft_version=1.21.5
+minecraft_version=1.20.2 +minecraft_version=1.20.2
project_group=com.hypherionmc.craterlib project_group=com.hypherionmc.craterlib
# Fabric # Fabric
-fabric_loader=0.16.10 -fabric_loader=0.16.10
-fabric_api=0.118.4+1.21.5 -fabric_api=0.119.5+1.21.5
+fabric_loader=0.15.11 +fabric_loader=0.15.11
+fabric_api=0.91.6+1.20.2 +fabric_api=0.91.6+1.20.2
@@ -18,7 +18,7 @@
-forge_version=50.0.6 -forge_version=50.0.6
- -
-# NeoForged -# NeoForged
-neoforge_version=16-beta -neoforge_version=0-beta
+forge_version=48.1.0 +forge_version=48.1.0
# Dependencies # Dependencies

2
patches/1.20.2/settings.gradle.patch
View File

@@ -5,7 +5,7 @@
} }
-rootProject.name = 'CraterLib' -rootProject.name = 'CraterLib'
-include("Common", "Fabric"/*, "NeoForge"*/) -include("Common", "Fabric", "NeoForge")
-//include 'Paper' -//include 'Paper'
- -
+rootProject.name = 'CraterLib-1.20.2' +rootProject.name = 'CraterLib-1.20.2'

2
patches/1.20.4/.jenkins/Jenkinsfile.snapshot.patch
View File

@@ -6,7 +6,7 @@
-def JDK = "21"; -def JDK = "21";
-def majorMc = "1.21.5"; -def majorMc = "1.21.5";
-def modLoaders = "neoforge|fabric|quilt|paper"; -def modLoaders = "neoforge|fabric|quilt|paper";
-def supportedMc = "25w10a"; -def supportedMc = "1.21.5-rc1";
-def reltype = "experimental"; -def reltype = "experimental";
+def JDK = "17"; +def JDK = "17";
+def majorMc = "1.20.4"; +def majorMc = "1.20.4";

6
patches/1.20.4/NeoForge/build.gradle.patch
View File

@@ -4,11 +4,11 @@
unimined.minecraft { unimined.minecraft {
neoForged { neoForged {
- /*if (isPort) { - if (isPort) {
- loader "net.neoforged:neoforge:${neoforge_version}:universal" - loader "net.neoforged:neoforge:${neoforge_version}:universal"
- } else {*/ - } else {
- loader neoforge_version - loader neoforge_version
- //} - }
- -
+ loader neoforge_version + loader neoforge_version
mixinConfig("${mod_id}.mixins.json", "${mod_id}.neoforge.mixins.json") mixinConfig("${mod_id}.mixins.json", "${mod_id}.neoforge.mixins.json")

6
patches/1.20.4/NeoForge/src/main/java/com/hypherionmc/craterlib/client/NeoForgeClientHelper.java.patch
View File

@@ -1,12 +1,10 @@
--- a/NeoForge/src/main/java/com/hypherionmc/craterlib/client/NeoForgeClientHelper.java --- a/NeoForge/src/main/java/com/hypherionmc/craterlib/client/NeoForgeClientHelper.java
+++ b/NeoForge/src/main/java/com/hypherionmc/craterlib/client/NeoForgeClientHelper.java +++ b/NeoForge/src/main/java/com/hypherionmc/craterlib/client/NeoForgeClientHelper.java
@@ -1,23 +1,12 @@ @@ -1,21 +1,12 @@
package com.hypherionmc.craterlib.client; package com.hypherionmc.craterlib.client;
-import com.hypherionmc.craterlib.api.events.client.LateInitEvent; -import com.hypherionmc.craterlib.api.events.client.LateInitEvent;
-import com.hypherionmc.craterlib.client.gui.config.ClothConfigScreenBuilder; -import com.hypherionmc.craterlib.client.gui.config.ClothConfigScreenBuilder;
-import com.hypherionmc.craterlib.client.gui.config.CraterConfigScreen;
-import com.hypherionmc.craterlib.core.config.AbstractConfig;
-import com.hypherionmc.craterlib.core.config.ConfigController; -import com.hypherionmc.craterlib.core.config.ConfigController;
-import com.hypherionmc.craterlib.core.config.annotations.ClothScreen; -import com.hypherionmc.craterlib.core.config.annotations.ClothScreen;
-import com.hypherionmc.craterlib.core.config.annotations.NoConfigScreen; -import com.hypherionmc.craterlib.core.config.annotations.NoConfigScreen;
@@ -24,7 +22,7 @@
import java.util.Objects; import java.util.Objects;
@@ -48,21 +37,5 @@ @@ -46,21 +37,5 @@
public Connection getClientConnection() { public Connection getClientConnection() {
Objects.requireNonNull(Minecraft.getInstance().getConnection(), "Cannot send packets when not in game!"); Objects.requireNonNull(Minecraft.getInstance().getConnection(), "Cannot send packets when not in game!");
return Minecraft.getInstance().getConnection().getConnection(); return Minecraft.getInstance().getConnection().getConnection();

4
patches/1.20.4/build.gradle.patch
View File

@@ -7,14 +7,14 @@
-var relType = project.properties["releaseType"] ?: "${release_type}" -var relType = project.properties["releaseType"] ?: "${release_type}"
- -
-ext { -ext {
- isPort = (relType == 'experimental') - isPort = false //(relType == 'experimental')
-} -}
- -
orion.setup { orion.setup {
multiProject = true multiProject = true
enableMirrorMaven = true enableMirrorMaven = true
enableReleasesMaven = true enableReleasesMaven = true
- //enableSnapshotsMaven = isPort - enableSnapshotsMaven = isPort
dopplerToken = System.getenv("DOPPLER_KEY") dopplerToken = System.getenv("DOPPLER_KEY")

6
patches/1.20.4/gradle.properties.patch
View File

@@ -4,13 +4,13 @@
mod_name=CraterLib mod_name=CraterLib
# Shared # Shared
-minecraft_version=25w10a -minecraft_version=1.21.5
+minecraft_version=1.20.4 +minecraft_version=1.20.4
project_group=com.hypherionmc.craterlib project_group=com.hypherionmc.craterlib
# Fabric # Fabric
-fabric_loader=0.16.10 -fabric_loader=0.16.10
-fabric_api=0.118.4+1.21.5 -fabric_api=0.119.5+1.21.5
+fabric_loader=0.15.11 +fabric_loader=0.15.11
+fabric_api=0.97.0+1.20.4 +fabric_api=0.97.0+1.20.4
@@ -19,7 +19,7 @@
+forge_version=49.0.49 +forge_version=49.0.49
# NeoForged # NeoForged
-neoforge_version=16-beta -neoforge_version=0-beta
+neoforge_version=234 +neoforge_version=234
# Dependencies # Dependencies

2
patches/1.20.4/settings.gradle.patch
View File

@@ -5,7 +5,7 @@
} }
-rootProject.name = 'CraterLib' -rootProject.name = 'CraterLib'
-include("Common", "Fabric"/*, "NeoForge"*/) -include("Common", "Fabric", "NeoForge")
-//include 'Paper' -//include 'Paper'
- -
+rootProject.name = 'CraterLib-1.20.4' +rootProject.name = 'CraterLib-1.20.4'

2
patches/1.20/.jenkins/Jenkinsfile.snapshot.patch
View File

@@ -6,7 +6,7 @@
-def JDK = "21"; -def JDK = "21";
-def majorMc = "1.21.5"; -def majorMc = "1.21.5";
-def modLoaders = "neoforge|fabric|quilt|paper"; -def modLoaders = "neoforge|fabric|quilt|paper";
-def supportedMc = "25w10a"; -def supportedMc = "1.21.5-rc1";
-def reltype = "experimental"; -def reltype = "experimental";
+def JDK = "17"; +def JDK = "17";
+def majorMc = "1.20"; +def majorMc = "1.20";

6
patches/1.20/NeoForge/build.gradle.patch
View File

@@ -42,11 +42,11 @@
- -
-unimined.minecraft { -unimined.minecraft {
- neoForged { - neoForged {
- /*if (isPort) { - if (isPort) {
- loader "net.neoforged:neoforge:${neoforge_version}:universal" - loader "net.neoforged:neoforge:${neoforge_version}:universal"
- } else {*/ - } else {
- loader neoforge_version - loader neoforge_version
- //} - }
- -
- mixinConfig("${mod_id}.mixins.json", "${mod_id}.neoforge.mixins.json") - mixinConfig("${mod_id}.mixins.json", "${mod_id}.neoforge.mixins.json")
- } - }

4
patches/1.20/NeoForge/src/main/java/com/hypherionmc/craterlib/client/NeoForgeClientHelper.java.patch
View File

@@ -1,12 +1,10 @@
--- a/NeoForge/src/main/java/com/hypherionmc/craterlib/client/NeoForgeClientHelper.java --- a/NeoForge/src/main/java/com/hypherionmc/craterlib/client/NeoForgeClientHelper.java
+++ /dev/null +++ /dev/null
@@ -1,68 +1,0 @@ @@ -1,66 +1,0 @@
-package com.hypherionmc.craterlib.client; -package com.hypherionmc.craterlib.client;
- -
-import com.hypherionmc.craterlib.api.events.client.LateInitEvent; -import com.hypherionmc.craterlib.api.events.client.LateInitEvent;
-import com.hypherionmc.craterlib.client.gui.config.ClothConfigScreenBuilder; -import com.hypherionmc.craterlib.client.gui.config.ClothConfigScreenBuilder;
-import com.hypherionmc.craterlib.client.gui.config.CraterConfigScreen;
-import com.hypherionmc.craterlib.core.config.AbstractConfig;
-import com.hypherionmc.craterlib.core.config.ConfigController; -import com.hypherionmc.craterlib.core.config.ConfigController;
-import com.hypherionmc.craterlib.core.config.annotations.ClothScreen; -import com.hypherionmc.craterlib.core.config.annotations.ClothScreen;
-import com.hypherionmc.craterlib.core.config.annotations.NoConfigScreen; -import com.hypherionmc.craterlib.core.config.annotations.NoConfigScreen;

2
patches/1.20/NeoForge/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java.patch
View File

@@ -25,7 +25,7 @@
- public ServerPlayer player; - public ServerPlayer player;
- -
- @Inject( - @Inject(
- method = "lambda$handleChat$5", - method = "lambda$handleChat$6",
- at = @At("HEAD"), - at = @At("HEAD"),
- cancellable = true - cancellable = true
- ) - )

4
patches/1.20/build.gradle.patch
View File

@@ -7,14 +7,14 @@
-var relType = project.properties["releaseType"] ?: "${release_type}" -var relType = project.properties["releaseType"] ?: "${release_type}"
- -
-ext { -ext {
- isPort = (relType == 'experimental') - isPort = false //(relType == 'experimental')
-} -}
- -
orion.setup { orion.setup {
multiProject = true multiProject = true
enableMirrorMaven = true enableMirrorMaven = true
enableReleasesMaven = true enableReleasesMaven = true
- //enableSnapshotsMaven = isPort - enableSnapshotsMaven = isPort
- -
dopplerToken = System.getenv("DOPPLER_KEY") dopplerToken = System.getenv("DOPPLER_KEY")

6
patches/1.20/gradle.properties.patch
View File

@@ -4,13 +4,13 @@
mod_name=CraterLib mod_name=CraterLib
# Shared # Shared
-minecraft_version=25w10a -minecraft_version=1.21.5
+minecraft_version=1.20 +minecraft_version=1.20
project_group=com.hypherionmc.craterlib project_group=com.hypherionmc.craterlib
# Fabric # Fabric
-fabric_loader=0.16.10 -fabric_loader=0.16.10
-fabric_api=0.118.4+1.21.5 -fabric_api=0.119.5+1.21.5
+fabric_loader=0.15.11 +fabric_loader=0.15.11
+fabric_api=0.83.0+1.20 +fabric_api=0.83.0+1.20
@@ -18,7 +18,7 @@
-forge_version=50.0.6 -forge_version=50.0.6
- -
-# NeoForged -# NeoForged
-neoforge_version=16-beta -neoforge_version=0-beta
+forge_version=46.0.14 +forge_version=46.0.14
# Dependencies # Dependencies

2
patches/1.20/settings.gradle.patch
View File

@@ -5,7 +5,7 @@
} }
-rootProject.name = 'CraterLib' -rootProject.name = 'CraterLib'
-include("Common", "Fabric"/*, "NeoForge"*/) -include("Common", "Fabric", "NeoForge")
-//include 'Paper' -//include 'Paper'
- -
+rootProject.name = 'CraterLib-1.20' +rootProject.name = 'CraterLib-1.20'

2
patches/1.21.2/.jenkins/Jenkinsfile.snapshot.patch
View File

@@ -7,7 +7,7 @@
-def majorMc = "1.21.5"; -def majorMc = "1.21.5";
+def majorMc = "1.21.2"; +def majorMc = "1.21.2";
def modLoaders = "neoforge|fabric|quilt|paper"; def modLoaders = "neoforge|fabric|quilt|paper";
-def supportedMc = "25w10a"; -def supportedMc = "1.21.5-rc1";
-def reltype = "experimental"; -def reltype = "experimental";
+def supportedMc = "1.21.3|1.21.4"; +def supportedMc = "1.21.3|1.21.4";
+def reltype = "snapshot"; +def reltype = "snapshot";

6
patches/1.21.2/NeoForge/build.gradle.patch
View File

@@ -4,11 +4,11 @@
unimined.minecraft { unimined.minecraft {
neoForged { neoForged {
- /*if (isPort) { - if (isPort) {
- loader "net.neoforged:neoforge:${neoforge_version}:universal" - loader "net.neoforged:neoforge:${neoforge_version}:universal"
- } else {*/ - } else {
- loader neoforge_version - loader neoforge_version
- //} - }
- -
+ loader neoforge_version + loader neoforge_version
mixinConfig("${mod_id}.mixins.json", "${mod_id}.neoforge.mixins.json") mixinConfig("${mod_id}.mixins.json", "${mod_id}.neoforge.mixins.json")

11
patches/1.21.2/NeoForge/src/main/java/com/hypherionmc/craterlib/client/NeoForgeClientHelper.java.patch Normal file
View File

@@ -0,0 +1,11 @@
--- a/NeoForge/src/main/java/com/hypherionmc/craterlib/client/NeoForgeClientHelper.java
+++ b/NeoForge/src/main/java/com/hypherionmc/craterlib/client/NeoForgeClientHelper.java
@@ -2,6 +2,8 @@
import com.hypherionmc.craterlib.api.events.client.LateInitEvent;
import com.hypherionmc.craterlib.client.gui.config.ClothConfigScreenBuilder;
+import com.hypherionmc.craterlib.client.gui.config.CraterConfigScreen;
+import com.hypherionmc.craterlib.core.config.AbstractConfig;
import com.hypherionmc.craterlib.core.config.ConfigController;
import com.hypherionmc.craterlib.core.config.annotations.ClothScreen;
import com.hypherionmc.craterlib.core.config.annotations.NoConfigScreen;

4
patches/1.20.4/NeoForge/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java.patch → patches/1.21.2/NeoForge/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java.patch
View File

@@ -4,8 +4,8 @@
public ServerPlayer player; public ServerPlayer player;
@Inject( @Inject(
- method = "lambda$handleChat$5", - method = "lambda$handleChat$6",
+ method = "lambda$handleChat$6", + method = "lambda$handleChat$5",
at = @At("HEAD"), at = @At("HEAD"),
cancellable = true cancellable = true
) )

4
patches/1.21.2/build.gradle.patch
View File

@@ -5,14 +5,14 @@
var relType = project.properties["releaseType"] ?: "${release_type}" var relType = project.properties["releaseType"] ?: "${release_type}"
-ext { -ext {
- isPort = (relType == 'experimental') - isPort = false //(relType == 'experimental')
-} -}
- -
orion.setup { orion.setup {
multiProject = true multiProject = true
enableMirrorMaven = true enableMirrorMaven = true
enableReleasesMaven = true enableReleasesMaven = true
- //enableSnapshotsMaven = isPort - enableSnapshotsMaven = isPort
dopplerToken = System.getenv("DOPPLER_KEY") dopplerToken = System.getenv("DOPPLER_KEY")

13
patches/1.21.2/gradle.properties.patch
View File

@@ -1,21 +1,28 @@
--- a/gradle.properties --- a/gradle.properties
+++ b/gradle.properties +++ b/gradle.properties
@@ -10,12 +10,12 @@ @@ -10,18 +10,18 @@
mod_name=CraterLib mod_name=CraterLib
# Shared # Shared
-minecraft_version=25w10a -minecraft_version=1.21.5
+minecraft_version=1.21.3 +minecraft_version=1.21.3
project_group=com.hypherionmc.craterlib project_group=com.hypherionmc.craterlib
# Fabric # Fabric
-fabric_loader=0.16.10 -fabric_loader=0.16.10
-fabric_api=0.118.4+1.21.5 -fabric_api=0.119.5+1.21.5
+fabric_loader=0.16.7 +fabric_loader=0.16.7
+fabric_api=0.107.3+1.21.3 +fabric_api=0.107.3+1.21.3
# Forge # Forge
forge_version=50.0.6 forge_version=50.0.6
# NeoForged
-neoforge_version=0-beta
+neoforge_version=16-beta
# Dependencies
moon_config=1.0.12
@@ -39,13 +39,13 @@ @@ -39,13 +39,13 @@
vanishmod_neo=puxrKAMr vanishmod_neo=puxrKAMr
ftb_essentials=2101.1.0 ftb_essentials=2101.1.0

6
patches/1.21.2/settings.gradle.patch
View File

@@ -1,11 +1,9 @@
--- a/settings.gradle --- a/settings.gradle
+++ b/settings.gradle +++ b/settings.gradle
@@ -14,6 +14,5 @@ @@ -15,5 +15,4 @@
}
rootProject.name = 'CraterLib' rootProject.name = 'CraterLib'
-include("Common", "Fabric"/*, "NeoForge"*/) include("Common", "Fabric", "NeoForge")
-//include 'Paper' -//include 'Paper'
- -
+include("Common", "Fabric", "NeoForge")
+include 'Paper' +include 'Paper'

2
patches/1.21/.jenkins/Jenkinsfile.snapshot.patch
View File

@@ -7,7 +7,7 @@
-def majorMc = "1.21.5"; -def majorMc = "1.21.5";
+def majorMc = "1.21"; +def majorMc = "1.21";
def modLoaders = "neoforge|fabric|quilt|paper"; def modLoaders = "neoforge|fabric|quilt|paper";
-def supportedMc = "25w10a"; -def supportedMc = "1.21.5-rc1";
-def reltype = "experimental"; -def reltype = "experimental";
+def supportedMc = "1.21|1.21.1"; +def supportedMc = "1.21|1.21.1";
+def reltype = "snapshot"; +def reltype = "snapshot";

6
patches/1.21/NeoForge/build.gradle.patch
View File

@@ -4,11 +4,11 @@
unimined.minecraft { unimined.minecraft {
neoForged { neoForged {
- /*if (isPort) { - if (isPort) {
- loader "net.neoforged:neoforge:${neoforge_version}:universal" - loader "net.neoforged:neoforge:${neoforge_version}:universal"
- } else {*/ - } else {
- loader neoforge_version - loader neoforge_version
- //} - }
- -
+ loader neoforge_version + loader neoforge_version
mixinConfig("${mod_id}.mixins.json", "${mod_id}.neoforge.mixins.json") mixinConfig("${mod_id}.mixins.json", "${mod_id}.neoforge.mixins.json")

11
patches/1.21/NeoForge/src/main/java/com/hypherionmc/craterlib/client/NeoForgeClientHelper.java.patch Normal file
View File

@@ -0,0 +1,11 @@
--- a/NeoForge/src/main/java/com/hypherionmc/craterlib/client/NeoForgeClientHelper.java
+++ b/NeoForge/src/main/java/com/hypherionmc/craterlib/client/NeoForgeClientHelper.java
@@ -2,6 +2,8 @@
import com.hypherionmc.craterlib.api.events.client.LateInitEvent;
import com.hypherionmc.craterlib.client.gui.config.ClothConfigScreenBuilder;
+import com.hypherionmc.craterlib.client.gui.config.CraterConfigScreen;
+import com.hypherionmc.craterlib.core.config.AbstractConfig;
import com.hypherionmc.craterlib.core.config.ConfigController;
import com.hypherionmc.craterlib.core.config.annotations.ClothScreen;
import com.hypherionmc.craterlib.core.config.annotations.NoConfigScreen;

11
patches/1.21/NeoForge/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java.patch Normal file
View File

@@ -0,0 +1,11 @@
--- a/NeoForge/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java
+++ b/NeoForge/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java
@@ -22,7 +22,7 @@
public ServerPlayer player;
@Inject(
- method = "lambda$handleChat$6",
+ method = "lambda$handleChat$5",
at = @At("HEAD"),
cancellable = true
)

4
patches/1.21/build.gradle.patch
View File

@@ -7,14 +7,14 @@
-var relType = project.properties["releaseType"] ?: "${release_type}" -var relType = project.properties["releaseType"] ?: "${release_type}"
- -
-ext { -ext {
- isPort = (relType == 'experimental') - isPort = false //(relType == 'experimental')
-} -}
- -
orion.setup { orion.setup {
multiProject = true multiProject = true
enableMirrorMaven = true enableMirrorMaven = true
enableReleasesMaven = true enableReleasesMaven = true
- //enableSnapshotsMaven = isPort - enableSnapshotsMaven = isPort
dopplerToken = System.getenv("DOPPLER_KEY") dopplerToken = System.getenv("DOPPLER_KEY")

6
patches/1.21/gradle.properties.patch
View File

@@ -4,13 +4,13 @@
mod_name=CraterLib mod_name=CraterLib
# Shared # Shared
-minecraft_version=25w10a -minecraft_version=1.21.5
+minecraft_version=1.21 +minecraft_version=1.21
project_group=com.hypherionmc.craterlib project_group=com.hypherionmc.craterlib
# Fabric # Fabric
-fabric_loader=0.16.10 -fabric_loader=0.16.10
-fabric_api=0.118.4+1.21.5 -fabric_api=0.119.5+1.21.5
+fabric_loader=0.15.11 +fabric_loader=0.15.11
+fabric_api=0.100.1+1.21 +fabric_api=0.100.1+1.21
@@ -18,7 +18,7 @@
forge_version=50.0.6 forge_version=50.0.6
# NeoForged # NeoForged
-neoforge_version=16-beta -neoforge_version=0-beta
+neoforge_version=167 +neoforge_version=167
# Dependencies # Dependencies

6
patches/1.21/settings.gradle.patch
View File

@@ -1,11 +1,9 @@
--- a/settings.gradle --- a/settings.gradle
+++ b/settings.gradle +++ b/settings.gradle
@@ -14,6 +14,5 @@ @@ -15,5 +15,4 @@
}
rootProject.name = 'CraterLib' rootProject.name = 'CraterLib'
-include("Common", "Fabric"/*, "NeoForge"*/) include("Common", "Fabric", "NeoForge")
-//include 'Paper' -//include 'Paper'
- -
+include("Common", "Fabric", "NeoForge")
+include 'Paper' +include 'Paper'