Commit graph

1542 commits

Author SHA1 Message Date
Johannes Fritz
d7e950ab7b Pillagers: spawn with loaded crossbow 2022-08-16 01:53:42 +02:00
Johannes Fritz
dd96dd097c Basic Pillagers 2022-08-16 01:53:42 +02:00
cora
f27b2d9714 Fix 'spawn_in_group_min' warning 2022-08-15 11:58:39 +02:00
cora
ecd1d13b43 Endermen TP out of sunlight
If not attacking a player endermen randomly tp around until they
find a spot that is not in direct sunlight
2022-08-13 23:23:01 +02:00
cora
3620db7c14 Add objectref to villager sound_play for pos sound 2022-08-13 00:47:46 +02:00
cora
68d5a81b1c Villager sounds -> mono 2022-08-13 00:47:46 +02:00
Sumyjkl
16c9a83a96 fix items floating into the air under rare circumstances 2022-08-12 21:46:17 +10:00
cora
374e30b4a5 stay on players shoulder in when flying in creative 2022-08-11 14:32:58 +02:00
cora
6101de8d68 Fix parrot punch spam 2022-08-11 14:32:58 +02:00
opfromthestart
5da6f6812f faster boat death 2022-08-09 12:23:44 -04:00
opfromthestart
8b06e5de87 Merge branch 'master' into boat-fire-fix 2022-08-09 00:16:14 +00:00
opfromthestart
76839961c6 Adds fire and lava collision to boats 2022-08-08 20:12:44 -04:00
iliekprogrammar
bf80074d98
[5.6][mobs] fix unsafe entity handling (unsure)
i'm not sure about this one, can't find a suitable test for it.
2022-08-07 12:38:26 +08:00
iliekprogrammar
4b31692319
[5.6][boats] fix unsafe entity handling
this probably does not affect normal gameplay, unless you can set boats on fire somehow
2022-08-07 12:09:12 +08:00
iliekprogrammar
221ee0fcf1
[5.6] mark places with unsafe set_hp entity handling
There might be other places i might be missing, but these are the obvious ones.

leftover entity handling i did not mark:
* everything that involves a apply()-like algorithm (e.g. callbacks) over the
  same list of objects.
* in mcl_damage, it's not known whether mcl_damage.from_mt() would involve
  entity handling or just player handling.
