Skip to content

Commit

Permalink
Tweaked thirst tooltip icons
Browse files Browse the repository at this point in the history
  • Loading branch information
@Forstride
Forstride committed Dec 30, 2023
1 parent ed0f31a commit 3de6803
Show file tree
Hide file tree
Showing 7 changed files with 10 additions and 13 deletions.
6 changes: 3 additions & 3 deletions common/src/generated/resources/.cache/20dae170dba4c8eb919766d5be31700d182da0d9
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
// 1.20.4 2023-12-30T07:08:56.2381487 Tags for minecraft:worldgen/biome mod id toughasnails
790a8cd60e3a3d959b0ac6ff486bf3fb96e94af7 data/toughasnails/tags/worldgen/biome/cold_biomes.json
// 1.20.4 2023-12-30T10:10:46.3659207 Tags for minecraft:worldgen/biome mod id toughasnails
2b52a1f084a28479a2e448b5ca6be229c52b6aa9 data/toughasnails/tags/worldgen/biome/cold_biomes.json
92158999e9537d3b7c9cd1a65cc1aa65bf673c2d data/toughasnails/tags/worldgen/biome/dirty_water_biomes.json
8548cd9e18e161a303323283cb2c7ab2f2ff2cb0 data/toughasnails/tags/worldgen/biome/hot_biomes.json
775e0f72e6757e7740bc9110927f01e0fc675071 data/toughasnails/tags/worldgen/biome/icy_biomes.json
9216882fcbcd4b24331fff1c4e917184c55c23a5 data/toughasnails/tags/worldgen/biome/neutral_biomes.json
83dc2f96a764a157bdb7f23ea0f3a4d92a761358 data/toughasnails/tags/worldgen/biome/neutral_biomes.json
35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data/toughasnails/tags/worldgen/biome/purified_water_biomes.json
c852764e89c93c82574fb9dbc68fdde3b9e030a2 data/toughasnails/tags/worldgen/biome/warm_biomes.json
1 change: 0 additions & 1 deletion common/src/generated/resources/data/toughasnails/tags/worldgen/biome/cold_biomes.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
"minecraft:taiga",
"minecraft:old_growth_spruce_taiga",
"minecraft:old_growth_pine_taiga",
"minecraft:meadow",
"minecraft:windswept_hills",
"minecraft:windswept_forest",
"minecraft:windswept_gravelly_hills",
Expand Down
1 change: 1 addition & 0 deletions common/src/generated/resources/data/toughasnails/tags/worldgen/biome/neutral_biomes.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
"minecraft:old_growth_birch_forest",
"minecraft:forest",
"minecraft:flower_forest",
"minecraft:meadow",
"minecraft:cherry_grove",
"minecraft:stony_peaks",
"minecraft:stony_shore",
Expand Down
6 changes: 3 additions & 3 deletions common/src/main/java/toughasnails/temperature/TemperatureHelperImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -127,9 +127,9 @@ private static TemperatureLevel getBiomeTemperatureLevel(Level level, BlockPos p
else if (biome.is(ModTags.Biomes.HOT_BIOMES)) return TemperatureLevel.HOT;
else if (biomeTemperature < 0.15F) return TemperatureLevel.ICY;
else if (biomeTemperature >= 0.15F && biomeTemperature < 0.45F) return TemperatureLevel.COLD;
else if (biomeTemperature >= 0.45F && biomeTemperature < 0.75F) return TemperatureLevel.NEUTRAL;
else if (biomeTemperature >= 0.75F && biomeTemperature < 0.9F) return TemperatureLevel.WARM;
else if (biomeTemperature >= 0.9F) return TemperatureLevel.HOT;
else if (biomeTemperature >= 0.45F && biomeTemperature < 0.85F) return TemperatureLevel.NEUTRAL;
else if (biomeTemperature >= 0.85F && biomeTemperature < 1.0F) return TemperatureLevel.WARM;
else if (biomeTemperature >= 1.0F) return TemperatureLevel.HOT;
}

return TemperatureLevel.NEUTRAL;
Expand Down
Binary file modified common/src/main/resources/assets/toughasnails/textures/gui/icons.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 1 addition & 4 deletions forge/src/main/java/toughasnails/client/handler/TooltipHandler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,14 +114,11 @@ public void renderImage(Font font, int x, int y, GuiGraphics gui)
int startX = x + i * 8 - 1;
int startY = y;

// Draw the background of each thirst droplet
// Args: poseStack, x, y, u, v, width, height, texWidth, texHeight
gui.blit(ThirstOverlayRenderer.OVERLAY, startX, startY, 9, 32, 9, 9, 256, 256);

