Anvilcraft/buildcraft
3
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix #2892 and zone planner mouse weirdness

Browse source
This commit is contained in:
Adrian 2015-07-19 15:36:45 +02:00
parent 2732409d9d
commit 140f14aab5
3 changed files with 40 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
buildcraft_resources/changelog/7.0.17 Normal file
View file

@ -0,0 +1,5 @@
Bugs fixed:
* [#2892] Disconnect on large-resolution Zone Planner fullscreen (asie)
* [#2891] Boxes ignoring the south and east boundaries when rounding (hea3ven)
* Accidentally setting an area in the Zone Planner GUI upon pressing fullscreen (asie)

35
common/buildcraft/robotics/gui/ContainerZonePlan.java
View file

@ -27,8 +27,10 @@ import buildcraft.core.lib.network.command.PacketCommand;
import buildcraft.core.lib.render.DynamicTextureBC; import buildcraft.core.lib.render.DynamicTextureBC;
import buildcraft.core.lib.utils.NetworkUtils; import buildcraft.core.lib.utils.NetworkUtils;
import buildcraft.robotics.TileZonePlan; import buildcraft.robotics.TileZonePlan;
import buildcraft.robotics.map.MapWorld;
public class ContainerZonePlan extends BuildCraftContainer implements ICommandReceiver { public class ContainerZonePlan extends BuildCraftContainer implements ICommandReceiver {
private static final int MAX_PACKET_LENGTH = 30000;
public DynamicTextureBC mapTexture; public DynamicTextureBC mapTexture;
public ZonePlan currentAreaSelection; public ZonePlan currentAreaSelection;
@ -92,9 +94,10 @@ public class ContainerZonePlan extends BuildCraftContainer implements ICommandRe
gui.refreshSelectedArea(); gui.refreshSelectedArea();
} else if ("receiveImage".equals(command)) { } else if ("receiveImage".equals(command)) {
int size = stream.readUnsignedMedium(); int size = stream.readUnsignedMedium();
int pos = stream.readUnsignedMedium();
for (int i = 0; i < size; ++i) { for (int i = 0; i < Math.min(size - pos, MAX_PACKET_LENGTH); ++i) {
mapTexture.colorMap[i] = 0xFF000000 | MapColor.mapColorArray[stream.readUnsignedByte()].colorValue; mapTexture.colorMap[pos + i] = 0xFF000000 | MapColor.mapColorArray[stream.readUnsignedByte()].colorValue;
} }
} }
} else if (side.isServer()) { } else if (side.isServer()) {
@ -123,28 +126,36 @@ public class ContainerZonePlan extends BuildCraftContainer implements ICommandRe
private void computeMap(int cx, int cz, int width, int height, int blocksPerPixel, EntityPlayer player) { private void computeMap(int cx, int cz, int width, int height, int blocksPerPixel, EntityPlayer player) {
final byte[] textureData = new byte[width * height]; final byte[] textureData = new byte[width * height];
MapWorld w = BuildCraftRobotics.manager.getWorld(map.getWorldObj());
int startX = cx - width * blocksPerPixel / 2; int startX = cx - width * blocksPerPixel / 2;
int startZ = cz - height * blocksPerPixel / 2; int startZ = cz - height * blocksPerPixel / 2;
int mapStartX = (map.chunkStartX << 4);
int mapStartZ = (map.chunkStartZ << 4);
for (int i = 0; i < width; ++i) { for (int i = 0; i < width; ++i) {
for (int j = 0; j < height; ++j) { for (int j = 0; j < height; ++j) {
int x = startX + i * blocksPerPixel; int x = startX + i * blocksPerPixel;
int z = startZ + j * blocksPerPixel; int z = startZ + j * blocksPerPixel;
int ix = x - (map.chunkStartX << 4); int ix = x - mapStartX;
int iz = z - (map.chunkStartZ << 4); int iz = z - mapStartZ;
if (ix >= 0 && iz >= 0 && ix < TileZonePlan.RESOLUTION && iz < TileZonePlan.RESOLUTION) { if (ix >= 0 && iz >= 0 && ix < TileZonePlan.RESOLUTION && iz < TileZonePlan.RESOLUTION) {
textureData[i + j * width] = (byte) BuildCraftRobotics.manager.getWorld(map.getWorldObj()) textureData[i + j * width] = (byte) w.getColor(x, z);
.getColor(x, z);
} }
} }
} }
BuildCraftCore.instance.sendToPlayer(player, new PacketCommand(this, "receiveImage", new CommandWriter() { final int len = MAX_PACKET_LENGTH;
public void write(ByteBuf data) {
data.writeMedium(textureData.length); for (int i = 0; i < textureData.length; i += len) {
data.writeBytes(textureData); final int pos = i;
} BuildCraftCore.instance.sendToPlayer(player, new PacketCommand(this, "receiveImage", new CommandWriter() {
})); public void write(ByteBuf data) {
data.writeMedium(textureData.length);
data.writeMedium(pos);
data.writeBytes(textureData, pos, Math.min(textureData.length - pos, len));
}
}));
}
} }
} }

23
common/buildcraft/robotics/gui/GuiZonePlan.java
View file

@ -234,10 +234,6 @@ public class GuiZonePlan extends GuiAdvancedInterface {
@Override @Override
protected void mouseClicked(int mouseX, int mouseY, int mouseButton) { protected void mouseClicked(int mouseX, int mouseY, int mouseButton) {
super.mouseClicked(mouseX, mouseY, mouseButton);
textField.mouseClicked(mouseX - guiLeft, mouseY - guiTop, mouseButton);
int blocksX = (mouseX - mapXMin) * zoomLevel; int blocksX = (mouseX - mapXMin) * zoomLevel;
int blocksZ = (mouseY - mapYMin) * zoomLevel; int blocksZ = (mouseY - mapYMin) * zoomLevel;
@ -255,22 +251,27 @@ public class GuiZonePlan extends GuiAdvancedInterface {
uploadMap(); uploadMap();
refreshSelectedArea(); refreshSelectedArea();
return;
} else { } else {
inSelection = true; inSelection = true;
selX1 = mouseX; selX1 = mouseX;
selY1 = mouseY; selY1 = mouseY;
selX2 = 0; selX2 = 0;
selY2 = 0; selY2 = 0;
return;
} }
} else { }
AdvancedSlot slot = getSlotAtLocation(mouseX, mouseY);
if (slot instanceof AreaSlot) { super.mouseClicked(mouseX, mouseY, mouseButton);
colorSelected = (AreaSlot) slot; textField.mouseClicked(mouseX - guiLeft, mouseY - guiTop, mouseButton);
newSelection.setColor(0, 0, colorSelected.color.getDarkHex(), alpha); AdvancedSlot slot = getSlotAtLocation(mouseX, mouseY);
getContainer().loadArea(colorSelected.color.ordinal());
} if (slot instanceof AreaSlot) {
colorSelected = (AreaSlot) slot;
newSelection.setColor(0, 0, colorSelected.color.getDarkHex(), alpha);
getContainer().loadArea(colorSelected.color.ordinal());
} }
} }