Skip to content

Commit

Permalink
Merge branch 'master' into twoconfig
Browse files Browse the repository at this point in the history
  • Loading branch information
Wyvest committed Jun 29, 2024
2 parents 938f9f5 + d947cd8 commit 3fe609a
Show file tree
Hide file tree
Showing 57 changed files with 1,147 additions and 291 deletions.
26 changes: 25 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ you would want while on Hypixel, including Colored Beds, Height Overlay, Chat Me

### General
- **Auto Start** - Join Hypixel immediately once the client has loaded to the main menu.
- **Auto Queue** - Automatically queues for another game once you win or die. (This will require you to interact with the game in a way to prevent abuse)
- **Auto-Complete Play Commands** - Allows tab completion of /play commands.
- **Auto Queue** - Automatically queues for another game once you win or die. (This will require you to interact with the game in a way to prevent abuse)
- **Limbo Play Helper** - When a /play command is run in Limbo, this runs /l first and then the command.
- **Automatically Check GEXP** - Automatically check your GEXP after you win a Hypixel game.
- **Automatically Check Winstreak** - Automatically check your winstreak after you win a Hypixel game.
Expand All @@ -22,11 +22,16 @@ you would want while on Hypixel, including Colored Beds, Height Overlay, Chat Me
<summary>Chat</summary>

### Chat
- **Auto GG** - Send a "gg" message at the end of a game.
- **Auto GG Second Message** - Enable a secondary message to send after your first GG.
- **Casual Auto GG** - Send a "gg" message at the end of minigames/events that don't give out Karma, such as SkyBlock and The Pit events.
- **Anti GG** - Remove GG messages from chat.
- **Auto GL** - Send a message 5 seconds before a Hypixel game starts.
- **Anti GL** - Remove all GL messages from chat.
- **Auto Friend** - Automatically accept friend requests.
- **Auto Chat Report Confirm** - Automatically confirms chat reports.
- **Auto Party Warp Confirm** - Automatically confirms party warps.
- **Auto Reply When AFK** - Automatically sends a reply to anyone who PMs you when you are AFK in Limbo.
- **Game Status Restyle** - Replace common game status messages with a new style.
- **Player Count Before Player Name** - Put the player count before the player name in game join/leave messages.
- **Player Count on Player Leave** - Include the player count when players leave.
Expand All @@ -48,6 +53,7 @@ you would want while on Hypixel, including Colored Beds, Height Overlay, Chat Me
- **Thank Watchdog** - Compliment Watchdog when someone is banned, or a Watchdog announcement is sent.
- **Shout Cooldown** - Show the amount of time remaining until /shout can be reused.
- **Non Speech Cooldown** - Show the amount of time remaining until you can speak if you are a non.
- **Remove Karma Messages** - Remove Karma messages from the chat.
- **Hide Locraw Messages** - Hide locraw messages in chat.
- **Remove Lobby Statuses** - Remove lobby join messages from chat.
- **Remove Ticket Machine Rewards** - Remove ticket machine messages from chat and only show your own.
Expand Down Expand Up @@ -130,6 +136,24 @@ you would want while on Hypixel, including Colored Beds, Height Overlay, Chat Me
- **Hide Useless Lobby Nametags** - Hides unnecessary nametags such as those that say "RIGHT CLICK" or "CLICK TO PLAY" in a lobby, as well as other useless ones.
- **Hide Lobby Bossbars** - Hide the bossbar in the lobby.
- **Silent Lobby** - Prevent all sounds from playing when you are in a lobby.
- **Disable Stepping Sounds** - Remove sounds created by stepping.
- **Disable Slime Sounds** - Remove sounds created by slimes.
- **Disable Dragon Sounds** - Remove sounds created by dragons.
- **Disable Wither Sounds** - Remove sounds created by withers & wither skeletons.
- **Disable Item Pickup Sounds** - Remove sounds created by picking up an item.
- **Disable Experience Orb Sounds** - Remove sounds created by experience orbs.
- **Disable Primed TNT Sounds** - Remove sounds created by primed TNT.
- **Disable Explosion Sounds** - Remove sounds created by explosions.
- **Disable Delivery Man Sounds** - Remove sounds created by delivery man events.
- **Disable Note Block Sounds** - Remove sounds created by note blocks.
- **Disable Firework Sounds** - Remove sounds created by fireworks.
- **Disable Levelup Sounds** - Remove sounds created by someone leveling up.
- **Disable Arrow Sounds** - Remove sounds created by arrows.
- **Disable Bat Sounds** - Remove sounds created by bats.
- **Disable Fire Sounds** - Remove sounds created by fire.
- **Disable Enderman Sounds** - Remove sounds created by endermen.
- **Disable Door Sounds** - Disable sounds caused by doors, trapdoors, and fence gates.
- **Disable Portal Sounds** - Disable sounds caused by nether portals.
- **Remove Limbo AFK Title** - Remove the AFK title when you get sent to limbo for being AFK.
- **Limbo Limiter** - While in Limbo, limit your framerate to reduce the load of the game on your computer.
- **Limbo PM Ding** - While in Limbo, play the ding sound if you get a PM. Currently, Hypixel's option does not work in Limbo.
Expand Down
5 changes: 2 additions & 3 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -106,15 +106,14 @@ dependencies {
compileOnly("org.polyfrost.oneconfig:ui:1.0.0-alpha.14")
modCompileOnly("org.polyfrost.oneconfig:$platform:1.0.0-alpha.14")


modRuntimeOnly("me.djtheredstoner:DevAuth-${if (platform.isFabric) "fabric" else if (platform.isLegacyForge) "forge-legacy" else "forge-latest"}:1.1.2")
modRuntimeOnly("me.djtheredstoner:DevAuth-${if (platform.isFabric) "fabric" else if (platform.isLegacyForge) "forge-legacy" else "forge-latest"}:1.2.0")

shade("com.github.ben-manes.caffeine:caffeine:2.9.3")

// If we are building for legacy forge, includes the launch wrapper with `shade` as we configured earlier.
if (platform.isLegacyForge) {
compileOnly("org.spongepowered:mixin:0.7.11-SNAPSHOT")
shade("cc.polyfrost:oneconfig-wrapper-launchwrapper:1.0.0-beta+")
shade("cc.polyfrost:oneconfig-wrapper-launchwrapper:1.0.0-beta17")
}
}

