From 85ee8dd5d0ff1b993edcc23ea041a6989f049e42 Mon Sep 17 00:00:00 2001
From: wsor <24964441+wsor4035@users.noreply.github.com>
Date: Wed, 24 Mar 2021 11:17:18 -0400
Subject: [PATCH] add in basics of glass mod

---
 mods/fl_glass/README                          |   3 +++
 mods/fl_glass/init.lua                        |  21 ++++++++++++++++++
 mods/fl_glass/textures/farlands_glass.png     | Bin 0 -> 292 bytes
 .../textures/farlands_glass_detail.png        | Bin 0 -> 316 bytes
 mods/fl_wildlife/fl_mobs/riverfish.lua        |  10 ++++++---
 5 files changed, 31 insertions(+), 3 deletions(-)
 create mode 100644 mods/fl_glass/README
 create mode 100644 mods/fl_glass/init.lua
 create mode 100644 mods/fl_glass/textures/farlands_glass.png
 create mode 100644 mods/fl_glass/textures/farlands_glass_detail.png

diff --git a/mods/fl_glass/README b/mods/fl_glass/README
new file mode 100644
index 0000000..900e196
--- /dev/null
+++ b/mods/fl_glass/README
@@ -0,0 +1,3 @@
+toby109tt(aka tobyplowy)(CC BY-SA 3.0):
+farlands_glass_detail.png
+farlands_glass.png
\ No newline at end of file
diff --git a/mods/fl_glass/init.lua b/mods/fl_glass/init.lua
new file mode 100644
index 0000000..74e9ab8
--- /dev/null
+++ b/mods/fl_glass/init.lua
@@ -0,0 +1,21 @@
+minetest.register_node("fl_glass:glass_connected", {
+    description = "connected glass",
+    drawtype = "glasslike_framed",
+    tiles = {"farlands_glass.png", "farlands_glass_detail.png"},
+    paramtype = "light",
+    paramtype2 = "glasslikeliquidlevel",
+    sunlight_propagates = true,
+    groups = {oddly_breakable_by_hand = 3},
+})
+
+minetest.register_node("fl_glass:glass_framed", {
+    description = "framed glass",
+    drawtype = "glasslike",
+    tiles = {"farlands_glass.png", "farlands_glass_detail.png"},
+    paramtype = "light",
+    paramtype2 = "glasslikeliquidlevel",
+    sunlight_propagates = true,
+    groups = {oddly_breakable_by_hand = 3},
+})
+
+--make colored glass, probably need to make dyes mod
\ No newline at end of file
diff --git a/mods/fl_glass/textures/farlands_glass.png b/mods/fl_glass/textures/farlands_glass.png
new file mode 100644
index 0000000000000000000000000000000000000000..db910c89490d0a71792f173283d932a13a771b23
GIT binary patch
literal 292
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b
z3=G`DAk4@xYmNj^kiEpy*OmPty9BqkN$v&pTR@?Wo-U3d7N_S18FC#q;F;pXp3iu`
zF|XF)|9>|70~ZdedOI1;aJaC{&&*TmblFzU`*Z!R5>=8`Tv=c$RygT^NRx(L>w#4&
zDRZA+lvuN~+2e?Aat9yV+Q456zHF-r3otF8WWms&#kl6PlBNER)PKfm6W4xT6Lq3m
z-TtM@*VSjT%O}Xjq~0rKx4k+4<Mz0sTka~4u2-{N^}2Vws^iCfV?QT}&WgKc61|SE
iYs9MU-nH)wiRZSMI$Js6+&!S<89ZJ6T-G@yGywqL`)%?7

literal 0
HcmV?d00001

diff --git a/mods/fl_glass/textures/farlands_glass_detail.png b/mods/fl_glass/textures/farlands_glass_detail.png
new file mode 100644
index 0000000000000000000000000000000000000000..962aa22471a11d3c3b1c35449dbb0e92d1a8e9e9
GIT binary patch
literal 316
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b
z3=G`DAk4@xYmNj^kiEpy*OmPty9Bqkq3o{9p+KRNo-U3d7N@5M?dChIz+*D^hLWNC
zt84r({?{`Lb8+RevE-UBSrK%^ZTh5ViO#P$Ie*vevo<@%u{FzrebaiD2hJX<3Gz&H
z#2i+qW#(kHCWKZc_k7+^%wILTei2WZy2r|G+(KW~dyksF*kxTM#?Wx>uvCLqW{&Rx
z7bAxfuNl^tZp`Oi`mn9oZP#SUgn8GC42(~#@Ls)b_MB>2??vC|-B~f^rgd}Yjql7W
z+plf^S$m^(?b@Gz#TitUq?22|n>cD8(Tco&dgq)i`Lzr(!P_ze9!_QldWyl*)z4*}
HQ$iB}P33oY

literal 0
HcmV?d00001

diff --git a/mods/fl_wildlife/fl_mobs/riverfish.lua b/mods/fl_wildlife/fl_mobs/riverfish.lua
index fb4fa00..e3adfb7 100644
--- a/mods/fl_wildlife/fl_mobs/riverfish.lua
+++ b/mods/fl_wildlife/fl_mobs/riverfish.lua
@@ -3,7 +3,7 @@ minetest.register_entity("fl_wildlife:riverfish", {
     --mte object properties
     physical = true,
     stepheight = 1.1,
-    collide_with_objects = true,
+    collide_with_objects = false,
     collisionbox = {-0.2, -0.2, -0.2, 0.2, 0.2, 0.2}, --fix this
     visual = "mesh",
     mesh = "farlands_mob_fish.b3d",
@@ -21,7 +21,7 @@ minetest.register_entity("fl_wildlife:riverfish", {
     --mobkit properties
     buoyancy = 0.99, --how it works in water
     max_speed = 2, --how fast it can go
-    jump_height = 1.1, --jumping height? not sure how this is different from mte stepheight
+    jump_height = 0, --jumping height? not sure how this is different from mte stepheight
     view_range = 24, --how far it can see
     lung_capacity = 10, --seconds till drowning
     max_hp = 5, --health, not sure how this measured? like player where 2hp = 1 heart?
@@ -60,4 +60,8 @@ minetest.register_entity("fl_wildlife:riverfish", {
 })
 
 --register eggs
-fl_wildlife.egg_it("fl_wildlife:riverfish", "riverfish", "#978166")
\ No newline at end of file
+fl_wildlife.egg_it("fl_wildlife:riverfish", "riverfish", "#978166")
+
+--fish still jump out,
+--fish die in pen on in water on base?
+--this ^ is due to water_flowing
\ No newline at end of file