Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/beta' into hide-crop-fortune-w…
Browse files Browse the repository at this point in the history
…arnings
  • Loading branch information
Chissl committed Jan 6, 2025
2 parents bd97b49 + 2fe67fc commit 6b6c051
Show file tree
Hide file tree
Showing 179 changed files with 2,921 additions and 2,512 deletions.
2 changes: 1 addition & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ ktlint_standard_no-wildcard-imports = enabled
ktlint_standard_function-expression-body = disabled

# Additional Kotlin-specific formatting for conditions and continuation
ij_kotlin_continuation_indent_size = 8
ij_kotlin_continuation_indent_size = 4
ij_kotlin_binary_expression_wrap = if_long
ij_kotlin_keep_line_breaks = true
ij_kotlin_annotations_new_line_after_suppress = true
1 change: 1 addition & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ jobs:
path: versions/1.8.9/build/reports/tests/test/

preprocess:
if: ${{ false }} # Fix github
runs-on: ubuntu-latest
name: "Build multi version"
steps:
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ Give feedback or just chat with others on our community Discord!

* **Bug Reports:** Use the `#bug-reports` channel when you find broken features (please check out `#faq` and `#known-bugs`).
* **Quick Help** Ask in `#support` for questions and problems with the mod or Minecraft in general.
* **Feature Suggestions:** Feel fre to tell your ideas in `#suggestions` channel for new features and improvements to the mod. (Don't copy from existing mods or break Hypixel rules).
* **Feature Suggestions:** Feel free to tell your ideas in `#suggestions` channel for new features and improvements to the mod. (Don't copy from existing mods or break Hypixel rules).
* **General Chat:** Chat with other SkyHanni users in `#skyblock-general` channel about the game.

**[Join the Discord!](https://discord.gg/skyhanni-997079228510117908)**
Expand Down
14 changes: 5 additions & 9 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
import at.skyhanni.sharedvariables.MinecraftVersion
import at.skyhanni.sharedvariables.MultiVersionStage
import at.skyhanni.sharedvariables.ProjectTarget
import at.skyhanni.sharedvariables.SHVersionInfo
import at.skyhanni.sharedvariables.versionString
import at.skyhanni.sharedvariables.*
import io.gitlab.arturbosch.detekt.Detekt
import io.gitlab.arturbosch.detekt.DetektCreateBaselineTask
import moe.nea.shot.ShotParser
Expand Down Expand Up @@ -191,9 +187,9 @@ dependencies {
exclude(module = "unspecified")
isTransitive = false
}
// October 3, 2024, 11:43 PM AEST
// https://github.com/NotEnoughUpdates/NotEnoughUpdates/tree/2.4.0
devenvMod("com.github.NotEnoughUpdates:NotEnoughUpdates:2.4.0:all") {
// December 29, 2024, 07:30 PM EST
// https://github.com/NotEnoughUpdates/NotEnoughUpdates/tree/2.5.0
devenvMod("com.github.NotEnoughUpdates:NotEnoughUpdates:2.5.0:all") {
exclude(module = "unspecified")
isTransitive = false
}
Expand Down Expand Up @@ -312,7 +308,7 @@ tasks.withType(JavaCompile::class) {

tasks.withType(org.gradle.jvm.tasks.Jar::class) {
archiveBaseName.set("SkyHanni")
archiveAppendix.set("mc${target.minecraftVersion.versionName}")
archiveVersion.set("$version-mc${target.minecraftVersion.versionName}")
duplicatesStrategy = DuplicatesStrategy.EXCLUDE // Why do we have this here? This only *hides* errors.
manifest.attributes.run {
this["Main-Class"] = "SkyHanniInstallerFrame"
Expand Down
2 changes: 1 addition & 1 deletion buildSrc/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@ repositories {

dependencies {
implementation("org.jetbrains.kotlin:kotlin-stdlib")
implementation("com.github.SkyHanniStudios:SkyHanniChangelogBuilder:1.0.2")
implementation("com.github.SkyHanniStudios:SkyHanniChangelogBuilder:1.1.0")
}
52 changes: 41 additions & 11 deletions docs/CHANGELOG.md

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions docs/FEATURES.md
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ Use `/sh` or `/skyhanni` to open the SkyHanni config in game.
+ Options to highlight good rolls in different colors, show only certain attributes, etc.
+ Added helpers for Essence Shops and Carnival Event Upgrade Shops. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2423)
+ Assists with maxing upgrades.
+ Added New Year Cake Tracker. - Daveed. (https://github.com/hannibal002/SkyHanni/pull/2237)
+ Added New Year Cake Tracker. - Daveed (https://github.com/hannibal002/SkyHanni/pull/2237)
+ Highlights unowned cakes in AH.
+ Displays a list of missing cake years.
+ Added commands "/bp -", "/ec -" and "/shlastopened" to reopen last opened storage pages. - aphased (https://github.com/hannibal002/SkyHanni/pull/2900)
Expand Down Expand Up @@ -1372,7 +1372,7 @@ Use `/sh` or `/skyhanni` to open the SkyHanni config in game.
+ Quiver Display. - Empa (https://github.com/hannibal002/SkyHanni/pull/1190)
+ Only shows the type of arrow when wearing a Skeleton Master Chestplate.
+ Low Quiver Reminder at the end of Dungeon/Kuudra run. - Empa (https://github.com/hannibal002/SkyHanni/pull/1190)
+ party chat commands. - !nea (https://github.com/hannibal002/SkyHanni/pull/1433)
+ party chat commands. - nea (https://github.com/hannibal002/SkyHanni/pull/1433)
+ Added `!pt` (and aliases) as a command that allows others to transfer the party to themselves.
+ Added `!pw` (and aliases) as a command that allows others to request a warp.
+ Option to highlight Zealots holding Chests in a different color. - Luna (https://github.com/hannibal002/SkyHanni/pull/1347)
Expand Down
196 changes: 70 additions & 126 deletions docs/INSTALLING.md
Original file line number Diff line number Diff line change
@@ -1,134 +1,78 @@
# Download and Install SkyHanni

SkyHanni is a Forge mod for **Minecraft 1.8.9 only**.
Trying to run this on Badlion, Lunar, Feather, or newer versions of Minecraft is **not supported**.
Running SkyHanni on Badlion, Lunar, Feather, or newer versions of Minecraft is **not supported**.

Follow this guide to install SkyHanni in regular Minecraft Forge.
If you already have Forge mods, you can skip to step 4. Otherwise, start from step 1.
If you already have the latest alpha version from NEU, you can skip to step 5.

<details>
<summary>1. Run vanilla 1.8.9</summary>

Run Minecraft 1.8.9, unmodded, for 10 seconds, then close it.

</details>


<details>
<summary>2. Install Java</summary>

To play with mods, you need Java.
Install [Java 8](https://www.java.com/download/ie_manual.jsp).
Double-click the file to install it.

</details>


<details>
<summary>3. Install Forge</summary>

Forge is the system that loads your mods into the game.
You need Java to run Forge.
Download [Forge for 1.8.9](https://files.minecraftforge.net/net/minecraftforge/forge/index_1.8.9.html).
Click installer, when you double-click the file, install as client.
If Forge does not open with Java, download [Jarfix](https://johann.loefflmann.net/en/software/jarfix/index.html),
double click it, then try running Forge again.

</details>


<details>
<summary>4. Download NEU</summary>

Neu is NotEnoughUpdates, another Forge mod that contains files that SkyHanni depends on to function.
You can install it from [Moulberry's Bush Discord Server](https://discord.gg/moulberry) in the
channel [#🧪neu-alphas](https://discord.com/channels/516977525906341928/1028896920346841118) or
from [SkyHanni Discord](https://discord.com/invite/skyhanni-997079228510117908) in the
channel [#neu-updates](https://discord.com/channels/997079228510117908/1123201092193366027)

</details>


<details>
<summary>5. Download SkyHanni</summary>

SkyHanni has two different update circles: [Full Release](https://github.com/hannibal002/SkyHanni/releases/latest)
and [Beta](https://github.com/hannibal002/SkyHanni/releases).

In general, it is recommended to use the **Full Release**.
It updates every 3–4 weeks and should run very stable.
If you find bugs or miss features in the full version, they might be fixed/implemented already in a beta version.

The **Beta Version**, on the other hand, gets updated multiple times a week,
has new features earlier, but also may contain more bugs.

</details>


<details>
<summary>6. Find .minecraft</summary>

Once you have downloaded both NEU and SkyHanni, you need to navigate to your `.minecraft` folder.
On Windows, open file explorer, in the file location bar at the top type in `%appdata%` and open `.minecraft`.
On Mac, go to `~/Library/Application Support/minecraft`.

</details>


<details>

<summary>7. Move mods into mods folder</summary>

If there is a "mods" folder, great! Open it.
Otherwise, create one and name it exactly "mods".

Move both your downloaded NEU file and SkyHanni file into the folder.
(If you have already an older version of NEU or SkyHanni in that folder, delete it.)

*Note: if you have a problem, people may ask to see your mod folder - that is this folder.*

</details>


<details>
<summary>8. Setup RAM</summary>

If you're running mods, you also need to set up your allocated ram.
If you don't know how much ram your computer has,
follow [this guide](https://www.howtogeek.com/435644/how-to-see-how-much-ram-is-in-your-pc-and-its-speed/).
To allocate ram, go to installation, press the 3 dots next to the installation you are using,
click edit, press more options.
In JVM arguments, look for something that says -Xmx2G or some other number followed by G.
That number is the amount you have allocated for Minecraft to use.
If you have 2G of ram on your computer, you might struggle to play Minecraft.
Try to allocate 1G. If you have 4G, allocate 2G. If you
have 8 or more G, allocate 4G.
You should never need more than 4G, unless you have more mods, than you know what to do.

</details>


<details>
<summary>9. Launch the Forge profile in the launcher</summary>

Installing Minecraft Forge should have set the profile for you, but if it didn't, go to installations,
select new installation, under version you need to find Forge for 1.8.9 (most likely at the top or bottom)

</details>


<details>
<summary>10. Recommended additional mods (optional)</summary>

[OptiFine](https://optifine.net/adloadx?f=preview_OptiFine_1.8.9_HD_U_M6_pre2.jar)
and either [Sk1erLLC's Patcher](https://sk1er.club/mods/patcher) or [Polyfrost's PolyPatcher](<https://modrinth.com/mod/patcher>) (a fork of Patcher with OneConfig, slightly different features, and bug fixes, including fixed cactus hitboxes)

Those two mods help you get more FPS in game and let you change many more performance
settings.

*Ask on discord if you need help with those.*

</details>

<h2>And finally, don't forget to <i><b>never run a file that is sent to you in dms</b></i></h2>
> **1: Run vanilla 1.8.9**
> Run Minecraft 1.8.9, unmodded, for 10 seconds, then close it.
> **2: Install Java**
> To play with mods, you need Java 8.
> Install [Java 8](<https://www.java.com/en/download/>).
> Double-click the file to install it.
> **3: Install Forge**
> Forge is the system that loads your mods into the game.
> You need Java to run Forge.
> Download [Forge for 1.8.9](<https://maven.minecraftforge.net/net/minecraftforge/forge/1.8.9-11.15.1.2318-1.8.9/forge-1.8.9-11.15.1.2318-1.8.9-installer.jar>).
> When you double-click the file, install as client.
> If Forge does not open with Java, download [Jarfix](<https://johann.loefflmann.net/en/software/jarfix/index.html>), double-click it, then try running Forge again.
> **4: Download NEU**
> NEU is NotEnoughUpdates, another Forge mod that contains files that SkyHanni depends on to function.
> You can install it from any of those spots:
> - [Modrinth](<https://modrinth.com/mod/notenoughupdates>)
> - [Moulberry's Bush Discord Server](<https://discord.gg/moulberry>) in the channel [#neu-download](<https://discord.com/channels/516977525906341928/693586404256645231>)
> - [SkyHanni Discord](<https://discord.com/invite/skyhanni-997079228510117908>) in the channel #neu-updates.
> **5: Download SkyHanni**
> SkyHanni has two different update circles: [Full Release](<https://github.com/hannibal002/SkyHanni/releases/latest>) and [Beta](<https://github.com/hannibal002/SkyHanni/releases>).
> It is recommended to use the **Full Release**.
> It updates every 3–4 weeks and should run very stable.
> If you find bugs or miss features in the full version, they might be fixed/implemented already in a beta version.
> The **Beta Version**, on the other hand, gets updated multiple times a week, has new features earlier, but may also contain more bugs.
> **6: Find .minecraft**
> Once you have downloaded both NEU and SkyHanni, you need to navigate to your `.minecraft` folder.
> - On Windows, open File Explorer, in the file location bar at the top type in `%appdata%` and open `.minecraft`.
> - On Mac, open Finder, click on "Go" at the top of your screen and then "Go to Folder" and type in `~/Library/Application Support/Minecraft`.
> - On Linux, `.minecraft` is located in your home folder. `~/.minecraft`
> **7: Move mods into mods folder**
> If there is a `mods` folder, great! Open it.
> Otherwise, create a new folder and name it exactly `mods`.
> Move the NEU and SkyHanni files you downloaded into the folder.
> Remove older versions of NEU or SkyHanni in that folder before adding the new files.
> *Note: If you encounter a problem, support may ask for a screenshot of your mods folder: this is the folder you just set up.*
> **8: Setup RAM**
> If you're running mods, you also need to set up your RAM.
> If you don't know how much RAM your computer has, follow [this guide](<https://www.howtogeek.com/435644/how-to-see-how-much-ram-is-in-your-pc-and-its-speed/>).
> To allocate RAM, go to Installations, press the 3 dots next to the installation you are using, click edit, and press the `More Options` button.
> In JVM arguments, look for something that says `-Xmx2G` or some other number followed by `G`.
> - If you have 4GB, allocate 2GB.
> - If you have 8GB or more, allocate 4GB.
> You generally don't need more than 4GB unless you are using an extensive number of mods.
> **9: Launch the Forge profile in the launcher**
> Installing Minecraft Forge should have set the profile for you, but if it didn't, go to installations, select new installation, and under version, find Forge for 1.8.9 (most likely at the top or bottom).
> **10: Recommended additional mods (optional)**
> [OptiFine](<https://optifine.net/adloadx?f=preview_OptiFine_1.8.9_HD_U_M6_pre2.jar>) and either [Sk1erLLC's Patcher](<https://sk1er.club/mods/patcher>) or [Polyfrost's PolyPatcher](<https://modrinth.com/mod/patcher>) (a fork of Patcher with OneConfig, slightly different features, and bug fixes, including fixed cactus hitboxes).
> Those two mods help you get more FPS in-game and let you change many more performance settings.
*Ask in #support if you need help with a step during installation.
If you have any other questions about the mod, please read our #faq before asking in #support for help.*

> **Important note**
> Never run files sent to you via Discord or other messaging apps.
> **Quick Download Links**
> Full Release: #releases
> Beta: #beta
*This guide was last updated on December 24th, 2024.*
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[versions]
libautoupdate = "1.3.1"
moulconfig = "3.0.0-beta.7"
moulconfig = "3.5.0"
headlessLwjgl = "1.7.2"
jbAnnotations = "24.1.0"

Expand Down
10 changes: 9 additions & 1 deletion root.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,15 @@ plugins {

allprojects {
group = "at.hannibal2.skyhanni"
version = "0.28.Beta.21"

/**
* The version of the project.
* Major version
* Minor version
* Beta version
*/
version = "1.0.0"

repositories {
mavenCentral()
mavenLocal()
Expand Down
14 changes: 8 additions & 6 deletions src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import at.hannibal2.skyhanni.test.command.ErrorManager
import at.hannibal2.skyhanni.test.hotswap.HotswapSupport
import at.hannibal2.skyhanni.utils.MinecraftConsoleFilter.Companion.initLogging
import at.hannibal2.skyhanni.utils.NEUVersionCheck.checkIfNeuIsLoaded
import at.hannibal2.skyhanni.utils.system.ModVersion
import kotlinx.coroutines.CoroutineName
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Job
Expand All @@ -28,7 +29,6 @@ import kotlinx.coroutines.launch
import net.minecraft.client.Minecraft
import net.minecraft.client.gui.GuiScreen
import net.minecraftforge.common.MinecraftForge
import net.minecraftforge.fml.common.Loader
import net.minecraftforge.fml.common.Mod
import net.minecraftforge.fml.common.event.FMLInitializationEvent
import net.minecraftforge.fml.common.event.FMLPreInitializationEvent
Expand All @@ -42,7 +42,7 @@ import org.apache.logging.log4j.Logger
clientSideOnly = true,
useMetadata = true,
guiFactory = "at.hannibal2.skyhanni.config.ConfigGuiForgeInterop",
version = "@MOD_VERSION@",
version = SkyHanniMod.VERSION,
)
class SkyHanniMod {

Expand Down Expand Up @@ -106,11 +106,13 @@ class SkyHanniMod {

companion object {

const val MODID = "skyhanni"
const val MODID: String = "skyhanni"
const val VERSION: String = "@MOD_VERSION@"

@JvmStatic
val version: String
get() = Loader.instance().indexedModList[MODID]!!.version
val modVersion: ModVersion = ModVersion.fromString(VERSION)

val isBetaVersion: Boolean
get() = modVersion.isBeta

@JvmField
var feature: Features = Features()
Expand Down
Loading

0 comments on commit 6b6c051

Please sign in to comment.