Commit Graph

5469 Commits

Author SHA1 Message Date
Elias Åström 1c6d3c2fea Do not include unnecessary tool_capabilities
This commit makes enchanted tools which have no use for
tool_capabilities to not include it in their metadata.  It does this by
not including tool_capabilities in the metadata of an enchanted tool if
at least one of two cases is true:

(1) The tool is not enchanted with unbreaking or efficiency
(2) The tool does not have tool_capabilities defined in its definition

The first case covers situations like having a pickaxe only being
enchanted with silk_touch.  The second case covers situations like a
piece of armor being enchanted with unbreaking.
2021-04-18 12:45:11 +02:00
Elias Åström d6e1fe42d1 Fix efficiency and unbreaking not working together
This commit fixes an issue were tools enchanted with both efficiency and
unbreaking would loose the effect of one of the enchantments in some
conditions.
2021-04-18 12:45:06 +02:00
Elias Åström 42c7186674 Do not register "creative_breakable" as a diggroup 2021-04-16 22:46:08 +02:00
Elias Åström b57c94df88 Fix crash when digging nodes with fishing rod
Previously the game would crash when digging nodes with a tool which
does not have tool_capabilities in their item definition.
2021-04-16 22:45:36 +02:00
Elias Åström 34af6a2cc3 Assert that both parts of mcl_autogroup exist 2021-04-16 22:45:22 +02:00
Elias Åström 029ebaa388 Rename "tool_multiplier" to "speed" for tools 2021-04-16 22:45:22 +02:00
Elias Åström 2df6ee32be Remove unnecessary code in mcl_item_entity 2021-04-16 22:45:22 +02:00
Elias Åström 9d38f0d01b Fix crash when digging nodes with hoe
Previously the game would crash when digging nodes with a tool which
does not have _mcl_digroups in their item definition.
2021-04-16 22:44:44 +02:00
Elias Åström eb1af8902d Remove _mcl_autogroup depends on mcl_autogroup
It looks like the dependency might cause problems with the mod loading
order and lead to situations were _mcl_autogroup is not loaded after all
the other mods.  Because _mcl_autogroup begins with an underscore it
should always be loaded after mcl_autogroup anyways.
2021-04-16 22:35:46 +02:00
Elias Åström d4a3213343 Update README.txt in _mcl_autogroup 2021-04-16 22:35:24 +02:00
Elias Åström 0681fc98d2 Use mod.conf for mcl_autogroup and _mcl_autogroup 2021-04-16 22:35:12 +02:00
Elias Åström 9c961394ec Automatically assign nodes to creative_breakable
If they belong to any digging group.
2021-04-16 22:34:53 +02:00
Elias Åström 64e8b82ff7 Update the groupcaps of all enchanted tools
Not just those enchanted with efficiency.
2021-04-16 22:34:48 +02:00
Elias Åström 54563262f6 Make tools without toolcaps do damage as hand
If the tool_capabilities defaults to {} if unspecified the tool, then
users will not be able to attack with the tool at all.  This solves that
by including the damage_group and full_punch_interval from the hand into
the tool_capabilities when it is nil.
2021-04-16 22:34:44 +02:00
Elias Åström 6fb56b074f Fix crash when tool_capabilities is nil 2021-04-16 22:34:34 +02:00
Elias Åström 7583223f68 Localize variables in _mcl_autogroup 2021-04-16 22:34:30 +02:00
Elias Åström 9bb39dfba6 Rename _mcl_autogroup_groupcaps to _mcl_diggroups 2021-04-16 22:34:26 +02:00
Elias Åström dcd050a274 Fix typo 2021-04-16 22:34:22 +02:00
Elias Åström ccd53e7f10 Force tools to include levels in their diggroups 2021-04-16 22:34:18 +02:00
Elias Åström 85ff4cee75 Improve documentation of mcl_autogroup 2021-04-16 22:34:14 +02:00
Elias Åström 3308ce812d Move mcl_util.hash to a local function
It is probably unlikely it will be useful at other places in Mineclone2.
2021-04-16 22:34:10 +02:00
Elias Åström e32f17b82a Move efficiency code to its own file 2021-04-16 22:34:04 +02:00
Elias Åström 576dde1dd5 Truncate groupcaps_hash to 8 Base64 digits 2021-04-16 22:33:59 +02:00
Elias Åström b50addac55 Make changes to the mcl_autogroup API
Group levels are now specified as a list of names when registering a
digging group.  Digging groups which do not have specified levels will
support tools having two levels, 0 and 1 where 0 means the tool can dig
but not harvest the node and 1 means it can also harvest the node.  If
more levels are required one has to specifiy them when registering the
digging group.
2021-04-16 22:33:55 +02:00
Elias Åström fe883a40bc Use hashing for more efficient groupcaps updating
This adds the metadata field "groupcaps_hash" to tools enchanted with
efficiency.  This value contains a hash of the groupcaps field in
tool_capabilities.  This value gets compared to the expected hash value
to determine if the tools tool_capabilities should be updated according
to commit af31f8189e8e5c2b.

