From 60a668aeaa7d2e849323026bb94ee969b12515e6 Mon Sep 17 00:00:00 2001 From: Chicken-Bomes Date: Thu, 3 Jul 2014 15:50:24 +1000 Subject: [PATCH] Minor subset improvements. Use latest CCC in build --- build/build.properties | 2 +- src/codechicken/nei/SubsetWidget.java | 15 +++++++++++---- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/build/build.properties b/build/build.properties index 47d44fd5..a76d7c74 100644 --- a/build/build.properties +++ b/build/build.properties @@ -1,5 +1,5 @@ mc_version=1.7.10 forge_version=10.13.0.1151 ccl_version=1.1.1.88 -ccc_version=1.0.1.6 +ccc_version=1.0.1.+ mod_version=1.0.2 diff --git a/src/codechicken/nei/SubsetWidget.java b/src/codechicken/nei/SubsetWidget.java index d6374337..b4082d9a 100644 --- a/src/codechicken/nei/SubsetWidget.java +++ b/src/codechicken/nei/SubsetWidget.java @@ -55,8 +55,13 @@ public class SubsetWidget extends Button implements ItemFilterProvider, ItemsLoa SubsetWidget.showOnly(tag); else SubsetWidget.setHidden(tag, button == 1); - } else - SubsetWidget.setHidden(state.items.get(slot-sorted.size()), button == 1); + } else { + ItemStack item = state.items.get(slot-sorted.size()); + if(NEIClientUtils.controlKey()) + NEIClientUtils.cheatItem(item, button, -1); + else + SubsetWidget.setHidden(state.items.get(slot-sorted.size()), button == 1); + } } @Override @@ -280,8 +285,10 @@ public class SubsetWidget extends Button implements ItemFilterProvider, ItemsLoa if(slot.contentHeight() > height) width+=slot.scrollbarDim().width; - if(pwidth >= 0 ? x+width+pwidth > area.x2() : x-width < area.x1()) - pwidth*=-1; + boolean fitLeft = x-width >= area.x1(); + boolean fitRight = x+width+pwidth <= area.x2(); + if(pwidth >= 0 ? !fitRight && fitLeft : !fitLeft) + pwidth*=-1;//swap x += pwidth >= 0 ? pwidth : -width; slot.setSize(x, y, width, height);