Mirrorlandia_minetest/MineClone2
1
0
Fork 0
mirror of https://git.minetest.land/MineClone2/MineClone2.git synced 2024-11-24 20:03:45 +01:00
Code Issues Packages Projects Releases Wiki Activity
10,311 Commits 108 Branches 83 Tags 166 MiB
f971283798
Commit Graph

4576 Commits

Author SHA1 Message Date
Michieal
04efa74115 Prevent growing "around" things in the way. 2023-01-11 02:19:19 -05:00
Michieal
2e8f56d098 Merge branch 'master' into mcl_bamboo_too 2023-01-10 22:29:28 -05:00
Michieal
ff7299a444 Fix beetroot seeds not dropping. 
Changed drop rate to 1-4.

Added in Fortune drops too. (Per the minecraft wiki.)
 2023-01-10 21:38:42 -05:00
Michieal
aad2d114f9 temp commit. recolor of the planks and scaffolds. 2023-01-10 20:49:38 -05:00
ancientmarinerdev
111c885417 Added burger alias 2023-01-11 01:07:18 +00:00
ancientmarinerdev
8e1f00d428 Villager breeding is now unburgered. Burger now needs right click to initiate follow. 2023-01-11 01:07:18 +00:00
Michieal
c12f2cc565 Fix placement of bamboo endcap 2023-01-10 19:23:40 -05:00
Michieal
9f94f12127 Fix placement of bamboo onto bamboo nodes going higher than max height. 2023-01-10 18:48:50 -05:00
Michieal
784f3ec226 Made plank textures more dried bamboo looking. 2023-01-10 16:40:18 -05:00
Michieal
44a769397d Fix bamboo mosaic using wrong texture. 
Fix error.
 2023-01-10 15:36:17 -05:00
Michieal
726eba7ed8 Make bamboo fence/gate less yellow. It's bamboo, not corn XD 2023-01-10 04:42:31 -05:00
Michieal
f46581905a Added veins to the Hyphae log sides. 2023-01-10 04:30:29 -05:00
Michieal
4f6de581dd fixed the warped fungus mushroom texture. 
fixed the warped fungus selection box.
 2023-01-10 04:29:47 -05:00
Michieal
eb8f7360a2 Merge branch 'master' into mcl_bamboo_too 2023-01-09 18:56:05 -05:00
Michieal
8c355db3ce Made Lecterns solid. 2023-01-09 22:32:14 +00:00
Michieal
eae08f3010 Finished Lecterns. 
Added in License.txt.
 2023-01-09 22:32:14 +00:00
Michieal
4701c4d6e7 Built basic lectern model, texture, and node definition. 
Created crafting recipe.

Marked Lecterns as WIP.

Started defining placement.

Added in README.txt.
 2023-01-09 22:32:14 +00:00
Michieal
34faca3f2c Added in License.txt 
Made the end cap node wave in the wind.
 2023-01-08 23:08:12 -05:00
Michieal
d5dda679eb fix vestigial variable names to not be so obtuse. 2023-01-07 16:45:36 -05:00
Michieal
c65bbcd5a5 fixed missed spot for licensing. 2023-01-07 16:14:33 -05:00
Michieal
533f59bf27 Merge branch 'master' into mcl_bamboo_too 2023-01-06 18:08:33 -05:00
Michieal
3074c15d14 clear up comment confusion. 
Factored out hard coded names for variable names.

removed "minecraft" from README.md.
 2023-01-06 18:07:30 -05:00
Michieal
132178b8c7 clear up comment confusion. 2023-01-06 17:46:54 -05:00
Michieal
ede21a8627 revert f92ea77849d07db5ff7bbfe596cb5d6c605a733e 
revert accidental second commit.

Mega commit. lol.

Did a LOT of refactoring.

Cleaned up some vestigial code.

Cleaned up aliases.
 2023-01-06 22:43:41 +00:00