2022-08-07 00:13:03 +08:00
SumianVoice
3f73dc1794 Merge branch 'master' into mcl_burning_depend 2022-08-03 12:55:07 +00:00
Sumyjkl
eb89466436 add dependency for mcl_weather to mcl_burning to hopefully avoid crashes 2022-08-03 22:45:15 +10:00
cora
51f79eaa39 Add lilypads and dead bushes 2022-08-02 12:02:20 +02:00
cora
eb7171fd51 Make boats unsinkable in river water 2022-08-01 05:20:19 +02:00
PrairieAstronomer
a153e5bc33 Fixed Place Water in the Nether with Fish Buckets. 2022-07-30 12:21:16 -06:00
Sumyjkl
86d6445f42 fix crash when items in unloaded chunk 2022-07-28 11:10:56 +10:00
SumianVoice
c93461ee0a Merge branch 'master' into item_floating 2022-07-26 10:21:17 +00:00
Sumyjkl
70b7655e46 various code style improvements 2022-07-26 20:20:13 +10:00
PrairieAstronomer
f84063ad0a Withering Heights Advancement 2022-07-25 11:48:38 -06:00
cora
0b729d7ada Fix wrong drops itemstring 2022-07-24 23:52:42 +02:00
PrairieAstronomer
3aa26cac14 Tropical Fish Bucket
Adds the bucket of tropical fish.
2022-07-24 23:52:42 +02:00
cora
3a47e8a2f9 Add tropical fish 2022-07-24 23:52:41 +02:00
Sumyjkl
5fc662664f cactus will act as if dug instead of its own hardcoded breaking function 2022-07-24 15:59:00 +10:00
Sumyjkl
6278fa21d3 Removed an entire block of code that was duplicate and didn't do anything 2022-07-23 16:41:41 +10:00
Sumyjkl
fb28177ff1 items will stay put when loaded, items dug by the game will get more initial random velocity, game will no longer apply random velocity twice (?) 2022-07-23 16:10:52 +10:00
Sumyjkl
58d80e5e9c netherite items (except armour) will float in lava and not burn 2022-07-22 23:06:35 +10:00
Sumyjkl
eeace260fe don't disable physics if you've already disabled it 2022-07-22 22:45:22 +10:00
Sumyjkl
65fc5b6f28 droppers and dispensers actually shoot items out, items will merge with eachother even when floating 2022-07-22 22:38:36 +10:00
Sumyjkl
dc6fbeeafd items will go into sleep mode even if there's a block above as long as it's not a liquid 2022-07-22 16:55:42 +10:00
Sumyjkl
70aca4c3ca fix infinite bobbing 2022-07-22 16:19:50 +10:00
Sumyjkl
9daac0aff1 make items float in water sources 2022-07-22 15:34:58 +10:00
cora
acbf043df0 Check 3 nodes above for enderman spawn 2022-07-22 03:27:41 +02:00
cora
2ba1a40820 Add ghasts specific spawning conditions 2022-07-22 03:27:41 +02:00
cora
94f0d679f2 Add can_spawn callback in mob api 2022-07-22 03:27:41 +02:00
cora
32ac2ffeb8 remove unused alias_mob function 2022-07-22 03:27:41 +02:00
Sumyjkl
68e1fdde36 fixed comment about creative 2022-07-22 03:27:41 +02:00
Sumyjkl
fbfc53ff42 eat sound will play even when feeding in creative 2022-07-22 03:27:41 +02:00
Sumyjkl
d8172e404e wolf when tamed will retain its health and not heal to full hp 2022-07-22 03:27:41 +02:00
Sumyjkl
3852c0297f changed API to recognise sitting order, added animations for sitting and idle, dog will no longer walk around while in sit mode 2022-07-22 03:27:41 +02:00
Sumyjkl
c60002b18d set tamed 2022-07-22 03:27:41 +02:00
Sumyjkl
4920ef0fd5 allow wolf to be bred like other animals 2022-07-22 03:27:41 +02:00
cora
96b628d418 Sheep run away when hit 2022-07-22 03:27:41 +02:00
cora
69c689bfb7 make llamas retaliate by spitting.
it's a bit picky when and how it will spit still but works.
2022-07-22 03:27:41 +02:00
cora
b7a0460b15 Reset aggro when player far 2022-07-22 03:27:41 +02:00
SumianVoice
cfb6b6003c Update api.lua 2022-07-22 03:27:41 +02:00
SumianVoice
a6eae1e95e don't tame baby animals yet 2022-07-22 03:27:41 +02:00
SumianVoice
682b61ad4a make sure you can't heal and tame at the same time 2022-07-22 03:27:41 +02:00
SumianVoice
524da8a6cb move heal under tame so that you can tame an animal and then heal it, like in MC 2022-07-22 03:27:41 +02:00
SumianVoice
e6a97031ef remove unnecessary check 2022-07-22 03:27:41 +02:00
SumianVoice
120b096fc8 move self.food check 2022-07-22 03:27:41 +02:00
SumianVoice
9d52fed357 non-tamable mobs will not send tame param to feed_tame func,
changed event flow so it tries in order: heal, tame, breed, grow child
2022-07-22 03:27:41 +02:00
SumianVoice
e5c1da4380 make it check not child, since the return statement was removed 2022-07-22 03:27:41 +02:00
SumianVoice
a07a5b24bd animals don't take food from player unless it is used for something 2022-07-22 03:27:41 +02:00
SumianVoice
c626c977d1 Update api.lua 2022-07-22 03:27:41 +02:00
cora
e1130a105f fix wrong sound position 2022-07-21 12:03:46 +02:00
cora
54337e9854 never show nitwit trading formspec 2022-07-19 11:46:28 +02:00
cora
d89ef0581f Optimize ABMs 2022-07-18 22:28:02 +02:00
cora
0298cecbcd change dripping entities to particles 2022-07-18 22:28:02 +02:00
cora
68d45ff606 Remove MushroomIsland from several mobs spawn list 2022-07-18 02:11:48 +02:00
cora
bf756403a3 Fix animals attacking players for no reason 2022-07-18 00:10:23 +00:00
cora
99037cb0ec adapt several mob spawning conditions to mc 2022-07-18 00:10:23 +00:00
cora
1087d9e54b Implement mc like mob cap 2022-07-18 00:10:23 +00:00
cora
2d3f4531c9 Add mob spawning debug command 2022-07-18 00:10:23 +00:00
cora
987ae3c6e8 Fix mobs spawning inside nodes 2022-07-18 00:10:23 +00:00
cora
3a32e4e4e9 Never spawn mobs on bedrock 2022-07-18 00:10:23 +00:00
cora
9883a37754 Enable group spawning for all mobs, add mc values 2022-07-18 00:10:23 +00:00
cora
a68343b71d Add group spawning minimum attribute 2022-07-18 00:10:23 +00:00
cora
a077e4535f Fix non-monsters being unable to attack
A check in the relevant function excluded all non-monsters from
looking for targets to attack. This removes that check and relies
on the passive attribute of the entity
2022-07-18 00:10:23 +00:00
cora
a49e66dbd3 Detection radius is 20 according to the wiki 2022-07-17 23:42:34 +02:00
cora
e9ad2cfe11 Make parrots imitate nearby mobs 2022-07-17 23:34:39 +02:00
Ale
27482ede7f update locale es 2022-07-15 22:55:03 +00:00
cora
ee9cc5341b Fix villager crash when opening iron doors 2022-07-15 22:11:07 +00:00
cora
aab3180269 clear empty nametag as well as nil 2022-07-15 04:40:12 +02:00
cora
9e60d24fe0 Never spawn mobs on leaves 2022-07-13 16:45:41 +02:00
cora
8d9c5059f3 Fix wither dupe
faulty on_place would not removed placed wither skelly head from
inv. This also prevents the execution of the schematic checking
routine if there is no soul sand under the head.
2022-07-12 23:11:00 +02:00
cora
c1686923d3 Fix crash when no group spawning positions found 2022-07-11 22:31:35 +02:00
cora
4a4636523e Add new mobs to translation template. 2022-07-09 22:14:37 +02:00
cora
e9b72083b3 Fix translator modnames 2022-07-09 02:30:48 +02:00
cora
aed96a4912 Add original dolphin texture
cc0 by cora
2022-07-09 02:30:48 +02:00
cora
f202ed8327 spawn in groups 2022-07-09 02:30:48 +02:00
cora
44abef44e1 Make fish buckets work with water mobs 2022-07-09 02:30:48 +02:00
cora
ae0eb85ffc Add salmon, cod and dolphin from mcl5 2022-07-09 02:30:48 +02:00
cora
de9056ae62 Fix child mobs collision boxes 2022-07-08 23:57:02 +02:00
cora
08a1ecd879 Don't take extra bread when feeding 2022-07-08 23:57:02 +02:00
cora
bcb76f7bd2 correctly lock job when traded 2022-07-08 23:57:02 +02:00
cora
8fe40fcd26 remove old debug line 2022-07-08 23:57:02 +02:00
cora
98c48dab8c abolish child labor 2022-07-08 23:57:02 +02:00
PrairieAstronomer
465d91036f Added Campfire to Fisherman Villager Trades 2022-07-08 02:37:20 +02:00
cora
31289f5686 villagers that haven't traded loose job on js gone 2022-07-05 23:47:30 +02:00
cora
672b9dbedf make pathfinding to jobsite more smooth 2022-07-05 23:47:30 +02:00
cora
dd5e9afbd9 villagers only get a job when they touch jobsite 2022-07-05 23:47:30 +02:00
cora
21d5ab88a5 comment out natural villager spawning 2022-07-05 23:47:30 +02:00
cora
0e6250b2a3 Fix rabbit spawning biomes 2022-07-04 12:50:48 +02:00
cora
bc2e61921f do not spawn polar bears in extremehills+_snowtop 2022-07-04 01:46:41 +02:00
cora
b1c97a0510 prevent ground squids, variable spawn height 2022-07-04 01:41:45 +02:00
MysticTempest
677110e39f Disable the despawn timer catchup for items that were unloaded. 2022-07-03 04:28:43 -05:00
PrairieAstronomer
40a421ddd0 Hidden in the Depths Advancement 2022-07-01 12:41:01 -06:00
PrairieAstronomer
687bc04560 Who is Cutting Onions? Advancement 2022-07-01 12:39:10 -06:00
PrairieAstronomer
ed2fc6601e Added Smithing Table to Toolsmith Villager Jobsite 2022-06-30 14:11:13 +02:00
cora
d9e40d5223 set profession first in on_spawn 2022-06-26 11:20:20 +02:00
cora
86651e7557 Fix zombie villager curing (crash) 2022-06-26 11:20:20 +02:00
RandomLegoBrick
b5eda3000e Merge branch 'master' into grindstone 2022-06-20 19:58:49 +00:00
TheRandomLegoBrick
99469ff1c5 Add grindstones 2022-06-20 12:46:59 -07:00
cora
e3c5b2cbb5 Fix crash on ghast explosions
In certain situations the arrow can be invalidated until its
get_pos() is called here - e.g. when the player wears over-
enchanted blast protection (65k in this case).

