Bixilon
aa3b9a1a05
mappingsDownloader.py: remove entities (burger), add blockModels.json (chain load other python file)
2020-11-15 18:51:15 +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
Bixilon
68d8f68413
wip documentation of config file
2020-11-06 18:54:17 +01:00
Bixilon
364f2736cb
fix bug in BlockPosition constructor (used x not y)
2020-11-05 23:12:01 +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
a5b4dabfd4
Fix error in assets downloading
...
In d32e04ba13618c2b62b3716b323c7cce74df4578 I introduced a memory fix, that does not save the asset in ram as byte array. I forgot to write only specific bytes to the output stream, fixed here. You should delete the objects folder in you appdata.
2020-11-05 22:05:50 +01:00
Bixilon
6ef561dd69
Fix copyright spacing
2020-11-05 21:38:21 +01:00
Bixilon
fad6c30c8c
Listen for lan servers and show them in server list
2020-11-05 14:06:49 +01:00
Bixilon
95da6eb9e2
launcher: make modals closeable with esc key
2020-11-04 14:42:52 +01:00
Bixilon
f9c791cf39
startup error: make error copyable, improve code
2020-11-04 14:13:48 +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
35a761252d
Improve math for allTextures.png length determination
2020-11-03 23:29:29 +01:00
Bixilon
f3090c6ec5
Merge branch 'development' into render
...
# Conflicts:
# pom.xml
2020-11-03 23:16:26 +01:00
Bixilon
ffe79ed618
Fix maven build instructions
...
Maven javafx:run fails because of java 15. This commit also removes some maven stuff, which is not needed anymore
2020-11-03 23:13:44 +01:00
Bixilon
445643f23d
render: (hopefully) fix SIGSEGV jvm crash
...
It looks like that the jvm crashes when preparing the render window while JavaFX is launching an window. Weired.
2020-11-03 22:57:56 +01:00
Bixilon
687410bc31
Merge branch 'development' into render
2020-11-03 20:08:30 +01:00
Bixilon
e24b657c3f
More custom exceptions
2020-11-03 20:07:19 +01:00
Bixilon
ae685e9068
Move ConfigurationPaths into type based paths, add some custom exceptions, ...
2020-11-03 19:43:25 +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
3b05e7670a
Improve slotEquals and ingredientEquals methods
2020-11-03 18:09:53 +01:00
Bixilon
a666b0c924
TextComponents: reuse same ObservableList (JavaFX)
2020-11-03 18:05:27 +01:00
Bixilon
cad9766d51
assets: verify hash before downloading a file, critical error: print canonical name, upgrade assets to 1.16.4
2020-11-03 16:25:25 +01:00
Bixilon
7fe2cacbef
launcher version dropdown: fix wrong sorting of versions
2020-11-03 15:46:52 +01:00
Bixilon
aec14fa573
1.16.4
2020-11-03 15:45:01 +01:00
Bixilon
d32e04ba13
Assets: use input stream twice (reduce memory usage)
2020-11-03 15:33:33 +01:00
Bixilon
f79b438108
Merge branch 'development' into render
...
# Conflicts:
# pom.xml
# src/main/java/de/bixilon/minosoft/data/world/BlockPosition.java
# src/main/java/de/bixilon/minosoft/data/world/Chunk.java
# src/main/java/de/bixilon/minosoft/data/world/ChunkSection.java
# src/main/java/de/bixilon/minosoft/data/world/InChunkLocation.java
# src/main/java/de/bixilon/minosoft/data/world/World.java
# src/main/java/de/bixilon/minosoft/util/ChunkUtil.java
2020-11-03 15:08:25 +01:00
Bixilon
c2f6c45273
remove World::name, rename ChunkNibble to ChunkSection
2020-11-03 14:51:11 +01:00
Bixilon
932dc995bc
ReadMe.md: Add compile commands
2020-11-03 13:39:49 +01:00