Michieal
82fae13b47 Merge remote-tracking branch 'origin/mcl_bamboo_too' into mcl_bamboo_too 2023-01-06 17:41:57 -05:00
Michieal
f92ea77849 Mega commit. lol. 
Did a LOT of refactoring.

Cleaned up some vestigial code.

Cleaned up aliases.
 2023-01-06 17:41:01 -05:00
Michieal
7ebf9b7ab8 Mega commit. lol. 
Did a LOT of refactoring.

Cleaned up some vestigial code.

Cleaned up aliases.
 2023-01-06 17:40:35 -05:00
Michieal
07a56165ed update optional depends. 2023-01-06 20:23:59 +00:00
Michieal
ee0b355f51 Fix licensing. 2023-01-06 20:21:08 +00:00
Michieal
cc24144bc6 Fixed collision and selection box for endcap nodes. 
fixed typo in debug message.
 2023-01-06 01:22:18 -05:00
Michieal
e1cd16c971 Adjusted growth interval. 
tested and fixed bamboo growth function.

Add debug code across growth function and scaffold place.

disabled debug for commit. removed finished todos.
 2023-01-06 00:41:26 -05:00
Michieal
ed64e7f733 Reverted scaffolding (WIP) for final push. Making an issue for it's continued work. Left wip in, but commented and future featured out. Will test changes forthwith. 
Adjusted bamboo base code (randomize which one to use.) to do less math and accomplish the same thing.
 2023-01-05 20:27:52 -05:00
Michieal
08f9c0074a REVERT: Fix mcl_dyes' mod.conf to use mcl_bamboo grow and check functions. 2023-01-05 18:31:21 -05:00
Michieal
c4969c13cd trying to fix redundancy error... 2023-01-05 00:30:18 -05:00
Michieal
f70176da34 Fix mcl_dyes' mod.conf to use mcl_bamboo grow and check functions. 2023-01-04 23:56:51 -05:00
Michieal
e314addeb3 Merge branch 'master' into mcl_bamboo_too 
# Conflicts:
#	mods/ITEMS/mcl_dye/init.lua
 2023-01-04 23:10:54 -05:00
Michieal
df8fc65e1e temp commit. 2023-01-04 23:03:08 -05:00
Michieal
687887fe27 Incorporate applying bonemeal to Bamboo stalks. 2023-01-04 22:49:17 -05:00
Michieal
65aa956d9c Add alias for scaffolding. 
Rework grow_bamboo to handle random heights, and to handle bonemeal.

 Remove "bamboo_node" in favor of is_bamboo()
 2023-01-04 22:43:05 -05:00
CyberMango
5e969ba928 Added sweet berries death messages. 2023-01-04 23:04:19 +02:00
CyberMango
17e02aec3c Applying bone meal on a stage 3 sweet berry no longer grows it. 
It now ignores the bone meal and harvests the sweet berry as normal.
 2023-01-04 23:04:19 +02:00
CyberMango
fb28e192e6 Bone meal applied on sweet berries only grows them by 1 stage now. 
The interface of the grow plant is a bit confusing since even with
stages set to 0 the plant grows by 1 stage (if other conditions such as
light are met). Therefore changing it to 0 makes the plant grow by 1.
 2023-01-04 23:04:19 +02:00
CyberMango
0f569fdbaa Bone meal on sweet berries in creative mode is no longer wasted and 
minor fixes.

removed an unnecessary -- in a comment.
Removed a redundant concatination.
 2023-01-04 23:04:19 +02:00
CyberMango
8a7fcfde82 Fixed sweet berries bugs. 
Now they can only be placed a tile's upper part.
Also when destroyed bushes at stage 2 drop 1 or 2 berries, while bushes
at stage 3 drop 2 or 3 (instead of fixed numbers of 1 and 3
respectively).
Also harvesting sweet berries at stage 3 (final) brings them to stage 1
instead of just to stage 2. Number of dropped berries was adjusted.
 2023-01-04 23:04:19 +02:00
