aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/me/shedaniel/rei/impl/ItemEntryStack.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/me/shedaniel/rei/impl/ItemEntryStack.java')
-rw-r--r--src/main/java/me/shedaniel/rei/impl/ItemEntryStack.java146
1 files changed, 73 insertions, 73 deletions
diff --git a/src/main/java/me/shedaniel/rei/impl/ItemEntryStack.java b/src/main/java/me/shedaniel/rei/impl/ItemEntryStack.java
index 2e6138cb2..21c44fdfa 100644
--- a/src/main/java/me/shedaniel/rei/impl/ItemEntryStack.java
+++ b/src/main/java/me/shedaniel/rei/impl/ItemEntryStack.java
@@ -8,7 +8,10 @@ package me.shedaniel.rei.impl;
import com.google.common.collect.Lists;
import com.mojang.blaze3d.platform.GlStateManager;
import me.shedaniel.math.api.Rectangle;
-import me.shedaniel.rei.api.*;
+import me.shedaniel.rei.api.ClientHelper;
+import me.shedaniel.rei.api.ConfigObject;
+import me.shedaniel.rei.api.EntryStack;
+import me.shedaniel.rei.api.ItemRendererHooks;
import me.shedaniel.rei.gui.widget.QueuedTooltip;
import net.minecraft.client.MinecraftClient;
import net.minecraft.client.render.*;
@@ -18,9 +21,7 @@ import net.minecraft.client.render.model.BakedModel;
import net.minecraft.client.render.model.json.ModelTransformation;
import net.minecraft.client.texture.SpriteAtlasTexture;
import net.minecraft.client.util.math.MatrixStack;
-import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
-import net.minecraft.item.Items;
import net.minecraft.util.Identifier;
import net.minecraft.util.registry.Registry;
@@ -32,40 +33,40 @@ import java.util.Optional;
@Deprecated
public class ItemEntryStack extends AbstractEntryStack {
-
+
private ItemStack itemStack;
private int hash = -1;
-
+
public ItemEntryStack(ItemStack itemStack) {
this.itemStack = itemStack;
}
-
+
@Override
public Optional<Identifier> getIdentifier() {
return Optional.ofNullable(Registry.ITEM.getId(getItem()));
}
-
+
@Override
public Type getType() {
return Type.ITEM;
}
-
+
@Override
public int getAmount() {
return itemStack.getCount();
}
-
+
@Override
public void setAmount(int amount) {
itemStack.setCount(amount);
hash = -1;
}
-
+
@Override
public boolean isEmpty() {
return itemStack.isEmpty();
}
-
+
@Override
public EntryStack copy() {
EntryStack stack = EntryStack.create(getItemStack().copy());
@@ -74,19 +75,19 @@ public class ItemEntryStack extends AbstractEntryStack {
}
return stack;
}
-
+
@Override
public Object getObject() {
return itemStack;
}
-
+
@Override
public boolean equalsIgnoreTagsAndAmount(EntryStack stack) {
if (stack.getType() != Type.ITEM)
return false;
return itemStack.getItem() == stack.getItem();
}
-
+
@Override
public boolean equalsAll(EntryStack stack) {
if (stack.getType() != Type.ITEM)
@@ -95,7 +96,7 @@ public class ItemEntryStack extends AbstractEntryStack {
return false;
return ItemStack.areTagsEqual(itemStack, stack.getItemStack());
}
-
+
@Override
public boolean equalsIgnoreAmount(EntryStack stack) {
if (stack.getType() != Type.ITEM)
@@ -104,7 +105,7 @@ public class ItemEntryStack extends AbstractEntryStack {
return false;
return ItemStack.areTagsEqual(itemStack, stack.getItemStack());
}
-
+
@Override
public boolean equalsIgnoreTags(EntryStack stack) {
if (stack.getType() != Type.ITEM)
@@ -113,23 +114,23 @@ public class ItemEntryStack extends AbstractEntryStack {
return false;
return getAmount() == stack.getAmount();
}
-
+
@Override
public int hashCode() {
-// if (hash == -1) {
- int result = 1;
- result = 31 * result + getType().hashCode();
- result = 31 * result + itemStack.getItem().hashCode();
- result = 31 * result + itemStack.getCount();
- result = 31 * result + (itemStack.hasTag() ? itemStack.getTag().hashCode() : 0);
- hash = result;
-// if (hash == -1) {
-// hash = -2;
-// }
-// }
+ // if (hash == -1) {
+ int result = 1;
+ result = 31 * result + getType().hashCode();
+ result = 31 * result + itemStack.getItem().hashCode();
+ result = 31 * result + itemStack.getCount();
+ result = 31 * result + (itemStack.hasTag() ? itemStack.getTag().hashCode() : 0);
+ hash = result;
+ // if (hash == -1) {
+ // hash = -2;
+ // }
+ // }
return hash;
}
-
+
@Nullable
@Override
public QueuedTooltip getTooltip(int mouseX, int mouseY) {
@@ -150,56 +151,55 @@ public class ItemEntryStack extends AbstractEntryStack {
}
return QueuedTooltip.create(toolTip);
}
-
+
@Override
public void render(Rectangle bounds, int mouseX, int mouseY, float delta) {
if (!isEmpty() && getSetting(Settings.RENDER).value().get()) {
ItemStack stack = getItemStack();
- if (ConfigObject.getInstance().doesFastEntryRendering()) {
- ItemRenderer itemRenderer = MinecraftClient.getInstance().getItemRenderer();
- BakedModel model = itemRenderer.getModels().getModel(stack);
- if (stack.getItem().hasPropertyGetters())
- model = model.getItemPropertyOverrides().apply(model, stack, null, null);
- if (model != null) {
- GlStateManager.pushMatrix();
- MinecraftClient.getInstance().getTextureManager().bindTexture(SpriteAtlasTexture.BLOCK_ATLAS_TEX);
- GlStateManager.enableRescaleNormal();
- GlStateManager.translatef(bounds.getCenterX(), bounds.getCenterY(), 100.0F + getZ());
- GlStateManager.scalef(16.0F, -16.0F, 16.0F);
- MatrixStack matrices = new MatrixStack();
- VertexConsumerProvider.Immediate immediate = MinecraftClient.getInstance().getBufferBuilders().getEntityVertexConsumers();
- Item item = stack.getItem();
- boolean bl = !model.hasDepthInGui() || item == Items.SHIELD || item == Items.TRIDENT;
- if (bl)
- GlStateManager.method_24221();
- model.getTransformation().getTransformation(ModelTransformation.Type.GUI).apply(false, matrices);
- matrices.translate(-0.5D, -0.5D, -0.5D);
- if (!model.isBuiltin()) {
- RenderLayer renderLayer = RenderLayers.getItemLayer(stack);
- if (Objects.equals(renderLayer, TexturedRenderLayers.getEntityTranslucent()))
- renderLayer = TexturedRenderLayers.getEntityTranslucentCull();
- VertexConsumer vertexConsumer = stack.hasEnchantmentGlint() && getSetting(Settings.Item.RENDER_ENCHANTMENT_GLINT).value().get() ? VertexConsumers.dual(immediate.getBuffer(RenderLayer.getGlint()), immediate.getBuffer(renderLayer)) : immediate.getBuffer(renderLayer);
- ((ItemRendererHooks) itemRenderer).rei_renderBakedItemModel(model, stack, 15728880, OverlayTexture.DEFAULT_UV, matrices, vertexConsumer);
- } else {
- BuiltinModelItemRenderer.INSTANCE.render(stack, matrices, immediate, 15728880, OverlayTexture.DEFAULT_UV);
- }
- immediate.draw();
- if (bl)
- GlStateManager.method_24222();
- GlStateManager.disableRescaleNormal();
- GlStateManager.popMatrix();
+ // if (true) {
+ ItemRenderer itemRenderer = MinecraftClient.getInstance().getItemRenderer();
+ itemRenderer.zOffset = getZ();
+ BakedModel model = itemRenderer.getModels().getModel(stack);
+ model = model.getItemPropertyOverrides().apply(model, stack, null, null);
+ if (model != null) {
+ MinecraftClient.getInstance().getTextureManager().bindTexture(SpriteAtlasTexture.BLOCK_ATLAS_TEX);
+ GlStateManager.enableRescaleNormal();
+ MatrixStack matrices = new MatrixStack();
+ matrices.translate(bounds.getCenterX(), bounds.getCenterY(), 100.0F + getZ());
+ matrices.scale(bounds.getWidth(), (bounds.getWidth() + bounds.getHeight()) / -2f, bounds.getHeight());
+ VertexConsumerProvider.Immediate immediate = MinecraftClient.getInstance().getBufferBuilders().getEntityVertexConsumers();
+ boolean bl = !model.hasDepthInGui();
+ if (bl)
+ GlStateManager.method_24221();
+ model.getTransformation().getTransformation(ModelTransformation.Type.GUI).apply(false, matrices);
+ matrices.translate(-0.5D, -0.5D, -0.5D);
+ if (!model.isBuiltin()) {
+ RenderLayer renderLayer = RenderLayers.getItemLayer(stack);
+ if (Objects.equals(renderLayer, TexturedRenderLayers.getEntityTranslucent()))
+ renderLayer = TexturedRenderLayers.getEntityTranslucentCull();
+ VertexConsumer vertexConsumer = stack.hasEnchantmentGlint() && getSetting(Settings.Item.RENDER_ENCHANTMENT_GLINT).value().get() ? VertexConsumers.dual(immediate.getBuffer(RenderLayer.getGlint()), immediate.getBuffer(renderLayer)) : immediate.getBuffer(renderLayer);
+ ((ItemRendererHooks) itemRenderer).rei_renderBakedItemModel(model, stack, 15728880, OverlayTexture.DEFAULT_UV, matrices, vertexConsumer);
+ } else {
+ BuiltinModelItemRenderer.INSTANCE.render(stack, matrices, immediate, 15728880, OverlayTexture.DEFAULT_UV);
}
- } else {
- ((ItemStackHook) (Object) stack).rei_setRenderEnchantmentGlint(getSetting(Settings.Item.RENDER_ENCHANTMENT_GLINT).value().get());
- ItemRenderer itemRenderer = MinecraftClient.getInstance().getItemRenderer();
- itemRenderer.zOffset = getZ();
- int i1 = bounds.getCenterX() - 8;
- int i2 = bounds.getCenterY() - 8;
- itemRenderer.renderGuiItemIcon(stack, i1, i2);
- itemRenderer.renderGuiItemOverlay(MinecraftClient.getInstance().textRenderer, stack, i1, i2, getSetting(Settings.RENDER_COUNTS).value().get() ? getSetting(Settings.COUNTS).value().apply(this) : "");
- itemRenderer.zOffset = 0.0F;
- ((ItemStackHook) (Object) stack).rei_setRenderEnchantmentGlint(true);
+ immediate.draw();
+ if (bl)
+ GlStateManager.method_24222();
+ GlStateManager.disableRescaleNormal();
}
+ itemRenderer.renderGuiItemOverlay(MinecraftClient.getInstance().textRenderer, stack, bounds.x, bounds.y, getSetting(Settings.RENDER_COUNTS).value().get() ? getSetting(Settings.COUNTS).value().apply(this) : "");
+ itemRenderer.zOffset = 0.0F;
+ // } else {
+ // ((ItemStackHook) (Object) stack).rei_setRenderEnchantmentGlint(getSetting(Settings.Item.RENDER_ENCHANTMENT_GLINT).value().get());
+ // ItemRenderer itemRenderer = MinecraftClient.getInstance().getItemRenderer();
+ // itemRenderer.zOffset = getZ();
+ // int i1 = bounds.x + 1;
+ // int i2 = bounds.y + 1;
+ // itemRenderer.renderGuiItemIcon(stack, i1, i2);
+ // itemRenderer.renderGuiItemOverlay(MinecraftClient.getInstance().textRenderer, stack, i1, i2, getSetting(Settings.RENDER_COUNTS).value().get() ? getSetting(Settings.COUNTS).value().apply(this) : "");
+ // itemRenderer.zOffset = 0.0F;
+ // ((ItemStackHook) (Object) stack).rei_setRenderEnchantmentGlint(true);
+ // }
}
}
}