diff options
| -rw-r--r-- | dependencies.gradle | 2 | ||||
| -rw-r--r-- | src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_CraftingInput_ME.java | 19 | ||||
| -rw-r--r-- | src/main/resources/assets/gregtech/textures/gui/overlay_slot/pattern_me.png | bin | 417 -> 421 bytes |
3 files changed, 16 insertions, 5 deletions
diff --git a/dependencies.gradle b/dependencies.gradle index 83ea3c5418..ce03e49e0e 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -38,7 +38,7 @@ dependencies { api("net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev") api("com.github.GTNewHorizons:NotEnoughItems:2.3.70-GTNH:dev") api("com.github.GTNewHorizons:GTNHLib:0.0.13:dev") - api("com.github.GTNewHorizons:ModularUI:1.1.14:dev") + api("com.github.GTNewHorizons:ModularUI:1.1.16:dev") api("com.github.GTNewHorizons:waila:1.6.0:dev") api("com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-235-GTNH:dev") api("com.github.GTNewHorizons:AE2FluidCraft-Rework:1.1.29-gtnh-pre:dev") diff --git a/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_CraftingInput_ME.java b/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_CraftingInput_ME.java index cfd953c3c7..2a9598a0d8 100644 --- a/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_CraftingInput_ME.java +++ b/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_CraftingInput_ME.java @@ -10,6 +10,7 @@ import javax.annotation.Nullable; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.inventory.InventoryCrafting; +import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; @@ -50,6 +51,7 @@ import appeng.api.storage.data.IAEFluidStack; import appeng.api.storage.data.IAEItemStack; import appeng.api.util.AECableType; import appeng.api.util.DimensionalCoord; +import appeng.items.misc.ItemEncodedPattern; import appeng.me.GridAccessException; import appeng.me.helpers.AENetworkProxy; import appeng.me.helpers.IGridProxyable; @@ -505,10 +507,19 @@ public class GT_MetaTileEntity_Hatch_CraftingInput_ME extends GT_MetaTileEntity_ .endAtSlot(MAX_PATTERN_COUNT - 1) .phantom(false) .background(getGUITextureSet().getItemSlot(), GT_UITextures.OVERLAY_SLOT_PATTERN_ME) - .widgetCreator( - slot -> new SlotWidget(slot) - .setFilter(itemStack -> itemStack.getItem() instanceof ICraftingPatternItem) - .setChangeListener(() -> onPatternChange(slot))) + .widgetCreator(slot -> new SlotWidget(slot) { + + @Override + protected ItemStack getItemStackForRendering(Slot slotIn) { + var stack = slot.getStack(); + if (stack == null || !(stack.getItem() instanceof ItemEncodedPattern patternItem)) { + return stack; + } + var output = patternItem.getOutput(stack); + return output != null ? output : stack; + } + }.setFilter(itemStack -> itemStack.getItem() instanceof ICraftingPatternItem) + .setChangeListener(() -> onPatternChange(slot))) .build() .setPos(7, 9)) .widget( diff --git a/src/main/resources/assets/gregtech/textures/gui/overlay_slot/pattern_me.png b/src/main/resources/assets/gregtech/textures/gui/overlay_slot/pattern_me.png Binary files differindex f7305270a6..86f9f49132 100644 --- a/src/main/resources/assets/gregtech/textures/gui/overlay_slot/pattern_me.png +++ b/src/main/resources/assets/gregtech/textures/gui/overlay_slot/pattern_me.png |
