aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMoulberry <jjenour@student.unimelb.edu.au>2021-09-02 14:09:31 +0930
committerGitHub <noreply@github.com>2021-09-02 14:09:31 +0930
commit81eea6bf1f653fa194735d892b40614389975dd3 (patch)
treea955e0d03401302332c743f6c396184e45c94c80
parent05428d1ccb15f58ccbdb4b14eb9e10b61b0477cc (diff)
parent05d6207281e18980b8a28046621c741fa81c1606 (diff)
downloadNotEnoughUpdates-81eea6bf1f653fa194735d892b40614389975dd3.tar.gz
NotEnoughUpdates-81eea6bf1f653fa194735d892b40614389975dd3.tar.bz2
NotEnoughUpdates-81eea6bf1f653fa194735d892b40614389975dd3.zip
Merge pull request #226 from DoKM/master
Pre31 update
-rw-r--r--.github/workflows/build.yml42
-rw-r--r--README.md2
-rw-r--r--Update Notes/2.0-Pre30.md28
-rw-r--r--Update Notes/2.0-Pre31.md111
-rw-r--r--build.gradle1
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/ItemPriceInformation.java9
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/NEUApi.java10
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/NEUEventListener.java566
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/NEUManager.java85
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/NEUOverlay.java78
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/NotEnoughUpdates.java162
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/auction/APIManager.java8
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/auction/CustomAH.java16
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/core/util/render/RenderUtils.java85
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/cosmetics/CapeManager.java6
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/cosmetics/GuiCosmetics.java48
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/cosmetics/NEUCape.java61
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/dungeons/DungeonMap.java5
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/dungeons/DungeonWin.java11
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/CrystalMetalDetectorSolver.java126
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/CustomItemEffects.java138
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/CustomSkulls.java3
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/DwarvenMinesWaypoints.java88
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/FairySouls.java134
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/ItemCooldowns.java4
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/PetInfoOverlay.java4
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/SlotLocking.java42
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/StorageManager.java44
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/miscgui/AccessoryBagOverlay.java18
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/miscgui/GuiCustomEnchant.java3
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/miscgui/GuiEnchantColour.java228
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/miscgui/GuiInvButtonEditor.java84
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/miscgui/GuiItemCustomize.java3
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/miscgui/HelpGUI.java189
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/miscgui/StorageOverlay.java59
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/miscgui/tutorials/NeuConfigTutorial.java9
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/miscgui/tutorials/NeuTutorial.java127
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/miscgui/tutorials/TutorialBase.java319
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/mixins/MixinEntityPlayerSP.java2
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/mixins/MixinGuiContainer.java11
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/mixins/MixinInventoryPlayer.java12
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/mixins/MixinMinecraft.java11
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/mixins/MixinRendererLivingEntity.java4
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/options/NEUConfig.java57
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/ItemOverlays.java91
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/Mining.java336
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/Misc.java22
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/SlotLocking.java13
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/Toolbar.java40
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/TooltipTweaks.java37
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/overlays/BonemerangOverlay.java118
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/overlays/CraftingOverlay.java118
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/overlays/CrystalHollowOverlay.java403
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/overlays/MiningOverlay.java551
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/overlays/OverlayManager.java65
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/overlays/TimersOverlay.java35
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/profileviewer/GuiProfileViewer.java458
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/profileviewer/PlayerStats.java4
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/profileviewer/ProfileViewer.java39
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/util/HypixelApi.java5
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/util/SBInfo.java17
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/util/Utils.java134
-rw-r--r--src/main/resources/assets/notenoughupdates/invbuttons/expanded_inventory.pngbin2494 -> 0 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/invbuttons/presets.json892
-rw-r--r--src/main/resources/assets/notenoughupdates/pv_elements.pngbin5129 -> 3030 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/pv_ironman.pngbin0 -> 235 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/ss_small/ss1-0.jpgbin148110 -> 0 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/ss_small/ss10-0.jpgbin57284 -> 0 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/ss_small/ss11-0.jpgbin56257 -> 0 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/ss_small/ss12-0.jpgbin57416 -> 0 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/ss_small/ss13-0.jpgbin83136 -> 0 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/ss_small/ss14-0.jpgbin74904 -> 0 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/ss_small/ss15-0.jpgbin66785 -> 0 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/ss_small/ss16-0.jpgbin72065 -> 0 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/ss_small/ss17-0.jpgbin62715 -> 0 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/ss_small/ss18-0.jpgbin30420 -> 0 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/ss_small/ss2-0.jpgbin94161 -> 0 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/ss_small/ss3-0.jpgbin96250 -> 0 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/ss_small/ss4-0.jpgbin93772 -> 0 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/ss_small/ss5-0.jpgbin95859 -> 0 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/ss_small/ss6-0.jpgbin106602 -> 0 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/ss_small/ss7-0.jpgbin127654 -> 0 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/ss_small/ss8-0.jpgbin86011 -> 0 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/ss_small/ss9-0.jpgbin69263 -> 0 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/storage_gui/storage_gui_0.pngbin12354 -> 6939 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/storage_gui/storage_gui_1.pngbin4726 -> 4859 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/storage_gui/storage_gui_2.pngbin4341 -> 4380 bytes
-rw-r--r--src/main/resources/assets/notenoughupdates/storage_gui/storage_gui_3.pngbin4417 -> 4469 bytes
-rw-r--r--src/main/resources/mixins.notenoughupdates.json3
89 files changed, 4996 insertions, 1438 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
new file mode 100644
index 00000000..2df530bf
--- /dev/null
+++ b/.github/workflows/build.yml
@@ -0,0 +1,42 @@
+name: Build
+
+on:
+ push:
+ branches: [ master ]
+ paths-ignore:
+ - 'README.md'
+ - 'LICENSE'
+ - '.gitignore'
+ pull_request:
+ branches: [ master ]
+ paths-ignore:
+ - 'README.md'
+ - 'LICENSE'
+ - '.gitignore'
+ workflow_dispatch:
+jobs:
+ build:
+
+ runs-on: ubuntu-latest
+
+ steps:
+ - uses: actions/checkout@v2
+ - name: Set up JDK 1.8
+ uses: actions/setup-java@v1
+ with:
+ java-version: 1.8
+ - uses: actions/cache@v2
+ with:
+ path: |
+ ~/.gradle/caches
+ ~/.gradle/wrapper
+ key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
+ restore-keys: |
+ ${{ runner.os }}-gradle-
+ - name: Grant execute permission for gradlew
+ run: chmod +x gradlew
+ - name: Build with Gradle
+ run: ./gradlew build --no-daemon
+ - uses: actions/upload-artifact@v2
+ with:
+ path: build/libs/*.jar
diff --git a/README.md b/README.md
index 3f699fb9..0b6648c4 100644
--- a/README.md
+++ b/README.md
@@ -55,7 +55,7 @@ NotEnoughUpdates (NEU) is a feature rich 1.8.9 Minecraft forge mod for Hypixel S
4. Then, hop onto Skyblock and run the command `/api new`. Your api key is automatically filled out and all features should work.
5. Type `/neu`. If you see the NotEnoughUpdates menu, you have done this correctly!
-*If you need further assistance feel free to join the [discord](https://discord.gg/moulberry) and ask for help in [#neu-support-1](discord://discord.com/channels/516977525906341928/714332750156660756)*
+*If you need further assistance feel free to join the [discord](https://discord.gg/moulberry) and ask for help in [#neu-support](discord://discord.com/channels/516977525906341928/714332750156660756)*
## Features
diff --git a/Update Notes/2.0-Pre30.md b/Update Notes/2.0-Pre30.md
new file mode 100644
index 00000000..e036627b
--- /dev/null
+++ b/Update Notes/2.0-Pre30.md
@@ -0,0 +1,28 @@
+# These are the change notes for PRE30
+
+### **New Features:**
+
+- More options for the Todo list
+- Added the voidgloom slayer stats to the /pv
+- Added Dungeon accesories to the accesory bag upgrade view
+- Added Dungeon items to the itemlist categories (for example armors now include dungeon armors and weapons include dungeon weapons)
+- Added check to see if titanium that spawned atleast touches 1 air block (toggleable)
+- Added check so titanium alert doesnt happen if titanium commision is set to "DONE"
+- Added Storage to PV (with correct sizes)
+- Added Personal Vault to PV
+- Added scroll lock to storage overlay
+### **Fixed Features:**
+
+- Todo list
+ - Fixed fetchur display
+ - Fixed godpot timer
+- PV's wardrobe view not showing second page bottom row (not fully fixed could be better by dividing on every 4 and drawing per column instead of row but right now its always a full page)
+- Made dwarven overlay work in crystal hollows (nopo)
+- Added Gemstone powder to dwarven overlay (nopo)
+- Made smooth aote work with aotv (thanks to 8k for letting me test his aotv) (nopo)
+
+### **Bug Fixes**
+
+- Arrow Key backpack option under storage gui not doing anything
+- Fixed pets gui going away if you open /pets (nopo)
+- Fixed PV cit models dieing (nopo) \ No newline at end of file
diff --git a/Update Notes/2.0-Pre31.md b/Update Notes/2.0-Pre31.md
new file mode 100644
index 00000000..802ad7c4
--- /dev/null
+++ b/Update Notes/2.0-Pre31.md
@@ -0,0 +1,111 @@
+# These are the change notes for PRE31
+
+### **Major new features**
+
+- Added divan's mines metal detector waypoints (DeDiamondPro)
+- Added divan's mines required items overlay (DeDiamondPro)
+- Added lost precusor city required items overlay (DeDiamondPro)
+- Added "extended pet exp" tooltip tweak which.
+- Overhauled the dwarven overlay's forge display.
+- Added load from/copy to clipboard and reset config buttons to neuec gui.
+- Added load from/copy to clipboard to neu inventory buttons gui.
+- Added a crafting recipe overlay when looking up a recipe while in the crafting menu (to more easily craft items like the Soul Esoward recipe) (DeDiamondPro)
+- Added mastermode support to /pv (basically done, just needs mastermode xp)
+- Added support for the Golden Dragon Pet and added support for other weird pets that might get added.
+
+
+### **New Features:**
+- Added Ferocity, Magic find, Mining speed and mining fortune to Accessory bag (and ferocity and magic find to /pv).
+- Update notifier for "Pre" version releases. (Ironm00n)
+- Added toggle for etherwarp helper overlay text.
+- Added toggle for settings and help icon at the search bar.
+- Added toggle for showing the reforge stats of a reforge stone.
+- Added open in skycrypt button to pv.
+- Added SBP Cape.
+- Added ironman indicator. (thanks for the icon ery)
+- Added join date, Last seen and guild to pv. (Last seen is based on last saved so this value is not when a player is online)
+- Added mastermode support for /join.
+- Added option to only show price tooltip when holding key.
+- Added option to disable neu's custom skulls. (idk why you would want it but its here)
+- Added explanation to search highlight feature.
+- Added fast render warning to storage gui.
+- Added info about how to get neu capes to the cosmetics gui.
+- Added SBA chroma support to neuec.
+- Redid bonemerang overlay - Moveable and a bit more info.
+- Added /neuhelp (neu command list with bit of explanation)
+- Added toggle to prismapump overlay.
+- Added ability to toggle the pickaxe's ability cooldown showing up as the pickaxe durability.
+- Added alternative command for "/neusouls" "/fairysouls".
+- Added pet skins to /pv. (DeDiamondPro)
+- Added pet candy to /pv. (DeDiamondPro)
+- Added a /pv button to the right click player menu (DeDiamondPro) (fixed by DoKM)
+- Replaced the chat command when clicking on a player name with /pv (Toggleable)
+- Added a link to a webpage containing neu's feature /neufeatures and it shows on the first time launch.
+
+
+### **Bug Fixes**
+- Fishing helper not showing "!" when the rod colours are disabled.
+- Decimal point values not being counted in Accessory bag overlay.
+- /pv not having the correct max minion tier. (Ironm00n)
+- Other (not Transparent) storage ui them