599 Commits

Author SHA1 Message Date
Bixilon
f080432749
Show start progress not always on top, do not open gui while starting, fix window blocking 2020-10-28 17:19:46 +01:00
Lukas
2c74ed6637 Merge remote-tracking branch 'origin/render' into render 2020-10-28 16:23:47 +01:00
Bixilon
025af06c91
Merge branch 'developement' into render
# Conflicts:
#	src/main/java/de/bixilon/minosoft/data/entities/VillagerData.java
#	src/main/java/de/bixilon/minosoft/util/mojang/api/MojangAccount.java
2020-10-28 16:20:07 +01:00
Bixilon
547b184198
Improve AsyncTaskWorker, fix potential infinity hold in AsyncTaskWorker 2020-10-28 16:17:03 +01:00
Lukas
6c1a461ab4 Block rendering: Correct block rotations 2020-10-27 22:14:25 +01:00
Bixilon
e85f548fd2
1.16.4-rc1 2020-10-27 18:39:18 +01:00
Bixilon
799095e8c7
reformat code 2020-10-26 15:13:15 +01:00
Bixilon
be0b1bdbd0
Task: allow string array as parameter (not only hashset) 2020-10-25 13:43:16 +01:00
Bixilon
723bcc3e55
manage account error: translate 2020-10-25 13:42:42 +01:00
Bixilon
066535be40
show progress (as number) in startup window 2020-10-24 14:06:02 +02:00
Bixilon
645ce43316
fix start latch counting (mods) 2020-10-24 13:32:05 +02:00
Bixilon
d26cb727a0
add every mod with every phase to StartUp Latch 2020-10-24 12:42:53 +02:00
Bixilon
5c28887153
upgrade asses to 1.16.4-pre2, bump guava 2020-10-23 20:59:18 +02:00
Bixilon
5d3fc64652
remove snakeyaml as dependency 2020-10-23 20:30:38 +02:00
Bixilon
809c9f5c15
Merge branch 'developement' into render
# Conflicts:
#	src/main/java/de/bixilon/minosoft/Minosoft.java
#	src/main/java/de/bixilon/minosoft/util/ChunkUtil.java
2020-10-23 20:20:01 +02:00
Bixilon
89bd924bee
main window: fix "Manage Account Modal" not blocking main window 2020-10-23 20:14:30 +02:00
Bixilon
9d12a40596
check sha1 of assets (optionally), hide all other windows, when fatal error occurred 2020-10-23 20:08:05 +02:00
Bixilon
16ef8d7b06
Util: set buffer size to 4096 2020-10-23 19:32:31 +02:00
Bixilon
5315681395
Way improved start up task handling, working progress bar in startup modal, bug fixes 2020-10-23 19:27:12 +02:00
Bixilon
6805326c03
server list: fix no connection error after refresh when first ping failed 2020-10-22 21:56:51 +02:00
Bixilon
de05416943
remove some typos in readMe files 2020-10-22 21:50:11 +02:00
Bixilon
7ddb059606
1.16.4-pre2 2020-10-22 18:22:59 +02:00
Bixilon
25df5b0706
introduce versionIds (replace protocolIds for must stuff) to handle recent changes in protocol versioning 2020-10-22 17:02:26 +02:00
Bixilon
33e12be77e
texture loading: use new assets system 2020-10-21 22:57:48 +02:00
Bixilon
22a99999ea
remove System.out references in rendering, optimisations 2020-10-21 22:37:19 +02: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
40e3c9f402
only check jar assets when assets index was not generated yet 2020-10-21 21:52:22 +02:00
Bixilon
d1b6a581f7
remove useless enum::getId to Enum::ordinal aliases 2020-10-21 20:23:04 +02:00
Bixilon
46d4a0ab06
add sortingId to ensure correct version order (mojang now sets the 30st bit to tell that it is a snapshot) 2020-10-21 20:15:51 +02:00
Bixilon
f1a180fbf1
workaround javafx and TranslatableComponent 2020-10-21 19:37:02 +02:00
Bixilon
075c7ec583
add system requirements to ReadMe.md 2020-10-20 20:40:11 +02:00
Bixilon
ef967b19bc
ExecutorService: print exception, if occurs 2020-10-20 14:43:16 +02:00
Bixilon
dea4f5253b
add TranslatableComponent, fix #7 2020-10-19 22:46:03 +02:00
Lukas
4a6e12c690 wip improved combined block models file 2020-10-19 21:57:59 +02:00
Bixilon
3231b0266e
AssetsManager (download all assets from mojang, generate jar resources, etc) 2020-10-19 21:55:45 +02:00
Bixilon
e1a0fdd289
Assets saving idea 2020-10-19 18:19:13 +02:00
Bixilon
06fdb3d676
add ReadMe in utility 2020-10-18 13:21:31 +02:00
Bixilon
009c97d6b1
1.16.4-pre1 2020-10-17 18:09:54 +02:00
Lukas
3e34ec040c another new block loading system 2020-10-17 17:38:05 +02:00
Bixilon
5f2552ea81
multi language support (en, de) 2020-10-17 17:21:00 +02:00
Bixilon
51e6b4a7f2
fix merge issues 2020-10-16 14:44:03 +02:00
Bixilon
7459ca769b
wip fix merge issues 2020-10-16 14:32:33 +02:00
Bixilon
5b22d12346
Merge branch 'master' into render
# Conflicts:
#	pom.xml
#	src/main/java/de/bixilon/minosoft/Minosoft.java
#	src/main/java/de/bixilon/minosoft/config/Configuration.java
#	src/main/java/de/bixilon/minosoft/data/Player.java
#	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/ChunkNibble.java
#	src/main/java/de/bixilon/minosoft/data/world/World.java
#	src/main/java/de/bixilon/minosoft/gui/main/Server.java
#	src/main/java/de/bixilon/minosoft/gui/main/SettingsWindow.java
#	src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketBlockAction.java
#	src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketChunkData.java
#	src/main/java/de/bixilon/minosoft/protocol/protocol/PacketHandler.java
#	src/main/java/de/bixilon/minosoft/util/ChunkUtil.java
#	src/main/java/de/bixilon/minosoft/util/mojang/api/MojangAccount.java
2020-10-15 23:36:11 +02:00
Bixilon
f76791f973 Merge branch 'modding' into 'master'
Modding

See merge request bixilon/minosoft!17
2020-10-15 23:13:37 +02:00
Bixilon
c54fac11d2
more refactoring 2020-10-15 00:00:23 +02:00
Bixilon
2029deeca7
mojang: remove status, more enum refactoring, code quality improvement 2020-10-14 15:00:32 +02:00
Bixilon
19626a37d9
rename package game.datatypes to data 2020-10-14 14:39:30 +02:00
Bixilon
794723571e
make more entity meta data classes abstract 2020-10-13 21:09:13 +02:00
Bixilon
9a4378c869
wip: do not save block entity meta data as nbt (custom data format) 2020-10-12 20:37:14 +02:00
Bixilon
8af90eee42
fix shulker box error (block action) 2020-10-12 17:55:01 +02:00