summaryrefslogtreecommitdiff
path: root/src/main/java/at
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/at')
-rw-r--r--src/main/java/at/lorenz/mod/Features.java102
-rw-r--r--src/main/java/at/lorenz/mod/HideNotClickableItems.kt6
-rw-r--r--src/main/java/at/lorenz/mod/chat/ChatFilter.kt4
-rw-r--r--src/main/java/at/lorenz/mod/dungeon/DungeonChatFilter.kt5
4 files changed, 59 insertions, 58 deletions
diff --git a/src/main/java/at/lorenz/mod/Features.java b/src/main/java/at/lorenz/mod/Features.java
index 0edf3273e..2aeed312c 100644
--- a/src/main/java/at/lorenz/mod/Features.java
+++ b/src/main/java/at/lorenz/mod/Features.java
@@ -1,7 +1,7 @@
package at.lorenz.mod;
import com.google.gson.annotations.Expose;
-import com.thatgravyboat.skyblockhud.SkyblockHud;
+import com.thatgravyboat.skyblockhud.LorenzMod;
import com.thatgravyboat.skyblockhud.config.SBHConfigEditor;
import com.thatgravyboat.skyblockhud.core.GuiScreenElementWrapper;
import com.thatgravyboat.skyblockhud.core.config.Config;
@@ -15,59 +15,62 @@ import net.minecraft.client.Minecraft;
public class Features extends Config {
private void editOverlay(String activeConfig, int width, int height, Position position) {
- Minecraft.getMinecraft().displayGuiScreen(new GuiPositionEditor(position, width, height, () -> {}, () -> {}, () -> SkyblockHud.screenToOpen = new GuiScreenElementWrapper(new SBHConfigEditor(SkyblockHud.config, activeConfig))));
+ Minecraft.getMinecraft().displayGuiScreen(new GuiPositionEditor(position, width, height, () -> {
+ }, () -> {
+ }, () -> LorenzMod.screenToOpen = new GuiScreenElementWrapper(new SBHConfigEditor(LorenzMod.config, activeConfig))));
}
@Override
public void executeRunnable(String runnableId) {
- // String activeConfigCategory = null;
- // if (Minecraft.getMinecraft().currentScreen instanceof GuiScreenElementWrapper) {
- // GuiScreenElementWrapper wrapper = (GuiScreenElementWrapper) Minecraft.getMinecraft().currentScreen;
- // if (wrapper.element instanceof SBHConfigEditor) {
- // activeConfigCategory = ((SBHConfigEditor) wrapper.element).getSelectedCategoryName();
- // }
- // }
- //
- // switch (runnableId) {
- // case "rpg":
- // editOverlay(activeConfigCategory, 120, 47, rpg.rpgHudPosition);
- // return;
- // case "d1":
- // editOverlay(activeConfigCategory, 120, 32, dungeon.dungeonPlayer1);
- // return;
- // case "d2":
- // editOverlay(activeConfigCategory, 120, 32, dungeon.dungeonPlayer2);
- // return;
- // case "d3":
- // editOverlay(activeConfigCategory, 120, 32, dungeon.dungeonPlayer3);
- // return;
- // case "d4":
- // editOverlay(activeConfigCategory, 120, 32, dungeon.dungeonPlayer4);
- // return;
- // case "main":
- // editOverlay(activeConfigCategory, 1000, 34, main.mainHudPos);
- // return;
- // case "ultimate":
- // editOverlay(activeConfigCategory, 182, 5, dungeon.barPosition);
- // return;
- // case "map":
- // editOverlay(activeConfigCategory, 72, 72, map.miniMapPosition);
- // return;
- // case "tracker":
- // editOverlay(activeConfigCategory, 130, 70, trackers.trackerPosition);
- // return;
- // case "drill":
- // editOverlay(activeConfigCategory, 136, 7, mining.drillBar);
- // return;
- // case "heat":
- // editOverlay(activeConfigCategory, 45, 7, mining.heatBar);
- // return;
- // case "dialogue":
- // editOverlay(activeConfigCategory, 182, 68, misc.dialoguePos);
- // return;
- // }
+// String activeConfigCategory = null;
+// if (Minecraft.getMinecraft().currentScreen instanceof GuiScreenElementWrapper) {
+// GuiScreenElementWrapper wrapper = (GuiScreenElementWrapper) Minecraft.getMinecraft().currentScreen;
+// if (wrapper.element instanceof SBHConfigEditor) {
+// activeConfigCategory = ((SBHConfigEditor) wrapper.element).getSelectedCategoryName();
+// }
+// }
+//
+// switch (runnableId) {
+// case "rpg":
+// editOverlay(activeConfigCategory, 120, 47, rpg.rpgHudPosition);
+// return;
+// case "d1":
+// editOverlay(activeConfigCategory, 120, 32, dungeon.dungeonPlayer1);
+// return;
+// case "d2":
+// editOverlay(activeConfigCategory, 120, 32, dungeon.dungeonPlayer2);
+// return;
+// case "d3":
+// editOverlay(activeConfigCategory, 120, 32, dungeon.dungeonPlayer3);
+// return;
+// case "d4":
+// editOverlay(activeConfigCategory, 120, 32, dungeon.dungeonPlayer4);
+// return;
+// case "main":
+// editOverlay(activeConfigCategory, 1000, 34, main.mainHudPos);
+// return;
+// case "ultimate":
+// editOverlay(activeConfigCategory, 182, 5, dungeon.barPosition);
+// return;
+// case "map":
+// editOverlay(activeConfigCategory, 72, 72, map.miniMapPosition);
+// return;
+// case "tracker":
+// editOverlay(activeConfigCategory, 130, 70, trackers.trackerPosition);
+// return;
+// case "drill":
+// editOverlay(activeConfigCategory, 136, 7, mining.drillBar);
+// return;
+// case "heat":
+// editOverlay(activeConfigCategory, 45, 7, mining.heatBar);
+// return;
+// case "dialogue":
+// editOverlay(activeConfigCategory, 182, 68, misc.dialoguePos);
+// return;
+// }
}
+
@Expose
@Category(name = "Chat", desc = "Chat related features.")
public Chat chat = new Chat();
@@ -99,7 +102,8 @@ public class Features extends Config {
public static class Inventory {
@Expose
- @ConfigOption(name = "Hide Not Clickable Items", desc = "Hide items that are not clickable in " + "the current inventory: ah, bz, accessory bag, etc")
+ @ConfigOption(name = "Hide Not Clickable Items", desc = "Hide items that are not clickable in " +
+ "the current inventory: ah, bz, accessory bag, etc")
@ConfigEditorBoolean
public boolean hideNotClickableItems = false;
}
diff --git a/src/main/java/at/lorenz/mod/HideNotClickableItems.kt b/src/main/java/at/lorenz/mod/HideNotClickableItems.kt
index 8c9e28d83..cd871ba4f 100644
--- a/src/main/java/at/lorenz/mod/HideNotClickableItems.kt
+++ b/src/main/java/at/lorenz/mod/HideNotClickableItems.kt
@@ -1,7 +1,6 @@
package at.lorenz.mod
import at.lorenz.mod.bazaar.BazaarApi
-import at.lorenz.mod.config.LorenzConfig
import at.lorenz.mod.events.GuiContainerEvent
import at.lorenz.mod.utils.ItemUtils
import at.lorenz.mod.utils.ItemUtils.cleanName
@@ -10,8 +9,7 @@ import at.lorenz.mod.utils.LorenzColor
import at.lorenz.mod.utils.LorenzUtils
import at.lorenz.mod.utils.LorenzUtils.removeColorCodes
import at.lorenz.mod.utils.RenderUtils.highlight
-import com.thatgravyboat.skyblockhud.SkyblockHud
-import com.thatgravyboat.skyblockhud.config.SBHConfig
+import com.thatgravyboat.skyblockhud.LorenzMod
import net.minecraft.client.Minecraft
import net.minecraft.client.gui.inventory.GuiChest
import net.minecraft.client.renderer.GlStateManager
@@ -137,7 +135,7 @@ class HideNotClickableItems {
private fun isDisabled(): Boolean {
if (bypassUntil > System.currentTimeMillis()) return true
- return !SkyblockHud.feature.inventory.hideNotClickableItems
+ return !LorenzMod.feature.inventory.hideNotClickableItems
}
private fun hide(chestName: String, stack: ItemStack): Boolean {
diff --git a/src/main/java/at/lorenz/mod/chat/ChatFilter.kt b/src/main/java/at/lorenz/mod/chat/ChatFilter.kt
index 8ac709681..5239bd088 100644
--- a/src/main/java/at/lorenz/mod/chat/ChatFilter.kt
+++ b/src/main/java/at/lorenz/mod/chat/ChatFilter.kt
@@ -3,14 +3,14 @@ package at.lorenz.mod.chat
import at.lorenz.mod.events.LorenzChatEvent
import at.lorenz.mod.utils.LorenzUtils
import at.lorenz.mod.utils.LorenzUtils.matchRegex
-import com.thatgravyboat.skyblockhud.SkyblockHud
+import com.thatgravyboat.skyblockhud.LorenzMod
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
class ChatFilter {
@SubscribeEvent
fun onChatMessage(event: LorenzChatEvent) {
- if (!SkyblockHud.feature.chat.filter) return
+ if (!LorenzMod.feature.chat.filter) return
val blockReason = block(event.message)
if (blockReason != "") {
diff --git a/src/main/java/at/lorenz/mod/dungeon/DungeonChatFilter.kt b/src/main/java/at/lorenz/mod/dungeon/DungeonChatFilter.kt
index 0db9b9e8f..578b37020 100644
--- a/src/main/java/at/lorenz/mod/dungeon/DungeonChatFilter.kt
+++ b/src/main/java/at/lorenz/mod/dungeon/DungeonChatFilter.kt
@@ -1,9 +1,8 @@
package at.lorenz.mod.dungeon
-import at.lorenz.mod.config.LorenzConfig
import at.lorenz.mod.events.LorenzChatEvent
import at.lorenz.mod.utils.LorenzUtils.matchRegex
-import com.thatgravyboat.skyblockhud.SkyblockHud
+import com.thatgravyboat.skyblockhud.LorenzMod
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
class DungeonChatFilter {
@@ -11,7 +10,7 @@ class DungeonChatFilter {
@SubscribeEvent
fun onChatMessage(event: LorenzChatEvent) {
- if (!SkyblockHud.feature.dungeon.hideAnnoyingMessages) return
+ if (!LorenzMod.feature.dungeon.hideAnnoyingMessages) return
val blockReason = block(event.message)
if (blockReason != "") {
generated by cgit (git 2.34.1) at 2026-08-03 16:37:55 +0000