From 41997e15e9a0bf7aa7ffa99f4d96225a5f3612da Mon Sep 17 00:00:00 2001 From: Chicken-Bomes Date: Wed, 9 Apr 2014 13:20:40 +1000 Subject: [PATCH] Replace private minecraft accesses with alternatives until transformers are accepted by forge. --- codechicken/lib/packet/PacketCustom.java | 9 ++++++++- codechicken/lib/render/TextureSpecial.java | 1 - 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/codechicken/lib/packet/PacketCustom.java b/codechicken/lib/packet/PacketCustom.java index 5d4e531..463454d 100644 --- a/codechicken/lib/packet/PacketCustom.java +++ b/codechicken/lib/packet/PacketCustom.java @@ -34,6 +34,7 @@ import net.minecraft.network.Packet; import net.minecraft.network.play.INetHandlerPlayClient; import net.minecraft.network.play.INetHandlerPlayServer; import net.minecraft.server.MinecraftServer; +import net.minecraft.server.management.PlayerManager; import net.minecraft.server.management.PlayerManager.PlayerInstance; import net.minecraft.world.World; import net.minecraft.world.WorldServer; @@ -523,9 +524,15 @@ public final class PacketCustom implements MCDataInput, MCDataOutput } public static void sendToChunk(Packet packet, World world, int chunkX, int chunkZ) { + PlayerManager playerManager = ((WorldServer)world).getPlayerManager(); + for (EntityPlayerMP player : (List) MinecraftServer.getServer().getConfigurationManager().playerEntityList) + if(playerManager.isPlayerWatchingChunk(player, chunkX, chunkZ)) + sendToPlayer(packet, player); + + /* Commented until forge accepts access tranformer request PlayerInstance p = ((WorldServer) world).getPlayerManager().getOrCreateChunkWatcher(chunkX, chunkZ, false); if (p != null) - p.sendToAllPlayersWatchingChunk(packet); + p.sendToAllPlayersWatchingChunk(packet);*/ } public void sendToOps() { diff --git a/codechicken/lib/render/TextureSpecial.java b/codechicken/lib/render/TextureSpecial.java index 5d2ee55..777749a 100644 --- a/codechicken/lib/render/TextureSpecial.java +++ b/codechicken/lib/render/TextureSpecial.java @@ -65,7 +65,6 @@ public class TextureSpecial extends TextureAtlasSprite implements IIconSelfRegis if (textureFX != null) { textureFX.update(); if (textureFX.changed()) - //TextureUtil.uploadTextureSub(0, textureFX.imageData, width, height, originX, originY, false, false, false); not accessible TextureUtil.uploadTextureMipmap(new int[][]{textureFX.imageData}, width, height, originX, originY, false, false); } }