// Draw a full droplet
if (this.amount > dropletHalf)
{
gui.blit(ThirstOverlayRenderer.OVERLAY, startX, startY, 4 * 9, 32, 9, 9, 256, 256);
gui.blit(ThirstOverlayRenderer.OVERLAY, startX, startY, 0, 32 + 9, 9, 9, 256, 256);
}
else if (this.amount == dropletHalf) // Draw a half droplet
{
Expand Down
4 changes: 2 additions & 2 deletions forge/src/main/java/toughasnails/datagen/provider/TANBiomeTagsProvider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ protected void addTags(HolderLookup.Provider provider)
{
// Temperature tags
this.tag(ModTags.Biomes.ICY_BIOMES).add(Biomes.ICE_SPIKES, Biomes.SNOWY_TAIGA, Biomes.SNOWY_PLAINS, Biomes.SNOWY_SLOPES, Biomes.GROVE, Biomes.JAGGED_PEAKS, Biomes.FROZEN_PEAKS, Biomes.SNOWY_BEACH, Biomes.FROZEN_RIVER, Biomes.FROZEN_OCEAN, Biomes.DEEP_FROZEN_OCEAN);
this.tag(ModTags.Biomes.COLD_BIOMES).add(Biomes.THE_END, Biomes.SMALL_END_ISLANDS, Biomes.END_MIDLANDS, Biomes.END_HIGHLANDS, Biomes.END_BARRENS, Biomes.DEEP_DARK, Biomes.TAIGA, Biomes.OLD_GROWTH_SPRUCE_TAIGA, Biomes.OLD_GROWTH_PINE_TAIGA, Biomes.MEADOW, Biomes.WINDSWEPT_HILLS, Biomes.WINDSWEPT_FOREST, Biomes.WINDSWEPT_GRAVELLY_HILLS, Biomes.COLD_OCEAN, Biomes.DEEP_COLD_OCEAN);
this.tag(ModTags.Biomes.NEUTRAL_BIOMES).add(Biomes.THE_VOID, Biomes.DRIPSTONE_CAVES, Biomes.PLAINS, Biomes.SUNFLOWER_PLAINS, Biomes.DARK_FOREST, Biomes.BIRCH_FOREST, Biomes.OLD_GROWTH_BIRCH_FOREST, Biomes.FOREST, Biomes.FLOWER_FOREST, Biomes.CHERRY_GROVE, Biomes.STONY_PEAKS, Biomes.STONY_SHORE, Biomes.BEACH, Biomes.RIVER, Biomes.OCEAN, Biomes.DEEP_OCEAN, Biomes.LUKEWARM_OCEAN, Biomes.DEEP_LUKEWARM_OCEAN);
this.tag(ModTags.Biomes.COLD_BIOMES).add(Biomes.THE_END, Biomes.SMALL_END_ISLANDS, Biomes.END_MIDLANDS, Biomes.END_HIGHLANDS, Biomes.END_BARRENS, Biomes.DEEP_DARK, Biomes.TAIGA, Biomes.OLD_GROWTH_SPRUCE_TAIGA, Biomes.OLD_GROWTH_PINE_TAIGA, Biomes.WINDSWEPT_HILLS, Biomes.WINDSWEPT_FOREST, Biomes.WINDSWEPT_GRAVELLY_HILLS, Biomes.COLD_OCEAN, Biomes.DEEP_COLD_OCEAN);
this.tag(ModTags.Biomes.NEUTRAL_BIOMES).add(Biomes.THE_VOID, Biomes.DRIPSTONE_CAVES, Biomes.PLAINS, Biomes.SUNFLOWER_PLAINS, Biomes.DARK_FOREST, Biomes.BIRCH_FOREST, Biomes.OLD_GROWTH_BIRCH_FOREST, Biomes.FOREST, Biomes.FLOWER_FOREST, Biomes.MEADOW, Biomes.CHERRY_GROVE, Biomes.STONY_PEAKS, Biomes.STONY_SHORE, Biomes.BEACH, Biomes.RIVER, Biomes.OCEAN, Biomes.DEEP_OCEAN, Biomes.LUKEWARM_OCEAN, Biomes.DEEP_LUKEWARM_OCEAN);
this.tag(ModTags.Biomes.WARM_BIOMES).add(Biomes.SOUL_SAND_VALLEY, Biomes.LUSH_CAVES, Biomes.SWAMP, Biomes.MANGROVE_SWAMP, Biomes.JUNGLE, Biomes.SPARSE_JUNGLE, Biomes.BAMBOO_JUNGLE, Biomes.SAVANNA, Biomes.SAVANNA_PLATEAU, Biomes.WINDSWEPT_SAVANNA, Biomes.WARM_OCEAN, Biomes.MUSHROOM_FIELDS);
this.tag(ModTags.Biomes.HOT_BIOMES).add(Biomes.NETHER_WASTES, Biomes.CRIMSON_FOREST, Biomes.WARPED_FOREST, Biomes.BASALT_DELTAS, Biomes.DESERT, Biomes.BADLANDS, Biomes.WOODED_BADLANDS, Biomes.ERODED_BADLANDS);

Expand Down

0 comments on commit 3de6803

Please sign in to comment.