From 27b3833f05857c483752f4ef2db6f9b51e02c617 Mon Sep 17 00:00:00 2001
From: IamPyu <pyucreates@tutamail.com>
Date: Wed, 27 Nov 2024 16:06:53 -0600
Subject: [PATCH] Add Cobblestone

---
 CHANGELOG.md                          |   1 +
 mods/ITEMS/pyutest_blocks/basic.lua   |  10 ++++++++++
 mods/ITEMS/pyutest_blocks/fire.lua    |  11 +++++++++++
 mods/ITEMS/pyutest_blocks/liquid.lua  |   3 ++-
 mods/ITEMS/pyutest_crafts/init.lua    |  22 ++++++++++++++--------
 mods/ITEMS/pyutest_overrides/init.lua |   4 ++++
 textures/pyutest-cobblestone.png      | Bin 0 -> 280 bytes
 7 files changed, 42 insertions(+), 9 deletions(-)
 create mode 100644 textures/pyutest-cobblestone.png

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9d0f5a8..11d98f7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -35,6 +35,7 @@ I should just start giving updates a version number to avoid naming updates.
 - Make Apple texture look more like other food textures
 - Add a light fog to snowy biomes
 - Make Taigas more dense
+- Added Cobblestone
 
 ## [Oct 20th - Nov 2nd] Update: The Something Update
 
