diff options
author | Harry <harryyunull@gmail.com> | 2023-07-28 04:22:41 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-07-28 10:22:41 +0200 |
commit | c82e45b0aa87ba9e982a770fab08040d9e6d9459 (patch) | |
tree | 6f0a96c35962928e414bd005eddea12638d6f2b1 /src/main | |
parent | ea1c6f981ef6d01cd7dd42937283e140be08a144 (diff) | |
download | GT5-Unofficial-c82e45b0aa87ba9e982a770fab08040d9e6d9459.tar.gz GT5-Unofficial-c82e45b0aa87ba9e982a770fab08040d9e6d9459.tar.bz2 GT5-Unofficial-c82e45b0aa87ba9e982a770fab08040d9e6d9459.zip |
Crafting Input: display pattern output by default (#2186)
* Crafting Input: display pattern output by default
* update modularui
Diffstat (limited to 'src/main')
2 files changed, 15 insertions, 4 deletions
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 |