RepoMirrors
/
baritone
mirror of https://github.com/cabaletta/baritone
1
0
Fork 1
Code Issues Releases Wiki Activity

Actually fix Forge by reverting Mixin change completely

This commit is contained in:
Brady 2023-07-01 18:38:13 -05:00
parent 14b5a0cec3
commit ccd737d0a1
No known key found for this signature in database
GPG Key ID: 73A788379A197567
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/launch/java/baritone/launch/mixins/MixinEntity.java
View File

@ -34,10 +34,4 @@ public abstract class MixinEntity {
@Shadow
protected EntityDataManager dataManager;
@Shadow
public float rotationPitch;
@Shadow
public float rotationYaw;
}

12
src/launch/java/baritone/launch/mixins/MixinEntityLivingBase.java
View File

@ -21,7 +21,9 @@ import baritone.api.BaritoneAPI;
import baritone.api.IBaritone;
import baritone.api.event.events.RotationMoveEvent;
import net.minecraft.client.entity.EntityPlayerSP;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.world.World;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Unique;
import org.spongepowered.asm.mixin.injection.At;
@ -38,7 +40,7 @@ import static org.spongepowered.asm.lib.Opcodes.GETFIELD;
* @since 9/10/2018
*/
@Mixin(EntityLivingBase.class)
public abstract class MixinEntityLivingBase extends MixinEntity {
public abstract class MixinEntityLivingBase extends Entity {
/**
* Event called to override the movement direction when jumping
@ -49,6 +51,10 @@ public abstract class MixinEntityLivingBase extends MixinEntity {
@Unique
private RotationMoveEvent elytraRotationEvent;
public MixinEntityLivingBase(World worldIn) {
super(worldIn);
}
@Inject(
method = "jump",
at = @At("HEAD")
@ -118,7 +124,7 @@ public abstract class MixinEntityLivingBase extends MixinEntity {
Optional<IBaritone> baritone = this.getBaritone();
if (!baritone.isPresent()) {
// If a shadow is used here it breaks on Forge
self.moveRelative(strafe, up, forward, friction);
this.moveRelative(strafe, up, forward, friction);
return;
}
@ -128,7 +134,7 @@ public abstract class MixinEntityLivingBase extends MixinEntity {
this.rotationYaw = event.getYaw();
this.rotationPitch = event.getPitch();
self.moveRelative(strafe, up, forward, friction);
this.moveRelative(strafe, up, forward, friction);
this.rotationYaw = event.getOriginal().getYaw();
this.rotationPitch = event.getOriginal().getPitch();