Commit Graph

4804 Commits

Author SHA1 Message Date
FossFanatic 319beb91ce Improve vines code 2023-02-14 18:11:43 +00:00
FossFanatic bea9bbe212 Improve certain functions 2023-02-14 18:10:49 +00:00
FossFanatic 57882ae56a Merge branch 'master' into biome_colored_foliage 2023-02-14 13:27:37 +00:00
PrairieWind f62546a54f Comment out crafting white and blue dye from lily of the valley and cornflowers respectively 2023-02-13 19:37:04 -07:00
PrairieWind e3f14a3a99 Campfire API 2023-02-14 02:25:50 +00:00
ancientmarinerdev 6f98ba5118 Fix crimson mushroom naming issue 2023-02-14 02:00:19 +00:00
ancientmarinerdev f6f812257e Fix crimson name mismatch 2023-02-14 01:50:06 +00:00
Michieal b66e2a117f fix json reading error. 2023-02-14 01:50:05 +00:00
Michieal 1e61fc3069 Fixed "mcl_crimson_mcl_crimson" issue.
Fixed colors.json stupidity.
2023-02-14 01:50:05 +00:00
Michieal ef30646788 Changed mcl_crimson - finished. 2023-02-14 01:50:02 +00:00
Michieal 70e4aaa3a7 Changed mcl_crimson part 1. 2023-02-14 01:48:11 +00:00
Michieal 8bfa55fa7a Changed Salmon, Glow Squid, Cod, Cartography Table, Awards_Axolotl, Armor_Stand_Item. Glow-Ink_sac. 2023-02-14 01:43:16 +00:00
FossFanatic 3a24903a01 Add nil check 2023-02-13 15:46:45 +00:00
FossFanatic abdd5e11c0 Shorten code slightly 2023-02-13 15:46:08 +00:00
FossFanatic e17fab385b Add nil checks 2023-02-13 15:44:23 +00:00
FossFanatic 17cae6896e Add back the logical code?
My gut feeling tells me that it is somehow a bad idea to have removed this.
2023-02-13 11:17:51 +00:00
FossFanatic 4d29fab932 Improve some trees code 2023-02-13 10:22:28 +00:00
FossFanatic a2087b19a5 Delete rogue file 2023-02-13 10:20:48 +00:00
PrairieWind b79f74c390 Update Translation Template for flowers 2023-02-12 23:29:02 +00:00
PrairieWind 06f47a0756 Add Cornflowers
Evidently I didn't include the lily texture in the lily of the valley commit, so it is in this one. Again, lily of the valley texture by Nicu
2023-02-12 23:29:02 +00:00
PrairieWind ff79af26e4 Add Lily of the Valley Flower
Awesome Lily Texture by Nicu
2023-02-12 23:29:02 +00:00
ancientmarinerdev e3c8d995b5 Finish clean up# 2023-02-12 22:48:20 +00:00
ancientmarinerdev b8b45210e9 Clean up and remove old code 2023-02-12 22:48:20 +00:00
ancientmarinerdev a1f10205f6 Init age on plant so not all kelp grow to top of ocean 2023-02-12 22:48:20 +00:00
ancientmarinerdev 6f7505b6c6 Change kelp to use ABMs to solve performance issues 2023-02-12 22:48:20 +00:00
FossFanatic c88f0047c1 Merge branch 'master' into biome_colored_foliage 2023-02-12 08:44:29 +00:00
FossFanatic 0400d9a2a5 Even further improvements to some foliage code 2023-02-12 08:28:21 +00:00
FossFanatic d1ceacf7ba Improve some vines code 2023-02-12 08:22:07 +00:00
FossFanatic a70a6ef13d Improve some foliage code 2023-02-12 08:21:14 +00:00
PrairieWind 194ff53400 Make sea pickles smelt into lime dye 2023-02-12 01:09:25 +00:00
FossFanatic 81dbdaab94 Adjust palette foliage check
The excessive 128 blocks high check has been changed to now check only up to 30 blocks, since the tallest 2x2 jungle tree I seemed to get was only 29 blocks tall.

I also discovered that the search area wasn't wide enough, so sometimes the most outer leaves avoided the check. I also adjusted that.
2023-02-11 07:53:12 +00:00
FossFanatic 1fb300ef18 Fix leaves not dropping
Due to some renaming, leaves no longer dropped from any of the `mcl_core` trees.

