diff --git a/iCommon-API/src/main/java/me/isaiah/common/cmixin/IMixinGlobalPos.java b/iCommon-API/src/main/java/me/isaiah/common/cmixin/IMixinGlobalPos.java new file mode 100644 index 0000000..580c1f1 --- /dev/null +++ b/iCommon-API/src/main/java/me/isaiah/common/cmixin/IMixinGlobalPos.java @@ -0,0 +1,20 @@ +package me.isaiah.common.cmixin; + +import net.minecraft.util.math.BlockPos; + +public interface IMixinGlobalPos { + + /** + * convince method. + * + * <=1.20.4 is method_19446 + * >=1.20.5 is comp_2208 + * + */ + public BlockPos IC$get_pos(); + + /** + */ + public Object IC$get_dimension(); + +} diff --git a/iCommon-API/src/main/java/me/isaiah/common/cmixin/MixinList.java b/iCommon-API/src/main/java/me/isaiah/common/cmixin/MixinList.java index a226ce9..5bc650b 100644 --- a/iCommon-API/src/main/java/me/isaiah/common/cmixin/MixinList.java +++ b/iCommon-API/src/main/java/me/isaiah/common/cmixin/MixinList.java @@ -34,6 +34,7 @@ public class MixinList { " Cat", " ItemStack", " TameableEntity", + " GlobalPos", "MCVER=1.18,1.19,1.20", " World_18" ); diff --git a/iCommon-Fabric-1.18.2/src/main/java/me/isaiah/common/mixin/R1_18/MixinGlobalPos.java b/iCommon-Fabric-1.18.2/src/main/java/me/isaiah/common/mixin/R1_18/MixinGlobalPos.java new file mode 100644 index 0000000..3aba2ed --- /dev/null +++ b/iCommon-Fabric-1.18.2/src/main/java/me/isaiah/common/mixin/R1_18/MixinGlobalPos.java @@ -0,0 +1,22 @@ +package me.isaiah.common.mixin.R1_18; + +import org.spongepowered.asm.mixin.Mixin; + +import me.isaiah.common.cmixin.IMixinGlobalPos; +import net.minecraft.util.dynamic.GlobalPos; +import net.minecraft.util.math.BlockPos; + +@Mixin(GlobalPos.class) +public class MixinGlobalPos implements IMixinGlobalPos { + + @Override + public BlockPos IC$get_pos() { + return ((GlobalPos)(Object)this).getPos(); + } + + @Override + public Object IC$get_dimension() { + return ((GlobalPos)(Object)this).getDimension(); + } + +} diff --git a/iCommon-Fabric-1.19.4/src/main/java/me/isaiah/common/mixin/R1_19/MixinGlobalPos.java b/iCommon-Fabric-1.19.4/src/main/java/me/isaiah/common/mixin/R1_19/MixinGlobalPos.java new file mode 100644 index 0000000..5efb47f --- /dev/null +++ b/iCommon-Fabric-1.19.4/src/main/java/me/isaiah/common/mixin/R1_19/MixinGlobalPos.java @@ -0,0 +1,22 @@ +package me.isaiah.common.mixin.R1_19; + +import org.spongepowered.asm.mixin.Mixin; + +import me.isaiah.common.cmixin.IMixinGlobalPos; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.GlobalPos; + +@Mixin(GlobalPos.class) +public class MixinGlobalPos implements IMixinGlobalPos { + + @Override + public BlockPos IC$get_pos() { + return ((GlobalPos)(Object)this).getPos(); + } + + @Override + public Object IC$get_dimension() { + return ((GlobalPos)(Object)this).getDimension(); + } + +} diff --git a/iCommon-Fabric-1.19/src/main/java/me/isaiah/common/mixin/R1_19/MixinGlobalPos.java b/iCommon-Fabric-1.19/src/main/java/me/isaiah/common/mixin/R1_19/MixinGlobalPos.java new file mode 100644 index 0000000..5efb47f --- /dev/null +++ b/iCommon-Fabric-1.19/src/main/java/me/isaiah/common/mixin/R1_19/MixinGlobalPos.java @@ -0,0 +1,22 @@ +package me.isaiah.common.mixin.R1_19; + +import org.spongepowered.asm.mixin.Mixin; + +import me.isaiah.common.cmixin.IMixinGlobalPos; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.GlobalPos; + +@Mixin(GlobalPos.class) +public class MixinGlobalPos implements IMixinGlobalPos { + + @Override + public BlockPos IC$get_pos() { + return ((GlobalPos)(Object)this).getPos(); + } + + @Override + public Object IC$get_dimension() { + return ((GlobalPos)(Object)this).getDimension(); + } + +} diff --git a/iCommon-Fabric-1.20.1/src/main/java/me/isaiah/common/mixin/R1_20/MixinGlobalPos.java b/iCommon-Fabric-1.20.1/src/main/java/me/isaiah/common/mixin/R1_20/MixinGlobalPos.java new file mode 100644 index 0000000..2921b74 --- /dev/null +++ b/iCommon-Fabric-1.20.1/src/main/java/me/isaiah/common/mixin/R1_20/MixinGlobalPos.java @@ -0,0 +1,22 @@ +package me.isaiah.common.mixin.R1_20; + +import org.spongepowered.asm.mixin.Mixin; + +import me.isaiah.common.cmixin.IMixinGlobalPos; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.GlobalPos; + +@Mixin(GlobalPos.class) +public class MixinGlobalPos implements IMixinGlobalPos { + + @Override + public BlockPos IC$get_pos() { + return ((GlobalPos)(Object)this).getPos(); + } + + @Override + public Object IC$get_dimension() { + return ((GlobalPos)(Object)this).getDimension(); + } + +} diff --git a/iCommon-Fabric-1.20.2/src/main/java/me/isaiah/common/mixin/R1_20/MixinGlobalPos.java b/iCommon-Fabric-1.20.2/src/main/java/me/isaiah/common/mixin/R1_20/MixinGlobalPos.java new file mode 100644 index 0000000..dce643b --- /dev/null +++ b/iCommon-Fabric-1.20.2/src/main/java/me/isaiah/common/mixin/R1_20/MixinGlobalPos.java @@ -0,0 +1,22 @@ +package me.isaiah.common.mixin.R1_20; + +import org.spongepowered.asm.mixin.Mixin; + +import me.isaiah.common.cmixin.IMixinGlobalPos; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.GlobalPos; + +@Mixin(GlobalPos.class) +public class MixinGlobalPos implements IMixinGlobalPos { + + @Override + public BlockPos IC$get_pos() { + return ((GlobalPos)(Object)this).getPos(); + } + + @Override + public Object IC$get_dimension() { + return ((GlobalPos)(Object)this).getDimension(); + } + +} diff --git a/iCommon-Fabric-1.20.5/src/main/java/me/isaiah/common/mixin/R1_20/MixinGlobalPos.java b/iCommon-Fabric-1.20.5/src/main/java/me/isaiah/common/mixin/R1_20/MixinGlobalPos.java new file mode 100644 index 0000000..56bbacb --- /dev/null +++ b/iCommon-Fabric-1.20.5/src/main/java/me/isaiah/common/mixin/R1_20/MixinGlobalPos.java @@ -0,0 +1,26 @@ +package me.isaiah.common.mixin.R1_20; + +import org.spongepowered.asm.mixin.Mixin; + +import me.isaiah.common.cmixin.IMixinGlobalPos; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.GlobalPos; + +@Mixin(GlobalPos.class) +public class MixinGlobalPos implements IMixinGlobalPos { + + @Override + public BlockPos IC$get_pos() { + // <=1.20.4 is method_19446 / getPos() + // >=1.20.5 is comp_2208 / pos() + return ((GlobalPos)(Object)this).comp_2208(); + } + + @Override + public Object IC$get_dimension() { + // <=1.20.4 is method_19442 / getDimension() + // >=1.20.5 is comp_2207 / dimension() + return ((GlobalPos)(Object)this).comp_2207(); + } + +}