diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/NewPacketHandler.java b/src/main/java/WayofTime/alchemicalWizardry/common/NewPacketHandler.java index 77b6dfbd..ce43817b 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/NewPacketHandler.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/NewPacketHandler.java @@ -1,5 +1,6 @@ package WayofTime.alchemicalWizardry.common; +import java.util.BitSet; import java.util.EnumMap; import java.util.LinkedList; import java.util.List; @@ -10,6 +11,7 @@ import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.network.Packet; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; +import net.minecraft.world.chunk.Chunk; import net.minecraftforge.common.util.ForgeDirection; import WayofTime.alchemicalWizardry.AlchemicalWizardry; @@ -77,6 +79,8 @@ public enum NewPacketHandler { .addAfter(tileAltarCodec, "CurrentReagentBarMessageHandler", new CurrentReagentBarMessageHandler()); clientChannel.pipeline() .addAfter(tileAltarCodec, "CurrentAddedHPMessageHandler", new CurrentAddedHPMessageHandler()); + clientChannel.pipeline() + .addAfter(tileAltarCodec, "GaiaBiomeChangeHandler", new GaiaBiomeChangeMessageHandler()); } @SideOnly(Side.SERVER) @@ -283,6 +287,23 @@ public enum NewPacketHandler { } } + private static class GaiaBiomeChangeMessageHandler extends SimpleChannelInboundHandler { + + @Override + protected void channelRead0(ChannelHandlerContext ctx, GaiaBiomeChangeMessage msg) throws Exception { + Chunk chunk = AlchemicalWizardry.proxy.getClientWorld().getChunkFromChunkCoords(msg.chunkX, msg.chunkZ); + if (chunk != null) { + byte[] biomeArray = chunk.getBiomeArray(); + for (int i = 0; i < 16 * 16; ++i) { + if (msg.mask.get(i)) { + biomeArray[i] = msg.biome; + } + } + chunk.setBiomeArray(biomeArray); + } + } + } + public static class BMMessage { int index; @@ -417,6 +438,14 @@ public enum NewPacketHandler { byte keyPressed; } + public static class GaiaBiomeChangeMessage extends BMMessage { + + int chunkX; + int chunkZ; + byte biome; + BitSet mask; + } + private class ClientToServerCodec extends FMLIndexedMessageToMessageCodec { public ClientToServerCodec() {} @@ -458,6 +487,7 @@ public enum NewPacketHandler { addDiscriminator(12, CurrentReagentBarMessage.class); addDiscriminator(13, CurrentAddedHPMessage.class); addDiscriminator(14, KeyboardMessage.class); + addDiscriminator(15, GaiaBiomeChangeMessage.class); } @Override @@ -669,6 +699,16 @@ public enum NewPacketHandler { target.writeByte(((KeyboardMessage) msg).keyPressed); break; + + case 15: + target.writeInt(((GaiaBiomeChangeMessage) msg).chunkX); + target.writeInt(((GaiaBiomeChangeMessage) msg).chunkZ); + target.writeByte(((GaiaBiomeChangeMessage) msg).biome); + byte[] arr = ((GaiaBiomeChangeMessage) msg).mask.toByteArray(); + target.writeInt(arr.length); + target.writeBytes(arr); + break; + } } @@ -894,6 +934,17 @@ public enum NewPacketHandler { System.out.println("Packet recieved: being decoded"); ((KeyboardMessage) msg).keyPressed = dat.readByte(); break; + + case 15: + ((GaiaBiomeChangeMessage) msg).chunkX = dat.readInt(); + ((GaiaBiomeChangeMessage) msg).chunkZ = dat.readInt(); + ((GaiaBiomeChangeMessage) msg).biome = dat.readByte(); + + int bufferLength = dat.readInt(); + byte[] buffer = new byte[bufferLength]; + dat.readBytes(buffer); + ((GaiaBiomeChangeMessage) msg).mask = BitSet.valueOf(buffer); + break; } } } @@ -1067,6 +1118,17 @@ public enum NewPacketHandler { return INSTANCE.channels.get(Side.CLIENT).generatePacketFrom(msg); } + public static Packet getGaiaBiomeChangePacket(int x, int z, byte biome, BitSet mask) { + GaiaBiomeChangeMessage msg = new GaiaBiomeChangeMessage(); + msg.index = 15; + msg.chunkX = x; + msg.chunkZ = z; + msg.biome = biome; + msg.mask = mask; + + return INSTANCE.channels.get(Side.SERVER).generatePacketFrom(msg); + } + public void sendTo(Packet message, EntityPlayerMP player) { this.channels.get(Side.SERVER).attr(FMLOutboundHandler.FML_MESSAGETARGET) .set(FMLOutboundHandler.OutboundTarget.PLAYER); @@ -1087,6 +1149,13 @@ public enum NewPacketHandler { this.channels.get(Side.SERVER).writeAndFlush(message); } + public void sendToDimension(Packet message, Integer dimensionId) { + this.channels.get(Side.SERVER).attr(FMLOutboundHandler.FML_MESSAGETARGET) + .set(FMLOutboundHandler.OutboundTarget.DIMENSION); + this.channels.get(Side.SERVER).attr(FMLOutboundHandler.FML_MESSAGETARGETARGS).set(dimensionId); + this.channels.get(Side.SERVER).writeAndFlush(message); + } + public void sendToServer(Packet message) { this.channels.get(Side.CLIENT).attr(FMLOutboundHandler.FML_MESSAGETARGET) .set(FMLOutboundHandler.OutboundTarget.TOSERVER); diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectBiomeChanger.java b/src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectBiomeChanger.java index cf4bd8a7..50e3ab72 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectBiomeChanger.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectBiomeChanger.java @@ -1,6 +1,7 @@ package WayofTime.alchemicalWizardry.common.rituals; import java.util.ArrayList; +import java.util.BitSet; import java.util.List; import net.minecraft.block.Block; @@ -24,6 +25,7 @@ import WayofTime.alchemicalWizardry.api.rituals.IMasterRitualStone; import WayofTime.alchemicalWizardry.api.rituals.RitualComponent; import WayofTime.alchemicalWizardry.api.rituals.RitualEffect; import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler; +import WayofTime.alchemicalWizardry.common.NewPacketHandler; import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper; import WayofTime.alchemicalWizardry.common.tileEntity.TEPlinth; @@ -240,26 +242,42 @@ public class RitualEffectBiomeChanger extends RitualEffect { biomeID = 1; } - for (int i = 0; i < 2 * range + 1; i++) { - for (int j = 0; j < 2 * range + 1; j++) { - if (boolList[i][j]) { - Chunk chunk = world.getChunkFromBlockCoords(x - range + i, z - range + j); - byte[] byteArray = chunk.getBiomeArray(); - int moduX = (x - range + i) % 16; - int moduZ = (z - range + j) % 16; + List chunkList = new ArrayList<>(); - if (moduX < 0) { - moduX = moduX + 16; + for (int chunkX = (x - range) >> 4; chunkX <= (x + range) >> 4; ++chunkX) { + for (int chunkZ = (z - range) >> 4; chunkZ <= (z + range) >> 4; ++chunkZ) { + chunkList.add(world.getChunkFromChunkCoords(chunkX, chunkZ)); + } + } + + for (Chunk chunk : chunkList) { + byte[] byteArray = chunk.getBiomeArray(); + BitSet mask = new BitSet(); + boolean changed = false; + + for (int cZ = 0; cZ < 16; ++cZ) { + int offsetZ = (chunk.zPosition << 4 | cZ) - (z - range); + if (0 <= offsetZ && offsetZ < 2 * range + 1) { + for (int cX = 0; cX < 16; ++cX) { + int offsetX = (chunk.xPosition << 4 | cX) - (x - range); + if (0 <= offsetX && offsetX < 2 * range + 1) { + if (boolList[offsetX][offsetZ]) { + mask.set(cZ << 4 | cX, true); + byteArray[cZ << 4 | cX] = (byte) biomeID; + changed = true; + } + } } - - if (moduZ < 0) { - moduZ = moduZ + 16; - } - - byteArray[moduZ * 16 + moduX] = (byte) biomeID; - chunk.setBiomeArray(byteArray); } } + + if (changed) { + chunk.setBiomeArray(byteArray); + NewPacketHandler.INSTANCE.sendToDimension( + NewPacketHandler + .getGaiaBiomeChangePacket(chunk.xPosition, chunk.zPosition, (byte) biomeID, mask), + world.provider.dimensionId); + } } SoulNetworkHandler.syphonFromNetwork(owner, this.getCostPerRefresh());