Skip to content

Commit

Permalink
2.1.1 based on 1.18.2-pre1
Browse files Browse the repository at this point in the history
soul fire is now 3x
  • Loading branch information
Madis0 committed Feb 20, 2022
1 parent 2d971be commit 9789397
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 9 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ The mod only uses client-side data, so it is never needed on a server. There are
* Regeneration - pink bar, **_number_** where number is the resulting health¹
* Absorption - no bar, **+number**, where number is your absorption health points
* Resistance - no bar, **+⛨number%** or **+rnumber%** where number is the [effect level multiplier](https://minecraft.gamepedia.com/Resistance#Effect)²
* Fire Resistance - no bar, **-~🔥number×~** or **-~bnumber×~** where number is a rough damage multiplier (1× - burning, 2× - burning in fire, 4× - burning in lava/soul fire)²
* Fire Resistance - no bar, **-~🔥number×~** or **-~bnumber×~** where number is a rough damage multiplier (1× - burning, 2× - in fire, 3× - in soul fire, 4× - in lava
* Water Breathing/Conduit Power - blue bar, **-~⭘number~** or **-~anumber~**, number is usually zero and bar hidden unless you got water breathing _within_ water²
* Held food restored hunger bar - green (exact/less) or orange (wasted) bar on top of hunger bar, **_number_** where number is the resulting hunger (negative if wasted; feature similar to AppleSkin)

Expand Down
10 changes: 5 additions & 5 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@ org.gradle.jvmargs=-Xmx1G

# Fabric Properties
# check these on https://fabricmc.net/develop/
minecraft_version=1.18.1
yarn_mappings=1.18.1+build.22
loader_version=0.13.1
minecraft_version=1.18.2-pre1
yarn_mappings=1.18.2-pre1+build.6
loader_version=0.13.2

# Mod Properties
mod_version = 2.1.0
mod_version = 2.1.1
maven_group = io.github.madis0
archives_base_name = onebar

# Dependencies
fabric_version=0.46.4+1.18
fabric_version=0.47.4+1.18.2
3 changes: 2 additions & 1 deletion src/main/java/io/github/madis0/PlayerProperties.java
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,8 @@ public PlayerProperties(){

if(rawBurningSource == -20) burningMultiplier = 1;
if(rawBurningSource == 1) burningMultiplier = 2;
if(rawBurningSource == 0 || isBurningOnSoulFire) burningMultiplier = 4;
if(isBurningOnSoulFire) burningMultiplier = 3;
if(rawBurningSource == 0) burningMultiplier = 4;
isBurningOnFire = (burningMultiplier == 2 || burningMultiplier == 4) && !hasFireResistance;

maxFreezeRaw = playerEntity.getMinFreezeDamageTicks();
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/assets/onebar/lang/en_us.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
"text.autoconfig.onebar.option.badThings.airColor": "Air color (underwater)",
"text.autoconfig.onebar.option.badThings.freezeColor": "Freezing color",
"text.autoconfig.onebar.option.badThings.showFire": "Burning bar and damage multiplier",
"text.autoconfig.onebar.option.badThings.showFire.@Tooltip": "1× - burning, 2× - burning in fire, 4× - burning in lava/soul fire",
"text.autoconfig.onebar.option.badThings.showFire.@Tooltip": "1× - burning, 2× - in fire, 3× - in soul fire, 4× - in lava",
"text.autoconfig.onebar.option.badThings.fireColor": "Burning color",
"text.autoconfig.onebar.option.badThings.poisonColor": "Poison color",
"text.autoconfig.onebar.option.badThings.witherColor": "Wither color",
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/assets/onebar/lang/et_ee.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
"text.autoconfig.onebar.option.badThings.airColor": "Õhu värv (vee all)",
"text.autoconfig.onebar.option.badThings.freezeColor": "Külmumise värv",
"text.autoconfig.onebar.option.badThings.showFire": "Põlemise riba ja kahju kordaja",
"text.autoconfig.onebar.option.badThings.showFire.@Tooltip": "1× - põlemine, 2× - tules põlemine, 4× - laavas/hingetules põlemine",
"text.autoconfig.onebar.option.badThings.showFire.@Tooltip": "1× - põled, 2× - oled tules, 3× - oled hingetules, 4× - oled laavas",
"text.autoconfig.onebar.option.badThings.fireColor": "Põlemise värv",
"text.autoconfig.onebar.option.badThings.poisonColor": "Mürgi värv",
"text.autoconfig.onebar.option.badThings.witherColor": "Närbumise värv",
Expand Down

0 comments on commit 9789397

Please sign in to comment.