Expand Down
4 changes: 2 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
mod_name = Hytils Reborn
mod_id = hytils-reborn
mod_version = 1.6.2
mod_version = 1.7.1
# Sets the name of the jar file that you put in your 'mods' folder.
mod_archives_name=Hytils Reborn

# Gradle Configuration -- DO NOT TOUCH THESE VALUES.
polyfrost.defaults.loom=2
polyfrost.defaults.loom=3
org.gradle.daemon=true
org.gradle.parallel=true
org.gradle.configureoncommand=true
Expand Down
58 changes: 58 additions & 0 deletions src/dummy/java/club/sk1er/lobbysounds/config/Sounds.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
/*
* Hytils Reborn - Hypixel focused Quality of Life mod.
* Copyright (C) 2020, 2021, 2022, 2023 Polyfrost, Sk1er LLC and contributors
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/

package club.sk1er.lobbysounds.config;

public class Sounds {

public static boolean DISABLE_SLIME_SOUNDS;

public static boolean DISABLE_DRAGON_SOUNDS;

public static boolean DISABLE_WITHER_SOUNDS;

public static boolean DISABLE_ITEM_PICKUP_SOUNDS;

public static boolean DISABLE_EXPERIENCE_SOUNDS;

public static boolean DISABLE_TNT_PRIME_SOUNDS;

public static boolean DISABLE_EXPLOSION_SOUNDS;

public static boolean DISABLE_DELIVERY_MAN_SOUNDS;

public static boolean DISABLE_NOTE_SOUNDS;

public static boolean DISABLE_FIREWORKS_SOUNDS;

public static boolean DISABLE_LEVELUP_SOUNDS;

public static boolean DISABLE_STEP_SOUNDS;

public static boolean DISABLE_ARROW_SOUNDS;

public static boolean DISABLE_BAT_SOUNDS;

public static boolean DISABLE_FIRE_SOUNDS;

public static boolean DISABLE_ENDERMEN_SOUNDS;

public void markDirty() {}

public void writeData() {}
}
29 changes: 29 additions & 0 deletions src/dummy/java/club/sk1er/mods/autogg/AutoGG.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
/*
* Hytils Reborn - Hypixel focused Quality of Life mod.
* Copyright (C) 2020, 2021, 2022, 2023 Polyfrost, Sk1er LLC and contributors
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/

package club.sk1er.mods.autogg;

import club.sk1er.mods.autogg.config.AutoGGConfig;

public class AutoGG {
public static AutoGG INSTANCE = new AutoGG();

public AutoGGConfig getAutoGGConfig() {
return new AutoGGConfig();
}
}
72 changes: 72 additions & 0 deletions src/dummy/java/club/sk1er/mods/autogg/config/AutoGGConfig.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
/*
* Hytils Reborn - Hypixel focused Quality of Life mod.
* Copyright (C) 2020, 2021, 2022, 2023 Polyfrost, Sk1er LLC and contributors
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/

package club.sk1er.mods.autogg.config;

public class AutoGGConfig {

private boolean autoGGEnabled = true;
private boolean casualAutoGGEnabled;
private boolean antiGGEnabled;
private boolean antiKarmaEnabled;
private int autoGGDelay = 1;
private int autoGGPhrase = 0;
private boolean secondaryEnabled;
private int autoGGPhrase2 = 0;
private int secondaryDelay = 1;

public boolean isModEnabled() {
return autoGGEnabled;
}

public boolean isCasualAutoGGEnabled() {
return casualAutoGGEnabled;
}

public boolean isAntiGGEnabled() {
return antiGGEnabled;
}

public boolean isAntiKarmaEnabled() {
return antiKarmaEnabled;
}

public int getAutoGGDelay() {
return autoGGDelay;
}

public int getAutoGGPhrase() {
return autoGGPhrase;
}

public boolean isSecondaryEnabled() {
return secondaryEnabled;
}

public int getAutoGGPhrase2() {
return autoGGPhrase2;
}

public int getSecondaryDelay() {
return secondaryDelay;
}

public void markDirty() {}

public void writeData() {}
}
1 change: 1 addition & 0 deletions src/main/java/org/polyfrost/hytils/HytilsReborn.java
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ public class HytilsReborn {

public boolean isPatcher;
public boolean isChatting;
public boolean isSk1erAutoGG;
private boolean loadedCall;

private RankType rank;
Expand Down
Loading

0 comments on commit 3fe609a

Please sign in to comment.