@@ -61,24 +61,34 @@ object ContainerPreview : Module(
61
61
private var stackContainer: GuiPreview ? = null
62
62
63
63
init {
64
-
65
64
safeListener<GuiScreenEvent .DrawScreenEvent .Post > {
66
65
if (mc.currentScreen !is GuiContainer ) return @safeListener
67
66
val gui = it.gui as GuiContainer
67
+
68
68
if (! Keyboard .isKeyDown(previewLock.key)) {
69
- gui.slotUnderMouse?.let {slotUnder ->
70
- if (slotUnder.hasStack && ! slotUnder.stack.isEmpty && (slotUnder.stack.item is ItemShulkerBox || slotUnder.stack.item.block == Blocks .ENDER_CHEST )) {
69
+ gui.slotUnderMouse?.let { slotUnder ->
70
+ if (slotUnder.hasStack
71
+ && ! slotUnder.stack.isEmpty
72
+ && (slotUnder.stack.item is ItemShulkerBox || slotUnder.stack.item.block == Blocks .ENDER_CHEST )
73
+ ) {
71
74
if (stackContainer == null || stackContainer?.parentContainer != slotUnder.stack) {
72
75
stackContainer = createPreviewGui(slotUnder.stack, getContainerContents(slotUnder.stack))
73
76
}
74
- } else stackContainer = null
77
+ } else {
78
+ stackContainer = null
79
+ }
80
+
75
81
stackContainer?.let { sc ->
76
82
val res = ScaledResolution (mc)
77
83
// ensure the preview gui is on screen
78
84
val dX = it.mouseX + 8
79
- val previewDrawX = if (dX + previewWidth > res.scaledWidth) res.scaledWidth - previewWidth else dX
85
+ val previewDrawX = if (dX + previewWidth > res.scaledWidth) {
86
+ res.scaledWidth - previewWidth
87
+ } else dX
80
88
val dY = it.mouseY
81
- val previewDrawY = if (dY + previewHeight > res.scaledHeight) res.scaledHeight - previewHeight else dY
89
+ val previewDrawY = if (dY + previewHeight > res.scaledHeight) {
90
+ res.scaledHeight - previewHeight
91
+ } else dY
82
92
sc.posX = previewDrawX
83
93
sc.posY = previewDrawY
84
94
}
@@ -100,7 +110,8 @@ object ContainerPreview : Module(
100
110
if (! itemFrames) return @safeListener
101
111
mc.renderManager.pointedEntity?.let { pe ->
102
112
if (pe !is EntityItemFrame ) return @safeListener
103
- if (! (pe.displayedItem.item.block is BlockShulkerBox || pe.displayedItem.item.block is BlockEnderChest )) return @safeListener
113
+ if (! (pe.displayedItem.item.block is BlockShulkerBox
114
+ || pe.displayedItem.item.block is BlockEnderChest )) return @safeListener
104
115
val posX = pe.posX + (pe.facingDirection?.xOffset ? : 0 ) * 0.1
105
116
val posY = pe.posY + (pe.facingDirection?.yOffset ? : 0 ) * 0.1
106
117
val posZ = pe.posZ + (pe.facingDirection?.zOffset ? : 0 ) * 0.1
@@ -187,6 +198,7 @@ object ContainerPreview : Module(
187
198
class GuiPreview (inventorySlotsIn : Container , val parentContainer : ItemStack ) : GuiContainer(inventorySlotsIn) {
188
199
var posX: Int = 0
189
200
var posY: Int = 0
201
+
190
202
init {
191
203
this .mc = Minecraft .getMinecraft()
192
204
this .fontRenderer = this .mc.fontRenderer
0 commit comments