Commit Graph

2670 Commits

Author SHA1 Message Date
Steveplays28 1ea62fd5ec Merge remote-tracking branch 'upstream/main'
# Conflicts:
#	common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/BiomeWrapper.java
#	common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/BlockStateWrapper.java
#	common/src/main/java/com/seibel/distanthorizons/common/wrappers/misc/ServerPlayerWrapper.java
#	common/src/main/java/com/seibel/distanthorizons/common/wrappers/world/ClientLevelWrapper.java
#	common/src/main/java/com/seibel/distanthorizons/common/wrappers/world/ServerLevelWrapper.java
#	coreSubProjects
#	fabric/src/main/java/com/seibel/distanthorizons/fabric/FabricClientProxy.java
#	forge/src/main/java/com/seibel/distanthorizons/forge/ForgeClientProxy.java
2023-08-15 15:55:33 +02:00
coolGi c53cf3f870 Fixed fabric 1.16.5 2023-08-15 14:51:57 +09:30
coolGi 4f0da248e3 Fixed git submodule not getting commit 2023-08-15 14:44:10 +09:30
coolGi 44688afeb9 Updated settings.gradle to 1.20.1 2023-08-15 13:23:07 +09:30
coolGi 4301ed9917 Fixed building for pre 1.19 2023-08-15 13:16:39 +09:30
coolGi 0b26f8ce3c Updated core subproject 2023-08-15 13:00:51 +09:30
coolGi 815aed53fc Removed unused accessors 2023-08-15 13:00:41 +09:30
coolGi 9cde0edfa3 Didnt merge it correctly 2023-08-15 12:52:59 +09:30
coolGi 70b3ba0040 Merge remote-tracking branch 'origin/main'
# Conflicts:
#	coreSubProjects
#	fabric/src/main/java/com/seibel/distanthorizons/fabric/FabricClientProxy.java
#	fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/client/MixinLevelRenderer.java
#	fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/mods/sodium/MixinSodiumRenderer.java
#	fabric/src/main/java/com/seibel/distanthorizons/fabric/wrappers/modAccessor/SodiumAccessor.java
2023-08-15 12:50:20 +09:30
coolGi 32c89b1af9 Updated core submodule 2023-08-15 12:47:43 +09:30
coolGi 21144a7ce4 Fix to sodium, now no longer requiring Mixins 2023-08-15 12:47:13 +09:30
James Seibel 0935a6e94b Fix ClientBlockDetailMap.getBlockStateData not passing the BlockPos
Thanks Builderb0y
2023-08-14 22:01:03 -05:00
coolGi f28f09dd40 Tmp fix for sodium 2023-08-15 11:54:41 +09:30
James Seibel f564755d66 Apply editorconfig auto formatting 2023-08-14 21:16:13 -05:00
James Seibel 2af274171c Create .editorconfig 2023-08-14 20:48:14 -05:00
Steveplays28 aaf0361c50 fix: Fix BlockStateWrapper and Biome serializing to empty strings 2023-08-15 00:03:12 +02:00
Steveplays28 a08feebde0 fix: Fix server trying to access client instance 2023-08-14 19:23:57 +02:00
Steveplays28 f7131fd2ca fix: Fix 1.20.1 compilation 2023-08-14 15:44:45 +02:00
Steveplays28 2100f4a6fe Merge remote-tracking branch 'upstream/main'
# Conflicts:
#	common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/BiomeWrapper.java
#	coreSubProjects
2023-08-14 15:40:31 +02:00
James Seibel de726b7669 Fix ModGitInfo crashing on release MC 2023-08-14 07:30:48 -05:00
James Seibel 22d134e786 Fix MC 1.17 compiling 2023-08-14 07:12:56 -05:00
James Seibel 642b040f65 change the default MC version to 1.20.1 2023-08-13 18:07:32 -05:00
James Seibel 0cc883b6c3 Fix unnecessary region file concurrency warnings in MC 1.16 and 1.17 2023-08-13 17:51:10 -05:00
James Seibel 902362f54f Fix 1.16 and 1.17 compiling 2023-08-13 17:23:36 -05:00
James Seibel f9c946e3ce Improve DhLightingEngine performance 2023-08-13 17:10:45 -05:00
James Seibel 9020d5bbe6 Replace ChunkWrapper light hash maps with 1D arrays 2023-08-13 17:02:45 -05:00
Steveplays28 996f097b9d refactor: Re-add old serialization method
This is used by some override methods that don't have access to the level.
These old serialization methods have `FIXME`s so they're easy to find in the future.
2023-08-13 23:18:52 +02:00
Steveplays28 2e1d737268 Merge remote-tracking branch 'upstream/main'
# Conflicts:
#	common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/BiomeWrapper.java
#	common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/BlockStateWrapper.java
#	coreSubProjects
2023-08-13 22:34:07 +02:00
James Seibel fe973d27b9 Merge branch 'main' of gitlab.com:jeseibel/minecraft-lod-mod 2023-08-13 13:37:43 -05:00
James Seibel e9c1f41f50 Fix the game instantly crashing due to running out of memory 2023-08-13 13:37:35 -05:00
s809 d374870fb7 Generation task prioritization (loaded > unloaded > ungenerated) 2023-08-13 18:59:42 +05:00
James Seibel 630e3bf16f Merge branch 'local.docker.compile' into 'main'
Local docker compile

