Skip to content

Commit 695f81f

Browse files
Fix3dllFix3dll
authored
Merge pull request #2 from Fix3dll/unofficial-update
Unofficial update
2 parents 437c604 + 9400d9e commit 695f81f

60 files changed

Lines changed: 1312 additions & 1340 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/docs/images/Minecraft Installations.png‎

-46.2 KB
Binary file not shown.

‎.github/workflows/build.yml‎

Lines changed: 8 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,15 @@
1-
name: Build
1+
name: build
2+
3+
on: [ push, pull_request ]
24

3-
on:
4-
push:
5-
branches:
6-
- unofficial-update
7-
- main
8-
paths:
9-
- '**.java'
10-
pull_request:
11-
branches:
12-
- main
13-
paths:
14-
- '**.java'
15-
workflow_dispatch:
16-
inputs:
17-
upload_artifact:
18-
description: 'Upload artifact to this run? [yes | no]'
19-
required: false
20-
default: 'no'
215
jobs:
226
build:
23-
name: Build
247
if: ${{ !contains(github.head_ref, 'translations/') }}
258
runs-on: ubuntu-latest
269
env:
2710
ORG_GRADLE_PROJECT_buildNumber: ${{ github.run_number }}
2811
ORG_GRADLE_PROJECT_runAttempt: ${{ github.run_attempt }}
2912
ORG_GRADLE_PROJECT_runningOnCi: ${{ true }}
30-
UPLOAD_ARTIFACT_ENABLED: ${{ true }}
3113
timeout-minutes: 15
3214