This has now been fixed.
2023-02-10 18:40:35 +00:00
FossFanatic f368fb3e43 Indentation improvements 2023-02-10 15:17:46 +00:00
FossFanatic d63ecac7cb Indentation improvements 2023-02-10 15:14:53 +00:00
FossFanatic 7fbc84971e Remove useless function
This commit removes an useless function which wasn't really needed.
2023-02-10 15:12:37 +00:00
FossFanatic 953044cc4b Mangrove propagules also grab biome colour on growth 2023-02-10 11:33:58 +00:00
FossFanatic 6744967d02 Make placed mangrove leaves always become player leaves
The same thing as with the `mcl_core` leaves.
2023-02-10 10:41:43 +00:00
FossFanatic fdb2333493 Make placed leaves always become player leaves
Any players which still have leaves in their inventory from before this update would have had those leaves rot if someone were to break any log withing 6 nodes of the leaves if they were placed. This commit adds an `after_place_node` callback which makes sure that any leaves placed by the player, become non-rotting player leaves.
2023-02-10 10:39:43 +00:00
FossFanatic 1defd03408 Make the function work self grown saplings
Saplings now also get the biome's foliage colour when grown by themselves.
2023-02-10 10:06:55 +00:00
FossFanatic d163faeb42 Use more fitting names for the newly added function
Basically renaming anything related to leaves in the new function to something more broad such as foliage, so vines aren't indirectly considered leaves. An aesthetic change, basically.
2023-02-10 08:08:28 +00:00
FossFanatic 197d3ae00b Make sapling foliage grab biome colour 2023-02-10 08:04:13 +00:00
Michieal f6b77aa458 reformated code. 2023-02-10 03:42:34 +00:00
Michieal 1558c852d8 Undo mesecon.register_mvps_dropper() and use abms until more research can be done. 2023-02-10 03:42:34 +00:00
Michieal 6c0525f00e Fix merge / rebase crossing massacre.
[Michieal] 83bc60722d Begin: make bamboo dig-able by Pistons for Farm Creation.

[Michieal] 449cbdb330 Make Bamboo & Bamboo items not sticky for pistons.

[Michieal] a44566f863 hijack the ABM to check for orphaned bamboo nodes.

[Michieal] 5dff9e1994 Fixed the ABM situation so that now bamboo "breaks" when pushed by pistons.
Probably not the most elegant, but hey. It works.

[Michieal] 76507025d9 Cleaned up the global function to match the current ABM.

[Michieal] dfa849e19a Merge branch 'master' into Bamboo-Piston-Dig

[Michieal] a5bdc8a166 fix bamboo mosaic recipe.

[Michieal] 14383d6c6f update mod.conf to use optional depends mesecons_mvps

