aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/main/java/me/xmrvizzy/skyblocker/SkyblockerMod.java19
-rw-r--r--src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java53
-rw-r--r--src/main/java/me/xmrvizzy/skyblocker/config/modmenu/ModMenuEntry.java17
-rw-r--r--src/main/java/me/xmrvizzy/skyblocker/mixin/ChatHudListenerMixin.java39
-rw-r--r--src/main/java/me/xmrvizzy/skyblocker/mixin/InGameHudMixin.java166
-rw-r--r--src/main/java/me/xmrvizzy/skyblocker/utils/Utils.java24
-rw-r--r--src/main/resources/assets/skyblocker/icon.pngbin0 -> 979 bytes
-rw-r--r--src/main/resources/assets/skyblocker/lang/en_us.json19
-rw-r--r--src/main/resources/assets/skyblocker/lang/ru_ru.json19
-rw-r--r--src/main/resources/assets/skyblocker/textures/gui/icons.pngbin0 -> 1350 bytes
-rw-r--r--src/main/resources/fabric.mod.json34
-rw-r--r--src/main/resources/skyblocker.mixins.json12
12 files changed, 402 insertions, 0 deletions
diff --git a/src/main/java/me/xmrvizzy/skyblocker/SkyblockerMod.java b/src/main/java/me/xmrvizzy/skyblocker/SkyblockerMod.java
new file mode 100644
index 00000000..65d207c1
--- /dev/null
+++ b/src/main/java/me/xmrvizzy/skyblocker/SkyblockerMod.java
@@ -0,0 +1,19 @@
+package me.xmrvizzy.skyblocker;
+
+import net.fabricmc.api.ClientModInitializer;
+import me.xmrvizzy.skyblocker.config.SkyblockerConfig;
+
+public class SkyblockerMod implements ClientModInitializer {
+ public static final String NAMESPACE = "skyblocker";
+ private static SkyblockerMod INSTANCE;
+
+ @Override
+ public void onInitializeClient() {
+ INSTANCE = this;
+ SkyblockerConfig.init();
+ }
+
+ public static SkyblockerMod get() {
+ return INSTANCE;
+ }
+} \ No newline at end of file
diff --git a/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java b/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java
new file mode 100644
index 00000000..cc3131b2
--- /dev/null
+++ b/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java
@@ -0,0 +1,53 @@
+package me.xmrvizzy.skyblocker.config;
+
+import me.sargunvohra.mcmods.autoconfig1u.AutoConfig;
+import me.sargunvohra.mcmods.autoconfig1u.ConfigData;
+import me.sargunvohra.mcmods.autoconfig1u.annotation.Config;
+import me.sargunvohra.mcmods.autoconfig1u.annotation.ConfigEntry;
+import me.sargunvohra.mcmods.autoconfig1u.serializer.GsonConfigSerializer;
+
+@Config(name = "skyblocker")
+public class SkyblockerConfig implements ConfigData {
+
+ @ConfigEntry.Category("general")
+ @ConfigEntry.Gui.TransitiveObject
+ public General general = new General();
+
+ @ConfigEntry.Category("bars")
+ @ConfigEntry.Gui.TransitiveObject
+ public Bars bars = new Bars();
+
+ @ConfigEntry.Category("messages")
+ @ConfigEntry.Gui.TransitiveObject
+ public Messages messages = new Messages();
+
+ public static class General {
+ public String apiKey;
+ }
+
+ public static class Bars {
+ public boolean enableBars = true;
+ public boolean enableAbsorption = true;
+ @ConfigEntry.ColorPicker()
+ public int absorbedHealthColor = 0xffaa00;
+ @ConfigEntry.ColorPicker()
+ public int healthColor = 0xff5555;
+ @ConfigEntry.ColorPicker()
+ public int manaColor = 0x55ffff;
+ }
+
+ public static class Messages {
+ public boolean hideAbility = false;
+ public boolean hideHeal = false;
+ public boolean hideAOTE = false;
+ public boolean hideMidasStaff = false;
+ }
+
+ public static void init() {
+ AutoConfig.register(SkyblockerConfig.class, GsonConfigSerializer::new);
+ }
+
+ public static SkyblockerConfig get() {
+ return AutoConfig.getConfigHolder(SkyblockerConfig.class).getConfig();
+ }
+} \ No newline at end of file
diff --git a/src/main/java/me/xmrvizzy/skyblocker/config/modmenu/ModMenuEntry.java b/src/main/java/me/xmrvizzy/skyblocker/config/modmenu/ModMenuEntry.java
new file mode 100644
index 00000000..80949a21
--- /dev/null
+++ b/src/main/java/me/xmrvizzy/skyblocker/config/modmenu/ModMenuEntry.java
@@ -0,0 +1,17 @@
+package me.xmrvizzy.skyblocker.config.modmenu;
+
+import io.github.prospector.modmenu.api.ConfigScreenFactory;
+import io.github.prospector.modmenu.api.ModMenuApi;
+import me.sargunvohra.mcmods.autoconfig1u.AutoConfig;
+import net.fabricmc.api.EnvType;
+import net.fabricmc.api.Environment;
+import me.xmrvizzy.skyblocker.config.SkyblockerConfig;
+
+@Environment(EnvType.CLIENT)
+public class ModMenuEntry implements ModMenuApi {
+
+ @Override
+ public ConfigScreenFactory<?> getModConfigScreenFactory() {
+ return screen -> AutoConfig.getConfigScreen(SkyblockerConfig.class, screen).get();
+ }
+} \ No newline at end of file
diff --git a/src/main/java/me/xmrvizzy/skyblocker/mixin/ChatHudListenerMixin.java b/src/main/java/me/xmrvizzy/skyblocker/mixin/ChatHudListenerMixin.java
new file mode 100644
index 00000000..f6975243
--- /dev/null
+++ b/src/main/java/me/xmrvizzy/skyblocker/mixin/ChatHudListenerMixin.java
@@ -0,0 +1,39 @@
+package me.xmrvizzy.skyblocker.mixin;
+
+import me.xmrvizzy.skyblocker.config.SkyblockerConfig;
+import net.minecraft.client.gui.hud.ChatHudListener;
+import net.minecraft.network.MessageType;
+import net.minecraft.text.Text;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+import java.util.UUID;
+
+@Mixin(ChatHudListener.class)
+public class ChatHudListenerMixin {
+ @Inject(method = "onChatMessage", at = @At("HEAD"), cancellable = true)
+ public void onChatMessage(MessageType messageType, Text message, UUID senderUuid, CallbackInfo ci) {
+ // Ability Cooldown
+ if (SkyblockerConfig.get().messages.hideAbility && message.getString().contains("This ability is currently on cooldown for ") || message.getString().contains("No more charges, next one in ")) {
+ ci.cancel();
+ }
+
+ // Heal Message
+ if (SkyblockerConfig.get().messages.hideHeal && message.getString().contains("You healed ") && message.getString().contains(" health!") || message.getString().contains(" healed you for ")) {
+ ci.cancel();
+ }
+
+ // AOTE
+ if (SkyblockerConfig.get().messages.hideAOTE && message.getString().contains("There are blocks in the way!")) {
+ ci.cancel();
+ }
+
+ // Midas Staff
+ if (SkyblockerConfig.get().messages.hideMidasStaff && message.getString().contains("Your Molten Wave hit ")) {
+ ci.cancel();
+ }
+ }
+
+} \ No newline at end of file
diff --git a/src/main/java/me/xmrvizzy/skyblocker/mixin/InGameHudMixin.java b/src/main/java/me/xmrvizzy/skyblocker/mixin/InGameHudMixin.java
new file mode 100644
index 00000000..faa80e2b
--- /dev/null
+++ b/src/main/java/me/xmrvizzy/skyblocker/mixin/InGameHudMixin.java
@@ -0,0 +1,166 @@
+package me.xmrvizzy.skyblocker.mixin;
+
+import com.mojang.blaze3d.systems.RenderSystem;
+import net.fabricmc.api.EnvType;
+import net.fabricmc.api.Environment;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.font.TextRenderer;
+import net.minecraft.client.gui.DrawableHelper;
+import net.minecraft.client.gui.hud.InGameHud;
+import net.minecraft.client.util.math.MatrixStack;
+import net.minecraft.text.Text;
+import net.minecraft.util.Identifier;
+import org.spongepowered.asm.mixin.Final;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.ModifyVariable;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import me.xmrvizzy.skyblocker.SkyblockerMod;
+import me.xmrvizzy.skyblocker.config.SkyblockerConfig;
+import me.xmrvizzy.skyblocker.utils.Utils;
+
+import java.awt.*;
+
+@Environment(EnvType.CLIENT)
+@Mixin(InGameHud.class)
+public abstract class InGameHudMixin extends DrawableHelper {
+ private static final Identifier ICONS = new Identifier(SkyblockerMod.NAMESPACE, "textures/gui/icons.png");
+
+ @Shadow
+ @Final
+ private MinecraftClient client;
+ @Shadow
+ private int scaledHeight;
+ @Shadow
+ private int scaledWidth;
+
+ @Shadow
+ public abstract TextRenderer getFontRenderer();
+
+ private String hpColor = "§c";
+ private int hpCurrent = 0;
+ private int hpMax = 0;
+ private int manaCurrent = 0;
+ private int manaMax = 0;
+
+ @ModifyVariable(method = "setOverlayMessage(Lnet/minecraft/text/Text;Z)V", at = @At("HEAD"))
+ private Text setOverlayMessage(Text message) {
+ if (Utils.isSkyblock() && SkyblockerConfig.get().bars.enableBars) {
+ String actionBar = message.getString();
+
+ if (actionBar != null) {
+ if (actionBar.contains("❤")) {
+ String[] health = actionBar.split("❤")[0]
+ .split("/");
+ hpColor = health[0].substring(0, 2);
+ hpCurrent = Integer.parseInt(health[0].replaceAll(hpColor, ""));
+ hpMax = Integer.parseInt(health[1]);
+ }
+ if (actionBar.contains("✎")) {
+ String[] mana = actionBar.split("✎")[0]
+ .split("§b");
+ mana = mana[mana.length - 1].split("/");
+ manaCurrent = Integer.parseInt(mana[0]);
+ manaMax = Integer.parseInt(mana[1]);
+ }
+ if (actionBar.contains("❤") && actionBar.contains("✎")) {
+ actionBar = actionBar.replaceAll(hpColor + hpCurrent + "/" + hpMax + "❤ ", "").replaceAll(" §b" + manaCurrent + "/" + manaMax + "✎ Mana", "");
+ return Text.of(actionBar);
+ }
+ }
+ }
+ return message;
+ }
+
+ @Inject(method = "renderStatusBars", at = @At("HEAD"), cancellable = true)
+ private void renderStatusBars(MatrixStack matrices, CallbackInfo ci) {
+ if (Utils.isSkyblock() && SkyblockerConfig.get().bars.enableBars) {
+ ci.cancel();
+
+ this.client.getTextureManager().bindTexture(ICONS);
+ this.client.getProfiler().push("skyblockBars");
+ {
+ int left = this.scaledWidth / 2 - 91;
+ int hpWidth = getWidth(hpCurrent, hpMax);
+ int manaWidth = getWidth(manaCurrent, manaMax);
+
+ if (hpColor.equals("§6") && SkyblockerConfig.get().bars.enableAbsorption) {
+ renderBar(matrices, left, hpWidth, SkyblockerConfig.get().bars.absorbedHealthColor);
+ } else {
+ renderBar(matrices, left, hpWidth, SkyblockerConfig.get().bars.healthColor);
+ }
+ renderBar(matrices, left + 71 + 40, manaWidth, SkyblockerConfig.get().bars.manaColor);
+ }
+ this.client.getProfiler().pop();
+
+ this.client.getProfiler().push("skyblockTexts");
+ {
+ int left = this.scaledWidth / 2 - 90;
+ String hpText = hpCurrent + "/" + hpMax;
+ String manaText = manaCurrent + "/" + manaMax;
+ int hpOffset = (71 - this.getFontRenderer().getWidth(hpText)) / 2;
+ int manaOffset = (71 - this.getFontRenderer().getWidth(manaText)) / 2;
+
+ if (hpColor.equals("§6") && SkyblockerConfig.get().bars.enableAbsorption) {
+ renderText(matrices, hpText, left + hpOffset, SkyblockerConfig.get().bars.absorbedHealthColor);
+ } else {
+ renderText(matrices, hpText, left + hpOffset, SkyblockerConfig.get().bars.healthColor);
+ }
+ renderText(matrices, manaText, left + 71 + 40 + manaOffset, SkyblockerConfig.get().bars.manaColor);
+ }
+ this.client.getProfiler().pop();
+
+ this.client.getTextureManager().bindTexture(DrawableHelper.GUI_ICONS_TEXTURE);
+ }
+ }
+
+ @Inject(method = "renderMountHealth", at = @At("HEAD"), cancellable = true)
+ private void renderMountHealth(MatrixStack matrices, CallbackInfo ci) {
+ if (Utils.isSkyblock() && SkyblockerConfig.get().bars.enableBars) {
+ ci.cancel();
+ }
+ }
+
+ private int getWidth(int current, int max) {
+ int width = 0;
+ if (current != 0) {
+ if (current > max) {
+ width = 71;
+ } else {
+ width = current * 71 / max;
+ }
+ } else {
+ width = 0;
+ }
+ return width;
+ }
+
+ private void renderBar(MatrixStack matrices, int left, int filled, int color) {
+ Color co = new Color(color);
+ int top = this.scaledHeight - 36;
+
+ RenderSystem.enableBlend();
+ RenderSystem.color4f((float) co.getRed() / 255, (float) co.getGreen() / 255, (float) co.getBlue() / 255, 1.0F);
+ this.drawTexture(matrices, left, top, 0, 0, 71, 5);
+
+ if (filled > 0) {
+ this.drawTexture(matrices, left, top, 0, 5, filled, 5);
+ }
+
+ RenderSystem.disableBlend();
+ RenderSystem.color4f(1.0F, 1.0F, 1.0F, 1.0F);
+ }
+
+ private void renderText(MatrixStack matrices, String str, int left, int color) {
+ int top = this.scaledHeight - 42;
+
+ this.getFontRenderer().draw(matrices, str, (float) (left + 1), (float) top, 0);
+ this.getFontRenderer().draw(matrices, str, (float) (left - 1), (float) top, 0);
+ this.getFontRenderer().draw(matrices, str, (float) left, (float) (top + 1), 0);
+ this.getFontRenderer().draw(matrices, str, (float) left, (float) (top - 1), 0);
+ this.getFontRenderer().draw(matrices, str, (float) left, (float) top, color);
+ }
+
+} \ No newline at end of file
diff --git a/src/main/java/me/xmrvizzy/skyblocker/utils/Utils.java b/src/main/java/me/xmrvizzy/skyblocker/utils/Utils.java
new file mode 100644
index 00000000..d305370e
--- /dev/null
+++ b/src/main/java/me/xmrvizzy/skyblocker/utils/Utils.java
@@ -0,0 +1,24 @@
+package me.xmrvizzy.skyblocker.utils;
+
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.scoreboard.ScoreboardObjective;
+import net.minecraft.text.Text;
+
+public class Utils {
+ public static boolean isSkyblock() {
+ MinecraftClient client = MinecraftClient.getInstance();
+ if (client != null && client.world != null && !client.isInSingleplayer()) {
+ ScoreboardObjective scoreboard = client.world.getScoreboard().getObjectiveForSlot(1);
+ if (scoreboard != null) {
+ String name = "";
+ for (Text text : scoreboard.getDisplayName().getSiblings()) {
+ name += text.getString();
+ }
+ if (name.contains("SKYBLOCK")) {
+ return true;
+ }
+ }
+ }
+ return false;
+ }
+} \ No newline at end of file
diff --git a/src/main/resources/assets/skyblocker/icon.png b/src/main/resources/assets/skyblocker/icon.png
new file mode 100644
index 00000000..fd06812a
--- /dev/null
+++ b/src/main/resources/assets/skyblocker/icon.png
Binary files differ
diff --git a/src/main/resources/assets/skyblocker/lang/en_us.json b/src/main/resources/assets/skyblocker/lang/en_us.json
new file mode 100644
index 00000000..cbd23bb1
--- /dev/null
+++ b/src/main/resources/assets/skyblocker/lang/en_us.json
@@ -0,0 +1,19 @@
+{
+ "text.autoconfig.skyblocker.title": "Skyblocker Settings",
+
+ "text.autoconfig.skyblocker.category.general": "General",
+ "text.autoconfig.skyblocker.option.general.apiKey": "Hypixel API Key",
+
+ "text.autoconfig.skyblocker.category.bars": "Bars",
+ "text.autoconfig.skyblocker.option.bars.enableBars": "Enable Health & Mana Bars",
+ "text.autoconfig.skyblocker.option.bars.enableAbsorption": "Enable Absorbed Health",
+ "text.autoconfig.skyblocker.option.bars.absorbedHealthColor": "Absorbed Health Color",
+ "text.autoconfig.skyblocker.option.bars.healthColor": "Health Color",
+ "text.autoconfig.skyblocker.option.bars.manaColor": "Mana Color",
+
+ "text.autoconfig.skyblocker.category.messages": "Messages",
+ "text.autoconfig.skyblocker.option.messages.hideAbility": "Hide Ability Cooldown",
+ "text.autoconfig.skyblocker.option.messages.hideHeal": "Hide Heal Messages",
+ "text.autoconfig.skyblocker.option.messages.hideAOTE": "Hide AOTE Messages",
+ "text.autoconfig.skyblocker.option.messages.hideMidasStaff": "Hide Midas Staff Messages"
+} \ No newline at end of file
diff --git a/src/main/resources/assets/skyblocker/lang/ru_ru.json b/src/main/resources/assets/skyblocker/lang/ru_ru.json
new file mode 100644
index 00000000..efb6b5d8
--- /dev/null
+++ b/src/main/resources/assets/skyblocker/lang/ru_ru.json
@@ -0,0 +1,19 @@
+{
+ "text.autoconfig.skyblocker.title": "Настройки Skyblocker",
+
+ "text.autoconfig.skyblocker.category.general": "Основные",
+ "text.autoconfig.skyblocker.option.general.apiKey": "Hypixel API-ключ",
+
+ "text.autoconfig.skyblocker.category.bars": "Бары",
+ "text.autoconfig.skyblocker.option.bars.enableBars": "Включить бары здоровья и маны",
+ "text.autoconfig.skyblocker.option.bars.enableAbsorption": "Включить поглощенное здоровье",
+ "text.autoconfig.skyblocker.option.bars.absorbedHealthColor": "Цвет поглощенного здоровья",
+ "text.autoconfig.skyblocker.option.bars.healthColor": "Цвет здоровья",
+ "text.autoconfig.skyblocker.option.bars.manaColor": "Цвет маны",
+
+ "text.autoconfig.skyblocker.category.messages": "Сообщения",
+ "text.autoconfig.skyblocker.option.messages.hideAbility": "Скрыть откат способностей",
+ "text.autoconfig.skyblocker.option.messages.hideHeal": "Скрыть сообщения об исцелении",
+ "text.autoconfig.skyblocker.option.messages.hideAOTE": "Скрыть сообщения от \"AOTE\"",
+ "text.autoconfig.skyblocker.option.messages.hideMidasStaff": "Скрыть сообщения от \"Midas Staff\""
+} \ No newline at end of file
diff --git a/src/main/resources/assets/skyblocker/textures/gui/icons.png b/src/main/resources/assets/skyblocker/textures/gui/icons.png
new file mode 100644
index 00000000..5eb23b84
--- /dev/null
+++ b/src/main/resources/assets/skyblocker/textures/gui/icons.png
Binary files differ
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
new file mode 100644
index 00000000..8f178ef9
--- /dev/null
+++ b/src/main/resources/fabric.mod.json
@@ -0,0 +1,34 @@
+{
+ "schemaVersion": 1,
+ "id": "skyblocker",
+ "version": "${version}",
+ "name": "Skyblocker",
+ "description": "Hypixel Skyblock Mod",
+ "authors": ["xMrVizzy"],
+ "contact": {
+ "homepage": "https://modrinth.com/mod/skyblocker"
+ },
+ "license": "CC0-1.0",
+ "icon": "assets/skyblocker/icon.png",
+ "environment": "*",
+ "entrypoints": {
+ "client": [
+ "me.xmrvizzy.skyblocker.SkyblockerMod"
+ ],
+ "modmenu": [
+ "me.xmrvizzy.skyblocker.config.modmenu.ModMenuEntry"
+ ]
+ },
+ "mixins": [
+ "skyblocker.mixins.json"
+ ],
+ "depends": {
+ "fabricloader": ">=0.7.4",
+ "fabric": "*"
+ },
+ "custom": {
+ "modmenu:clientsideOnly": true,
+ "stopmodreposts:showToast": true,
+ "stopmodreposts:showButton": true
+ }
+}
diff --git a/src/main/resources/skyblocker.mixins.json b/src/main/resources/skyblocker.mixins.json
new file mode 100644
index 00000000..551bb924
--- /dev/null
+++ b/src/main/resources/skyblocker.mixins.json
@@ -0,0 +1,12 @@
+{
+ "required": true,
+ "package": "me.xmrvizzy.skyblocker.mixin",
+ "compatibilityLevel": "JAVA_8",
+ "client": [
+ "InGameHudMixin",
+ "ChatHudListenerMixin"
+ ],
+ "injectors": {
+ "defaultRequire": 1
+ }
+} \ No newline at end of file