diff --git a/mods/ITEMS/pyutest_blocks/basic.lua b/mods/ITEMS/pyutest_blocks/basic.lua
index 068cbef..1726d44 100644
--- a/mods/ITEMS/pyutest_blocks/basic.lua
+++ b/mods/ITEMS/pyutest_blocks/basic.lua
@@ -52,6 +52,16 @@ PyuTest.make_building_blocks("pyutest_blocks:gravel", "Gravel", { "pyutest-grave
 
 -- Cracky
 PyuTest.make_building_blocks("pyutest_blocks:stone", "Stone", { "pyutest-stone.png" }, nil, {
+  ground = 1,
+  stone = 1,
+  cobble = 1,
+  cracky = PyuTest.BLOCK_NORMAL,
+}, {
+    is_ground_content = true,
+    _pyutest_blast_resistance = 3
+})
+
+PyuTest.make_building_blocks("pyutest_blocks:cobblestone", "Cobblestone", { "pyutest-cobblestone.png" }, nil, {
   ground = 1,
   stone = 1,
   cracky = PyuTest.BLOCK_NORMAL,
diff --git a/mods/ITEMS/pyutest_blocks/fire.lua b/mods/ITEMS/pyutest_blocks/fire.lua
index 2d7ad46..4e44a86 100644
--- a/mods/ITEMS/pyutest_blocks/fire.lua
+++ b/mods/ITEMS/pyutest_blocks/fire.lua
@@ -57,3 +57,14 @@ core.register_abm({
     core.remove_node(pos)
   end
 })
+
+core.register_abm({
+    label = "Fire Extinguish",
+    nodenames = {"pyutest_blocks:fire"},
+    neighbors = {"group:destroys_fire"},
+    interval = 1,
+    chance = 1,
+    action = function (pos)
+      core.remove_node(pos)
+    end
+})
diff --git a/mods/ITEMS/pyutest_blocks/liquid.lua b/mods/ITEMS/pyutest_blocks/liquid.lua
index e4d3749..f2f9086 100644
--- a/mods/ITEMS/pyutest_blocks/liquid.lua
+++ b/mods/ITEMS/pyutest_blocks/liquid.lua
@@ -1,7 +1,8 @@
 PyuTest.make_liquid("pyutest_blocks:water", "Water", {
   water = 1,
   freezable = 1,
-  heatable = 1
+  heatable = 1,
+  destroys_fire = 1
 }, "pyutest-water.png", 1, {
   post_effect_color = { a = 60, r = 24.7, g = 46.3, b = 89.4 },
   paramtype2 = "color",
diff --git a/mods/ITEMS/pyutest_crafts/init.lua b/mods/ITEMS/pyutest_crafts/init.lua
index f547fbc..c9448af 100644
--- a/mods/ITEMS/pyutest_crafts/init.lua
+++ b/mods/ITEMS/pyutest_crafts/init.lua
@@ -28,7 +28,7 @@ core.register_craft({
 core.register_craft({
     output = "pyutest_tools:stone_pickaxe",
     recipe = {
-      { "group:stone", "group:stone",         "group:stone" },
+      { "group:cobble", "group:cobble",         "group:cobble" },
       { "",            "pyutest_tools:stick", "" },
       { "",            "pyutest_tools:stick", "" }
     }
@@ -37,8 +37,8 @@ core.register_craft({
 core.register_craft({
     output = "pyutest_tools:stone_axe",
     recipe = {
-      { "group:stone", "group:stone",         "" },
-      { "group:stone", "pyutest_tools:stick", "" },
+      { "group:cobble", "group:cobble",         "" },
+      { "group:cobble", "pyutest_tools:stick", "" },
       { "",            "pyutest_tools:stick", "" }
     }
 })
@@ -46,8 +46,8 @@ core.register_craft({
 core.register_craft({
     output = "pyutest_tools:stone_sword",
     recipe = {
-      { "", "group:stone",         "" },
-      { "", "group:stone",         "" },
+      { "", "group:cobble",         "" },
+      { "", "group:cobble",         "" },
       { "", "pyutest_tools:stick", "" }
     }
 })
@@ -153,9 +153,9 @@ core.register_craft({
 core.register_craft({
     output = "pyutest_furnace:furnace",
     recipe = {
-      { "group:stone", "group:stone", "group:stone" },
-      { "group:stone", "",            "group:stone" },
-      { "group:stone", "group:stone", "group:stone" }
+      { "group:cobble", "group:cobble", "group:cobble" },
+      { "group:cobble", "",            "group:cobble" },
+      { "group:cobble", "group:cobble", "group:cobble" }
     }
 })
 
@@ -341,3 +341,9 @@ core.register_craft({
     output = "pyutest_blocks:brick",
     recipe = "pyutest_tools:clay",
 })
+
+core.register_craft({
+    type = "cooking",
+    output = "pyutest_blocks:stone_block",
+    recipe = "pyutest_tools:cobblestone_block",
+})
diff --git a/mods/ITEMS/pyutest_overrides/init.lua b/mods/ITEMS/pyutest_overrides/init.lua
index 3b631c5..427f628 100644
--- a/mods/ITEMS/pyutest_overrides/init.lua
+++ b/mods/ITEMS/pyutest_overrides/init.lua
@@ -2,6 +2,10 @@ core.override_item("pyutest_blocks:clay_block", {
   drop = "pyutest_tools:clay 3"
 })
 
+core.override_item("pyutest_blocks:stone_block", {
+  drop = "pyutest_blocks:cobblestone_block"
+})
+
 core.override_item("pyutest_blocks:bone_block", {
   paramtype2 = "facedir",
   on_place = core.rotate_node
diff --git a/textures/pyutest-cobblestone.png b/textures/pyutest-cobblestone.png
new file mode 100644
index 0000000000000000000000000000000000000000..599c08d0dc622d670b59bf260eaeda71b4747e1f
GIT binary patch
literal 280
zcmV+z0q6dSP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0002rNkl<ZIE{@{
zF$%*l3{*=N<H2YRAusJv`qU7z3J=C(JD5`x#i6;;KAm(r^!U7AUvd!1#GL%I{t=P>
zKf5eL><L@(!4g7Dw5<z`(@aD}+q#@YLQGW4F8=hz%#Bb>Rv~m{Zk!O)Q9vYXXFGZ=
zZDjif5w#$)ce;ZRn;=97jBJ;52jC6<!;fo4?Vi+v7Z|6RYRO8r@WlrKbb=i$&`))W
z5exANc)zwYVid`3iFkl#*yzF9VouG1B_n4<`!Au(TiDh`yIG6g<|zfh-UBSzrCwg6
eO#?-}qXK?t`KfeF^V=Z+0000<MNUMnLSTZnA$A4;

literal 0
HcmV?d00001