Skip to content

Commit

Permalink
Fixed hyperthermia issues
Browse files Browse the repository at this point in the history
  • Loading branch information
Adubbz committed Dec 31, 2023
1 parent ef78ed1 commit 00b277f
Show file tree
Hide file tree
Showing 9 changed files with 30 additions and 26 deletions.
36 changes: 18 additions & 18 deletions .github/workflows/gradle-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,21 +23,21 @@ jobs:
settings-path: ${{ github.workspace }} # location for the settings.xml file
- name: Setup Gradle
uses: gradle/gradle-build-action@v2
# - name: Publish
# run: ./gradlew publish
# env:
# MAVEN_USER: ${{ secrets.MAVEN_USER }}
# MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
# BUILD_NUMBER: ${{ github.run_number }}
# - name: CurseForge Publish
# run: ./gradlew curseforge -PcurseApiKey=${CURSE_API_KEY}
# env:
# CURSE_API_KEY: ${{ secrets.CURSE_API_KEY }}
# BUILD_NUMBER: ${{ github.run_number }}
# continue-on-error: true
# - name: Modrinth Publish
# run: ./gradlew modrinth -PmodrinthToken=${MODRINTH_TOKEN}
# env:
# MODRINTH_TOKEN: ${{ secrets.MODRINTH_TOKEN }}
# BUILD_NUMBER: ${{ github.run_number }}
# continue-on-error: true
- name: Publish
run: ./gradlew publish
env:
MAVEN_USER: ${{ secrets.MAVEN_USER }}
MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
BUILD_NUMBER: ${{ github.run_number }}
- name: CurseForge Publish
run: ./gradlew curseforge -PcurseApiKey=${CURSE_API_KEY}
env:
CURSE_API_KEY: ${{ secrets.CURSE_API_KEY }}
BUILD_NUMBER: ${{ github.run_number }}
continue-on-error: true
- name: Modrinth Publish
run: ./gradlew modrinth -PmodrinthToken=${MODRINTH_TOKEN}
env:
MODRINTH_TOKEN: ${{ secrets.MODRINTH_TOKEN }}
BUILD_NUMBER: ${{ github.run_number }}
continue-on-error: true
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
// 1.20.4 2023-12-25T10:07:37.6375031 Registries
d470b0b2874a8852f0c4685792683ee5e40da360 data/toughasnails/damage_type/hyperthermia.json
// 1.20.4 2023-12-31T23:39:17.4498631 Registries
55b6780cec82f4d4f609e750902d114649d4a8ad data/toughasnails/damage_type/hyperthermia.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"exhaustion": 0.1,
"message_id": "hyperthermia",
"message_id": "toughasnails.hyperthermia",
"scaling": "when_caused_by_living_non_player"
}
2 changes: 1 addition & 1 deletion common/src/main/java/toughasnails/config/ClientConfig.java
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ public ClientConfig()
}

@Override
public void read()
public void load()
{
thirstLeftOffset = addNumber("gui.thirst_left_offset", 0, Integer.MIN_VALUE, Integer.MAX_VALUE, "The offset of the left of the thirst overlay from its default position.");
thirstTopOffset = addNumber("gui.thirst_top_offset", 0, Integer.MIN_VALUE, Integer.MAX_VALUE, "The offset of the top of the thirst overlay from its default position.");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ public TemperatureConfig()
};

@Override
public void read()
public void load()
{
// Toggles
enableTemperature = add("toggles.enable_temperature", true, "Enable or disable temperature.");
Expand Down
2 changes: 1 addition & 1 deletion common/src/main/java/toughasnails/config/ThirstConfig.java
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ public ThirstConfig()
}

@Override
public void read()
public void load()
{
// Toggles
enableThirst = add("toggles.enable_thirst", true, "Enable or disable thirst.");
Expand Down
4 changes: 4 additions & 0 deletions common/src/main/java/toughasnails/init/ModConfig.java
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
******************************************************************************/
package toughasnails.init;

import glitchcore.config.ConfigSync;
import glitchcore.util.Environment;
import toughasnails.config.ClientConfig;
import toughasnails.config.TemperatureConfig;
Expand All @@ -20,6 +21,9 @@ public static void init()
thirst = new ThirstConfig();
temperature = new TemperatureConfig();

ConfigSync.register(thirst);
ConfigSync.register(temperature);

if (Environment.isClient())
{
client = new ClientConfig();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ public class ModDamageTypes
{
protected static void bootstrap(BootstapContext<DamageType> context)
{
context.register(TANDamageTypes.HYPERTHERMIA, new DamageType("hyperthermia", 0.1F));
context.register(TANDamageTypes.HYPERTHERMIA, new DamageType("toughasnails.hyperthermia", 0.1F));
}
}
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -40,5 +40,5 @@ org.gradle.daemon=false

# Dependencies
nightconfig_version=3.6.7
glitchcore_version=1.0.0.21
glitchcore_version=1.0.0.23
serene_seasons_version=9.3.0.0

0 comments on commit 00b277f

Please sign in to comment.