Lukas
4b33c0ce08
Merge remote-tracking branch 'origin/render' into render
2020-11-18 21:34:37 +01:00
Lukas
9d05bde504
add support for all needed versions in the blockModelGenerator
2020-11-18 21:34:22 +01:00
Bixilon
1e2413b875
Merge branch 'entity-meta' into render
...
# Conflicts:
# src/main/java/de/bixilon/minosoft/protocol/protocol/PacketHandler.java
2020-11-18 21:09:22 +01:00
Bixilon
915eeab020
reduce exceptions if server sends bullshit
2020-11-18 21:05:32 +01:00
Bixilon
efb5f6f058
fix issue with entity meta data generation,
2020-11-18 21:04:57 +01:00
Bixilon
e4d6b40c95
Remove PacketEntityStatus and add PacketEntityEvent
2020-11-18 19:07:07 +01:00
Bixilon
de1554f243
EntityMetaData serializer (log message), bug fix, reduce exceptions
2020-11-18 18:30:05 +01:00
Lukas
24e08aa11f
Load block models per version
2020-11-17 22:24:30 +01:00
Lukas
62e1f5599c
Merge remote-tracking branch 'origin/render' into render
...
# Conflicts:
# src/main/java/de/bixilon/minosoft/data/Mappings.java
# src/main/java/de/bixilon/minosoft/data/mappings/CustomMapping.java
# src/main/java/de/bixilon/minosoft/data/mappings/versions/VersionMapping.java
# src/main/java/de/bixilon/minosoft/data/mappings/versions/Versions.java
2020-11-17 21:33:37 +01:00
Lukas
43c2c38ec8
wip blockModelCombiner
2020-11-17 21:31:29 +01:00
Bixilon
3a31450195
Merge branch 'entity-meta' into render
...
# Conflicts:
# util/.idea/misc.xml
# util/mappingsDownloader.py
2020-11-17 21:26:34 +01:00
Bixilon
514d0e95be
add 2 missing assets
2020-11-17 21:22:19 +01:00
Bixilon
52d34a0cc6
improve ReadMe
2020-11-17 21:14:52 +01:00
Bixilon
db0a5f42c5
Entity mappings, generator, improvements
...
version_mappings_generator.py can now generate an entites.json, based on mojangs deobfuscation maps and burger data
All version mappings updated to include these changes
Some missing entities added, some mistakes fixed
2020-11-17 20:23:37 +01:00
Bixilon
623d8cacec
MetaDataIndex: allow parent mapping
2020-11-16 19:39:21 +01:00
Bixilon
3b3535697e
Re-enable PacketSpawnObject, improve mappingsDownloader.py, rename files
...
mappingsDownloader.py is now way more readable and supplemental for future edits (e.g. entities mappings)
2020-11-16 18:32:01 +01:00
Bixilon
718cf1ba25
Improve version mappings a lot, other improvements
...
AssetsManager: throw FileNotFoundException if asset does not exist instead of NullPointerException
EntityInformation: Remove max health
Rename some constants into caps with underline and not camel case
Version: Fix loading pre flattening mapping (mappings are now the latest not flattened version and not the first flattened version)
Remove CustomMapping.java. Use VersionMapping with parent ability (nesting)
Almost rewrite VersionMapping. Code is way better and easier to understand
Allow VersionMapping per version and inherit block and registries mapping from PRE_FLATTENING_VERSION (if needed): Custom Entity mappings per version now possible
2020-11-16 14:34:52 +01:00
Bixilon
aa3b9a1a05
mappingsDownloader.py: remove entities (burger), add blockModels.json (chain load other python file)
2020-11-15 18:51:15 +01:00
Bixilon
b4d81d98d9
allow ClientboundPacket to throw Exceptions, UnknownEntityException
2020-11-15 17:08:48 +01:00
Bixilon
c46bf57ad3
add EntityClassMappings, re-enable all entity spawn classes
2020-11-15 17:06:59 +01:00
Bixilon
d29e45e2c5
all entity classes (including meta data) (4):
2020-11-15 16:08:32 +01:00
Bixilon
f290bb4fce
wip more entities (3)
2020-11-14 23:04:21 +01:00
Bixilon
df0e8d007c
wip more entities (2)
2020-11-14 21:55:54 +01:00
Bixilon
ee82708479
wip more entities
2020-11-13 19:01:10 +01:00
Bixilon
e869478e79
add zombie, prototype of new entity system (wip)
2020-11-12 21:48:51 +01:00
Bixilon
707fc357bc
remove all old entities and entity meta data, wip new entity system
2020-11-12 19:59:57 +01:00
Bixilon
5ef1cf5793
protocol, assets: 20w46a
2020-11-11 22:09:58 +01:00
Bixilon
77bc055464
mappings for 20w46a
2020-11-11 21:55:27 +01:00
Bixilon
9b4d44a88c
startup log: print how many versions got loaded in a specific time
2020-11-10 20:44:40 +01:00
Bixilon
7818623c71
Merge branch 'development' into render
2020-11-10 20:29:46 +01:00
Bixilon
43a4febbc4
add missing asset
2020-11-10 20:29:33 +01:00
Bixilon
9ee311b402
Merge branch 'development' into render
...
# Conflicts:
# src/main/java/de/bixilon/minosoft/data/assets/AssetsManager.java
2020-11-10 20:26:13 +01:00
Bixilon
fb5c16aaa0
use new assets system for version mappings, allow download of already compressed data, ...
2020-11-10 20:22:34 +01:00
Bixilon
a02b17784f
wip new assets system for mappings
2020-11-10 19:52:04 +01:00
Lukas
c86d7e1fe6
bump blockModels.json for version 20w45a
2020-11-10 16:56:46 +01:00
Lukas
b7a0b858ec
Merge remote-tracking branch 'origin/render' into render
2020-11-10 16:18:40 +01:00
Bixilon
e85708f72f
Merge branch 'development' into render
2020-11-10 16:17:49 +01:00
Bixilon
49472411f7
bump assets to 20w45a
2020-11-10 16:17:31 +01:00
Lukas
93276fa49e
Merge remote-tracking branch 'origin/render' into render
...
# Conflicts:
# pom.xml
2020-11-10 16:07:54 +01:00
Bixilon
a3ccc9579a
Merge branch 'development' into render
2020-11-10 16:05:55 +01:00
Bixilon
629b3ee526
rename rotation and properties mapping
2020-11-10 16:04:36 +01:00
Bixilon
d53677369b
Merge remote-tracking branch 'origin/render' into render
...
# Conflicts:
# src/main/java/de/bixilon/minosoft/render/blockModels/BlockModelLoader.java
2020-11-10 16:02:36 +01:00
Bixilon
78f4978fa4
Merge branch 'development' into render
...
# Conflicts:
# src/main/java/de/bixilon/minosoft/data/mappings/blocks/BlockProperties.java
# src/main/java/de/bixilon/minosoft/data/mappings/blocks/BlockRotations.java
# src/main/java/de/bixilon/minosoft/data/mappings/blocks/Blocks.java
2020-11-10 15:57:22 +01:00
Lukas
4089ff42d8
add support for ConditionalModels
2020-11-10 15:56:48 +01:00
Bixilon
4a9fab814a
Improve style and generation (and maintainability) of BlockProperties and BlockRotations
2020-11-10 15:48:54 +01:00
Lukas
4c52ebab97
Render: support for BlockRotations
2020-11-10 15:45:14 +01:00
Bixilon
c76554eda7
protocol: 20w45a
2020-11-10 14:14:09 +01:00
Bixilon
75167cdbba
fix typo in comment
2020-11-09 17:15:26 +01:00
Bixilon
d54c95ebbb
Improve de_DE language
2020-11-08 17:56:32 +01:00
Bixilon
f449b1845d
Config documentation
2020-11-07 14:29:14 +01:00
