-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Also cleaned up alot
- Loading branch information
Tripp1e
committed
Feb 5, 2024
1 parent
a56d17c
commit d2f8ef3
Showing
9 changed files
with
192 additions
and
80 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,42 @@ | ||
| package com.tripp1e.isleshelper; | ||
|
|
||
| import com.tripp1e.isleshelper.bossrush.Frog; | ||
| import com.tripp1e.isleshelper.bossrush.General; | ||
| import com.tripp1e.isleshelper.config.ConfigManager; | ||
| import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents; | ||
| import net.fabricmc.fabric.api.client.rendering.v1.HudRenderCallback; | ||
| import net.minecraft.client.MinecraftClient; | ||
| import net.minecraft.util.math.ColorHelper; | ||
|
|
||
| public class Events { | ||
| public static void hudRenderCallback() { | ||
| HudRenderCallback.EVENT.register((drawContext, tickDelta) -> { | ||
| if (Utils.getWorld() == null) return; | ||
|
|
||
| //Timer | ||
| int x = ConfigManager.get().general.generalX; | ||
| int y = ConfigManager.get().general.generalY; | ||
| int color = ColorHelper.Argb.getArgb(255, 255, 255, 255); | ||
|
|
||
| if (Utils.isInBoss()) drawContext.drawTextWithShadow(MinecraftClient.getInstance().textRenderer, General.deltaTime, x, y, color); | ||
| } | ||
| ); | ||
| } | ||
|
|
||
| public static void startClientTick() { | ||
| ClientTickEvents.START_CLIENT_TICK.register(client -> { | ||
| if (Utils.getWorld() == null) return; | ||
|
|
||
| //General | ||
| if (ConfigManager.get().general.generalTeammateDeathMessage) General.teamDeathNotify(); | ||
| if (ConfigManager.get().general.generalOnlyPartyChats) General.onlyPartyMessages(); | ||
| if (ConfigManager.get().general.generalTimerEnabled) General.timer(); | ||
|
|
||
| //Frog | ||
| if (Utils.getBoss().equals("frog")) { | ||
| if (ConfigManager.get().general.frogStomachWarning) Frog.stomachExplodeWarn(); | ||
| } | ||
| }); | ||
| } | ||
|
|
||
| } |
26 changes: 3 additions & 23 deletions
26
src/main/java/com/tripp1e/isleshelper/IslesHelperClient.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,42 +1,22 @@ | ||
| package com.tripp1e.isleshelper; | ||
|
|
||
| import com.tripp1e.isleshelper.bossrush.Frog; | ||
| import com.tripp1e.isleshelper.bossrush.General; | ||
| import com.tripp1e.isleshelper.config.ConfigManager; | ||
| import net.fabricmc.api.ClientModInitializer; | ||
| import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents; | ||
| import org.slf4j.Logger; | ||
| import org.slf4j.LoggerFactory; | ||
|
|
||
|
|
||
| public class IslesHelperClient implements ClientModInitializer { | ||
| public static String MOD_ID = "isleshelper"; | ||
| public static final Logger LOGGER = LoggerFactory.getLogger(MOD_ID); | ||
|
|
||
| @Override | ||
| public void onInitializeClient() { | ||
| LOGGER.info("Jesser where is the cocainer"); | ||
| tick(); | ||
| ConfigManager.init(); | ||
| } | ||
|
|
||
|
|
||
| //Runs every tick | ||
| private void tick() { | ||
| ClientTickEvents.START_CLIENT_TICK.register(client -> { | ||
| if (client.player != null && client.world != null && client.world.isClient) { | ||
| //General | ||
| if (ConfigManager.get().general.generalTeammateDeathMessage) General.teamDeathNotify(); | ||
| if (ConfigManager.get().general.generalOnlyPartyChats) General.onlyPartyMessages(); | ||
|
|
||
| //Frog | ||
| if (client.world.getRegistryKey().getValue().toString().contains("frog")) { | ||
| if (ConfigManager.get().general.frogStomachWarning) Frog.stomachExplodeWarn(); | ||
| } | ||
| } | ||
| }); | ||
| ClientTickEvents.END_CLIENT_TICK.register(client -> { | ||
| if (ConfigManager.get().general.generalOnlyPartyChats) General.onlyPartyMessages(); | ||
| }); | ||
| Events.hudRenderCallback(); | ||
| Events.startClientTick(); | ||
| } | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
79 changes: 79 additions & 0 deletions
79
src/main/java/com/tripp1e/isleshelper/config/categories/BossRushCategory.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,79 @@ | ||
| package com.tripp1e.isleshelper.config.categories; | ||
|
|
||
| import com.tripp1e.isleshelper.Utils; | ||
| import com.tripp1e.isleshelper.config.ConfigManager; | ||
| import dev.isxander.yacl3.api.ConfigCategory; | ||
| import dev.isxander.yacl3.api.Option; | ||
| import dev.isxander.yacl3.api.OptionGroup; | ||
| import net.minecraft.text.Text; | ||
|
|
||
| public class BossRushCategory { | ||
|
|
||
| public static ConfigCategory create(ConfigManager defaults, ConfigManager config) { | ||
| return ConfigCategory.createBuilder() | ||
| .name(Text.of("Boss Rush Options")) | ||
|
|
||
| .option(Option.<Boolean>createBuilder() | ||
| .name(Text.of("Notify when Teammate died")) | ||
| .binding(defaults.general.generalTeammateDeathMessage, | ||
| () -> config.general.generalTeammateDeathMessage, | ||
| newValue -> config.general.generalTeammateDeathMessage = newValue) | ||
| .controller(Utils::createBooleanController) | ||
| .build()) | ||
|
|
||
| .option(Option.<Boolean>createBuilder() | ||
| .name(Text.of("Only receive Messages from your Party")) | ||
| .binding(defaults.general.generalOnlyPartyChats, | ||
| () -> config.general.generalOnlyPartyChats, | ||
| newValue -> config.general.generalOnlyPartyChats = newValue) | ||
| .controller(Utils::createBooleanController) | ||
| .build()) | ||
|
|
||
| .group(OptionGroup.createBuilder() | ||
| .name(Text.of("Timer Options")) | ||
| .collapsed(true) | ||
|
|
||
| .option(Option.<Boolean>createBuilder() | ||
| .name(Text.of("Time Bossrush Runs?")) | ||
| .binding(defaults.general.generalOnlyPartyChats, | ||
| () -> config.general.generalOnlyPartyChats, | ||
| newValue -> config.general.generalOnlyPartyChats = newValue) | ||
| .controller(Utils::createBooleanController) | ||
| .build()) | ||
|
|
||
| .option(Option.<Integer>createBuilder() | ||
| .name(Text.of("X of Timer")) | ||
| .binding(defaults.general.generalX, | ||
| () -> config.general.generalX, | ||
| newValue -> config.general.generalX = newValue) | ||
| .controller(opt->Utils.createIntegerController(opt, 0, 1000)) | ||
| .build()) | ||
|
|
||
| .option(Option.<Integer>createBuilder() | ||
| .name(Text.of("Y of Timer")) | ||
| .binding(defaults.general.generalY, | ||
| () -> config.general.generalY, | ||
| newValue -> config.general.generalY = newValue) | ||
| .controller(opt->Utils.createIntegerController(opt, 0, 500)) | ||
| .build()) | ||
| .build()) | ||
|
|
||
| .group(OptionGroup.createBuilder() | ||
| .name(Text.of("Frog Options")) | ||
| .collapsed(true) | ||
|
|
||
| .option(Option.<Boolean>createBuilder() | ||
| .name(Text.of("Warn about explosions in the frog's stomach")) | ||
| .binding(defaults.general.frogStomachWarning, | ||
| () -> config.general.frogStomachWarning, | ||
| newValue -> config.general.frogStomachWarning = newValue) | ||
| .controller(Utils::createBooleanController) | ||
| .build()) | ||
|
|
||
| .build()) | ||
| .build(); | ||
|
|
||
|
|
||
| } | ||
|
|
||
| } |
44 changes: 0 additions & 44 deletions
44
src/main/java/com/tripp1e/isleshelper/config/categories/GeneralCategory.java
This file was deleted.
Oops, something went wrong.