Skip to content

Commit c2cdc20

Browse files
committed
Fix a couple of bugs
1 parent 6a2b1c8 commit c2cdc20

File tree

4 files changed

+33
-9
lines changed

4 files changed

+33
-9
lines changed

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ org.gradle.jvmargs=-Xmx1G
77
loader_version=0.8.2+build.194
88

99
# Mod Properties
10-
mod_version = 1.4
10+
mod_version = 1.4.1
1111
maven_group = net.earthcomputer
1212
archives_base_name = movement-hacks
1313

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
package net.earthcomputer.movementhacks.mixin;
2+
3+
import net.minecraft.src.Entity;
4+
import org.spongepowered.asm.mixin.Mixin;
5+
import org.spongepowered.asm.mixin.gen.Accessor;
6+
7+
@Mixin(Entity.class)
8+
public interface EntityAccessor {
9+
@Accessor
10+
void setField_653_b(int field_653_b);
11+
}

src/main/java/net/earthcomputer/movementhacks/mixin/MixinEntityPlayerSP.java

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
package net.earthcomputer.movementhacks.mixin;
22

33
import net.earthcomputer.movementhacks.IPlayer;
4-
import net.minecraft.src.EntityPlayer;
5-
import net.minecraft.src.EntityPlayerSP;
6-
import net.minecraft.src.MovementInput;
7-
import net.minecraft.src.World;
4+
import net.minecraft.src.*;
85
import org.spongepowered.asm.mixin.Mixin;
96
import org.spongepowered.asm.mixin.Shadow;
107
import org.spongepowered.asm.mixin.Unique;
@@ -32,8 +29,13 @@ public boolean isFlying() {
3229
@Override
3330
public void setFlying(boolean flying) {
3431
this.flying = flying;
35-
if (flying)
32+
if (flying) {
3633
immuneToFallDamage = true;
34+
} else {
35+
// step sound counter
36+
((EntityAccessor) this).setField_653_b(1);
37+
this.field_641_aF = 0;
38+
}
3739
}
3840

3941
@Override
@@ -68,4 +70,14 @@ private void onTick(CallbackInfo ci) {
6870
if (onGround)
6971
flying = immuneToFallDamage = false;
7072
}
73+
74+
@Inject(method = "writeEntityToNBT", at = @At("RETURN"))
75+
private void onWriteEntityToNBT(NBTTagCompound nbt, CallbackInfo ci) {
76+
nbt.setBoolean("Flying", flying);
77+
}
78+
79+
@Inject(method = "readEntityFromNBT", at = @At("RETURN"))
80+
private void onReadEntityFromNBT(NBTTagCompound nbt, CallbackInfo ci) {
81+
setFlying(nbt.getBoolean("Flying"));
82+
}
7183
}

src/main/resources/movementhacks.mixins.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,13 @@
33
"package": "net.earthcomputer.movementhacks.mixin",
44
"compatibilityLevel": "JAVA_8",
55
"mixins": [
6+
"EntityAccessor"
67
],
78
"client": [
8-
"MixinEntityPlayerSP",
9-
"MixinMovementInputFromOptions",
9+
"MixinEntity",
1010
"MixinEntityLiving",
11-
"MixinEntity"
11+
"MixinEntityPlayerSP",
12+
"MixinMovementInputFromOptions"
1213
],
1314
"injectors": {
1415
"defaultRequire": 1

0 commit comments

Comments
 (0)