From b16a84f81b49de217c1031e256b7b5c5bcae5d5f Mon Sep 17 00:00:00 2001 From: desyncfy Date: Wed, 3 Jul 2024 12:26:05 -0700 Subject: [PATCH] Bars --- README.md | 2 +- .../scify/mixin/client/ActionBarMixin.java | 43 ++++++++++++++++-- .../kotlin/chickenmanfy/scify/BridgeMixins.kt | 20 ++++++++ .../kotlin/chickenmanfy/scify/modules/Bars.kt | 37 +++++++++++++-- .../kotlin/chickenmanfy/scify/modules/Menu.kt | 4 +- .../Health/Vials_0001.png | Bin .../Health/Vials_0002.png | Bin .../Health/Vials_0003.png | Bin .../Health/Vials_0004.png | Bin .../Health/Vials_0005.png | Bin .../Health/Vials_0006.png | Bin .../Health/Vials_0007.png | Bin .../Health/Vials_0008.png | Bin .../Health/Vials_0009.png | Bin .../Health/Vials_0010.png | Bin .../Health/Vials_0011.png | Bin .../Health/Vials_0012.png | Bin .../Health/Vials_0013.png | Bin .../Health/Vials_0014.png | Bin .../Health/Vials_0015.png | Bin .../Health/Vials_0016.png | Bin .../Health/Vials_0017.png | Bin .../Health/Vials_0018.png | Bin .../Health/Vials_0019.png | Bin .../Health/Vials_0020.png | Bin .../Mana/Vials_0021.png | Bin .../Mana/Vials_0022.png | Bin .../Mana/Vials_0023.png | Bin .../Mana/Vials_0024.png | Bin .../Mana/Vials_0025.png | Bin .../Mana/Vials_0026.png | Bin .../Mana/Vials_0027.png | Bin .../Mana/Vials_0028.png | Bin .../Mana/Vials_0029.png | Bin .../Mana/Vials_0030.png | Bin .../Mana/Vials_0031.png | Bin .../Mana/Vials_0032.png | Bin .../Mana/Vials_0033.png | Bin .../Mana/Vials_0034.png | Bin .../Mana/Vials_0035.png | Bin .../Mana/Vials_0036.png | Bin .../Mana/Vials_0037.png | Bin .../Mana/Vials_0038.png | Bin .../Mana/Vials_0039.png | Bin .../Mana/Vials_0040.png | Bin 45 files changed, 94 insertions(+), 12 deletions(-) create mode 100644 src/client/kotlin/chickenmanfy/scify/BridgeMixins.kt rename src/main/resources/assets/scify/{Health And Mana => HealthMana}/Health/Vials_0001.png (100%) rename src/main/resources/assets/scify/{Health And Mana => HealthMana}/Health/Vials_0002.png (100%) rename src/main/resources/assets/scify/{Health And Mana => HealthMana}/Health/Vials_0003.png (100%) rename src/main/resources/assets/scify/{Health And Mana => HealthMana}/Health/Vials_0004.png (100%) rename src/main/resources/assets/scify/{Health And Mana => HealthMana}/Health/Vials_0005.png (100%) rename src/main/resources/assets/scify/{Health And Mana => HealthMana}/Health/Vials_0006.png (100%) rename src/main/resources/assets/scify/{Health And Mana => HealthMana}/Health/Vials_0007.png (100%) rename src/main/resources/assets/scify/{Health And Mana => HealthMana}/Health/Vials_0008.png (100%) rename src/main/resources/assets/scify/{Health And Mana => HealthMana}/Health/Vials_0009.png (100%) rename src/main/resources/assets/scify/{Health And Mana => HealthMana}/Health/Vials_0010.png (100%) rename src/main/resources/assets/scify/{Health And Mana => HealthMana}/Health/Vials_0011.png (100%) rename src/main/resources/assets/scify/{Health And Mana => HealthMana}/Health/Vials_0012.png (100%) rename src/main/resources/assets/scify/{Health And Mana => HealthMana}/Health/Vials_0013.png (100%) rename src/main/resources/assets/scify/{Health And Mana => HealthMana}/Health/Vials_0014.png (100%) rename src/main/resources/assets/scify/{Health And Mana => HealthMana}/Health/Vials_0015.png (100%) rename src/main/resources/assets/scify/{Health And Mana => HealthMana}/Health/Vials_0016.png (100%) rename src/main/resources/assets/scify/{Health And Mana => HealthMana}/Health/Vials_0017.png (100%) rename src/main/resources/assets/scify/{Health And Mana => HealthMana}/Health/Vials_0018.png (100%) rename src/main/resources/assets/scify/{Health And Mana => HealthMana}/Health/Vials_0019.png (100%) rename src/main/resources/assets/scify/{Health And Mana => HealthMana}/Health/Vials_0020.png (100%) rename src/main/resources/assets/scify/{Health And Mana => HealthMana}/Mana/Vials_0021.png (100%) rename src/main/resources/assets/scify/{Health And Mana => HealthMana}/Mana/Vials_0022.png (100%) rename src/main/resources/assets/scify/{Health And Mana => HealthMana}/Mana/Vials_0023.png (100%) rename src/main/resources/assets/scify/{Health And Mana => HealthMana}/Mana/Vials_0024.png (100%) rename src/main/resources/assets/scify/{Health And Mana => HealthMana}/Mana/Vials_0025.png (100%) rename src/main/resources/assets/scify/{Health And Mana => HealthMana}/Mana/Vials_0026.png (100%) rename src/main/resources/assets/scify/{Health And Mana => HealthMana}/Mana/Vials_0027.png (100%) rename src/main/resources/assets/scify/{Health And Mana => HealthMana}/Mana/Vials_0028.png (100%) rename src/main/resources/assets/scify/{Health And Mana => HealthMana}/Mana/Vials_0029.png (100%) rename src/main/resources/assets/scify/{Health And Mana => HealthMana}/Mana/Vials_0030.png (100%) rename src/main/resources/assets/scify/{Health And Mana => HealthMana}/Mana/Vials_0031.png (100%) rename src/main/resources/assets/scify/{Health And Mana => HealthMana}/Mana/Vials_0032.png (100%) rename src/main/resources/assets/scify/{Health And Mana => HealthMana}/Mana/Vials_0033.png (100%) rename src/main/resources/assets/scify/{Health And Mana => HealthMana}/Mana/Vials_0034.png (100%) rename src/main/resources/assets/scify/{Health And Mana => HealthMana}/Mana/Vials_0035.png (100%) rename src/main/resources/assets/scify/{Health And Mana => HealthMana}/Mana/Vials_0036.png (100%) rename src/main/resources/assets/scify/{Health And Mana => HealthMana}/Mana/Vials_0037.png (100%) rename src/main/resources/assets/scify/{Health And Mana => HealthMana}/Mana/Vials_0038.png (100%) rename src/main/resources/assets/scify/{Health And Mana => HealthMana}/Mana/Vials_0039.png (100%) rename src/main/resources/assets/scify/{Health And Mana => HealthMana}/Mana/Vials_0040.png (100%) diff --git a/README.md b/README.md index a082c72..191c7eb 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ I then remembered when one of my friends (BearCat865) suggested making a Dungeon # Roadmap _Currently in super beta so don't expect something working for a while._ - Right shift menu to enable and disable mods (90%) -- Health & Food bars replaced with dynamic bar similar to EXP bar (40%) +- Health & Food bars replaced with dynamic bar similar to EXP bar (80%) - Custom GUIs (0%) - Built-in guide (CANCELED) **This feature is being worked on in a different mod called "Mythicfy", so it will not be added to this one. We recommend you download that mod.** - Auto-Welcome (20%) **WARNING: This feature may prove to be annoying, in which case we will remove it.** diff --git a/src/client/java/chickenmanfy/scify/mixin/client/ActionBarMixin.java b/src/client/java/chickenmanfy/scify/mixin/client/ActionBarMixin.java index 586c7cd..1e579af 100644 --- a/src/client/java/chickenmanfy/scify/mixin/client/ActionBarMixin.java +++ b/src/client/java/chickenmanfy/scify/mixin/client/ActionBarMixin.java @@ -1,7 +1,9 @@ package chickenmanfy.scify.mixin.client; +import chickenmanfy.scify.BridgeMixins; import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Unique; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; @@ -9,12 +11,45 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import net.minecraft.client.gui.hud.InGameHud; import net.minecraft.text.Text; +import java.util.regex.Matcher; +import java.util.regex.Pattern; @Mixin(InGameHud.class) public class ActionBarMixin { + @Unique + public int finale; - @Inject(at = @At("HEAD"), method = "setOverlayMessage(Lnet/minecraft/text/Text;Z)V") - private void sendMessage(Text message, boolean tinted, CallbackInfo info) { - System.out.println(message.getString()); - } + @Inject(at = @At("HEAD"), method = "setOverlayMessage(Lnet/minecraft/text/Text;Z)V") + public void sendMessage(Text message, boolean tinted, CallbackInfo info) { + String actionBar = message.getString(); + + int num0 = 0; + int num1 = 0; + + // Fancy Regex + Pattern pattern = Pattern.compile("\\[(\\d+)/(\\d+)]"); + Matcher matcher = pattern.matcher(actionBar); + + int count = 0; + while (matcher.find() && count < 2) { + int firstNumber = Integer.parseInt(matcher.group(1)); + int secondNumber = Integer.parseInt(matcher.group(2)); + + float divided = (float) secondNumber / 20; + + finale = Math.round((float) firstNumber/divided); + + if (count == 0) { + num0 = finale; + } else { + num1 = finale; + } + + BridgeMixins.INSTANCE.setNum0(num0); + BridgeMixins.INSTANCE.setNum1(num1); + + + count++; + } + } } \ No newline at end of file diff --git a/src/client/kotlin/chickenmanfy/scify/BridgeMixins.kt b/src/client/kotlin/chickenmanfy/scify/BridgeMixins.kt new file mode 100644 index 0000000..f0c90eb --- /dev/null +++ b/src/client/kotlin/chickenmanfy/scify/BridgeMixins.kt @@ -0,0 +1,20 @@ +package chickenmanfy.scify + +object BridgeMixins { + private var num0: Int = 0 + private var num1: Int = 0 + + fun getNum0(): Int { + return num0 + } + fun getNum1(): Int { + return num1 + } + + fun setNum0(number: Int) { + num0 = number + } + fun setNum1(number: Int) { + num1 = number + } +} diff --git a/src/client/kotlin/chickenmanfy/scify/modules/Bars.kt b/src/client/kotlin/chickenmanfy/scify/modules/Bars.kt index e7a2f6d..dad620c 100644 --- a/src/client/kotlin/chickenmanfy/scify/modules/Bars.kt +++ b/src/client/kotlin/chickenmanfy/scify/modules/Bars.kt @@ -1,7 +1,10 @@ package chickenmanfy.scify.modules +import chickenmanfy.scify.BridgeMixins +import chickenmanfy.scify.SciFyClient.debugUser import com.mojang.blaze3d.systems.RenderSystem import net.fabricmc.fabric.api.client.rendering.v1.HudRenderCallback +import net.minecraft.client.MinecraftClient import net.minecraft.client.gui.DrawContext import net.minecraft.client.render.* import net.minecraft.util.Identifier @@ -17,19 +20,43 @@ class Bars { val tessellator: Tessellator = Tessellator.getInstance() val buffer: BufferBuilder = tessellator.buffer val positionMatrix = drawContext?.matrices?.peek()?.positionMatrix + if (MinecraftClient.getInstance().networkHandler?.serverInfo?.address == "51.222.121.148:25599" || + MinecraftClient.getInstance().player?.name?.string == debugUser) { if (barsToggle) { buffer.begin(VertexFormat.DrawMode.QUADS, VertexFormats.POSITION_COLOR_TEXTURE) - buffer.vertex(positionMatrix, 20F, 20F, 0F).color(1f, 1f, 1f, 1f).texture(0f, 0f).next() - buffer.vertex(positionMatrix, 20F, 60F, 0F).color(1f, 1f, 1f, 1f).texture(0f, 1f).next() - buffer.vertex(positionMatrix, 60F, 60F, 0F).color(1f, 1f, 1f, 1f).texture(1f, 1f).next() - buffer.vertex(positionMatrix, 60F, 20F, 0F).color(1f, 1f, 1f, 1f).texture(1f, 0f).next() + buffer.vertex(positionMatrix, 240F, 460F, 0F).color(1f, 1f, 1f, 1f).texture(0f, 0f).next() + buffer.vertex(positionMatrix, 240F, 500F, 0F).color(1f, 1f, 1f, 1f).texture(0f, 1f).next() + buffer.vertex(positionMatrix, 280F, 500F, 0F).color(1f, 1f, 1f, 1f).texture(1f, 1f).next() + buffer.vertex(positionMatrix, 280F, 460F, 0F).color(1f, 1f, 1f, 1f).texture(1f, 0f).next() RenderSystem.setShader { GameRenderer.getPositionColorTexProgram() } - RenderSystem.setShaderTexture(0, Identifier("scify", "/Health And Mana/Health/Vials_0001.png")) + if (BridgeMixins.getNum1() < 10) { + RenderSystem.setShaderTexture(0, Identifier("scify", "./HealthMana/Mana/Vials_000${BridgeMixins.getNum1() + 20}.png")) + } + else { + RenderSystem.setShaderTexture(0, Identifier("scify", "./HealthMana/Mana/Vials_00${BridgeMixins.getNum1() + 20}.png")) + } + RenderSystem.setShaderColor(1f, 1f, 1f, 1f) + + tessellator.draw() + + buffer.begin(VertexFormat.DrawMode.QUADS, VertexFormats.POSITION_COLOR_TEXTURE) + buffer.vertex(positionMatrix, 215F, 460F, 0F).color(1f, 1f, 1f, 1f).texture(0f, 0f).next() + buffer.vertex(positionMatrix, 215F, 500F, 0F).color(1f, 1f, 1f, 1f).texture(0f, 1f).next() + buffer.vertex(positionMatrix, 255F, 500F, 0F).color(1f, 1f, 1f, 1f).texture(1f, 1f).next() + buffer.vertex(positionMatrix, 255F, 460F, 0F).color(1f, 1f, 1f, 1f).texture(1f, 0f).next() + + RenderSystem.setShader { GameRenderer.getPositionColorTexProgram() } + if (BridgeMixins.getNum0() < 10) { + RenderSystem.setShaderTexture(0, Identifier("scify", "./HealthMana/Health/Vials_000${BridgeMixins.getNum0()}.png")) + } else { + RenderSystem.setShaderTexture(0, Identifier("scify", "./HealthMana/Health/Vials_00${BridgeMixins.getNum0()}.png")) + } RenderSystem.setShaderColor(1f, 1f, 1f, 1f) tessellator.draw() } + } }) } } \ No newline at end of file diff --git a/src/client/kotlin/chickenmanfy/scify/modules/Menu.kt b/src/client/kotlin/chickenmanfy/scify/modules/Menu.kt index 89bcef1..b2b74fa 100644 --- a/src/client/kotlin/chickenmanfy/scify/modules/Menu.kt +++ b/src/client/kotlin/chickenmanfy/scify/modules/Menu.kt @@ -34,11 +34,11 @@ class Menu : Screen(Text.literal("SciFy Menu")) { } public override fun init() { - dynamicBars = ButtonWidget.builder(Text.literal("Dynamic Health")) { + dynamicBars = ButtonWidget.builder(Text.literal("Custom Health/Mana")) { Bars().toggleBars() // Call the function toggleBars() from the bars.kt module } .dimensions(width / 2 - 205, 84, 200, 20) - .tooltip(Tooltip.of(Text.literal("Health bar similar to XP"))) + .tooltip(Tooltip.of(Text.literal("Custom Health and Mana bars."))) .build() fishingNotif = ButtonWidget.builder(Text.literal("Fishing Notifications")) { FishingNotif().toggleFishingNotif() // Call the function toggleFishingNotif() from the FishingNotif.kt module diff --git a/src/main/resources/assets/scify/Health And Mana/Health/Vials_0001.png b/src/main/resources/assets/scify/HealthMana/Health/Vials_0001.png similarity index 100% rename from src/main/resources/assets/scify/Health And Mana/Health/Vials_0001.png rename to src/main/resources/assets/scify/HealthMana/Health/Vials_0001.png diff --git a/src/main/resources/assets/scify/Health And Mana/Health/Vials_0002.png b/src/main/resources/assets/scify/HealthMana/Health/Vials_0002.png similarity index 100% rename from src/main/resources/assets/scify/Health And Mana/Health/Vials_0002.png rename to src/main/resources/assets/scify/HealthMana/Health/Vials_0002.png diff --git a/src/main/resources/assets/scify/Health And Mana/Health/Vials_0003.png b/src/main/resources/assets/scify/HealthMana/Health/Vials_0003.png similarity index 100% rename from src/main/resources/assets/scify/Health And Mana/Health/Vials_0003.png rename to src/main/resources/assets/scify/HealthMana/Health/Vials_0003.png diff --git a/src/main/resources/assets/scify/Health And Mana/Health/Vials_0004.png b/src/main/resources/assets/scify/HealthMana/Health/Vials_0004.png similarity index 100% rename from src/main/resources/assets/scify/Health And Mana/Health/Vials_0004.png rename to src/main/resources/assets/scify/HealthMana/Health/Vials_0004.png diff --git a/src/main/resources/assets/scify/Health And Mana/Health/Vials_0005.png b/src/main/resources/assets/scify/HealthMana/Health/Vials_0005.png similarity index 100% rename from src/main/resources/assets/scify/Health And Mana/Health/Vials_0005.png rename to src/main/resources/assets/scify/HealthMana/Health/Vials_0005.png diff --git a/src/main/resources/assets/scify/Health And Mana/Health/Vials_0006.png b/src/main/resources/assets/scify/HealthMana/Health/Vials_0006.png similarity index 100% rename from src/main/resources/assets/scify/Health And Mana/Health/Vials_0006.png rename to src/main/resources/assets/scify/HealthMana/Health/Vials_0006.png diff --git a/src/main/resources/assets/scify/Health And Mana/Health/Vials_0007.png b/src/main/resources/assets/scify/HealthMana/Health/Vials_0007.png similarity index 100% rename from src/main/resources/assets/scify/Health And Mana/Health/Vials_0007.png rename to src/main/resources/assets/scify/HealthMana/Health/Vials_0007.png diff --git a/src/main/resources/assets/scify/Health And Mana/Health/Vials_0008.png b/src/main/resources/assets/scify/HealthMana/Health/Vials_0008.png similarity index 100% rename from src/main/resources/assets/scify/Health And Mana/Health/Vials_0008.png rename to src/main/resources/assets/scify/HealthMana/Health/Vials_0008.png diff --git a/src/main/resources/assets/scify/Health And Mana/Health/Vials_0009.png b/src/main/resources/assets/scify/HealthMana/Health/Vials_0009.png similarity index 100% rename from src/main/resources/assets/scify/Health And Mana/Health/Vials_0009.png rename to src/main/resources/assets/scify/HealthMana/Health/Vials_0009.png diff --git a/src/main/resources/assets/scify/Health And Mana/Health/Vials_0010.png b/src/main/resources/assets/scify/HealthMana/Health/Vials_0010.png similarity index 100% rename from src/main/resources/assets/scify/Health And Mana/Health/Vials_0010.png rename to src/main/resources/assets/scify/HealthMana/Health/Vials_0010.png diff --git a/src/main/resources/assets/scify/Health And Mana/Health/Vials_0011.png b/src/main/resources/assets/scify/HealthMana/Health/Vials_0011.png similarity index 100% rename from src/main/resources/assets/scify/Health And Mana/Health/Vials_0011.png rename to src/main/resources/assets/scify/HealthMana/Health/Vials_0011.png diff --git a/src/main/resources/assets/scify/Health And Mana/Health/Vials_0012.png b/src/main/resources/assets/scify/HealthMana/Health/Vials_0012.png similarity index 100% rename from src/main/resources/assets/scify/Health And Mana/Health/Vials_0012.png rename to src/main/resources/assets/scify/HealthMana/Health/Vials_0012.png diff --git a/src/main/resources/assets/scify/Health And Mana/Health/Vials_0013.png b/src/main/resources/assets/scify/HealthMana/Health/Vials_0013.png similarity index 100% rename from src/main/resources/assets/scify/Health And Mana/Health/Vials_0013.png rename to src/main/resources/assets/scify/HealthMana/Health/Vials_0013.png diff --git a/src/main/resources/assets/scify/Health And Mana/Health/Vials_0014.png b/src/main/resources/assets/scify/HealthMana/Health/Vials_0014.png similarity index 100% rename from src/main/resources/assets/scify/Health And Mana/Health/Vials_0014.png rename to src/main/resources/assets/scify/HealthMana/Health/Vials_0014.png diff --git a/src/main/resources/assets/scify/Health And Mana/Health/Vials_0015.png b/src/main/resources/assets/scify/HealthMana/Health/Vials_0015.png similarity index 100% rename from src/main/resources/assets/scify/Health And Mana/Health/Vials_0015.png rename to src/main/resources/assets/scify/HealthMana/Health/Vials_0015.png diff --git a/src/main/resources/assets/scify/Health And Mana/Health/Vials_0016.png b/src/main/resources/assets/scify/HealthMana/Health/Vials_0016.png similarity index 100% rename from src/main/resources/assets/scify/Health And Mana/Health/Vials_0016.png rename to src/main/resources/assets/scify/HealthMana/Health/Vials_0016.png diff --git a/src/main/resources/assets/scify/Health And Mana/Health/Vials_0017.png b/src/main/resources/assets/scify/HealthMana/Health/Vials_0017.png similarity index 100% rename from src/main/resources/assets/scify/Health And Mana/Health/Vials_0017.png rename to src/main/resources/assets/scify/HealthMana/Health/Vials_0017.png diff --git a/src/main/resources/assets/scify/Health And Mana/Health/Vials_0018.png b/src/main/resources/assets/scify/HealthMana/Health/Vials_0018.png similarity index 100% rename from src/main/resources/assets/scify/Health And Mana/Health/Vials_0018.png rename to src/main/resources/assets/scify/HealthMana/Health/Vials_0018.png diff --git a/src/main/resources/assets/scify/Health And Mana/Health/Vials_0019.png b/src/main/resources/assets/scify/HealthMana/Health/Vials_0019.png similarity index 100% rename from src/main/resources/assets/scify/Health And Mana/Health/Vials_0019.png rename to src/main/resources/assets/scify/HealthMana/Health/Vials_0019.png diff --git a/src/main/resources/assets/scify/Health And Mana/Health/Vials_0020.png b/src/main/resources/assets/scify/HealthMana/Health/Vials_0020.png similarity index 100% rename from src/main/resources/assets/scify/Health And Mana/Health/Vials_0020.png rename to src/main/resources/assets/scify/HealthMana/Health/Vials_0020.png diff --git a/src/main/resources/assets/scify/Health And Mana/Mana/Vials_0021.png b/src/main/resources/assets/scify/HealthMana/Mana/Vials_0021.png similarity index 100% rename from src/main/resources/assets/scify/Health And Mana/Mana/Vials_0021.png rename to src/main/resources/assets/scify/HealthMana/Mana/Vials_0021.png diff --git a/src/main/resources/assets/scify/Health And Mana/Mana/Vials_0022.png b/src/main/resources/assets/scify/HealthMana/Mana/Vials_0022.png similarity index 100% rename from src/main/resources/assets/scify/Health And Mana/Mana/Vials_0022.png rename to src/main/resources/assets/scify/HealthMana/Mana/Vials_0022.png diff --git a/src/main/resources/assets/scify/Health And Mana/Mana/Vials_0023.png b/src/main/resources/assets/scify/HealthMana/Mana/Vials_0023.png similarity index 100% rename from src/main/resources/assets/scify/Health And Mana/Mana/Vials_0023.png rename to src/main/resources/assets/scify/HealthMana/Mana/Vials_0023.png diff --git a/src/main/resources/assets/scify/Health And Mana/Mana/Vials_0024.png b/src/main/resources/assets/scify/HealthMana/Mana/Vials_0024.png similarity index 100% rename from src/main/resources/assets/scify/Health And Mana/Mana/Vials_0024.png rename to src/main/resources/assets/scify/HealthMana/Mana/Vials_0024.png diff --git a/src/main/resources/assets/scify/Health And Mana/Mana/Vials_0025.png b/src/main/resources/assets/scify/HealthMana/Mana/Vials_0025.png similarity index 100% rename from src/main/resources/assets/scify/Health And Mana/Mana/Vials_0025.png rename to src/main/resources/assets/scify/HealthMana/Mana/Vials_0025.png diff --git a/src/main/resources/assets/scify/Health And Mana/Mana/Vials_0026.png b/src/main/resources/assets/scify/HealthMana/Mana/Vials_0026.png similarity index 100% rename from src/main/resources/assets/scify/Health And Mana/Mana/Vials_0026.png rename to src/main/resources/assets/scify/HealthMana/Mana/Vials_0026.png diff --git a/src/main/resources/assets/scify/Health And Mana/Mana/Vials_0027.png b/src/main/resources/assets/scify/HealthMana/Mana/Vials_0027.png similarity index 100% rename from src/main/resources/assets/scify/Health And Mana/Mana/Vials_0027.png rename to src/main/resources/assets/scify/HealthMana/Mana/Vials_0027.png diff --git a/src/main/resources/assets/scify/Health And Mana/Mana/Vials_0028.png b/src/main/resources/assets/scify/HealthMana/Mana/Vials_0028.png similarity index 100% rename from src/main/resources/assets/scify/Health And Mana/Mana/Vials_0028.png rename to src/main/resources/assets/scify/HealthMana/Mana/Vials_0028.png diff --git a/src/main/resources/assets/scify/Health And Mana/Mana/Vials_0029.png b/src/main/resources/assets/scify/HealthMana/Mana/Vials_0029.png similarity index 100% rename from src/main/resources/assets/scify/Health And Mana/Mana/Vials_0029.png rename to src/main/resources/assets/scify/HealthMana/Mana/Vials_0029.png diff --git a/src/main/resources/assets/scify/Health And Mana/Mana/Vials_0030.png b/src/main/resources/assets/scify/HealthMana/Mana/Vials_0030.png similarity index 100% rename from src/main/resources/assets/scify/Health And Mana/Mana/Vials_0030.png rename to src/main/resources/assets/scify/HealthMana/Mana/Vials_0030.png diff --git a/src/main/resources/assets/scify/Health And Mana/Mana/Vials_0031.png b/src/main/resources/assets/scify/HealthMana/Mana/Vials_0031.png similarity index 100% rename from src/main/resources/assets/scify/Health And Mana/Mana/Vials_0031.png rename to src/main/resources/assets/scify/HealthMana/Mana/Vials_0031.png diff --git a/src/main/resources/assets/scify/Health And Mana/Mana/Vials_0032.png b/src/main/resources/assets/scify/HealthMana/Mana/Vials_0032.png similarity index 100% rename from src/main/resources/assets/scify/Health And Mana/Mana/Vials_0032.png rename to src/main/resources/assets/scify/HealthMana/Mana/Vials_0032.png diff --git a/src/main/resources/assets/scify/Health And Mana/Mana/Vials_0033.png b/src/main/resources/assets/scify/HealthMana/Mana/Vials_0033.png similarity index 100% rename from src/main/resources/assets/scify/Health And Mana/Mana/Vials_0033.png rename to src/main/resources/assets/scify/HealthMana/Mana/Vials_0033.png diff --git a/src/main/resources/assets/scify/Health And Mana/Mana/Vials_0034.png b/src/main/resources/assets/scify/HealthMana/Mana/Vials_0034.png similarity index 100% rename from src/main/resources/assets/scify/Health And Mana/Mana/Vials_0034.png rename to src/main/resources/assets/scify/HealthMana/Mana/Vials_0034.png diff --git a/src/main/resources/assets/scify/Health And Mana/Mana/Vials_0035.png b/src/main/resources/assets/scify/HealthMana/Mana/Vials_0035.png similarity index 100% rename from src/main/resources/assets/scify/Health And Mana/Mana/Vials_0035.png rename to src/main/resources/assets/scify/HealthMana/Mana/Vials_0035.png diff --git a/src/main/resources/assets/scify/Health And Mana/Mana/Vials_0036.png b/src/main/resources/assets/scify/HealthMana/Mana/Vials_0036.png similarity index 100% rename from src/main/resources/assets/scify/Health And Mana/Mana/Vials_0036.png rename to src/main/resources/assets/scify/HealthMana/Mana/Vials_0036.png diff --git a/src/main/resources/assets/scify/Health And Mana/Mana/Vials_0037.png b/src/main/resources/assets/scify/HealthMana/Mana/Vials_0037.png similarity index 100% rename from src/main/resources/assets/scify/Health And Mana/Mana/Vials_0037.png rename to src/main/resources/assets/scify/HealthMana/Mana/Vials_0037.png diff --git a/src/main/resources/assets/scify/Health And Mana/Mana/Vials_0038.png b/src/main/resources/assets/scify/HealthMana/Mana/Vials_0038.png similarity index 100% rename from src/main/resources/assets/scify/Health And Mana/Mana/Vials_0038.png rename to src/main/resources/assets/scify/HealthMana/Mana/Vials_0038.png diff --git a/src/main/resources/assets/scify/Health And Mana/Mana/Vials_0039.png b/src/main/resources/assets/scify/HealthMana/Mana/Vials_0039.png similarity index 100% rename from src/main/resources/assets/scify/Health And Mana/Mana/Vials_0039.png rename to src/main/resources/assets/scify/HealthMana/Mana/Vials_0039.png diff --git a/src/main/resources/assets/scify/Health And Mana/Mana/Vials_0040.png b/src/main/resources/assets/scify/HealthMana/Mana/Vials_0040.png similarity index 100% rename from src/main/resources/assets/scify/Health And Mana/Mana/Vials_0040.png rename to src/main/resources/assets/scify/HealthMana/Mana/Vials_0040.png