Bixilon
248f5532bb
Merge branch 'development' into render
...
# Conflicts:
# src/main/java/de/bixilon/minosoft/protocol/protocol/PacketHandler.java
2020-12-05 22:16:51 +01:00
Bixilon
35b1dd4626
fix various typos
...
Co-authored-by: DeinBerater <niklas.hernitscheck@gmail.com>
2020-11-27 15:23:44 +01:00
Lukas
122eeaaf3a
Fix bugs with previous commit
2020-11-23 16:36:23 +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
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
f966deb637
fix blockModelGenerator.py
2020-11-21 13:20:41 +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
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
Bixilon
1e9de9cc63
fix entity generation for versions below 1.16 (PigZombie missing)
2020-11-19 14:50:28 +01:00
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
efb5f6f058
fix issue with entity meta data generation,
2020-11-18 21:04:57 +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
aa3b9a1a05
mappingsDownloader.py: remove entities (burger), add blockModels.json (chain load other python file)
2020-11-15 18:51:15 +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
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
Bixilon
f449b1845d
Config documentation
2020-11-07 14:29:14 +01:00
Bixilon
067ecb5571
Merge branch 'development' into render
...
# Conflicts:
# src/main/java/de/bixilon/minosoft/Minosoft.java
2020-11-05 22:10:42 +01:00
Bixilon
6ef561dd69
Fix copyright spacing
2020-11-05 21:38:21 +01:00
Bixilon
d029780cca
reformat blockModelCombinder.py
2020-11-04 12:13:44 +01:00
Bixilon
e805f72e7c
reformat serverWrapper.py, remove redundant variable
2020-11-03 23:52:34 +01:00
Bixilon
5553586185
Merge branch 'development' into render
2020-11-03 18:31:09 +01:00
Bixilon
202bd35075
improve documentation (ReadMes)
...
Add hypixel lobby screenshot
Add task descriptions in Minosoft.java
Improve ReadMe.md and util/ReadMe.md
2020-11-03 18:24:00 +01:00
Bixilon
7860e26909
Merge branch 'developement' into render
...
# Conflicts:
# src/main/java/de/bixilon/minosoft/protocol/network/Connection.java
2020-11-02 15:48:53 +01:00
Bixilon
74d9d33551
fix copyright in python scripts, fix python formatting
2020-10-30 14:47:15 +01:00
Bixilon
5cc00d1e6f
Merge branch 'developement' into render
...
# Conflicts:
# src/main/java/de/bixilon/minosoft/data/mappings/blocks/Blocks.java
# src/main/java/de/bixilon/minosoft/gui/main/Launcher.java
# src/main/java/de/bixilon/minosoft/gui/main/StartProgressWindow.java
# src/main/java/de/bixilon/minosoft/protocol/network/Connection.java
2020-10-29 16:21:09 +01:00
Bixilon
0208a1032f
remove "Codename" in copyright, force add newline add end of file
2020-10-29 16:17:37 +01:00
Bixilon
357520d451
Merge branch 'developement' into render
...
# Conflicts:
# src/main/java/de/bixilon/minosoft/Minosoft.java
# src/main/java/de/bixilon/minosoft/gui/main/MainWindow.java
# src/main/resources/layout/cells/account.fxml
2020-10-21 22:08:21 +02:00
Bixilon
ef967b19bc
ExecutorService: print exception, if occurs
2020-10-20 14:43:16 +02:00
Lukas
4a6e12c690
wip improved combined block models file
2020-10-19 21:57:59 +02:00
Lukas
3e34ec040c
another new block loading system
2020-10-17 17:38:05 +02:00
Bixilon
6c7d6db505
improve code, remove some warnings
2020-10-07 23:22:31 +02:00
Bixilon
739f861bf6
Fix mappings downloading (missing folder creation)
2020-09-23 21:33:58 +02:00
Bixilon
6560a704c9
refactor code
2020-09-22 19:59:10 +02:00
Bixilon
195d31adb6
readme for the util python scripts
2020-09-03 22:04:43 +02:00
