Make witches spawned in swamp huts persistent like in newer versions

Related: #115
embeddedt · Feb 24, 2024 · 18fec61 · 18fec61
1 parent f61aafd
commit 18fec61
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 0 deletions.
diff --git a/src/main/java/org/embeddedt/archaicfix/asm/Mixin.java b/src/main/java/org/embeddedt/archaicfix/asm/Mixin.java
@@ -52,6 +52,7 @@ public enum Mixin {
     common_core_MixinEmbeddedChannel(Side.COMMON, Phase.EARLY, m -> ArchaicConfig.fixLoginRaceCondition, "core.MixinEmbeddedChannel"),
     common_core_MixinNetHandlerPlayServer(Side.COMMON, Phase.EARLY, always(), "core.MixinNetHandlerPlayServer"),
     common_core_MixinObjectIntIdentityMap(Side.COMMON, Phase.EARLY, m -> ArchaicConfig.optimizeObjectIntIdentityMap, "core.MixinObjectIntIdentityMap"),
+    common_core_MixinSwampHut(Side.COMMON, Phase.EARLY, m -> ArchaicConfig.fixEntityStructurePersistence, "core.MixinSwampHut"),
     common_gt6_MixinAdvancedCraftingXToY(Side.COMMON, Phase.LATE, require(TargetedMod.GREGTECH6), "gt6.MixinAdvancedCraftingXToY"),
     common_gt6_MixinGT6_Main(Side.COMMON, Phase.LATE, require(TargetedMod.GREGTECH6), "gt6.MixinGT6_Main"),
     common_gt6_MixinCR(Side.COMMON, Phase.LATE, require(TargetedMod.GREGTECH6), "gt6.MixinCR"),

diff --git a/src/main/java/org/embeddedt/archaicfix/config/ArchaicConfig.java b/src/main/java/org/embeddedt/archaicfix/config/ArchaicConfig.java
@@ -168,4 +168,8 @@ public class ArchaicConfig {
     @Config.Comment("Allow entities to be hit through grass, instead of breaking the grass plant")
     @Config.DefaultBoolean(true)
     public static boolean enableHitThroughGrassFix;
+
+    @Config.Comment("Fix vanilla issues with entities spawned as part of structures not being marked persistent (e.g. MC-108664)")
+    @Config.DefaultBoolean(true)
+    public static boolean fixEntityStructurePersistence;
 }
diff --git a/src/main/java/org/embeddedt/archaicfix/mixins/common/core/MixinSwampHut.java b/src/main/java/org/embeddedt/archaicfix/mixins/common/core/MixinSwampHut.java
@@ -0,0 +1,17 @@
+package org.embeddedt.archaicfix.mixins.common.core;
+
+import net.minecraft.entity.IEntityLivingData;
+import net.minecraft.entity.monster.EntityWitch;
+import net.minecraft.world.gen.structure.ComponentScatteredFeaturePieces;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Redirect;
+
+@Mixin(ComponentScatteredFeaturePieces.SwampHut.class)
+public class MixinSwampHut {
+    @Redirect(method = "addComponentParts", at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/monster/EntityWitch;onSpawnWithEgg(Lnet/minecraft/entity/IEntityLivingData;)Lnet/minecraft/entity/IEntityLivingData;"))
+    private IEntityLivingData summonWitchWithPersistence(EntityWitch instance, IEntityLivingData iEntityLivingData) {
+        instance.func_110163_bv();
+        return instance.onSpawnWithEgg(iEntityLivingData);
+    }
+}