CyberMango
fb51067c78 Created a shared function for planting a seed that can also be consumed. 2023-01-04 23:04:19 +02:00
Michieal
8dd4a2611e Added alias for scaffolding. 2023-01-04 14:25:31 -05:00
Michieal
f86ee99abf Further cleaned up bamboo base code. 
Fixed some errors in Scaffolding, Commented out the in progress section.
 2023-01-04 11:28:09 -05:00
Michieal
d1a017f6b2 optimized out some for loops, cleaned up code for bamboo placement. 
tested the changes.
 2023-01-03 18:40:40 -05:00
Michieal
50e50e2904 Continued some optimizations of code in bamboo.on_place. 
Begun work on scaffolding.
 2023-01-03 15:57:58 -05:00
Michieal
9351f72c15 Updated Bamboo translations template.txt 2023-01-03 15:38:34 -05:00
Michieal
ef7fb0d2e3 Cleaned up the code. Fixed side placement of bamboo against bamboo. 
Dinked with the random number generator some more.

Condensed some more of the code duplication (WIP).

Added in MCL_Log function.

Finally settled on a decent looking Bamboo top.
 2023-01-03 01:38:12 -05:00
Michieal
5ef7d9f7a0 Added in Bamboo_Plank variable. 
Dinked with the random number generator some.

Moved Bamboo Mosaic from base to items.

condensed some of the code duplication (WIP).

started to add in checks to prevent bamboo from being placed against itself horizontally.

Fixed a couple of naming issues.
 2023-01-02 22:36:09 -05:00
Michieal
dd4a0a4172 Fixed mcl_fishing depending on mcl_bamboo. 2023-01-02 19:24:56 -05:00
Michieal
d586b3fecc Tracked down missing node type placement issues, and fixed them. 
Now with Chicken Cherry Cola!
 2023-01-02 03:54:26 -05:00
Michieal
a7a0c4791a Many bug fixes, Adjusted randomizing code. 
And, Now with Lime-Cherry Kool-aid!! Yum!
 2023-01-02 02:19:33 -05:00
Michieal
23b62c296a Fix code caching errors, and remove unused variables from init. 2023-01-01 23:07:20 -05:00
kabou
2a37d38f6c Reformat cocoa pod node definition groups. 2022-12-31 11:18:04 +01:00
kabou
89821a8329 Rename cocoa pod placement function. 
* Rename cocoa pod placement function to match the `on_place` call in
  the cocoa pods item definition.
* Make the function local, there are no callers outside of mcl_cocoas.
 2022-12-31 10:41:39 +01:00
