Skip to content

Commit

Permalink
Add methods for GlobalPos class->record change
Browse files Browse the repository at this point in the history
  • Loading branch information
pisaiah committed May 3, 2024
1 parent 00a9db2 commit 5bb83b2
Show file tree
Hide file tree
Showing 8 changed files with 157 additions and 0 deletions.
Original file line number Diff line number Diff line change
@@ -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();

}
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ public class MixinList {
" Cat",
" ItemStack",
" TameableEntity",
" GlobalPos",
"MCVER=1.18,1.19,1.20",
" World_18"
);
Expand Down
Original file line number Diff line number Diff line change
@@ -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();
}

}
Original file line number Diff line number Diff line change
@@ -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();
}

}
Original file line number Diff line number Diff line change
@@ -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();
}

}
Original file line number Diff line number Diff line change
@@ -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();
}

}
Original file line number Diff line number Diff line change
@@ -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();
}

}
Original file line number Diff line number Diff line change
@@ -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();
}

}

0 comments on commit 5bb83b2

Please sign in to comment.