1
0
Fork 0
Commit Graph

4418 Commits (b0978d275d7de223b18e47de0a2392fca1c045fb)

Author SHA1 Message Date
cora ebf4678e54 mcl_buckets whitespace fixes 2022-11-26 22:18:46 +01:00
cora b4971b298d Move fish bucket code to separate file 2022-11-26 22:18:46 +01:00
cora 99db678a44 Fish buckets set properties from bucket item meta 2022-11-26 22:18:46 +01:00
cora dd58bed5d1 refactor fish bucket code to not use bucket api
it was clearly not made for this
2022-11-26 22:18:46 +01:00
cora c6fc388597 Add _harmless option for rocket arrows
so event fireworks dont grief things
2022-11-26 17:06:04 +01:00
cora c3455de604 Clear bad omen when raid complete 2022-11-26 17:06:04 +01:00
cora dc017864fd raids: properly integrate potions api
supports "level" now, bad omen > 1 means extra wave additionally
the playername is saved in the event object now for later access
and events can be made exclusive to a certain radius now.
2022-11-26 17:06:04 +01:00
cora 2159edba05 Remove dependency on mcl_potions 2022-11-26 17:06:04 +01:00
PrairieWind 1b6d778dd1 Add Village Checks 2022-11-26 17:06:03 +01:00
PrairieWind 96ac31bec3 Add Bad Omen Effect 2022-11-26 17:06:03 +01:00
cora ba7da6a885 Fix pressure plates being pressed by new chest size
this fixes the problem for chests, with paintings it would need to
go down considerably ( .65 was the value i determined)
2022-11-26 16:52:19 +01:00
cora 3066d966a1 Add the missing wood types pressure plates 2022-11-26 16:52:19 +01:00
cora 626f61c2c1 Merge pull request 'Nether Plank Fixes' (#3023) from FossFanatic/MineClone2:nether_plank_fixes into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3023
Reviewed-by: cora <cora@noreply.git.minetest.land>
2022-11-26 12:58:21 +00:00
FossFanatic f71759f184 Fix crimson & warped planks 2022-11-26 11:54:34 +00:00
cora 53c1ed9fbf Merge pull request 'Axolotl' (#2870) from TheOnlyJoeEnderman/MineClone2:Axolotl into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2870
Reviewed-by: cora <cora@noreply.git.minetest.land>
2022-11-23 03:18:36 +00:00
cora a3fbb2e0c9 Merge pull request 'Grass Block Underside Fix' (#2987) from FossFanatic/MineClone2:grass_block_underside_fix into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2987
Reviewed-by: cora <cora@noreply.git.minetest.land>
2022-11-21 10:34:12 +00:00
Michieal 9ffdd13fa5 Make waterlogged roots more water looking
A quick change to the setting within the wlroots definition that makes the water translucent.
It's not perfect, but I think it looks better blended than opaque.
2022-11-20 19:16:39 +00:00
FossFanatic 1a5aed704c Fix underside of grass block 2022-11-19 11:28:31 +00:00
AFCMS 029769f48f Fixes to `mcl_tnt`
- reorder code
- fix potential crashes with not handeled nil values
- use new vectors
2022-11-19 01:27:32 +01:00
Daniel Cassidy 79192d51ed mcl_enchanting: Add missing dependency on mcl_experience. 2022-11-18 21:30:50 +01:00
FossFanatic dec2c2bade Merge branch 'master' into cocoa_pod_fixes 2022-11-18 08:27:19 +00:00
FossFanatic e25415e047 Merge branch 'master' into respawn_anchor_animation 2022-11-18 08:24:57 +00:00
FossFanatic f93af56bf6 Remove MineCraft derivative texture 2022-11-18 08:16:53 +00:00
FossFanatic f8b98d784b Add animated top texture 2022-11-18 08:12:16 +00:00
FossFanatic e898b72f3d Add animated top texture 2022-11-18 08:11:39 +00:00
cora 7d63b07e09 Fix mangrove sign registrations 2022-11-18 00:51:45 +01:00
Michieal 197e807684 Fix the crafting recipes for the signs.
Placed in the proper place. Ugh.
2022-11-18 00:51:45 +01:00
PrairieWind 1877f7261e Make Raw Copper (Block) smeltable in the blast furnace 2022-11-18 00:33:17 +01:00
cora adeb6c42e5 Merge pull request 'Make kelp cookable in the smoker' (#2979) from anarquimico/MineClone2:kelp_smoker into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2979
Reviewed-by: cora <cora@noreply.git.minetest.land>
2022-11-17 23:30:21 +00:00
anarquimico e658e29179 Make kelp cookable by smoker. 2022-11-17 20:16:58 -03:00
cora 142f3d6d5a Handle bonemealing in the sweetberry on_rightclick 2022-11-17 19:42:02 +00:00
cora 328a377940 export apply_bone_meal function in mcl_dye
this is essentially just a hack to not put any more sweetberry code
in mcl_dye because the architecture makes it necessary for mcl_dye
to depend on mcl_farming, not the other way around - hence all the
plant bonemealing is done in mcl_dye...
2022-11-17 19:42:02 +00:00
cora c5ec3c770c Sweet berries: Add rightclick harvesting 2022-11-17 19:42:02 +00:00
cora 5a9d428151 Merge pull request 'Hoppers pulling from chest minecart' (#2954) from anarquimico/MineClone2:hoppers_mc_chest into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2954
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
Reviewed-by: cora <cora@noreply.git.minetest.land>
2022-11-17 05:38:39 +00:00
PrairieWind 89a342a34f Add Bee Nest Tree Schematics and generation 2022-11-17 03:16:45 +01:00
PrairieWind b17dcf26da Make beehives transparent and not launch entities, thanks MysticTempest! 2022-11-17 03:16:45 +01:00
PrairieWind c767c617f8 Add waxing copper blocks 2022-11-17 03:16:45 +01:00
PrairieWind 16f878d3dc Make Honey Blocks Sticky
Uses slime block stickiness code.
2022-11-17 03:16:45 +01:00
PrairieWind bbb908239b Total Beelocation Advancement 2022-11-17 03:16:45 +01:00
PrairieWind 0aaaa05164 Bee Our Guest Advancement 2022-11-17 03:16:45 +01:00
PrairieWind 8a3c1eaa6e Add harvest and digging damage, and campfire usage
Damage is temporary until bees are implemented
2022-11-17 03:16:45 +01:00
PrairieWind a79692a68b Add harvesting functionality to bee nests
Still has temporary abm updating
2022-11-17 03:16:45 +01:00
PrairieWind cb60338f10 Add basic functionality to beehives
Uses a temporary ABM to progress through honey levels
2022-11-17 03:16:45 +01:00
PrairieWind 89b02c126a Add basic beehives and bee nests
Still need to add functionality
2022-11-17 03:16:45 +01:00
PrairieWind db0b44326b Add crafting recipe item replacements 2022-11-17 03:16:45 +01:00
PrairieWind 4bb824cd38 Add mcl_honey mod.conf file along with translation templates 2022-11-17 03:16:45 +01:00
PrairieWind daf5bf90a4 Add Honey, Honeycomb, and respective blocks 2022-11-17 03:16:45 +01:00
Michieal 9dc27e535b revert 020a9510cbd7adf7419c166af5c2baba7c96cf45
revert "This has the achievement in there."

The only difference is the placement of a single comment, not worth a full on commit.
2022-11-17 02:55:14 +01:00
Michieal 439ac600fd This has the achievement in there. 2022-11-17 02:55:14 +01:00
Michieal bee40c55ec Fix KillAura bug destroying the Displayed Item. 2022-11-17 02:55:14 +01:00
Michieal 2577a70a65 Made displayed entities immortal
Added in extended placement. 
Registered the Achievement "Glow and Behold!"
2022-11-17 02:55:14 +01:00
Michieal e2e86ae9a8 Final commit
Add in the ability to place frames on surfaces. Has minor visual bugs. Should be modified to disallow placing on top of items to prevent visual bugging.

Signed-off-by: Michieal <michieal@noreply.git.minetest.land>
2022-11-17 02:55:14 +01:00
Michieal 577f9f7785 Change Frames to only use the timer if it's displaying an object. 2022-11-17 02:55:14 +01:00
Michieal 67296c7a37 Update Signs API to only use timer functions when there is text to display. 2022-11-17 02:55:14 +01:00
Michieal 4a1e37d9c6 fix typo that somehow propagated. 2022-11-17 02:55:14 +01:00
Michieal e67c6e1ada fix signs to reset after /clearobjects
Additionally, added in the register_hanging_sing_craft() for future use.
2022-11-17 02:55:14 +01:00
Michieal 10a3a022b6 fix frames to reset after /clearobjects 2022-11-17 02:55:14 +01:00
Michieal 99a7df7ce6 Fix the Pumpkin/Melon grass position.
Also, updated the license.
2022-11-17 02:16:59 +01:00
FossFanatic 9b392fcefc Upload files to 'mods/ITEMS/mcl_cocoas/models' 2022-11-16 13:44:35 +00:00
FossFanatic d091d634bb Delete 'mods/ITEMS/mcl_cocoas/models/emptyfile' 2022-11-16 13:44:23 +00:00
FossFanatic 16746f962f Upload files to 'mods/ITEMS/mcl_cocoas/models' 2022-11-16 13:44:15 +00:00
FossFanatic 00c596c126 Add 'mods/ITEMS/mcl_cocoas/models/emptyfile' 2022-11-16 13:43:40 +00:00
FossFanatic 993d7b6873 Delete 'mods/ITEMS/mcl_cocoas/models' 2022-11-16 13:43:23 +00:00
FossFanatic ceff91e2c3 Add 'mods/ITEMS/mcl_cocoas/models/' 2022-11-16 13:43:11 +00:00
FossFanatic 6bfcd9b1ea Delete 'mods/ITEMS/mcl_cocoas/models/emptyfile' 2022-11-16 13:42:49 +00:00
FossFanatic 6b826b45e1 Add 'mods/ITEMS/mcl_cocoas/models/emptyfile' 2022-11-16 13:42:36 +00:00
FossFanatic 3de1f9e4d6 Delete 'mods/ITEMS/mcl_cocoas/mcl_cocoas_cocoa_stage_2.obj' 2022-11-16 13:39:41 +00:00
FossFanatic 348434adf1 Delete 'mods/ITEMS/mcl_cocoas/mcl_cocoas_cocoa_stage_1.obj' 2022-11-16 13:39:36 +00:00
FossFanatic 6946573e65 Delete 'mods/ITEMS/mcl_cocoas/mcl_cocoas_cocoa_stage_0.obj' 2022-11-16 13:39:32 +00:00
FossFanatic 862d6a9e3e Upload files to 'mods/ITEMS/mcl_cocoas' 2022-11-16 13:39:19 +00:00
FossFanatic 78d45d23c2 change the code 2022-11-16 13:38:44 +00:00
FossFanatic b11d65cc82 Update cocoa textures 2022-11-16 13:35:01 +00:00
FossFanatic f4f57a9fe6 Delete 'mods/ITEMS/mcl_cocoas/textures/mcl_cocoas_cocoa_top_stage_2.png' 2022-11-16 13:33:42 +00:00
epCode a5eb1d240e add deeper = darker 2022-11-15 22:36:05 +00:00
anarquimico 507f14c317 Modified function and ABM 2022-11-15 00:01:28 -03:00
cora 489ef43458 Don't transfer whole stacks 2022-11-14 04:07:41 +01:00
ancientmarinerdev 70a7fb9387 Hoppers now take from hopper minecarts 2022-11-14 04:07:41 +01:00
ancientmarinerdev 9065170b1c Clean up hopper minecart 2022-11-14 04:07:41 +01:00
epCode c288b6ab93 make townaura more preformant 2022-11-14 02:38:02 +01:00
epCode 28f952309e add mycelium townaura particles 2022-11-14 02:38:02 +01:00
epCode 080182ab15 Fix ender and shulker nodeboxes 2022-11-13 22:18:00 +00:00
epCode 6c6e21b63e fix chests 2022-11-13 22:18:00 +00:00
3raven d01aa36d09 Pot nether roots and fungi
Pot nether roots and fungi
2022-11-13 17:44:21 +00:00
cora b625fba4f2 Merge branch 'master' into hoppers_w_composter 2022-11-12 12:27:49 +00:00
anarquimico 3ef8838a11 Fixed indentation. 2022-11-12 06:28:36 -03:00
ancientmarinerdev 3000a378f3 Villagers can claim any bed. Player can steal villager bed. Villager won't take player bed 2022-11-12 02:35:00 +01:00
AFCMS 7dbe6489be Change lighting rod activation time to 0.4 2022-11-11 16:39:19 +01:00
AFCMS 5f626cf1b0 Make lightning rods send redstone signal when struck by lighting (0.5s) 2022-11-11 16:39:19 +01:00
AFCMS 47e46efa6f Add french translation 2022-11-11 16:39:19 +01:00
AFCMS a11948c5f3 Add new texture 2022-11-11 16:39:19 +01:00
AFCMS cb7d5e3790 Make lightning rod texture look better 2022-11-11 16:39:19 +01:00
AFCMS 2c5d3861f6 Add locale template to mcl_lightning_rods 2022-11-11 16:39:19 +01:00
AFCMS e56fa0d809 Lightning Rod Fixes
- give node a proper nodebox
- add better texture compatible with MC texture packs
- set use_texture_alpha = "opaque"
- fix invalid translator
- disable node placement prediction
- simplificate placement code
2022-11-11 16:39:19 +01:00
anarquimico cb721f37ce Fixed minor bug and removed TODO commentary 2022-11-10 21:11:32 -03:00
anarquimico 3072d44b66 Bugs fixed. 2022-11-08 19:18:35 -03:00
anarquimico f61b072d39 Fixed compostable item comsumption. 2022-11-07 22:10:35 -03:00
TheOnlyJoeEnderman 3110f97868 Move axolotl_bucket to buckets mod 2022-11-07 08:19:44 +00:00
Michieal dd869afea0 fixed typo error
had a list inside of an extra set of {}'s
2022-11-07 01:20:03 +00:00
Michieal c277229c1b Changed the Item Frames' LBM method.
Moved the custom lbm function call out of create_custom_frame() into init.
Changed how the custom lbm handles frames lbm regeneration.
2022-11-06 21:00:14 +00:00
anarquimico 91ef21c55b Integrate hoppers with composter 2022-11-06 17:49:32 -03:00
MysticTempest 2be75c9628 Better fix for creative digging drops, and fix the itemframes LBM. 2022-11-06 07:08:49 -06:00
PrairieWind 6f8d854f8a Fix texture issue and capitalization in Stripped Warped Hyphae Bark 2022-11-04 19:17:39 -06:00
PrairieWind 92723cab9f Add Crafting Recipes for the crimson and warped (trap)doors, fences, and gates 2022-11-04 19:17:39 -06:00
Nicu 8162a4af2d Add custom door and trapdoor textures for mcl_crimson 2022-11-05 01:47:35 +01:00
Nicu 30d2022b4a Optimize textures in mcl_crimson 2022-11-05 01:47:35 +01:00
cora df216cb847 Add crimson fence and gate 2022-11-05 01:47:35 +01:00
cora 4dec3e1382 Add warped fence and gate 2022-11-05 01:47:35 +01:00
cora 43425279a3 Add crimson and warped doors and trapdoors 2022-11-05 01:47:35 +01:00
Michieal b62f61db10 Added in the API Doc file, and adjusted the created items' names.
Added the ":" to the front of the item creation so that it can be called from an external mod.
Put in an optional inventory and wield image parameter to add in colorized inventory / wield images.
2022-11-05 01:26:15 +01:00
Michieal c4981d894c Removed the local cached copy of the built in TGA encoder. 2022-11-05 01:26:15 +01:00
Michieal 93913ed780 Fix accidental conversion of tabs to spaces. 2022-11-05 01:26:15 +01:00
Michieal 3409c5a220 Prereview code, but with the spaces converted to tabs.
* Cleaned up all of the code, checked to make sure that there were no erraneous debug logging.
* To enable debugging, turn it on in the api by changing the following line in item_frames_api.lua:
mcl_itemframes.DEBUG = false -- set to true to see debug output.
* Made the standard Item Frame and the new Glow Frame use the frames API. 
Added in backwards compatibility mode.
* Made frames pop out items into the world on the old frames' entities when they are a hidden / broken entity. (Part of the backwards compatibility.)

* Tested locally.

* *Converted the spaces to tabs!*

Should be fully functional and ready for review.
2022-11-05 01:26:15 +01:00
Michieal 76991fcba9 Pre-review Item frames code
* Cleaned up all of the code, checked to make sure that there were no erraneous debug logging.
* To enable debugging, turn it on in the api by changing the following line in item_frames_api.lua:
mcl_itemframes.DEBUG = false -- set to true to see debug output.
* Made the standard Item Frame and the new Glow Frame use the frames API. 
Added in backwards compatibility mode.
* Made frames pop out items into the world on the old frames' entities when they are a hidden / broken entity. (Part of the backwards compatibility.)

* Tested locally.

Should be fully functional and ready for review.
2022-11-05 01:26:14 +01:00
Michieal 61df48e46e Translations for the Item Frames. 2022-11-05 01:26:14 +01:00
Michieal 18e83e5763 Added in display item rotation
Updated the Readme. Added in the ability to rotate the displayed item with a screwdriver. Made the Screwdriver mod required, due to rotating the item being fundamental behavoir.

Finalized a few bug fixes... still have to remove the all of the forced debug code, and move the item frames and glow frames over to the new api, and do a final test.
2022-11-05 01:26:14 +01:00
Michieal 8a21b9e99c Changed detection code custom frames.
todo: figure out why the standard item frame is using the wrong item entities.
todo: fix screwdriver rotating the item displayed.
2022-11-05 01:26:14 +01:00
Michieal 6d1b1b3c74 Added a return code to load_maps
Added a return code to load_maps to check for if dynamic_add_media registers a fail.
Used by mcl_itemframes when reloading a map placed into an itemframe.
2022-11-05 01:26:14 +01:00
Michieal 1f5b92f7bf code clean up. testing & debugging custom frames.
cleaned up a LOT of duplicate code. Added in the custom frames, and a couple of calls in init.lua to begin testing custom frames out.

to do: fix the freaking maps. (It looks like it's client side that is failing, to be honest.)
2022-11-05 01:26:14 +01:00
Michieal 4d74e4d9c1 update the translation template 2022-11-05 01:26:14 +01:00
Michieal ef504e90c1 glowframe model commit 2022-11-05 01:26:14 +01:00
Michieal 09d452667b glowframe textures commit 2022-11-05 01:26:14 +01:00
Michieal 9b37ca460e Initial code comit 2022-11-05 01:26:14 +01:00
TheOnlyJoeEnderman 7e3d5f3553 add axolotl to bucket translation template 2022-11-04 01:58:04 +00:00
cora 48d6a2fd72 Add some ABM limits for lava ABMs 2022-11-03 14:11:03 +01:00
Michieal fb10320550 Quickfix: changed standing sign rotate replacement node.
Replaced the standing sign (90 degrees) starting replacement node for on_rotate().
Tested on all signs, testing all degrees of rotation (all 16 of them).

fixes newly found bug: non-oak standing sign becomes oak standing sign when initially rotated with a screwdriver.
2022-11-03 13:10:50 +01:00
Michieal 5a68c876fb new translations for the additional signs. 2022-11-03 13:10:50 +01:00
Michieal dd1e4ca927 Added in Crimson Hyphae and Warped Hyphae Signs
Added in Crimson Hyphae and Warped Hyphae Signs.

Didn't do the the translations for them.
2022-11-03 13:10:50 +01:00
Michieal 162bd36101 Translations for the signs 2022-11-03 13:10:50 +01:00
Michieal d48100c427 Translations for the signs 2022-11-03 13:10:50 +01:00
cora 6485545269 Add warped fungus on a stick item 2022-11-01 04:52:17 +01:00
cora dec207368c Add wither rose 2022-11-01 04:52:17 +01:00
Michieal c3433bd003 Warped Fungus redo.
Changed the colors and added in the old drips because they look pretty cool on it.
Wanted it to match the surrounding color scheme more than the green and orange one.

texture license: full usage under the standard MineClone2 texture license.

Created by Michieal, based off of the Minecraft Warped Fungus.
2022-11-01 04:52:17 +01:00
Johannes Fritz 8faa6aa9eb Fix buckets on Android 2022-11-01 03:46:45 +00:00
TheOnlyJoeEnderman e7bcc89e65 Merge branch 'master' into Axolotl 2022-10-30 21:14:49 +00:00
cora dc84b28d54 Fix warning in mcl_dye 2022-10-29 12:26:11 +02:00
TheOnlyJoeEnderman 0624d9d169 Change spaces to tabs on line 127 2022-10-29 04:29:13 +00:00
cora 9aaa13408a Remove get_structure_data_construct
the positions are available from the registered structure
2022-10-28 21:25:43 +02:00
TheOnlyJoeEnderman b1355513dd Merge branch 'master' into Axolotl 2022-10-28 07:18:37 +00:00
cora 11cc8745a2 Remove potentially copyrighted music track and replace by cc music
Soaring over the sea by mactonite (cc-by)
http://ccmixter.org/files/mactonite/65379
2022-10-28 05:00:17 +02:00
cora 9e3163ec42 Drop sweet berry item when bone mealing mature bush 2022-10-27 00:19:38 +02:00
TheOnlyJoeEnderman d324197609 Fix duplicate/unnecessary "fish" in several names 2022-10-26 21:43:41 +00:00
cora ba9d10055e always advance growth stage by 1 on bonemeal 2022-10-26 23:40:06 +02:00
PrairieWind e8b983bcc5 Place sweet berries on wet farmland and bonemeal the sweet berries to progress growth 2022-10-26 15:57:17 +00:00
cora ae91640234 Add missing biomes, correct saturation 2022-10-26 15:57:17 +00:00
cora d6c0561d5a Only do damage from stage 1 and up 2022-10-26 15:57:17 +00:00
cora 2664fb871b sweet berries plantable not only on farming soil 2022-10-26 15:57:17 +00:00
cora 2b08f9ac53 Slow down player movement while inside sweet berry 2022-10-26 15:57:17 +00:00
cora 8d456d8ff9 implement sweet berry damage
0.5 per second while moving inside it
2022-10-26 15:57:17 +00:00
cora b00f2784ff Sweet berry bushes are flammable 2022-10-26 15:57:17 +00:00
cora 280bcddcb2 Move sweet berry decoration to mcl_biomes 2022-10-26 15:57:17 +00:00