This commit makes efficiency more efficient.
2021-04-16 22:33:13 +02:00
Elias Åström 4a9561e5dc Update enchanted tools with outdated digging times
Because of the way digging times is implemented in Mineclone2, it is
possible for the digging times of efficiency enchanted tools to become
outdated.

This fixes that by automatically updating the tools tool_capabilities
after each time the tool is used.
2021-04-16 22:33:10 +02:00
Elias Åström c92f0e5ce3 Fix tools not taking wear when rightclicking
Added the API function mcl_autogroup.get_wear which is used to get the
tool wear for digging a node of a group.  This is used by mcl_tools to
compute the wear of shovels and shears when rightclicking to create
grass paths and carve pumpkins.
2021-04-16 22:33:07 +02:00
Elias Åström ba0a09243b Make mcl_enchanting use the new mcl_autogroups
The function mcl_autogroups.get_groupcaps is used by mods to get the
groupcaps for tools with efficiency enchantments.  This function is used
by mcl_enchanting when enchanting tools with efficiency.
2021-04-16 22:33:00 +02:00
Elias Åström 64e353a9c2 Fix some nodes not being diggable
Previously some nodes like "mcl_flowers:double_grass_top" would be
undiggable.  This was because they did not define _mcl_hardness and it
was not defaulted to 0 in all parts of _mcl_autogroup.
2021-04-16 22:32:56 +02:00
Elias Åström ecccc2058a Fix tool uses not being set in _mcl_autogroups 2021-04-16 22:32:53 +02:00
Elias Åström bb5094f657 Rename register_digtime_group to register_diggroup 2021-04-16 22:32:49 +02:00
Elias Åström a342652960 Change comments for mcl_autogroup 2021-04-16 22:32:46 +02:00
Elias Åström ffbbe91bc5 Remove mcl_autogroups.get_groupcaps
Requiring tool definitions to call a function in _mcl_autogroup means
that they need to be loaded after _mcl_autogroup.  This can cause
problems because _mcl_autogroup needs to be loaded after all tool and
node definitions are completed.

Because of this the API is changed so tool definitions instead put the
data used to generate groupcaps in the custom field
_mcl_autogroup_groupcaps.  _mcl_autogroup will then go through all
registered tools and update the groupcaps for every tool where this
field is present.  This means that no mod ever has to depend on
_mcl_autogroup.
2021-04-16 22:31:57 +02:00
Elias Åström 012e150b59 Rewrite mcl_autogroup
These changes are primarly made to make mcl_autogroup more efficient.
Previously enchanted tools required storing around 21 kB of metadata due
to the way the previous version of the mod was implemented.  This caused
a lot of lag and a huge amount of network traffic.  With the changes
enchanted tools won't require more than 1 kB of metadata.

The mod is also rewritten to use an API to register digging groups and
compute the groupcaps for tools.  This will make it easier for modders
to register custom digging groups.

