From eeafc8db80ebf60b150f843a5c4feec594adaa0a Mon Sep 17 00:00:00 2001 From: pizzacalz0ne Date: Mon, 26 Jan 2026 02:25:55 +1100 Subject: [PATCH] fixies --- .../EntityAnnoyingForgeQuirkMixin.java | 24 +++++++++++++++++++ .../weapon_attributes/draconic_twinsword.json | 3 +++ .../weapon_attributes/dragon_talon.json | 3 +++ .../weapon_attributes/knotted_sword.json | 3 +++ .../weapon_attributes/nectar_lance.json | 3 +++ src/main/resources/spectrum.mixins.json | 3 ++- 6 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 src/main/java/de/dafuqs/spectrum/mixin/compat/connectormod/present/EntityAnnoyingForgeQuirkMixin.java create mode 100644 src/main/resources/data/spectrum/weapon_attributes/draconic_twinsword.json create mode 100644 src/main/resources/data/spectrum/weapon_attributes/dragon_talon.json create mode 100644 src/main/resources/data/spectrum/weapon_attributes/knotted_sword.json create mode 100644 src/main/resources/data/spectrum/weapon_attributes/nectar_lance.json diff --git a/src/main/java/de/dafuqs/spectrum/mixin/compat/connectormod/present/EntityAnnoyingForgeQuirkMixin.java b/src/main/java/de/dafuqs/spectrum/mixin/compat/connectormod/present/EntityAnnoyingForgeQuirkMixin.java new file mode 100644 index 0000000000..a875f58b76 --- /dev/null +++ b/src/main/java/de/dafuqs/spectrum/mixin/compat/connectormod/present/EntityAnnoyingForgeQuirkMixin.java @@ -0,0 +1,24 @@ +package de.dafuqs.spectrum.mixin.compat.connectormod.present; + +import com.llamalad7.mixinextras.sugar.*; +import net.minecraft.entity.*; +import net.minecraft.fluid.*; +import net.minecraft.registry.tag.*; +import org.objectweb.asm.*; +import org.spongepowered.asm.mixin.*; +import org.spongepowered.asm.mixin.injection.*; +import org.spongepowered.asm.mixin.injection.callback.*; + +import java.util.*; + +@Mixin(Entity.class) +public class EntityAnnoyingForgeQuirkMixin { + @Shadow + @Final + private Set> submergedFluidTag; + + @Inject(method = "updateSubmergedInWaterState", at = @At(value = "FIELD", target = "forgeFluidTypeOnEyes", opcode = Opcodes.PUTFIELD, remap = false)) + public void spectrum$actuallyUpdateSubmergedInWaterStateOnStupidForge(CallbackInfo ci, @Local FluidState fluidState) { + fluidState.streamTags().forEach(this.submergedFluidTag::add); + } +} diff --git a/src/main/resources/data/spectrum/weapon_attributes/draconic_twinsword.json b/src/main/resources/data/spectrum/weapon_attributes/draconic_twinsword.json new file mode 100644 index 0000000000..b521a4bece --- /dev/null +++ b/src/main/resources/data/spectrum/weapon_attributes/draconic_twinsword.json @@ -0,0 +1,3 @@ +{ + "parent": "bettercombat:twin_blade" +} \ No newline at end of file diff --git a/src/main/resources/data/spectrum/weapon_attributes/dragon_talon.json b/src/main/resources/data/spectrum/weapon_attributes/dragon_talon.json new file mode 100644 index 0000000000..daafc473ce --- /dev/null +++ b/src/main/resources/data/spectrum/weapon_attributes/dragon_talon.json @@ -0,0 +1,3 @@ +{ + "parent": "bettercombat:dagger" +} \ No newline at end of file diff --git a/src/main/resources/data/spectrum/weapon_attributes/knotted_sword.json b/src/main/resources/data/spectrum/weapon_attributes/knotted_sword.json new file mode 100644 index 0000000000..c8bb11ed16 --- /dev/null +++ b/src/main/resources/data/spectrum/weapon_attributes/knotted_sword.json @@ -0,0 +1,3 @@ +{ + "parent": "bettercombat:sword" +} \ No newline at end of file diff --git a/src/main/resources/data/spectrum/weapon_attributes/nectar_lance.json b/src/main/resources/data/spectrum/weapon_attributes/nectar_lance.json new file mode 100644 index 0000000000..c8bb11ed16 --- /dev/null +++ b/src/main/resources/data/spectrum/weapon_attributes/nectar_lance.json @@ -0,0 +1,3 @@ +{ + "parent": "bettercombat:sword" +} \ No newline at end of file diff --git a/src/main/resources/spectrum.mixins.json b/src/main/resources/spectrum.mixins.json index f8a6fa2146..82896268ec 100644 --- a/src/main/resources/spectrum.mixins.json +++ b/src/main/resources/spectrum.mixins.json @@ -104,8 +104,9 @@ "compat.connectormod.absent.EntityApplyFluidsMixinNoSinytra", "compat.connectormod.absent.ExplosionMixin", "compat.connectormod.absent.PlayerEntityMixin", + "compat.connectormod.present.EntityAnnoyingForgeQuirkMixin", "compat.connectormod.present.ExplosionMixin", - "compat.kubejs.absent.RecipeManagerMixin", + "compat.kubejs.absent.RecipeManagerMixin", "compat.quilt_status_effect.absent.LivingEntityPreventStatusClearMixin", "compat.quilt_status_effect.present.SpectrumEventListenersMixin" ],