mirror of
https://github.com/GTNewHorizons/NotEnoughItems.git
synced 2026-11-18 19:39:06 +00:00
Compare commits
3
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
2bf5a1cf9f | ||
|
|
2126ec78bc | ||
|
|
5f6209366a |
No files matched your search
@@ -17,6 +17,8 @@ public class ColorUtils {
|
||||
buttonLabelNormal = color.rgb("buttonLabelNormal", "0xE0E0E0"),
|
||||
buttonLabelHover = color.rgb("buttonLabelHover", "0xFFFFA0"),
|
||||
buttonLabelDisabled = color.rgb("buttonLabelDisabled", "0x601010"),
|
||||
buttonLabelInactive = color.rgb("buttonLabelInactive", "0xA0A0A0");
|
||||
buttonLabelInactive = color.rgb("buttonLabelInactive", "0xA0A0A0"),
|
||||
|
||||
craftingTreeLine = color.argb("craftingTreeLine", "0xFF888888");
|
||||
// spotless:on
|
||||
}
|
||||
@@ -571,7 +571,7 @@ public class NEIClientUtils extends NEIServerUtils {
|
||||
return multiplier;
|
||||
}
|
||||
|
||||
return StackInfo.itemStackToNBT(stack).hasKey("gtFluidName") ? 144 : stack.getMaxStackSize();
|
||||
return StackInfo.isFluidDisplayItem(stack) ? 144 : stack.getMaxStackSize();
|
||||
}
|
||||
|
||||
public static void drawRect(double left, double top, double width, double height, Color color) {
|
||||
|
||||
@@ -42,7 +42,7 @@ public class BookmarkItem {
|
||||
|
||||
this.groupId = groupId;
|
||||
this.stack = stack;
|
||||
this.factor = StackInfo.isFluidDisplayItem(stack) ? Math.min(144, nbTag.getInteger("Count")) : 1;
|
||||
this.factor = StackInfo.isFluidDisplayItem(stack) ? Math.max(nbTag.getInteger("Count"), 1) : 1;
|
||||
}
|
||||
|
||||
public Builder factor(long factor) {
|
||||
|
||||
@@ -19,6 +19,7 @@ import org.lwjgl.opengl.GL12;
|
||||
|
||||
import codechicken.lib.gui.GuiDraw;
|
||||
import codechicken.lib.vec.Rectangle4i;
|
||||
import codechicken.nei.ColorUtils;
|
||||
import codechicken.nei.NEIClientUtils;
|
||||
import codechicken.nei.NEIClientUtils.Alignment;
|
||||
import codechicken.nei.PositionedStack;
|
||||
@@ -123,7 +124,7 @@ class CraftingTreeCanvas {
|
||||
18,
|
||||
18).build();
|
||||
|
||||
private static final Color LINE_COLOR = new Color(0xFF888888, true);
|
||||
private static final Color LINE_COLOR = new Color(ColorUtils.craftingTreeLine.getColor(), true);
|
||||
private static final int HOVER_COLOR = 0x66888888;
|
||||
private static final float BADGE_SCALE = 0.6f;
|
||||
|
||||
|
||||
@@ -54,7 +54,7 @@ class ItemTreeSlot {
|
||||
this.emptyStack = ingrItem.getItemStack(0);
|
||||
}
|
||||
|
||||
this.isFluidDisplay = StackInfo.itemStackToNBT(this.emptyStack).hasKey("gtFluidName");
|
||||
this.isFluidDisplay = StackInfo.isFluidDisplayItem(this.emptyStack);
|
||||
this.isContainerItem = isContainerItem(this.emptyStack);
|
||||
}
|
||||
|
||||
|
||||
@@ -78,7 +78,7 @@ class StatsPanel extends ScrollContainer {
|
||||
this.icon = icon;
|
||||
this.recipeId = recipeId;
|
||||
this.multiplier = multiplier;
|
||||
this.isFluidDisplay = StackInfo.itemStackToNBT(stack).hasKey("gtFluidName");
|
||||
this.isFluidDisplay = StackInfo.isFluidDisplayItem(stack);
|
||||
this.info = this.recipeId != null ? handlerInfo(this.recipeId.getHandlerName()) : null;
|
||||
this.w = SLOT_SIZE;
|
||||
this.h = SLOT_SIZE;
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 1.7 KiB After Width: | Height: | Size: 1.3 KiB |
Reference in new issue
Block a user