diff options
| author | Jason Mitchell <mitchej@gmail.com> | 2021-01-24 10:18:42 -0800 |
|---|---|---|
| committer | Jason Mitchell <mitchej@gmail.com> | 2021-01-24 10:18:42 -0800 |
| commit | 7d918352b9f7c95d6fd28a5a85e0433fddc3b0eb (patch) | |
| tree | dfdb5f3fc71a64c311174c7939ab9313c8e014de /src/main/java/com/detrav/gui | |
| parent | 8ecc28d1317e01036a6d0f1cefa34b0aacd2d16a (diff) | |
| download | GT5-Unofficial-7d918352b9f7c95d6fd28a5a85e0433fddc3b0eb.tar.gz GT5-Unofficial-7d918352b9f7c95d6fd28a5a85e0433fddc3b0eb.tar.bz2 GT5-Unofficial-7d918352b9f7c95d6fd28a5a85e0433fddc3b0eb.zip | |
Fluids work now
Diffstat (limited to 'src/main/java/com/detrav/gui')
| -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 |
2 files changed, 3 insertions, 3 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); |