3315
steps:
@@ -42,17 +24,15 @@ jobs:
4224
- name: Build with Gradle
4325
run: ./gradlew build --no-daemon
4426
- name: Read Project Version
45-
id: read_project_version
46-
if: ${{ env.UPLOAD_ARTIFACT_ENABLED || contains(github.event.inputs.upload_artifact, 'yes') }}
47-
uses: christian-draeger/read-properties@1.0.1
27+
id: read_properties
28+
uses: christian-draeger/read-properties@1.1.1
4829
with:
4930
path: gradle.properties
50-
property: version
31+
properties: version
5132
- name: Upload Artifact
52-
if: ${{ env.UPLOAD_ARTIFACT_ENABLED || contains(github.event.inputs.upload_artifact, 'yes') }}
5333
env:
54-
project_version: ${{ steps.read_project_version.outputs.value }}
34+
project_version: ${{ steps.read_properties.outputs.value }}
5535
uses: actions/upload-artifact@v3
5636
with:
57-
name: SkyblockAddons v${{ env.project_version }}
37+
name: build_artifacts
5838
path: build/libs/*

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,3 +29,4 @@ run
2929
Thumbs.db
3030
bytecode
3131
.vscode
32+
logs

‎LICENSE‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) 2023 Biscuit Development
3+
Copyright (c) 2023 Fix3dll
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,8 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
2020
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
2121
SOFTWARE.
2222

23-
23+
This project is fork of SkyblockAddons mod, which was written by Biscuit team and they announced to be end of life, which is
24+
available under the MIT license. The full license available at https://github.com/BiscuitDevelopment/SkyblockAddons/blob/main/LICENSE
2425

2526
This product bundles the files /gradle/wrapper/gradle-wrapper.jar, /gradle/wrapper/gradle-wrapper.properties,
2627
/gradlew, and /gradlew.bat, which are available under the Apache 2.0 license. The full license is available at
@@ -40,4 +41,4 @@ in MinecraftForge 11.15.1.2318-1.8.9, which is available under the Minecraft For
4041
available at dependencyLicenses/minecraftForge/MINECRAFT_FORGE_LICENSE.txt.
4142

4243
This product bundles SLF4J API Module 1.7.25, which is available under the MIT license. The full license is available at
43-
dependencyLicenses/slf4j-api/MIT.txt.
44+
dependencyLicenses/slf4j-api/MIT.txt.

‎README.md‎

Lines changed: 3 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -2,35 +2,12 @@
22
<h1 align="center">SkyblockAddons</h1>
33

44
<p align="center">
5-
<a href="https://github.com/BiscuitDevelopment/SkyblockAddons/releases" target="_blank">
6-
<img alt="release" src="https://img.shields.io/github/v/release/BiscuitDevelopment/SkyblockAddons?color=56bcd3" />
7-
</a>
8-
<a href="https://github.com/BiscuitDevelopment/SkyblockAddons/releases" target="_blank">
9-
<img alt="downloads" src="https://img.shields.io/github/downloads/BiscuitDevelopment/SkyblockAddons/total?color=56bcd3" />
10-
</a>
11-
<a href="https://github.com/BiscuitDevelopment/SkyblockAddons/blob/master/LICENSE" target="_blank">
5+
<a href="https://github.com/Fix3dll/SkyblockAddons/blob/unofficial-update/LICENSE" target="_blank">
126
<img alt="license" src="https://img.shields.io/badge/License-MIT-56bcd3" />
137
</a>
14-
<a href="https://discord.gg/PqTAEek" target="_blank">
15-
<img alt="discord" src="https://img.shields.io/discord/450878205294018560?color=56bcd3&label=discord" />
16-
</a>
17-
<a href="https://twitter.com/bisccut" target="_blank">
18-
<img alt="twitter" src="https://img.shields.io/twitter/follow/bisccut?style=social" />
19-
</a>
20-
<a href="https://translate.biscuit.codes" target="_blank">
21-
<img alt="localization" src="https://badges.crowdin.net/skyblockaddons/localized.svg" />
22-
</a>
238
</p>
249

25-
A Minecraft Forge mod with many features to make your Hypixel Skyblock experience better.
26-
27-
```
28-
Sorry, development is slow and will be for the foreseeable future since I quit SB and I'm also busy with
29-
other things. Thank you for your understanding.
30-
31-
- TirelessTraveler
32-
```
33-
10+
Skyblock Addons has reached end of life. This fork contains unofficial updates from me. You can reach latest unofficial build [here](https://nightly.link/Fix3dll/SkyblockAddons/workflows/build/unofficial-update/SkyblockAddons%20v1.7.2.zip).
3411

3512
Special Credits
3613
-----
@@ -40,27 +17,8 @@ TirelessTraveler (aka ILikePlayingGames) for helping maintain the project.
4017

4118
DidiSkywalker & CraftedFury (Nahydrin) for adding/PRing many incredible features!
4219

43-
Thanks to YourKit
20+
Thanks to Our Translators
4421
------
45-
![YourKit](https://www.yourkit.com/images/yklogo.png)
46-
47-
Big thank you to YourKit for supporting this project with their profiler to help us improve performance!
48-
49-
50-
YourKit supports open source projects with innovative and intelligent tools
51-
for monitoring and profiling Java and .NET applications.
52-
YourKit is the creator of [YourKit Java Profiler](https://www.yourkit.com/java/profiler/),
53-
[YourKit .NET Profiler](https://www.yourkit.com/.net/profiler/),
54-
and [YourKit YouMonitor](https://www.yourkit.com/youmonitor/).
55-
56-
Thanks to Crowdin & Our Translators
57-
------
58-
![Crowdin](https://crowdin.com/images/crowdin-logo.svg)
59-
60-
Big thanks to Crowdin for supporting this project with their
61-
localization management platform to help us serve the mod in many languages!
62-
[Check out their website here](https://crowdin.com/)!
63-
6422
Also thanks for our countless translators who help us translate this mod!
6523

6624
Thanks to Open Source Software

‎build.gradle‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ import java.text.ParseException
44

55
plugins {
66
id 'java'
7-
id 'gg.essential.loom' version '0.10.0.5'
7+
id 'gg.essential.loom' version '0.10.0.+'
88
id 'dev.architectury.architectury-pack200' version '0.1.3'
9-
id 'io.freefair.lombok' version "6.6.1"
9+
id 'io.freefair.lombok' version "8.0.1"
1010
id 'com.github.johnrengelman.shadow' version '7.1.2'
1111
id 'net.kyori.blossom' version '1.3.1'
1212
}
@@ -97,10 +97,10 @@ dependencies {
9797
minecraft("com.mojang:minecraft:${project.minecraftVersion}")
9898
mappings("de.oceanlabs.mcp:mcp_stable:${project.mappings}")
9999
forge("net.minecraftforge:forge:${project.forgeVersion}")
100-
runtimeOnly('me.djtheredstoner:DevAuth-forge-legacy:1.1.0')
100+
runtimeOnly('me.djtheredstoner:DevAuth-forge-legacy:1.1.2')
101101

102102
// Discord RPC for Java https://github.com/jagrosh/DiscordIPC
103-
bundle('com.github.ILikePlayingGames:DiscordIPC:-SNAPSHOT') {
103+
bundle('com.github.ILikePlayingGames:DiscordIPC:f91ed4b') {
104104
exclude module: 'log4j'
105105
because 'Different version conflicts with Minecraft\'s Log4J'
106106
exclude module: 'gson'
@@ -110,7 +110,7 @@ dependencies {
110110
exclude module: 'gson'
111111
because 'Different version conflicts with Minecraft\'s GSON'
112112
}
113-
testImplementation('org.junit.jupiter:junit-jupiter:5.9.1')
113+
testImplementation('org.junit.jupiter:junit-jupiter:5.9.3')
114114
}
115115

116116
tasks.withType(JavaCompile).configureEach {

‎gradle.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
org.gradle.jvmargs=-Xmx2G
44

55
# SkyblockAddons Properties
6-
version=1.7.2
6+
version=1.8.0-beta.1
77
# Set by CI
88
buildNumber=0
99
acceptedMinecraftVersions=[1.8.9]

‎src/main/java/codes/biscuit/skyblockaddons/SkyblockAddons.java‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,7 @@
2222
import codes.biscuit.skyblockaddons.misc.scheduler.NewScheduler;
2323
import codes.biscuit.skyblockaddons.misc.scheduler.Scheduler;
2424
import codes.biscuit.skyblockaddons.newgui.GuiManager;
25-
import codes.biscuit.skyblockaddons.utils.EnumUtils;
26-
import codes.biscuit.skyblockaddons.utils.InventoryUtils;
27-
import codes.biscuit.skyblockaddons.utils.SkyblockAddonsMessageFactory;
28-
import codes.biscuit.skyblockaddons.utils.Utils;
25+
import codes.biscuit.skyblockaddons.utils.*;
2926
import codes.biscuit.skyblockaddons.utils.data.DataUtils;
3027
import codes.biscuit.skyblockaddons.utils.gson.GsonInitializableTypeAdapter;
3128
import codes.biscuit.skyblockaddons.utils.gson.PatternAdapter;
@@ -191,6 +188,10 @@ public void init(FMLInitializationEvent e) {
191188
usingLabymod = utils.isModLoaded("labymod");
192189
usingOofModv1 = utils.isModLoaded("refractionoof", "1.0");
193190
usingPatcher = utils.isModLoaded("patcher");
191+
192+
if (!this.configValues.isEnabled(Feature.NUMBER_SEPARATORS)) {
193+
TextUtils.NUMBER_FORMAT.setGroupingUsed(false);
194+
}
194195
}
195196

196197
@Mod.EventHandler

‎src/main/java/codes/biscuit/skyblockaddons/asm/hooks/GuiContainerHook.java‎

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
import codes.biscuit.skyblockaddons.core.Feature;
66
import codes.biscuit.skyblockaddons.core.InventoryType;
77
import codes.biscuit.skyblockaddons.features.backpacks.ContainerPreviewManager;
8-
import codes.biscuit.skyblockaddons.features.craftingpatterns.CraftingPattern;
98
import codes.biscuit.skyblockaddons.utils.ColorCode;
109
import net.minecraft.client.Minecraft;
1110
import net.minecraft.client.gui.FontRenderer;
@@ -64,29 +63,6 @@ public static void drawSlot(GuiContainer guiContainer, Slot slot) {
6463
Container container = mc.thePlayer.openContainer;
6564

6665
if (slot != null) {
67-
// Draw crafting pattern overlays inside the crafting grid.
68-
if (false /*main.getConfigValues().isEnabled(Feature.CRAFTING_PATTERNS)*/ && main.getUtils().isOnSkyblock()
69-
&& slot.inventory.getDisplayName().getUnformattedText().equals(CraftingPattern.CRAFTING_TABLE_DISPLAYNAME)
70-
&& main.getPersistentValuesManager().getPersistentValues().getSelectedCraftingPattern() != CraftingPattern.FREE) {
71-
72-
int craftingGridIndex = CraftingPattern.slotToCraftingGridIndex(slot.getSlotIndex());
73-
if (craftingGridIndex >= 0) {
74-
int slotLeft = slot.xDisplayPosition;
75-
int slotTop = slot.yDisplayPosition;
76-
int slotRight = slotLeft + 16;
77-
int slotBottom = slotTop + 16;
78-
if (main.getPersistentValuesManager().getPersistentValues().getSelectedCraftingPattern().isSlotInPattern(craftingGridIndex)) {
79-
if (!slot.getHasStack()) {
80-
guiContainer.drawGradientRect(slotLeft, slotTop, slotRight, slotBottom, OVERLAY_GREEN, OVERLAY_GREEN);
81-
}
82-
} else {
83-
if (slot.getHasStack()) {
84-
guiContainer.drawGradientRect(slotLeft, slotTop, slotRight, slotBottom, OVERLAY_RED, OVERLAY_RED);
85-
}
86-
}
87-
}
88-
}
89-
9066
if (main.getConfigValues().isEnabled(Feature.LOCK_SLOTS) &&
9167
main.getUtils().isOnSkyblock()) {
9268
int slotNum = slot.slotNumber + main.getInventoryUtils().getSlotDifference(container);

‎src/main/java/codes/biscuit/skyblockaddons/asm/hooks/PlayerControllerMPHook.java‎

Lines changed: 0 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,9 @@
33
import codes.biscuit.skyblockaddons.SkyblockAddons;
44
import codes.biscuit.skyblockaddons.asm.utils.ReturnValue;
55
import codes.biscuit.skyblockaddons.core.Feature;
6-
import codes.biscuit.skyblockaddons.core.InventoryType;
76
import codes.biscuit.skyblockaddons.events.SkyblockBlockBreakEvent;
87
import codes.biscuit.skyblockaddons.features.backpacks.BackpackColor;
98
import codes.biscuit.skyblockaddons.features.backpacks.BackpackInventoryManager;
10-
import codes.biscuit.skyblockaddons.features.craftingpatterns.CraftingPattern;
11-
import codes.biscuit.skyblockaddons.features.craftingpatterns.CraftingPatternResult;
129
import codes.biscuit.skyblockaddons.utils.ItemUtils;
1310
import codes.biscuit.skyblockaddons.utils.Utils;
1411
import com.google.common.collect.Sets;
@@ -161,45 +158,6 @@ public static void onWindowClick(int slotNum, int mouseButtonClicked, int mode,
161158
main.getUtils().playLoudSound("note.bass", 0.5);
162159
returnValue.cancel();
163160
}
164-
165-
// Crafting patterns
166-
if (false && slotIn != null && main.getInventoryUtils().getInventoryType() == InventoryType.CRAFTING_TABLE
167-
/*&& main.getConfigValues().isEnabled(Feature.CRAFTING_PATTERNS)*/) {
168-
169-
final CraftingPattern selectedPattern = main.getPersistentValuesManager().getPersistentValues().getSelectedCraftingPattern();
170-
final ItemStack clickedItem = slotIn.getStack();
171-
if (selectedPattern != CraftingPattern.FREE && clickedItem != null) {
172-
final ItemStack[] craftingGrid = new ItemStack[9];
173-
for (int i = 0; i < CraftingPattern.CRAFTING_GRID_SLOTS.size(); i++) {
174-
int slotIndex = CraftingPattern.CRAFTING_GRID_SLOTS.get(i);
175-
craftingGrid[i] = slots.getSlot(slotIndex).getStack();
176-
}
177-
178-
final CraftingPatternResult result = selectedPattern.checkAgainstGrid(craftingGrid);
179-
180-
if (slotIn.inventory.equals(Minecraft.getMinecraft().thePlayer.inventory)) {
181-
if (result.isFilled() && !result.fitsItem(clickedItem) && mode == SHIFTCLICK_CLICK_TYPE) {
182-
// cancel shift-clicking items from the inventory if the pattern is already filled
183-
if (System.currentTimeMillis() > lastCraftingSoundPlayed + CRAFTING_PATTERN_SOUND_COOLDOWN) {
184-
main.getUtils().playSound("note.bass", 0.5);
185-
lastCraftingSoundPlayed = System.currentTimeMillis();
186-
}
187-
returnValue.cancel();
188-
}
189-
} else {
190-
if (slotIn.getSlotIndex() == CraftingPattern.CRAFTING_RESULT_INDEX
191-
&& !result.isSatisfied()
192-
&& main.getPersistentValuesManager().getPersistentValues().isBlockCraftingIncompletePatterns()) {
193-
// cancel clicking the result if the pattern isn't satisfied
194-
if (System.currentTimeMillis() > lastCraftingSoundPlayed + CRAFTING_PATTERN_SOUND_COOLDOWN) {
195-
main.getUtils().playSound("note.bass", 0.5);
196-
lastCraftingSoundPlayed = System.currentTimeMillis();
197-
}
198-
returnValue.cancel();
199-
}
200-
}
201-
}
202-
}
203161
}
204162
}
205163
else {

0 commit comments

Comments
 (0)