diff options
| -rw-r--r-- | src/main/java/com/detrav/gui/OresList.java | 2 | ||||
| -rw-r--r-- | src/main/java/com/detrav/gui/textures/DetravMapTexture.java | 4 | ||||
| -rw-r--r-- | src/main/java/com/detrav/net/ProspectingPacket.java | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/main/java/com/detrav/gui/OresList.java b/src/main/java/com/detrav/gui/OresList.java index a6af396a1a..819a79dda5 100644 --- a/src/main/java/com/detrav/gui/OresList.java +++ b/src/main/java/com/detrav/gui/OresList.java @@ -23,7 +23,7 @@ class OresList extends GuiScrollingList { this.parent = parent; this.onSelected = onSelected; ores = aOres; - keys = new ArrayList(ores.keySet()); + keys = new ArrayList<>(ores.keySet()); Collections.sort(keys); keys.add(0, "All"); selected = 0; diff --git a/src/main/java/com/detrav/gui/textures/DetravMapTexture.java b/src/main/java/com/detrav/gui/textures/DetravMapTexture.java index 5cf913985c..71911f4ea7 100644 --- a/src/main/java/com/detrav/gui/textures/DetravMapTexture.java +++ b/src/main/java/com/detrav/gui/textures/DetravMapTexture.java @@ -52,8 +52,8 @@ public class DetravMapTexture extends AbstractTexture { // Variables used to locate within a chunk. final int k = (i % 16), l = (j % 16); - if( ( (k + l * 16) * 3) < (fluidSize + 48) ) { - image.setRGB(i, j, packet.ores.get(name)); + if( ( (k + l * 16) * 3) < (fluidSize + 48) && (selected.equals("All") || selected.equals(name))) { + image.setRGB(i, j, packet.ores.get(name) | 0XFF000000); } }else if (packet.ptype == 3) { final short meta = packet.map[i][j].get((byte) 1); diff --git a/src/main/java/com/detrav/net/ProspectingPacket.java b/src/main/java/com/detrav/net/ProspectingPacket.java index 932f3a9edc..f3b473ce9d 100644 --- a/src/main/java/com/detrav/net/ProspectingPacket.java +++ b/src/main/java/com/detrav/net/ProspectingPacket.java @@ -99,7 +99,6 @@ public class ProspectingPacket extends DetravPacket { } catch (Exception ignored) { return; } - packet.map[i][j].put(y, meta); packet.ores.put(name, ((rgba[0] & 0xFF) << 16) + ((rgba[1] & 0xFF) << 8) + ((rgba[2] & 0xFF))); packet.metaMap.put(meta, name); } @@ -118,7 +117,8 @@ public class ProspectingPacket extends DetravPacket { for (int k = 0; k < kSize; k++) { final byte y = aData.readByte(); final short meta = aData.readShort(); - addOre(packet, y, i, j, meta); + packet.map[i][j].put(y, meta); + if (packet.ptype != 2 || y == 1) addOre(packet, y, i, j, meta); checkOut++; } } |