From 9d5d87fe81c85fa549fb9b13f3d26a63c22c4081 Mon Sep 17 00:00:00 2001 From: Vitaly Date: Wed, 28 Dec 2022 13:04:19 +0200 Subject: [PATCH 1/8] Extend PotionIDs Byte -> Short --- .../common/vanilla/potion/PotionMixin.java | 29 +++++++++++++++++++ .../endlessids/mixin/plugin/Mixin.java | 3 ++ 2 files changed, 32 insertions(+) create mode 100644 src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/potion/PotionMixin.java diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/potion/PotionMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/potion/PotionMixin.java new file mode 100644 index 0000000..19eeef5 --- /dev/null +++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/potion/PotionMixin.java @@ -0,0 +1,29 @@ +package com.falsepattern.endlessids.mixin.mixins.common.vanilla.potion; + +import org.spongepowered.asm.mixin.Final; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Mutable; +import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + + +import net.minecraft.potion.Potion; + +@Mixin(Potion.class) +public class PotionMixin { + + @Shadow + @Final + @Mutable + public static Potion[] potionTypes; + + + @Inject(method = "", + at = @At(value = "RETURN"), + require = 1) + private static void clinit(CallbackInfo ci) { + potionTypes = new Potion[32767]; + } +} diff --git a/src/main/java/com/falsepattern/endlessids/mixin/plugin/Mixin.java b/src/main/java/com/falsepattern/endlessids/mixin/plugin/Mixin.java index 88ae9dc..3c9f863 100644 --- a/src/main/java/com/falsepattern/endlessids/mixin/plugin/Mixin.java +++ b/src/main/java/com/falsepattern/endlessids/mixin/plugin/Mixin.java @@ -46,6 +46,9 @@ public enum Mixin implements IMixin { GenLayerRiverMixMixin(Side.COMMON, avoid(TargetedMod.DRAGONAPI), "vanilla.worldgen.GenLayerRiverMixMixin"), GenLayerVoronoiZoomMixin(Side.COMMON, always(), "vanilla.worldgen.GenLayerVoronoiZoomMixin"), //endregion Minecraft->common->worldgen + //region Minecraft->common->potion + PotionMixin (Side.COMMON, always(), "vanilla.potion.PotionMixin"), + //endregion Minecraft->common->potion //endregion Minecraft->common //region Minecraft->client ChunkMixinClient(Side.CLIENT, always(), "vanilla.ChunkMixin"), From d825ea3c97465cd1d39bc055add8732031c462e7 Mon Sep 17 00:00:00 2001 From: Vitaly Date: Wed, 28 Dec 2022 13:07:29 +0200 Subject: [PATCH 2/8] Fix automatic padding to comply with codestyle --- .../java/com/falsepattern/endlessids/mixin/plugin/Mixin.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/falsepattern/endlessids/mixin/plugin/Mixin.java b/src/main/java/com/falsepattern/endlessids/mixin/plugin/Mixin.java index 3c9f863..7177340 100644 --- a/src/main/java/com/falsepattern/endlessids/mixin/plugin/Mixin.java +++ b/src/main/java/com/falsepattern/endlessids/mixin/plugin/Mixin.java @@ -47,7 +47,7 @@ public enum Mixin implements IMixin { GenLayerVoronoiZoomMixin(Side.COMMON, always(), "vanilla.worldgen.GenLayerVoronoiZoomMixin"), //endregion Minecraft->common->worldgen //region Minecraft->common->potion - PotionMixin (Side.COMMON, always(), "vanilla.potion.PotionMixin"), + PotionMixin(Side.COMMON, always(), "vanilla.potion.PotionMixin"), //endregion Minecraft->common->potion //endregion Minecraft->common //region Minecraft->client From ccb2c62a89884ba73fae179f9fd7c01555253f93 Mon Sep 17 00:00:00 2001 From: FalsePattern <30945458+FalsePattern@users.noreply.github.com> Date: Wed, 28 Dec 2022 12:35:20 +0100 Subject: [PATCH 3/8] fix vanilla potions being deleted --- .../mixin/mixins/common/vanilla/potion/PotionMixin.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/potion/PotionMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/potion/PotionMixin.java index 19eeef5..1e0ed88 100644 --- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/potion/PotionMixin.java +++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/potion/PotionMixin.java @@ -11,8 +11,10 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import net.minecraft.potion.Potion; +import java.util.Arrays; + @Mixin(Potion.class) -public class PotionMixin { +public abstract class PotionMixin { @Shadow @Final @@ -24,6 +26,6 @@ public class PotionMixin { at = @At(value = "RETURN"), require = 1) private static void clinit(CallbackInfo ci) { - potionTypes = new Potion[32767]; + potionTypes = Arrays.copyOf(potionTypes, 32767); } } From 7e972870049cdecf20c1f6ee4717b680c6e383c9 Mon Sep 17 00:00:00 2001 From: FalsePattern <30945458+FalsePattern@users.noreply.github.com> Date: Wed, 28 Dec 2022 12:36:04 +0100 Subject: [PATCH 4/8] 0-32767 --- .../mixin/mixins/common/vanilla/potion/PotionMixin.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/potion/PotionMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/potion/PotionMixin.java index 1e0ed88..e4e4c68 100644 --- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/potion/PotionMixin.java +++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/potion/PotionMixin.java @@ -26,6 +26,6 @@ public abstract class PotionMixin { at = @At(value = "RETURN"), require = 1) private static void clinit(CallbackInfo ci) { - potionTypes = Arrays.copyOf(potionTypes, 32767); + potionTypes = Arrays.copyOf(potionTypes, 32768); } } From 495c70223c61730b946219fab248a27892c23b15 Mon Sep 17 00:00:00 2001 From: FalsePattern <30945458+FalsePattern@users.noreply.github.com> Date: Wed, 28 Dec 2022 14:24:09 +0100 Subject: [PATCH 5/8] the rest of the potion ID fixes --- .../constants/ExtendedConstants.java | 2 + .../helpers/IS1DPacketEntityEffectMixin.java | 5 ++ .../mixin/helpers/PotionIDHelper.java | 5 ++ .../vanilla/NetHandlerPlayClientMixin.java | 26 +++++++- .../vanilla/potion/PotionEffectMixin.java | 63 +++++++++++++++++++ .../common/vanilla/potion/PotionMixin.java | 3 +- .../network/S1DPacketEntityEffectMixin.java | 49 +++++++++++++++ .../S1EPacketRemoveEntityEffectMixin.java | 47 ++++++++++++++ .../endlessids/mixin/plugin/Mixin.java | 3 + .../endlessids/mixin/plugin/TargetedMod.java | 3 +- 10 files changed, 201 insertions(+), 5 deletions(-) create mode 100644 src/main/java/com/falsepattern/endlessids/mixin/helpers/IS1DPacketEntityEffectMixin.java create mode 100644 src/main/java/com/falsepattern/endlessids/mixin/helpers/PotionIDHelper.java create mode 100644 src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/potion/PotionEffectMixin.java create mode 100644 src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/potion/network/S1DPacketEntityEffectMixin.java create mode 100644 src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/potion/network/S1EPacketRemoveEntityEffectMixin.java diff --git a/src/main/java/com/falsepattern/endlessids/constants/ExtendedConstants.java b/src/main/java/com/falsepattern/endlessids/constants/ExtendedConstants.java index 840478b..bcc5c26 100644 --- a/src/main/java/com/falsepattern/endlessids/constants/ExtendedConstants.java +++ b/src/main/java/com/falsepattern/endlessids/constants/ExtendedConstants.java @@ -11,6 +11,8 @@ public class ExtendedConstants { public static final int watchableBits = 7; public static final int bitsPerBiome = 16; + public static final int maximumPotionIDs = 65536; + //BlockItemIDs public static final int nibblesPerID = bitsPerID / 4; public static final int bytesPerID = (nibblesPerID + 1) / 2; diff --git a/src/main/java/com/falsepattern/endlessids/mixin/helpers/IS1DPacketEntityEffectMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/helpers/IS1DPacketEntityEffectMixin.java new file mode 100644 index 0000000..3e0816a --- /dev/null +++ b/src/main/java/com/falsepattern/endlessids/mixin/helpers/IS1DPacketEntityEffectMixin.java @@ -0,0 +1,5 @@ +package com.falsepattern.endlessids.mixin.helpers; + +public interface IS1DPacketEntityEffectMixin { + int getIDExtended(); +} diff --git a/src/main/java/com/falsepattern/endlessids/mixin/helpers/PotionIDHelper.java b/src/main/java/com/falsepattern/endlessids/mixin/helpers/PotionIDHelper.java new file mode 100644 index 0000000..d8d6a58 --- /dev/null +++ b/src/main/java/com/falsepattern/endlessids/mixin/helpers/PotionIDHelper.java @@ -0,0 +1,5 @@ +package com.falsepattern.endlessids.mixin.helpers; + +public class PotionIDHelper { + public static final ThreadLocal theID = new ThreadLocal<>(); +} diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/client/vanilla/NetHandlerPlayClientMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/client/vanilla/NetHandlerPlayClientMixin.java index 8313711..eca9ad5 100644 --- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/client/vanilla/NetHandlerPlayClientMixin.java +++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/client/vanilla/NetHandlerPlayClientMixin.java @@ -1,13 +1,20 @@ package com.falsepattern.endlessids.mixin.mixins.client.vanilla; +import com.falsepattern.endlessids.mixin.helpers.IS1DPacketEntityEffectMixin; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Overwrite; import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.Redirect; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import net.minecraft.block.Block; import net.minecraft.client.multiplayer.WorldClient; import net.minecraft.client.network.NetHandlerPlayClient; +import net.minecraft.network.play.server.S1DPacketEntityEffect; import net.minecraft.network.play.server.S22PacketMultiBlockChange; +import net.minecraft.potion.PotionEffect; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -15,14 +22,14 @@ import java.io.ByteArrayInputStream; import java.io.DataInputStream; import java.io.IOException; +import static com.falsepattern.endlessids.mixin.helpers.PotionIDHelper.theID; + @SideOnly(Side.CLIENT) @Mixin(NetHandlerPlayClient.class) public abstract class NetHandlerPlayClientMixin { - @Shadow private WorldClient clientWorldController; - /** * @author FalsePattern * @reason Direct port from dumped code @@ -47,6 +54,21 @@ public abstract class NetHandlerPlayClientMixin { var9); } } + } + //POTIONS + @Inject(method = "handleEntityEffect", + at = @At("HEAD"), + require = 1) + private void grabID(S1DPacketEntityEffect packetIn, CallbackInfo ci) { + theID.set(((IS1DPacketEntityEffectMixin)packetIn).getIDExtended()); + } + + @Redirect(method = "handleEntityEffect", + at = @At(value = "NEW", + target = "Lnet/minecraft/potion/PotionEffect;(III)V"), + require = 1) + private PotionEffect customNewPotionEffect(int id, int duration, int amplifier) { + return new PotionEffect(theID.get(), duration, amplifier); } } diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/potion/PotionEffectMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/potion/PotionEffectMixin.java new file mode 100644 index 0000000..b0e0086 --- /dev/null +++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/potion/PotionEffectMixin.java @@ -0,0 +1,63 @@ +package com.falsepattern.endlessids.mixin.mixins.common.vanilla.potion; + +import lombok.val; +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.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; + +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.potion.Potion; +import net.minecraft.potion.PotionEffect; + +@Mixin(value = PotionEffect.class) +public abstract class PotionEffectMixin { + @Shadow public abstract int getPotionID(); + + @Shadow public abstract int getAmplifier(); + + @Shadow public abstract int getDuration(); + + @Shadow public abstract boolean getIsAmbient(); + + @Inject(method = "writeCustomPotionEffectToNBT", + at = @At(value = "HEAD"), + cancellable = true, + require = 1) + private void writeCustomPotionEffectToNBTExtended(NBTTagCompound nbt, CallbackInfoReturnable cir) { + val potionID = getPotionID(); + if (potionID > 127) { + nbt.setInteger("IdExtended", potionID); + nbt.setByte("Id", (byte)-1); + } else { + nbt.setByte("Id", (byte)potionID); + } + nbt.setByte("Amplifier", (byte)this.getAmplifier()); + nbt.setInteger("Duration", this.getDuration()); + nbt.setBoolean("Ambient", this.getIsAmbient()); + cir.setReturnValue(nbt); + } + + @Inject(method = "readCustomPotionEffectFromNBT", + at = @At(value = "HEAD"), + cancellable = true, + require = 1) + private static void readCustomPotionEffectFromNBT(NBTTagCompound nbt, CallbackInfoReturnable cir) { + int id; + if (nbt.hasKey("IdExtended")) { + id = nbt.getInteger("IdExtended"); + } else { + id = nbt.getByte("Id"); + } + + if (id >= 0 && id < Potion.potionTypes.length && Potion.potionTypes[id] != null) { + byte b1 = nbt.getByte("Amplifier"); + int i = nbt.getInteger("Duration"); + boolean flag = nbt.getBoolean("Ambient"); + cir.setReturnValue(new PotionEffect(id, i, b1, flag)); + } else { + cir.setReturnValue(null); + } + } +} diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/potion/PotionMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/potion/PotionMixin.java index e4e4c68..8bb32d4 100644 --- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/potion/PotionMixin.java +++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/potion/PotionMixin.java @@ -1,5 +1,6 @@ package com.falsepattern.endlessids.mixin.mixins.common.vanilla.potion; +import com.falsepattern.endlessids.constants.ExtendedConstants; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mutable; @@ -26,6 +27,6 @@ public abstract class PotionMixin { at = @At(value = "RETURN"), require = 1) private static void clinit(CallbackInfo ci) { - potionTypes = Arrays.copyOf(potionTypes, 32768); + potionTypes = Arrays.copyOf(potionTypes, ExtendedConstants.maximumPotionIDs); } } diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/potion/network/S1DPacketEntityEffectMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/potion/network/S1DPacketEntityEffectMixin.java new file mode 100644 index 0000000..3886ef4 --- /dev/null +++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/potion/network/S1DPacketEntityEffectMixin.java @@ -0,0 +1,49 @@ +package com.falsepattern.endlessids.mixin.mixins.common.vanilla.potion.network; + +import com.falsepattern.endlessids.mixin.helpers.IS1DPacketEntityEffectMixin; +import com.llamalad7.mixinextras.injector.wrapoperation.Operation; +import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation; +import io.netty.buffer.ByteBuf; +import lombok.Getter; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Redirect; + +import net.minecraft.network.PacketBuffer; +import net.minecraft.network.play.server.S1DPacketEntityEffect; +import net.minecraft.potion.PotionEffect; + +@Mixin(value = S1DPacketEntityEffect.class) +public abstract class S1DPacketEntityEffectMixin implements IS1DPacketEntityEffectMixin { + @Getter + private int idExtended; + + @WrapOperation(method = "(ILnet/minecraft/potion/PotionEffect;)V", + at = @At(value = "INVOKE", + target = "Lnet/minecraft/potion/PotionEffect;getPotionID()I"), + require = 1) + private int getPotionID(PotionEffect effect, Operation original) { + idExtended = original.call(effect); + return -1; + } + + @Redirect(method = "readPacketData", + at = @At(value = "INVOKE", + target = "Lnet/minecraft/network/PacketBuffer;readByte()B", + ordinal = 0), + require = 1) + private byte networkReadPacketData(PacketBuffer instance) { + idExtended = instance.readInt(); + return -1; + } + + @Redirect(method = "writePacketData", + at = @At(value = "INVOKE", + target = "Lnet/minecraft/network/PacketBuffer;writeByte(I)Lio/netty/buffer/ByteBuf;", + ordinal = 0), + require = 1) + private ByteBuf networkWritePacketData(PacketBuffer instance, int p_writeByte_1_) { + instance.writeInt(idExtended); + return null; + } +} diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/potion/network/S1EPacketRemoveEntityEffectMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/potion/network/S1EPacketRemoveEntityEffectMixin.java new file mode 100644 index 0000000..af75f52 --- /dev/null +++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/potion/network/S1EPacketRemoveEntityEffectMixin.java @@ -0,0 +1,47 @@ +package com.falsepattern.endlessids.mixin.mixins.common.vanilla.potion.network; + +import io.netty.buffer.ByteBuf; +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.Inject; +import org.spongepowered.asm.mixin.injection.Redirect; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +import net.minecraft.network.PacketBuffer; +import net.minecraft.network.play.server.S1EPacketRemoveEntityEffect; + +@Mixin(S1EPacketRemoveEntityEffect.class) +public abstract class S1EPacketRemoveEntityEffectMixin { + @Shadow private int field_149078_b; + + @Redirect(method = "readPacketData", + at = @At(value = "INVOKE", + target = "Lnet/minecraft/network/PacketBuffer;readUnsignedByte()S"), + require = 1) + private short dontReadByte(PacketBuffer instance) { + return 0; + } + + @Inject(method = "readPacketData", + at = @At("RETURN"), + require = 1) + private void readNewData(PacketBuffer buf, CallbackInfo ci) { + field_149078_b = buf.readInt(); + } + + @Redirect(method = "writePacketData", + at = @At(value = "INVOKE", + target = "Lnet/minecraft/network/PacketBuffer;writeByte(I)Lio/netty/buffer/ByteBuf;"), + require = 1) + private ByteBuf dontWriteByte(PacketBuffer instance, int p_writeByte_1_) { + return null; + } + + @Inject(method = "writePacketData", + at = @At(value = "RETURN"), + require = 1) + private void writeNewData(PacketBuffer buf, CallbackInfo ci) { + buf.writeInt(field_149078_b); + } +} diff --git a/src/main/java/com/falsepattern/endlessids/mixin/plugin/Mixin.java b/src/main/java/com/falsepattern/endlessids/mixin/plugin/Mixin.java index 7177340..1576579 100644 --- a/src/main/java/com/falsepattern/endlessids/mixin/plugin/Mixin.java +++ b/src/main/java/com/falsepattern/endlessids/mixin/plugin/Mixin.java @@ -47,7 +47,10 @@ public enum Mixin implements IMixin { GenLayerVoronoiZoomMixin(Side.COMMON, always(), "vanilla.worldgen.GenLayerVoronoiZoomMixin"), //endregion Minecraft->common->worldgen //region Minecraft->common->potion + PotionEffectMixin(Side.COMMON, always(), "vanilla.potion.PotionEffectMixin"), PotionMixin(Side.COMMON, always(), "vanilla.potion.PotionMixin"), + S1DPacketEntityEffectMixin(Side.COMMON, always(), "vanilla.potion.network.S1DPacketEntityEffectMixin"), + S1EPacketRemoveEntityEffectMixin(Side.COMMON, always(), "vanilla.potion.network.S1EPacketRemoveEntityEffectMixin"), //endregion Minecraft->common->potion //endregion Minecraft->common //region Minecraft->client diff --git a/src/main/java/com/falsepattern/endlessids/mixin/plugin/TargetedMod.java b/src/main/java/com/falsepattern/endlessids/mixin/plugin/TargetedMod.java index 6465c08..377bf7b 100644 --- a/src/main/java/com/falsepattern/endlessids/mixin/plugin/TargetedMod.java +++ b/src/main/java/com/falsepattern/endlessids/mixin/plugin/TargetedMod.java @@ -11,7 +11,6 @@ import static com.falsepattern.lib.mixin.ITargetedMod.PredicateHelpers.startsWit @RequiredArgsConstructor public enum TargetedMod implements ITargetedMod { - ABYSSALCRAFT("AbyssalCraft", false, startsWith("abyssalcraft-")), AROCKETRY("Advanced Rocketry", false, startsWith("advancedrocketry-")), ATG("Alternate Terrain Generation", false, startsWith("atg")), @@ -20,7 +19,7 @@ public enum TargetedMod implements ITargetedMod { BOP("Biomes O' Plenty", false, startsWith("biomesoplenty-")), BIOMETWEAKER("Biome Tweaker", false, startsWith("biometweaker-")), BIOMEWAND("Biome Wand", false, startsWith("1.7.10-biome-wand-").or(startsWith("biome-wand"))), - BUILDCRAFT("BuildCraft", false, startsWith("buildcraft-").and(contains("-compat").negate())), + BUILDCRAFT("BuildCraft", false, startsWith("buildcraft-").and(contains("compat").negate())), COFHLIB("CoFH Lib", false, startsWith("cofhlib-")), COMPACTMACHINES("Compact Machines", false, startsWith("compactmachines-")), DARKWORLD("Dark World", false, startsWith("darkworld-")), From 012fa8188cc412b545f41f31943a970a183ef248 Mon Sep 17 00:00:00 2001 From: FalsePattern <30945458+FalsePattern@users.noreply.github.com> Date: Wed, 28 Dec 2022 19:12:47 +0100 Subject: [PATCH 6/8] alias fix --- .../mixin/mixins/common/vanilla/potion/PotionMixin.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/potion/PotionMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/potion/PotionMixin.java index 8bb32d4..c22b8d9 100644 --- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/potion/PotionMixin.java +++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/potion/PotionMixin.java @@ -17,7 +17,7 @@ import java.util.Arrays; @Mixin(Potion.class) public abstract class PotionMixin { - @Shadow + @Shadow(aliases = "field_76425_a") @Final @Mutable public static Potion[] potionTypes; From 5c81a620e233442ce738cee9c19742bc8ec8d3bf Mon Sep 17 00:00:00 2001 From: FalsePattern <30945458+FalsePattern@users.noreply.github.com> Date: Wed, 28 Dec 2022 19:49:13 +0100 Subject: [PATCH 7/8] crash fix --- .../vanilla/NetHandlerPlayClientMixin.java | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/client/vanilla/NetHandlerPlayClientMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/client/vanilla/NetHandlerPlayClientMixin.java index eca9ad5..31698bc 100644 --- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/client/vanilla/NetHandlerPlayClientMixin.java +++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/client/vanilla/NetHandlerPlayClientMixin.java @@ -1,17 +1,20 @@ package com.falsepattern.endlessids.mixin.mixins.client.vanilla; import com.falsepattern.endlessids.mixin.helpers.IS1DPacketEntityEffectMixin; +import com.llamalad7.mixinextras.injector.wrapoperation.Operation; +import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation; +import lombok.val; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Overwrite; import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.Redirect; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import net.minecraft.block.Block; import net.minecraft.client.multiplayer.WorldClient; import net.minecraft.client.network.NetHandlerPlayClient; +import net.minecraft.entity.EntityLivingBase; import net.minecraft.network.play.server.S1DPacketEntityEffect; import net.minecraft.network.play.server.S22PacketMultiBlockChange; import net.minecraft.potion.PotionEffect; @@ -64,11 +67,13 @@ public abstract class NetHandlerPlayClientMixin { theID.set(((IS1DPacketEntityEffectMixin)packetIn).getIDExtended()); } - @Redirect(method = "handleEntityEffect", - at = @At(value = "NEW", - target = "Lnet/minecraft/potion/PotionEffect;(III)V"), - require = 1) - private PotionEffect customNewPotionEffect(int id, int duration, int amplifier) { - return new PotionEffect(theID.get(), duration, amplifier); + @WrapOperation(method = "handleEntityEffect", + at = @At(value = "INVOKE", + target = "Lnet/minecraft/entity/EntityLivingBase;addPotionEffect(Lnet/minecraft/potion/PotionEffect;)V"), + require = 1) + private void addPotionEffect(EntityLivingBase entity, PotionEffect effect, Operation op) { + val newPotion = new PotionEffect(theID.get(), effect.getDuration(), effect.getAmplifier()); + newPotion.setPotionDurationMax(effect.getIsPotionDurationMax()); + op.call(entity, newPotion); } } From 078cc110ffce5db918b9d882eb2680119e761041 Mon Sep 17 00:00:00 2001 From: Vitaly Date: Thu, 29 Dec 2022 11:42:59 +0200 Subject: [PATCH 8/8] Remove Lombok annotation and make a getter manually. --- .../vanilla/potion/network/S1DPacketEntityEffectMixin.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/potion/network/S1DPacketEntityEffectMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/potion/network/S1DPacketEntityEffectMixin.java index 3886ef4..f751954 100644 --- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/potion/network/S1DPacketEntityEffectMixin.java +++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/potion/network/S1DPacketEntityEffectMixin.java @@ -15,7 +15,6 @@ import net.minecraft.potion.PotionEffect; @Mixin(value = S1DPacketEntityEffect.class) public abstract class S1DPacketEntityEffectMixin implements IS1DPacketEntityEffectMixin { - @Getter private int idExtended; @WrapOperation(method = "(ILnet/minecraft/potion/PotionEffect;)V", @@ -46,4 +45,9 @@ public abstract class S1DPacketEntityEffectMixin implements IS1DPacketEntityEffe instance.writeInt(idExtended); return null; } + + @Override + public int getIDExtended() { + return this.idExtended; + } }