upstream/EndlessIDs
2
0 Fork 0
mirror of https://github.com/GTMEGA/EndlessIDs.git synced 2026-11-13 19:34:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Remove broken potion ID recovery logic

Browse Source 
It was causing issues with Salis Arcana, SuperTic, etc. I am not fixing your bugs. Garbage in, garbage out, figure it out, i don't care anymore.
This commit is contained in:
FalsePattern committed 2025-11-03 04:27:15 +01:00
1 parent a47a187d65
commit 1c035f6110
1 file changed
-33
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/falsepattern/endlessids/mixin/mixins/common/potion/vanilla/PotionEffectMixin.java
-33
View File
@@ -22,15 +22,11 @@
package com.falsepattern.endlessids.mixin.mixins.common.potion.vanilla;
import com.falsepattern.endlessids.EndlessIDs;
import com.falsepattern.endlessids.constants.ExtendedConstants;
import lombok.val;
import lombok.var;
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.CallbackInfo;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
import net.minecraft.nbt.NBTTagCompound;
@@ -40,35 +36,6 @@ import net.minecraft.potion.PotionEffect;
@Mixin(value = PotionEffect.class,
priority = 2000 ) //Hodgepodge fixPotionLimit compat (inject-head into overwrite in readCustomPotionEffectFromNBT)
public abstract class PotionEffectMixin {
@Inject(method = "<init>(IIIZ)V",
at = @At("RETURN"),
require = 1)
private void fixOutOfBoundsID(int p_i1576_1_, int p_i1576_2_, int p_i1576_3_, boolean p_i1576_4_, CallbackInfo ci) {
var id = p_i1576_1_ & ExtendedConstants.potionIDMask;
recovery:
if (id != p_i1576_1_ && Potion.potionTypes[id] == null) {
//Maybe vanilla code?
val realId = id;
id = id & 0xFF;
if (Potion.potionTypes[id] == null) {
//Nope
id = realId;
}
}
if (Potion.potionTypes[id] == null) {
EndlessIDs.LOG.error("Encountered invalid potion ID: {}. See the following stacktrace for more info.", p_i1576_1_);
EndlessIDs.LOG.error("Stacktrace:", new Throwable());
EndlessIDs.LOG.error("Recovering to a valid potion ID (usually movement speed)");
for (int i = 0; i < Potion.potionTypes.length; i++) {
if (Potion.potionTypes[i] != null) {
id = i;
break;
}
}
}
this.potionID = id;
}
@Inject(method = "readCustomPotionEffectFromNBT",
at = @At(value = "HEAD"),
cancellable = true,