Merge branch 'ver/1.20.1' into ver/1.20.2

RelativityMC · Sep 14, 2023 · d42a0b1 · d42a0b1
2 parents b836a80 + 87428f1
commit d42a0b1
Show file tree

Hide file tree

Showing 7 changed files with 50 additions and 11 deletions.
diff --git a/c2me-base/src/main/java/com/ishland/c2me/base/ModuleEntryPoint.java b/c2me-base/src/main/java/com/ishland/c2me/base/ModuleEntryPoint.java
@@ -39,6 +39,18 @@ public class ModuleEntryPoint {
                     """.indent(1))
             .getString(DEFAULT_EXPRESSION, DEFAULT_EXPRESSION);
 
+    public static final boolean disableLoggingShutdownHook = new ConfigSystem.ConfigAccessor()
+            .key("fixes.disableLoggingShutdownHook")
+            .comment("""
+                    
+                    Whether to disable the shutdown hook of log4j2 on dedicated servers.
+                    Enabling this also makes the JVM exit when the dedicated server is considered fully shut down.
+                    This option have no effect on client-side.
+                    We has historically been doing this, and this config option allows you to disable this behavior.
+                    """.indent(1))
+            .incompatibleMod("textile_backup", "*")
+            .getBoolean(true, false);
+
     public static final int defaultParallelism;
 
     private static int tryEvaluateExpression(String expression) {

diff --git a/c2me-base/src/main/java/com/ishland/c2me/base/TheMixinPlugin.java b/c2me-base/src/main/java/com/ishland/c2me/base/TheMixinPlugin.java
@@ -0,0 +1,21 @@
+package com.ishland.c2me.base;
+
+import com.ishland.c2me.base.common.ModuleMixinPlugin;
+
+/**
+ * Used internally for c2me-base, do not subclass.
+ */
+public final class TheMixinPlugin extends ModuleMixinPlugin {
+
+    @Override
+    public boolean shouldApplyMixin(String targetClassName, String mixinClassName) {
+        if (!super.shouldApplyMixin(targetClassName, mixinClassName)) {
+            return false;
+        }
+
+        if (mixinClassName.startsWith("com.ishland.c2me.base.mixin.util.log4j2shutdownhookisnomore."))
+            return ModuleEntryPoint.disableLoggingShutdownHook;
+
+        return true;
+    }
+}
diff --git a/c2me-base/src/main/java/com/ishland/c2me/base/common/config/ConfigSystem.java b/c2me-base/src/main/java/com/ishland/c2me/base/common/config/ConfigSystem.java
@@ -259,8 +259,12 @@ private String getSystemPropertyOverride() {
 
         private void disableConfigWithReason(String reason) {
             incompatibilityReason.append("\n ").append(reason);
-            LOGGER.info("Disabling config {}: {}", this.key, reason);
-            this.incompatibilityDetected = true;
+            if (!Boolean.getBoolean("com.ishland.c2me.base.config.ignoreIncompatibility")) {
+                LOGGER.info("Disabling config {}: {}", this.key, reason);
+                this.incompatibilityDetected = true;
+            } else {
+                LOGGER.info("Compatibility issues ignored by system property: {}: {}", this.key, reason);
+            }
         }
 
         private void generateDefaultEntry(Object def, Object incompatibleDef) {

diff --git a/c2me-base/src/main/resources/c2me-base.mixins.json b/c2me-base/src/main/resources/c2me-base.mixins.json
@@ -2,7 +2,7 @@
   "parent": "c2me.mixins.json",
   "required": true,
   "package": "com.ishland.c2me.base.mixin",
-  "plugin": "com.ishland.c2me.base.common.ModuleMixinPlugin",
+  "plugin": "com.ishland.c2me.base.TheMixinPlugin",
   "mixins": [
     "access.IAquiferSamplerFluidLevel",
     "access.IAtomicSimpleRandomDeriver",

diff --git a/c2me-notickvd/src/main/java/com/ishland/c2me/notickvd/mixin/MixinServerChunkManager.java b/c2me-notickvd/src/main/java/com/ishland/c2me/notickvd/mixin/MixinServerChunkManager.java
@@ -2,6 +2,8 @@
 
 import com.ishland.c2me.base.common.util.FilteringIterable;
 import com.ishland.c2me.notickvd.common.IChunkTicketManager;
+import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
+import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
 import it.unimi.dsi.fastutil.longs.LongSet;
 import net.minecraft.entity.Entity;
 import net.minecraft.server.world.ChunkTicketManager;
@@ -11,7 +13,6 @@
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Redirect;
 
 @Mixin(ServerChunkManager.class)
 public class MixinServerChunkManager {
@@ -25,11 +26,11 @@ public class MixinServerChunkManager {
 //    }
 
 
-    @Redirect(method = "tickChunks", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/world/ServerWorld;iterateEntities()Ljava/lang/Iterable;"))
-    private Iterable<Entity> redirectIterateEntities(ServerWorld serverWorld) {
+    @WrapOperation(method = "tickChunks", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/world/ServerWorld;iterateEntities()Ljava/lang/Iterable;"))
+    private Iterable<Entity> redirectIterateEntities(ServerWorld serverWorld, Operation<Iterable<Entity>> op) {
         final LongSet noTickOnlyChunks = ((IChunkTicketManager) this.ticketManager).getNoTickOnlyChunks();
-        if (noTickOnlyChunks == null) return serverWorld.iterateEntities();
-        return new FilteringIterable<>(serverWorld.iterateEntities(), entity -> !noTickOnlyChunks.contains(entity.getChunkPos().toLong()));
+        if (noTickOnlyChunks == null) return op.call(serverWorld);
+        return new FilteringIterable<>(op.call(serverWorld), entity -> !noTickOnlyChunks.contains(entity.getChunkPos().toLong()));
     }
 
 }
diff --git a/...serializer/src/main/java/com/ishland/c2me/rewrites/chunk_serializer/ModuleEntryPoint.java b/...serializer/src/main/java/com/ishland/c2me/rewrites/chunk_serializer/ModuleEntryPoint.java
@@ -16,6 +16,7 @@ public final class ModuleEntryPoint {
                     Whether to use the fast reduced allocation chunk serializer
                     (may cause incompatibility with other mods)
                     """)
+            .incompatibleMod("architectury", "*")
             .getBoolean(false, false);
 
 }
diff --git a/...rc/main/java/com/ishland/c2me/rewrites/chunk_serializer/common/utils/ReflectionUtils.java b/...rc/main/java/com/ishland/c2me/rewrites/chunk_serializer/common/utils/ReflectionUtils.java
@@ -46,8 +46,8 @@ private static void setAccessibleObjectToPublic(AccessibleObject obj) {
     private static Field getReflectedField(ClassField clssfild) {
         try {
             return clssfild.clss.getField(clssfild.fild());
-        } catch (NoSuchFieldException e) {
-            e.printStackTrace();
+        } catch (NoSuchFieldException ignored) {
+
         }
         return null;
     }
@@ -80,4 +80,4 @@ private static Class getNestedClass(Class upperClass, String nestedClassName) {
     }
 
     private record ClassField(Class clss, String fild) {};
-}
+}