Skip to content

Commit 3d68c93

Browse files
Madis0Madis0
committed
Hunger toggle, 1.6.1
1 parent 80ec59a commit 3d68c93

5 files changed

Lines changed: 27 additions & 18 deletions

File tree

‎gradle.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ org.gradle.jvmargs=-Xmx1G
88
loader_version=0.12.2
99

1010
# Mod Properties
11-
mod_version = 1.6.0
11+
mod_version = 1.6.1
1212
maven_group = io.github.madis0
1313
archives_base_name = onebar
1414

‎src/main/java/io/github/madis0/ModConfig.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ public class ModConfig implements ConfigData {
1111
@ConfigEntry.Gui.Tooltip
1212
public boolean healthEstimates = true;
1313
public boolean uhcMode = false;
14+
@ConfigEntry.Gui.Tooltip
15+
public boolean disableHunger = false;
1416
@ConfigEntry.Gui.PrefixText
1517
@ConfigEntry.ColorPicker(allowAlpha = true)
1618
public int backgroundColor = 0xFF000000;

‎src/main/java/io/github/madis0/OneBarElements.java‎

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ public class OneBarElements {
1818
private final Difficulty difficulty = Objects.requireNonNull(client.getCameraEntity()).world.getDifficulty();
1919
private final MatrixStack stack;
2020

21+
boolean hasHunger = playerProperties.hasHunger && !config.disableHunger;
22+
2123
public OneBarElements(MatrixStack matrixStack){
2224
stack = matrixStack;
2325
}
@@ -59,19 +61,19 @@ private void saturationBar(){
5961
}
6062

6163
private void heldFoodHungerBar(){
62-
if(playerProperties.hasHunger){
64+
if(hasHunger){
6365
if(playerProperties.heldFoodHungerEstimate >= 0) // Used food
6466
DrawableHelper.fill(stack, clientProperties.baseRelativeStartW(playerProperties.hunger, playerProperties.maxFoodLevel), clientProperties.baseStartH, clientProperties.baseRelativeEndW(playerProperties.maxFoodLevel - playerProperties.heldFoodHungerEstimate, playerProperties.maxFoodLevel), clientProperties.baseEndH, config.goodThings.heldFoodHungerGoodColor);
6567
else // Wasted food
6668
DrawableHelper.fill(stack, clientProperties.baseRelativeStartW(playerProperties.heldFoodHunger, playerProperties.maxFoodLevel), clientProperties.baseStartH, clientProperties.baseEndW, clientProperties.baseEndH, config.goodThings.heldFoodHungerWasteColor);
6769
}
6870
}
6971

70-
private void heldFoodSaturationBar(){
72+
private void heldFoodSaturationBar(){ // Still WIP
7173
DrawableHelper.fill(stack, clientProperties.baseStartW, clientProperties.baseEndH, clientProperties.baseRelativeEndW(playerProperties.heldFoodSaturationEstimateRaw, playerProperties.maxFoodLevelRaw), clientProperties.baseEndH + 1, config.goodThings.heldFoodHungerGoodColor);
7274
}
7375

74-
private void heldFoodHealthBar(){
76+
private void heldFoodHealthBar(){ // Still WIP
7577
if(playerProperties.heldFoodHealthEstimateRaw > playerProperties.healthRaw) {
7678
DrawableHelper.fill(stack, clientProperties.baseStartW, clientProperties.baseStartH, clientProperties.baseRelativeEndW(Math.max(playerProperties.heldFoodHealthEstimateRaw, playerProperties.healthRaw), playerProperties.maxHealthRaw), clientProperties.baseEndH, config.goodThings.naturalRegenerationColor);
7779
}
@@ -100,13 +102,14 @@ private void witherBar(){
100102
}
101103

102104
private void hungerEffectBar(){
103-
if (playerProperties.hungerEffectEstimateRaw > playerProperties.hunger && !difficulty.equals(Difficulty.PEACEFUL)){
105+
if (playerProperties.hungerEffectEstimateRaw > playerProperties.hunger && !difficulty.equals(Difficulty.PEACEFUL) && !config.disableHunger){
104106
DrawableHelper.fill(stack, clientProperties.baseRelativeStartW(playerProperties.hungerEffectEstimateRaw, playerProperties.maxFoodLevelRaw), clientProperties.baseStartH, clientProperties.baseEndW, clientProperties.baseEndH, config.badThings.hungerEffectColor);
105107
}
106108
}
107109

108110
private void hungerBar(){
109-
DrawableHelper.fill(stack, clientProperties.baseRelativeStartW(playerProperties.hungerRaw, playerProperties.maxFoodLevelRaw), clientProperties.baseStartH, clientProperties.baseEndW, clientProperties.baseEndH, config.badThings.hungerColor);
111+
if(hasHunger)
112+
DrawableHelper.fill(stack, clientProperties.baseRelativeStartW(playerProperties.hungerRaw, playerProperties.maxFoodLevelRaw), clientProperties.baseStartH, clientProperties.baseEndW, clientProperties.baseEndH, config.badThings.hungerColor);
110113
}
111114

112115
private void airBar(){
@@ -126,10 +129,10 @@ private void fireBar(){
126129
private void barText(){
127130
String value = "";
128131
boolean showHealthParentheses = config.textSettings.estimatesParentheses &&
129-
(playerProperties.hasHunger || playerProperties.hasHungerEffect || playerProperties.isUnderwater || playerProperties.isFreezing || playerProperties.isBurning || playerProperties.hasAbsorption || (playerProperties.hasResistance && config.goodThings.showResistance)) &&
130-
((playerProperties.naturalRegenerationHealth > playerProperties.health && !config.uhcMode) || playerProperties.hasRegeneration || playerProperties.isStarving || playerProperties.hasPoison || playerProperties.hasWither || playerProperties.isGettingFreezeDamage || playerProperties.isBurningOnFire || playerProperties.isDrowning || playerProperties.isSuffocating);
132+
(hasHunger || playerProperties.hasHungerEffect && !config.disableHunger || playerProperties.isUnderwater || playerProperties.isFreezing || playerProperties.isBurning || playerProperties.hasAbsorption || (playerProperties.hasResistance && config.goodThings.showResistance)) &&
133+
((playerProperties.naturalRegenerationHealth > playerProperties.health && !config.uhcMode) || playerProperties.hasRegeneration || playerProperties.isStarving && !config.disableHunger || playerProperties.hasPoison || playerProperties.hasWither || playerProperties.isGettingFreezeDamage || playerProperties.isBurningOnFire || playerProperties.isDrowning || playerProperties.isSuffocating);
131134

132-
boolean showHungerParentheses = config.textSettings.estimatesParentheses && config.healthEstimates && (playerProperties.hasHungerEffect || (playerProperties.hasHunger && playerProperties.isHoldingFood && config.goodThings.heldFoodHungerBar));
135+
boolean showHungerParentheses = config.textSettings.estimatesParentheses && config.healthEstimates && (playerProperties.hasHungerEffect && !config.disableHunger || (hasHunger && playerProperties.isHoldingFood && config.goodThings.heldFoodHungerBar));
133136

134137
String arrowRight = "→";
135138
String arrowDown = "↓";
@@ -151,11 +154,11 @@ private void barText(){
151154
if(config.healthEstimates){
152155
if (playerProperties.naturalRegenerationHealth > playerProperties.health && !config.uhcMode)
153156
value += arrowRight + Calculations.MakeFraction(playerProperties.naturalRegenerationHealth, config.textSettings.estimatesItalic);
154-
//if (playerProperties.hasHunger && playerProperties.isHoldingFood && playerProperties.heldFoodHealthEstimate > playerProperties.health)
157+
//if (hasHunger && playerProperties.isHoldingFood && playerProperties.heldFoodHealthEstimate > playerProperties.health)
155158
// value += arrowRight + Calculations.MakeFraction(playerProperties.heldFoodHealthEstimate, config.textSettings.estimatesItalic);
156159
if (playerProperties.hasRegeneration)
157160
value += arrowRight + Calculations.MakeFraction(playerProperties.regenerationHealth, config.textSettings.estimatesItalic);
158-
if (playerProperties.isStarving)
161+
if (playerProperties.isStarving && hasHunger)
159162
value += arrowRight + Calculations.MakeFraction(playerProperties.starvationHealthEstimate, config.textSettings.estimatesItalic);
160163
if (playerProperties.hasPoison)
161164
value += arrowRight + Calculations.MakeFraction(playerProperties.poisonHealth, config.textSettings.estimatesItalic);
@@ -195,18 +198,18 @@ private void barText(){
195198
value += minus + new TranslatableText(config.textSettings.useEmoji ? "text.onebar.fireEmoji" : "text.onebar.fire", playerProperties.burningMultiplier).getString();
196199
if (playerProperties.isBurning && playerProperties.hasFireResistance && config.badThings.showFire)
197200
value += minus + para + "m" + new TranslatableText(config.textSettings.useEmoji ? "text.onebar.fireEmoji" : "text.onebar.fire", playerProperties.burningMultiplier).getString() + para + "r";
198-
if (playerProperties.hasHunger || (playerProperties.hasHungerEffect && config.healthEstimates))
201+
if (hasHunger || (playerProperties.hasHungerEffect && config.healthEstimates && !config.disableHunger))
199202
value += minus;
200203

201204
if (showHungerParentheses)
202205
value += pStart;
203-
if (playerProperties.hasHunger || (playerProperties.hasHungerEffect && config.healthEstimates))
206+
if (hasHunger || (playerProperties.hasHungerEffect && config.healthEstimates && !config.disableHunger))
204207
value += Calculations.MakeFraction(playerProperties.hunger, false);
205-
if (playerProperties.hasHunger && playerProperties.saturation < 1 && config.badThings.showHungerDecreasing)
208+
if (hasHunger && playerProperties.saturation < 1 && config.badThings.showHungerDecreasing)
206209
value += arrowDown;
207-
if (playerProperties.hasHungerEffect && config.healthEstimates)
210+
if (playerProperties.hasHungerEffect && !config.disableHunger && config.healthEstimates)
208211
value += arrowRight + Calculations.MakeFraction(playerProperties.hungerEffectEstimate, config.textSettings.estimatesItalic);
209-
if (playerProperties.hasHunger && playerProperties.isHoldingFood && config.goodThings.heldFoodHungerBar)
212+
if (hasHunger && playerProperties.isHoldingFood && config.goodThings.heldFoodHungerBar)
210213
value += arrowRight + Calculations.MakeFraction(playerProperties.heldFoodHungerEstimate, config.textSettings.estimatesItalic);
211214
if (showHungerParentheses)
212215
value += pEnd;

‎src/main/resources/assets/onebar/lang/en_us.json‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
"text.autoconfig.onebar.option.healthEstimates": "Estimates for potion and natural effects",
1616
"text.autoconfig.onebar.option.healthEstimates.@Tooltip": "Toggles the texts and bars for (natural) regeneration, hunger effect, poison etc.",
1717
"text.autoconfig.onebar.option.uhcMode": "UHC mode (disable natural regen estimate)",
18+
"text.autoconfig.onebar.option.disableHunger": "Disable hunger (for minigames)",
19+
"text.autoconfig.onebar.option.disableHunger.@Tooltip": "Hides the hunger bar/text, hunger effect and starvation estimates etc.",
1820
"text.autoconfig.onebar.option.backgroundColor.@PrefixText": "Every color is preceded by the opacity value in hex, see mod page for help",
1921
"text.autoconfig.onebar.option.backgroundColor": "Background color",
2022
"text.autoconfig.onebar.option.textSettings": "Text settings",
@@ -30,7 +32,7 @@
3032
"text.autoconfig.onebar.option.goodThings.naturalRegenerationColor": "Natural regeneration color",
3133
"text.autoconfig.onebar.option.goodThings.regenerationColor": "Regeneration effect color",
3234
"text.autoconfig.onebar.option.goodThings.showResistance": "Resistance percent",
33-
"text.autoconfig.onebar.option.goodThings.heldFoodHungerBar": "Food level restoration by held food (bar on top of hunger bar)",
35+
"text.autoconfig.onebar.option.goodThings.heldFoodHungerBar": "Food level restoration by held food (bar overlay on hunger bar)",
3436
"text.autoconfig.onebar.option.goodThings.heldFoodHungerWasteColor": "Food level restoration color: wasted",
3537
"text.autoconfig.onebar.option.goodThings.heldFoodHungerGoodColor": "Food level restoration color: exact or less",
3638
"text.autoconfig.onebar.option.badThings": "Bad effects and states",

‎src/main/resources/assets/onebar/lang/et_ee.json‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
"text.autoconfig.onebar.option.healthEstimates": "Võlujoogi- ja loomulike mõjude ennustused",
1111
"text.autoconfig.onebar.option.healthEstimates.@Tooltip": "Lülitab (loomuliku) taastumise, näljamõju, mürgi jt väärtuseid ja ribasid",
1212
"text.autoconfig.onebar.option.uhcMode": "UHC-režiim (keela loomuliku taastumise ennustus)",
13+
"text.autoconfig.onebar.option.disableHunger": "Keela nälg (minimängude jaoks)",
14+
"text.autoconfig.onebar.option.disableHunger.@Tooltip": "Peidab näljariba/-teksti, näljaefekti ja nälja tervise ennutuse jne",
1315
"text.autoconfig.onebar.option.backgroundColor.@PrefixText": "Iga värvi ees on läbipaistmatuse väärtus kuueteistkümnendsüsteemis, vt abi saamiseks modi lehte",
1416
"text.autoconfig.onebar.option.backgroundColor": "Tausta värv",
1517
"text.autoconfig.onebar.option.textSettings": "Teksti sätted",
@@ -25,7 +27,7 @@
2527
"text.autoconfig.onebar.option.goodThings.naturalRegenerationColor": "Loomuliku taastumise värv",
2628
"text.autoconfig.onebar.option.goodThings.regenerationColor": "Taastumise mõju värv",
2729
"text.autoconfig.onebar.option.goodThings.showResistance": "Vastupanu protsent",
28-
"text.autoconfig.onebar.option.goodThings.heldFoodHungerBar": "Toidutaseme taastamine käesoleva toiduga (riba näljariba peal)",
30+
"text.autoconfig.onebar.option.goodThings.heldFoodHungerBar": "Toidutaseme taastamine käesoleva toiduga (riba ülekate näljariba peal)",
2931
"text.autoconfig.onebar.option.goodThings.heldFoodHungerWasteColor": "Toidutaseme taastamise värv: raisatud",
3032
"text.autoconfig.onebar.option.goodThings.heldFoodHungerGoodColor": "Toidutaseme taastamise värv: täpne või vähem",
3133
"text.autoconfig.onebar.option.badThings": "Halvad mõjud ja olekud",

0 commit comments

Comments
 (0)