atomdmac
/
MineClone5
forked from MineClone5/MineClone5
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
8,120 Commits 32 Branches 24 Tags 71 MiB
Commit Graph

7427 Commits

Author SHA1 Message Date
kay27 a996db13d1 Merge master into testing 2022-01-24 23:14:10 +04:00
NO411 a53a849d96 Add shields and offhand 2022-01-24 17:26:14 +01:00
kay27 b5eb4c821b Merge master into testing 2022-01-24 02:20:49 +04:00
kay27 007c8d410a Merge pull request 'PLAYER/mcl_playerplus: Send player properties and bones only when changed' (#134) from fix-activeobject-spam into master 
Reviewed-on: MineClone5/MineClone5#134
 2022-01-23 22:11:46 +00:00
cora 22403f2926 Send player properties and bones only when changed 2022-01-23 22:32:16 +01:00
kay27 1446d4fcad #133 Fix unclear crash in mcl_wieldview 2022-01-23 23:37:01 +04:00
kay27 f9aea133e9 Merge pull request 'Fix issue #118; fixes noise param errors for ores on startup.' (#128) from MysticTempest/MineClone5:noise_params_fix into master 
Reviewed-on: MineClone5/MineClone5#128
 2022-01-22 23:53:55 +00:00
Mental-Inferno 28143f28cc Merge branch 'master' into add_cave_spider_poison 2022-01-22 20:26:18 +00:00
Mental-Inferno d3711b69a5 Fixed bug where cave spider poison effect would continue after respawn 
Also added knockback effect to cave spider attack and set default cave spider health to current Minecraft default.
 2022-01-22 15:15:09 -05:00
MysticTempest b5044bb4ef Fix issue #118; fixes noise param errors for ores on startup. 2022-01-22 04:44:51 -06:00
kay27 40f2b85dd3 Spawn Nether Wart 2022-01-22 13:29:50 +04:00
kay27 10ccde1b24 Make Nether warts grow in inactive areas 2022-01-22 04:09:50 +04:00
Thinking 4c85f85422 Added poison to cave spider attack 
Converted melee cave spider punch to custom, ultra low range, poison spit. The attack serves as a functional stop gap until punch augmentation is implemented in the mcl_mobs API  (if that is decided to be done). The attack does 2 initial damage + 4 poison damage over 8 seconds (better fraction that Minecraft's weird 4 damage over 7 seconds) Credits have been added where necessary.
 2022-01-21 17:21:58 -05:00
kay27 77f48900b5 Fix music interruption 2022-01-21 19:37:35 +04:00
kay27 ee519e5fa5 Add different music for different dimensions 2022-01-21 19:32:27 +04:00
kay27 255f84f2ec Fix mcl_music: play to all players, play every day, overworld only 2022-01-21 18:49:16 +04:00
kay27 a192ef0bcd Add trivial mcl_music mod and a piano track by diminixed 2022-01-21 05:30:16 +04:00
kay27 c7ad90f78a Make sure we return a string in get_staticdata 2022-01-20 19:54:08 +04:00
kay27 7b50aeb440 Merge master into testing 2022-01-20 19:46:20 +04:00
superfloh247 78a5416e60 fix crash 2022-01-20 14:59:29 +00:00
kay27 aac486ccc8 Search brackets in creative inventory 2022-01-20 05:48:10 +04:00
kay27 c2b8991eb2 Merge mapgen_issue into testing 2022-01-19 05:00:28 +04:00
kay27 b305eceee9 Fix End ligh bug 2022-01-19 04:57:27 +04:00
kay27 6c367977a8 Fix a bug 2022-01-19 04:55:15 +04:00
kay27 2a26adac0f Fix End 2022-01-19 04:53:55 +04:00
kay27 89769b8168 Fix Nether portal in End 2022-01-19 04:11:29 +04:00
kay27 a36f3ba7d0 Cleanup again 2022-01-19 04:09:19 +04:00
kay27 bc4cb14a76 Clean up the code 2022-01-19 03:59:22 +04:00
kay27 4a3f1032ca Add ice spikes for v6 2022-01-19 03:41:22 +04:00
kay27 6ac682fdcf Fix huts 2022-01-19 02:25:23 +04:00
kay27 75a7f5a3ae Restore Witch Hut 2022-01-19 01:49:28 +04:00
kay27 34c6bf3446 Restore igloos 2022-01-18 21:41:09 +04:00
kay27 5c27e1c186 Merge master into mapgen_issue 2022-01-18 19:18:04 +04:00
kay27 da606acfd1 Add old structures to new mod 2022-01-18 19:17:20 +04:00
kay27 a25770ecae Spawn Nice Jungle Temple by cora 2022-01-18 12:28:08 +04:00
kay27 4e832ba323 Use per-chunk probability and 1-octave Perlin noise to simplify spawning temples 2022-01-17 20:43:30 +04:00
kay27 30a0eb1d4a Restore nether_portal in spawnstruct list 2022-01-17 20:03:46 +04:00
kay27 6eb126da40 Disable debugging tools 2022-01-17 06:48:59 +04:00
kay27 0e70e386ea Add loot into jungle temple trapped chests 2022-01-17 06:37:15 +04:00
kay27 8caf8c91dd Add more complex temple spawn conditions 2022-01-17 06:17:52 +04:00
kay27 d3265a2f72 Find better place for jungle temples again, add cobbles to support some stair parts 2022-01-17 05:54:36 +04:00
kay27 93922a00d5 Find better places for Jungle Templates 2022-01-17 04:26:37 +04:00
kay27 66fded90d5 Fix vines 2022-01-17 03:25:47 +04:00
kay27 e528cc7d8b Place Jungle Temple by cora 2022-01-17 00:39:53 +04:00
kay27 12e85f9f12 Add Jungle Temple schematic by cora 2022-01-16 22:50:58 +04:00
kay27 2cfca05186 Move noise indicator into separate file 2022-01-16 19:20:42 +04:00
kay27 fefa9c8b4f Initialize temples 2022-01-16 06:42:18 +04:00
kay27 6d4f7d2e62 Fix strongholds 2022-01-16 05:20:34 +04:00
kay27 95fd9e9105 Flush current work on spawnstruct, refactor strongholds 2022-01-16 04:46:07 +04:00
kay27 37725cc1dc Refactor desert temples and structs in general (unfinished) 2022-01-15 20:32:48 +04:00
kay27 e2928c4afc Add red desert temples 2022-01-15 08:04:43 +04:00
kay27 096b384676 Spawn desert temples from seeds 2022-01-14 04:25:39 +04:00
kay27 41b8ff5cb0 Merge pull request 'Breaking range parity with Minecraft: Java Edition' (#115) from GuyLiner/MineClone5:break_range_fix into testing 
Reviewed-on: MineClone5/MineClone5#115
 2022-01-12 07:23:55 +00:00
kay27 79170e2386 Fix attempt to perform arithmetic on a nil value in mount.lua:232 2022-01-12 04:33:55 +04:00
kay27 9d171a6b7b Fix Nether roof light 2022-01-12 04:02:56 +04:00
kay27 c6754fd39e Start adding new structures API 2022-01-12 03:27:28 +04:00
GuyLiner 26cc290342 Merge branch 'testing' into break_range_fix 2022-01-11 21:44:01 +00:00
Guy Liner 8a7db3de9a Breaking range parity with Minecraft: Java Edition 2022-01-11 16:40:50 -05:00
kay27 c9e56e68c4 Merge GuyLiner/rotate-fix into testing 2022-01-11 21:59:55 +04:00
kay27 1f55e6da1c Merge remote-tracking branch 'origin/spawner' into testing 2022-01-11 21:56:47 +04:00
kay27 749bc379e7 Merge MineClone 2/master into testing 2022-01-11 21:52:45 +04:00
GuyLiner cb836541c6 Merge branch 'testing' into rotate-fix 2022-01-11 15:46:14 +00:00
Guy Liner 49201116e8 Fixes problem where pillar like nodes could not be placed on 
nodes that had the "on_rightclick" attribute.
Merge remote-tracking branch 'mcl2/rotate_fix' into rotate-fix
 2022-01-11 10:37:53 -05:00
Guy Liner bc3ecb175e Merge remote-tracking branch 'spawner/spawner' into spawner 
These are my changes that fix a spawning bug that allowed monsters
to spawn no matter what light level if you had manually created
the spawner
 2022-01-11 09:24:19 -05:00
kay27 dd5803908b #110 Add trident model by epCode 2022-01-10 19:49:18 +04:00
kay27 f207832c5a Merge master into testing 2022-01-10 19:38:12 +04:00
kay27 16116df4c6 Generate only desert seeds for some structs and lots of debugging glass blocks in the sky 2022-01-10 19:35:04 +04:00
Daniel Cassidy d0d7ebe53b Really move mcl_stairs_stone_slab_top.png into mcl_core 
This is a fix for #105 where I accidentally moved it to the wrong place.
Sorry.

mcl_core uses this texture for Polished Stone (mcl_core:stone_smooth),
which means mcl_core had an undeclared dependency on mcl_stairs.

Since mcl_stairs depends on mcl_core, it makes sense to move the texture
to mcl_core.
 2022-01-07 21:56:37 +00:00
GuyLiner cade03cedf Merge branch 'master' into spawner 2022-01-07 15:40:45 +00:00
kay27 667ebf1385 Fix several mapgen_issue warnings 2022-01-07 08:41:04 +04:00
GuyLiner bdc5252c59 Merge branch 'master' into rotate_fix 2022-01-07 03:18:15 +00:00
kay27 da8e92e071 Fix layers 2022-01-07 07:16:31 +04:00
kay27 7868cf7dc5 Merge master into mapgen_issue 2022-01-07 06:47:11 +04:00
kay27 726159e796 Dedicate clay and structures from mapgen core 2022-01-07 06:24:11 +04:00
epCode 9b881df465 Temporarily remove glitchy Elytra crash-damage 
If you fly in certain directions with this damage system, you will die. also if you speed up too fast.
 2022-01-06 21:55:01 +00:00
Daniel Cassidy 978f23c70e mcl_mapgen_core: Rename cocoa to c_cocoas. 
This is more consistent and should hopefully be clearer.
 2022-01-06 02:56:51 +00:00
Daniel Cassidy 802d214d7b mcl_mapgen_core: Make mcl_nether an optional dependency. 
mcl_nether was previously an undeclared dependency of mcl_mapgen_core.
Now it is both optional and declared.
 2022-01-06 02:55:33 +00:00
Daniel Cassidy a0708abb9c mcl_mapgen_core: Make mcl_mushrooms an optional dependency. 
mcl_mushrooms was previously an undeclared dependency of mcl_mapgen_core.
Now it is both optional and declared.
 2022-01-06 02:46:02 +00:00
Daniel Cassidy 554f22b802 mcl_mapgen_core: Make mcl_farming an optional dependency. 
mcl_farming was previously an undeclared dependency of mcl_mapgen_core.
Now it is both optional and declared.
 2022-01-06 02:33:04 +00:00
Daniel Cassidy 1d03a3d150 mcl_mapgen_core: Make mcl_flowers an optional dependency. 
mcl_flowers was previously an undeclared dependency of mcl_mapgen_core.
Now it is both optional and declared.
 2022-01-06 02:30:24 +00:00
Daniel Cassidy 7c72ce1d0d mcl_mapgen_core: Fix check for wrong mod. 2022-01-06 02:11:06 +00:00
Daniel Cassidy 2bdaa77932 mcl_mapgen_core: Make mcl_structures an optional dependency. 2022-01-06 01:20:06 +00:00
Daniel Cassidy 5cad35dbfe mcl_mapgen_core: Make mcl_stairs an optional dependency. 
The "mapgen_stair" aliases are only used by v6, and even then appear to
be optional in practice, so there's no reason for mcl_mapgen_core to
require mcl_stairs.
 2022-01-06 01:20:06 +00:00
Daniel Cassidy 51cdc69b99 mcl_mapgen_core: Make mcl_monster_eggs an optional dependency. 
The only purpose of this dependency appears to be to force
mcl_monster_eggs to load before mcl_mapgen_core. It is not actually
used in the code.

mcl_monster_eggs is an undeclared dependency of mobs_mc_gameconfig,
mcl_biomes, and mcl_structures, all of which are either transitive
or direct dependencies of mcl_mapgen_core.

It's not possible to add a dependency on mcl_monster_eggs directly
to mobs_mc_gameconfig, because that would lead to a circular
dependency. So it seems like a dependency on mcl_monster_eggs is
declared as a dependency of mcl_mapgen_core as a workaround to
ensure that mcl_monster_eggs at least gets loaded before
mcl_mapgen_core.

I've moved mcl_monster_eggs to the optional dependencies which
should achieve the same aim without complaining if mcl_monster_eggs
is missing, but this should probably be cleaned up in future to
remove the circular dependency.
 2022-01-06 01:18:40 +00:00
kay27 54adfe9e30 Merge remote-tracking branch 'origin/testing' into mapgen_issue 2022-01-06 02:07:16 +04:00
Daniel Cassidy b73c0e8f2c mcl_mapgen_core: Make mcl_ocean an optional dependency. 2022-01-05 21:34:56 +00:00
Daniel Cassidy 012d0bd942 mcl_mapgen_core: Make mcl_sponges an optional dependency. 2022-01-05 20:52:53 +00:00
Daniel Cassidy c52f598e64 mcl_mapgen_core: Make mcl_cocoas an optional dependency. 2022-01-05 20:46:28 +00:00
Guy Liner 502f85f637 Added a file that contains a table of every monsters light spawning levels 2022-01-05 10:45:15 -05:00
Guy Liner a9eb6cb747 Moved that table that contains every monster's light spawning levels to a different file, added some comments 2022-01-05 10:44:01 -05:00
Guy Liner 04a81af4a1 Make sure that the player is not in creative mode before giving them experience points 2022-01-05 10:42:50 -05:00
Guy Liner 385d34df33 Added comments and figured out away to fix mob spawning bug 2022-01-04 23:15:48 -05:00
kay27 fc3dc63f01 Merge pull request 'Move texture mcl_stairs_stone_slab_top to mcl_core.' (#105) from djc/MineClone5:polished-stone into master 
Reviewed-on: MineClone5/MineClone5#105
 2022-01-05 03:05:20 +00:00
kay27 806edcda19 Fix crash at startup 2022-01-05 06:47:06 +04:00
kay27 6c1d30a130 Polish new mapgen stuff 2022-01-05 06:43:16 +04:00
Daniel Cassidy af03b030a0 Move texture mcl_stairs_stone_slab_top to mcl_core. 
mcl_core uses this texture for Polished Stone (mcl_core:stone_smooth),
which means mcl_core has an undeclared dependency on mcl_stairs.

Since mcl_stairs depends on mcl_core, it makes sense to move the texture
to mcl_core.
 2022-01-05 02:33:31 +00:00
kay27 4ce3102ab4 Merge remote-tracking branch 'origin/testing' into mapgen_issue 2022-01-05 04:18:39 +04:00
kay27 b703dbc288 Merge remote-tracking branch 'origin/master' into testing 2022-01-05 04:18:07 +04:00
Daniel Cassidy 841c278490 mcl_enchanting: Add missing dependency on mcl_experience. 2022-01-04 23:46:54 +00:00
kay27 05f1614893 #62 Spawn Ender Dragon 2022-01-04 04:13:28 +04:00