The mod is now split up into two parts.  One part called "mcl_autogroup"
to implement the API for registering custom digging groups, and the
other part called "_mcl_autogroup" which contains most of the code which
has to be loaded after most mods.
2021-04-16 22:31:42 +02:00
Elias Åström ac20baac12 Revert "Slightly tweak minecarts to be more MC-like"
This reverts commit 8af76f835d.
2021-04-16 16:29:06 +02:00
Elias Åström 97bd3777e1 Merge branch 'master' of https://git.minetest.land/Wuzzy/MineClone2 2021-03-01 16:10:55 +01:00
Elias Åström 1b9857219d Lower drop rate of TNT to 25 %
So it becomes consistent with Minecraft 1.12.
2021-03-01 16:08:52 +01:00
Lizzy Fleckenstein f5b590901e Merge branch 'master' of https://git.minetest.land/Wuzzy/MineClone2 2021-03-01 10:52:07 +01:00
Lizzy Fleckenstein 95b0a495bc Fix #1152 2021-03-01 10:51:57 +01:00
kay27 8af76f835d Slightly tweak minecarts to be more MC-like 2021-03-01 01:43:00 +04:00
Elias Åström 53041a0d62 Add setting to bypass protection in mcl_explosions 2021-02-28 16:06:48 +01:00
Code-Sploit 83ade6fadd Merge branch 'master' into master 2021-02-28 14:04:10 +00:00
Code-Sploit 6ab0e0fa86 Do some calculating 2021-02-28 14:02:48 +00:00
kay27 05a3b4e60c Wrap https://github.com/minetest/minetest/issues/10995 around, thanks @SmallJoker 2021-02-28 16:35:21 +04:00
epCode 9f66238aaa Transform mcl_meshhand_female.b3d to correct rotation 2021-02-27 11:36:18 -08:00
kay27 6f2f427777 fix a typo 2021-02-27 23:31:01 +04:00
kay27 abc0bb9e8e Fix dir_to_rotation() 2021-02-27 23:20:57 +04:00
kay27 21e6c5ad1f Fix MineClone2/MineClone2#1216 2021-02-27 22:44:34 +04:00
kay27 bf81bb7f07 Translatable archievement chat messages 2021-02-27 22:16:29 +04:00
Code-Sploit 99b5dff849 Fix another bug 2021-02-27 16:13:05 +00:00
Code-Sploit de9d838642 Fix a bug and improve some things
Bugs:
1) When player is in liquid and takes off his/her boots, he/her still has increased speed.

