@@ -5,14 +5,14 @@ Subject: [PATCH] Port to NeoForge
55
66
77diff --git a/build.gradle b/build.gradle
8- index ed1e0933..3b12a01b 100644
8+ index ed1e0933..f9119574 100644
99--- a/build.gradle
1010+++ b/build.gradle
1111@@ -1,6 +1,6 @@
1212 plugins {
1313 id 'java-library'
1414- id 'fabric-loom' version '1.11-SNAPSHOT' apply false
15- + id 'dev.architectury.loom' version '1.11 -SNAPSHOT' apply false
15+ + id 'dev.architectury.loom' version '1.13 -SNAPSHOT' apply false
1616 id "me.champeau.jmh" version "0.7.2"
1717 id 'com.modrinth.minotaur' version '2.+' apply false
1818 id 'io.github.themrmilchmann.curseforge-publish' version '0.8.0' apply false
@@ -726,14 +726,15 @@ index 00000000..76bac433
726726+ ordering = "NONE"
727727+ side = "BOTH"
728728diff --git a/c2me-base/src/main/resources/c2me-base.mixins.json b/c2me-base/src/main/resources/c2me-base.mixins.json
729- index a35a85af..df34ae58 100644
729+ index 255f5138..6f8e972b 100644
730730--- a/c2me-base/src/main/resources/c2me-base.mixins.json
731731+++ b/c2me-base/src/main/resources/c2me-base.mixins.json
732- @@ -55,17 +55,15 @@
732+ @@ -55,18 +55,16 @@
733733 "access.IXoroshiro128PlusPlusRandom",
734734 "access.IXoroshiro128PlusPlusRandomDeriver",
735735 "access.IXoroshiro128PlusPlusRandomImpl",
736736- "access.fapi.IArrayBackedEvent",
737+ "bugfixes.config_enforce_main.MixinServerConfigurationNetworkHandler",
737738 "client_movement.MixinPlayerEntity",
738739 "instrumentation.MixinServerChunkManager",
739740 "report.MixinDedicatedServerWatchdog",
@@ -1466,7 +1467,7 @@ index 6d46744f..1e4ca266 100644
14661467+ }
14671468+ }
14681469diff --git a/c2me-notickvd/src/main/java/com/ishland/c2me/notickvd/common/Config.java b/c2me-notickvd/src/main/java/com/ishland/c2me/notickvd/common/Config.java
1469- index a7373e81..8c12b0ab 100644
1470+ index 2ab00eb6..cfc7c14c 100644
14701471--- a/c2me-notickvd/src/main/java/com/ishland/c2me/notickvd/common/Config.java
14711472+++ b/c2me-notickvd/src/main/java/com/ishland/c2me/notickvd/common/Config.java
14721473@@ -3,7 +3,6 @@ package com.ishland.c2me.notickvd.common;
@@ -1487,7 +1488,7 @@ index a7373e81..8c12b0ab 100644
14871488+ """.formatted(C2MEConstants.EXT_RENDER_DISTANCE_ID))
14881489 .getBoolean(true, false);
14891490
1490- public static final boolean ensureChunkCorrectness = new ConfigSystem.ConfigAccessor()
1491+ public static final boolean smoothChunkSendingRate = new ConfigSystem.ConfigAccessor()
14911492diff --git a/c2me-notickvd/src/main/java/com/ishland/c2me/notickvd/common/NoTickVDInitializer.java b/c2me-notickvd/src/main/java/com/ishland/c2me/notickvd/common/NoTickVDInitializer.java
14921493index e8383e1e..7f3661a7 100644
14931494--- a/c2me-notickvd/src/main/java/com/ishland/c2me/notickvd/common/NoTickVDInitializer.java
@@ -4041,7 +4042,7 @@ index 5a092ec9..00000000
40414042- }
40424043- }
40434044diff --git a/gradle.properties b/gradle.properties
4044- index 81cdb600..6599f9b0 100644
4045+ index 2964d929..8697f156 100644
40454046--- a/gradle.properties
40464047+++ b/gradle.properties
40474048@@ -8,20 +8,24 @@ gradle-curseforge-publish.interop.forge-gradle=false
@@ -4056,10 +4057,10 @@ index 81cdb600..6599f9b0 100644
40564057 # check these on https://fabricmc.net/versions.html
40574058 minecraft_version=1.21.10
40584059 yarn_mappings=1.21.10+build.1
4059- - loader_version=0.17.2
4060+ - loader_version=0.17.3
40604061- fabric_version=0.134.0+1.21.9
40614062+ # neoforge version, latest version can be found on https://projects.neoforged.net/neoforged/neoforge
4062- + forge_version=21.10.1-beta
4063+ + forge_version=21.10.64
40634064+ # https://github.com/architectury/architectury-loom/issues/230
40644065+ yarn_mappings_patch_neoforge_version=1.21+build.4
40654066 # Mod Properties
0 commit comments