aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/BetterContainers.java
diff options
context:
space:
mode:
authorMoulberry <james.jenour@protonmail.com>2021-09-02 20:00:10 +0800
committerMoulberry <james.jenour@protonmail.com>2021-09-02 20:00:10 +0800
commit8eee6262a6e2c372240331f3c43c2279bd18539e (patch)
tree8ebf9cdf596fae2ec6b149826475d1d84de9ec3a /src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/BetterContainers.java
parent7cab76126da90f1884c111a1ee589b90a6ef828e (diff)
downloadnotenoughupdates-8eee6262a6e2c372240331f3c43c2279bd18539e.tar.gz
notenoughupdates-8eee6262a6e2c372240331f3c43c2279bd18539e.tar.bz2
notenoughupdates-8eee6262a6e2c372240331f3c43c2279bd18539e.zip
finish enchant gui
Diffstat (limited to 'src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/BetterContainers.java')
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/BetterContainers.java27
1 files changed, 20 insertions, 7 deletions
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/BetterContainers.java b/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/BetterContainers.java
index 0aa5e84d..65ccd73f 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/BetterContainers.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/BetterContainers.java
@@ -3,6 +3,7 @@ package io.github.moulberry.notenoughupdates.miscfeatures;
import com.google.gson.JsonObject;
import io.github.moulberry.notenoughupdates.NEUEventListener;
import io.github.moulberry.notenoughupdates.NotEnoughUpdates;
+import io.github.moulberry.notenoughupdates.util.SBInfo;
import io.github.moulberry.notenoughupdates.util.TexLoc;
import io.github.moulberry.notenoughupdates.util.Utils;
import net.minecraft.client.Minecraft;
@@ -119,17 +120,29 @@ public class BetterContainers {
return isChestOpen() && ((loaded && texture != null) || System.currentTimeMillis() - lastRenderMillis < 200) && !isBlacklistedInventory();
}
- public static boolean isBlankStack(ItemStack stack) {
+ public static boolean isBlankStack(int index, ItemStack stack) {
+ if(index == 42 && NotEnoughUpdates.INSTANCE.hasSkyblockScoreboard() &&
+ (SBInfo.getInstance().lastOpenContainerName.contains("'s Profile") ||
+ SBInfo.getInstance().lastOpenContainerName.contains("s' Profile"))) {
+ return false;
+ }
+
return stack != null && stack.getItem() == Item.getItemFromBlock(Blocks.stained_glass_pane) &&
stack.getItemDamage() == 15 &&
stack.getDisplayName() != null && stack.getDisplayName().trim().isEmpty();
}
- public static boolean shouldRenderStack(ItemStack stack) {
- return !isBlankStack(stack) && !isToggleOff(stack) && !isToggleOn(stack);
+ public static boolean shouldRenderStack(int index, ItemStack stack) {
+ return !isBlankStack(index, stack) && !isToggleOff(stack) && !isToggleOn(stack);
}
- public static boolean isButtonStack(ItemStack stack) {
+ public static boolean isButtonStack(int index, ItemStack stack) {
+ if(index == 42 && NotEnoughUpdates.INSTANCE.hasSkyblockScoreboard() &&
+ (SBInfo.getInstance().lastOpenContainerName.contains("'s Profile") ||
+ SBInfo.getInstance().lastOpenContainerName.contains("s' Profile"))) {
+ return true;
+ }
+
return stack != null && stack.getItem() != Item.getItemFromBlock(Blocks.stained_glass_pane)
&& NotEnoughUpdates.INSTANCE.manager.getInternalNameForItem(stack) == null && !isToggleOn(stack) && !isToggleOff(stack);
}
@@ -220,7 +233,7 @@ public class BetterContainers {
!lower.getDisplayName().getUnformattedText().contains("Stakes");
for (int index = 0; index < size; index++) {
ItemStack stack = getStackCached(lower, index);
- buttons[index%9][index/9] = isButtonStack(stack);
+ buttons[index%9][index/9] = isButtonStack(index, stack);
if(ultrasequencer && stack.getItem() == Items.dye) {
buttons[index%9][index/9] = false;
@@ -234,7 +247,7 @@ public class BetterContainers {
//buttons[index%9][index/9] = false;
//slots[index%9][index/9] = true;
} else {
- slots[index%9][index/9] = !isBlankStack(stack) && !buttons[index%9][index/9];
+ slots[index%9][index/9] = !isBlankStack(index, stack) && !buttons[index%9][index/9];
}
}
for (int index = 0; index < size; index++) {
@@ -351,7 +364,7 @@ public class BetterContainers {
IInventory lower = ((ContainerChest)container).getLowerChestInventory();
int size = lower.getSizeInventory();
for(int index=0; index<size; index++) {
- if(isBlankStack(getStackCached(lower, index))) return true;
+ if(isBlankStack(index, getStackCached(lower, index))) return true;
}
}
return false;