Skip to content

Commit 5ba1794

Browse files
committed
refactor: use fastutil maps (as suggested by @brachy84) & spotless
1 parent 86e17df commit 5ba1794

2 files changed

Lines changed: 7 additions & 5 deletions

File tree

src/main/java/gregtech/common/gui/widget/prospector/ProspectingTexture.java

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,14 @@
1414
import net.minecraftforge.fluids.FluidRegistry;
1515
import net.minecraftforge.fluids.FluidStack;
1616

17+
import it.unimi.dsi.fastutil.bytes.Byte2ObjectArrayMap;
1718
import org.jetbrains.annotations.Nullable;
1819

1920
import java.awt.*;
2021
import java.awt.image.BufferedImage;
2122
import java.awt.image.WritableRaster;
2223
import java.util.HashMap;
24+
import java.util.Map;
2325

2426
public class ProspectingTexture extends AbstractTexture {
2527

@@ -29,8 +31,8 @@ public class ProspectingTexture extends AbstractTexture {
2931
private boolean darkMode;
3032
private int imageWidth = -1;
3133
private int imageHeight = -1;
32-
public final HashMap<Byte, String>[][] map;
33-
public static HashMap<Byte, String> emptyTag = new HashMap<>();
34+
public final Map<Byte, String>[][] map;
35+
public static Map<Byte, String> emptyTag = new Byte2ObjectArrayMap<>();
3436
private int playerXGui;
3537
private int playerYGui;
3638
private final ProspectorMode mode;
@@ -42,7 +44,7 @@ public ProspectingTexture(ProspectorMode mode, int radius, boolean darkMode) {
4244
this.mode = mode;
4345
if (this.mode == ProspectorMode.FLUID) {
4446
// noinspection unchecked
45-
map = new HashMap[(radius * 2 - 1)][(radius * 2 - 1)];
47+
map = new Byte2ObjectArrayMap[(radius * 2 - 1)][(radius * 2 - 1)];
4648
} else {
4749
// noinspection unchecked
4850
map = new HashMap[(radius * 2 - 1) * 16][(radius * 2 - 1) * 16];
@@ -102,7 +104,7 @@ private BufferedImage getImage() {
102104

103105
for (int i = 0; i < wh; i++) {
104106
for (int j = 0; j < wh; j++) {
105-
HashMap<Byte, String> data = this.map[this.mode == ProspectorMode.ORE ? i : i / 16][this.mode ==
107+
Map<Byte, String> data = this.map[this.mode == ProspectorMode.ORE ? i : i / 16][this.mode ==
106108
ProspectorMode.ORE ? j : j / 16];
107109
// draw bg
108110
image.setRGB(i, j, ((data == null) ^ darkMode) ? Color.darkGray.getRGB() : Color.WHITE.getRGB());

src/main/java/gregtech/common/gui/widget/prospector/widget/WidgetProspectingMap.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package gregtech.common.gui.widget.prospector.widget;
22

3-
import com.google.common.primitives.UnsignedBytes;
43
import gregtech.api.gui.IRenderContext;
54
import gregtech.api.gui.Widget;
65
import gregtech.api.unification.OreDictUnifier;
@@ -37,6 +36,7 @@
3736
import net.minecraftforge.fml.relauncher.Side;
3837
import net.minecraftforge.fml.relauncher.SideOnly;
3938

39+
import com.google.common.primitives.UnsignedBytes;
4040
import org.jetbrains.annotations.NotNull;
4141

4242
import java.awt.*;

0 commit comments

Comments
 (0)