Skip to content

Commit

Permalink
config stuff - bumped to 1.0.3
Browse files Browse the repository at this point in the history
  • Loading branch information
exhq committed Sep 2, 2023
1 parent d311472 commit 2e5aa94
Show file tree
Hide file tree
Showing 5 changed files with 31 additions and 9 deletions.
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ yarn_mappings=1.20.1+build.10
loader_version=0.14.22

# Mod Properties
mod_version=1.0.0
mod_version=1.0.3
maven_group=dev.exhq
archives_base_name=essm

Expand Down
23 changes: 17 additions & 6 deletions src/main/java/dev/exhq/ESSMConfigModel.java
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,25 @@ public class ESSMConfigModel {
public boolean disableVanillaHealthbar = false;

@ExcludeFromScreen
public ESSMhud.PosData Heart = new ESSMhud.PosData();
public ESSMhud.PosData XP = new ESSMhud.PosData();
public ESSMhud.PosData Heart = new ESSMhud.PosData(1,.95,1);

public ESSMhud.PosData Health = new ESSMhud.PosData();
@ExcludeFromScreen
public ESSMhud.PosData XP = new ESSMhud.PosData(1, 0.943,1);

@ExcludeFromScreen
public ESSMhud.PosData Health = new ESSMhud.PosData(1,0.01,1.6f);

@ExcludeFromScreen
public ESSMhud.PosData Mana = new ESSMhud.PosData(1,0.07,1.6f);

public ESSMhud.PosData Mana = new ESSMhud.PosData();
public ESSMhud.PosData UsedMana = new ESSMhud.PosData();
public ESSMhud.PosData PurseAmount = new ESSMhud.PosData();
@ExcludeFromScreen
public ESSMhud.PosData UsedMana = new ESSMhud.PosData(0.04, 1,1);

@ExcludeFromScreen
public ESSMhud.PosData PurseAmount = new ESSMhud.PosData(0.003, 1, 1);

@ExcludeFromScreen
public ESSMhud.PosData Hotbar = new ESSMhud.PosData(1,1,1);


}
9 changes: 8 additions & 1 deletion src/main/java/dev/exhq/ESSMhud.java
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,12 @@ public ESSMhud(Text label, int width, int height, PosData posdata){
this.posdata = posdata;
}
public static class PosData{
public PosData (double defaultX, double defaultY, float Scale){
this.x = defaultX;
this.y = defaultY;
this.scale = Scale;
}
public PosData (){}
double x;
double y;
float scale = 1f;
Expand Down Expand Up @@ -77,14 +83,15 @@ public int getWidth() {
public int getHeight() {
return this.height;
}
public static ESSMhud hotBarPos = new ESSMhud(Text.of("Hotbar"), 182,22, 1,1);
public static ESSMhud hotBarPos = new ESSMhud(Text.of("Hotbar"), 182,22, EchosShittySkyBlockMod.CONFIG.Hotbar());

public static ESSMhud heartPos = new ESSMhud(Text.of("Heart"), 182,22, EchosShittySkyBlockMod.CONFIG.Heart());
public static ESSMhud Xp = new ESSMhud(Text.of("XP"), 182,5, EchosShittySkyBlockMod.CONFIG.XP());
public static ESSMhud Trolley = new ESSMhud(Text.of("Health"), 128,16, EchosShittySkyBlockMod.CONFIG.Health());
public static ESSMhud Trolleymana = new ESSMhud(Text.of("Mana"), 128,16, EchosShittySkyBlockMod.CONFIG.Mana());
public static ESSMhud UsedMana = new ESSMhud(Text.of("UsedMana"), 128,16, EchosShittySkyBlockMod.CONFIG.UsedMana());
public static ESSMhud PurseAmount = new ESSMhud(Text.of("PurseAmount"), 128,16, EchosShittySkyBlockMod.CONFIG.PurseAmount());

public static ESSMhud Skill = new ESSMhud(Text.of("Skill"), 128,16, 0,0);


Expand Down
1 change: 0 additions & 1 deletion src/main/java/dev/exhq/EchosShittySkyBlockMod.java
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
import net.fabricmc.fabric.api.client.command.v2.ClientCommandRegistrationCallback;
import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
import net.fabricmc.fabric.api.client.message.v1.ClientReceiveMessageEvents;
import net.fabricmc.loader.api.FabricLoader;
import net.minecraft.client.MinecraftClient;
import net.minecraft.scoreboard.Scoreboard;
import net.minecraft.scoreboard.ScoreboardPlayerScore;
Expand Down
5 changes: 5 additions & 0 deletions src/main/resources/assets/essm/lang/en_us.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"text.config.ESSMConfig.title": "ESSM",
"text.config.ESSMConfig.option.DisableActionbar": "Disable Actionbar",
"text.config.ESSMConfig.option.disableVanillaHealthbar": "Disable Vanilla Hearts"
}

0 comments on commit 2e5aa94

Please sign in to comment.