[DEV] Rebuild Porting Patches

This commit is contained in:
2025-03-25 19:49:02 +02:00
parent 9da963f3c8
commit 327a60c806
56 changed files with 137 additions and 113 deletions

View File

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

View File

@@ -4,11 +4,11 @@
unimined.minecraft {
neoForged {
- /*if (isPort) {
- if (isPort) {
- 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")

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;

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
)

View File

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

View File

@@ -4,13 +4,13 @@
mod_name=CraterLib
# Shared
-minecraft_version=25w10a
-minecraft_version=1.21.5
+minecraft_version=1.21
project_group=com.hypherionmc.craterlib
# Fabric
-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_api=0.100.1+1.21
@@ -18,7 +18,7 @@
forge_version=50.0.6
# NeoForged
-neoforge_version=16-beta
-neoforge_version=0-beta
+neoforge_version=167
# Dependencies

View File

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