Commit Graph

7855 Commits

Author SHA1 Message Date
cora b4cbc528a3 mcl_mobs: add entity_cramming 2022-05-26 14:16:38 +02:00
Lizzy Fleckenstein 96dcfb8a62 Merge pull request 'Strip trailing whitespace from files' (#2240) from EliasFleckenstein03/MineClone2:fmt into master
Reviewed-on: MineClone2/MineClone2#2240
2022-05-26 05:36:32 +00:00
Lizzy Fleckenstein f6a40ffb78
Run tools/strip_trailing_whitespace.sh 2022-05-26 07:29:28 +02:00
Lizzy Fleckenstein 6a054556cc
Add tool to strip trailing whitespace 2022-05-26 07:28:05 +02:00
cora 8210fba65b Merge pull request 'Mobs Redo Part 1' (#2245) from mobs-redo-basic-cleanup into master
Reviewed-on: MineClone2/MineClone2#2245
2022-05-25 21:19:07 +00:00
Lizzy Fleckenstein dd1f8cb59c Remove enderman gameconfig 2022-05-25 23:13:33 +02:00
Lizzy Fleckenstein ff33794487 Rename mobs global to mcl_mobs 2022-05-25 23:13:33 +02:00
Lizzy Fleckenstein e0f70b54ec Remove _cmi_is_mob 2022-05-25 23:13:33 +02:00
Lizzy Fleckenstein 4054f05a4c Remove support for invisibility mod 2022-05-25 23:13:33 +02:00
Lizzy Fleckenstein f6be8bac5a Remove checks for MCL2 mods 2022-05-25 23:13:33 +02:00
Lizzy Fleckenstein 8db9e76529 Remove unused version field 2022-05-25 23:13:33 +02:00
Lizzy Fleckenstein 6ae722a6ee Remove use_cmi 2022-05-25 23:13:33 +02:00
Lizzy Fleckenstein fc3992ceb6 Remove mobs.is_creative 2022-05-25 23:13:33 +02:00
cora d3afccad64 Merge pull request 'Fix warnings in mcl_bells and mcl_beds' (#2243) from EliasFleckenstein03/MineClone2:warn into master
Reviewed-on: MineClone2/MineClone2#2243
2022-05-25 17:54:28 +00:00
Lizzy Fleckenstein 569288b782
Fix warnings in mcl_bells and mcl_beds 2022-05-25 19:37:36 +02:00
cora 950a0607f1 Merge pull request 'Add /gamemode command for per player gamemode' (#2235) from creative_gamemode_2 into master
Reviewed-on: MineClone2/MineClone2#2235
Reviewed-by: Elias Fleckenstein <eliasfleckenstein@web.de>
2022-05-25 14:43:06 +00:00
cora d863a6298b fix/simplifiy things from review 2022-05-25 16:36:04 +02:00
cora 2499fe1e83 add complete input validation, better result msgs 2022-05-25 05:43:49 +02:00
cora f89780695e Add /gamemode command for per player gamemode 2022-05-25 05:43:49 +02:00
cora e2fc41cf51 Merge pull request 'Fix wrong argument to is_creative_enabled' (#2237) from fix_wtong_is_creative_usage into master
Reviewed-on: MineClone2/MineClone2#2237
2022-05-25 03:42:12 +00:00
cora 6a2f9e1a16 Fix wrong argument to is_creative_enabled 2022-05-25 03:41:43 +00:00
cora efbf3d9750 Merge pull request 'make soul fire drop nothing when dug' (#2238) from fix_soul_fire_drop into master
Reviewed-on: MineClone2/MineClone2#2238
2022-05-25 03:40:54 +00:00
cora bda5073d86 make soul fire drop nothing when dug 2022-05-25 05:27:52 +02:00
cora 8ad9dd0b86 Merge pull request 'Add blackstone by debian044' (#2142) from blackstone into master
Reviewed-on: MineClone2/MineClone2#2142
2022-05-24 11:29:12 +00:00
cora 11e8e7d4cc Add soul_group to s.soil&sand, torch fix recpipe 2022-05-24 13:25:59 +02:00
kabou 1931a85f24 Add blackstone to cobble group.
By adding blackstone to the group "cobble", it automatically inherits
all crafting recipes and tool repair capabilities that apply to that
group.

* Add `cobble=1` to blackstone node definition groups.
* Remove stone tools and furnace crafting recipes.
2022-05-24 13:25:45 +02:00
cora 0c65363a09 replace ' with " 2022-05-24 13:25:45 +02:00
cora b6a647e119 remove unused vars 2022-05-24 13:25:45 +02:00
cora 23e5a1c7d3 Comment out ore generation for now
The discussion about how to handle this is still ongoing. Since
this is about getting the new nodes disable ore registration
for now.
2022-05-24 13:25:45 +02:00
cora 0d8436b343 fix soul fire 2022-05-24 13:25:45 +02:00
cora 29c16eaa75 remove superfluous torch models 2022-05-24 13:25:45 +02:00
cora 2d81d31139 Fix soul torch to use the actual mcl_torches api 2022-05-24 13:25:45 +02:00
cora a9be3f0f96 remove excessive newlines 2022-05-24 13:25:45 +02:00
cora 181a7d3b11 make nether gold gen. respect mcl_generate_ores 2022-05-24 13:25:45 +02:00
cora 430dc7fd8c remove packed ice recipe 2022-05-24 13:25:45 +02:00
cora c6312e7bdd use vector.new instead of normal tables 2022-05-24 13:25:45 +02:00
cora d9f2db5950 adapt readme to mcl2 2022-05-24 13:25:45 +02:00
cora 6b058d6f38 remove changelog.md 2022-05-24 13:25:45 +02:00
cora dd928db9ea fix soul torch recipe 2022-05-24 13:25:45 +02:00
cora 67e026cb12 blackstone: remove soul lantern dupe(mcl_lanterns) 2022-05-24 13:25:45 +02:00
cora 4a0a9ba482 move depends.txt to mod.conf, add author field 2022-05-24 13:25:45 +02:00
debian044 16d79996c0 Add blackstone via cp -r & git add * ^^ 2022-05-24 13:25:45 +02:00
cora c71a6d5df7 Merge pull request 'Run tools/generate_ingame_credits.lua' (#2228) from EliasFleckenstein03/MineClone2:generate_ingame_credits into master
Reviewed-on: MineClone2/MineClone2#2228
2022-05-22 20:30:26 +00:00
Lizzy Fleckenstein 60c463b8f9
Run tools/generate_ingame_credits.lua
This should be run every time CREDITS.md is changed.
2022-05-22 21:41:40 +02:00
cora fc428da6fd Merge pull request 'Villager employment system and mob-api enhancements' (#2209) from villagers_jobsites into master
Reviewed-on: MineClone2/MineClone2#2209
2022-05-22 13:22:41 +00: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 d34191f00c villagers go to the bell if it's rung(for now)
this will help with further testing pathfinding until villagers
get a proper schedule and do more things
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 fca259c074 fix crash during (artificial) village creation
when using the village tool doing that on an unsuitable location
would result in no position for the belltower being available
this checks for that and ... doesn't crash then ^^
2022-05-22 02:01:21 +02:00