aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/com/detrav
diff options
context:
space:
mode:
authorJason Mitchell <mitchej@gmail.com>2021-01-24 11:23:12 -0800
committerJason Mitchell <mitchej@gmail.com>2021-01-24 11:23:12 -0800
commiteb7e8585e4496cf14893c618f53418905a32fb70 (patch)
tree202e31e103bc9646c9c71dc1e2f5f85f93249336 /src/main/java/com/detrav
parent7d918352b9f7c95d6fd28a5a85e0433fddc3b0eb (diff)
downloadGT5-Unofficial-eb7e8585e4496cf14893c618f53418905a32fb70.tar.gz
GT5-Unofficial-eb7e8585e4496cf14893c618f53418905a32fb70.tar.bz2
GT5-Unofficial-eb7e8585e4496cf14893c618f53418905a32fb70.zip
Pollution works now.
Diffstat (limited to 'src/main/java/com/detrav')
-rw-r--r--src/main/java/com/detrav/gui/OresList.java6
-rw-r--r--src/main/java/com/detrav/gui/textures/DetravMapTexture.java3
-rw-r--r--src/main/java/com/detrav/net/ProspectingPacket.java2
3 files changed, 5 insertions, 6 deletions
diff --git a/src/main/java/com/detrav/gui/OresList.java b/src/main/java/com/detrav/gui/OresList.java
index 819a79dda5..13622a49d7 100644
--- a/src/main/java/com/detrav/gui/OresList.java
+++ b/src/main/java/com/detrav/gui/OresList.java
@@ -25,13 +25,13 @@ class OresList extends GuiScrollingList {
ores = aOres;
keys = new ArrayList<>(ores.keySet());
Collections.sort(keys);
- keys.add(0, "All");
+ if(keys.size() > 1) keys.add(0, "All");
selected = 0;
}
@Override
protected int getSize() {
- return ores.size();
+ return keys.size();
}
@Override
@@ -54,7 +54,7 @@ class OresList extends GuiScrollingList {
parent.mc.fontRenderer,
parent.mc.fontRenderer.trimStringToWidth(keys.get(slotIdx), listWidth - 10),
this.left + 3,
- slotTop,
+ slotTop - 1,
ores.getOrDefault(keys.get(slotIdx), 0x7d7b76)
);
}
diff --git a/src/main/java/com/detrav/gui/textures/DetravMapTexture.java b/src/main/java/com/detrav/gui/textures/DetravMapTexture.java
index 71911f4ea7..56db8717c7 100644
--- a/src/main/java/com/detrav/gui/textures/DetravMapTexture.java
+++ b/src/main/java/com/detrav/gui/textures/DetravMapTexture.java
@@ -57,8 +57,7 @@ public class DetravMapTexture extends AbstractTexture {
}
}else if (packet.ptype == 3) {
final short meta = packet.map[i][j].get((byte) 1);
- final String name = packet.metaMap.get(meta);
- image.setRGB(i, j, packet.ores.get(name));
+ image.setRGB(i, j, ((meta & 0xFF) << 16) + ((meta & 0xFF) << 8) + ((meta & 0xFF)) | 0XFF000000);
}
}
// draw player pos
diff --git a/src/main/java/com/detrav/net/ProspectingPacket.java b/src/main/java/com/detrav/net/ProspectingPacket.java
index f3b473ce9d..411986fd42 100644
--- a/src/main/java/com/detrav/net/ProspectingPacket.java
+++ b/src/main/java/com/detrav/net/ProspectingPacket.java
@@ -92,7 +92,7 @@ public class ProspectingPacket extends DetravPacket {
} else if (packet.ptype == 3) {
// Pollution
name = StatCollector.translateToLocal("gui.detrav.scanner.pollution");
- rgba = new short[]{0,0,0,0};
+ rgba = new short[]{125,123,118,0};
} else {
return;
}