Improve:
1) Check for liquid group instead of node names
2021-02-27 16:10:11 +00:00
Code-Sploit 828c1110b1 Implement Depth Strider enchantment 2021-02-27 15:37:25 +00:00
Code-Sploit 578709c93e Add Depth Strider enchantment 2021-02-27 15:35:59 +00:00
Lizzy Fleckenstein e5263d854e Localize player_vel_yaw 2021-02-27 15:10:25 +01:00
Lizzy Fleckenstein a923b61ac8 Merge branch 'master' of https://git.minetest.land/MineClone2/MineClone2 2021-02-27 15:07:18 +01:00
Lizzy Fleckenstein 5a0b7bc131 Fix usages of player:get_velocity(), closes #1203 2021-02-27 15:07:10 +01:00
Lizzy Fleckenstein 68ac84da83 Proper archievement chat messages 2021-02-27 14:51:50 +01:00
Elias Fleckenstein 311e1b74a3 Merge pull request 'Fix French translations' (#1211) from pitchum/MineClone2:master into master
Reviewed-on: MineClone2/MineClone2#1211
2021-02-27 13:44:32 +00:00
Lizzy Fleckenstein ba1e42a638 Remove debug chat_send_all xD 2021-02-27 14:42:39 +01:00
Lizzy Fleckenstein 8d5b2ff714 Make boats less annoying on ice 2021-02-27 14:38:53 +01:00
pitchum d0e789daf2 More fixes in French translations 2021-02-27 13:43:57 +01:00
pitchum b0f389eb9f Fix French translations for 'Achievement gotten' 2021-02-27 12:15:33 +01:00
pitchum 390f877230 Fix French translations 2021-02-27 10:35:46 +01:00
kay27 2ce5c5415a Fix village initialization: MineClone2/MineClone2#1206 MineClone2/MineClone2#1207 MineClone2/MineClone2#1209 2021-02-27 03:33:51 +04:00
epCode 2b513aa592 Change mcl_meshand depending on skin metadata 2021-02-26 15:01:30 -08:00
kay27 3a2300382b Translate mcl_enchanting to Russian 2021-02-27 01:48:22 +04:00
Elias Fleckenstein d859d94a63 Merge pull request 'Fix #1204' (#1208) from AFCMS/MineClone2:afcms-patch-1 into master
Reviewed-on: MineClone2/MineClone2#1208
2021-02-26 16:26:46 +00:00
AFCMS 41e715ef39 Fix #1204 2021-02-26 15:57:44 +00:00
Lizzy Fleckenstein 37ef792c9d Fix #1192 2021-02-26 09:38:02 +01:00
Lizzy Fleckenstein 524b3343bd Fix #1200 2021-02-26 09:19:11 +01:00
MysticTempest 2ace4ccc68 Fix endermen teleporting in the rain in the end per issue #1169. 2021-02-25 21:48:37 -06:00
epCode 73616453a4 Fix #1188 2021-02-25 19:01:22 -08:00
kay27 c1880d26c8 Fix awards logging 2021-02-26 02:58:53 +04:00
kay27 23a023d87d Fix MineClone2/MineClone2#183 2021-02-26 02:56:46 +04:00
kay27 0e37188ad1 Fix MineClone2/MineClone2#1108 2021-02-26 02:48:22 +04:00
epCode 3406342ed0 remove unessesary Message every time skin is changed 2021-02-25 13:38:02 -08:00
epCode 8f2a588059 Fix #1156 2021-02-25 12:27:14 -08:00
kay27 44d3f25767 Leave minecart by Pressing Sneak, MineClone2/MineClone2#567 2021-02-26 00:26:27 +04:00
epCode fb5f86d829 Fix #1196 2021-02-25 12:07:25 -08:00
epCode 8c1444a1a8 Fix Swim toggling 2021-02-25 12:06:24 -08:00
Lizzy Fleckenstein d4401a6c3e Simplify 3D wielded nodes (improves performance + possibly fixes a crash) 2021-02-25 17:35:44 +01:00
kay27 a5168721b1 Fix MineClone2/MineClone2#1186 2021-02-25 17:36:42 +04:00
Lizzy Fleckenstein 1274884a9e Merge branch 'master' of https://git.minetest.land/Wuzzy/MineClone2 2021-02-25 13:59:38 +01:00
Lizzy Fleckenstein f04a5a4cc9 Prevent Ender dragon and Wither from despawning 2021-02-25 12:48:17 +01:00
kay27 e23ad6cabf Merge pull request 'Add setting to disable ores generation' (#1174) from AFCMS/MineClone2:master into master
Reviewed-on: MineClone2/MineClone2#1174
2021-02-25 10:04:13 +00:00
Lizzy Fleckenstein 360436cf19 Fix #1183 2021-02-25 10:24:26 +01:00
Lizzy Fleckenstein 51ace85d4e Enable 3D player preview by default now that MT 5.4 is released 2021-02-25 09:52:08 +01:00
epCode fbb79635eb Fix player body rotation glitch 2021-02-24 17:11:00 -08:00
kay27 3ceb2b0a4d Fix MineClone2/MineClone2#1160 2021-02-25 03:30:34 +04:00
epCode c1c3dbfaec Fix #1184 2021-02-24 15:21:05 -08:00
epCode d1fd3cc827 Add 3D wieldveiw for non-item objects 2021-02-24 13:20:31 -08:00
kay27 54cd5007ed Try to wrap https://github.com/minetest/minetest/issues/10995 by cancelling redefinition of minetest.place_schematic 2021-02-25 01:03:41 +04:00
Lizzy Fleckenstein da606fa9d2 Add 3d wielded nodes (not functional until Right_Hand bone is added) 2021-02-24 12:58:30 +01:00
Lizzy Fleckenstein 62171b9cf9 Implement #1099 2021-02-24 10:55:13 +01:00
Lizzy Fleckenstein 0c3ab5843d Make boats go super fast on ice and slightly faster on land 2021-02-24 10:38:49 +01:00
Lizzy Fleckenstein 0d2950228a Implement #1057 2021-02-24 09:31:27 +01:00
Lizzy Fleckenstein 6780031454 Fix #1181 2021-02-24 08:33:35 +01:00
epCode 4334339ba3 Fix player head bone in while attached 2021-02-23 14:18:52 -08:00
epCode 5a6810aa6a Add female player model (though unutilized) 2021-02-23 09:47:02 -08:00
Lizzy Fleckenstein 2d4b8a8232 Replace usages of get_node_group by get_item_group 2021-02-23 10:25:17 +01:00
epCode 9caf6f2904 Add more MC-like player body bone positioning 2021-02-22 18:48:09 -08:00
AFCMS f0348d99d9 Use setting to generate Quartz ore 2021-02-22 19:12:33 +00:00
kay27 47db5c5917 Make mcl_loot/get_random_slots() deterministic 2021-02-22 21:58:35 +04:00
Elias Fleckenstein eb62db441b Merge pull request 'Rewrite all deathmessages so they are more minecraft like.' (#1147) from Code-Sploit/MineClone2_deathmessages_rewrite:master into master
Reviewed-on: MineClone2/MineClone2#1147
2021-02-22 13:06:53 +00:00
Code-Sploit 89a048e335 Fix another typo 2021-02-22 13:03:32 +00:00
AFCMS 0e6177ee1f Add setting to dissable ores generation #874 2021-02-22 12:33:28 +00:00
Lizzy Fleckenstein 2d0612fa81 Make boats regenerate health and shake when damaged 2021-02-22 12:43:29 +01:00
Lizzy Fleckenstein 86dc33c12f Fix #1150 2021-02-22 11:08:57 +01:00
Lizzy Fleckenstein 5de9d90569 Simplify mcl_burning API 2021-02-22 10:55:14 +01:00
Lizzy Fleckenstein 3d0f5a4de5 Fix #1161 2021-02-22 10:43:59 +01:00
Lizzy Fleckenstein a86d3fa22c Merge branch 'master' of https://git.minetest.land/Wuzzy/MineClone2 2021-02-22 10:41:47 +01:00
Lizzy Fleckenstein 152d49ef20 Fix #1167 2021-02-22 10:41:44 +01:00
kay27 0ba7e4fc4d Fix Runtime error: attempt to index a nil value (api.lua:399 <- is_node_dangerous <- is_at_cliff_or_danger <- on_step_old <- void_damage:16) 2021-02-22 13:40:40 +04:00
epCode 512765a37d Make use_texture_alpha an mobs_mc.entity setting 2021-02-21 17:10:04 -08:00
kay27 89e55e9065 Add sub-map generators queue, fix MineClone2/MineClone2#993 and MineClone2/MineClone2#1060 2021-02-22 03:15:32 +04:00
epCode d8b5620115 Make head block detection more stable 2021-02-21 04:11:20 +00:00
epCode 38cb2fdeec Fix swimming crash (sorry) 2021-02-20 19:19:59 -08:00
epCode 98f6e05cdc Make swimming a bit smoother 2021-02-20 16:21:09 -08:00
Code-Sploit 8135110fd4 Fix typo on line 97 2021-02-20 17:41:09 +00:00
Lizzy Fleckenstein 30b1d58e67 Revert "Merge pull request 'Change Diamond and Emerald textures to more Minecraft-looking ones' (#1100) from TechDudie/MineClone2:master into master"
This reverts commit 2f206a0640, reversing
changes made to 0bde0aabf6.
2021-02-20 10:46:52 +01:00
epCode ecb70aaf55 Make player head anim while attached more flexible 2021-02-19 14:07:36 -08:00
epCode af89b95316 Remove unessesary code in slime+magma_cube.lua 2021-02-19 13:25:53 -08:00
epCode 393bc195fb Enable alpha for mobs 2021-02-19 13:11:18 -08:00
epCode d29c045ad8 Fix sneak_mine glitch 2021-02-19 09:19:18 -08:00
Code-Sploit f5d2a32e6b Change some deathmessages 2021-02-19 13:52:24 +00:00
Code-Sploit 84bfa87fdf Fix some other typo's 2021-02-19 12:12:46 +00:00
Code-Sploit c4633db21d Fix some typo's 2021-02-19 06:43:50 +00:00
Code-Sploit ae7c4d7a8b Rewrite all deathmessages 2021-02-18 17:59:44 +00:00
AFCMS fa0ea94433 replace pairs() by ipairs() in mcl_bow 2021-02-18 15:35:52 +00:00
AFCMS 4c3954959c replace pairs() by ipairs() in mcl_player 2021-02-18 15:32:15 +00:00
AFCMS 25653e6178 replace pairs() by ipairs() in mcl_playerinfo 2021-02-18 15:31:13 +00:00
AFCMS 0531aae687 replace pairs() by ipairs() in mcl_playerplus 2021-02-18 15:27:50 +00:00
AFCMS 35d55376a9 replace pairs() by ipairs() (3) 2021-02-18 15:26:09 +00:00
AFCMS 63d1661e08 replace pairs() by ipairs() (2) 2021-02-18 15:25:30 +00:00
AFCMS 9819b713c9 replace pairs() by ipairs() 2021-02-18 15:24:03 +00:00
AFCMS 2e2d0b49ea performance fix in mcl_skins 2021-02-18 15:07:37 +00:00
Lizzy Fleckenstein c9e589b931 Add mcl_burning damage interval 2021-02-18 14:47:35 +01:00
Lizzy Fleckenstein aeb7078c05 Update use_texture_alpha to the minetest 5.4 conventions 2021-02-18 14:00:17 +01:00
Lizzy Fleckenstein 100e37183d Update noise_params to the minetest 5.4 convention 2021-02-18 11:54:51 +01:00
Lizzy Fleckenstein 82e113f0fc Update usages of alpha to the 5.4 convention 2021-02-18 10:58:50 +01:00
Lizzy Fleckenstein bec5339fc6 Update existing occurences of use_texture_alpha to the Minetest 5.4 convention if the feature is detected 2021-02-18 10:39:19 +01:00
Lizzy Fleckenstein eddef41e6b Fix #1132 2021-02-18 09:41:06 +01:00
Lizzy Fleckenstein 9b349a1684 More flexible wield rotation determination 2021-02-18 09:28:12 +01:00
Lizzy Fleckenstein 69959fe816 Fix #1142 2021-02-18 08:58:28 +01:00
epCode 18a8d011a2 Sprinting anim, MC-like Player anims, Swimming detection 2021-02-17 15:17:12 -08:00
epCode a49e144911 Localize a couple variables 2021-02-17 02:51:33 +00:00
epCode 0d8744d9a0 Fix player head node textures 2021-02-16 18:11:53 -08:00
epCode c238fd9ba7 Set swiming detection to "node_feet" 2021-02-16 14:18:06 -08:00
kay27 0e026c187e Merge pull request 'Translate French - Small fixes' (#1133) from lrocher/MineClone2:translate-fr into master
Reviewed-on: MineClone2/MineClone2#1133
2021-02-16 22:11:37 +00:00
Rocher Laurent 529f799cc2 Translate French - Small fixes 2021-02-16 22:30:26 +01:00