diff options
Diffstat (limited to 'src/main')
10 files changed, 152 insertions, 54 deletions
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/NotEnoughUpdates.java b/src/main/java/io/github/moulberry/notenoughupdates/NotEnoughUpdates.java index 86a36f49..4f2e8a93 100644 --- a/src/main/java/io/github/moulberry/notenoughupdates/NotEnoughUpdates.java +++ b/src/main/java/io/github/moulberry/notenoughupdates/NotEnoughUpdates.java @@ -9,6 +9,7 @@ import com.google.gson.JsonObject; import com.mojang.authlib.Agent; import com.mojang.authlib.minecraft.MinecraftSessionService; import com.mojang.authlib.yggdrasil.YggdrasilAuthenticationService; +import com.mojang.authlib.yggdrasil.YggdrasilMinecraftSessionService; import com.mojang.authlib.yggdrasil.YggdrasilUserAuthentication; import io.github.moulberry.notenoughupdates.auction.CustomAHGui; import io.github.moulberry.notenoughupdates.collectionlog.GuiCollectionLog; diff --git a/src/main/java/io/github/moulberry/notenoughupdates/core/config/gui/GuiOptionEditorKeybind.java b/src/main/java/io/github/moulberry/notenoughupdates/core/config/gui/GuiOptionEditorKeybind.java index 0c0514fe..601cc6b1 100644 --- a/src/main/java/io/github/moulberry/notenoughupdates/core/config/gui/GuiOptionEditorKeybind.java +++ b/src/main/java/io/github/moulberry/notenoughupdates/core/config/gui/GuiOptionEditorKeybind.java @@ -83,9 +83,10 @@ public class GuiOptionEditorKeybind extends GuiOptionEditor { editingKeycode = false; if(Keyboard.getEventKey() == Keyboard.KEY_ESCAPE) { keyCode = 0; - } else { - keyCode = Keyboard.getEventKey() == 0 ? Keyboard.getEventCharacter() + 256 : Keyboard.getEventKey(); + } else if(Keyboard.getEventKey() != 0) { + keyCode = Keyboard.getEventKey(); } + if(keyCode > 256) keyCode = 0; option.set(keyCode); return true; } diff --git a/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/DwarvenMinesTextures.java b/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/DwarvenMinesTextures.java index 65b47ec0..735243d3 100644 --- a/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/DwarvenMinesTextures.java +++ b/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/DwarvenMinesTextures.java @@ -54,8 +54,11 @@ public class DwarvenMinesTextures { if(error) return 0; if(Minecraft.getMinecraft().theWorld == null) return 0; - if(SBInfo.getInstance().getLocation() == null) return 0; - if(!SBInfo.getInstance().getLocation().equals("mining_3")) return 0; + String location = SBInfo.getInstance().getLocation(); + + if(location == null) return 0; + if(location.equals("crystal_hollows")) return 3; + if(!location.equals("mining_3")) return 0; IBlockState state = Minecraft.getMinecraft().theWorld.getBlockState(pos); boolean titanium = state.getBlock() == Blocks.stone && state.getValue(BlockStone.VARIANT) == BlockStone.EnumType.DIORITE_SMOOTH; diff --git a/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/StorageManager.java b/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/StorageManager.java index 37a60b1b..a20e5abb 100644 --- a/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/StorageManager.java +++ b/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/StorageManager.java @@ -226,7 +226,7 @@ public class StorageManager { } public boolean shouldRenderStorageOverlay(String containerName) { - if(!NotEnoughUpdates.INSTANCE.config.storageGUI.enableStorageGUI) { + if(!NotEnoughUpdates.INSTANCE.config.storageGUI.enableStorageGUI2) { shouldRenderStorageOverlayCached = false; return false; } diff --git a/src/main/java/io/github/moulberry/notenoughupdates/miscgui/GuiCustomEnchant.java b/src/main/java/io/github/moulberry/notenoughupdates/miscgui/GuiCustomEnchant.java index d32d74af..2707c7ab 100644 --- a/src/main/java/io/github/moulberry/notenoughupdates/miscgui/GuiCustomEnchant.java +++ b/src/main/java/io/github/moulberry/notenoughupdates/miscgui/GuiCustomEnchant.java @@ -10,6 +10,7 @@ import io.github.moulberry.notenoughupdates.core.GuiElementTextField; import io.github.moulberry.notenoughupdates.core.util.lerp.LerpingFloat; import io.github.moulberry.notenoughupdates.core.util.lerp.LerpingInteger; import io.github.moulberry.notenoughupdates.miscfeatures.SlotLocking; +import io.github.moulberry.notenoughupdates.options.NEUConfig; import io.github.moulberry.notenoughupdates.util.Constants; import io.github.moulberry.notenoughupdates.util.Utils; import net.minecraft.client.Minecraft; @@ -199,10 +200,8 @@ public class GuiCustomEnchant extends Gui { } public boolean shouldOverride(String containerName) { - shouldOverrideFast = false; - if(true) return shouldOverrideFast; - - shouldOverrideFast = containerName != null && + shouldOverrideFast = NotEnoughUpdates.INSTANCE.config.enchantingSolvers.enableTableGUI && + containerName != null && NotEnoughUpdates.INSTANCE.hasSkyblockScoreboard() && containerName.equalsIgnoreCase("Enchant Item"); if(!shouldOverrideFast) { @@ -467,8 +466,13 @@ public class GuiCustomEnchant extends Gui { } } } - removable.sort(Comparator.comparingInt(e -> e.xpCost)); - applicable.sort(Comparator.comparingInt(e -> e.xpCost)); + NEUConfig cfg = NotEnoughUpdates.INSTANCE.config; + int mult = cfg.enchantingSolvers.enchantOrdering == 0 ? 1 : -1; + Comparator<Enchantment> comparator = cfg.enchantingSolvers.enchantSorting == 0 ? + Comparator.comparingInt(e -> mult*e.xpCost) : + (c1, c2) -> mult*c1.enchId.toLowerCase().compareTo(c2.enchId.toLowerCase()); + removable.sort(comparator); + applicable.sort(comparator); } } } diff --git a/src/main/java/io/github/moulberry/notenoughupdates/miscgui/InventoryStorageSelector.java b/src/main/java/io/github/moulberry/notenoughupdates/miscgui/InventoryStorageSelector.java index 4119c87b..d24f2572 100644 --- a/src/main/java/io/github/moulberry/notenoughupdates/miscgui/InventoryStorageSelector.java +++ b/src/main/java/io/github/moulberry/notenoughupdates/miscgui/InventoryStorageSelector.java @@ -30,7 +30,6 @@ public class InventoryStorageSelector { private static final ResourceLocation STORAGE_PANE_CTM_TEXTURE = new ResourceLocation("notenoughupdates:storage_gui/storage_gui_pane_ctm.png"); public boolean isOverridingSlot = false; - public int selectedIndex = 0; public static InventoryStorageSelector getInstance() { return INSTANCE; @@ -65,19 +64,19 @@ public class InventoryStorageSelector { } if(KeybindHelper.isKeyPressed(NotEnoughUpdates.INSTANCE.config.storageGUI.arrowLeftKey)) { - selectedIndex--; + NotEnoughUpdates.INSTANCE.config.storageGUI.selectedIndex--; int max = StorageManager.getInstance().storageConfig.displayToStorageIdMap.size()-1; - if(selectedIndex > max) selectedIndex = max; - if(selectedIndex < 0) selectedIndex = 0; + if(NotEnoughUpdates.INSTANCE.config.storageGUI.selectedIndex > max) NotEnoughUpdates.INSTANCE.config.storageGUI.selectedIndex = max; + if(NotEnoughUpdates.INSTANCE.config.storageGUI.selectedIndex < 0) NotEnoughUpdates.INSTANCE.config.storageGUI.selectedIndex = 0; } else if(KeybindHelper.isKeyPressed(NotEnoughUpdates.INSTANCE.config.storageGUI.arrowRightKey)) { - selectedIndex++; + NotEnoughUpdates.INSTANCE.config.storageGUI.selectedIndex++; int max = StorageManager.getInstance().storageConfig.displayToStorageIdMap.size()-1; - if(selectedIndex > max) selectedIndex = max; - if(selectedIndex < 0) selectedIndex = 0; + if(NotEnoughUpdates.INSTANCE.config.storageGUI.selectedIndex > max) NotEnoughUpdates.INSTANCE.config.storageGUI.selectedIndex = max; + if(NotEnoughUpdates.INSTANCE.config.storageGUI.selectedIndex < 0) NotEnoughUpdates.INSTANCE.config.storageGUI.selectedIndex = 0; } else if(KeybindHelper.isKeyPressed(NotEnoughUpdates.INSTANCE.config.storageGUI.arrowDownKey)) { - sendToPage(selectedIndex); + sendToPage(NotEnoughUpdates.INSTANCE.config.storageGUI.selectedIndex); } if(isSlotSelected()) { @@ -87,7 +86,7 @@ public class InventoryStorageSelector { if(Mouse.getEventButton() == useKeycode || Mouse.getEventButton() == attackKeycode) { if(Mouse.getEventButtonState() && Mouse.getEventButton() != NotEnoughUpdates.INSTANCE.config.storageGUI.backpackScrollKey+100) { - sendToPage(selectedIndex); + sendToPage(NotEnoughUpdates.INSTANCE.config.storageGUI.selectedIndex); } event.setCanceled(true); @@ -99,10 +98,10 @@ public class InventoryStorageSelector { if(!StorageManager.getInstance().storageConfig.displayToStorageIdMap.containsKey(displayId)) { return; } - if(getPage(selectedIndex) == null) { + if(getPage(NotEnoughUpdates.INSTANCE.config.storageGUI.selectedIndex) == null) { NotEnoughUpdates.INSTANCE.sendChatMessage("/storage"); } else { - int index = StorageManager.getInstance().storageConfig.displayToStorageIdMap.get(selectedIndex); + int index = StorageManager.getInstance().storageConfig.displayToStorageIdMap.get(NotEnoughUpdates.INSTANCE.config.storageGUI.selectedIndex); StorageManager.getInstance().sendToPage(index); } } @@ -124,19 +123,19 @@ public class InventoryStorageSelector { Minecraft.getMinecraft().thePlayer.inventory.currentItem = 0; isOverridingSlot = true; } else if(KeybindHelper.isKeyPressed(NotEnoughUpdates.INSTANCE.config.storageGUI.arrowLeftKey)) { - selectedIndex--; + NotEnoughUpdates.INSTANCE.config.storageGUI.selectedIndex--; int max = StorageManager.getInstance().storageConfig.displayToStorageIdMap.size()-1; - if(selectedIndex > max) selectedIndex = max; - if(selectedIndex < 0) selectedIndex = 0; + if(NotEnoughUpdates.INSTANCE.config.storageGUI.selectedIndex > max) NotEnoughUpdates.INSTANCE.config.storageGUI.selectedIndex = max; + if(NotEnoughUpdates.INSTANCE.config.storageGUI.selectedIndex < 0) NotEnoughUpdates.INSTANCE.config.storageGUI.selectedIndex = 0; } else if(KeybindHelper.isKeyPressed(NotEnoughUpdates.INSTANCE.config.storageGUI.arrowRightKey)) { - selectedIndex++; + NotEnoughUpdates.INSTANCE.config.storageGUI.selectedIndex++; int max = StorageManager.getInstance().storageConfig.displayToStorageIdMap.size()-1; - if(selectedIndex > max) selectedIndex = max; - if(selectedIndex < 0) selectedIndex = 0; + if(NotEnoughUpdates.INSTANCE.config.storageGUI.selectedIndex > max) NotEnoughUpdates.INSTANCE.config.storageGUI.selectedIndex = max; + if(NotEnoughUpdates.INSTANCE.config.storageGUI.selectedIndex < 0) NotEnoughUpdates.INSTANCE.config.storageGUI.selectedIndex = 0; } else if(KeybindHelper.isKeyPressed(NotEnoughUpdates.INSTANCE.config.storageGUI.arrowDownKey)) { - sendToPage(selectedIndex); + sendToPage(NotEnoughUpdates.INSTANCE.config.storageGUI.selectedIndex); } if(isSlotSelected()) { @@ -145,7 +144,7 @@ public class InventoryStorageSelector { if(attack.isPressed() || attack.isKeyDown()) { if(attack.getKeyCode() != NotEnoughUpdates.INSTANCE.config.storageGUI.backpackScrollKey) { - sendToPage(selectedIndex); + sendToPage(NotEnoughUpdates.INSTANCE.config.storageGUI.selectedIndex); } KeyBinding.setKeyBindState(attack.getKeyCode(), false); @@ -154,7 +153,7 @@ public class InventoryStorageSelector { if(use.isPressed() || use.isKeyDown()) { if(attack.getKeyCode() != NotEnoughUpdates.INSTANCE.config.storageGUI.backpackScrollKey) { - sendToPage(selectedIndex); + sendToPage(NotEnoughUpdates.INSTANCE.config.storageGUI.selectedIndex); } KeyBinding.setKeyBindState(use.getKeyCode(), false); @@ -173,16 +172,19 @@ public class InventoryStorageSelector { int keyCode = NotEnoughUpdates.INSTANCE.config.storageGUI.backpackScrollKey; if(isOverridingSlot && KeybindHelper.isKeyDown(keyCode)) { - selectedIndex -= direction; + NotEnoughUpdates.INSTANCE.config.storageGUI.selectedIndex -= direction; int max = StorageManager.getInstance().storageConfig.displayToStorageIdMap.size()-1; - if(selectedIndex > max) selectedIndex = max; - if(selectedIndex < 0) selectedIndex = 0; + if(NotEnoughUpdates.INSTANCE.config.storageGUI.selectedIndex > max) NotEnoughUpdates.INSTANCE.config.storageGUI.selectedIndex = max; + if(NotEnoughUpdates.INSTANCE.config.storageGUI.selectedIndex < 0) NotEnoughUpdates.INSTANCE.config.storageGUI.selectedIndex = 0; return 0; } - if(NotEnoughUpdates.INSTANCE.config.storageGUI.scrollToBackpack && - resultantSlot == 0 && direction == -1 && !isOverridingSlot) { + boolean allowScroll = NotEnoughUpdates.INSTANCE.config.storageGUI.scrollToBackpack2 == 0 ? + KeybindHelper.isKeyDown(NotEnoughUpdates.INSTANCE.config.storageGUI.backpackScrollKey) : + NotEnoughUpdates.INSTANCE.config.storageGUI.scrollToBackpack2 == 1; + + if(allowScroll && resultantSlot == 0 && direction == -1 && !isOverridingSlot) { isOverridingSlot = true; Minecraft.getMinecraft().getItemRenderer().resetEquippedProgress(); return 0; @@ -190,8 +192,7 @@ public class InventoryStorageSelector { isOverridingSlot = false; Minecraft.getMinecraft().getItemRenderer().resetEquippedProgress(); return 0; - } else if(NotEnoughUpdates.INSTANCE.config.storageGUI.scrollToBackpack && - resultantSlot == 8 && direction == 1 && !isOverridingSlot) { + } else if(allowScroll && resultantSlot == 8 && direction == 1 && !isOverridingSlot) { isOverridingSlot = true; Minecraft.getMinecraft().getItemRenderer().resetEquippedProgress(); return 0; @@ -208,7 +209,7 @@ public class InventoryStorageSelector { } public ItemStack getNamedHeldItemOverride() { - StorageManager.StoragePage page = getPage(selectedIndex); + StorageManager.StoragePage page = getPage(NotEnoughUpdates.INSTANCE.config.storageGUI.selectedIndex); if(page != null && page.backpackDisplayStack != null) { return page.backpackDisplayStack; } @@ -216,7 +217,7 @@ public class InventoryStorageSelector { } public ItemStack getHeldItemOverride() { - return getHeldItemOverride(selectedIndex); + return getHeldItemOverride(NotEnoughUpdates.INSTANCE.config.storageGUI.selectedIndex); } public ItemStack getHeldItemOverride(int selectedIndex) { @@ -240,8 +241,8 @@ public class InventoryStorageSelector { } int max = StorageManager.getInstance().storageConfig.displayToStorageIdMap.size()-1; - if(selectedIndex > max) selectedIndex = max; - if(selectedIndex < 0) selectedIndex = 0; + if(NotEnoughUpdates.INSTANCE.config.storageGUI.selectedIndex > max) NotEnoughUpdates.INSTANCE.config.storageGUI.selectedIndex = max; + if(NotEnoughUpdates.INSTANCE.config.storageGUI.selectedIndex < 0) NotEnoughUpdates.INSTANCE.config.storageGUI.selectedIndex = 0; int width = scaledResolution.getScaledWidth(); int height = scaledResolution.getScaledHeight(); @@ -259,7 +260,7 @@ public class InventoryStorageSelector { int top = scaledResolution.getScaledHeight() - 22; if(NotEnoughUpdates.INSTANCE.config.storageGUI.showInvBackpackPreview && isSlotSelected()) { - StorageManager.StoragePage page = getPage(selectedIndex); + StorageManager.StoragePage page = getPage(NotEnoughUpdates.INSTANCE.config.storageGUI.selectedIndex); if(page != null && page.rows > 0) { int rows = page.rows; @@ -428,8 +429,8 @@ public class InventoryStorageSelector { } int index = 1; - if(StorageManager.getInstance().storageConfig.displayToStorageIdMap.containsKey(selectedIndex)) { - int displayIndex = StorageManager.getInstance().storageConfig.displayToStorageIdMap.get(selectedIndex); + if(StorageManager.getInstance().storageConfig.displayToStorageIdMap.containsKey(NotEnoughUpdates.INSTANCE.config.storageGUI.selectedIndex)) { + int displayIndex = StorageManager.getInstance().storageConfig.displayToStorageIdMap.get(NotEnoughUpdates.INSTANCE.config.storageGUI.selectedIndex); if(displayIndex < 9) { index = displayIndex+1; } else { diff --git a/src/main/java/io/github/moulberry/notenoughupdates/miscgui/StorageOverlay.java b/src/main/java/io/github/moulberry/notenoughupdates/miscgui/StorageOverlay.java index b8d6dc38..58d6f119 100644 --- a/src/main/java/io/github/moulberry/notenoughupdates/miscgui/StorageOverlay.java +++ b/src/main/java/io/github/moulberry/notenoughupdates/miscgui/StorageOverlay.java @@ -117,6 +117,7 @@ public class StorageOverlay extends GuiElement { private int desiredHeightMY = -1; private boolean dirty = false; + private boolean allowTypingInSearchBar = true; private int scrollGrabOffset = -1; @@ -1237,6 +1238,7 @@ public class StorageOverlay extends GuiElement { GlStateManager.popMatrix(); GlStateManager.translate(0, 0, 300); + allowTypingInSearchBar = false; if(stackOnMouse != null) { if(hoveringOtherBackpack) { Utils.drawItemStack(new ItemStack(Item.getItemFromBlock(Blocks.barrier)), mouseX - 8, mouseY - 8); @@ -1276,6 +1278,8 @@ public class StorageOverlay extends GuiElement { } } else if(tooltipToDisplay != null) { Utils.drawHoveringText(tooltipToDisplay, mouseX, mouseY, width, height, -1, Minecraft.getMinecraft().fontRendererObj); + } else { + allowTypingInSearchBar = true; } GlStateManager.translate(0, 0, -300); } @@ -1439,7 +1443,8 @@ public class StorageOverlay extends GuiElement { if(!(Minecraft.getMinecraft().currentScreen instanceof GuiChest)) return false; int dWheel = Mouse.getEventDWheel(); - if(dWheel != 0) { + if(!(NotEnoughUpdates.INSTANCE.config.storageGUI.cancelScrollKey != 0 && + Keyboard.isKeyDown(NotEnoughUpdates.INSTANCE.config.storageGUI.cancelScrollKey)) && dWheel != 0) { if(dWheel < 0) { dWheel = -1; if(scrollVelocity > 0) scrollVelocity = 0; @@ -1633,7 +1638,7 @@ public class StorageOverlay extends GuiElement { switch(buttonIndex) { case 0: - NotEnoughUpdates.INSTANCE.config.storageGUI.enableStorageGUI = false; break; + NotEnoughUpdates.INSTANCE.config.storageGUI.enableStorageGUI2 = false; break; case 1: int size = desiredHeightSwitch != -1 ? desiredHeightSwitch : NotEnoughUpdates.INSTANCE.config.storageGUI.storageHeight; int sizeIndex = Math.round((size-104)/54f); @@ -1879,7 +1884,7 @@ public class StorageOverlay extends GuiElement { page.customTitle = renameStorageField.getText(); } } - } else if(NotEnoughUpdates.INSTANCE.config.storageGUI.searchBarAutofocus || searchBar.getFocus()) { + } else if(searchBar.getFocus() || (allowTypingInSearchBar && NotEnoughUpdates.INSTANCE.config.storageGUI.searchBarAutofocus)) { String prevText = searchBar.getText(); searchBar.setFocus(true); renameStorageField.setFocus(false); diff --git a/src/main/java/io/github/moulberry/notenoughupdates/mixins/MixinWorld.java b/src/main/java/io/github/moulberry/notenoughupdates/mixins/MixinWorld.java index fff1c449..0df8b30b 100644 --- a/src/main/java/io/github/moulberry/notenoughupdates/mixins/MixinWorld.java +++ b/src/main/java/io/github/moulberry/notenoughupdates/mixins/MixinWorld.java @@ -33,6 +33,8 @@ public class MixinWorld { cir.setReturnValue(BiomeGenBase.extremeHillsPlus); } else if(retexture == 2) { cir.setReturnValue(BiomeGenBase.extremeHillsEdge); + } else if(retexture == 3) { + cir.setReturnValue(BiomeGenBase.coldBeach); } } diff --git a/src/main/java/io/github/moulberry/notenoughupdates/options/NEUConfig.java b/src/main/java/io/github/moulberry/notenoughupdates/options/NEUConfig.java index d608159b..484a12a0 100644 --- a/src/main/java/io/github/moulberry/notenoughupdates/options/NEUConfig.java +++ b/src/main/java/io/github/moulberry/notenoughupdates/options/NEUConfig.java @@ -176,8 +176,8 @@ public class NEUConfig extends Config { @Expose @Category( - name = "Enchanting Solvers", - desc = "Enchanting Solvers" + name = "Enchanting GUI/Solvers", + desc = "Enchanting GUI/Solvers" ) public EnchSolvers enchantingSolvers = new EnchSolvers(); @@ -1207,6 +1207,9 @@ public class NEUConfig extends Config { public boolean storageOverlayAccordion = true; @Expose + public int selectedIndex = 0; + + @Expose @ConfigOption( name = "Enable Storage GUI", desc = "Show a custom storage overlay when accessing /storage. " + @@ -1214,7 +1217,7 @@ public class NEUConfig extends Config { ) @ConfigEditorBoolean @ConfigAccordionId(id = 1) - public boolean enableStorageGUI = true; + public boolean enableStorageGUI2 = true; @Expose @ConfigOption( @@ -1296,6 +1299,16 @@ public class NEUConfig extends Config { @ConfigAccordionId(id = 1) public String selectedStorageColour = "0:255:255:223:0"; + @Expose + @ConfigOption( + name = "Scrollable Tooltips", + desc = "Support for scrolling tooltips for users with small monitors\n" + + "This will prevent the menu from scrolling while holding the key, allowing you to scroll tooltips" + ) + @ConfigEditorKeybind(defaultKey = 0) + @ConfigAccordionId(id = 1) + public int cancelScrollKey = 0; + @ConfigOption( name = "Inventory Backpacks", desc = "" @@ -1315,11 +1328,14 @@ public class NEUConfig extends Config { @Expose @ConfigOption( name = "Scroll to Backpack", - desc = "Allow scrolling to the backpack using the mouse wheel. If you have the hotkey enabled (default: KEY_GRAVE), you can still use that" + desc = "Allow scrolling to the backpack using the mouse wheel.\n" + + "\"Scroll (Key)\" = Allow scrolling to 10th slot only while 'Backpack Scroll Key' (default: SHIFT) is pressed" + ) + @ConfigEditorDropdown( + values = {"Scroll (Key)", "Scroll (Always)", "Don't Scroll"} ) - @ConfigEditorBoolean @ConfigAccordionId(id = 0) - public boolean scrollToBackpack = false; + public int scrollToBackpack2 = 0; @Expose @ConfigOption( @@ -1418,12 +1434,20 @@ public class NEUConfig extends Config { } public static class EnchSolvers { + @ConfigOption( + name = "Solvers", + desc = "" + ) + @ConfigEditorAccordion(id = 0) + public boolean solversAccordion = false; + @Expose @ConfigOption( name = "Enable Solvers", desc = "Turn on solvers for the experimentation table" ) @ConfigEditorBoolean + @ConfigAccordionId(id = 0) public boolean enableEnchantingSolvers = true; /*@Expose @@ -1440,6 +1464,7 @@ public class NEUConfig extends Config { desc = "Hide the tooltip of items in the Chronomatron and Ultrasequencer experiments" ) @ConfigEditorBoolean + @ConfigAccordionId(id = 0) public boolean hideTooltips = true; @Expose @@ -1448,6 +1473,7 @@ public class NEUConfig extends Config { desc = "Replace the items in the supersequencer with only numbers" ) @ConfigEditorBoolean + @ConfigAccordionId(id = 0) public boolean seqNumbers = false; @Expose @@ -1459,6 +1485,7 @@ public class NEUConfig extends Config { values = {"None", "White", "Orange", "Light Purple", "Light Blue", "Yellow", "Light Green", "Pink", "Gray", "Light Gray", "Cyan", "Dark Purple", "Dark Blue", "Brown", "Dark Green", "Red", "Black"} ) + @ConfigAccordionId(id = 0) public int seqNext = 6; @Expose @@ -1470,6 +1497,7 @@ public class NEUConfig extends Config { values = {"None", "White", "Orange", "Light Purple", "Light Blue", "Yellow", "Light Green", "Pink", "Gray", "Light Gray", "Cyan", "Dark Purple", "Dark Blue", "Brown", "Dark Green", "Red", "Black"} ) + @ConfigAccordionId(id = 0) public int seqUpcoming = 5; @Expose @@ -1481,6 +1509,7 @@ public class NEUConfig extends Config { values = {"None", "White", "Orange", "Light Purple", "Light Blue", "Yellow", "Light Green", "Pink", "Gray", "Light Gray", "Cyan", "Dark Purple", "Dark Blue", "Brown", "Dark Green", "Red", "Black"} ) + @ConfigAccordionId(id = 0) public int supMatched = 6; @Expose @@ -1492,6 +1521,7 @@ public class NEUConfig extends Config { values = {"None", "White", "Orange", "Light Purple", "Light Blue", "Yellow", "Light Green", "Pink", "Gray", "Light Gray", "Cyan", "Dark Purple", "Dark Blue", "Brown", "Dark Green", "Red", "Black"} ) + @ConfigAccordionId(id = 0) public int supPossible = 2; @Expose @@ -1503,6 +1533,7 @@ public class NEUConfig extends Config { values = {"None", "White", "Orange", "Light Purple", "Light Blue", "Yellow", "Light Green", "Pink", "Gray", "Light Gray", "Cyan", "Dark Purple", "Dark Blue", "Brown", "Dark Green", "Red", "Black"} ) + @ConfigAccordionId(id = 0) public int supUnmatched = 5; @Expose @@ -1514,7 +1545,57 @@ public class NEUConfig extends Config { values = {"None", "White", "Orange", "Light Purple", "Light Blue", "Yellow", "Light Green", "Pink", "Gray", "Light Gray", "Cyan", "Dark Purple", "Dark Blue", "Brown", "Dark Green", "Red", "Black"} ) + @ConfigAccordionId(id = 0) public int supPower = 11; + + @ConfigOption( + name = "Enchant Table GUI", + desc = "" + ) + @ConfigEditorAccordion(id = 1) + public boolean tableGUIAccordion = false; + + @Expose + @ConfigOption( + name = "Enable Enchant Table GUI", + desc = "Show a custom GUI when using the Enchant Table" + ) + @ConfigEditorBoolean + @ConfigAccordionId(id = 1) + public boolean enableTableGUI = true; + + @Expose + @ConfigOption( + name = "Incompatible Enchants", + desc = "Handle enchants that are incompatible with your current item, eg. Smite on a sword with Sharpness" + ) + @ConfigEditorDropdown( + values = {"Highlight", "Hide"} + ) + @ConfigAccordionId(id = 1) + public int incompatibleEnchants = 0; + + @Expose + @ConfigOption( + name = "Enchant Sorting", + desc = "Change the method of sorting enchants in the GUI" + ) + @ConfigEditorDropdown( + values = {"By Cost", "Alphabetical"} + ) + @ConfigAccordionId(id = 1) + public int enchantSorting = 0; + + @Expose + @ConfigOption( + name = "Enchant Ordering", + desc = "Change the method of ordered used by the sort" + ) + @ConfigEditorDropdown( + values = {"Ascending", "Descending"} + ) + @ConfigAccordionId(id = 1) + public int enchantOrdering = 0; } public static class Mining { diff --git a/src/main/resources/assets/notenoughupdates/test.gif b/src/main/resources/assets/notenoughupdates/test.gif Binary files differdeleted file mode 100644 index 23c07e5d..00000000 --- a/src/main/resources/assets/notenoughupdates/test.gif +++ /dev/null |