This uses the player position for the explosion in these cases
2022-06-20 13:40:05 +02:00
cora
5b366c692d Enable mob spawning in new biomes
lower ghast spawning chance
2022-06-19 00:24:52 +02:00
cora
8efbd89b6a Add basalt columns & lava pools 2022-06-19 00:24:52 +02:00
cora
98a322443b make "old" villagers keep their job 2022-06-17 13:59:32 +00:00
cora
cd43076ea3 additionally rate limit villager jobhunts 2022-06-17 15:54:53 +02:00
cora
e630ea59c9 Rate limit pathfinding attempts
In certain situation it otherwise results in excessive attempts to
find a path.
2022-06-17 15:54:53 +02:00
cora
8651e3b04e randomize spawning list 2022-06-15 05:06:31 +02:00
cora
60f164d46a Fix horse and wolf spawning biomes 2022-06-15 05:06:31 +02:00
cora
9cea10a706 fix more blast resistance and hardness values 2022-06-13 02:48:00 +02:00
cora
a43627e268 Fix 2 wrong variable uses that made warnings 2022-06-12 01:35:27 +00:00
PrairieAstronomer
b544fb819d What A Deal! Advancement 2022-06-11 15:35:48 -06:00
MysticTempest
45ec876167 Knockback fixes:
This PR enables knockback for snowballs, and eggs.
And disables knockback for the following mobs: Shulkers, Iron Golems,
and Ender Dragons.
2022-06-07 02:55:19 -05:00
epCode
ad486a56fd Add more Villager sounds 2022-06-06 12:09:14 -07:00
epCode
42c764e149 Make Villager nod/head shake 2022-06-06 11:12:57 -07:00
cora
ef093d0c00 Be more careful with possibly expired objects 2022-06-04 20:26:00 +02:00
MysticTempest
b4c5805afe Make items flowing in water use acceleration for movement. 2022-06-03 05:46:27 -05:00
MysticTempest
5dde594c19 Item movement fixes:
This PR fixes items at flowing_water edges not falling down holes.
As well as fixing items not sliding on slippery nodes like ice.

