Merge branch 'release/2.0'

CHANGELOG.md

@@ -1,5 +1,19 @@
 # Changelog
 
+## [Unreleased]
+
+## [2.0] - 2024-02-16
+
+## Added
+
++ Add the new Thermostat block, fully oxidiziable and waxable.
+
+### Chenged
+
++ Drop mod's patch version because unnecessary.
+
++ Update target Minecraft version to 1.20.2 and remap mod.
+
 ## [1.2.0] - 2024-02-16
 
 ### Added
@@ -30,6 +44,7 @@
 
 Initial release.
 
+[2.0]: https://github.com/NivOridocs/heater/releases/tag/2.0
 [1.2.0]: https://github.com/NivOridocs/heater/releases/tag/1.2.0
 [1.1.1]: https://github.com/NivOridocs/heater/releases/tag/1.1.1
 [1.1.0]: https://github.com/NivOridocs/heater/releases/tag/1.1.0

README.md

@@ -1,17 +1,65 @@
 # Heater
 
-**Heater** is a tech mod which adds precisely two blocks, the **Heater** and the **Heat Pipe**.
+**Heater** is a straightforward tech mod about centralizing fuel consumption and how to propagate the produced heat to nearby furnaces and furnaces-adjacent blocks.
 
-The **Heater** block is a furnace-like block but without any processing slot. Instead, whenever it burns something, it propagates the produced heat to every connected actual furnace, like Furnaces, Blast Furnaces, and Smokers for vanilla Minecraft, but also [Haunt Furnaces](https://modrinth.com/mod/haunt-furnace) and [Kilns](https://modrinth.com/mod/embers-kiln).
+![Heater Showcase](img/Heater_Showcase_1.png)
 
-In other words, the **Heater** allows you to centralise the burning process and avoid building complex fuel lines.
+(Credits to [StarOcean](https://github.com/0Starocean0) for the fantastic textures they created!)
 
-On the other hand, the **Heat Pipe** is a pipe-like block that just extends the reach of a **Heater** up to 64 blocks.
+It only adds three blocks: the namesake **Heater**, the **Heat Pipe**, and the new and shiny **Thermostat**.
 
-![Heater Showcase](img/Heater_Showcase_1.png)
+Here's what they do.
+
+### Heater
+
+As its namesake block, the **Heater** is this mod's core. Its role is to burn fuel and propagate the generated heat to nearby compatible blocks, such as Furnaces, Blast Furnaces, and Smokers for vanilla Minecraft, but also [Haunt Furnaces](https://modrinth.com/mod/haunt-furnace), [Kilns](https://modrinth.com/mod/embers-kiln), and probably others.
+
+<details>
+<summary>Heater Interface</summary>
+
+![Heater Interface](img/Heater_Screen.png)
+
+</details>
+
+<details>
+<summary>Heater Recipe</summary>
+
+![Heater Recipe](img/Heater_Recipe.png)
+
+</details>
+
+### Heat Pipe
+
+The **Heat Pipe** is a pipe-like block which works as you may imagine. Heat produced by a Heater can travel through it, basically extending the Heater's reach. But be aware that heat can only propagate a certain distance before dissipating, and the oxidization state of the Heat Pipe can only reduce said distance.
 
-Credits to [StarOcean](https://github.com/0Starocean0) for the fantastic textures they created!
+<details>
+<summary>Heat Pipe Recipe</summary>
+
+![Heat Pipe Recipe](img/Heat_Pipe_Recipe.png)
+
+</details>
+
+The Heat Pipe is entity-free, so you can fully fulfil your pipe dreams without concerns about dropping performances.
+
+### Thermostate
+
+Only from version 2.0 forward.
+
+The **Thermostat** allows heat to propagate only in the direction it is facing and only if powered. When unpowered, it acts like any other heat-inert block.
+
+The Thermostat is also the only block that can "push" heat into a Heater, doubling as a heat repeater of sorts.
+
+<details>
+<summary>Thermostat Recipe</summary>
+
+![Thermostat Recipe](img/Thermostat_Recipe.png)
+
+</details>
+
+The Thermostat is entity-free, too.
 
 ## Planned Features
 
-There are no planned features!
+In the next major version (i.e. 3.x), other than upgrading the target Minecraft version to 1.20.3+, I will try to implement a configuration file to customize some numbers that I thus far arbitrarily set and to extend the compatibility options with other mods.
+
+I plan to add dyeable Heat Pipes (and maybe Thermostats, too) with some color-matching-heat-propagation logic. However, considering that each new block has four oxidization stages and as many waxed variants, I am not so thrilled to implement SIXTEEN new blocks with all their SIXTY-FOUR variants. Double that if I decide to dye the Thermostat, too. So, I don't promise anything.

build.gradle

@@ -115,7 +115,7 @@ publishing {
 modrinth {
     token = System.getenv("MODRINTH_TOKEN")
     projectId = "${project.project_id}"
-    gameVersions = ["1.20.1"]
+    gameVersions = ["1.20.2"]
     uploadFile = remapJar
     syncBodyFrom = rootProject.file("README.md").text
 }

gradle.properties

@@ -4,15 +4,15 @@ org.gradle.parallel=true
 
 # Fabric Properties
 # check these on https://fabricmc.net/develop
-minecraft_version=1.20.1
-yarn_mappings=1.20.1+build.10
-loader_version=0.14.22
+minecraft_version=1.20.2
+yarn_mappings=1.20.2+build.4
+loader_version=0.15.7
 
 # Mod Properties
-mod_version=1.2.0+1.20.1
+mod_version=2.0+1.20.2
 maven_group=niv.heater
 archives_base_name=heater
 project_id=g3jBz897
 
 # Dependencies
-fabric_version=0.90.0+1.20.1
+fabric_version=0.91.6+1.20.2

src/client/java/niv/heater/HeaterScreen.java

@@ -7,6 +7,7 @@
 import net.minecraft.entity.player.PlayerInventory;
 import net.minecraft.text.Text;
 import net.minecraft.util.Identifier;
+import niv.heater.screen.HeaterScreenHandler;
 
 import static niv.heater.Heater.MOD_ID;
 
@@ -26,7 +27,6 @@ public void init() {
 
     @Override
     public void render(DrawContext context, int mouseX, int mouseY, float delta) {
-        renderBackground(context);
         super.render(context, mouseX, mouseY, delta);
         drawMouseoverTooltip(context, mouseX, mouseY);
     }

src/main/generated/assets/heater/blockstates/exposed_thermostat.json

@@ -0,0 +1,27 @@
+{
+  "variants": {
+    "facing=down": {
+      "model": "heater:block/exposed_thermostat",
+      "x": 90
+    },
+    "facing=east": {
+      "model": "heater:block/exposed_thermostat",
+      "y": 90
+    },
+    "facing=north": {
+      "model": "heater:block/exposed_thermostat"
+    },
+    "facing=south": {
+      "model": "heater:block/exposed_thermostat",
+      "y": 180
+    },
+    "facing=up": {
+      "model": "heater:block/exposed_thermostat",
+      "x": 270
+    },
+    "facing=west": {
+      "model": "heater:block/exposed_thermostat",
+      "y": 270
+    }
+  }
+}

src/main/generated/assets/heater/blockstates/oxidized_thermostat.json

@@ -0,0 +1,27 @@
+{
+  "variants": {
+    "facing=down": {
+      "model": "heater:block/oxidized_thermostat",
+      "x": 90
+    },
+    "facing=east": {
+      "model": "heater:block/oxidized_thermostat",
+      "y": 90
+    },
+    "facing=north": {
+      "model": "heater:block/oxidized_thermostat"
+    },
+    "facing=south": {
+      "model": "heater:block/oxidized_thermostat",
+      "y": 180
+    },
+    "facing=up": {
+      "model": "heater:block/oxidized_thermostat",
+      "x": 270
+    },
+    "facing=west": {
+      "model": "heater:block/oxidized_thermostat",
+      "y": 270
+    }
+  }
+}

src/main/generated/assets/heater/blockstates/thermostat.json

@@ -0,0 +1,27 @@
+{
+  "variants": {
+    "facing=down": {
+      "model": "heater:block/thermostat",
+      "x": 90
+    },
+    "facing=east": {
+      "model": "heater:block/thermostat",
+      "y": 90
+    },
+    "facing=north": {
+      "model": "heater:block/thermostat"
+    },
+    "facing=south": {
+      "model": "heater:block/thermostat",
+      "y": 180
+    },
+    "facing=up": {
+      "model": "heater:block/thermostat",
+      "x": 270
+    },
+    "facing=west": {
+      "model": "heater:block/thermostat",
+      "y": 270
+    }
+  }
+}

src/main/generated/assets/heater/blockstates/waxed_exposed_thermostat.json

@@ -0,0 +1,27 @@
+{
+  "variants": {
+    "facing=down": {
+      "model": "heater:block/exposed_thermostat",
+      "x": 90
+    },
+    "facing=east": {
+      "model": "heater:block/exposed_thermostat",
+      "y": 90
+    },
+    "facing=north": {
+      "model": "heater:block/exposed_thermostat"
+    },
+    "facing=south": {
+      "model": "heater:block/exposed_thermostat",
+      "y": 180
+    },
+    "facing=up": {
+      "model": "heater:block/exposed_thermostat",
+      "x": 270
+    },
+    "facing=west": {
+      "model": "heater:block/exposed_thermostat",
+      "y": 270
+    }
+  }
+}

src/main/generated/assets/heater/blockstates/waxed_oxidized_thermostat.json

@@ -0,0 +1,27 @@
+{
+  "variants": {
+    "facing=down": {
+      "model": "heater:block/oxidized_thermostat",
+      "x": 90
+    },
+    "facing=east": {
+      "model": "heater:block/oxidized_thermostat",
+      "y": 90
+    },
+    "facing=north": {
+      "model": "heater:block/oxidized_thermostat"
+    },
+    "facing=south": {
+      "model": "heater:block/oxidized_thermostat",
+      "y": 180
+    },
+    "facing=up": {
+      "model": "heater:block/oxidized_thermostat",
+      "x": 270
+    },
+    "facing=west": {
+      "model": "heater:block/oxidized_thermostat",
+      "y": 270
+    }
+  }
+}

src/main/generated/assets/heater/blockstates/waxed_thermostat.json

@@ -0,0 +1,27 @@
+{
+  "variants": {
+    "facing=down": {
+      "model": "heater:block/thermostat",
+      "x": 90
+    },
+    "facing=east": {
+      "model": "heater:block/thermostat",
+      "y": 90
+    },
+    "facing=north": {
+      "model": "heater:block/thermostat"
+    },
+    "facing=south": {
+      "model": "heater:block/thermostat",
+      "y": 180
+    },
+    "facing=up": {
+      "model": "heater:block/thermostat",
+      "x": 270
+    },
+    "facing=west": {
+      "model": "heater:block/thermostat",
+      "y": 270
+    }
+  }
+}

src/main/generated/assets/heater/blockstates/waxed_weathered_thermostat.json

@@ -0,0 +1,27 @@
+{
+  "variants": {
+    "facing=down": {
+      "model": "heater:block/weathered_thermostat",
+      "x": 90
+    },
+    "facing=east": {
+      "model": "heater:block/weathered_thermostat",
+      "y": 90
+    },
+    "facing=north": {
+      "model": "heater:block/weathered_thermostat"
+    },
+    "facing=south": {
+      "model": "heater:block/weathered_thermostat",
+      "y": 180
+    },
+    "facing=up": {
+      "model": "heater:block/weathered_thermostat",
+      "x": 270
+    },
+    "facing=west": {
+      "model": "heater:block/weathered_thermostat",
+      "y": 270
+    }
+  }
+}

src/main/generated/assets/heater/blockstates/weathered_thermostat.json

@@ -0,0 +1,27 @@
+{
+  "variants": {
+    "facing=down": {
+      "model": "heater:block/weathered_thermostat",
+      "x": 90
+    },
+    "facing=east": {
+      "model": "heater:block/weathered_thermostat",
+      "y": 90
+    },
+    "facing=north": {
+      "model": "heater:block/weathered_thermostat"
+    },
+    "facing=south": {
+      "model": "heater:block/weathered_thermostat",
+      "y": 180
+    },
+    "facing=up": {
+      "model": "heater:block/weathered_thermostat",
+      "x": 270
+    },
+    "facing=west": {
+      "model": "heater:block/weathered_thermostat",
+      "y": 270
+    }
+  }
+}