[Michieal] f81d530912 Update init.lua to register dropper callback.
2023-02-10 03:42:34 +00:00
ancientmarinerdev 3c13ce1d6b Merge pull request 'Fix "mcl_core:dirt_with_dry_grass" to be "mcl_core:dirt_with_grass" with the savanna color index.' (#3408) from fix_dirt_dry_grass into master
Reviewed-on: MineClone2/MineClone2#3408
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-02-10 02:50:27 +00:00
PrairieWind 70fb4f8a0d Fixed weather not clearing after sleep
Isnt as clean as it should be because making it clean made some very funky results
2023-02-10 01:51:28 +00:00
FossFanatic 169019096e Change the waterlily code
Waterlilies now use a brownish grey texture with a coded hex colour.
2023-02-09 09:46:18 +00:00
SmokeyDope dfbee5cb93 Add "mushroom" to the warped fungus and crimson fungus item descriptions for creative search 2023-02-09 03:22:17 +00:00
SmokeyDope 378af531a9 remove "mushroom" from the names of crimson fungus and warped fungus 2023-02-09 03:22:17 +00:00
FossFanatic f4e8088e60 Improve mangrove leaves
This commit makes it so mangrove leaves also no longer use `param2` to see if they rot or not. The leaves also use the biome colours now.
2023-02-08 16:13:13 +00:00
FossFanatic 198375a18e Change stuff in mcl_core
Simply put, this commit changes some code so that leaves don't use `param2` to see if they rot or not, and will now use the biome colours.

This commit also makes it so vines do the same (use biome colours).
2023-02-08 16:11:38 +00:00
anarquimico e2de5908c7 5th ITEMS batch 2023-02-07 16:39:24 +00:00
anarquimico 439c879508 4th batch of ITEMs translation 2023-02-07 16:39:23 +00:00
anarquimico 67977b0d26 Third batch of ITEMS translation 2023-02-07 16:39:23 +00:00
anarquimico ed8c3e7d26 Second batch of ITEMS translated 2023-02-07 16:39:22 +00:00
anarquimico 7add59992f First batch of ITEMS translation 2023-02-07 16:39:22 +00:00
Michieal ef4e4b1b7b Merge branch 'master' into fix_copper_blocks 2023-02-06 16:58:38 -05:00
Michieal 0e000e6491 Merge branch 'master' into fix_dirt_dry_grass 2023-02-06 16:55:14 -05:00
Michieal ec7a97ba3e Made LBM run at every load, so that it catches anything missed from previous passes. 2023-02-06 16:54:23 -05:00
SmokeyDope 48eb934d64 Add compostability to warped wart blocks and shroomlight 2023-02-06 13:08:28 -07:00
SmokeyDope 88cf3a5900 Add compostability to nether sprouts 2023-02-06 13:08:27 -07:00
SmokeyDope 1401652015 Add compostability to warped roots and crimson roots 2023-02-06 13:08:26 -07:00
SmokeyDope cac6e15736 Add compostability to twisting vines and weeping vines 2023-02-06 13:08:24 -07:00
SmokeyDope 156d096a78 Add compostability to warped fungus and crimson fungus 2023-02-06 13:08:23 -07:00
Michieal de00b7228e Fix "mcl_core:dirt_with_dry_grass" to be "mcl_core:dirt_with_grass" with the savanna color index. 2023-02-05 21:17:53 -05:00
GuyLiner 4d922d9edf Added conditional based on existing fire damage conditional that will apply fire damage to a
mob standing on top of a magma node that belongs to the "fire" group. The magma node
has also been added to the fire group, making it so that standing on the node will
do damage to the mob.

In official Minecraft, magma blocks just do fire damage without the fire animation.
Source: https://minecraft.fandom.com/wiki/Magma_Block
2023-02-06 00:10:52 +00:00
Michieal 46ca650ea4 further optimize and reformat mcl_honey's init.lua 2023-02-04 16:31:18 -05:00
Michieal c4e4a8e4d2 Move Waxing function to MCL_Honey. Remove commented code. 2023-02-04 03:31:11 -05:00
Michieal 08610296fc Merge branch 'master' into fix_copper_blocks 2023-02-04 03:30:20 -05:00
ancientmarinerdev 7d46fa3362 Merge pull request 'texture-consolidation' (#3380) from texture-consolidation into master
Reviewed-on: MineClone2/MineClone2#3380
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-02-04 03:23:13 +00:00
ancientmarinerdev 58a08ea697 Merge pull request 'fix incorrect digtypes and missing sounds for some nether blocks' (#3351) from SmokeyDope/MineClone2:master into master
Reviewed-on: MineClone2/MineClone2#3351
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-02-04 00:27:48 +00:00
Michieal 50effaa807 Made Requested changes from Pull Request. 2023-02-03 14:09:16 -05:00
SmokeyDope 08df1fe02f Update overworld vine breaking logic with vector.offset 2023-02-03 00:50:25 +00:00
SmokeyDope bc4d9211cb Update nether vine breaking logic with vector.offset 2023-02-03 00:43:17 +00:00
SmokeyDope cf05771e30 remove unnecessary blank line 2023-02-02 23:12:09 +00:00
SmokeyDope 16a6dcb66c Completely remove selection box for warped fungus
Recommended by Michael
2023-02-02 22:45:06 +00:00
SmokeyDope 89eb458df7 Fix up indentation for warped and crimson wart block sounds part 2 2023-02-02 22:42:44 +00:00
SmokeyDope eae1ee7cee Fix indentation for shapeless type @ netherite ingot 2023-02-02 22:39:37 +00:00
SmokeyDope 27f5a94c6a Fix up indentation for warped and crimson wart block sounds 2023-02-02 22:36:33 +00:00
SmokeyDope b4719599b5 Fix up indentation 2023-02-02 22:30:15 +00:00
SmokeyDope 659f11bf6f Fixed up indentation and removed excess blank lines 2023-02-02 22:08:37 +00:00
SmokeyDope 88a7a8afab Removed handy, axey, swordy, from nether vines & removed useless comments 2023-02-02 21:37:23 +00:00
Michieal ad43fbd237 Adjust amethyst bud growth speed. 2023-02-02 15:25:33 +00:00
Michieal 618313f0af Merge branch 'master' into fix_copper_blocks 2023-02-01 23:51:29 -05:00
Michieal a3bc3fd9b9 Removed old commented code to prevent accidental re-enabling, and put the todo into the correct spot. 2023-02-01 23:49:04 -05:00
Michieal c370f1884b Fixed the unwax copper blocks variants to be able to properly remove oxidization levels properly.
MCL_COPPER Blocks off all types (not stairs and slabs) now function properly.
2023-02-01 23:34:02 -05:00
Michieal b771f314fe Removed "scraping_copper_block" function.
Fixed the wax copper blocks variants to have the wax removed.
2023-02-01 23:24:59 -05:00
Michieal 4b0b3217e2 added in TODO 2023-02-01 19:55:23 -05:00
ancientmarinerdev e363435134 Merge pull request 'mcl_starting_chest' (#3373) from mcl_starting_chest into master
Reviewed-on: MineClone2/MineClone2#3373
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-02-01 23:54:44 +00:00
Michieal 5b1c7f2d3a Everything *BUT* scraping works properly. 2023-02-01 18:39:13 -05:00
FossFanatic 24b1078b61 Make the post effect alpha the same between water source and flow 2023-02-01 22:50:50 +00:00
𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 8793ed211e Fix ender chest crash + remove map hand reference 2023-02-01 09:56:12 -06:00
Michieal 425cf53194 fix minor bug. 2023-01-30 23:57:50 -05:00
Michieal d04f162d8f Initialize Global variable. 2023-01-30 23:53:40 -05:00
Michieal 6265148727 Move textures all into one centralized directory. 2023-01-30 22:55:53 -05:00
Michieal 319602508d Make copper block nodes use on_place. 2023-01-30 20:13:32 -05:00
Michieal 8c703f1352 Refactored out "varient" in foavor of "variant".
Set up a basic "on_place" function.

Made _mcl_copper_waxed_variant and _mcl_copper_unwaxed_variant node parameters so that the waxing_copper_block and scraping_copper_block functions can be made generic.

Adjusted said functions to look first for the variants, and added in protection checks for the blocks
2023-01-30 18:27:53 -05:00
Michieal 95b1429922 Add mcl_util to mcl_copper's mod.conf file. 2023-01-30 16:01:09 -05:00
SmokeyDope 32b5b435c5 Make weeping vines and twisting vines break instantly
Partial revert of previous commit, they should break instantly
2023-01-30 17:09:50 +00:00
SmokeyDope a3fe41128f Make netherite ingot crafting shapeless 2023-01-30 05:38:33 +00:00
SmokeyDope 1a495dd63a Make ancient debris smeltable in a blast furnace 2023-01-30 05:03:50 +00:00
Michieal 29597af738 Fixed noted errors from Pull Request. 2023-01-29 13:12:24 -05:00
Michieal f3e840a0ff Merge branch 'master' into mcl_starting_chest 2023-01-29 13:02:03 -05:00
SmokeyDope 1f09c0a128 Make weeping vines and twisting vines break the same speed as regular vines 2023-01-25 05:47:41 +00:00
SmokeyDope fb8060c366 lower hardness of warped wart block and shroomlight block to match nether wart block 2023-01-25 04:06:59 +00:00
𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 a1cc24f8d3 Slowing creative digging 2023-01-24 11:16:28 -06:00
SmokeyDope 6f22d7daa4 Add node breaking logic to twisting vines and weeping vines
breaking twisting vines will break the ones above them, breaking weeping vines breaks the ones below them
2023-01-24 17:15:22 +00:00
SmokeyDope dc3eedac5f Add breaking sounds for warped fungus, nether sprouts, warped roots, crimson fungus, crimson roots 2023-01-24 16:24:35 +00:00
ancientmarinerdev 02ee8b757d Merge pull request 'Biome Colour Palette Fixes' (#3203) from simplified_palette_index into master
Reviewed-on: MineClone2/MineClone2#3203
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-01-24 00:21:12 +00:00
SmokeyDope 39b6e41a62 revert hitbox size for warped fungus 2023-01-23 22:34:22 +00:00
SmokeyDope ef1f7b8e20 make blackstone, basalt, and nether gold ore mineable with a wooden pickaxe
Fixes #3287
2023-01-23 22:17:12 +00:00
SmokeyDope 70b56d7126 Fix hitbox size for Warped Fungus 2023-01-23 21:30:32 +00:00
ancientmarinerdev c4ea504123 Fix crash when leaves don't have a registered orphan but try to rot 2023-01-23 20:58:05 +00:00
SmokeyDope f971283798 Add placement sounds to twisting vines and weeping vines 2023-01-23 16:55:18 +00:00
SmokeyDope 62bb7a85eb Add sounds to weeping vines and twisting vines, updated warped wart block and shroomlight sounds 2023-01-23 02:04:58 +00:00
SmokeyDope 42eb541eaa Add sound to warped wart block and shroomlight block 2023-01-23 01:28:55 +00:00
SmokeyDope 9e8ed7efc3 make hoes effective and swords slightly effective on nether wart blocks 2023-01-23 00:11:56 +00:00
SmokeyDope 36231241ba make hoes effective on warped wart blocks and shroomlight blocks 2023-01-23 00:06:46 +00:00
CyberMango c57f797226 Make the velocity checks absolute.
Now sweet berries will cause damage in all directions.
2023-01-20 19:15:55 +02:00
ancientmarinerdev c7ebe1b8cd Updated Bamboo textures by Nicu. Updated credits as per request from Michieal 2023-01-19 20:51:49 +00:00
Michieal b258ccffdc Merge Master into mcl_bamboo_cleanup 2023-01-18 20:29:40 -05:00
Michieal ed03cb470d Change Bamboo Trapdoor to be Boring. 2023-01-17 22:12:57 -05:00
FossFanatic 5fd5cc9f1c Merge branch 'master' into simplified_palette_index 2023-01-17 12:53:09 +00:00
Michieal b99487b6ab Merge branch 'master' into mcl_bamboo2_cleanup 2023-01-16 20:19:03 -05:00
Michieal ac30e25065 Remove "mcl_farming:beetroot_item" from fortune drop, so Fortune only gives seeds. 2023-01-16 19:40:07 -05:00
Michieal 77a8ca689f Give textures more definition. 2023-01-16 18:16:26 -05:00
ancientmarinerdev 30d3b7ee23 Merge pull request 'mcl_bamboo Part 2.' (#3208) from mcl_bamboo_too into master
Reviewed-on: MineClone2/MineClone2#3208
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
2023-01-16 20:22:09 +00:00
Michieal 55bb9800f4 removed errant logging line. 2023-01-16 15:07:57 -05:00
Michieal b805ae9926 Adjust bamboo growth rates to be close to the MC wiki. 2023-01-16 15:01:38 -05:00
𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 6e6c11cde2 Fix undeclared global variable in mcl_buckets 2023-01-16 12:56:59 -06:00
Michieal d48b3dcaee Starting Inventory fix #4 Optimized and remove chatcommand. 2023-01-16 02:12:39 -05:00
Michieal 88493091b6 Starting Inventory fix #3. turn off debugging in code.
Ready for testing.
2023-01-16 01:58:27 -05:00
Michieal d68667beb9 Starting Inventory fix #2. add in chat command, /give_starting_inventory. add in debug code. 2023-01-16 01:53:35 -05:00
Michieal d6ee21d192 Merge branch 'master' into mcl_bamboo_too 2023-01-15 15:27:30 -05:00
Michieal 0c61035df0 Missing files from the optipng commit. (not exactly sure what happened.) 2023-01-15 14:30:12 -05:00
AFCMS 3027965314 Add comment 2023-01-15 15:32:42 +00:00
AFCMS e9c9f151de Let user dig light blocks when wielding a light block 2023-01-15 15:32:42 +00:00
AFCMS fb8262bf57 Make light blocks `buildable_to` 2023-01-15 15:32:42 +00:00
AFCMS 726358da4b Rename callbacks parameters to match Minetest documentation 2023-01-15 15:32:42 +00:00
AFCMS 515204d296 Update translation template and add french translation 2023-01-15 15:32:42 +00:00
AFCMS eb5f5678d6 Fix typo in barrier help text 2023-01-15 15:32:42 +00:00
AFCMS 33e2b79b2b Make nearby light blocks spawn particles when player wield one 2023-01-15 15:32:42 +00:00
AFCMS 7c20896d5e Make light blocks not walkable 2023-01-15 15:32:42 +00:00
AFCMS cd70dd5b88 Spawn particle then placing light blocks 2023-01-15 15:32:42 +00:00
AFCMS 302970d220 Basic light blocks 2023-01-15 15:32:42 +00:00
AFCMS 79876635af Use `mcl_util.call_on_rightclick` in `on_place` callback for barrier block 2023-01-15 15:32:42 +00:00
AFCMS b9238b4069 Use new vectors 2023-01-15 15:32:42 +00:00
AFCMS bf25fca47d Remove support for `use_texture_alpha` bool values (mt 5.3) 2023-01-15 15:32:42 +00:00
AFCMS 92261e5fb5 Remove `stack_max` fields duplicated with default value 2023-01-15 15:32:42 +00:00
AFCMS 1e31e383d4 Fix invalid function signature for `on_place` callbacks + handling of possible nil value 2023-01-15 15:32:42 +00:00