And, allows for movement starting at the source block of a
flowing water node. While ensuring regular water_source blocks
do not bug out.
2022-06-02 09:44:04 +00:00
MysticTempest
983b8f0934 Make breaking boats by hand easier. 2022-06-02 00:20:44 -05:00
MysticTempest
31106a2031 Fix items obtained from villager trades:
This PR stops the load_enchantments function from being
called for all items in the villager trades.
Fixing non-enchanted items from villagers being unable to stack
with their regular counterparts.

As they now, no longer have any description metadata.
While also ensuring that enchanted items still have their
tooltips, and work.
2022-05-30 15:11:22 -05:00
cora
dc21b02d04 update old mobs_mc_ horse armor textures 2022-05-30 10:49:38 +00:00
cora
e4a4648b25 fix size of black cat texture 2022-05-29 02:34:02 +02:00
cora
da6563a5b3 Spawn witch and black cat on witchhut generation 2022-05-29 02:34:02 +02:00
cora
7bc63d2882 fix mcl_mobs api_changes 2022-05-28 00:06:29 +02:00
cora
c0a9cb7020 don't hurt perched parrot on punch 2022-05-28 00:05:04 +02:00
cora
e90e17e533 clean up perch code, smoother behavior 2022-05-28 00:05:04 +02:00
cora
3d13000599 tweak detaching behavior 2022-05-28 00:05:04 +02:00
cora
86bc398a79 don't do flying animation while perching,fix anims 2022-05-28 00:05:04 +02:00
cora
14ec1aa014 add basic parrot perching 2022-05-28 00:05:04 +02:00
Elias Fleckenstein
e7898352d8 Remove mobs_mc_gameconfig 2022-05-27 02:44:39 +02:00
cora
47fa43825c count only mobs for cramming 2022-05-26 14:20:19 +02:00
cora
af7dc0fb8f change "constant" declaration to match mcl_mobs 2022-05-26 14:16:38 +02:00
cora
87f50d6423 entity cramming: clean up check logic 2022-05-26 14:16:38 +02:00
cora
fb4f21cba0 entity cramming: spare the children 2022-05-26 14:16:38 +02:00
cora
85b599edba entity cramming: check less often 2022-05-26 14:16:38 +02:00
cora
b4cbc528a3 mcl_mobs: add entity_cramming 2022-05-26 14:16:38 +02:00
Elias Fleckenstein
f6a40ffb78
Run tools/strip_trailing_whitespace.sh 2022-05-26 07:29:28 +02:00
Elias Fleckenstein
dd1f8cb59c Remove enderman gameconfig 2022-05-25 23:13:33 +02:00
Elias Fleckenstein
ff33794487 Rename mobs global to mcl_mobs 2022-05-25 23:13:33 +02:00
Elias Fleckenstein
e0f70b54ec Remove _cmi_is_mob 2022-05-25 23:13:33 +02:00
Elias Fleckenstein
4054f05a4c Remove support for invisibility mod 2022-05-25 23:13:33 +02:00
Elias Fleckenstein
f6be8bac5a Remove checks for MCL2 mods 2022-05-25 23:13:33 +02:00
Elias Fleckenstein
8db9e76529 Remove unused version field 2022-05-25 23:13:33 +02:00
Elias Fleckenstein
6ae722a6ee Remove use_cmi 2022-05-25 23:13:33 +02:00
Elias Fleckenstein
fc3992ceb6 Remove mobs.is_creative 2022-05-25 23:13:33 +02:00
cora
028d1c1f4f do not tame villagers 2022-05-22 14:43:44 +02:00
cora
a5ba8f739f Add bell to villager trades 2022-05-22 02:01:21 +02:00
cora
ec73afd21a use iron texture for apprentice badge, not stone 2022-05-22 02:01:21 +02:00
cora
e353ec3b16 Iron golems pick and pick up one (stack of) poppy 2022-05-21 12:36:57 +02:00
cora
5dafeaadc6 Fix indentation in mcl_mobs/api.txt 2022-05-21 12:36:57 +02:00
cora
27d0d778e2 Update TODO list 2022-05-21 12:36:57 +02:00
cora
a74fcab06b Make iron golem stay near set _home position 2022-05-21 12:36:57 +02:00
cora
e5806215f0 fix possible crash 2022-05-21 12:36:57 +02:00
cora
08b36e3eb3 Add textures for all professions 2022-05-21 12:36:57 +02:00
cora
53df441c1b Don't pick up near player, add more breeding stuff 2022-05-21 12:36:57 +02:00
cora
873e018faf Dynamically add trading tier badge to texture 2022-05-21 12:36:57 +02:00
cora
b58422a584 write villager id into bed nodemeta 2022-05-21 12:36:57 +02:00
cora
539c31e8d6 fix trading crash 2022-05-21 12:36:57 +02:00
cora
db865ede56 villagers open doors in daytime and close at night 2022-05-21 12:36:57 +02:00
cora
0d56ef1a90 add jobsites to villagegen schematics 2022-05-21 12:36:57 +02:00
cora
67939f7b7a pathfinding: find doors close to target as well 2022-05-21 12:36:57 +02:00
cora
9ccbf91706 mobs api: document api additions 2022-05-21 12:36:57 +02:00
cora
dfb74cf9e9 mobs: add nofollow option so v. dont follow bread 2022-05-21 12:36:57 +02:00
cora
9a866e873e breed by throwing bread at villagers 2022-05-21 12:36:57 +02:00
cora
e6b65af3b4 add mobs item pickup 2022-05-21 12:36:57 +02:00
cora
4ac41a793e fix two crashes in pathfinding 2022-05-21 12:36:57 +02:00
cora
98231f15ae change function name go_wplist -> gopath 2022-05-21 12:36:57 +02:00
cora
e3bb7fe4be codestyle: replace inline functions 2022-05-21 12:36:57 +02:00
cora
f8fc111b4a pathfind to jobsites 2022-05-21 12:36:57 +02:00
cora
dbc5564d02 move movement code to mcl_mobs 2022-05-21 12:36:57 +02:00
cora
ce7a882c86 Show trade tier in formspec 2022-05-21 12:36:57 +02:00
cora
12bc8f1a3b initial pathfinding experiments
to test rightclick a villager and it will try to path find to
0,9,0 (i'm using flat mapgen for testing for now).
2022-05-21 12:36:57 +02:00
cora
0598aa35c0 add simple jobsite logic 2022-05-21 12:36:57 +02:00
PrairieWind
d93704fa0e Merge branch 'master' into furnaces 2022-05-17 18:33:20 +00:00
PrairieAstronomer
fe36d579eb Add Blast Furnace and Smoker to Villager Workstations 2022-05-17 10:37:55 -06:00
cora
5282a63bcb add options for nametagged mobs and range 2022-05-15 20:04:09 +00:00
cora
e5de4bba65 keep nametagged mobs, add "all" argument 2022-05-15 20:04:09 +00:00
cora
628686ce79 Add a command to safely remove all mob objects 2022-05-15 20:04:09 +00:00
PrairieAstronomer
5abfa555eb Added new workstations to villager jobsite definitions 2022-05-14 15:52:37 -06:00
cora
31b8ea26a2 add jobsites to professions table 2022-05-14 00:32:15 +02:00
cora
fd6f2be485 update cleric trades 2022-05-14 00:32:15 +02:00
cora
07e0a90051 update tool smith trades 2022-05-14 00:32:15 +02:00
cora
f073d4d420 update weapon smith trades 2022-05-14 00:32:15 +02:00
cora
89aaf6b709 update butcher trades 2022-05-14 00:32:15 +02:00
cora
f09b578034 update leatherworker trades 2022-05-14 00:32:15 +02:00
cora
0ce1a92282 update armorer trades 2022-05-14 00:32:15 +02:00
cora
135ee97b21 update cartographer trades 2022-05-14 00:32:15 +02:00
cora
51cf92a909 update librarian trades 2022-05-14 00:32:15 +02:00
cora
2d47ad3e5f update fletcher trades 2022-05-14 00:32:15 +02:00
cora
c28d700caf update fisherman trades 2022-05-14 00:32:15 +02:00
cora
ba861d7b74 update farmer trades 2022-05-14 00:32:15 +02:00
cora
9b8b7ce6b4 refactor go home logic 2022-05-14 00:32:15 +02:00
cora
354d17a14c enable simple villager breeding 2022-05-14 00:30:44 +02:00