Commit Graph

2690 Commits

Author SHA1 Message Date
Steveplays28 23ca022ee9 Merge remote-tracking branch 'upstream/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
2023-08-18 15:11:59 +02:00
Steveplays28 6c80165523 chore: Remove username from Fabric build script 2023-08-18 15:08:48 +02:00
s809 d598061fa7 Add missing level wrapper argument (and a bunch of null checks) 2023-08-18 15:04:49 +02:00
James Seibel e12d7766d6 Fix a null pointer in ClassicConfigGui 2023-08-18 07:59:28 -05:00
James Seibel e43ee68508 Fix preset configs not applying after the UI screen changes 2023-08-18 07:51:15 -05:00
James Seibel 9a9aac64af Update coreSubProjects 2023-08-17 22:18:00 -05:00
James Seibel 5193a3313d Merge branch 'main' into 'main'
Fix querying block colors at constant position.

See merge request jeseibel/minecraft-lod-mod!34
2023-08-18 03:05:23 +00:00
James Seibel 2ff1b80650 Fix weird rendering on Intel GPUs 2023-08-17 21:05:05 -05:00
Builderb0y 7e0e51103b Fix querying block colors at constant position. 2023-08-18 01:57:08 +00:00
coolGi 2977486866 Merge remote-tracking branch 'origin/main'
# Conflicts:
#	coreSubProjects
2023-08-17 23:27:48 +09:30
coolGi bb9df60004 Updated core subproject 2023-08-17 23:25:36 +09:30
James Seibel a1b42f61fb Update coreSubProjects 2023-08-17 07:23:25 -05:00
Steveplays28 02498aa189 fix: Fix index out of bounds errors and LOD pillars
The `BiomeWrapper#equals` and `BlockStateWrapper#equals` methods didn't use the right `LevelWrapper` for serializing the object to compare to, this is now fixed.
2023-08-16 13:25:23 +02:00
coolGi b394c01f47 Changed inject to the correct point (thx @Steveplays) 2023-08-16 20:02:49 +09:30
coolGi c047996592 This revert commit 21144a7c 2023-08-16 19:38:49 +09:30
Steveplays28 d535f6aa57 fix: Comment out leftover Immersive Portals compat
A bit I didn't notice while making the previous commit.
2023-08-16 11:42:02 +02:00
Steveplays28 933753a38a fix: Comment out Immersive Portals compat
The renderer compat was commented out in upstream, but the rest of the compat wasn't commented out, or lost in a merge.
2023-08-16 11:40:46 +02:00
James Seibel cc2340d1b9 Add a .editorconfig to core 2023-08-15 20:50:52 -05:00
James Seibel 01b233e968 Potentially fix lag when moving across chunk borders 2023-08-15 20:49:29 -05:00
Steveplays28 5483cdbc51 refactor: Update to Sodium 0.5.1
This reverts commits 815aed53 and 21144a7c.
2023-08-15 16:18:05 +02:00
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