aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech
diff options
context:
space:
mode:
authorMaya <10861407+serenibyss@users.noreply.github.com>2024-10-05 08:08:19 -0500
committerGitHub <noreply@github.com>2024-10-05 13:08:19 +0000
commit90cf10f06294b6bdeb48c5b2d19cb5decf378324 (patch)
tree474fc71bd687e51e24fed591666c4e4670eafb9a /src/main/java/gregtech
parentbd24e8eda6be9b3c6761c0fb094fef6edd372cd6 (diff)
downloadGT5-Unofficial-90cf10f06294b6bdeb48c5b2d19cb5decf378324.tar.gz
GT5-Unofficial-90cf10f06294b6bdeb48c5b2d19cb5decf378324.tar.bz2
GT5-Unofficial-90cf10f06294b6bdeb48c5b2d19cb5decf378324.zip
Fix data stick render not working when holding shift (#3329)
Co-authored-by: Martin Robertz <dream-master@gmx.net>
Diffstat (limited to 'src/main/java/gregtech')
-rw-r--r--src/main/java/gregtech/common/render/items/MetaGeneratedItemRenderer.java14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/main/java/gregtech/common/render/items/MetaGeneratedItemRenderer.java b/src/main/java/gregtech/common/render/items/MetaGeneratedItemRenderer.java
index f0a614e3e6..8a2163a2af 100644
--- a/src/main/java/gregtech/common/render/items/MetaGeneratedItemRenderer.java
+++ b/src/main/java/gregtech/common/render/items/MetaGeneratedItemRenderer.java
@@ -33,7 +33,7 @@ public class MetaGeneratedItemRenderer implements IItemRenderer {
public static void registerSpecialRenderer(ItemList item, IItemRenderer renderer) {
specialRenderers.put(
new RendererKey(
- Item.getIdFromItem(item.getItem()),
+ item.getItem(),
(short) item.getInternalStack_unsafe()
.getItemDamage()),
renderer);
@@ -67,7 +67,7 @@ public class MetaGeneratedItemRenderer implements IItemRenderer {
private IItemRenderer getRendererForItemStack(ItemStack aStack) {
final short aMetaData = (short) aStack.getItemDamage();
- final RendererKey key = new RendererKey(Item.getIdFromItem(aStack.getItem()), aMetaData);
+ final RendererKey key = new RendererKey(aStack.getItem(), aMetaData);
if (specialRenderers.containsKey(key)) {
return specialRenderers.get(key);
@@ -97,11 +97,11 @@ public class MetaGeneratedItemRenderer implements IItemRenderer {
@SuppressWarnings("ClassCanBeRecord")
private static class RendererKey {
- private final int id;
+ private final Item item;
private final short metadata;
- private RendererKey(final int id, final short metadata) {
- this.id = id;
+ private RendererKey(final Item item, final short metadata) {
+ this.item = item;
this.metadata = metadata;
}
@@ -110,12 +110,12 @@ public class MetaGeneratedItemRenderer implements IItemRenderer {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
final RendererKey that = (RendererKey) o;
- return id == that.id && metadata == that.metadata;
+ return item == that.item && metadata == that.metadata;
}
@Override
public int hashCode() {
- return Objects.hashCode(id, metadata);
+ return Objects.hashCode(item, metadata);
}
}
}