Reclassified vanilla Swamp as a neutral temperature biome

Glitchfiend · Jan 1, 2024 · b729ac7 · b729ac7
1 parent f19d272
commit b729ac7
Show file tree

Hide file tree

Showing 12 changed files with 18 additions and 16 deletions.
diff --git a/common/src/generated/resources/.cache/20dae170dba4c8eb919766d5be31700d182da0d9 b/common/src/generated/resources/.cache/20dae170dba4c8eb919766d5be31700d182da0d9
@@ -1,8 +1,8 @@
-// 1.20.4	2023-12-30T10:10:46.3659207	Tags for minecraft:worldgen/biome mod id toughasnails
+// 1.20.4	2024-01-01T12:37:49.2281638	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
-83dc2f96a764a157bdb7f23ea0f3a4d92a761358 data/toughasnails/tags/worldgen/biome/neutral_biomes.json
+9128966f06f646c3a8f85e09692e7ce97009d009 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
+92b547e23992c4f327b30052a1b36aab5b36d767 data/toughasnails/tags/worldgen/biome/warm_biomes.json
diff --git a/common/src/generated/resources/.cache/9dc2e1bbb6dbc88d629e62ed955e4c156b6652a3 b/common/src/generated/resources/.cache/9dc2e1bbb6dbc88d629e62ed955e4c156b6652a3
@@ -1,8 +1,10 @@
-// 1.20.4	2023-12-31T06:07:30.3349516	Tags for minecraft:item mod id toughasnails
+// 1.20.4	2024-01-01T12:51:21.0396063	Tags for minecraft:item mod id toughasnails
 f05342856fe99891fa5e94bbe8db82a4f75ac41e data/toughasnails/tags/items/cooling_armor.json
+35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data/toughasnails/tags/items/cooling_consumed_items.json
 7c304628a9c17ca3ba6cd13e199fcf73ad9c974f data/toughasnails/tags/items/cooling_held_items.json
 d7e37bc0c1468593bf2403c8bab7e97c17edde8e data/toughasnails/tags/items/drinks.json
 eb101cb126ebd917a2c240ff53e1e6e16ba3bf83 data/toughasnails/tags/items/heating_armor.json
+35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data/toughasnails/tags/items/heating_consumed_items.json
 efe9e0caf089100a228c46379f3aa70d7f602ddc data/toughasnails/tags/items/heating_held_items.json
 35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data/toughasnails/tags/items/hydration/100_hydration_drinks.json
 9c0dc65d9f036f654b10088e08368b1a58a41237 data/toughasnails/tags/items/hydration/10_hydration_drinks.json

diff --git a/common/src/generated/resources/data/toughasnails/tags/items/cooling_consumed_items.json b/common/src/generated/resources/data/toughasnails/tags/items/cooling_consumed_items.json
@@ -1,4 +1,3 @@
 {
-  "values": [
-  ]
+  "values": []
 }
diff --git a/common/src/generated/resources/data/toughasnails/tags/items/heating_consumed_items.json b/common/src/generated/resources/data/toughasnails/tags/items/heating_consumed_items.json
@@ -1,4 +1,3 @@
 {
-  "values": [
-  ]
+  "values": []
 }
