1
0
Fork 0
Commit Graph

6989 Commits

Author SHA1 Message Date
kay27 206c98e354 Fix various amethyst errors, better seed function 2022-05-05 22:49:23 +02:00
kay27 69e83d5c0a #11 Spawn buds 2022-05-05 22:49:23 +02:00
kay27 d3dfd13f78 #11 Fix the style, add template.txt, add Russian translation 2022-05-05 22:49:23 +02:00
kay27 e28ccd9a80 #11 Put tabs instead of each 2 spaces 2022-05-05 22:49:23 +02:00
kay27 a5fba06a2c #11 Remove amethyst screenshot 2022-05-05 22:49:23 +02:00
1F616EMO 6c36c83a18 AMethyst Growing 2022-05-05 22:49:23 +02:00
1F616EMO 48a4e069f9 craft bugfix 2022-05-05 22:49:23 +02:00
1F616EMO 60e04438e0 typo missing space 2022-05-05 22:49:23 +02:00
1F616EMO 0b01d299ea 更新 'mods/ITEMS/mcl_amethyst/init.lua' 2022-05-05 22:49:23 +02:00
1F616EMO ebdf944dda amethyst bud 2022-05-05 22:49:23 +02:00
1F616EMO 794e10df4e [mcl_amethyst] INIT
* Amethyst Block
* Budding Amethyst (won't  grow amethyst now)
* New spyglass recipe
* Tinted Glass
* Calcite
2022-05-05 22:49:23 +02:00
cora 6a2fe2eb4f remove ancient backup "init_new.lua" 2022-05-05 04:05:08 +00:00
kabou 1266396e1d Add cobbled deepslate to cobble group.
By adding cobbled deepslate to the group "cobble", it automatically
inherits  all crafting recipes and tool repair capabilities that apply
to that group.

* Add `cobble=1` to cobbled deepslate node definition groups.  This
  requires a little refactoring of the deepslate variants registration
  function.
* Remove stone tools, furnace and brewing stand crafting recipes.
2022-05-05 01:45:03 +02:00
kabou f5abc28190 Allow smelting of deepslate ores.
* Register "cooking" crafting recipe for deepslate ores that enables
  smelting these ores in furnaces.
* Extend deepslate ore registration function to allow passing cooking
  result as argument.
* Update the deepslate ore table to include smelting results.
* Put deepslate w/ lapis drops in a separate table, making the deepslate
  ores table less unwieldly.
2022-05-04 23:35:07 +00:00
AFCMS f8f6ea22c8 Fix codestyle issues with `mcl_deepslate`, `mcl_copper`, `mcl_raw_ores` 2022-05-04 23:35:07 +00:00
cora b0b8ef3921 Comment out ore registrations for now
The discussion about how to handle the new ores is still ongoing.
This PR was originally only intended to add the new nodes so
that's what it does now.
2022-05-04 23:35:07 +00:00
cora be6d2db7d4 remove redundant license files 2022-05-04 23:35:07 +00:00
cora dc40ed18b3 remove raw_ores item override 2022-05-04 23:35:07 +00:00
cora 1b99de73d2 remove screenshots from original mods 2022-05-04 23:35:07 +00:00
NO11 c97e0cd631 Add deepslate 2022-05-04 23:35:07 +00:00
NO11 8c7a8a61d2 Add Copper 2022-05-04 23:35:07 +00:00
NO11 6bdaa9f2d1 Add raw ores 2022-05-04 23:35:06 +00:00
kabou dceb48bf94 Fix undefined variable in mcl_enchanting/engine.lua. 2022-05-04 23:31:54 +00:00
AFCMS 8a47a195f6 Remove preview files 2022-05-04 23:15:11 +00:00
AFCMS d0b60e2399 Fix player armor enchanting overlay (#2161) 2022-05-04 23:15:11 +00:00
AFCMS 3ca40cd4e4 Remove 2D preview 2022-05-04 23:15:11 +00:00
kabou 920b8b9654 Bookshelves are deco blocks, not building blocks. 2022-05-04 23:06:05 +00:00
kabou f1a494ea62 Change stone tool repair materal to group:cobble.
* Update repair material for stone tools (pick, shovel, axe, sword and
  hoe) to use any cobble group stone.
2022-05-05 01:01:29 +02:00
kabou 64bb50dfd5 Change some crafting recipes to use group:cobble.
* Update crafting recipes for stone tools (pick, shovel, axe, sword and
hoe), furnace and brewing stand to use any cobble group stone.
2022-05-04 15:54:12 +02:00
kabou 9edb40b5c5 Add cobblestone to the `cobble` group. 2022-05-04 15:14:23 +02:00
chmodsayshello 3699ca5535 update translation template 2022-05-03 15:21:18 +00:00
chmodsayshello 9c652df8a2 update german translation 2022-05-03 14:59:49 +00:00
chmodsayshello 390802a344 fix crash when achievements are disabled and /awards is being used
This commit fixes  MineClone2/MineClone2#2164, which crashes the game whenever /awards is called with arguments other than enable
2022-05-03 14:58:44 +00:00
cora 61a999fe5a Fix warning in mcl_weather 2022-05-02 21:47:33 +02:00
kabou ed8995acec Fix `add_large_plant()` argument mismatch.
* In commit 86b2cd70f9 an extra argument
  was added to the `add_large_plant()` function in order to handle silk
  touch.  For some reason, the callers for "double_grass" and
  "double_fern" were updated with two new arguments.  Because of this,
  silk touch likely never worked on these nodes.  This commit removes
  the unused `nil` argument from both callers.
* This commit fixes #2155.
2022-05-01 10:31:01 +00:00
chmodsayshello f1c60a48e0 remove debug logging 2022-04-30 10:02:04 +00:00
chmodsayshello c97fc42b68 upload textures 2/2 2022-04-30 09:02:17 +00:00
chmodsayshello 92cd3381ad upload textures 1/2 2022-04-30 09:01:57 +00:00
chmodsayshello f7a5862df2 update mcl_itemframes to use get_compass_image correctly 2022-04-30 08:59:25 +00:00
chmodsayshello ba8e072265 update mcl_compass dependencies 2022-04-30 08:58:04 +00:00
chmodsayshello f9d8b61dc1 update mcl_compass init.lua 2022-04-30 08:57:03 +00:00
Nils Dagsson Moskopp 057051aa6d Add packed ice crafting recipe 2022-04-27 00:33:01 +02:00
Nils Dagsson Moskopp cbf3dc49aa Replace grass path with dirt path
If a player wants to make a path when there is no dirt with grass on the
ground it means they need to either have silk touch to collect dirt with
grass or place dirt beside dirt with grass and wait for the grass cover
to spread before they can create the new paths …

Since the former is not possible early in the game and the latter is not
easy, this patch imitates Minecraft 1.17 behaviour; the following nodes
can now be turned into path nodes by right-clicking them with a shovel:

• Dirt (mcl_core:dirt)
• Coarse Dirt (mcl_core:coarse_dirt)
• Dirt with Grass (mcl_core:dirt_with_grass)
• Mycelium (mcl_core:mycelium)
• Podzol (mcl_core:podzol)

A group “path_creation_possible” has been added to mark nodes that can
be turned into a dirt path with a shovel. One obvious objection to that
addition might be that the “dirt” group already exists. Even though all
existing nodes that can be turned into a dirt path do indeed belong to
the “dirt” group, it is not a good idea: Changing what “dirt” means to
“any node that can be turned into a dirt path” would make it harder to
maintain the code.
2022-04-25 15:33:01 +02:00
cora 6bc676545b Allow saplings to grow on coarse d. and mycelium 2022-04-25 15:30:45 +02:00
cora 5f126c4686 add hypercopyrighted end crystal beam texture
This texture has the following poem written by me, cora, encoded in its
pixeldata. I the author hereby release both the texture file and the
poem as cc0.

Additionally I explicitly consent with its inclusion into MineClone2,
MineClone5 and Mineclonia as well as any other minetest game for this
day and all the days to come.

Shall though betray me with a texture, mate
I'll smile at though just like a summer's day
The raindrop particles - no laggy state
But spring is coming, really, soon it's may

As If the seasons meant a damn to us
They do not exist in mineclone at all
unreal water flow, iron never rusts
but copper does in summer and in fall

But what this literally is about
because this damn thing is really silly
you see somehow they had to say it loud

I would bring that quote with painting lilys
but plagerism everywhere you see
so this will just be good enough for me
2022-04-24 01:46:57 +02:00
Nils Dagsson Moskopp 67ae203772 Trigger node callbacks when pumpkin is sheared
The code for shearing a pumpkin used minetest.swap_node() to replace a
faceless pumpkin with a carved pumpkin. This did not trigger the node
callbacks of the carved pumpkin, which meant that shearing a pumpkin
would not check for the snow golem or iron golem spawn conditions.

This patch replaces minetest.swap_node() in the code for shearing a
pumpkin with minetest.set_node(), which does trigger the callbacks;
therefore snow and iron golems can now spawn as a pumpkin is carved.
2022-04-22 18:07:37 +00:00
Nils Dagsson Moskopp 5ba36c08b6 Drop carved pumpkin when shearing snow golem 2022-04-22 18:07:37 +00:00
Nils Dagsson Moskopp 56db877360 Disconnect gourd stems after destruct
While testing the previous commit, it became clear that gourd stems do
not disconnect properly if the gourd disappears while not being dug. A
simple method to create illegal curved stems was to explode the gourd.

This patch changes gourds so that the stem curves back after a gourd is
destroyed, regardless of reason. This hopefully makes curved stems that
are not connected to matching gourds a relict of the past.
2022-04-22 18:07:37 +00:00
Nils Dagsson Moskopp e1d67a2095 Disconnect stems from carved pumpkins after dig
Carved pumpkins can end up being connected to a stem – either if they
were grown in a previous version of MineClone2 or Mineclonia, or if a
player carves them before harvesting them. This patch makes sure that
stems turn into unconnected stems after such a carved pumpkin is dug.
2022-04-22 18:07:37 +00:00
Nils Dagsson Moskopp a2dd8c935d Make villagers accept uncarved pumpkin in trades
As map generation and growing mechanics have been changed to generate
uncarved pumpkins instead of carved, requiring players to shear every
pumpkin before trading it with villagers seems like useless busywork.
2022-04-22 18:07:37 +00:00
Nils Dagsson Moskopp 4fda54b0d1 Remove pumpkin pie recipe with carved pumpkin
Shearing an uncarved pumpkin turns it into a carved pumpkin and drops
four pumpkin seeds. As map generation and growing mechanics have been
changed to generate uncarved pumpkins instead of carved, preserving a
recipe to get pumpkin pie from carved pumpkins enabled players to get
both seeds and pumpkin pie from grown pumpkins, which was unintended.
2022-04-22 18:07:37 +00:00
Nils Dagsson Moskopp 9a53761b08 Remove pumpkin seeds recipe with carved pumpkin
Shearing an uncarved pumpkin turns it into a carved pumpkin and drops
four pumpkin seeds. As map generation and growing mechanics have been
changed to generate uncarved pumpkins instead of carved, preserving a
recipe to get seeds from carved pumpkins enables players to get twice
the amount of seeds as intended. Because of this, the recipe must go.
2022-04-22 18:07:37 +00:00
Alexander Minges 9b614c115c Grow uncarved pumpkin from seeds instead of carved
Carved pumpkin has to be explicitly registered as a separate node, as
registering a carved pumpkin node happened as a side effect of invoking
mcl_farming:add_gourd() for the carved pumpkin.

The iron / snow golem spawning checks that trigger whenever a carved
pumpkin is placed had to be moved out of the mcl_farming:add_gourd()
invocation to preserve the existing behaviour.

Note that uncarved pumpkin must not be registered as a separate node,
as invoking mcl_farming:add_gourd() for a registered node name leads to
stems not updating when an adjacent node is manually placed or mined.
2022-04-22 18:07:37 +00:00
Alexander Minges faf3f60cff Use uncarved pumpkin instead of carved in mapgen 2022-04-22 18:07:37 +00:00
cora b6ab815adc Fix endermen dropping node AND taking it 2022-04-22 01:02:20 +02:00
cora a83a2e9aba generate podzol under huge spruce trees 2022-04-21 22:25:47 +00:00
AFCMS 8396dfe7e3
enderdragon egg: check for protection on punch 2022-04-21 21:02:43 +02:00
kay27 dc4ccf91cc lift clouds to 384 in valleys mapgen
Valleys has a much higher average elevation than v7 often leading
to "normal" looking terrain being in the clouds. This lifts the
clouds up higher.
2022-04-19 10:23:10 +00:00
cora 3cb9947cf4 fix sugarcane not getting param2 on mapgen 2022-04-19 12:16:07 +02:00
Nils Dagsson Moskopp 34b5002fc8
Shuffle pixels in mcl_end_crystal_beam.png
A user claimed that this texture was a texture from Minecraft 1.8.9 –
see <MineClone2/MineClone2#2099> for
further details. I have not verified that but I noticed that in commit
152e552458 the file was replaced with a
file containing the exact same pixels.

A visual inspection confirms that the file contains noise, so it is not
clear if it is even copyrightable. However, to ensure that it could not
be identical to a file from Minecraft, To get noise of the same quality,
I have shuffled all its pixels with the following POSIX sh shell script:

LANG=C
PREFIX=mcl_end_crystal_beam
convert $PREFIX.png $PREFIX.pnm
<$PREFIX.pnm  >$PREFIX.plainpnm pnmtoplainpnm
<$PREFIX.plainpnm >$PREFIX.seed tr '1234567890 ' ' 1356902468'
(
 <$PREFIX.plainpnm head -n+3
 <$PREFIX.plainpnm tail -n+4 \
  |tr ' ' '\n' \
  |shuf --random-source $PREFIX.seed
) >$PREFIX.shuffled.plainpnm

I then opened mcl_end_crystal_beam.shuffled.plainpnm using GIMP,
converted the color black to tranparency and saved the image as a
paletted PNG (which yields a smaller filesize than a grayscale PNG).
2022-04-16 01:24:04 +02:00
NO411 e790bf90f4 Make shields work with all mobs 2022-04-09 16:21:22 +02:00
cora bb593159f1 mcl_weather: fix typo/crash 2022-04-08 06:23:14 +02:00
cora e7970ecce5 shields: Fix crash when deflecting ghast fireball 2022-04-07 22:40:48 +02:00
kabou 152e552458 Replace mcl_end_crystal_beam.png with free version.
* Replace mcl_end_crystal_beam.png with unknown provenance with a
  version from the PixelPerfection texture pack that has a know good
  free licence.
2022-04-06 23:04:01 +02:00
kabou ace0dc00c7 Remove `settlements_in_world` and `settlements.txt`
The global(!) table settlements_in_world` has no use, but is serialized and
saved to a file `settlements.txt` every time during generation of a new
village, adding more lag.  This commit removes all related code:
* Remove all instances of `settlements_in_world`.
* Remove `settlements.load()` and `settlements.save()`.
2022-04-02 21:52:03 +02:00
kabou f3b28df6cc Rework function comments.
* Move descriptive function comments to above the function definition.
* Adopt some luadoc styles.
* Update a stale reference to a renamed function in comments.
2022-04-02 03:32:56 +02:00
kabou f37f8b6bca Return itemstack in `composter_harvest()`.
* `composter_harvest()` is a `on_rightclick` handler and should return
  what remains of the ItemStack that was passed to it.
2022-04-02 03:32:56 +02:00
kabou 2ba801dfc7 Add protection support to composter.
* Add checks for `minetest.is_protected()` and log any violations.
* Add local aliases for global functions.
2022-04-02 03:32:56 +02:00
kabou 19eb31f389 Streamline use of vector ops.
* Use vector.offset instead of vector.add.
* Define and use local alias for vector.offset.
2022-04-02 03:32:56 +02:00
kabou 541a805a48 Logix fix and some simple optimizations.
* Fix silly and mostly inconsequential logic bug that had gone unnoticed up
  till now.
* Condense a single use variable away by using a slightly more elaborate
  assignment statement.
* Add a few more local aliases for global minetest.* functions.
2022-04-02 03:32:56 +02:00
kabou cd12e1d78c Various little fixes.
* Remove trailing whitespace.
* Remove `use_texture_alpha` setting from node definitions, the default
  value is already the correct one.
2022-04-02 03:32:56 +02:00
kabou 4335d0d659 Use compostability group from node definitions.
* Replace use of local table with compostability values with a call to
 `minetest.get_item_group()`.
* Define local alias for `minetest.get_item_group`.
* Remove the now unused static compostabilty values table.
2022-04-02 03:32:56 +02:00
kabou de16eb3c5a Add `compostability` to node definition group.
* mcl_cake/init.lua (cake);
* mcl_core/craftitems.lua (apple);
* mcl_core/nodes_base.lua (dirt with grass);
* mcl_core/nodes_cactuscane.lua (cactus, sugarcane);
* mcl_core/nodes_climb.lua (vines);
* mcl_core/nodes_trees.lua (leaves, saplings);
* mcl_dye/init.lua (cocoa beans);
* mcl_farming/beetroot.lua (beetroot, & seeds);
* mcl_farming/carrots.lua (carrot);
* mcl_farming/melon.lua (melon, & slice, & seeds);
* mcl_farming/potatoes.lua (potato, baked potato);
* mcl_farming/pumpkin.lua (pumpkin, carved &, & seeds, & pie);
* mcl_farming/wheat.lua (wheat, cookie, bread, hay block);
* mcl_flowers/init.lua (flowers, ferns, grass, & tall variants);
* mcl_mushrooms/small.lua (red and brown mushrooms);
* mcl_mushrooms/huge.lua (red and brown huge mushrooms);
* mcl_nether/init.lua (nether wart block);
* mcl_nether/nether_wart.lua (nether wart);
* mcl_ocean/kelp.lua (kelp, dried &, & block);
* mcl_ocean/sea_pickle.lua (sea pickle);
* mcl_ocean/seagrass.lua (seagrass).
2022-04-02 03:32:56 +02:00
cora 7f1bb7af92 replace nether dust particles with p. spawners
mcl2 uses add_particle for nether dust resulting in a 10-fold
increase in network traffic when in the nether. Nether dust is not
configurable making it impossible to turn this off for server admins.
this commit replaces the add_particle method with particle spawners
2022-03-30 10:21:32 +00:00
cora 53715212a2 remove unnecessary on_dimensionchange 2022-03-30 10:21:32 +00:00
cora c146426c5c fix snow not being properly removed 2022-03-30 10:21:32 +00:00
cora dc24f45cfa add indoor detection for snow 2022-03-30 10:21:32 +00:00
cora d2861c5955 remove unneccessary particle logic 2022-03-30 10:21:32 +00:00
cora 1e4494e85d let rain and thunder use particlespawners 2022-03-30 10:21:32 +00:00
cora 4eae95fa47 let snow use particlespawners 2022-03-30 10:21:32 +00:00
kabou 1b99b73894 Fix wrong player name accessor.
* Duh..
2022-03-30 01:31:38 +02:00
kabou 14da059ce7 Add extra check and warning on missing player data.
* For some unexplained reason, `mcl_burning.storage[player]` can
  sometimes be `nil`, causing a crash in `on_leaveplayer()`.  This
  commit adds a check for that.  If a `nil` is encountered, a sane
  value is substituted and a warning is set to the log.
2022-03-29 12:06:00 +02:00
NO11 5974b6f609 Merge branch 'master' into shields2 2022-03-28 12:27:57 +00:00
NO411 148be4ea39 Fix shield behavior 2022-03-27 19:52:36 +02:00
NO411 6afe7cfb58 Fix typo and interact bug? 2022-03-27 18:08:43 +02:00
AFCMS 909b77ce4d
barrel protection fix + log 2022-03-25 13:28:33 +01:00
NO11 63a156c30c Fix typo/crash 2022-03-23 18:30:34 +00:00
cora 1c9f0c3238 don't spawn mobs on non opaque nodes or leaves
with the preliminary jordanspaning mobs would spawn on trees
and water regularly.
2022-03-22 22:02:15 +01:00
cora 50e99f470e fix certain mobs not spawning in certain biomes 2022-03-22 15:16:48 +01:00
NO411 aeff7cf1a4 Remove offhand item on death 2022-03-22 12:48:41 +01:00
kabou 46ee5aaa59 Fix undefined luaentity crash.
* Add nil check to get_luaentity() access.
* Cache get_luaentity() call in local var.
2022-03-21 01:39:02 +00:00
NO411 019dd45381 Check for damager 2022-03-19 16:50:19 +01:00
NO411 d481f7b720 Fix showing shield hud at the wrong side for half a second 2022-03-19 15:59:59 +01:00
NO411 c94964d10a Remove debug line 2022-03-19 15:26:41 +01:00
kabou a9a3f01a0e Tiny comment fix. 2022-03-19 03:16:15 +01:00
kabou ae6bea73fd Make carpets `supported_node`.
* Change carpet from `group:attached_node` to `group:supported_node`,
  allowing carpets to be placed on top of torches, water source blocks
  and other non-walkable nodes, like in MC.
2022-03-19 02:32:46 +01:00
kabou 8518ce2c19 Add support for `group:supported_node`
* Add support for `group:supported_node` to CORE/mcl_attached.
  Supported nodes are nodes that can be placed on any node that does not
  have the `drawtype = "airlike"` attribute.
* Copy the `drop_attached_node()` function from minetest/builtin, so
  that the override function provides the same behavior when nodes drop.
* Add comments to CORE/mcl_attached and to the functions defined in it.
* Add more local aliases for global minetest.* functions.
* If the original function returns true, it is not necessary anymore
  to perform more tests and the override function can simply return true
  immediately.
2022-03-19 02:32:13 +01:00
NO411 6158e4e50d Don't always update shield texture using set_properties 2022-03-18 23:23:01 +01:00
NO411 7c0a48bebf Remove some code ... 2022-03-18 23:08:50 +01:00
NO411 5bdf83cbfc Revert weird changes 2022-03-18 23:07:25 +01:00