Skip to content

Commit 7dee17a

Browse files
committed
Update 1.2.2
1 parent 7303781 commit 7dee17a

File tree

5 files changed

+39
-1
lines changed

5 files changed

+39
-1
lines changed
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
package com.fox2code.foxloader.client.mixins;
2+
3+
import net.minecraft.src.client.gui.Container;
4+
import net.minecraft.src.game.entity.player.EntityPlayer;
5+
import org.spongepowered.asm.mixin.Mixin;
6+
import org.spongepowered.asm.mixin.injection.At;
7+
import org.spongepowered.asm.mixin.injection.Inject;
8+
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
9+
10+
11+
@Mixin(Container.class)
12+
public class MixinContainer {
13+
@Inject(method = "onCraftGuiClosed", at = @At("HEAD"), cancellable = true)
14+
public void hotfix_onCraftGuiClosedHook(EntityPlayer var1, CallbackInfo ci) {
15+
if (var1 == null || var1.inventory == null) {
16+
ci.cancel();
17+
}
18+
}
19+
}

client/src/main/java/com/fox2code/foxloader/client/mixins/MixinWorld.java

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,11 @@
88
import net.minecraft.src.game.entity.other.EntityItem;
99
import net.minecraft.src.game.entity.player.EntityPlayer;
1010
import net.minecraft.src.game.level.World;
11+
import net.minecraft.src.game.level.chunk.Chunk;
1112
import org.spongepowered.asm.mixin.Mixin;
1213
import org.spongepowered.asm.mixin.Shadow;
14+
import org.spongepowered.asm.mixin.injection.At;
15+
import org.spongepowered.asm.mixin.injection.Redirect;
1316

1417
import java.util.List;
1518

@@ -80,4 +83,10 @@ public List<? extends RegisteredTileEntity> getRegisteredTileEntities() {
8083
public List<? extends NetworkPlayer> getRegisteredNetworkPlayers() {
8184
return (List<? extends NetworkPlayer>) (Object) this.playerEntities;
8285
}
86+
87+
@Redirect(method = "getLoadedBlockIdOrM1", at = @At(value = "INVOKE", target =
88+
"Lnet/minecraft/src/game/level/World;getLoadedChunkFromBlockCoords(III)Lnet/minecraft/src/game/level/chunk/Chunk;"))
89+
public Chunk hotfix_getLoadedBlockIdOrM1(World instance, int x, int y, int z) {
90+
return instance.getLoadedChunkFromChunkCoords(x, y, z);
91+
}
8392
}

client/src/main/resources/foxloader.client.mixins.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
"MixinChunk",
1010
"MixinChunkBlockMap",
1111
"MixinCommandHelperGUI",
12+
"MixinContainer",
1213
"MixinContainerCreative",
1314
"MixinEntity",
1415
"MixinEntityClientPlayerMP",

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ org.gradle.parallel=true
33
org.gradle.jvmargs=-Xmx1024m -XX:-UseGCOverheadLimit -Dfile.encoding=UTF-8
44

55
# FoxLoader properties
6-
foxloader.version=1.2.1
6+
foxloader.version=1.2.2
77
foxloader.lastReIndevTransformerChanges=1.2.1
88

99
# ReIndev properties

server/src/main/java/com/fox2code/foxloader/server/mixins/MixinWorld.java

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,11 @@
88
import net.minecraft.src.game.entity.other.EntityItem;
99
import net.minecraft.src.game.entity.player.EntityPlayer;
1010
import net.minecraft.src.game.level.World;
11+
import net.minecraft.src.game.level.chunk.Chunk;
1112
import org.spongepowered.asm.mixin.Mixin;
1213
import org.spongepowered.asm.mixin.Shadow;
14+
import org.spongepowered.asm.mixin.injection.At;
15+
import org.spongepowered.asm.mixin.injection.Redirect;
1316

1417
import java.util.List;
1518

@@ -76,4 +79,10 @@ public List<? extends RegisteredTileEntity> getRegisteredTileEntities() {
7679
public List<? extends NetworkPlayer> getRegisteredNetworkPlayers() {
7780
return (List<? extends NetworkPlayer>) (Object) this.playerEntities;
7881
}
82+
83+
@Redirect(method = "getLoadedBlockIdOrM1", at = @At(value = "INVOKE", target =
84+
"Lnet/minecraft/src/game/level/World;getLoadedChunkFromBlockCoords(III)Lnet/minecraft/src/game/level/chunk/Chunk;"))
85+
public Chunk hotfix_getLoadedBlockIdOrM1(World instance, int x, int y, int z) {
86+
return instance.getLoadedChunkFromChunkCoords(x, y, z);
87+
}
7988
}

0 commit comments

Comments
 (0)