diff --git a/common/src/generated/resources/data/toughasnails/tags/worldgen/biome/neutral_biomes.json b/common/src/generated/resources/data/toughasnails/tags/worldgen/biome/neutral_biomes.json
@@ -2,6 +2,7 @@
   "values": [
     "minecraft:the_void",
     "minecraft:dripstone_caves",
+    "minecraft:swamp",
     "minecraft:plains",
     "minecraft:sunflower_plains",
     "minecraft:dark_forest",

diff --git a/common/src/generated/resources/data/toughasnails/tags/worldgen/biome/warm_biomes.json b/common/src/generated/resources/data/toughasnails/tags/worldgen/biome/warm_biomes.json
@@ -2,7 +2,6 @@
   "values": [
     "minecraft:soul_sand_valley",
     "minecraft:lush_caves",
-    "minecraft:swamp",
     "minecraft:mangrove_swamp",
     "minecraft:jungle",
     "minecraft:sparse_jungle",

diff --git a/common/src/main/java/toughasnails/client/handler/TooltipHandler.java b/common/src/main/java/toughasnails/client/handler/TooltipHandler.java
@@ -85,7 +85,7 @@ public int getHeight()
         @Override
         public int getWidth(Font font)
         {
-            return (this.amount / 2) * 9;
+            return (this.amount / 2) * 8;
         }
 
         @Override
@@ -97,18 +97,18 @@ public void renderImage(Font font, int x, int y, GuiGraphics gui)
             {
                 int dropletHalf = i * 2 + 1;
 
-                int startX = x + i * 8 - 1;
+                int startX = x + i * 8;
                 int startY = y;
 
                 // Args: poseStack, x, y, u, v, width, height, texWidth, texHeight
                 // Draw a full droplet
                 if (this.amount > dropletHalf)
                 {
-                    gui.blit(ThirstOverlayRenderer.OVERLAY, startX, startY, 0, 32 + 9, 9, 9, 256, 256);
+                    gui.blit(ThirstOverlayRenderer.OVERLAY, startX, startY, 0, 41, 8, 8, 256, 256);
                 }
                 else if (this.amount == dropletHalf) // Draw a half droplet
                 {
-                    gui.blit(ThirstOverlayRenderer.OVERLAY, startX, startY, 9, 32 + 9, 9, 9, 256, 256);
+                    gui.blit(ThirstOverlayRenderer.OVERLAY, startX, startY, 8, 41, 8, 8, 256, 256);
                 }
             }
 

diff --git a/common/src/main/resources/assets/toughasnails/lang/en_us.json b/common/src/main/resources/assets/toughasnails/lang/en_us.json
@@ -37,7 +37,7 @@
   "item.toughasnails.dirty_water_canteen": "Dirty Water Canteen",
   "item.toughasnails.empty_canteen": "Empty Canteen",
   "item.toughasnails.glow_berry_juice": "Glow Berry Juice",
-  "item.toughasnails.leaf_boots": "Leaf Boots",
+  "item.toughasnails.leaf_boots": "Leaf Greaves",
   "item.toughasnails.leaf_chestplate": "Leaf Poncho",
   "item.toughasnails.leaf_helmet": "Leaf Veil",
   "item.toughasnails.leaf_leggings": "Leaf Pants",

diff --git a/...on/src/main/resources/assets/toughasnails/textures/block/rain_collector_top.png b/...on/src/main/resources/assets/toughasnails/textures/block/rain_collector_top.png
diff --git a/common/src/main/resources/assets/toughasnails/textures/gui/icons.png b/common/src/main/resources/assets/toughasnails/textures/gui/icons.png
diff --git a/forge/src/main/java/toughasnails/datagen/provider/TANBiomeTagsProvider.java b/forge/src/main/java/toughasnails/datagen/provider/TANBiomeTagsProvider.java
@@ -29,8 +29,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.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.NEUTRAL_BIOMES).add(Biomes.THE_VOID, Biomes.DRIPSTONE_CAVES, Biomes.SWAMP, 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.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);
 
         // Water purity tags

diff --git a/forge/src/main/java/toughasnails/datagen/provider/TANItemTagsProvider.java b/forge/src/main/java/toughasnails/datagen/provider/TANItemTagsProvider.java
@@ -36,6 +36,8 @@ protected void addTags(HolderLookup.Provider provider)
         // Temperature items
         this.tag(ModTags.Items.COOLING_HELD_ITEMS).add(Items.POWDER_SNOW_BUCKET);
         this.tag(ModTags.Items.HEATING_HELD_ITEMS).add(Items.LAVA_BUCKET);
+        this.tag(ModTags.Items.COOLING_CONSUMED_ITEMS);
+        this.tag(ModTags.Items.HEATING_CONSUMED_ITEMS);
 
         // Drinks
         this.tag(ModTags.Items.DRINKS).addTags(