Merge branch 'master' into stats

GTNewHorizons · Sep 1, 2024 · 12382b2 · 12382b2
2 parents b34b751 + bbec8c1
commit 12382b2
Show file tree

Hide file tree

Showing 6 changed files with 42 additions and 1 deletion.
diff --git a/dependencies.gradle b/dependencies.gradle
@@ -35,6 +35,7 @@ dependencies {
     transformedModCompileOnly("curse.maven:extra-utilities-225561:2264384")
     transformedModCompileOnly(rfg.deobf("curse.maven:extratic-72728:2299292"))
     transformedModCompileOnly(rfg.deobf("curse.maven:journeymap-32274:4500658"))
+    transformedModCompileOnly(rfg.deobf("curse.maven:morpheus-69118:2280761"))
     transformedModCompileOnly(deobf('https://dist.creeper.host/ichun/filespg/PortalGun-4.0.0-beta-6.jar'))
     transformedModCompileOnly("curse.maven:travellers-gear-224440:2262113")
     transformedModCompileOnly(rfg.deobf("curse.maven:witchery-69673:2234410"))

diff --git a/src/main/java/com/mitchej123/hodgepodge/config/FixesConfig.java b/src/main/java/com/mitchej123/hodgepodge/config/FixesConfig.java
@@ -567,6 +567,13 @@ public class FixesConfig {
     @Config.RequiresMcRestart
     public static boolean java12MineChemCompat;
 
+    // Morpheus
+
+    @Config.Comment("Fix not properly waking players if not everyone is sleeping")
+    @Config.DefaultBoolean(true)
+    @Config.RequiresMcRestart
+    public static boolean fixMorpheusWaking;
+
     // Optifine
 
     @Config.Comment("Forces the chunk loading option from optifine to default since other values can crash the game")

diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/Mixins.java b/src/main/java/com/mitchej123/hodgepodge/mixins/Mixins.java
@@ -856,7 +856,12 @@ public enum Mixins {
     // Candycraft
     FIX_SUGARBLOCK_NPE(new Builder("Fix NPE when interacting with sugar block")
             .addMixinClasses("candycraft.MixinBlockSugar").setPhase(Phase.LATE).setSide(Side.BOTH)
-            .setApplyIf(() -> FixesConfig.fixCandycraftBlockSugarNPE).addTargetedMod(TargetedMod.CANDYCRAFT));
+            .setApplyIf(() -> FixesConfig.fixCandycraftBlockSugarNPE).addTargetedMod(TargetedMod.CANDYCRAFT)),
+
+    // Morpheus
+    FIX_NOT_WAKING_PLAYERS(new Builder("Fix players not being woken properly when not everyone is sleeping")
+            .addMixinClasses("morpheus.MixinMorpheusWakePlayers").setPhase(Phase.LATE).setSide(Side.SERVER)
+            .setApplyIf(() -> FixesConfig.fixMorpheusWaking).addTargetedMod(TargetedMod.MORPHEUS));
 
     private final List<String> mixinClasses;
     private final List<TargetedMod> targetedMods;

diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/TargetedMod.java b/src/main/java/com/mitchej123/hodgepodge/mixins/TargetedMod.java
@@ -36,6 +36,7 @@ public enum TargetedMod {
     LWJGL3IFY("lwjgl3ify", "me.eigenraven.lwjgl3ify.core.Lwjgl3ifyCoremod", "lwjgl3ify"),
     MINECHEM("Minechem", null, "minechem"),
     MINEFACTORY_RELOADED("MineFactory Reloaded", null, "MineFactoryReloaded"),
+    MORPHEUS("Morpheus", null, "Morpheus"),
     MRTJPCORE("MrTJPCore", null, "MrTJPCoreMod"),
     NOTENOUGHITEMS("NotEnoughItems", "codechicken.nei.asm.NEICorePlugin", "NotEnoughItems"),
     OPTIFINE("Optifine", "optifine.OptiFineForgeTweaker", "Optifine"),

diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/late/morpheus/MixinMorpheusWakePlayers.java b/src/main/java/com/mitchej123/hodgepodge/mixins/late/morpheus/MixinMorpheusWakePlayers.java
@@ -0,0 +1,26 @@
+package com.mitchej123.hodgepodge.mixins.late.morpheus;
+
+import net.minecraft.world.World;
+import net.minecraft.world.WorldServer;
+import net.quetzi.morpheus.SleepChecker;
+
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+@Mixin(value = SleepChecker.class, remap = false)
+public class MixinMorpheusWakePlayers {
+
+    @Inject(
+            method = "advanceToMorning",
+            at = @At(
+                    value = "INVOKE",
+                    target = "Lnet/minecraft/world/WorldProvider;resetRainAndThunder()V",
+                    shift = At.Shift.BEFORE,
+                    remap = true))
+    private void hodgepodge$fixWakePlayers(World world, CallbackInfo c) {
+        if (!(world instanceof WorldServer worldServer)) return;
+        worldServer.wakeAllPlayers();
+    }
+}
diff --git a/src/main/resources/META-INF/hodgepodge_at.cfg b/src/main/resources/META-INF/hodgepodge_at.cfg
@@ -20,3 +20,4 @@ public net.minecraft.client.resources.FallbackResourceManager field_110540_a # r
 public net.minecraft.client.resources.FileResourcePack field_110600_d # resourcePackZipFile
 public net.minecraft.client.resources.SimpleReloadableResourceManager field_110548_a # domainResourceManagers
 public net.minecraft.entity.EntityList field_75624_e # classToIDMapping
+public net.minecraft.world.WorldServer func_73053_d()V # wakeAllPlayers()