diff options
| author | Jakub <53441451+kuba6000@users.noreply.github.com> | 2023-02-27 22:09:18 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-27 22:09:18 +0100 |
| commit | e73d866f070863892b232ade1a2fb6de9bc97602 (patch) | |
| tree | 45fc760fb1ae3f1dd5df7e69c9423300b5c27ec4 /src | |
| parent | 4e6398bb504fe51530265984e628bffb30f03290 (diff) | |
| download | GT5-Unofficial-e73d866f070863892b232ade1a2fb6de9bc97602.tar.gz GT5-Unofficial-e73d866f070863892b232ade1a2fb6de9bc97602.tar.bz2 GT5-Unofficial-e73d866f070863892b232ade1a2fb6de9bc97602.zip | |
Fix GUI scrolling in EIG (#295)
Former-commit-id: b416a306e0729924c301520ba02cd6b2c35270f1
Diffstat (limited to 'src')
2 files changed, 4 insertions, 8 deletions
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_ExtremeIndustrialGreenhouse.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_ExtremeIndustrialGreenhouse.java index 6bb34f8cdc..408342006e 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_ExtremeIndustrialGreenhouse.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_ExtremeIndustrialGreenhouse.java @@ -632,12 +632,8 @@ public class GT_TileEntity_ExtremeIndustrialGreenhouse return Collections.emptyList(); }).setSize(18, 18)); } - cropsContainer.widget(row.setPos(0, i * 18).setEnabled(widget -> { - int y = widget.getPos().y; - int cy = cropsContainer.getVerticalScrollOffset(); - int ch = cropsContainer.getVisibleHeight(); - return y >= cy - ch && y <= cy + ch; - })); + cropsContainer.widget( + row.setPos(0, i * 18).setEnabled(widget -> widget.getPos().y < cropsContainer.getVisibleHeight())); } cropsContainer.attachSyncer( new FakeSyncWidget.ListSyncer<>( @@ -1033,7 +1029,6 @@ public class GT_TileEntity_ExtremeIndustrialGreenhouse World world = tileEntity.getBaseMetaTileEntity().getWorld(); this.input = input.copy(); this.isValid = false; - this.noHumidity = noHumidity; if (IC2) { GreenHouseSlotIC2(tileEntity, world, input, noHumidity); return; @@ -1093,6 +1088,7 @@ public class GT_TileEntity_ExtremeIndustrialGreenhouse ItemStack input, boolean noHumidity) { if (!ItemList.IC2_Crop_Seeds.isStackEqual(input, true, true)) return; this.isIC2Crop = true; + this.noHumidity = noHumidity; recalculate(tileEntity, world); if (this.isValid) input.stackSize--; } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_HTGR.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_HTGR.java index 656d9a38d2..a29eebb947 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_HTGR.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_HTGR.java @@ -461,7 +461,7 @@ public class GT_TileEntity_HTGR extends GT_MetaTileEntity_EnhancedMultiBlockBase } @Override - @SuppressWarnings("unchecked") + @SuppressWarnings({ "unchecked", "rawtypes" }) public void addInformation(ItemStack p_77624_1_, EntityPlayer p_77624_2_, List aList, boolean p_77624_4_) { if (tooltip.containsKey(getDamage(p_77624_1_))) aList.add(tooltip.get(getDamage(p_77624_1_))); aList.add("Material for High Temperature Gas-cooled Reactor"); |