824 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Bixilon	58f85f1a3a	Merge branch 'development' into render	2020-11-25 19:16:31 +01:00
Bixilon	2f84f9b75a	add block properties for 20w48a	2020-11-25 19:16:17 +01:00
Bixilon	241db581b1	support for 20w48a	2020-11-25 19:07:00 +01:00
Bixilon	f5be2aef8d	support for 20w48a	2020-11-25 19:06:13 +01:00
Bixilon	fcfffde3d6	Merge branch 'development' into render	2020-11-25 19:02:07 +01:00
Bixilon	3b5ddabfc7	fix possible exception when selecting account in startup	2020-11-25 19:01:12 +01:00
Bixilon	dc7787cc8c	Merge branch 'entity-meta' into 'master' ... Entity meta See merge request bixilon/minosoft!18	2020-11-25 18:56:41 +01:00
Bixilon	cb1bf13140	entity mappings for 1.8.9, pre flattening bug fixes	2020-11-25 18:23:12 +01:00
Bixilon	ba62fe8316	some mappings and entity meta fixes for pre flattening versions	2020-11-24 18:08:32 +01:00
Bixilon	6759a149fc	allow mobs without id (used for object ids)	2020-11-24 17:09:58 +01:00
Bixilon	a43d4afbaa	Improve log messages	2020-11-23 21:44:09 +01:00
Bixilon	368c880121	fix loading of old textures (with prefixed blocks)	2020-11-23 18:14:22 +01:00
Bixilon	dcea6626a3	allow asset aliases, throw FileNotFoundException if asset not found (jar asset)	2020-11-23 17:30:07 +01:00
Bixilon	46671aa1bf	Merge branch 'entity-meta' into render	2020-11-23 16:36:59 +01:00
Lukas	122eeaaf3a	Fix bugs with previous commit	2020-11-23 16:36:23 +01:00
Bixilon	0fba4510df	Handle all mod loading exceptions	2020-11-22 19:42:12 +01:00
Bixilon	82cd21ddf9	Log can now handle like String::format	2020-11-22 19:37:21 +01:00
Bixilon	dcd61d4d41	No critical exception if there is not network (LAN Server)	2020-11-22 18:57:30 +01:00
Bixilon	ac87d42c48	fix some bugs in TranslatableComponent (allow parent mapping), other fixes and improvements	2020-11-22 18:53:48 +01:00
Bixilon	44605c1fe3	Add BetterHashSet, use it in ChatComponents, split Post and Pre formatting codes	2020-11-22 16:47:46 +01:00
Bixilon	9a2fcadd67	Make ChatComponent an abstract class	2020-11-22 14:10:25 +01:00
Bixilon	38cdf8e1bb	Merge branch 'entity-meta' into render ... # Conflicts: # src/main/java/de/bixilon/minosoft/data/world/Chunk.java	2020-11-22 13:35:17 +01:00
Bixilon	735617130d	Various fixes ... PlayerEntity: PlayerPropertyData is now a HashSet Teams: Fix formatting code (only colors before this, now also formatting codes are supported)	2020-11-22 13:30:46 +01:00
Bixilon	492dd7a0ce	Improve und fix various things ... BlockActions: Use unsigned byte (short) BlockActions: Add BellAction and ignore all other actions ChatComponent: Fix mishandling, wrong order Rename some GameStates Fix Respawn Packet Handling in 1.16.2+	2020-11-22 12:50:56 +01:00
Bixilon	e077ab9288	fix wrong resources.json	2020-11-21 22:03:47 +01:00
Bixilon	996ad522a4	fix wrong resources.json	2020-11-21 22:03:22 +01:00
Bixilon	718f516032	regenerate assets (4)	2020-11-21 22:02:19 +01:00
Bixilon	b5657ad495	regenerate assets (4)	2020-11-21 22:01:31 +01:00
Lukas	c790430bf3	Merge remote-tracking branch 'origin/render' into render	2020-11-21 21:14:21 +01:00
Lukas	92b51927db	Adapt BlockModelLoader for new BlockModels.json format	2020-11-21 21:11:56 +01:00
Bixilon	8efce8d2b1	improve code quality, performance. Introduce Debug Mode	2020-11-21 19:51:34 +01:00
Bixilon	5580bc4323	regenerate resources (3)	2020-11-21 18:25:43 +01:00
Bixilon	8980ca42f6	regenerate resources (3)	2020-11-21 18:24:57 +01:00
Bixilon	0e9dcfdbf9	Merge branch 'entity-meta' into render	2020-11-21 18:01:27 +01:00
Bixilon	09fdd472f9	fix typo from mojang in mappings generator	2020-11-21 18:01:02 +01:00
Bixilon	c065c01361	Merge branch 'entity-meta' into render	2020-11-21 17:13:46 +01:00
Bixilon	13e85ccdd7	cleanup some things, bug fix	2020-11-21 17:12:13 +01:00
Bixilon	e0fc0b3d7d	Merge branch 'entity-meta' into render ... # Conflicts: # src/main/java/de/bixilon/minosoft/protocol/protocol/PacketHandler.java	2020-11-21 15:44:47 +01:00
Bixilon	970627024a	Confirm spawn position, fix data sending bug (no data was sent to the server)	2020-11-21 15:43:32 +01:00
Bixilon	5fe7c73a6e	reformat code	2020-11-21 15:12:22 +01:00
Bixilon	a5d26a6448	fix class cast exception in living entity flags (only when default value is used)	2020-11-21 13:35:16 +01:00
Bixilon	64e1cd2292	regenerate mappings (2)	2020-11-21 13:21:50 +01:00
Bixilon	f966deb637	fix blockModelGenerator.py	2020-11-21 13:20:41 +01:00
Bixilon	d712336137	regenerate mappings (2)	2020-11-21 13:18:14 +01:00
Bixilon	5a0a639f6a	Merge branch 'entity-meta' into render	2020-11-20 23:47:44 +01:00
Bixilon	dd95df2370	fix entities.json generation (hopefully)	2020-11-20 23:47:05 +01:00
Bixilon	379a9a9a66	regenerate mappings	2020-11-20 22:23:11 +01:00
Bixilon	e61dd898fa	regenerate mappings	2020-11-20 22:21:35 +01:00
Bixilon	3db4880eb9	fix blockModelGenerator.py	2020-11-20 22:20:33 +01:00
Bixilon	66658ad8a7	Merge branch 'entity-meta' into render ... # Conflicts: # src/main/java/de/bixilon/minosoft/data/mappings/blocks/Block.java # src/main/java/de/bixilon/minosoft/data/world/ChunkSection.java # src/main/java/de/bixilon/minosoft/data/world/World.java # src/main/java/de/bixilon/minosoft/protocol/network/Connection.java	2020-11-20 21:45:16 +01:00