Commit Graph

2775 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 029ebaa388 Rename "tool_multiplier" to "speed" for tools 2021-04-16 22:45:22 +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 9bb39dfba6 Rename _mcl_autogroup_groupcaps to _mcl_diggroups 2021-04-16 22:34:26 +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 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 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 bb5094f657 Rename register_digtime_group to register_diggroup 2021-04-16 22:32:49 +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 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
Code-Sploit 578709c93e Add Depth Strider enchantment 2021-02-27 15:35:59 +00:00
pitchum d0e789daf2 More fixes in French translations 2021-02-27 13:43:57 +01:00
pitchum 390f877230 Fix French translations 2021-02-27 10:35:46 +01:00
kay27 3a2300382b Translate mcl_enchanting to Russian 2021-02-27 01:48:22 +04:00
Lizzy Fleckenstein 524b3343bd Fix #1200 2021-02-26 09:19:11 +01:00
kay27 0e37188ad1 Fix MineClone2/MineClone2#1108 2021-02-26 02:48:22 +04:00
epCode 8f2a588059 Fix #1156 2021-02-25 12:27:14 -08:00
Lizzy Fleckenstein 360436cf19 Fix #1183 2021-02-25 10:24:26 +01:00
epCode d1fd3cc827 Add 3D wieldveiw for non-item objects 2021-02-24 13:20:31 -08: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 6780031454 Fix #1181 2021-02-24 08:33:35 +01: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
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 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 d29c045ad8 Fix sneak_mine glitch 2021-02-19 09:19:18 -08:00
AFCMS fa0ea94433 replace pairs() by ipairs() in mcl_bow 2021-02-18 15:35:52 +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 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 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 0d8744d9a0 Fix player head node textures 2021-02-16 18:11:53 -08:00
Rocher Laurent 529f799cc2 Translate French - Small fixes 2021-02-16 22:30:26 +01:00
Lizzy Fleckenstein b0c1aea881 Merge branch 'master' of https://git.minetest.land/Wuzzy/MineClone2 2021-02-15 16:44:18 +01:00
Lizzy Fleckenstein e5caef3440 Fix Double chest model 2021-02-15 16:41:33 +01:00
kay27 3e584cdfb7 Merge pull request 'Update translate-fr' (#1104) from lrocher/MineClone2:translate-fr into master
Reviewed-on: MineClone2/MineClone2#1104
2021-02-13 00:31:49 +00:00
Laurent Rocher 303d286603 Update French translation 2021-02-13 00:09:59 +01:00
kay27 cbc5299bff Merge pull request 'Correct hoe repair material' (#1097) from midgard/MineClone2:hoe_repair into master
Reviewed-on: MineClone2/MineClone2#1097
2021-02-12 21:34:53 +00:00
TechDudie 10d3c62690 Upload files to 'mods/ITEMS/mcl_core/textures' 2021-02-12 17:54:49 +00:00
TechDudie a1e8685faf Delete 'mods/ITEMS/mcl_core/textures/mcl_core_emerald.png' 2021-02-12 17:53:21 +00:00
TechDudie b2d53e9e39 Upload files to 'mods/ITEMS/mcl_core/textures' 2021-02-12 17:52:30 +00:00
TechDudie 1022449ace Delete 'mods/ITEMS/mcl_core/textures/default_diamond.png' 2021-02-12 17:51:23 +00:00
epCode 0bde0aabf6 Merge branch 'master' of https://git.minetest.land/MineClone2/MineClone2 2021-02-12 09:25:23 -08:00
epCode a9fe8d58e5 Add bow aiming animations 2021-02-12 09:16:08 -08:00
Midgard f27fbd866e
Correct hoe repair material 2021-02-12 17:13:58 +01:00
Lizzy Fleckenstein b2e2120b9e Fix shulkerbox model 2021-02-12 10:12:57 +01:00
MysticTempest 846b1d273d Fix the enchanting table book entity spawning multiple times as reported in issue #1008. 2021-02-11 19:25:54 -06:00
Lizzy Fleckenstein 735bfc88c4 Fix chests entities spawning multible times 2021-02-10 09:20:46 +01:00
epCode cf95239fe5 Replace mcl_armor_character.b3d
Fix the player bone positioning while not swiming
2021-02-09 21:23:35 +00:00
epCode 7e2e96672b Remove mcl_armor_character.b3d 2021-02-09 21:22:28 +00:00
epCode b749de4ced replace mcl_armor_character.blend 2021-02-09 21:21:51 +00:00
epCode 0fe02b5a69 Replace mcl_armor_character.blend 2021-02-09 21:20:43 +00:00
epCode c5169e48a1 Merge branch 'master' of https://git.minetest.land/epCode/MineClone2 2021-02-06 17:50:27 -08:00
epCode adbfd6b55d Merge branch 'master' of https://git.minetest.land/epCode/MineClone2 2021-02-06 17:40:24 -08:00
epCode df8bdfbc36 Animations for swiming 2021-02-06 17:40:07 -08:00
kay27 84289a3a11 Tiny code cleanup and potentially bugfix after latest mergings 2021-02-07 02:56:00 +04:00
epCode b5353c060f Merge branch 'master' into master 2021-02-06 19:35:13 +00:00
Lizzy Fleckenstein 88ed1aaa87 Merge branch 'master' of https://git.minetest.land/Wuzzy/MineClone2 2021-02-06 20:04:09 +01:00
Lizzy Fleckenstein 18dd3ac9bd Add 'ice' group 2021-02-03 17:08:04 +01:00
epCode e0ad09900c Merge pull request 'master' (#5) from MineClone2/MineClone2:master into master
Reviewed-on: epCode/MineClone2#5
2021-02-02 22:19:58 +00:00
HimbeerserverDE ee6d8451d2 Flame arrows ignite TNT 2021-02-01 08:15:28 +01:00
Lizzy Fleckenstein b5d92f3078 Fix warning in mcl_beds 2021-01-31 14:04:11 +01:00
HimbeerserverDE a654db7684 Merge branch 'master' of https://git.minetest.land/Wuzzy/MineClone2 2021-01-30 19:35:32 +01:00
kay27 b0f151147c Fix the trees, Wuzzy/MineClone2#1031 2021-01-30 05:23:34 +04:00
kay27 948265fd6b Fix Wuzzy/MineClone2#1028 - Make tree saplings grow in inactive areas (approx. time calc.) 2021-01-30 04:42:53 +04:00
Lizzy Fleckenstein 65219d34a2 Animated shulkerboxes 2021-01-28 20:53:57 +01:00
HimbeerserverDE 8ae233ba36 Merge branch 'master' of https://git.minetest.land/Wuzzy/MineClone2 2021-01-28 20:16:32 +01:00
HimbeerserverDE 000dd3cbc9 Only burning arrows set objects on fire 2021-01-28 20:16:26 +01:00
Lizzy Fleckenstein e66d66caf9 Fix #399 2021-01-28 19:02:44 +01:00
Lizzy Fleckenstein 89ce072621 Sneak to dismount when in boat 2021-01-28 17:44:55 +01:00
HimbeerserverDE a3ccb54376 Merge branch 'master' of https://git.minetest.land/Wuzzy/MineClone2 2021-01-27 20:13:16 +01:00
HimbeerserverDE 00df587bf7 Add flame enchantment 2021-01-27 20:11:02 +01:00
Lizzy Fleckenstein dbd6ebd4b5 Fix #1014 2021-01-27 19:21:28 +01:00
Lizzy Fleckenstein 85f3fb7ea1 Fix #1005 2021-01-27 16:42:49 +01:00
Lizzy Fleckenstein 248272a128 Fix #1018 2021-01-27 16:01:04 +01:00
Lizzy Fleckenstein 5ede42bbe7 Fix #1020 2021-01-27 15:46:10 +01:00
Lizzy Fleckenstein db3a31c2c4 Simplify chest animations 2021-01-27 15:45:23 +01:00
MysticTempest 9feee980f8 Add help text for enchanting table. 2021-01-27 01:41:23 -06:00
Lizzy Fleckenstein e9f9d96eb1 Fix #1012 2021-01-26 17:42:45 +01:00
MysticTempest cbd3a491f6 Add support for mcimported worlds by clearing out singlenode mapgen, and adding a toggleable fix for converted double_plants. 2021-01-25 20:23:38 -06:00
Lizzy Fleckenstein 9ce8c95f8c Fix bed not dropping when top part is dug 2021-01-24 18:54:17 +01:00
Lizzy Fleckenstein 745b7063a5 Move bed messages to HUD; Fix #1000 2021-01-24 18:40:29 +01:00