See merge request jeseibel/minecraft-lod-mod!33
2023-08-12 22:05:29 +00:00
Null 511 27df83f8e7 Local docker compile 2023-08-12 22:05:29 +00:00
James Seibel 4ad9bb0d71 Fix FullDataPointIdMap (de)serialization duplicate Entries
Potentially fix serializing Biomes/Blocks after a level has been shut down.
Also increase DATA_FORMAT_VERSION 2 -> 3
2023-08-12 16:17:59 -05:00
s809 5c303df32c Update core 2023-08-13 01:53:45 +05:00
s809 dfc4b51e89 Merge branch 'main' of https://gitlab.com/jeseibel/minecraft-lod-mod 2023-08-13 01:53:22 +05:00
coolGi 4fcd4cb2f7 Merge branch 'cicd.cleanup' into 'main'
CICD Improvements

See merge request jeseibel/minecraft-lod-mod!32
2023-08-08 22:09:51 +00:00
Null 511 15beb792d1 CICD Improvements 2023-08-08 22:09:51 +00:00
s809 765202d582 Merge branch 'main' of https://gitlab.com/jeseibel/minecraft-lod-mod 2023-08-08 20:58:21 +05:00
s809 0d2e5adbed Skip version if step failed in buildAll 2023-08-08 20:30:19 +05:00
s809 68e9d64779 Fix compiling (except 1.16.5 & 1.17.1) 2023-08-08 20:25:07 +05:00
coolGi 401daf907c Updated core sub-module 2023-08-08 21:23:38 +09:30
coolGi a3f6f51a7a Temporary fix for sodium 0.5's fog occlusion 2023-08-08 21:23:25 +09:30
coolGi e4cd89131e Removed test git stage 2023-08-08 20:41:23 +09:30
coolGi 32d8553b9b Added a temporary ci stage to test git 2023-08-08 20:36:35 +09:30
s809 b64b44f301 Merge branch 'main' of https://gitlab.com/jeseibel/minecraft-lod-mod 2023-08-08 12:48:37 +05:00
coolGi 092fc45a36 Updated core submodule 2023-08-07 22:05:13 +09:30
coolGi 9f58cf305f Added a warning if value doesn't have a way to display it 2023-08-07 22:05:04 +09:30
coolGi c1370e74a2 Updated core sub-module 2023-08-07 21:10:54 +09:30
coolGi 3b3ec1eee2 DH Jar now knows git version that it was built from 2023-08-07 21:10:45 +09:30