FossFanatic
aacbaddfe0 Add warped hyphae texture to the right folder 2022-12-30 01:27:02 +00:00
ancientmarinerdev
e6e898671a Merge pull request 'add japanese translation' (#3149) from SakuraRiu/MineClone2:master into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3149
Reviewed-by: Michieal <michieal@noreply.git.minetest.land>
 2022-12-29 22:14:48 +00:00
Michieal
87327abfb9 Restructure Commit. 
Recipes are in recipes.lua
Bamboo Basic nodes are in bamboo_base.lua
Bamboo items are in bamboo_items.lua
Bamboo api / globals are in globals.lua.
 2022-12-29 13:16:48 -05:00
Michieal
34263c2ef3 Change bamboo back to Axey, instead of swordy. 2022-12-29 12:28:42 -05:00
Michieal
38c6969292 Fix mod.conf in mcl_fishing 
Fix bamboo nodes on_destruct to handle the alt nodes too.
clean up ToDos
 2022-12-29 11:31:13 -05:00
Michieal
1d0968f4f5 Fix bamboo nodes on_destruct to handle the alt nodes too. 
clean up ToDos
 2022-12-29 01:38:10 -05:00
Michieal
0f9d263e02 Add Bamboo to the Fishing Junk table. 
Update the mod.conf to be aware of mcl_bamboo.
 2022-12-29 01:29:25 -05:00
Michieal
26c1be3722 Fix bamboo node to be Swordy. 
Added in secondary bamboo node types.
Changed the grow_bamboo function to make use of new alt nodes, and removed unneccessary "force" parameter.
 2022-12-29 01:03:25 -05:00
kabou
44f724f677 Minor refactoring of mcl_dye, fix dye texture names. 
* Reorganize dyes table.
* Rename dye item textures to conform to mcl naming standard.
* Refactor dye item registration.
* Shuffle recipes around in a more logical order.
* Remove unused dye names from lists that are probably equally unused.
 2022-12-29 03:08:50 +00:00
kabou
92ee402971 Separate white dye from bone meal. 
* Add craftitem for ":mcl_bone_meal:bone_meal" to mcl_dye (temporarily.)
* Add crafting recipe for bone meal.
* Add texture for white dye item.
* Merge craftitem registration for "mcl_dye:white" with generic dyes.
* Add crafting recipe for white dye.
* Add legacy conversion recipe.
* Update dyes table.
* Update translations.
* Update mcl_crimson and sweet berry on_rightclick handlers.
* Update composter output, both as freestanding and to hoppers.
* Update bone block crafting recipes.
* Update tropical fish, cod and salmon mob drops.
 2022-12-29 03:08:50 +00:00
kabou
7d8fdc6ec3 Separate brown dye from cocoa beans. 
* Add craftitem "mcl_cocoas:cocoa_beans".
* Add texture for brown dye item.
* Merge craftitem registration for "mcl_dye:brown" with generic dyes.
* Add crafting recipe for brown dye.
* Add legacy conversion recipe.
* Update dyes table.
* Update translations.
* Update cookie recipe.
 2022-12-29 03:08:49 +00:00
kabou
d2edc75407 Separate blue dye from lapis lazuli. 
* Add craftitem "mcl_core:lapis".
* Add texture for blue dye item.
* Add crafting recipe for blue dye.
* Add legacy conversion recipe.
* Update dyes table.
* Update translations.
* Update lapis block crafting recipes.
* Update lapis ore drops.
* Update dungeon and shipwreck loot.
* Update enchanting table input.
* Update villager trade.
 2022-12-29 03:08:49 +00:00
kabou
7311071303 Separate black dye from squid ink sac. 
* Add craftitem "mcl_mobitems:ink_sac".
* Add texture for black dye item.
* Add crafting recipe for black dye.
* Add legacy conversion recipe.
* Update dyes table.
* Update translations.
* Update fishing loot.
 2022-12-29 03:08:49 +00:00
Michieal
28cb06421d Merge branch 'master' into mcl_bamboo_too 2022-12-28 18:13:51 -05:00
Michieal
731468cf5a Did a bit of code restructuring. 
Removed another magic number.
Add in todo for fishing.
Added in the possibility for bamboo to grow two nodes in one success.
Added in a "force" param to use with bonemealing.
 2022-12-28 18:10:12 -05:00
Michieal
ff7693937a Did a bit of code restructuring. 
Removed another magic number.
Add in todo for fishing.
Added in the possibility for bamboo to grow two nodes in one success.
Added in a "force" param to use with bonemealing.
 2022-12-28 15:29:06 -05:00
Michieal
76669e1f3c Moved bamboo grow code to its own function, and made that function global so that it can be called outside of mcl_bamboo. 2022-12-28 14:34:14 -05:00
ancientmarinerdev
81daec14a2 Merge pull request 'Update sounds from MTG' (#3157) from grorp/MineClone2:patch-1 into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3157
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
 2022-12-27 21:36:33 +00:00
Michieal
6f05992c8b Fix Licensing. 
Removed Make_Stairs check.
Made unified protection check.
Began work on the second half of scaffolding.
Removed comments that was no longer needed.
 2022-12-25 07:30:31 -05:00
PrairieWind
0dc31611ac Merge pull request 'Adjusts mcl_crimson Doors to have a specified side texture' (#3140) from Wbjitscool/MineClone2:master into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3140
Reviewed-by: PrairieWind <prairie.astronomer1@gmail.com>
 2022-12-25 02:09:14 +00:00
3raven
5964f25fa7 Merge branch 'master' into master 2022-12-24 17:01:13 +00:00
3raven
d3e8e24f42 Fix the disapearance of christmas texture of the ender chest once it is placed 
Fix the disapearance of christmas texture of the ender chest once it is placed
 2022-12-24 14:44:06 +00:00
Michieal
c55332bf42 Change mod.conf and readme's depends. 
Optipng images, after adding in bamboo top image.
Try out a plantlike style top node for bamboo stalks.
Make Bamboo drop 1-2 bamboo.
Fix Bamboo top drops.
 2022-12-24 00:57:44 -05:00
Michieal
42f8fbf9b8 Added in Fuel Recipes for bamboo slabs / stairs; including mosaics. 
Finished Bamboo Mosaic nodes.
 2022-12-23 17:27:01 -05:00
Michieal
b0978d275d Abstracted variables in bamboo abm. 
Fix Base scaffolding in Creative mode.
Fixed Lua Warnings.
 2022-12-22 16:08:05 -05:00
FossFanatic
e1f26ea70d Remove dry grass side texture 
The same reason as why the dry grass top texture got removed.
 2022-12-22 12:40:36 +00:00
FossFanatic
9ef4a850b1 Remove dry grass top texture 
This is a remnant of Minetest Game and used to be for dry biomes before colour palettes were a thing in MineClone 2.
 2022-12-22 12:40:10 +00:00
FossFanatic
4c23601d03 Remove useless amethyst texture 
This texture is a remnant of the PixelPerfection resource pack and nowhere in the code does this texture get used.
 2022-12-22 12:38:05 +00:00
FossFanatic
8d51e16b8e Remove obsolete texture 2022-12-22 12:34:14 +00:00
Michieal
2b11b5c17a Added full node names for bamboo on_place. 
Added in bamboo top destruct.
Removed mapgen.lua.
 2022-12-21 22:23:46 -05:00
SakuraRiu
1b980849db Merge branch 'master' into master 2022-12-22 00:55:48 +00:00
Michieal
e0d48400a7 Fix the removal of bamboo extras. 2022-12-21 16:16:53 -05:00
Michieal
742a625c42 Added in aliasing for scaffolding, to prevent breakage for players using the "mcl_scaffolding" mod. 2022-12-21 15:55:50 -05:00
Michieal
95d3f9be07 Make Lantern API callable from outside of mcl_lanterns 2022-12-21 12:34:47 -05:00
Michieal
16d94a88db moved extras to the proper location 2022-12-21 12:32:09 -05:00
Michieal
b14f055154 Merge branch 'master' into mcl_bamboo_too 
# Conflicts:
#	mods/ITEMS/mcl_bamboo/init.lua
 2022-12-20 23:19:29 -05:00
Riu Sakura
3faa930bdc Added missing translations. 
In addition, the translation of "Grass Block" has been corrected to a better phrase.
 2022-12-21 10:24:26 +09:00
ancientmarinerdev
a6e0da0e07 Merge pull request 'Fixes https://git.minetest.land/MineClone2/MineClone2/pulls/3120 | Complete re-upload of the mcl_bamboo branch.' (#3123) from mcl_bamboo_new into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3123
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
 2022-12-21 00:47:21 +00:00
Michieal
41ab80183e Darken the Warped Hyphae Log (side) texture 2022-12-20 18:02:48 -05:00
ancientmarinerdev
1c24adb714 Merge pull request 'Animated Nether Tree Textures' (#3155) from FossFanatic/MineClone2:animated_nether_trees_possible into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3155
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
 2022-12-20 21:19:45 +00:00
Michieal
7003459b8d Merge remote-tracking branch 'origin/master' 2022-12-20 16:13:54 -05:00
Michieal
8d440f8464 Made purple warped_hyphae trapdoor so that it matched the sides. (The top was green, the sides were purple.) 
Renamed the old trapdoor top to _alt.
 2022-12-20 16:13:07 -05:00