aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/SlotLocking.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/SlotLocking.java')
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/SlotLocking.java295
1 files changed, 221 insertions, 74 deletions
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/SlotLocking.java b/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/SlotLocking.java
index 99ab6a84..e7c5b460 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/SlotLocking.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/SlotLocking.java
@@ -1,5 +1,7 @@
package io.github.moulberry.notenoughupdates.miscfeatures;
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
import com.google.gson.JsonObject;
import io.github.moulberry.notenoughupdates.NotEnoughUpdates;
import io.github.moulberry.notenoughupdates.core.config.KeybindHelper;
@@ -15,6 +17,7 @@ import net.minecraft.client.renderer.Tessellator;
import net.minecraft.client.renderer.WorldRenderer;
import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
import net.minecraft.inventory.Slot;
+import net.minecraft.item.ItemStack;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.client.event.GuiScreenEvent;
import net.minecraftforge.fml.common.eventhandler.EventPriority;
@@ -26,15 +29,23 @@ import org.lwjgl.opengl.GL11;
import org.lwjgl.util.vector.Vector2f;
import org.lwjgl.util.vector.Vector3f;
+import java.io.*;
+import java.nio.charset.StandardCharsets;
import java.util.HashMap;
import java.util.function.Consumer;
+import java.util.zip.GZIPInputStream;
+import java.util.zip.GZIPOutputStream;
public class SlotLocking {
private static final SlotLocking INSTANCE = new SlotLocking();
+
+ private static final Gson GSON = new GsonBuilder().setPrettyPrinting().create();
+
private static final LockedSlot DEFAULT_LOCKED_SLOT = new LockedSlot();
private final ResourceLocation LOCK = new ResourceLocation("notenoughupdates:slotlocking/lock.png");
+ private final ResourceLocation BOUND = new ResourceLocation("notenoughupdates:slotlocking/bound.png");
public static SlotLocking getInstance() {
return INSTANCE;
@@ -63,8 +74,28 @@ public class SlotLocking {
private boolean lockKeyHeld = false;
private Slot pairingSlot = null;
+ public void loadConfig(File file) {
+ try(BufferedReader reader = new BufferedReader(new InputStreamReader(new FileInputStream(file), StandardCharsets.UTF_8))) {
+ config = GSON.fromJson(reader, SlotLockingConfig.class);
+ } catch(Exception ignored) { }
+ if(config == null) {
+ config = new SlotLockingConfig();
+ }
+ }
+
+ public void saveConfig(File file) {
+ try {
+ file.createNewFile();
+ try(BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(file), StandardCharsets.UTF_8))) {
+ writer.write(GSON.toJson(config));
+ }
+ } catch(Exception ignored) {
+ ignored.printStackTrace();
+ }
+ }
+
private LockedSlot[] getDataForProfile() {
- if(!NotEnoughUpdates.INSTANCE.hasSkyblockScoreboard()) return null;
+ if(!NotEnoughUpdates.INSTANCE.hasSkyblockScoreboard() || !NotEnoughUpdates.INSTANCE.config.slotLocking.enableSlotLocking) return null;
if(SBInfo.getInstance().currentProfile == null) return null;
SlotLockProfile profile = config.profileData.computeIfAbsent(SBInfo.getInstance().currentProfile,
@@ -94,9 +125,9 @@ public class SlotLocking {
return slot;
}
- @SubscribeEvent
- public void keyboardInput(GuiScreenEvent.KeyboardInputEvent.Post event) {
- if(!NotEnoughUpdates.INSTANCE.hasSkyblockScoreboard()) {
+ @SubscribeEvent(priority = EventPriority.LOW)
+ public void keyboardInput(GuiScreenEvent.KeyboardInputEvent.Pre event) {
+ if(!NotEnoughUpdates.INSTANCE.hasSkyblockScoreboard() || !NotEnoughUpdates.INSTANCE.config.slotLocking.enableSlotLocking) {
return;
}
if(!(Minecraft.getMinecraft().currentScreen instanceof GuiContainer)) {
@@ -104,8 +135,8 @@ public class SlotLocking {
}
GuiContainer container = (GuiContainer) Minecraft.getMinecraft().currentScreen;
- int key = Keyboard.KEY_L;
- if(!lockKeyHeld && KeybindHelper.isKeyPressed(key)) {
+ int key = NotEnoughUpdates.INSTANCE.config.slotLocking.slotLockKey;
+ if(!lockKeyHeld && KeybindHelper.isKeyPressed(key) && !Keyboard.isRepeatEvent()) {
final ScaledResolution scaledresolution = new ScaledResolution(Minecraft.getMinecraft());
final int scaledWidth = scaledresolution.getScaledWidth();
final int scaledHeight = scaledresolution.getScaledHeight();
@@ -113,7 +144,7 @@ public class SlotLocking {
int mouseY = scaledHeight - Mouse.getY() * scaledHeight / Minecraft.getMinecraft().displayHeight - 1;
Slot slot = container.getSlotAtPosition(mouseX, mouseY);
- if(slot != null && slot.inventory == Minecraft.getMinecraft().thePlayer.inventory) {
+ if(slot != null && slot.getSlotIndex() != 8 && slot.inventory == Minecraft.getMinecraft().thePlayer.inventory) {
int slotNum = slot.getSlotIndex();
if(slotNum >= 0 && slotNum <= 39) {
boolean isHotbar = slotNum < 9;
@@ -131,11 +162,16 @@ public class SlotLocking {
if(lockedSlots != null) {
if(lockedSlots[slotNum] == null) {
lockedSlots[slotNum] = new LockedSlot();
- lockedSlots[slotNum].locked = true;
- lockedSlots[slotNum].boundTo = -1;
- } else {
- lockedSlots[slotNum].locked = !lockedSlots[slotNum].locked;
- lockedSlots[slotNum].boundTo = -1;
+ }
+ lockedSlots[slotNum].locked = !lockedSlots[slotNum].locked;
+ lockedSlots[slotNum].boundTo = -1;
+
+ if(isHotbar && lockedSlots[slotNum].locked) {
+ for(int i = 9; i <= 39; i++) {
+ if(lockedSlots[i] != null && lockedSlots[i].boundTo == slotNum) {
+ lockedSlots[i].boundTo = -1;
+ }
+ }
}
}
}
@@ -147,9 +183,9 @@ public class SlotLocking {
}
}
- @SubscribeEvent
- public void mouseEvent(GuiScreenEvent.MouseInputEvent event) {
- if(!NotEnoughUpdates.INSTANCE.hasSkyblockScoreboard()) {
+ @SubscribeEvent(priority = EventPriority.LOW)
+ public void mouseEvent(GuiScreenEvent.MouseInputEvent.Pre event) {
+ if(!NotEnoughUpdates.INSTANCE.hasSkyblockScoreboard() || !NotEnoughUpdates.INSTANCE.config.slotLocking.enableSlotLocking) {
return;
}
if(!(Minecraft.getMinecraft().currentScreen instanceof GuiContainer)) {
@@ -157,7 +193,7 @@ public class SlotLocking {
}
GuiContainer container = (GuiContainer) Minecraft.getMinecraft().currentScreen;
- if(lockKeyHeld && pairingSlot != null) {
+ if(NotEnoughUpdates.INSTANCE.config.slotLocking.enableSlotBinding && lockKeyHeld && pairingSlot != null) {
final ScaledResolution scaledresolution = new ScaledResolution(Minecraft.getMinecraft());
final int scaledWidth = scaledresolution.getScaledWidth();
final int scaledHeight = scaledresolution.getScaledHeight();
@@ -165,9 +201,10 @@ public class SlotLocking {
int mouseY = scaledHeight - Mouse.getY() * scaledHeight / Minecraft.getMinecraft().displayHeight - 1;
Slot slot = container.getSlotAtPosition(mouseX, mouseY);
- if(slot != null && slot.inventory == Minecraft.getMinecraft().thePlayer.inventory) {
+ if(slot != null && slot.getSlotIndex() != 8 && slot.inventory == Minecraft.getMinecraft().thePlayer.inventory) {
int slotNum = slot.getSlotIndex();
if(slotNum >= 0 && slotNum <= 39) {
+
boolean isHotbar = slotNum < 9;
boolean isInventory = !isHotbar && slotNum < 36;
boolean isArmor = !isHotbar && !isInventory;
@@ -176,14 +213,30 @@ public class SlotLocking {
if(isHotbar && slotNum != pairingNum) {
LockedSlot[] lockedSlots = getDataForProfile();
if(lockedSlots != null) {
- if(lockedSlots[pairingNum] == null) {
- lockedSlots[pairingNum] = new LockedSlot();
+ if(lockedSlots[slotNum] == null) {
+ lockedSlots[slotNum] = new LockedSlot();
+ }
+ if(!lockedSlots[slotNum].locked) {
+ if(lockedSlots[pairingNum] == null) {
+ lockedSlots[pairingNum] = new LockedSlot();
+ }
+ lockedSlots[pairingNum].boundTo = slotNum;
+ lockedSlots[pairingNum].locked = false;
+
+ lockedSlots[slotNum].boundTo = pairingNum;
}
- lockedSlots[pairingNum].boundTo = slotNum;
- lockedSlots[pairingNum].locked = false;
}
}
}
+ } else {
+ int pairingNum = pairingSlot.getSlotIndex();
+ LockedSlot[] lockedSlots = getDataForProfile();
+ if(lockedSlots != null && lockedSlots[pairingNum] != null) {
+ if(lockedSlots[pairingNum].boundTo >= 0) {
+ lockedSlots[lockedSlots[pairingNum].boundTo] = null;
+ }
+ lockedSlots[pairingNum] = null;
+ }
}
}
}
@@ -191,31 +244,34 @@ public class SlotLocking {
@SubscribeEvent(priority = EventPriority.LOW)
public void drawScreenEvent(GuiScreenEvent.DrawScreenEvent.Post event) {
- if(!event.isCanceled() && pairingSlot != null && lockKeyHeld) {
+ if(NotEnoughUpdates.INSTANCE.config.slotLocking.enableSlotBinding && !event.isCanceled() && pairingSlot != null && lockKeyHeld) {
+ LockedSlot[] lockedSlots = getDataForProfile();
+ LockedSlot lockedSlot = getLockedSlot(lockedSlots, pairingSlot.getSlotIndex());
+ if(lockedSlot.boundTo >= 0 && lockedSlot.boundTo < 8) {
+ return;
+ }
+
if(!(Minecraft.getMinecraft().currentScreen instanceof GuiContainer)) {
return;
}
GuiContainer container = (GuiContainer) Minecraft.getMinecraft().currentScreen;
+ int x1 = container.guiLeft+pairingSlot.xDisplayPosition+8;
+ int y1 = container.guiTop+pairingSlot.yDisplayPosition+8;
int x2 = event.mouseX;
int y2 = event.mouseY;
- LockedSlot[] lockedSlots = getDataForProfile();
- LockedSlot lockedSlot = getLockedSlot(lockedSlots, pairingSlot.getSlotIndex());
- if(lockedSlot.boundTo >= 0 && lockedSlot.boundTo < 9) {
- Slot boundSlot = container.inventorySlots.getSlotFromInventory(Minecraft.getMinecraft().thePlayer.inventory, lockedSlot.boundTo);
- x2 = container.guiLeft+boundSlot.xDisplayPosition+8;
- y2 = container.guiTop+boundSlot.yDisplayPosition+8;
+ if(x2 > x1-8 && x2 < x1+8 &&
+ y2 > y1-8 && y2 < y1+8) {
+ return;
}
- drawLinkArrow(container.guiLeft+pairingSlot.xDisplayPosition+8,
- container.guiTop+pairingSlot.yDisplayPosition+8,
- x2, y2);
+ drawLinkArrow(x1, y1, x2, y2);
}
}
private void drawLinkArrow(int x1, int y1, int x2, int y2) {
- GlStateManager.color(0x33/255f, 0xff/255f, 0xcc/255f, 1f);
+ GlStateManager.color(0x33/255f, 0xee/255f, 0xdd/255f, 1f);
GlStateManager.disableLighting();
RenderHelper.disableStandardItemLighting();
GlStateManager.disableTexture2D();
@@ -237,50 +293,56 @@ public class SlotLocking {
GL11.glLineWidth(1f);
GL11.glEnable(GL11.GL_LINE_SMOOTH);
- /*worldrenderer.begin(GL11.GL_TRIANGLE_STRIP, DefaultVertexFormats.POSITION);
- worldrenderer.pos(x1, y1, 0.0D).endVertex();
- worldrenderer.pos(x1+vec.x-side.x, y1+vec.y-side.y, 0.0D).endVertex();
- worldrenderer.pos(x1+vec.x+side.x, y1+vec.y+side.y, 0.0D).endVertex();
- worldrenderer.pos(x2-vec.x-side.x, y2-vec.y-side.y, 0.0D).endVertex();
- worldrenderer.pos(x2-vec.x+side.x, y2-vec.y+side.y, 0.0D).endVertex();
- worldrenderer.pos(x2, y2, 0.0D).endVertex();*/
-
Tessellator tessellator = Tessellator.getInstance();
WorldRenderer worldrenderer = tessellator.getWorldRenderer();
- worldrenderer.begin(GL11.GL_LINES, DefaultVertexFormats.POSITION);
- worldrenderer.pos(x1, y1, 0.0D).endVertex();
- worldrenderer.pos(x2, y2, 0.0D).endVertex();
- tessellator.draw();
-
- worldrenderer.begin(GL11.GL_LINES, DefaultVertexFormats.POSITION);
- worldrenderer.pos(x1-side.x/2f, y1-side.y/2f, 0.0D).endVertex();
- worldrenderer.pos(x2-side.x/2f, y2-side.y/2f, 0.0D).endVertex();
- tessellator.draw();
-
- worldrenderer.begin(GL11.GL_LINES, DefaultVertexFormats.POSITION);
- worldrenderer.pos(x1+side.x/2f, y1+side.y/2f, 0.0D).endVertex();
- worldrenderer.pos(x2+side.x/2f, y2+side.y/2f, 0.0D).endVertex();
- tessellator.draw();
+
+ int lines = 6;
+ for(int i=0; i<lines; i++) {
+ worldrenderer.begin(GL11.GL_LINES, DefaultVertexFormats.POSITION);
+ worldrenderer.pos(x1-side.x+side.x*i/lines, y1-side.y+side.y*i/lines, 0.0D).endVertex();
+ worldrenderer.pos(x2-side.x+side.x*i/lines, y2-side.y+side.y*i/lines, 0.0D).endVertex();
+ tessellator.draw();
+ }
}
public void onWindowClick(Slot slotIn, int slotId, int clickedButton, int clickType, Consumer<Triple<Integer, Integer, Integer>> consumer) {
LockedSlot locked = getLockedSlot(slotIn);
if(locked == null) {
return;
- } else if(isSlotLocked(slotIn) || (clickType == 2 && SlotLocking.getInstance().isSlotIndexLocked(clickedButton))) {
+ } else if(locked.locked || (clickType == 2 && SlotLocking.getInstance().isSlotIndexLocked(clickedButton))) {
consumer.accept(null);
- } else if(clickType == 1 && locked.boundTo >= 0 && locked.boundTo < 9) {
- if(slotId > 9) {
- consumer.accept(Triple.of(slotId, locked.boundTo, 2));
-
- GuiContainer container = (GuiContainer) Minecraft.getMinecraft().currentScreen;
- Slot boundSlot = container.inventorySlots.getSlotFromInventory(Minecraft.getMinecraft().thePlayer.inventory, locked.boundTo);
+ } else if(NotEnoughUpdates.INSTANCE.config.slotLocking.enableSlotBinding && clickType == 1) {
+ GuiContainer container = (GuiContainer) Minecraft.getMinecraft().currentScreen;
+ Slot boundSlot = container.inventorySlots.getSlotFromInventory(Minecraft.getMinecraft().thePlayer.inventory, locked.boundTo);
- LockedSlot boundLocked = getLockedSlot(boundSlot);
+ if(boundSlot == null) {
+ return;
+ }
+ LockedSlot boundLocked = getLockedSlot(boundSlot);
+ int id = slotIn.getSlotIndex();
+ if(id >= 9 && locked.boundTo >= 0 && locked.boundTo < 8) {
+ if(!boundLocked.locked) {
+ consumer.accept(Triple.of(slotId, locked.boundTo, 2));
+ if(boundLocked == DEFAULT_LOCKED_SLOT) {
+ LockedSlot[] lockedSlots = getDataForProfile();
+ lockedSlots[locked.boundTo] = new LockedSlot();
+ lockedSlots[locked.boundTo].boundTo = id;
+ } else {
+ boundLocked.boundTo = id;
+ }
+ }
+ } else if(id >= 0 && id < 8 && locked.boundTo >= 9 && locked.boundTo <= 39) {
+ if(boundLocked.locked || boundLocked.boundTo != id) {
+ locked.boundTo = -1;
+ } else {
+ int boundTo = boundSlot.slotNumber;
+ consumer.accept(Triple.of(boundTo, id, 2));
+ }
}
-
+ } else if(NotEnoughUpdates.INSTANCE.config.slotLocking.enableSlotBinding && locked.boundTo != -1 && NotEnoughUpdates.INSTANCE.config.slotLocking.bindingAlsoLocks) {
+ consumer.accept(null);
}
}
@@ -296,7 +358,93 @@ public class SlotLocking {
GlStateManager.depthMask(true);
GlStateManager.enableBlend();
GlStateManager.translate(0, 0, -400);
- } else if(slot.canBeHovered() && locked.boundTo >= 0 && locked.boundTo < 9) {
+ } else if(NotEnoughUpdates.INSTANCE.config.slotLocking.enableSlotBinding && slot.canBeHovered() && locked.boundTo >= 0 && locked.boundTo <= 39) {
+ if(!(Minecraft.getMinecraft().currentScreen instanceof GuiContainer)) {
+ return;
+ }
+ GuiContainer container = (GuiContainer) Minecraft.getMinecraft().currentScreen;
+
+ final ScaledResolution scaledresolution = new ScaledResolution(Minecraft.getMinecraft());
+ final int scaledWidth = scaledresolution.getScaledWidth();
+ final int scaledHeight = scaledresolution.getScaledHeight();
+ int mouseX = Mouse.getX() * scaledWidth / Minecraft.getMinecraft().displayWidth;
+ int mouseY = scaledHeight - Mouse.getY() * scaledHeight / Minecraft.getMinecraft().displayHeight - 1;
+
+ Slot boundSlot = container.inventorySlots.getSlotFromInventory(Minecraft.getMinecraft().thePlayer.inventory, locked.boundTo);
+ if(boundSlot == null) {
+ return;
+ }
+
+ boolean hoverOverSlot = container.isMouseOverSlot(slot, mouseX, mouseY);
+
+ if(hoverOverSlot || slot.getSlotIndex() >= 9) {
+ Minecraft.getMinecraft().getTextureManager().bindTexture(BOUND);
+ GlStateManager.color(1, 1, 1, 0.7f);
+ GlStateManager.depthMask(false);
+ RenderUtils.drawTexturedRect(slot.xDisplayPosition, slot.yDisplayPosition, 16, 16, 0, 1, 0, 1, GL11.GL_NEAREST);
+ GlStateManager.depthMask(true);
+ GlStateManager.enableBlend();
+
+ //Rerender Text over Top
+ if(slot.getStack() != null) {
+ Minecraft.getMinecraft().getRenderItem().renderItemOverlayIntoGUI(Minecraft.getMinecraft().fontRendererObj, slot.getStack(),
+ slot.xDisplayPosition, slot.yDisplayPosition, null);
+ }
+ } else if(pairingSlot != null && lockKeyHeld && slot.getSlotIndex() < 8) {
+ int x1 = container.guiLeft+pairingSlot.xDisplayPosition;
+ int y1 = container.guiTop+pairingSlot.yDisplayPosition;
+
+ if(mouseX <= x1 || mouseX >= x1+16 ||
+ mouseY <= y1 || mouseY >= y1+16) {
+ Gui.drawRect(slot.xDisplayPosition, slot.yDisplayPosition, slot.xDisplayPosition+16, slot.yDisplayPosition+16, 0x80ffffff);
+ }
+ }
+
+ if(hoverOverSlot) {
+ LockedSlot boundLocked = getLockedSlot(boundSlot);
+ if(boundLocked == null || boundLocked.locked ||
+ (boundSlot.getSlotIndex() >= 9 && boundLocked.boundTo != slot.getSlotIndex())) {
+ locked.boundTo = -1;
+ return;
+ }
+
+ Minecraft.getMinecraft().getTextureManager().bindTexture(BOUND);
+ GlStateManager.color(1, 1, 1, 0.7f);
+ GlStateManager.depthMask(false);
+ RenderUtils.drawTexturedRect(boundSlot.xDisplayPosition, boundSlot.yDisplayPosition, 16, 16, 0, 1, 0, 1, GL11.GL_NEAREST);
+ GlStateManager.depthMask(true);
+ GlStateManager.enableBlend();
+
+ //Rerender Text over Top
+ if(boundSlot.getStack() != null) {
+ Minecraft.getMinecraft().getRenderItem().renderItemOverlayIntoGUI(Minecraft.getMinecraft().fontRendererObj, boundSlot.getStack(),
+ boundSlot.xDisplayPosition, boundSlot.yDisplayPosition, null);
+ }
+
+ int maxIter = 100;
+ float x1 = slot.xDisplayPosition+8;
+ float y1 = slot.yDisplayPosition+8;
+ float x2 = boundSlot.xDisplayPosition+8;
+ float y2 = boundSlot.yDisplayPosition+8;
+ Vector2f vec = new Vector2f(x2 - x1, y2 - y1);
+ vec.normalise(vec);
+
+ while(x1 > slot.xDisplayPosition && x1 < slot.xDisplayPosition+16 &&
+ y1 > slot.yDisplayPosition && y1 < slot.yDisplayPosition+16) {
+ if(maxIter-- < 50) break;
+ x1 += vec.x;
+ y1 += vec.y;
+ }
+ while(x2 > boundSlot.xDisplayPosition && x2 < boundSlot.xDisplayPosition+16 &&
+ y2 > boundSlot.yDisplayPosition && y2 < boundSlot.yDisplayPosition+16) {
+ if(maxIter-- < 0) break;
+ x2 -= vec.x;
+ y2 -= vec.y;
+ }
+
+ drawLinkArrow((int)x1, (int)y1, (int)x2, (int)y2);
+ }
+ } else if(NotEnoughUpdates.INSTANCE.config.slotLocking.enableSlotBinding && slot.getSlotIndex() < 8 && pairingSlot != null && lockKeyHeld) {
if(!(Minecraft.getMinecraft().currentScreen instanceof GuiContainer)) {
return;
}
@@ -308,20 +456,19 @@ public class SlotLocking {
int mouseX = Mouse.getX() * scaledWidth / Minecraft.getMinecraft().displayWidth;
int mouseY = scaledHeight - Mouse.getY() * scaledHeight / Minecraft.getMinecraft().displayHeight - 1;
- if(container.isMouseOverSlot(slot, mouseX, mouseY)) {
- Slot boundSlot = container.inventorySlots.getSlotFromInventory(Minecraft.getMinecraft().thePlayer.inventory, locked.boundTo);
- int x2 = boundSlot.xDisplayPosition+8;
- int y2 = boundSlot.yDisplayPosition+8;
+ int x1 = container.guiLeft+pairingSlot.xDisplayPosition;
+ int y1 = container.guiTop+pairingSlot.yDisplayPosition;
- drawLinkArrow(slot.xDisplayPosition+8,
- slot.yDisplayPosition+8, x2, y2);
+ if(mouseX <= x1 || mouseX >= x1+16 ||
+ mouseY <= y1 || mouseY >= y1+16) {
+ Gui.drawRect(slot.xDisplayPosition, slot.yDisplayPosition, slot.xDisplayPosition+16, slot.yDisplayPosition+16, 0x80ffffff);
}
}
}
}
public LockedSlot getLockedSlot(Slot slot) {
- if(!NotEnoughUpdates.INSTANCE.hasSkyblockScoreboard()) return null;
+ if(!NotEnoughUpdates.INSTANCE.hasSkyblockScoreboard() || !NotEnoughUpdates.INSTANCE.config.slotLocking.enableSlotLocking) return null;
if(slot == null) {
return null;
}
@@ -336,7 +483,7 @@ public class SlotLocking {
}
public LockedSlot getLockedSlotIndex(int index) {
- if(!NotEnoughUpdates.INSTANCE.hasSkyblockScoreboard()) return null;
+ if(!NotEnoughUpdates.INSTANCE.hasSkyblockScoreboard() || !NotEnoughUpdates.INSTANCE.config.slotLocking.enableSlotLocking) return null;
LockedSlot[] lockedSlots = getDataForProfile();
if(lockedSlots == null) return null;
@@ -345,13 +492,13 @@ public class SlotLocking {
public boolean isSlotLocked(Slot slot) {
LockedSlot locked = getLockedSlot(slot);
- return locked != null && locked.locked;
+ return locked != null && (locked.locked || (NotEnoughUpdates.INSTANCE.config.slotLocking.bindingAlsoLocks && locked.boundTo != -1));
}
public boolean isSlotIndexLocked(int index) {
LockedSlot locked = getLockedSlotIndex(index);
- return locked != null && locked.locked;
+ return locked != null && (locked.locked || (NotEnoughUpdates.INSTANCE.config.slotLocking.bindingAlsoLocks && locked.boundTo != -1));
}
}
generated by cgit (git 2.34.1) at 2026-05-31 10:32:35 +0000