Compare commits
193 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 7c4ac2bd7e | |||
| 8c13c2cf47 | |||
| 802019ff72 | |||
| 141890556c | |||
| 353838db41 | |||
| f1547477c9 | |||
| 535a645a84 | |||
| 2dc7f02b32 | |||
| 50bdb73a52 | |||
| 53e6c95432 | |||
| 36f0029e45 | |||
| 5067e970a2 | |||
| 167ca94e69 | |||
| 8d94b86bfd | |||
| a29567430e | |||
| fb2dae48e2 | |||
| 948b4bfd9c | |||
| ca44256ca9 | |||
| a29b6a5aab | |||
| 868254ccc8 | |||
| 195fde8d73 | |||
| ce7b9b94b6 | |||
| 1f0c2e286a | |||
| f79fd5e06f | |||
| 47c1d3955f | |||
| 2c5f5a3d4c | |||
| 81c533051e | |||
| 5cbe5ecfd8 | |||
| d4b4d28c9f | |||
| b8e653b5f7 | |||
| 80fea09598 | |||
| 1d4f914a9f | |||
| bf92dea2eb | |||
| 2dd675b8da | |||
| ff3145336d | |||
| 280181c91e | |||
| 60232e713b | |||
| 55d9030954 | |||
| 452bd75f5d | |||
| 72be1e2602 | |||
| 1c30213aca | |||
| e9a044308f | |||
| 1aabc0c792 | |||
| 4a1513ed65 | |||
| 6d98c9cb84 | |||
| b1b0642fbe | |||
| eecb28d11f | |||
| 90564f2537 | |||
| ded0b979cf | |||
| ed9cc5485c | |||
| cbd5974657 | |||
| 0e5fba58ab | |||
| 2943e63382 | |||
| 30564aade7 | |||
| aabb90ada6 | |||
| 963a8dc53f | |||
| aa6d69385b | |||
| f42c9cf8fb | |||
| 92e0011c8d | |||
| c20d95a7c7 | |||
| 353aa1ed2c | |||
| 5aa43ebcc8 | |||
| b6145461b6 | |||
| 478e431076 | |||
| 6feb7f1b42 | |||
| 016fc66293 | |||
| 6d3e30d425 | |||
| 5be5c5a5bc | |||
| ed5aeb8951 | |||
| 7f0ddadf26 | |||
| a2c61ed278 | |||
| 99eb4ac8a1 | |||
| c75902d9d6 | |||
| 1743949ba5 | |||
| a74a37a0e8 | |||
| 4ed7941288 | |||
| ec59a5f754 | |||
| 895e04b7cc | |||
| 8f0930fa02 | |||
| c1c4328fa5 | |||
| 91240e4f7a | |||
| 17c61a97cc | |||
| b78b852ffb | |||
| 26d4220967 | |||
| 5edc73cc03 | |||
| 6fcfc9379e | |||
| 149fbccfa5 | |||
| 5ca754d2ac | |||
| f13744e858 | |||
| 64ac218003 | |||
| 385bd326cf | |||
| 4e9559f230 | |||
| 6ea864ef6b | |||
| 4e96728c25 | |||
| 1c44ef7f0c | |||
| 227d0d09ba | |||
| d7ba3fa724 | |||
| 7e46adf469 | |||
| f43e2fa441 | |||
| f9819d3d46 | |||
| 19b23bea5f | |||
| d1c0f7ebb4 | |||
| 5a4ddafbbb | |||
| 7c40d96f2e | |||
| b535be16c0 | |||
| 22f5608f9a | |||
| a498422843 | |||
| bfd6efb4a4 | |||
| c8c9df3a34 | |||
| 3349e5b898 | |||
| ed7511ff6a | |||
| 8516e8f9ab | |||
| 47a4d1535f | |||
| 33a55dc7cd | |||
| 1b4f9e8942 | |||
| 2537c4a259 | |||
| b74b6e8068 | |||
| 25979d6a76 | |||
| 3f287388d5 | |||
| 72d2ba6aae | |||
| 611ed4e24a | |||
| eac7a38e73 | |||
| afd7da7763 | |||
| ff7abb6a18 | |||
| ca3f5da5de | |||
| 69012ab7e6 | |||
| e5e502b4f8 | |||
| 42dc0903de | |||
| 4b20637e47 | |||
| 3257ae8480 | |||
| a6ddc561a0 | |||
| 7c82c9eb7b | |||
| 3c62e18502 | |||
| eea5198fb6 | |||
| b82a59ecbc | |||
| 6bfcf36687 | |||
| 6fe0df7d0f | |||
| b9746381eb | |||
| 91dffa3c3e | |||
| 6eb24ecde1 | |||
| 767753c004 | |||
| 97442f8833 | |||
| 62359e3dde | |||
| b5199cfa87 | |||
| f0acc73c56 | |||
| f9dfc38bf1 | |||
| 5c5d39738e | |||
| 27fb629c22 | |||
| c374bf7ca8 | |||
| 7e04b12e37 | |||
| 67637dbf10 | |||
| 6456651d27 | |||
| 9343854b4a | |||
| 5fd8ed840f | |||
| 4d4d8fd8e9 | |||
| bf05965015 | |||
| 47569f2b3c | |||
| 0567195f73 | |||
| e355366ffc | |||
| 3681d50eb2 | |||
| e0c143881f | |||
| 2a49fdee7f | |||
| f39e06b6dc | |||
| 0d5c454dd4 | |||
| 1b447fdc98 | |||
| d84ba05380 | |||
| 3e7f160fcd | |||
| dcaf334828 | |||
| 789306ccff | |||
| e33fa3cb5e | |||
| 8f99117066 | |||
| 2136c0fe83 | |||
| 7a6cffe19d | |||
| 06bef93c82 | |||
| 939e45ce62 | |||
| 7f958269e4 | |||
| 07e3091d13 | |||
| f7ece2b02e | |||
| bd796c2ce0 | |||
| 4e6be35da9 | |||
| 0e0e1e1b0f | |||
| f4ab101403 | |||
| 0902d3f0f5 | |||
| 75c2758fd5 | |||
| 9ddd917f3b | |||
| c5945b1254 | |||
| 9060579615 | |||
| 8f0217185f | |||
| 656971b0b9 | |||
| 5fa3a11024 | |||
| ed3d00bfce | |||
| 034ec7d656 | |||
| fb5e15a2f1 |
+1
-1
@@ -10,7 +10,7 @@ insert_final_newline = false
|
|||||||
max_line_length = 1000
|
max_line_length = 1000
|
||||||
tab_width = 4
|
tab_width = 4
|
||||||
trim_trailing_whitespace = false
|
trim_trailing_whitespace = false
|
||||||
ij_continuation_indent_size = 8
|
ij_continuation_indent_size = 4
|
||||||
ij_formatter_off_tag = @formatter:off
|
ij_formatter_off_tag = @formatter:off
|
||||||
ij_formatter_on_tag = @formatter:on
|
ij_formatter_on_tag = @formatter:on
|
||||||
ij_formatter_tags_enabled = true
|
ij_formatter_tags_enabled = true
|
||||||
|
|||||||
@@ -39,10 +39,6 @@ package com.seibel.distanthorizons.api.enums;
|
|||||||
*/
|
*/
|
||||||
public enum EDhApiDetailLevel
|
public enum EDhApiDetailLevel
|
||||||
{
|
{
|
||||||
// Reminder:
|
|
||||||
// when adding items up the API minor version
|
|
||||||
// when removing items up the API major version
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* detail level: 0 <Br>
|
* detail level: 0 <Br>
|
||||||
* width in Blocks: 1
|
* width in Blocks: 1
|
||||||
|
|||||||
@@ -28,10 +28,6 @@ package com.seibel.distanthorizons.api.enums.config;
|
|||||||
*/
|
*/
|
||||||
public enum EDhApiBlocksToAvoid
|
public enum EDhApiBlocksToAvoid
|
||||||
{
|
{
|
||||||
// Reminder:
|
|
||||||
// when adding items up the API minor version
|
|
||||||
// when removing items up the API major version
|
|
||||||
|
|
||||||
NONE(false),
|
NONE(false),
|
||||||
NON_COLLIDING(true);
|
NON_COLLIDING(true);
|
||||||
|
|
||||||
|
|||||||
+22
-10
@@ -22,7 +22,9 @@ package com.seibel.distanthorizons.api.enums.config;
|
|||||||
/**
|
/**
|
||||||
* UNCOMPRESSED <br>
|
* UNCOMPRESSED <br>
|
||||||
* LZ4 <br>
|
* LZ4 <br>
|
||||||
* XZ <br><br>
|
* Z_STD <br>
|
||||||
|
* Z_STD_STREAM <br>
|
||||||
|
* LZMA2 <br><br>
|
||||||
*
|
*
|
||||||
* Note: speed and compression ratios are examples
|
* Note: speed and compression ratios are examples
|
||||||
* and should only be used for estimated comparisons.
|
* and should only be used for estimated comparisons.
|
||||||
@@ -32,10 +34,6 @@ package com.seibel.distanthorizons.api.enums.config;
|
|||||||
*/
|
*/
|
||||||
public enum EDhApiDataCompressionMode
|
public enum EDhApiDataCompressionMode
|
||||||
{
|
{
|
||||||
// Reminder:
|
|
||||||
// when adding items up the API minor version
|
|
||||||
// when removing items up the API major version
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Should only be used internally and for unit testing. <br><br>
|
* Should only be used internally and for unit testing. <br><br>
|
||||||
*
|
*
|
||||||
@@ -56,18 +54,32 @@ public enum EDhApiDataCompressionMode
|
|||||||
LZ4(1),
|
LZ4(1),
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Decent speed and good compression. <br><br>
|
* Great speed and good compression. <br><br>
|
||||||
*
|
*
|
||||||
|
* Read Speed: 2.1 MS / DTO <br>
|
||||||
|
* Write Speed: 4.9 MS / DTO <br>
|
||||||
|
* Compression ratio: 0.2606 <br>
|
||||||
|
*/
|
||||||
|
Z_STD_BLOCK(4),
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Similar to {@link EDhApiDataCompressionMode#Z_STD_BLOCK}
|
||||||
|
* except slower. <br><br>
|
||||||
|
*
|
||||||
|
* This option is only provided for legacy support when processing old databases. <br><br>
|
||||||
|
*
|
||||||
* Read Speed: 9.31 MS / DTO <br>
|
* Read Speed: 9.31 MS / DTO <br>
|
||||||
* Write Speed: 15.13 MS / DTO <br>
|
* Write Speed: 15.13 MS / DTO <br>
|
||||||
* Compression ratio: 0.2606 <br>
|
* Compression ratio: 0.2606 <br>
|
||||||
*/
|
*/
|
||||||
Z_STD(2),
|
@Deprecated
|
||||||
|
@DisallowSelectingViaConfigGui
|
||||||
|
Z_STD_STREAM(2),
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Extremely slow, but very good compression. <br><br>
|
* Extremely slow, but very good compression. <br>
|
||||||
*
|
* Often causes whole computer stuttering due to memory bandwidth saturation. <br><br>
|
||||||
|
*
|
||||||
* Read Speed: 13.29 MS / DTO <br>
|
* Read Speed: 13.29 MS / DTO <br>
|
||||||
* Write Speed: 70.95 MS / DTO <br>
|
* Write Speed: 70.95 MS / DTO <br>
|
||||||
* Compression ratio: 0.2068 <br>
|
* Compression ratio: 0.2068 <br>
|
||||||
|
|||||||
+4
@@ -44,6 +44,10 @@ public enum EDhApiGpuUploadMethod
|
|||||||
/** Fast rendering but may stutter when uploading. */
|
/** Fast rendering but may stutter when uploading. */
|
||||||
SUB_DATA(false, false),
|
SUB_DATA(false, false),
|
||||||
|
|
||||||
|
///** Don't upload, only should be used for debugging */
|
||||||
|
//@Deprecated
|
||||||
|
//NONE(false, false),
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* May end up storing buffers in System memory. <br>
|
* May end up storing buffers in System memory. <br>
|
||||||
* Fast rending if in GPU memory, slow if in system memory, <br>
|
* Fast rending if in GPU memory, slow if in system memory, <br>
|
||||||
|
|||||||
-4
@@ -29,10 +29,6 @@ package com.seibel.distanthorizons.api.enums.config;
|
|||||||
*/
|
*/
|
||||||
public enum EDhApiGrassSideRendering
|
public enum EDhApiGrassSideRendering
|
||||||
{
|
{
|
||||||
// Reminder:
|
|
||||||
// when adding items up the API minor version
|
|
||||||
// when removing items up the API major version
|
|
||||||
|
|
||||||
AS_GRASS,
|
AS_GRASS,
|
||||||
FADE_TO_DIRT,
|
FADE_TO_DIRT,
|
||||||
AS_DIRT;
|
AS_DIRT;
|
||||||
|
|||||||
-5
@@ -31,11 +31,6 @@ package com.seibel.distanthorizons.api.enums.config;
|
|||||||
*/
|
*/
|
||||||
public enum EDhApiHorizontalQuality
|
public enum EDhApiHorizontalQuality
|
||||||
{
|
{
|
||||||
// Reminder:
|
|
||||||
// when adding items up the API minor version
|
|
||||||
// when removing items up the API major version
|
|
||||||
|
|
||||||
|
|
||||||
// Note: any quadraticBase less than 2.0f has issues with DetailDistanceUtil, and will always return the lowest detail level.
|
// Note: any quadraticBase less than 2.0f has issues with DetailDistanceUtil, and will always return the lowest detail level.
|
||||||
// So for now we are limiting the lowest value to 2.0
|
// So for now we are limiting the lowest value to 2.0
|
||||||
// LOWEST was originally 1.0f and LOW was 1.5f
|
// LOWEST was originally 1.0f and LOW was 1.5f
|
||||||
|
|||||||
@@ -29,10 +29,6 @@ package com.seibel.distanthorizons.api.enums.config;
|
|||||||
*/
|
*/
|
||||||
public enum EDhApiLodShading
|
public enum EDhApiLodShading
|
||||||
{
|
{
|
||||||
// Reminder:
|
|
||||||
// when adding items up the API minor version
|
|
||||||
// when removing items up the API major version
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Uses Minecraft's shading for LODs. <Br>
|
* Uses Minecraft's shading for LODs. <Br>
|
||||||
* This means if Minecraft's shading is disabled DH's shading will be as well.
|
* This means if Minecraft's shading is disabled DH's shading will be as well.
|
||||||
|
|||||||
+25
-11
@@ -17,23 +17,37 @@
|
|||||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package com.seibel.distanthorizons.core.generation.tasks;
|
package com.seibel.distanthorizons.api.enums.config;
|
||||||
|
|
||||||
import java.util.concurrent.CompletableFuture;
|
import org.apache.logging.log4j.Level;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author Leetom
|
* ALL
|
||||||
* @version 2022-11-25
|
* DEBUG
|
||||||
|
* INFO
|
||||||
|
* WARN
|
||||||
|
* ERROR
|
||||||
|
* DISABLED
|
||||||
|
*
|
||||||
|
* @since API 5.0.0
|
||||||
|
* @version 2024-4-6
|
||||||
*/
|
*/
|
||||||
public final class InProgressWorldGenTaskGroup
|
public enum EDhApiLoggerLevel
|
||||||
{
|
{
|
||||||
public final WorldGenTaskGroup group;
|
// ordered from most to least broad
|
||||||
public CompletableFuture<Void> genFuture = null;
|
ALL(Level.ALL),
|
||||||
|
DEBUG(Level.DEBUG),
|
||||||
|
INFO(Level.INFO),
|
||||||
|
WARN(Level.WARN),
|
||||||
|
ERROR(Level.ERROR),
|
||||||
|
DISABLED(Level.OFF),
|
||||||
|
;
|
||||||
|
|
||||||
|
public final Level level;
|
||||||
|
|
||||||
|
EDhApiLoggerLevel(Level level)
|
||||||
|
{ this.level = level; }
|
||||||
|
|
||||||
|
|
||||||
public InProgressWorldGenTaskGroup(WorldGenTaskGroup group)
|
|
||||||
{
|
|
||||||
this.group = group;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -1,55 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of the Distant Horizons mod
|
|
||||||
* licensed under the GNU LGPL v3 License.
|
|
||||||
*
|
|
||||||
* Copyright (C) 2020 James Seibel
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU Lesser General Public License as published by
|
|
||||||
* the Free Software Foundation, version 3.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU Lesser General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Lesser General Public License
|
|
||||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package com.seibel.distanthorizons.api.enums.config;
|
|
||||||
|
|
||||||
import org.apache.logging.log4j.Level;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @since API 2.0.0
|
|
||||||
* @version 2024-4-6
|
|
||||||
*/
|
|
||||||
public enum EDhApiLoggerMode
|
|
||||||
{
|
|
||||||
DISABLED(Level.OFF, Level.OFF),
|
|
||||||
LOG_ALL_TO_FILE(Level.ALL, Level.OFF),
|
|
||||||
LOG_ERROR_TO_CHAT(Level.ALL, Level.ERROR),
|
|
||||||
LOG_WARNING_TO_CHAT(Level.ALL, Level.WARN),
|
|
||||||
LOG_INFO_TO_CHAT(Level.ALL, Level.INFO),
|
|
||||||
LOG_DEBUG_TO_CHAT(Level.ALL, Level.DEBUG),
|
|
||||||
LOG_ALL_TO_CHAT(Level.ALL, Level.ALL),
|
|
||||||
LOG_ERROR_TO_CHAT_AND_FILE(Level.ERROR, Level.ERROR),
|
|
||||||
LOG_WARNING_TO_CHAT_AND_FILE(Level.WARN, Level.WARN),
|
|
||||||
LOG_INFO_TO_CHAT_AND_FILE(Level.INFO, Level.INFO),
|
|
||||||
LOG_DEBUG_TO_CHAT_AND_FILE(Level.DEBUG, Level.DEBUG),
|
|
||||||
LOG_WARNING_TO_CHAT_AND_INFO_TO_FILE(Level.INFO, Level.WARN),
|
|
||||||
LOG_ERROR_TO_CHAT_AND_INFO_TO_FILE(Level.INFO, Level.ERROR),
|
|
||||||
LOG_ERROR_TO_CHAT_AND_WARNING_TO_FILE(Level.ERROR, Level.WARN),
|
|
||||||
;
|
|
||||||
|
|
||||||
public final Level levelForFile;
|
|
||||||
public final Level levelForChat;
|
|
||||||
|
|
||||||
EDhApiLoggerMode(Level levelForFile, Level levelForChat)
|
|
||||||
{
|
|
||||||
this.levelForFile = levelForFile;
|
|
||||||
this.levelForChat = levelForChat;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
+1
-4
@@ -64,10 +64,7 @@ public enum EDhApiMaxHorizontalResolution
|
|||||||
/** How wide each LOD DataPoint is */
|
/** How wide each LOD DataPoint is */
|
||||||
public final int dataPointWidth;
|
public final int dataPointWidth;
|
||||||
|
|
||||||
/**
|
/** This is the same as detailLevel in LodQuadTreeNode */
|
||||||
* This is the same as detailLevel in LodQuadTreeNode,
|
|
||||||
* lowest is 0 highest is 9
|
|
||||||
*/
|
|
||||||
public final byte detailLevel;
|
public final byte detailLevel;
|
||||||
|
|
||||||
/* Start/End X/Z give the block positions
|
/* Start/End X/Z give the block positions
|
||||||
|
|||||||
-4
@@ -33,10 +33,6 @@ package com.seibel.distanthorizons.api.enums.config;
|
|||||||
*/
|
*/
|
||||||
public enum EDhApiMcRenderingFadeMode
|
public enum EDhApiMcRenderingFadeMode
|
||||||
{
|
{
|
||||||
// Reminder:
|
|
||||||
// when adding items up the API minor version
|
|
||||||
// when removing items up the API major version
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* No fading is done, there will be a pronounced border between
|
* No fading is done, there will be a pronounced border between
|
||||||
* Minecraft and Distant Horizons. <br>
|
* Minecraft and Distant Horizons. <br>
|
||||||
|
|||||||
-5
@@ -35,11 +35,6 @@ package com.seibel.distanthorizons.api.enums.config;
|
|||||||
*/
|
*/
|
||||||
public enum EDhApiServerFolderNameMode
|
public enum EDhApiServerFolderNameMode
|
||||||
{
|
{
|
||||||
// Reminder:
|
|
||||||
// when adding items up the API minor version
|
|
||||||
// when removing items up the API major version
|
|
||||||
|
|
||||||
|
|
||||||
/** Only use the server name */
|
/** Only use the server name */
|
||||||
NAME_ONLY,
|
NAME_ONLY,
|
||||||
|
|
||||||
|
|||||||
-5
@@ -34,11 +34,6 @@ package com.seibel.distanthorizons.api.enums.config;
|
|||||||
@Deprecated // not currently in use, if the config this enum represents is re-implemented, the deprecated flag can be removed
|
@Deprecated // not currently in use, if the config this enum represents is re-implemented, the deprecated flag can be removed
|
||||||
public enum EDhApiVanillaOverdraw
|
public enum EDhApiVanillaOverdraw
|
||||||
{
|
{
|
||||||
// Reminder:
|
|
||||||
// when adding items up the API minor version
|
|
||||||
// when removing items up the API major version
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Don't draw LODs where a minecraft chunk could be.
|
* Don't draw LODs where a minecraft chunk could be.
|
||||||
* Use Overdraw Offset to tweak the border thickness.
|
* Use Overdraw Offset to tweak the border thickness.
|
||||||
|
|||||||
-4
@@ -28,10 +28,6 @@ package com.seibel.distanthorizons.api.enums.config;
|
|||||||
*/
|
*/
|
||||||
public enum EDhApiWorldCompressionMode
|
public enum EDhApiWorldCompressionMode
|
||||||
{
|
{
|
||||||
// Reminder:
|
|
||||||
// when adding items up the API minor version
|
|
||||||
// when removing items up the API major version
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Every block/biome change is recorded in the database. <br>
|
* Every block/biome change is recorded in the database. <br>
|
||||||
* This is what DH 2.0 and 2.0.1 all used by default and will store a lot of data.
|
* This is what DH 2.0 and 2.0.1 all used by default and will store a lot of data.
|
||||||
|
|||||||
-4
@@ -35,10 +35,6 @@ import com.seibel.distanthorizons.api.enums.config.DisallowSelectingViaConfigGui
|
|||||||
*/
|
*/
|
||||||
public enum EDhApiQualityPreset
|
public enum EDhApiQualityPreset
|
||||||
{
|
{
|
||||||
// Reminder:
|
|
||||||
// when adding items up the API minor version
|
|
||||||
// when removing items up the API major version
|
|
||||||
|
|
||||||
@DisallowSelectingViaConfigGui
|
@DisallowSelectingViaConfigGui
|
||||||
CUSTOM,
|
CUSTOM,
|
||||||
|
|
||||||
|
|||||||
-4
@@ -34,10 +34,6 @@ import com.seibel.distanthorizons.api.enums.config.DisallowSelectingViaConfigGui
|
|||||||
*/
|
*/
|
||||||
public enum EDhApiThreadPreset
|
public enum EDhApiThreadPreset
|
||||||
{
|
{
|
||||||
// Reminder:
|
|
||||||
// when adding items up the API minor version
|
|
||||||
// when removing items up the API major version
|
|
||||||
|
|
||||||
@DisallowSelectingViaConfigGui
|
@DisallowSelectingViaConfigGui
|
||||||
CUSTOM,
|
CUSTOM,
|
||||||
|
|
||||||
|
|||||||
-5
@@ -33,11 +33,6 @@ package com.seibel.distanthorizons.api.enums.rendering;
|
|||||||
*/
|
*/
|
||||||
public enum EDhApiDebugRendering
|
public enum EDhApiDebugRendering
|
||||||
{
|
{
|
||||||
// Reminder:
|
|
||||||
// when adding items up the API minor version
|
|
||||||
// when removing items up the API major version
|
|
||||||
|
|
||||||
|
|
||||||
/** LODs are rendered normally */
|
/** LODs are rendered normally */
|
||||||
OFF,
|
OFF,
|
||||||
|
|
||||||
|
|||||||
-4
@@ -33,10 +33,6 @@ package com.seibel.distanthorizons.api.enums.rendering;
|
|||||||
@Deprecated
|
@Deprecated
|
||||||
public enum EDhApiFogDrawMode
|
public enum EDhApiFogDrawMode
|
||||||
{
|
{
|
||||||
// Reminder:
|
|
||||||
// when adding items up the API minor version
|
|
||||||
// when removing items up the API major version
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Use whatever Fog setting Optifine is using.
|
* Use whatever Fog setting Optifine is using.
|
||||||
* If Optifine isn't installed this defaults to {@link EDhApiFogDrawMode#FOG_ENABLED}.
|
* If Optifine isn't installed this defaults to {@link EDhApiFogDrawMode#FOG_ENABLED}.
|
||||||
|
|||||||
@@ -30,11 +30,6 @@ package com.seibel.distanthorizons.api.enums.rendering;
|
|||||||
*/
|
*/
|
||||||
public enum EDhApiFogFalloff
|
public enum EDhApiFogFalloff
|
||||||
{
|
{
|
||||||
// Reminder:
|
|
||||||
// when adding items up the API minor version
|
|
||||||
// when removing items up the API major version
|
|
||||||
|
|
||||||
|
|
||||||
LINEAR(0),
|
LINEAR(0),
|
||||||
EXPONENTIAL(1),
|
EXPONENTIAL(1),
|
||||||
EXPONENTIAL_SQUARED(2);
|
EXPONENTIAL_SQUARED(2);
|
||||||
|
|||||||
-5
@@ -33,11 +33,6 @@ package com.seibel.distanthorizons.api.enums.rendering;
|
|||||||
*/
|
*/
|
||||||
public enum EDhApiHeightFogDirection
|
public enum EDhApiHeightFogDirection
|
||||||
{
|
{
|
||||||
// Reminder:
|
|
||||||
// when adding items up the API minor version
|
|
||||||
// when removing items up the API major version
|
|
||||||
|
|
||||||
|
|
||||||
ABOVE_CAMERA (true, true, false),
|
ABOVE_CAMERA (true, true, false),
|
||||||
BELOW_CAMERA (true, false, true),
|
BELOW_CAMERA (true, false, true),
|
||||||
ABOVE_AND_BELOW_CAMERA (true, true, true),
|
ABOVE_AND_BELOW_CAMERA (true, true, true),
|
||||||
|
|||||||
-5
@@ -29,11 +29,6 @@ package com.seibel.distanthorizons.api.enums.rendering;
|
|||||||
*/
|
*/
|
||||||
public enum EDhApiRendererMode
|
public enum EDhApiRendererMode
|
||||||
{
|
{
|
||||||
// Reminder:
|
|
||||||
// when adding items up the API minor version
|
|
||||||
// when removing items up the API major version
|
|
||||||
|
|
||||||
|
|
||||||
DEFAULT,
|
DEFAULT,
|
||||||
DEBUG,
|
DEBUG,
|
||||||
DISABLED;
|
DISABLED;
|
||||||
|
|||||||
-5
@@ -29,11 +29,6 @@ package com.seibel.distanthorizons.api.enums.rendering;
|
|||||||
*/
|
*/
|
||||||
public enum EDhApiTransparency
|
public enum EDhApiTransparency
|
||||||
{
|
{
|
||||||
// Reminder:
|
|
||||||
// when adding items up the API minor version
|
|
||||||
// when removing items up the API major version
|
|
||||||
|
|
||||||
|
|
||||||
DISABLED(false, false),
|
DISABLED(false, false),
|
||||||
FAKE(true, true),
|
FAKE(true, true),
|
||||||
COMPLETE(true, false);
|
COMPLETE(true, false);
|
||||||
|
|||||||
-5
@@ -34,11 +34,6 @@ package com.seibel.distanthorizons.api.enums.worldGeneration;
|
|||||||
*/
|
*/
|
||||||
public enum EDhApiDistantGeneratorMode
|
public enum EDhApiDistantGeneratorMode
|
||||||
{
|
{
|
||||||
// Reminder:
|
|
||||||
// when adding items up the API minor version
|
|
||||||
// when removing items up the API major version
|
|
||||||
|
|
||||||
|
|
||||||
/** Don't generate any new terrain, just generate LODs for already generated chunks. */
|
/** Don't generate any new terrain, just generate LODs for already generated chunks. */
|
||||||
PRE_EXISTING_ONLY((byte) 1),
|
PRE_EXISTING_ONLY((byte) 1),
|
||||||
|
|
||||||
|
|||||||
-5
@@ -31,11 +31,6 @@ package com.seibel.distanthorizons.api.enums.worldGeneration;
|
|||||||
*/
|
*/
|
||||||
public enum EDhApiDistantGeneratorProgressDisplayLocation
|
public enum EDhApiDistantGeneratorProgressDisplayLocation
|
||||||
{
|
{
|
||||||
// Reminder:
|
|
||||||
// when adding items up the API minor version
|
|
||||||
// when removing items up the API major version
|
|
||||||
|
|
||||||
|
|
||||||
OVERLAY,
|
OVERLAY,
|
||||||
CHAT,
|
CHAT,
|
||||||
LOG,
|
LOG,
|
||||||
|
|||||||
+1
-1
@@ -104,7 +104,7 @@ public interface IDhApiGraphicsConfig extends IDhApiConfigGroup
|
|||||||
* 2 = blending of 5x5 <br>
|
* 2 = blending of 5x5 <br>
|
||||||
* ... <br>
|
* ... <br>
|
||||||
*/
|
*/
|
||||||
// IDhApiConfigValue<Integer> getBiomeBlending();
|
IDhApiConfigValue<Integer> getBiomeBlending();
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
+9
-2
@@ -161,9 +161,16 @@ public interface IDhApiTerrainDataRepo
|
|||||||
//=========//
|
//=========//
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
* Creates a new cache you manage that can be used to speed up repeat
|
||||||
|
* read operations. <br>
|
||||||
|
* Without a cache each operation must: hit the backing database file,
|
||||||
|
* decompress it, and parse it; which is a fairly slow process. <br>
|
||||||
|
*
|
||||||
* @return a {@link IDhApiTerrainDataCache} backed by {@link java.lang.ref.SoftReference}'s.
|
* @return a {@link IDhApiTerrainDataCache} backed by {@link java.lang.ref.SoftReference}'s.
|
||||||
* @since API 3.0.0
|
* @since API 5.0.0
|
||||||
*/
|
*/
|
||||||
IDhApiTerrainDataCache getSoftCache();
|
IDhApiTerrainDataCache createSoftCache();
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
+1
@@ -41,6 +41,7 @@ public interface IDhApiEventInjector extends IDependencyInjector<IDhApiEvent>
|
|||||||
* @throws IllegalArgumentException if the implementation object doesn't implement the interface
|
* @throws IllegalArgumentException if the implementation object doesn't implement the interface
|
||||||
*/
|
*/
|
||||||
// Note to self: Don't try adding a generic type to IDhApiEvent, the constructor won't accept it
|
// Note to self: Don't try adding a generic type to IDhApiEvent, the constructor won't accept it
|
||||||
|
// TODO why are we removing the class instead of an instance?
|
||||||
boolean unbind(Class<? extends IDhApiEvent> dependencyInterface, Class<? extends IDhApiEvent> dependencyClassToRemove) throws IllegalArgumentException;
|
boolean unbind(Class<? extends IDhApiEvent> dependencyInterface, Class<? extends IDhApiEvent> dependencyClassToRemove) throws IllegalArgumentException;
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -169,7 +169,7 @@ public interface IDhApiWorldGenerator extends Closeable, IDhApiOverrideable
|
|||||||
*
|
*
|
||||||
* After the {@link IDhApiWorldGenerator} has been generated, it should be passed into the
|
* After the {@link IDhApiWorldGenerator} has been generated, it should be passed into the
|
||||||
* resultConsumer's {@link Consumer#accept(Object)} method.
|
* resultConsumer's {@link Consumer#accept(Object)} method.
|
||||||
* Note: if air blocks aren't included in the with the {@link DhApiChunk} with proper lighting, lower detail levels will appear as black/unlit.
|
* Note: if air blocks aren't included in the {@link IDhApiFullDataSource} with proper lighting, lower detail levels will appear as black/unlit.
|
||||||
*
|
*
|
||||||
* @implNote the default implementation of this method throws an {@link UnsupportedOperationException},
|
* @implNote the default implementation of this method throws an {@link UnsupportedOperationException},
|
||||||
* and must be overridden when {@link #getReturnType()} returns {@link EDhApiWorldGeneratorReturnType#API_CHUNKS}.
|
* and must be overridden when {@link #getReturnType()} returns {@link EDhApiWorldGeneratorReturnType#API_CHUNKS}.
|
||||||
|
|||||||
+1
-1
@@ -33,7 +33,7 @@ import com.seibel.distanthorizons.api.methods.events.sharedParameterObjects.DhAp
|
|||||||
* @since API 2.0.0
|
* @since API 2.0.0
|
||||||
* @deprecated Replaced by {@link DhApiBeforeColorDepthTextureCreatedEvent} since this event's name isn't obvious when it fires.
|
* @deprecated Replaced by {@link DhApiBeforeColorDepthTextureCreatedEvent} since this event's name isn't obvious when it fires.
|
||||||
*/
|
*/
|
||||||
@Deprecated
|
@Deprecated // internal notes: this method must be kept around due to Iris using it and we don't want to break old Iris support
|
||||||
public abstract class DhApiColorDepthTextureCreatedEvent implements IDhApiEvent<DhApiColorDepthTextureCreatedEvent.EventParam>
|
public abstract class DhApiColorDepthTextureCreatedEvent implements IDhApiEvent<DhApiColorDepthTextureCreatedEvent.EventParam>
|
||||||
{
|
{
|
||||||
/** Fired before Distant Horizons creates. */
|
/** Fired before Distant Horizons creates. */
|
||||||
|
|||||||
+26
-16
@@ -20,6 +20,8 @@
|
|||||||
package com.seibel.distanthorizons.api.methods.events.sharedParameterObjects;
|
package com.seibel.distanthorizons.api.methods.events.sharedParameterObjects;
|
||||||
|
|
||||||
import com.seibel.distanthorizons.api.enums.rendering.EDhApiRenderPass;
|
import com.seibel.distanthorizons.api.enums.rendering.EDhApiRenderPass;
|
||||||
|
import com.seibel.distanthorizons.api.interfaces.world.IDhApiLevelWrapper;
|
||||||
|
import com.seibel.distanthorizons.api.methods.events.abstractEvents.DhApiWorldLoadEvent;
|
||||||
import com.seibel.distanthorizons.api.methods.events.interfaces.IDhApiEventParam;
|
import com.seibel.distanthorizons.api.methods.events.interfaces.IDhApiEventParam;
|
||||||
import com.seibel.distanthorizons.api.objects.math.DhApiMat4f;
|
import com.seibel.distanthorizons.api.objects.math.DhApiMat4f;
|
||||||
|
|
||||||
@@ -27,7 +29,7 @@ import com.seibel.distanthorizons.api.objects.math.DhApiMat4f;
|
|||||||
* Contains information relevant to Distant Horizons and Minecraft rendering.
|
* Contains information relevant to Distant Horizons and Minecraft rendering.
|
||||||
*
|
*
|
||||||
* @author James Seibel
|
* @author James Seibel
|
||||||
* @version 2024-1-31
|
* @version 2025-12-23
|
||||||
* @since API 1.0.0
|
* @since API 1.0.0
|
||||||
*/
|
*/
|
||||||
public class DhApiRenderParam implements IDhApiEventParam
|
public class DhApiRenderParam implements IDhApiEventParam
|
||||||
@@ -38,7 +40,7 @@ public class DhApiRenderParam implements IDhApiEventParam
|
|||||||
/** Indicates how far into this tick the frame is. */
|
/** Indicates how far into this tick the frame is. */
|
||||||
public final float partialTicks;
|
public final float partialTicks;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Indicates DH's near clip plane, measured in blocks.
|
* Indicates DH's near clip plane, measured in blocks.
|
||||||
* Note: this may change based on time, player speed, and other factors.
|
* Note: this may change based on time, player speed, and other factors.
|
||||||
*/
|
*/
|
||||||
@@ -61,22 +63,29 @@ public class DhApiRenderParam implements IDhApiEventParam
|
|||||||
|
|
||||||
public final int worldYOffset;
|
public final int worldYOffset;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The level currently being rendered.
|
||||||
|
*
|
||||||
|
* @since API 5.1.0
|
||||||
|
*/
|
||||||
|
public final IDhApiLevelWrapper clientLevelWrapper;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
//==============//
|
//==============//
|
||||||
// constructors //
|
// constructors //
|
||||||
//==============//
|
//==============//
|
||||||
|
|
||||||
|
|
||||||
public DhApiRenderParam(DhApiRenderParam parent)
|
public DhApiRenderParam(DhApiRenderParam parent)
|
||||||
{
|
{
|
||||||
this(
|
this(
|
||||||
parent.renderPass,
|
parent.renderPass,
|
||||||
parent.partialTicks,
|
parent.partialTicks,
|
||||||
parent.nearClipPlane, parent.farClipPlane,
|
parent.nearClipPlane, parent.farClipPlane,
|
||||||
parent.mcProjectionMatrix.copy(), parent.mcModelViewMatrix.copy(),
|
parent.mcProjectionMatrix.copy(), parent.mcModelViewMatrix.copy(),
|
||||||
parent.dhProjectionMatrix.copy(), parent.dhModelViewMatrix.copy(),
|
parent.dhProjectionMatrix.copy(), parent.dhModelViewMatrix.copy(),
|
||||||
parent.worldYOffset
|
parent.worldYOffset,
|
||||||
|
parent.clientLevelWrapper
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
public DhApiRenderParam(
|
public DhApiRenderParam(
|
||||||
@@ -85,8 +94,9 @@ public class DhApiRenderParam implements IDhApiEventParam
|
|||||||
float nearClipPlane, float farClipPlane,
|
float nearClipPlane, float farClipPlane,
|
||||||
DhApiMat4f newMcProjectionMatrix, DhApiMat4f newMcModelViewMatrix,
|
DhApiMat4f newMcProjectionMatrix, DhApiMat4f newMcModelViewMatrix,
|
||||||
DhApiMat4f newDhProjectionMatrix, DhApiMat4f newDhModelViewMatrix,
|
DhApiMat4f newDhProjectionMatrix, DhApiMat4f newDhModelViewMatrix,
|
||||||
int worldYOffset
|
int worldYOffset,
|
||||||
)
|
IDhApiLevelWrapper clientLevelWrapper
|
||||||
|
)
|
||||||
{
|
{
|
||||||
this.renderPass = renderPass;
|
this.renderPass = renderPass;
|
||||||
|
|
||||||
@@ -102,6 +112,7 @@ public class DhApiRenderParam implements IDhApiEventParam
|
|||||||
this.dhModelViewMatrix = newDhModelViewMatrix;
|
this.dhModelViewMatrix = newDhModelViewMatrix;
|
||||||
|
|
||||||
this.worldYOffset = worldYOffset;
|
this.worldYOffset = worldYOffset;
|
||||||
|
this.clientLevelWrapper = clientLevelWrapper;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -111,10 +122,9 @@ public class DhApiRenderParam implements IDhApiEventParam
|
|||||||
// base overrides //
|
// base overrides //
|
||||||
//================//
|
//================//
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public DhApiRenderParam copy()
|
public DhApiRenderParam copy() { return new DhApiRenderParam(this); }
|
||||||
{
|
|
||||||
return new DhApiRenderParam(this);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -31,7 +31,7 @@ import java.util.List;
|
|||||||
* Contains a list of {@link DhApiTerrainDataPoint} representing the blocks in a Minecraft chunk.
|
* Contains a list of {@link DhApiTerrainDataPoint} representing the blocks in a Minecraft chunk.
|
||||||
*
|
*
|
||||||
* @author Builderb0y, James Seibel
|
* @author Builderb0y, James Seibel
|
||||||
* @version 2024-7-21
|
* @version 2025-12-11
|
||||||
* @since API 2.0.0
|
* @since API 2.0.0
|
||||||
*
|
*
|
||||||
* @see IDhApiWrapperFactory
|
* @see IDhApiWrapperFactory
|
||||||
@@ -54,27 +54,12 @@ public class DhApiChunk
|
|||||||
// constructors //
|
// constructors //
|
||||||
//==============//
|
//==============//
|
||||||
|
|
||||||
/**
|
/** @since API 3.0.0 */
|
||||||
* Deprecated due to the topYBlockPos and bottomYBlockPos variables being put in the wrong order.
|
|
||||||
* They should have been in bottom -> top order.
|
|
||||||
*
|
|
||||||
* @see DhApiChunk#create(int, int, int, int)
|
|
||||||
*/
|
|
||||||
@Deprecated
|
|
||||||
public DhApiChunk(int chunkPosX, int chunkPosZ, int topYBlockPos, int bottomYBlockPos)
|
|
||||||
{ this(chunkPosX, chunkPosZ, bottomYBlockPos, topYBlockPos, false); }
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @since API 3.0.0
|
|
||||||
*/
|
|
||||||
public static DhApiChunk create(int chunkPosX, int chunkPosZ, int bottomYBlockPos, int topYBlockPos)
|
public static DhApiChunk create(int chunkPosX, int chunkPosZ, int bottomYBlockPos, int topYBlockPos)
|
||||||
{ return new DhApiChunk(chunkPosX, chunkPosZ, bottomYBlockPos, topYBlockPos, false); }
|
{ return new DhApiChunk(chunkPosX, chunkPosZ, bottomYBlockPos, topYBlockPos); }
|
||||||
|
|
||||||
/**
|
/** Only visible to internal DH methods */
|
||||||
* Only visible to internal DH methods
|
private DhApiChunk(int chunkPosX, int chunkPosZ, int bottomYBlockPos, int topYBlockPos)
|
||||||
* @param ignoredParameter is only present to differentiate the two constructors and isn't actually used
|
|
||||||
*/
|
|
||||||
private DhApiChunk(int chunkPosX, int chunkPosZ, int bottomYBlockPos, int topYBlockPos, boolean ignoredParameter)
|
|
||||||
{
|
{
|
||||||
this.chunkPosX = chunkPosX;
|
this.chunkPosX = chunkPosX;
|
||||||
this.chunkPosZ = chunkPosZ;
|
this.chunkPosZ = chunkPosZ;
|
||||||
|
|||||||
+29
-31
@@ -29,7 +29,7 @@ import java.util.ArrayList;
|
|||||||
* Holds a single datapoint of terrain data.
|
* Holds a single datapoint of terrain data.
|
||||||
*
|
*
|
||||||
* @author James Seibel
|
* @author James Seibel
|
||||||
* @version 2024-7-20
|
* @version 2025-11-15
|
||||||
* @since API 1.0.0
|
* @since API 1.0.0
|
||||||
*/
|
*/
|
||||||
public class DhApiTerrainDataPoint
|
public class DhApiTerrainDataPoint
|
||||||
@@ -47,6 +47,10 @@ public class DhApiTerrainDataPoint
|
|||||||
|
|
||||||
public final int blockLightLevel;
|
public final int blockLightLevel;
|
||||||
public final int skyLightLevel;
|
public final int skyLightLevel;
|
||||||
|
/**
|
||||||
|
* An unsigned block position of the bottom vertex for this LOD relative to the level's minimum height.
|
||||||
|
* Should be greater than or equal to 0.
|
||||||
|
*/
|
||||||
public final int bottomYBlockPos;
|
public final int bottomYBlockPos;
|
||||||
public final int topYBlockPos;
|
public final int topYBlockPos;
|
||||||
|
|
||||||
@@ -59,28 +63,7 @@ public class DhApiTerrainDataPoint
|
|||||||
// constructors //
|
// constructors //
|
||||||
//==============//
|
//==============//
|
||||||
|
|
||||||
/**
|
/** @since API 3.0.0 */
|
||||||
* Deprecated due to the topYBlockPos and bottomYBlockPos variables being put in the wrong order.
|
|
||||||
* They should have been in bottom -> top order.
|
|
||||||
*
|
|
||||||
* @see DhApiTerrainDataPoint#create(byte, int, int, int, int, IDhApiBlockStateWrapper, IDhApiBiomeWrapper)
|
|
||||||
*/
|
|
||||||
@Deprecated
|
|
||||||
public DhApiTerrainDataPoint(
|
|
||||||
byte detailLevel,
|
|
||||||
int blockLightLevel, int skyLightLevel,
|
|
||||||
int topYBlockPos, int bottomYBlockPos,
|
|
||||||
IDhApiBlockStateWrapper blockStateWrapper, IDhApiBiomeWrapper biomeWrapper)
|
|
||||||
{
|
|
||||||
this(detailLevel, blockLightLevel, skyLightLevel,
|
|
||||||
bottomYBlockPos, topYBlockPos,
|
|
||||||
blockStateWrapper, biomeWrapper,
|
|
||||||
false);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @since API 3.0.0
|
|
||||||
*/
|
|
||||||
public static DhApiTerrainDataPoint create(
|
public static DhApiTerrainDataPoint create(
|
||||||
byte detailLevel,
|
byte detailLevel,
|
||||||
int blockLightLevel, int skyLightLevel,
|
int blockLightLevel, int skyLightLevel,
|
||||||
@@ -91,20 +74,15 @@ public class DhApiTerrainDataPoint
|
|||||||
return new DhApiTerrainDataPoint(
|
return new DhApiTerrainDataPoint(
|
||||||
detailLevel, blockLightLevel, skyLightLevel,
|
detailLevel, blockLightLevel, skyLightLevel,
|
||||||
bottomYBlockPos, topYBlockPos,
|
bottomYBlockPos, topYBlockPos,
|
||||||
blockStateWrapper, biomeWrapper,
|
blockStateWrapper, biomeWrapper);
|
||||||
false);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/** Only visible to internal DH methods */
|
||||||
* Only visible to internal DH methods
|
|
||||||
* @param ignoredParameter is only present to differentiate the two constructors and isn't actually used
|
|
||||||
*/
|
|
||||||
private DhApiTerrainDataPoint(
|
private DhApiTerrainDataPoint(
|
||||||
byte detailLevel,
|
byte detailLevel,
|
||||||
int blockLightLevel, int skyLightLevel,
|
int blockLightLevel, int skyLightLevel,
|
||||||
int bottomYBlockPos, int topYBlockPos,
|
int bottomYBlockPos, int topYBlockPos,
|
||||||
IDhApiBlockStateWrapper blockStateWrapper, IDhApiBiomeWrapper biomeWrapper,
|
IDhApiBlockStateWrapper blockStateWrapper, IDhApiBiomeWrapper biomeWrapper
|
||||||
boolean ignoredParameter
|
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
this.detailLevel = detailLevel;
|
this.detailLevel = detailLevel;
|
||||||
@@ -118,4 +96,24 @@ public class DhApiTerrainDataPoint
|
|||||||
this.biomeWrapper = biomeWrapper;
|
this.biomeWrapper = biomeWrapper;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
//================//
|
||||||
|
// base overrides //
|
||||||
|
//================//
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String toString()
|
||||||
|
{
|
||||||
|
return "[Block:" + this.blockStateWrapper.getSerialString() +
|
||||||
|
",Biome:" + this.biomeWrapper.getName() +
|
||||||
|
",TopY:" + this.topYBlockPos +
|
||||||
|
",BottomY:" + this.bottomYBlockPos +
|
||||||
|
",BlockLight:" + this.blockLightLevel +
|
||||||
|
",SkyLight:" + this.skyLightLevel +
|
||||||
|
"]";
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -31,19 +31,19 @@ public final class ModInfo
|
|||||||
public static final String DEDICATED_SERVER_INITIAL_PATH = "dedicated_server_initial";
|
public static final String DEDICATED_SERVER_INITIAL_PATH = "dedicated_server_initial";
|
||||||
|
|
||||||
/** Incremented every time any packets are added, changed or removed, with a few exceptions. */
|
/** Incremented every time any packets are added, changed or removed, with a few exceptions. */
|
||||||
public static final int PROTOCOL_VERSION = 11;
|
public static final int PROTOCOL_VERSION = 13;
|
||||||
public static final String WRAPPER_PACKET_PATH = "message";
|
public static final String WRAPPER_PACKET_PATH = "message";
|
||||||
|
|
||||||
/** The internal mod name */
|
/** The internal mod name */
|
||||||
public static final String NAME = "DistantHorizons";
|
public static final String NAME = "DistantHorizons";
|
||||||
/** Human-readable version of NAME */
|
/** Human-readable version of NAME */
|
||||||
public static final String READABLE_NAME = "Distant Horizons";
|
public static final String READABLE_NAME = "Distant Horizons";
|
||||||
public static final String VERSION = "2.3.5-b";
|
public static final String VERSION = "2.4.4-b";
|
||||||
/** Returns true if the current build is an unstable developer build, false otherwise. */
|
/** Returns true if the current build is an unstable developer build, false otherwise. */
|
||||||
public static final boolean IS_DEV_BUILD = VERSION.toLowerCase().contains("dev");
|
public static final boolean IS_DEV_BUILD = VERSION.toLowerCase().contains("dev");
|
||||||
|
|
||||||
/** This version should only be updated when breaking changes are introduced to the DH API */
|
/** This version should only be updated when breaking changes are introduced to the DH API */
|
||||||
public static final int API_MAJOR_VERSION = 4;
|
public static final int API_MAJOR_VERSION = 5;
|
||||||
/** This version should be updated whenever new methods are added to the DH API */
|
/** This version should be updated whenever new methods are added to the DH API */
|
||||||
public static final int API_MINOR_VERSION = 1;
|
public static final int API_MINOR_VERSION = 1;
|
||||||
/** This version should be updated whenever non-breaking fixes are added to the DH API */
|
/** This version should be updated whenever non-breaking fixes are added to the DH API */
|
||||||
|
|||||||
-86
@@ -1,86 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of the Distant Horizons mod
|
|
||||||
* licensed under the GNU LGPL v3 License.
|
|
||||||
*
|
|
||||||
* Copyright (C) 2020 James Seibel
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU Lesser General Public License as published by
|
|
||||||
* the Free Software Foundation, version 3.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU Lesser General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Lesser General Public License
|
|
||||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package com.seibel.distanthorizons.coreapi.interfaces.config;
|
|
||||||
|
|
||||||
|
|
||||||
import java.util.function.Consumer;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Use for making the config variables
|
|
||||||
*
|
|
||||||
* @author coolGi
|
|
||||||
* @version 2022-5-26
|
|
||||||
*/
|
|
||||||
public interface IConfigEntry<T>
|
|
||||||
{
|
|
||||||
|
|
||||||
/** Gets the default value of the option */
|
|
||||||
T getDefaultValue();
|
|
||||||
|
|
||||||
void setApiValue(T newApiValue);
|
|
||||||
T getApiValue();
|
|
||||||
/** @return true if this config is able to be overridden by the API and an API user has set it */
|
|
||||||
boolean apiIsOverriding();
|
|
||||||
|
|
||||||
/** Returns true if this config can be set via the API. */
|
|
||||||
boolean getAllowApiOverride();
|
|
||||||
|
|
||||||
void set(T newValue);
|
|
||||||
T get();
|
|
||||||
/** gets the option ignoring what the API has overridden */
|
|
||||||
T getTrueValue();
|
|
||||||
|
|
||||||
/** Sets the value without saving */
|
|
||||||
void setWithoutSaving(T newValue);
|
|
||||||
|
|
||||||
/** Gets the min value */
|
|
||||||
T getMin();
|
|
||||||
/** Sets the min value */
|
|
||||||
void setMin(T newMin);
|
|
||||||
/** Gets the max value */
|
|
||||||
T getMax();
|
|
||||||
/** Sets the max value */
|
|
||||||
void setMax(T newMax);
|
|
||||||
/** Sets the min and max in 1 setter */
|
|
||||||
void setMinMax(T newMin, T newMax);
|
|
||||||
|
|
||||||
/** Gets the comment */
|
|
||||||
String getComment();
|
|
||||||
/** Sets the comment */
|
|
||||||
void setComment(String newComment);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Checks if the option is valid
|
|
||||||
*
|
|
||||||
* 0 == valid
|
|
||||||
* 2 == invalid
|
|
||||||
* 1 == number too high
|
|
||||||
* -1 == number too low
|
|
||||||
*/
|
|
||||||
byte isValid(); // TODO replace with an enum
|
|
||||||
/** Checks if a value is valid */
|
|
||||||
byte isValid(T value);
|
|
||||||
|
|
||||||
/** Is the value of this equal to another */
|
|
||||||
boolean equals(IConfigEntry<?> obj);
|
|
||||||
|
|
||||||
void addValueChangeListener(Consumer<T> onValueChangeFunc);
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -20,36 +20,43 @@
|
|||||||
package com.seibel.distanthorizons.core;
|
package com.seibel.distanthorizons.core;
|
||||||
|
|
||||||
import com.github.luben.zstd.ZstdOutputStream;
|
import com.github.luben.zstd.ZstdOutputStream;
|
||||||
|
import com.seibel.distanthorizons.api.methods.events.abstractEvents.DhApiBeforeRenderEvent;
|
||||||
|
import com.seibel.distanthorizons.core.config.Config;
|
||||||
|
import com.seibel.distanthorizons.core.config.eventHandlers.IgnoredDimensionCsvHandler;
|
||||||
import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
|
import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
|
||||||
|
import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
|
||||||
import com.seibel.distanthorizons.core.render.renderer.generic.GenericRenderObjectFactory;
|
import com.seibel.distanthorizons.core.render.renderer.generic.GenericRenderObjectFactory;
|
||||||
import com.seibel.distanthorizons.core.sql.DatabaseUpdater;
|
import com.seibel.distanthorizons.core.sql.DatabaseUpdater;
|
||||||
import com.seibel.distanthorizons.core.wrapperInterfaces.IWrapperFactory;
|
import com.seibel.distanthorizons.core.wrapperInterfaces.IWrapperFactory;
|
||||||
import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper;
|
|
||||||
import com.seibel.distanthorizons.coreapi.ModInfo;
|
|
||||||
import com.seibel.distanthorizons.core.world.DhApiWorldProxy;
|
import com.seibel.distanthorizons.core.world.DhApiWorldProxy;
|
||||||
import com.seibel.distanthorizons.core.api.external.methods.config.DhApiConfig;
|
import com.seibel.distanthorizons.core.api.external.methods.config.DhApiConfig;
|
||||||
import com.seibel.distanthorizons.core.api.external.methods.data.DhApiTerrainDataRepo;
|
import com.seibel.distanthorizons.core.api.external.methods.data.DhApiTerrainDataRepo;
|
||||||
import com.seibel.distanthorizons.api.DhApi;
|
import com.seibel.distanthorizons.api.DhApi;
|
||||||
import com.seibel.distanthorizons.core.render.DhApiRenderProxy;
|
import com.seibel.distanthorizons.core.render.DhApiRenderProxy;
|
||||||
|
import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper;
|
||||||
|
import com.seibel.distanthorizons.coreapi.util.StringUtil;
|
||||||
import net.jpountz.lz4.LZ4FrameOutputStream;
|
import net.jpountz.lz4.LZ4FrameOutputStream;
|
||||||
import org.apache.logging.log4j.LogManager;
|
import com.seibel.distanthorizons.core.logging.DhLogger;
|
||||||
import org.apache.logging.log4j.Logger;
|
|
||||||
import org.sqlite.SQLiteJDBCLoader;
|
import org.sqlite.SQLiteJDBCLoader;
|
||||||
import org.sqlite.util.OSInfo;
|
|
||||||
import org.tukaani.xz.XZOutputStream;
|
import org.tukaani.xz.XZOutputStream;
|
||||||
|
|
||||||
import java.awt.*;
|
import java.lang.management.GarbageCollectorMXBean;
|
||||||
import java.io.File;
|
import java.lang.management.ManagementFactory;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
/** Handles first time Core setup. */
|
/** Handles first time Core setup. */
|
||||||
public class Initializer
|
public class Initializer
|
||||||
{
|
{
|
||||||
private static final Logger LOGGER = LogManager.getLogger(ModInfo.NAME + "-" + Initializer.class.getSimpleName());
|
private static final DhLogger LOGGER = new DhLoggerBuilder().build();
|
||||||
|
|
||||||
private static final IMinecraftClientWrapper MC_CLIENT = SingletonInjector.INSTANCE.get(IMinecraftClientWrapper.class);
|
private static final IMinecraftClientWrapper MC_CLIENT = SingletonInjector.INSTANCE.get(IMinecraftClientWrapper.class);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
public static void init()
|
public static void init()
|
||||||
{
|
{
|
||||||
|
LOGGER.info("Running library validation...");
|
||||||
|
|
||||||
// confirm that all referenced libraries are available to use
|
// confirm that all referenced libraries are available to use
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
@@ -57,6 +64,17 @@ public class Initializer
|
|||||||
// will throw an error (not an exception)
|
// will throw an error (not an exception)
|
||||||
Class<?> lz4Compressor = LZ4FrameOutputStream.class;
|
Class<?> lz4Compressor = LZ4FrameOutputStream.class;
|
||||||
Class<?> zstdCompressor = ZstdOutputStream.class;
|
Class<?> zstdCompressor = ZstdOutputStream.class;
|
||||||
|
|
||||||
|
{
|
||||||
|
byte[] testCompressByteArray = new byte[1024];
|
||||||
|
for (int i = 0; i < testCompressByteArray.length; i++)
|
||||||
|
{
|
||||||
|
testCompressByteArray[i] = (byte) (i % 126);
|
||||||
|
}
|
||||||
|
byte[] compressedBytes = com.github.luben.zstd.Zstd.compress(testCompressByteArray);
|
||||||
|
com.github.luben.zstd.Zstd.decompress(compressedBytes);
|
||||||
|
}
|
||||||
|
|
||||||
Class<?> lzmaCompressor = XZOutputStream.class;
|
Class<?> lzmaCompressor = XZOutputStream.class;
|
||||||
//Class<?> networking = ByteBuf.class;
|
//Class<?> networking = ByteBuf.class;
|
||||||
Class<?> config = com.electronwill.nightconfig.core.Config.class;
|
Class<?> config = com.electronwill.nightconfig.core.Config.class;
|
||||||
@@ -73,9 +91,7 @@ public class Initializer
|
|||||||
}
|
}
|
||||||
catch (Throwable e)
|
catch (Throwable e)
|
||||||
{
|
{
|
||||||
LOGGER.fatal("Critical programmer error: One or more libraries aren't present. Error: [" + e.getMessage() + "].", e);
|
MC_CLIENT.crashMinecraft("Distant Horizons critical setup error: One or more libraries are either in-accessible, corrupted, or overwritten by another mod. Error: [" + e.getMessage() + "].", e);
|
||||||
// throwing here should crash the game, notifying the developer that something is wrong
|
|
||||||
throw new RuntimeException(e);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// confirm the resource directory is present
|
// confirm the resource directory is present
|
||||||
@@ -89,8 +105,7 @@ public class Initializer
|
|||||||
}
|
}
|
||||||
catch (Exception e)
|
catch (Exception e)
|
||||||
{
|
{
|
||||||
LOGGER.fatal("Critical programmer error: Can't read SQL Scripts resource folder is either missing or malformed. Error: [" + e.getMessage() + "].");
|
MC_CLIENT.crashMinecraft("Critical programmer error: Can't read SQL Scripts resource folder is either missing or malformed. Error: [" + e.getMessage() + "].", e);
|
||||||
throw new RuntimeException(e);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// This code has been disabled since it can cause Mac
|
// This code has been disabled since it can cause Mac
|
||||||
@@ -121,6 +136,45 @@ public class Initializer
|
|||||||
LOGGER.error("Programmer Error: No ["+IWrapperFactory.class.getSimpleName()+"] assigned to the DhApi.");
|
LOGGER.error("Programmer Error: No ["+IWrapperFactory.class.getSimpleName()+"] assigned to the DhApi.");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// log a warning if G1GC is being used
|
||||||
|
// (this garbage collector is known to cause stuttering)
|
||||||
|
{
|
||||||
|
boolean g1GcInUse = false;
|
||||||
|
|
||||||
|
StringBuilder garbageCollectorNames = new StringBuilder();
|
||||||
|
List<GarbageCollectorMXBean> gcMxBeans = ManagementFactory.getGarbageCollectorMXBeans();
|
||||||
|
for (GarbageCollectorMXBean gcMxBean : gcMxBeans)
|
||||||
|
{
|
||||||
|
if (!garbageCollectorNames.toString().isEmpty())
|
||||||
|
{
|
||||||
|
garbageCollectorNames.append(", ");
|
||||||
|
}
|
||||||
|
garbageCollectorNames.append(gcMxBean.getName());
|
||||||
|
|
||||||
|
// "G1 Young Generation" // "G1 Concurrent GC" // "G1 Old Generation"
|
||||||
|
if (gcMxBean.getName().toLowerCase().contains("g1 "))
|
||||||
|
{
|
||||||
|
g1GcInUse = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
LOGGER.info("Garbage collectors: ["+garbageCollectorNames+"]");
|
||||||
|
|
||||||
|
|
||||||
|
if (g1GcInUse
|
||||||
|
&& Config.Common.Logging.Warning.logGarbageCollectorWarning.get())
|
||||||
|
{
|
||||||
|
LOGGER.warn(
|
||||||
|
"Distant Horizons: G1 Garbage collector detected. \n" +
|
||||||
|
"This garbage collector can cause FPS stuttering. \n" +
|
||||||
|
"It's recommended to use a concurrent garbage collector \n" +
|
||||||
|
"like ZGC (Java 21+) or Shenandoah (Java 8 through 17) for a smoother experience. \n" +
|
||||||
|
"");
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
DhApi.events.bind(DhApiBeforeRenderEvent.class, IgnoredDimensionCsvHandler.INSTANCE);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -21,7 +21,7 @@ package com.seibel.distanthorizons.core.api.external.methods.config.client;
|
|||||||
|
|
||||||
import com.seibel.distanthorizons.api.interfaces.config.IDhApiConfigValue;
|
import com.seibel.distanthorizons.api.interfaces.config.IDhApiConfigValue;
|
||||||
import com.seibel.distanthorizons.api.interfaces.config.client.IDhApiAmbientOcclusionConfig;
|
import com.seibel.distanthorizons.api.interfaces.config.client.IDhApiAmbientOcclusionConfig;
|
||||||
import com.seibel.distanthorizons.api.objects.config.DhApiConfigValue;
|
import com.seibel.distanthorizons.core.config.api.DhApiConfigValue;
|
||||||
import com.seibel.distanthorizons.core.config.Config;
|
import com.seibel.distanthorizons.core.config.Config;
|
||||||
|
|
||||||
public class DhApiAmbientOcclusionConfig implements IDhApiAmbientOcclusionConfig
|
public class DhApiAmbientOcclusionConfig implements IDhApiAmbientOcclusionConfig
|
||||||
|
|||||||
+1
-1
@@ -21,7 +21,7 @@ package com.seibel.distanthorizons.core.api.external.methods.config.client;
|
|||||||
|
|
||||||
import com.seibel.distanthorizons.api.interfaces.config.IDhApiConfigValue;
|
import com.seibel.distanthorizons.api.interfaces.config.IDhApiConfigValue;
|
||||||
import com.seibel.distanthorizons.api.interfaces.config.client.IDhApiDebuggingConfig;
|
import com.seibel.distanthorizons.api.interfaces.config.client.IDhApiDebuggingConfig;
|
||||||
import com.seibel.distanthorizons.api.objects.config.DhApiConfigValue;
|
import com.seibel.distanthorizons.core.config.api.DhApiConfigValue;
|
||||||
import com.seibel.distanthorizons.core.config.Config;
|
import com.seibel.distanthorizons.core.config.Config;
|
||||||
import com.seibel.distanthorizons.api.enums.rendering.EDhApiDebugRendering;
|
import com.seibel.distanthorizons.api.enums.rendering.EDhApiDebugRendering;
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -22,7 +22,7 @@ package com.seibel.distanthorizons.core.api.external.methods.config.client;
|
|||||||
import com.seibel.distanthorizons.api.enums.rendering.EDhApiFogFalloff;
|
import com.seibel.distanthorizons.api.enums.rendering.EDhApiFogFalloff;
|
||||||
import com.seibel.distanthorizons.api.interfaces.config.IDhApiConfigValue;
|
import com.seibel.distanthorizons.api.interfaces.config.IDhApiConfigValue;
|
||||||
import com.seibel.distanthorizons.api.interfaces.config.client.IDhApiFarFogConfig;
|
import com.seibel.distanthorizons.api.interfaces.config.client.IDhApiFarFogConfig;
|
||||||
import com.seibel.distanthorizons.api.objects.config.DhApiConfigValue;
|
import com.seibel.distanthorizons.core.config.api.DhApiConfigValue;
|
||||||
import com.seibel.distanthorizons.core.config.Config;
|
import com.seibel.distanthorizons.core.config.Config;
|
||||||
|
|
||||||
public class DhApiFarFogConfig implements IDhApiFarFogConfig
|
public class DhApiFarFogConfig implements IDhApiFarFogConfig
|
||||||
|
|||||||
+4
-3
@@ -25,9 +25,10 @@ import com.seibel.distanthorizons.api.interfaces.config.IDhApiConfigValue;
|
|||||||
import com.seibel.distanthorizons.api.interfaces.config.client.IDhApiFarFogConfig;
|
import com.seibel.distanthorizons.api.interfaces.config.client.IDhApiFarFogConfig;
|
||||||
import com.seibel.distanthorizons.api.interfaces.config.client.IDhApiFogConfig;
|
import com.seibel.distanthorizons.api.interfaces.config.client.IDhApiFogConfig;
|
||||||
import com.seibel.distanthorizons.api.interfaces.config.client.IDhApiHeightFogConfig;
|
import com.seibel.distanthorizons.api.interfaces.config.client.IDhApiHeightFogConfig;
|
||||||
import com.seibel.distanthorizons.api.objects.config.DhApiConfigValue;
|
import com.seibel.distanthorizons.core.config.api.DhApiConfigValue;
|
||||||
import com.seibel.distanthorizons.core.config.Config;
|
import com.seibel.distanthorizons.core.config.Config;
|
||||||
import com.seibel.distanthorizons.coreapi.util.converters.ApiFogDrawModeConverter;
|
import com.seibel.distanthorizons.core.config.api.converters.ApiFogDrawModeConverter;
|
||||||
|
import com.seibel.distanthorizons.core.config.api.converters.InvertedBoolConverter;
|
||||||
|
|
||||||
public class DhApiFogConfig implements IDhApiFogConfig
|
public class DhApiFogConfig implements IDhApiFogConfig
|
||||||
{
|
{
|
||||||
@@ -67,7 +68,7 @@ public class DhApiFogConfig implements IDhApiFogConfig
|
|||||||
@Override
|
@Override
|
||||||
@Deprecated
|
@Deprecated
|
||||||
public IDhApiConfigValue<Boolean> disableVanillaFog()
|
public IDhApiConfigValue<Boolean> disableVanillaFog()
|
||||||
{ return new DhApiConfigValue<>(Config.Client.Advanced.Graphics.Fog.disableVanillaFog); }
|
{ return new DhApiConfigValue<>(Config.Client.Advanced.Graphics.Fog.enableVanillaFog, new InvertedBoolConverter()); }
|
||||||
@Override
|
@Override
|
||||||
public IDhApiConfigValue<Boolean> enableVanillaFog()
|
public IDhApiConfigValue<Boolean> enableVanillaFog()
|
||||||
{ return new DhApiConfigValue<>(Config.Client.Advanced.Graphics.Fog.enableVanillaFog); }
|
{ return new DhApiConfigValue<>(Config.Client.Advanced.Graphics.Fog.enableVanillaFog); }
|
||||||
|
|||||||
+1
-1
@@ -21,7 +21,7 @@ package com.seibel.distanthorizons.core.api.external.methods.config.client;
|
|||||||
|
|
||||||
import com.seibel.distanthorizons.api.interfaces.config.IDhApiConfigValue;
|
import com.seibel.distanthorizons.api.interfaces.config.IDhApiConfigValue;
|
||||||
import com.seibel.distanthorizons.api.interfaces.config.client.IDhApiGenericRenderingConfig;
|
import com.seibel.distanthorizons.api.interfaces.config.client.IDhApiGenericRenderingConfig;
|
||||||
import com.seibel.distanthorizons.api.objects.config.DhApiConfigValue;
|
import com.seibel.distanthorizons.core.config.api.DhApiConfigValue;
|
||||||
import com.seibel.distanthorizons.core.config.Config;
|
import com.seibel.distanthorizons.core.config.Config;
|
||||||
|
|
||||||
public class DhApiGenericRenderingConfig implements IDhApiGenericRenderingConfig
|
public class DhApiGenericRenderingConfig implements IDhApiGenericRenderingConfig
|
||||||
|
|||||||
+5
-6
@@ -23,10 +23,10 @@ import com.seibel.distanthorizons.api.enums.config.*;
|
|||||||
import com.seibel.distanthorizons.api.enums.rendering.EDhApiTransparency;
|
import com.seibel.distanthorizons.api.enums.rendering.EDhApiTransparency;
|
||||||
import com.seibel.distanthorizons.api.interfaces.config.IDhApiConfigValue;
|
import com.seibel.distanthorizons.api.interfaces.config.IDhApiConfigValue;
|
||||||
import com.seibel.distanthorizons.api.interfaces.config.client.*;
|
import com.seibel.distanthorizons.api.interfaces.config.client.*;
|
||||||
import com.seibel.distanthorizons.api.objects.config.DhApiConfigValue;
|
import com.seibel.distanthorizons.core.config.api.DhApiConfigValue;
|
||||||
import com.seibel.distanthorizons.api.enums.rendering.EDhApiRendererMode;
|
import com.seibel.distanthorizons.api.enums.rendering.EDhApiRendererMode;
|
||||||
import com.seibel.distanthorizons.core.config.Config;
|
import com.seibel.distanthorizons.core.config.Config;
|
||||||
import com.seibel.distanthorizons.coreapi.util.converters.RenderModeEnabledConverter;
|
import com.seibel.distanthorizons.core.config.api.converters.RenderModeEnabledConverter;
|
||||||
|
|
||||||
public class DhApiGraphicsConfig implements IDhApiGraphicsConfig
|
public class DhApiGraphicsConfig implements IDhApiGraphicsConfig
|
||||||
{
|
{
|
||||||
@@ -97,10 +97,9 @@ public class DhApiGraphicsConfig implements IDhApiGraphicsConfig
|
|||||||
public IDhApiConfigValue<Boolean> tintWithAvoidedBlocks()
|
public IDhApiConfigValue<Boolean> tintWithAvoidedBlocks()
|
||||||
{ return new DhApiConfigValue<Boolean, Boolean>(Config.Client.Advanced.Graphics.Quality.tintWithAvoidedBlocks); }
|
{ return new DhApiConfigValue<Boolean, Boolean>(Config.Client.Advanced.Graphics.Quality.tintWithAvoidedBlocks); }
|
||||||
|
|
||||||
// TODO re-implement
|
@Override
|
||||||
// @Override
|
public IDhApiConfigValue<Integer> getBiomeBlending()
|
||||||
// public IDhApiConfigValue<Integer> getBiomeBlending()
|
{ return new DhApiConfigValue<Integer, Integer>(Config.Client.Advanced.Graphics.Quality.lodBiomeBlending); }
|
||||||
// { return new DhApiConfigValue<Integer, Integer>(Quality.lodBiomeBlending); }
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -24,7 +24,7 @@ import com.seibel.distanthorizons.api.enums.rendering.EDhApiHeightFogMixMode;
|
|||||||
import com.seibel.distanthorizons.api.enums.rendering.EDhApiHeightFogDirection;
|
import com.seibel.distanthorizons.api.enums.rendering.EDhApiHeightFogDirection;
|
||||||
import com.seibel.distanthorizons.api.interfaces.config.IDhApiConfigValue;
|
import com.seibel.distanthorizons.api.interfaces.config.IDhApiConfigValue;
|
||||||
import com.seibel.distanthorizons.api.interfaces.config.client.IDhApiHeightFogConfig;
|
import com.seibel.distanthorizons.api.interfaces.config.client.IDhApiHeightFogConfig;
|
||||||
import com.seibel.distanthorizons.api.objects.config.DhApiConfigValue;
|
import com.seibel.distanthorizons.core.config.api.DhApiConfigValue;
|
||||||
import com.seibel.distanthorizons.core.config.Config;
|
import com.seibel.distanthorizons.core.config.Config;
|
||||||
|
|
||||||
public class DhApiHeightFogConfig implements IDhApiHeightFogConfig
|
public class DhApiHeightFogConfig implements IDhApiHeightFogConfig
|
||||||
|
|||||||
+1
-1
@@ -21,7 +21,7 @@ package com.seibel.distanthorizons.core.api.external.methods.config.client;
|
|||||||
|
|
||||||
import com.seibel.distanthorizons.api.interfaces.config.IDhApiConfigValue;
|
import com.seibel.distanthorizons.api.interfaces.config.IDhApiConfigValue;
|
||||||
import com.seibel.distanthorizons.api.interfaces.config.client.IDhApiMultiThreadingConfig;
|
import com.seibel.distanthorizons.api.interfaces.config.client.IDhApiMultiThreadingConfig;
|
||||||
import com.seibel.distanthorizons.api.objects.config.DhApiConfigValue;
|
import com.seibel.distanthorizons.core.config.api.DhApiConfigValue;
|
||||||
import com.seibel.distanthorizons.core.config.Config;
|
import com.seibel.distanthorizons.core.config.Config;
|
||||||
|
|
||||||
public class DhApiMultiThreadingConfig implements IDhApiMultiThreadingConfig
|
public class DhApiMultiThreadingConfig implements IDhApiMultiThreadingConfig
|
||||||
|
|||||||
+1
-1
@@ -21,7 +21,7 @@ package com.seibel.distanthorizons.core.api.external.methods.config.client;
|
|||||||
|
|
||||||
import com.seibel.distanthorizons.api.interfaces.config.IDhApiConfigValue;
|
import com.seibel.distanthorizons.api.interfaces.config.IDhApiConfigValue;
|
||||||
import com.seibel.distanthorizons.api.interfaces.config.client.IDhApiMultiplayerConfig;
|
import com.seibel.distanthorizons.api.interfaces.config.client.IDhApiMultiplayerConfig;
|
||||||
import com.seibel.distanthorizons.api.objects.config.DhApiConfigValue;
|
import com.seibel.distanthorizons.core.config.api.DhApiConfigValue;
|
||||||
import com.seibel.distanthorizons.core.config.Config;
|
import com.seibel.distanthorizons.core.config.Config;
|
||||||
import com.seibel.distanthorizons.api.enums.config.EDhApiServerFolderNameMode;
|
import com.seibel.distanthorizons.api.enums.config.EDhApiServerFolderNameMode;
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -21,7 +21,7 @@ package com.seibel.distanthorizons.core.api.external.methods.config.client;
|
|||||||
|
|
||||||
import com.seibel.distanthorizons.api.interfaces.config.IDhApiConfigValue;
|
import com.seibel.distanthorizons.api.interfaces.config.IDhApiConfigValue;
|
||||||
import com.seibel.distanthorizons.api.interfaces.config.client.IDhApiNoiseTextureConfig;
|
import com.seibel.distanthorizons.api.interfaces.config.client.IDhApiNoiseTextureConfig;
|
||||||
import com.seibel.distanthorizons.api.objects.config.DhApiConfigValue;
|
import com.seibel.distanthorizons.core.config.api.DhApiConfigValue;
|
||||||
import com.seibel.distanthorizons.core.config.Config;
|
import com.seibel.distanthorizons.core.config.Config;
|
||||||
|
|
||||||
public class DhApiNoiseTextureConfig implements IDhApiNoiseTextureConfig
|
public class DhApiNoiseTextureConfig implements IDhApiNoiseTextureConfig
|
||||||
|
|||||||
+1
-1
@@ -21,7 +21,7 @@ package com.seibel.distanthorizons.core.api.external.methods.config.common;
|
|||||||
|
|
||||||
import com.seibel.distanthorizons.api.interfaces.config.IDhApiConfigValue;
|
import com.seibel.distanthorizons.api.interfaces.config.IDhApiConfigValue;
|
||||||
import com.seibel.distanthorizons.api.interfaces.config.both.IDhApiWorldGenerationConfig;
|
import com.seibel.distanthorizons.api.interfaces.config.both.IDhApiWorldGenerationConfig;
|
||||||
import com.seibel.distanthorizons.api.objects.config.DhApiConfigValue;
|
import com.seibel.distanthorizons.core.config.api.DhApiConfigValue;
|
||||||
import com.seibel.distanthorizons.api.enums.worldGeneration.EDhApiDistantGeneratorMode;
|
import com.seibel.distanthorizons.api.enums.worldGeneration.EDhApiDistantGeneratorMode;
|
||||||
import com.seibel.distanthorizons.core.config.Config;
|
import com.seibel.distanthorizons.core.config.Config;
|
||||||
|
|
||||||
|
|||||||
+3
-3
@@ -2,10 +2,10 @@ package com.seibel.distanthorizons.core.api.external.methods.data;
|
|||||||
|
|
||||||
import com.seibel.distanthorizons.api.interfaces.data.IDhApiTerrainDataCache;
|
import com.seibel.distanthorizons.api.interfaces.data.IDhApiTerrainDataCache;
|
||||||
import com.seibel.distanthorizons.core.dataObjects.fullData.sources.FullDataSourceV2;
|
import com.seibel.distanthorizons.core.dataObjects.fullData.sources.FullDataSourceV2;
|
||||||
|
import com.seibel.distanthorizons.core.logging.DhLogger;
|
||||||
|
import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
|
||||||
import it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap;
|
import it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap;
|
||||||
import it.unimi.dsi.fastutil.longs.LongSet;
|
import it.unimi.dsi.fastutil.longs.LongSet;
|
||||||
import org.apache.logging.log4j.LogManager;
|
|
||||||
import org.apache.logging.log4j.Logger;
|
|
||||||
import org.jetbrains.annotations.Nullable;
|
import org.jetbrains.annotations.Nullable;
|
||||||
|
|
||||||
import java.lang.ref.SoftReference;
|
import java.lang.ref.SoftReference;
|
||||||
@@ -15,7 +15,7 @@ public class DhApiTerrainDataCache implements IDhApiTerrainDataCache
|
|||||||
private final Object modificationLock = new Object();
|
private final Object modificationLock = new Object();
|
||||||
private Long2ReferenceOpenHashMap<SoftReference<FullDataSourceV2>> posToFullDataRef = new Long2ReferenceOpenHashMap<>();
|
private Long2ReferenceOpenHashMap<SoftReference<FullDataSourceV2>> posToFullDataRef = new Long2ReferenceOpenHashMap<>();
|
||||||
|
|
||||||
private static final Logger LOGGER = LogManager.getLogger(DhApiTerrainDataCache.class.getSimpleName());
|
private static final DhLogger LOGGER = new DhLoggerBuilder().build();
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
+23
-14
@@ -31,6 +31,7 @@ import com.seibel.distanthorizons.core.dataObjects.fullData.FullDataPointIdMap;
|
|||||||
import com.seibel.distanthorizons.core.dataObjects.fullData.sources.FullDataSourceV2;
|
import com.seibel.distanthorizons.core.dataObjects.fullData.sources.FullDataSourceV2;
|
||||||
import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
|
import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
|
||||||
import com.seibel.distanthorizons.core.level.IDhLevel;
|
import com.seibel.distanthorizons.core.level.IDhLevel;
|
||||||
|
import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
|
||||||
import com.seibel.distanthorizons.core.pos.DhLodPos;
|
import com.seibel.distanthorizons.core.pos.DhLodPos;
|
||||||
import com.seibel.distanthorizons.core.pos.DhSectionPos;
|
import com.seibel.distanthorizons.core.pos.DhSectionPos;
|
||||||
import com.seibel.distanthorizons.core.render.renderer.DebugRenderer;
|
import com.seibel.distanthorizons.core.render.renderer.DebugRenderer;
|
||||||
@@ -48,8 +49,7 @@ import com.seibel.distanthorizons.coreapi.util.BitShiftUtil;
|
|||||||
import com.seibel.distanthorizons.core.util.math.Vec3d;
|
import com.seibel.distanthorizons.core.util.math.Vec3d;
|
||||||
import com.seibel.distanthorizons.core.util.math.Vec3i;
|
import com.seibel.distanthorizons.core.util.math.Vec3i;
|
||||||
import it.unimi.dsi.fastutil.longs.LongArrayList;
|
import it.unimi.dsi.fastutil.longs.LongArrayList;
|
||||||
import org.apache.logging.log4j.LogManager;
|
import com.seibel.distanthorizons.core.logging.DhLogger;
|
||||||
import org.apache.logging.log4j.Logger;
|
|
||||||
import org.jetbrains.annotations.Nullable;
|
import org.jetbrains.annotations.Nullable;
|
||||||
|
|
||||||
import java.awt.*;
|
import java.awt.*;
|
||||||
@@ -64,7 +64,7 @@ public class DhApiTerrainDataRepo implements IDhApiTerrainDataRepo
|
|||||||
{
|
{
|
||||||
public static DhApiTerrainDataRepo INSTANCE = new DhApiTerrainDataRepo();
|
public static DhApiTerrainDataRepo INSTANCE = new DhApiTerrainDataRepo();
|
||||||
|
|
||||||
private static final Logger LOGGER = LogManager.getLogger(DhApiTerrainDataRepo.class.getSimpleName());
|
private static final DhLogger LOGGER = new DhLoggerBuilder().build();
|
||||||
|
|
||||||
// debugging values
|
// debugging values
|
||||||
private static volatile boolean debugThreadRunning = false;
|
private static volatile boolean debugThreadRunning = false;
|
||||||
@@ -258,7 +258,7 @@ public class DhApiTerrainDataRepo implements IDhApiTerrainDataRepo
|
|||||||
//===============================//
|
//===============================//
|
||||||
|
|
||||||
FullDataPointIdMap mapping = dataSource.mapping;
|
FullDataPointIdMap mapping = dataSource.mapping;
|
||||||
LongArrayList dataColumn = dataSource.get(relativePos.x, relativePos.z);
|
LongArrayList dataColumn = dataSource.getColumnAtRelPos(relativePos.x, relativePos.z);
|
||||||
if (dataColumn != null)
|
if (dataColumn != null)
|
||||||
{
|
{
|
||||||
int dataColumnIndexCount = dataColumn.size();
|
int dataColumnIndexCount = dataColumn.size();
|
||||||
@@ -277,7 +277,7 @@ public class DhApiTerrainDataRepo implements IDhApiTerrainDataRepo
|
|||||||
if (!getSpecificYCoordinate)
|
if (!getSpecificYCoordinate)
|
||||||
{
|
{
|
||||||
// if we aren't look for a specific datapoint, add each datapoint to the return array
|
// if we aren't look for a specific datapoint, add each datapoint to the return array
|
||||||
returnArray[i] = DhApiTerrainDataPointUtil.createApiDatapoint(levelWrapper, mapping, requestedDetailLevel, dataPoint);
|
returnArray[i] = DhApiTerrainDataPointUtil.createApiDatapoint(levelWrapper.getMinHeight(), mapping, requestedDetailLevel, dataPoint);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@@ -294,7 +294,7 @@ public class DhApiTerrainDataRepo implements IDhApiTerrainDataRepo
|
|||||||
if (bottomY <= requestedY && requestedY < topY) // blockPositions start from the bottom of the block, thus "<=" for bottomY, just "<" for topY
|
if (bottomY <= requestedY && requestedY < topY) // blockPositions start from the bottom of the block, thus "<=" for bottomY, just "<" for topY
|
||||||
{
|
{
|
||||||
// this datapoint contains the requested block position, return it
|
// this datapoint contains the requested block position, return it
|
||||||
DhApiTerrainDataPoint apiTerrainData = DhApiTerrainDataPointUtil.createApiDatapoint(levelWrapper, mapping, requestedDetailLevel, dataPoint);
|
DhApiTerrainDataPoint apiTerrainData = DhApiTerrainDataPointUtil.createApiDatapoint(levelWrapper.getMinHeight(), mapping, requestedDetailLevel, dataPoint);
|
||||||
return DhApiResult.createSuccess(new DhApiTerrainDataPoint[]{apiTerrainData});
|
return DhApiResult.createSuccess(new DhApiTerrainDataPoint[]{apiTerrainData});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -345,7 +345,10 @@ public class DhApiTerrainDataRepo implements IDhApiTerrainDataRepo
|
|||||||
@Nullable
|
@Nullable
|
||||||
IDhApiTerrainDataCache dataCache)
|
IDhApiTerrainDataCache dataCache)
|
||||||
{
|
{
|
||||||
return this.raycastLodData(levelWrapper, new Vec3d(rayOriginX, rayOriginY, rayOriginZ), new Vec3f(rayDirectionX, rayDirectionY, rayDirectionZ), maxRayBlockLength, dataCache);
|
return this.raycastLodData(levelWrapper,
|
||||||
|
new Vec3d(rayOriginX, rayOriginY, rayOriginZ),
|
||||||
|
new Vec3f(rayDirectionX, rayDirectionY, rayDirectionZ),
|
||||||
|
maxRayBlockLength, dataCache);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -363,8 +366,8 @@ public class DhApiTerrainDataRepo implements IDhApiTerrainDataRepo
|
|||||||
{
|
{
|
||||||
rayDirection.normalize();
|
rayDirection.normalize();
|
||||||
|
|
||||||
int minBlockHeight = levelWrapper.getMinHeight();
|
int minLevelBlockHeight = levelWrapper.getMinHeight();
|
||||||
int maxBlockHeight = levelWrapper.getMaxHeight();
|
int maxLevelBlockHeight = levelWrapper.getMaxHeight();
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@@ -380,7 +383,8 @@ public class DhApiTerrainDataRepo implements IDhApiTerrainDataRepo
|
|||||||
DhApiRaycastResult closetFoundDataPoint = null;
|
DhApiRaycastResult closetFoundDataPoint = null;
|
||||||
|
|
||||||
|
|
||||||
while (blockPos.y >= minBlockHeight && blockPos.y < maxBlockHeight
|
while (blockPos.y >= minLevelBlockHeight
|
||||||
|
&& blockPos.y < maxLevelBlockHeight
|
||||||
&& currentLength <= maxRayBlockLength)
|
&& currentLength <= maxRayBlockLength)
|
||||||
{
|
{
|
||||||
// get the LOD columns around this position
|
// get the LOD columns around this position
|
||||||
@@ -403,7 +407,8 @@ public class DhApiTerrainDataRepo implements IDhApiTerrainDataRepo
|
|||||||
{
|
{
|
||||||
// does this LOD contain the given Y position?
|
// does this LOD contain the given Y position?
|
||||||
Vec3i dataPointPos = new Vec3i(columnPos.x, dataPoint.bottomYBlockPos, columnPos.z);
|
Vec3i dataPointPos = new Vec3i(columnPos.x, dataPoint.bottomYBlockPos, columnPos.z);
|
||||||
if (exactPos.y >= dataPoint.bottomYBlockPos && exactPos.y <= dataPoint.topYBlockPos)
|
if (exactPos.y >= dataPoint.bottomYBlockPos
|
||||||
|
&& exactPos.y <= dataPoint.topYBlockPos)
|
||||||
{
|
{
|
||||||
if (closetFoundDataPoint == null)
|
if (closetFoundDataPoint == null)
|
||||||
{
|
{
|
||||||
@@ -516,7 +521,7 @@ public class DhApiTerrainDataRepo implements IDhApiTerrainDataRepo
|
|||||||
//=============//
|
//=============//
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public IDhApiTerrainDataCache getSoftCache() { return new DhApiTerrainDataCache(); }
|
public IDhApiTerrainDataCache createSoftCache() { return new DhApiTerrainDataCache(); }
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@@ -572,12 +577,16 @@ public class DhApiTerrainDataRepo implements IDhApiTerrainDataRepo
|
|||||||
}
|
}
|
||||||
|
|
||||||
// draw raycast position
|
// draw raycast position
|
||||||
if (rayCast.success && rayCast.payload != null)
|
if (rayCast.success
|
||||||
|
&& rayCast.payload != null)
|
||||||
{
|
{
|
||||||
DebugRenderer.makeParticle(
|
DebugRenderer.makeParticle(
|
||||||
new DebugRenderer.BoxParticle(
|
new DebugRenderer.BoxParticle(
|
||||||
new DebugRenderer.Box(
|
new DebugRenderer.Box(
|
||||||
DhSectionPos.encode((byte) 0, rayCast.payload.pos.x, rayCast.payload.pos.z), rayCast.payload.dataPoint.bottomYBlockPos, rayCast.payload.dataPoint.topYBlockPos, -0.1f, Color.RED),
|
DhSectionPos.encode((byte) 0, rayCast.payload.pos.x, rayCast.payload.pos.z),
|
||||||
|
rayCast.payload.dataPoint.bottomYBlockPos,
|
||||||
|
rayCast.payload.dataPoint.topYBlockPos,
|
||||||
|
-0.1f, Color.RED),
|
||||||
1.0, 0f
|
1.0, 0f
|
||||||
)
|
)
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -23,18 +23,17 @@ import com.seibel.distanthorizons.api.DhApi;
|
|||||||
import com.seibel.distanthorizons.api.enums.config.EDhApiMcRenderingFadeMode;
|
import com.seibel.distanthorizons.api.enums.config.EDhApiMcRenderingFadeMode;
|
||||||
import com.seibel.distanthorizons.api.enums.rendering.EDhApiRenderPass;
|
import com.seibel.distanthorizons.api.enums.rendering.EDhApiRenderPass;
|
||||||
import com.seibel.distanthorizons.api.methods.events.abstractEvents.*;
|
import com.seibel.distanthorizons.api.methods.events.abstractEvents.*;
|
||||||
import com.seibel.distanthorizons.api.methods.events.sharedParameterObjects.DhApiRenderParam;
|
import com.seibel.distanthorizons.core.api.internal.rendering.DhRenderState;
|
||||||
import com.seibel.distanthorizons.core.api.internal.rendering.RenderState;
|
|
||||||
import com.seibel.distanthorizons.core.file.structure.ClientOnlySaveStructure;
|
import com.seibel.distanthorizons.core.file.structure.ClientOnlySaveStructure;
|
||||||
|
import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
|
||||||
import com.seibel.distanthorizons.core.network.messages.MessageRegistry;
|
import com.seibel.distanthorizons.core.network.messages.MessageRegistry;
|
||||||
import com.seibel.distanthorizons.core.pos.DhChunkPos;
|
import com.seibel.distanthorizons.core.pos.DhChunkPos;
|
||||||
import com.seibel.distanthorizons.core.render.DhApiRenderProxy;
|
import com.seibel.distanthorizons.core.render.DhApiRenderProxy;
|
||||||
import com.seibel.distanthorizons.core.render.renderer.FadeRenderer;
|
import com.seibel.distanthorizons.core.render.renderer.*;
|
||||||
import com.seibel.distanthorizons.core.util.TimerUtil;
|
import com.seibel.distanthorizons.core.util.TimerUtil;
|
||||||
import com.seibel.distanthorizons.core.util.objects.Pair;
|
import com.seibel.distanthorizons.core.util.objects.Pair;
|
||||||
import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftRenderWrapper;
|
import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftRenderWrapper;
|
||||||
import com.seibel.distanthorizons.coreapi.DependencyInjection.ApiEventInjector;
|
import com.seibel.distanthorizons.coreapi.DependencyInjection.ApiEventInjector;
|
||||||
import com.seibel.distanthorizons.core.level.IDhClientLevel;
|
|
||||||
import com.seibel.distanthorizons.core.config.Config;
|
import com.seibel.distanthorizons.core.config.Config;
|
||||||
import com.seibel.distanthorizons.core.network.messages.AbstractNetworkMessage;
|
import com.seibel.distanthorizons.core.network.messages.AbstractNetworkMessage;
|
||||||
import com.seibel.distanthorizons.core.network.session.NetworkSession;
|
import com.seibel.distanthorizons.core.network.session.NetworkSession;
|
||||||
@@ -43,30 +42,21 @@ import com.seibel.distanthorizons.api.enums.rendering.EDhApiDebugRendering;
|
|||||||
import com.seibel.distanthorizons.api.enums.rendering.EDhApiRendererMode;
|
import com.seibel.distanthorizons.api.enums.rendering.EDhApiRendererMode;
|
||||||
import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
|
import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
|
||||||
import com.seibel.distanthorizons.core.level.IServerKeyedClientLevel;
|
import com.seibel.distanthorizons.core.level.IServerKeyedClientLevel;
|
||||||
import com.seibel.distanthorizons.core.logging.ConfigBasedLogger;
|
|
||||||
import com.seibel.distanthorizons.core.logging.ConfigBasedSpamLogger;
|
|
||||||
import com.seibel.distanthorizons.core.logging.SpamReducedLogger;
|
|
||||||
import com.seibel.distanthorizons.core.util.math.Mat4f;
|
|
||||||
import com.seibel.distanthorizons.core.render.glObject.GLProxy;
|
import com.seibel.distanthorizons.core.render.glObject.GLProxy;
|
||||||
import com.seibel.distanthorizons.core.render.renderer.TestRenderer;
|
|
||||||
import com.seibel.distanthorizons.core.util.RenderUtil;
|
|
||||||
import com.seibel.distanthorizons.core.world.AbstractDhWorld;
|
import com.seibel.distanthorizons.core.world.AbstractDhWorld;
|
||||||
import com.seibel.distanthorizons.core.world.DhClientServerWorld;
|
|
||||||
import com.seibel.distanthorizons.core.world.DhClientWorld;
|
import com.seibel.distanthorizons.core.world.DhClientWorld;
|
||||||
import com.seibel.distanthorizons.core.world.IDhClientWorld;
|
|
||||||
import com.seibel.distanthorizons.core.wrapperInterfaces.chunk.IChunkWrapper;
|
import com.seibel.distanthorizons.core.wrapperInterfaces.chunk.IChunkWrapper;
|
||||||
import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper;
|
import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper;
|
||||||
import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IProfilerWrapper;
|
import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IProfilerWrapper;
|
||||||
import com.seibel.distanthorizons.core.wrapperInterfaces.world.IClientLevelWrapper;
|
import com.seibel.distanthorizons.core.wrapperInterfaces.world.IClientLevelWrapper;
|
||||||
import org.apache.logging.log4j.LogManager;
|
import com.seibel.distanthorizons.core.logging.DhLogger;
|
||||||
import org.apache.logging.log4j.Logger;
|
|
||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
|
import org.jetbrains.annotations.Nullable;
|
||||||
import org.lwjgl.glfw.GLFW;
|
import org.lwjgl.glfw.GLFW;
|
||||||
|
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.util.*;
|
import java.util.*;
|
||||||
import java.util.concurrent.LinkedBlockingQueue;
|
import java.util.concurrent.LinkedBlockingQueue;
|
||||||
import java.util.concurrent.TimeUnit;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This holds the methods that should be called
|
* This holds the methods that should be called
|
||||||
@@ -75,7 +65,7 @@ import java.util.concurrent.TimeUnit;
|
|||||||
*/
|
*/
|
||||||
public class ClientApi
|
public class ClientApi
|
||||||
{
|
{
|
||||||
private static final Logger LOGGER = LogManager.getLogger();
|
private static final DhLogger LOGGER = new DhLoggerBuilder().build();
|
||||||
|
|
||||||
public static boolean prefLoggerEnabled = false;
|
public static boolean prefLoggerEnabled = false;
|
||||||
|
|
||||||
@@ -85,8 +75,6 @@ public class ClientApi
|
|||||||
private static final IMinecraftClientWrapper MC_CLIENT = SingletonInjector.INSTANCE.get(IMinecraftClientWrapper.class);
|
private static final IMinecraftClientWrapper MC_CLIENT = SingletonInjector.INSTANCE.get(IMinecraftClientWrapper.class);
|
||||||
private static final IMinecraftRenderWrapper MC_RENDER = SingletonInjector.INSTANCE.get(IMinecraftRenderWrapper.class);
|
private static final IMinecraftRenderWrapper MC_RENDER = SingletonInjector.INSTANCE.get(IMinecraftRenderWrapper.class);
|
||||||
|
|
||||||
public static final long SPAM_LOGGER_FLUSH_NS = TimeUnit.NANOSECONDS.convert(1, TimeUnit.SECONDS);
|
|
||||||
|
|
||||||
/** this includes the is dev build message and low allocated memory warning */
|
/** this includes the is dev build message and low allocated memory warning */
|
||||||
private static final int MS_BETWEEN_STATIC_STARTUP_MESSAGES = 4_000;
|
private static final int MS_BETWEEN_STATIC_STARTUP_MESSAGES = 4_000;
|
||||||
|
|
||||||
@@ -98,14 +86,13 @@ public class ClientApi
|
|||||||
*
|
*
|
||||||
* Only downside is making sure each variable is populated before rendering.
|
* Only downside is making sure each variable is populated before rendering.
|
||||||
*/
|
*/
|
||||||
public static final RenderState RENDER_STATE = new RenderState();
|
public static final DhRenderState RENDER_STATE = new DhRenderState();
|
||||||
|
|
||||||
|
|
||||||
private boolean isDevBuildMessagePrinted = false;
|
private boolean isDevBuildMessagePrinted = false;
|
||||||
private boolean lowMemoryWarningPrinted = false;
|
private boolean lowMemoryWarningPrinted = false;
|
||||||
private boolean highVanillaRenderDistanceWarningPrinted = false;
|
private boolean highVanillaRenderDistanceWarningPrinted = false;
|
||||||
|
|
||||||
/** when the last static */
|
|
||||||
private long lastStaticWarningMessageSentMsTime = 0L;
|
private long lastStaticWarningMessageSentMsTime = 0L;
|
||||||
|
|
||||||
private final Queue<String> chatMessageQueueForNextFrame = new LinkedBlockingQueue<>();
|
private final Queue<String> chatMessageQueueForNextFrame = new LinkedBlockingQueue<>();
|
||||||
@@ -113,8 +100,6 @@ public class ClientApi
|
|||||||
|
|
||||||
public boolean rendererDisabledBecauseOfExceptions = false;
|
public boolean rendererDisabledBecauseOfExceptions = false;
|
||||||
|
|
||||||
private long lastFlushNanoTime = 0;
|
|
||||||
|
|
||||||
private final ClientPluginChannelApi pluginChannelApi = new ClientPluginChannelApi(this::clientLevelLoadEvent, this::clientLevelUnloadEvent);
|
private final ClientPluginChannelApi pluginChannelApi = new ClientPluginChannelApi(this::clientLevelLoadEvent, this::clientLevelUnloadEvent);
|
||||||
|
|
||||||
/** Delay loading the first level to give the server some time to respond with level to actually load */
|
/** Delay loading the first level to give the server some time to respond with level to actually load */
|
||||||
@@ -126,8 +111,8 @@ public class ClientApi
|
|||||||
/** Holds any chunks that were loaded before the {@link ClientApi#clientLevelLoadEvent(IClientLevelWrapper)} was fired. */
|
/** Holds any chunks that were loaded before the {@link ClientApi#clientLevelLoadEvent(IClientLevelWrapper)} was fired. */
|
||||||
public final HashMap<Pair<IClientLevelWrapper, DhChunkPos>, IChunkWrapper> waitingChunkByClientLevelAndPos = new HashMap<>();
|
public final HashMap<Pair<IClientLevelWrapper, DhChunkPos>, IChunkWrapper> waitingChunkByClientLevelAndPos = new HashMap<>();
|
||||||
|
|
||||||
/** re-set every frame during the opaque rendering stage */
|
@Nullable
|
||||||
private boolean renderingCancelledForThisFrame;
|
public String lastRenderParamValidationMessage = null;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@@ -256,7 +241,7 @@ public class ClientApi
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public void clientLevelLoadEvent(IClientLevelWrapper levelWrapper)
|
public void clientLevelLoadEvent(@Nullable IClientLevelWrapper levelWrapper)
|
||||||
{
|
{
|
||||||
// wait a moment before loading the level to give the server a chance to handle the client's login request
|
// wait a moment before loading the level to give the server a chance to handle the client's login request
|
||||||
if (MC_CLIENT.clientConnectedToDedicatedServer())
|
if (MC_CLIENT.clientConnectedToDedicatedServer())
|
||||||
@@ -332,49 +317,6 @@ public class ClientApi
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
//===============//
|
|
||||||
// render events //
|
|
||||||
//===============//
|
|
||||||
|
|
||||||
public void clientTickEvent()
|
|
||||||
{
|
|
||||||
IProfilerWrapper profiler = MC_CLIENT.getProfiler();
|
|
||||||
profiler.push("DH-ClientTick");
|
|
||||||
|
|
||||||
try
|
|
||||||
{
|
|
||||||
boolean doFlush = System.nanoTime() - this.lastFlushNanoTime >= SPAM_LOGGER_FLUSH_NS;
|
|
||||||
if (doFlush)
|
|
||||||
{
|
|
||||||
this.lastFlushNanoTime = System.nanoTime();
|
|
||||||
SpamReducedLogger.flushAll();
|
|
||||||
}
|
|
||||||
ConfigBasedLogger.updateAll();
|
|
||||||
ConfigBasedSpamLogger.updateAll(doFlush);
|
|
||||||
|
|
||||||
IDhClientWorld clientWorld = SharedApi.getIDhClientWorld();
|
|
||||||
if (clientWorld != null)
|
|
||||||
{
|
|
||||||
clientWorld.clientTick();
|
|
||||||
|
|
||||||
// Ignore local world gen, as it's managed by server ticking
|
|
||||||
if (!(clientWorld instanceof DhClientServerWorld))
|
|
||||||
{
|
|
||||||
SharedApi.worldGenTick(clientWorld::worldGenTick);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
catch (Exception e)
|
|
||||||
{
|
|
||||||
// handle errors here to prevent blowing up a mixin or API up stream
|
|
||||||
LOGGER.error("Unexpected error in ClientApi.clientTickEvent(), error: "+e.getMessage(), e);
|
|
||||||
}
|
|
||||||
|
|
||||||
profiler.pop();
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
//============//
|
//============//
|
||||||
// networking //
|
// networking //
|
||||||
//============//
|
//============//
|
||||||
@@ -395,9 +337,9 @@ public class ClientApi
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
//===========//
|
//===============//
|
||||||
// rendering //
|
// LOD rendering //
|
||||||
//===========//
|
//===============//
|
||||||
|
|
||||||
/** Should be called before {@link ClientApi#renderDeferredLodsForShaders} */
|
/** Should be called before {@link ClientApi#renderDeferredLodsForShaders} */
|
||||||
public void renderLods() { this.renderLodLayer(false); }
|
public void renderLods() { this.renderLodLayer(false); }
|
||||||
@@ -410,18 +352,9 @@ public class ClientApi
|
|||||||
|
|
||||||
private void renderLodLayer(boolean renderingDeferredLayer)
|
private void renderLodLayer(boolean renderingDeferredLayer)
|
||||||
{
|
{
|
||||||
// A global render state variable is used since MC has split up their
|
//=========//
|
||||||
// render prep and actual rendering into different threads/methods
|
|
||||||
// this is annoying since it's possible to start a render with only
|
|
||||||
// partially complete info, but there isn't a better option at the moment
|
|
||||||
IClientLevelWrapper levelWrapper = RENDER_STATE.clientLevelWrapper;
|
|
||||||
Mat4f mcModelViewMatrix = RENDER_STATE.mcModelViewMatrix;
|
|
||||||
Mat4f mcProjectionMatrix = RENDER_STATE.mcProjectionMatrix;
|
|
||||||
float partialTicks = RENDER_STATE.frameTime;
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
// logging //
|
// logging //
|
||||||
|
//=========//
|
||||||
|
|
||||||
this.sendQueuedChatMessages();
|
this.sendQueuedChatMessages();
|
||||||
|
|
||||||
@@ -431,7 +364,36 @@ public class ClientApi
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
// render parameter setup //
|
//=====================//
|
||||||
|
// render thread tasks //
|
||||||
|
//=====================//
|
||||||
|
|
||||||
|
// only run these tasks once per frame
|
||||||
|
if (!renderingDeferredLayer)
|
||||||
|
{
|
||||||
|
profiler.push("DH render thread tasks");
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
// make sure the GLProxy is created for future use
|
||||||
|
GLProxy.getInstance();
|
||||||
|
|
||||||
|
// these tasks always need to be called, regardless of whether the renderer is enabled or not to prevent memory leaks
|
||||||
|
GLProxy.runRenderThreadTasks();
|
||||||
|
}
|
||||||
|
catch (Exception e)
|
||||||
|
{
|
||||||
|
LOGGER.error("Unexpected issue running render thread tasks, error: [" + e.getMessage() + "].", e);
|
||||||
|
}
|
||||||
|
|
||||||
|
profiler.pop();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
//=================//
|
||||||
|
// parameter setup //
|
||||||
|
//=================//
|
||||||
|
|
||||||
EDhApiRenderPass renderPass;
|
EDhApiRenderPass renderPass;
|
||||||
if (DhApiRenderProxy.INSTANCE.getDeferTransparentRendering())
|
if (DhApiRenderProxy.INSTANCE.getDeferTransparentRendering())
|
||||||
@@ -450,86 +412,67 @@ public class ClientApi
|
|||||||
renderPass = EDhApiRenderPass.OPAQUE_AND_TRANSPARENT;
|
renderPass = EDhApiRenderPass.OPAQUE_AND_TRANSPARENT;
|
||||||
}
|
}
|
||||||
|
|
||||||
DhApiRenderParam renderEventParam =
|
// A global render state variable is used since MC has split up their
|
||||||
new DhApiRenderParam(
|
// render prep and actual rendering into different threads/methods
|
||||||
renderPass,
|
// this is annoying since it's possible to start a render with only
|
||||||
partialTicks,
|
// partially complete info, but there isn't a better option at the moment
|
||||||
RenderUtil.getNearClipPlaneDistanceInBlocks(partialTicks), RenderUtil.getFarClipPlaneDistanceInBlocks(),
|
RenderParams renderParams =
|
||||||
mcProjectionMatrix, mcModelViewMatrix,
|
new RenderParams(
|
||||||
RenderUtil.createLodProjectionMatrix(mcProjectionMatrix, partialTicks), RenderUtil.createLodModelViewMatrix(mcModelViewMatrix),
|
renderPass,
|
||||||
levelWrapper.getMinHeight()
|
RENDER_STATE.frameTime,
|
||||||
);
|
RENDER_STATE.mcProjectionMatrix, RENDER_STATE.mcModelViewMatrix,
|
||||||
|
RENDER_STATE.clientLevelWrapper
|
||||||
|
);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
//Mat4f mcCombined = mcModelViewMatrix.copy();
|
//============//
|
||||||
//mcCombined.multiply(mcProjectionMatrix);
|
// validation //
|
||||||
//
|
//============//
|
||||||
//com.seibel.distanthorizons.api.objects.math.DhApiMat4f dhCombined = renderEventParam.dhModelViewMatrix.copy();
|
|
||||||
//dhCombined.multiply(renderEventParam.dhProjectionMatrix);
|
// TODO write this message to the F3 menu so people can see when a different mod screws with the lightmap
|
||||||
//
|
String validationMessage = renderParams.getValidationErrorMessage();
|
||||||
//LOGGER.info("\n\n" +
|
if (validationMessage != null)
|
||||||
// "API\n" +
|
{
|
||||||
// "Mc MVM: \n" + mcModelViewMatrix.toString() + "\n" +
|
this.lastRenderParamValidationMessage = validationMessage;
|
||||||
// "Mc Proj: \n" + mcProjectionMatrix + "\n" +
|
return;
|
||||||
// "Mc Combined:\n" + mcCombined.toString() + "\n" +
|
}
|
||||||
// "\n" +
|
else
|
||||||
// "DH MVM: \n" + renderEventParam.dhModelViewMatrix.toString() + "\n" +
|
{
|
||||||
// "DH Proj: \n" + renderEventParam.dhProjectionMatrix + "\n" +
|
this.lastRenderParamValidationMessage = null;
|
||||||
// "DH Combined:\n" + mcCombined.toString()
|
}
|
||||||
//);
|
|
||||||
|
if (this.rendererDisabledBecauseOfExceptions)
|
||||||
|
{
|
||||||
|
// re-enable rendering if the user toggles DH rendering
|
||||||
|
if (!Config.Client.quickEnableRendering.get())
|
||||||
|
{
|
||||||
|
LOGGER.info("DH Renderer re-enabled after exception. Some rendering issues may occur. Please reboot Minecraft if you see any rendering issues.");
|
||||||
|
this.rendererDisabledBecauseOfExceptions = false;
|
||||||
|
Config.Client.quickEnableRendering.set(true);
|
||||||
|
}
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
// render validation //
|
//===========//
|
||||||
|
// rendering //
|
||||||
|
//===========//
|
||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
// TODO write this message to the F3 menu so people can see when a different mod screws with the lightmap
|
|
||||||
String reasonLodsCannotRender = RenderUtil.shouldLodsRender(levelWrapper, renderEventParam);
|
|
||||||
if (reasonLodsCannotRender != null)
|
|
||||||
{
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
IDhClientWorld dhClientWorld = SharedApi.getIDhClientWorld();
|
|
||||||
if (dhClientWorld == null)
|
|
||||||
{
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
IDhClientLevel level = (IDhClientLevel) dhClientWorld.getLevel(levelWrapper);
|
|
||||||
if (level == null)
|
|
||||||
{
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
if (this.rendererDisabledBecauseOfExceptions)
|
|
||||||
{
|
|
||||||
// re-enable rendering if the user toggles DH rendering
|
|
||||||
if (!Config.Client.quickEnableRendering.get())
|
|
||||||
{
|
|
||||||
LOGGER.info("DH Renderer re-enabled after exception. Some rendering issues may occur. Please reboot Minecraft if you see any rendering issues.");
|
|
||||||
this.rendererDisabledBecauseOfExceptions = false;
|
|
||||||
Config.Client.quickEnableRendering.set(true);
|
|
||||||
}
|
|
||||||
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
// render pass //
|
// render pass //
|
||||||
|
|
||||||
if (!renderingDeferredLayer)
|
if (!renderingDeferredLayer)
|
||||||
{
|
{
|
||||||
if (Config.Client.Advanced.Debugging.rendererMode.get() == EDhApiRendererMode.DEFAULT)
|
if (Config.Client.Advanced.Debugging.rendererMode.get() == EDhApiRendererMode.DEFAULT)
|
||||||
{
|
{
|
||||||
this.renderingCancelledForThisFrame = ApiEventInjector.INSTANCE.fireAllEvents(DhApiBeforeRenderEvent.class, renderEventParam);
|
boolean renderingCancelledForThisFrame = ApiEventInjector.INSTANCE.fireAllEvents(DhApiBeforeRenderEvent.class, renderParams);
|
||||||
if (!this.renderingCancelledForThisFrame)
|
if (!renderingCancelledForThisFrame)
|
||||||
{
|
{
|
||||||
level.render(renderEventParam, profiler);
|
LodRenderer.INSTANCE.render(renderParams, profiler);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!DhApi.Delayed.renderProxy.getDeferTransparentRendering())
|
if (!DhApi.Delayed.renderProxy.getDeferTransparentRendering())
|
||||||
@@ -546,10 +489,10 @@ public class ClientApi
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
boolean renderingCancelled = ApiEventInjector.INSTANCE.fireAllEvents(DhApiBeforeDeferredRenderEvent.class, renderEventParam);
|
boolean renderingCancelled = ApiEventInjector.INSTANCE.fireAllEvents(DhApiBeforeDeferredRenderEvent.class, renderParams);
|
||||||
if (!renderingCancelled)
|
if (!renderingCancelled)
|
||||||
{
|
{
|
||||||
level.renderDeferred(renderEventParam, profiler);
|
LodRenderer.INSTANCE.renderDeferred(renderParams, profiler);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -569,24 +512,19 @@ public class ClientApi
|
|||||||
MC_CLIENT.sendChatMessage("\u00A74Toggle DH rendering via the config UI to re-activate DH rendering.");
|
MC_CLIENT.sendChatMessage("\u00A74Toggle DH rendering via the config UI to re-activate DH rendering.");
|
||||||
MC_CLIENT.sendChatMessage("\u00A74Error: " + e);
|
MC_CLIENT.sendChatMessage("\u00A74Error: " + e);
|
||||||
}
|
}
|
||||||
finally
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
profiler.pop(); // end LOD
|
||||||
// these tasks always need to be called, regardless of whether the renderer is enabled or not to prevent memory leaks
|
profiler.push("terrain"); // go back into "terrain"
|
||||||
GLProxy.getInstance().runRenderThreadTasks();
|
|
||||||
}
|
|
||||||
catch (Exception e)
|
|
||||||
{
|
|
||||||
LOGGER.error("Unexpected issue running render thread tasks.", e);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
profiler.pop(); // end LOD
|
|
||||||
profiler.push("terrain"); // go back into "terrain"
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
//================//
|
||||||
|
// fade rendering //
|
||||||
|
//================//
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The first fade pass.
|
* The first fade pass.
|
||||||
* Called after MC finishes rendering the opaque passes.
|
* Called after MC finishes rendering the opaque passes.
|
||||||
@@ -595,12 +533,17 @@ public class ClientApi
|
|||||||
{
|
{
|
||||||
// only fade when DH is rendering
|
// only fade when DH is rendering
|
||||||
if (Config.Client.Advanced.Debugging.rendererMode.get() == EDhApiRendererMode.DEFAULT
|
if (Config.Client.Advanced.Debugging.rendererMode.get() == EDhApiRendererMode.DEFAULT
|
||||||
// only fade when requested
|
&&
|
||||||
&& Config.Client.Advanced.Graphics.Quality.vanillaFadeMode.get() == EDhApiMcRenderingFadeMode.DOUBLE_PASS
|
(
|
||||||
|
// only fade when requested
|
||||||
|
Config.Client.Advanced.Graphics.Quality.vanillaFadeMode.get() == EDhApiMcRenderingFadeMode.DOUBLE_PASS
|
||||||
|
// or if LOD-only mode is enabled (fading is used to remove the MC render pass)
|
||||||
|
|| Config.Client.Advanced.Debugging.lodOnlyMode.get()
|
||||||
|
)
|
||||||
// don't fade when Iris shaders are active, otherwise the rendering can get weird
|
// don't fade when Iris shaders are active, otherwise the rendering can get weird
|
||||||
&& !DhApiRenderProxy.INSTANCE.getDeferTransparentRendering())
|
&& !DhApiRenderProxy.INSTANCE.getDeferTransparentRendering())
|
||||||
{
|
{
|
||||||
FadeRenderer.INSTANCE.render(RENDER_STATE.mcModelViewMatrix, RENDER_STATE.mcProjectionMatrix, RENDER_STATE.frameTime, RENDER_STATE.clientLevelWrapper);
|
VanillaFadeRenderer.INSTANCE.render(RENDER_STATE.mcModelViewMatrix, RENDER_STATE.mcProjectionMatrix, RENDER_STATE.frameTime, RENDER_STATE.clientLevelWrapper);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
/**
|
/**
|
||||||
@@ -624,14 +567,13 @@ public class ClientApi
|
|||||||
&& !DhApiRenderProxy.INSTANCE.getDeferTransparentRendering();
|
&& !DhApiRenderProxy.INSTANCE.getDeferTransparentRendering();
|
||||||
if (renderFade)
|
if (renderFade)
|
||||||
{
|
{
|
||||||
FadeRenderer.INSTANCE.render(RENDER_STATE.mcModelViewMatrix, RENDER_STATE.mcProjectionMatrix, RENDER_STATE.frameTime, RENDER_STATE.clientLevelWrapper);
|
VanillaFadeRenderer.INSTANCE.render(RENDER_STATE.mcModelViewMatrix, RENDER_STATE.mcProjectionMatrix, RENDER_STATE.frameTime, RENDER_STATE.clientLevelWrapper);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
//=================//
|
//=================//
|
||||||
// DEBUG USE //
|
// DEBUG USE //
|
||||||
//=================//
|
//=================//
|
||||||
@@ -705,7 +647,8 @@ public class ClientApi
|
|||||||
{
|
{
|
||||||
// dev build
|
// dev build
|
||||||
if (ModInfo.IS_DEV_BUILD
|
if (ModInfo.IS_DEV_BUILD
|
||||||
&& !this.isDevBuildMessagePrinted && MC_CLIENT.playerExists())
|
&& !this.isDevBuildMessagePrinted
|
||||||
|
&& MC_CLIENT.playerExists())
|
||||||
{
|
{
|
||||||
this.isDevBuildMessagePrinted = true;
|
this.isDevBuildMessagePrinted = true;
|
||||||
this.lastStaticWarningMessageSentMsTime = System.currentTimeMillis();
|
this.lastStaticWarningMessageSentMsTime = System.currentTimeMillis();
|
||||||
@@ -751,10 +694,11 @@ public class ClientApi
|
|||||||
if (!this.highVanillaRenderDistanceWarningPrinted
|
if (!this.highVanillaRenderDistanceWarningPrinted
|
||||||
&& Config.Common.Logging.Warning.showHighVanillaRenderDistanceWarning.get())
|
&& Config.Common.Logging.Warning.showHighVanillaRenderDistanceWarning.get())
|
||||||
{
|
{
|
||||||
|
this.highVanillaRenderDistanceWarningPrinted = true;
|
||||||
|
|
||||||
// DH generally doesn't need a vanilla render distance above 12
|
// DH generally doesn't need a vanilla render distance above 12
|
||||||
if (MC_RENDER.getRenderDistance() > 12)
|
if (MC_RENDER.getRenderDistance() > 12)
|
||||||
{
|
{
|
||||||
this.highVanillaRenderDistanceWarningPrinted = true;
|
|
||||||
this.lastStaticWarningMessageSentMsTime = System.currentTimeMillis();
|
this.lastStaticWarningMessageSentMsTime = System.currentTimeMillis();
|
||||||
|
|
||||||
String message =
|
String message =
|
||||||
|
|||||||
+18
-8
@@ -4,13 +4,14 @@ import com.seibel.distanthorizons.core.config.Config;
|
|||||||
import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
|
import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
|
||||||
import com.seibel.distanthorizons.core.level.IKeyedClientLevelManager;
|
import com.seibel.distanthorizons.core.level.IKeyedClientLevelManager;
|
||||||
import com.seibel.distanthorizons.core.level.IServerKeyedClientLevel;
|
import com.seibel.distanthorizons.core.level.IServerKeyedClientLevel;
|
||||||
import com.seibel.distanthorizons.core.logging.ConfigBasedLogger;
|
import com.seibel.distanthorizons.core.logging.DhLogger;
|
||||||
|
import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
|
||||||
import com.seibel.distanthorizons.core.network.event.internal.CloseInternalEvent;
|
import com.seibel.distanthorizons.core.network.event.internal.CloseInternalEvent;
|
||||||
import com.seibel.distanthorizons.core.network.messages.base.LevelInitMessage;
|
import com.seibel.distanthorizons.core.network.messages.base.LevelInitMessage;
|
||||||
import com.seibel.distanthorizons.core.network.session.NetworkSession;
|
import com.seibel.distanthorizons.core.network.session.NetworkSession;
|
||||||
|
import com.seibel.distanthorizons.core.render.glObject.GLProxy;
|
||||||
import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper;
|
import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper;
|
||||||
import com.seibel.distanthorizons.core.wrapperInterfaces.world.IClientLevelWrapper;
|
import com.seibel.distanthorizons.core.wrapperInterfaces.world.IClientLevelWrapper;
|
||||||
import org.apache.logging.log4j.LogManager;
|
|
||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
import org.jetbrains.annotations.Nullable;
|
import org.jetbrains.annotations.Nullable;
|
||||||
|
|
||||||
@@ -22,8 +23,10 @@ import java.util.function.Consumer;
|
|||||||
*/
|
*/
|
||||||
public class ClientPluginChannelApi
|
public class ClientPluginChannelApi
|
||||||
{
|
{
|
||||||
private static final ConfigBasedLogger LOGGER = new ConfigBasedLogger(LogManager.getLogger(),
|
private static final DhLogger LOGGER = new DhLoggerBuilder()
|
||||||
() -> Config.Common.Logging.logNetworkEvent.get());
|
.fileLevelConfig(Config.Common.Logging.logNetworkEventToFile)
|
||||||
|
.build();
|
||||||
|
|
||||||
private static final IMinecraftClientWrapper MC = SingletonInjector.INSTANCE.get(IMinecraftClientWrapper.class);
|
private static final IMinecraftClientWrapper MC = SingletonInjector.INSTANCE.get(IMinecraftClientWrapper.class);
|
||||||
private static final IKeyedClientLevelManager KEYED_CLIENT_LEVEL_MANAGER = SingletonInjector.INSTANCE.get(IKeyedClientLevelManager.class);
|
private static final IKeyedClientLevelManager KEYED_CLIENT_LEVEL_MANAGER = SingletonInjector.INSTANCE.get(IKeyedClientLevelManager.class);
|
||||||
|
|
||||||
@@ -75,14 +78,19 @@ public class ClientPluginChannelApi
|
|||||||
|
|
||||||
private void onLevelInitMessage(LevelInitMessage msg)
|
private void onLevelInitMessage(LevelInitMessage msg)
|
||||||
{
|
{
|
||||||
if (!msg.levelKey.matches(LevelInitMessage.VALIDATION_REGEX))
|
if (!msg.serverKey.isEmpty() && !msg.serverKey.matches(LevelInitMessage.SERVER_KEY_REGEX))
|
||||||
|
{
|
||||||
|
throw new IllegalArgumentException("Server sent invalid server key.");
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!msg.levelKey.matches(LevelInitMessage.LEVEL_KEY_REGEX))
|
||||||
{
|
{
|
||||||
throw new IllegalArgumentException("Server sent invalid level key.");
|
throw new IllegalArgumentException("Server sent invalid level key.");
|
||||||
}
|
}
|
||||||
|
|
||||||
LOGGER.info("Server level key received: [" + msg.levelKey + "].");
|
LOGGER.info("Server level key received: [" + msg.levelKey + "].");
|
||||||
|
|
||||||
MC.executeOnRenderThread(() ->
|
GLProxy.queueRunningOnRenderThread(() ->
|
||||||
{
|
{
|
||||||
IClientLevelWrapper clientLevel = MC.getWrappedClientLevel(true);
|
IClientLevelWrapper clientLevel = MC.getWrappedClientLevel(true);
|
||||||
IServerKeyedClientLevel existingKeyedClientLevel = KEYED_CLIENT_LEVEL_MANAGER.getServerKeyedLevel();
|
IServerKeyedClientLevel existingKeyedClientLevel = KEYED_CLIENT_LEVEL_MANAGER.getServerKeyedLevel();
|
||||||
@@ -105,10 +113,12 @@ public class ClientPluginChannelApi
|
|||||||
this.levelUnloadHandler.accept(clientLevel);
|
this.levelUnloadHandler.accept(clientLevel);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (existingKeyedClientLevel == null || !existingKeyedClientLevel.getServerLevelKey().equals(msg.levelKey))
|
if (existingKeyedClientLevel == null
|
||||||
|
|| !existingKeyedClientLevel.getServerKey().equals(msg.serverKey)
|
||||||
|
|| !existingKeyedClientLevel.getServerLevelKey().equals(msg.levelKey))
|
||||||
{
|
{
|
||||||
LOGGER.info("Loading level with key: [" + msg.levelKey + "].");
|
LOGGER.info("Loading level with key: [" + msg.levelKey + "].");
|
||||||
IServerKeyedClientLevel keyedLevel = KEYED_CLIENT_LEVEL_MANAGER.setServerKeyedLevel(clientLevel, msg.levelKey);
|
IServerKeyedClientLevel keyedLevel = KEYED_CLIENT_LEVEL_MANAGER.setServerKeyedLevel(clientLevel, msg.serverKey, msg.levelKey);
|
||||||
this.levelLoadHandler.accept(keyedLevel);
|
this.levelLoadHandler.accept(keyedLevel);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -30,7 +30,7 @@ import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
|
|||||||
import com.seibel.distanthorizons.core.wrapperInterfaces.chunk.IChunkWrapper;
|
import com.seibel.distanthorizons.core.wrapperInterfaces.chunk.IChunkWrapper;
|
||||||
import com.seibel.distanthorizons.core.wrapperInterfaces.world.ILevelWrapper;
|
import com.seibel.distanthorizons.core.wrapperInterfaces.world.ILevelWrapper;
|
||||||
import com.seibel.distanthorizons.core.wrapperInterfaces.world.IServerLevelWrapper;
|
import com.seibel.distanthorizons.core.wrapperInterfaces.world.IServerLevelWrapper;
|
||||||
import org.apache.logging.log4j.Logger;
|
import com.seibel.distanthorizons.core.logging.DhLogger;
|
||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -41,7 +41,7 @@ public class ServerApi
|
|||||||
{
|
{
|
||||||
public static final ServerApi INSTANCE = new ServerApi();
|
public static final ServerApi INSTANCE = new ServerApi();
|
||||||
|
|
||||||
private static final Logger LOGGER = DhLoggerBuilder.getLogger();
|
private static final DhLogger LOGGER = new DhLoggerBuilder().build();
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@@ -53,30 +53,6 @@ public class ServerApi
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
//=============//
|
|
||||||
// tick events //
|
|
||||||
//=============//
|
|
||||||
|
|
||||||
public void serverTickEvent()
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
IDhServerWorld serverWorld = SharedApi.getIDhServerWorld();
|
|
||||||
if (serverWorld != null)
|
|
||||||
{
|
|
||||||
serverWorld.serverTick();
|
|
||||||
SharedApi.worldGenTick(serverWorld::worldGenTick);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
catch (Exception e)
|
|
||||||
{
|
|
||||||
// try catch is necessary to prevent crashing the internal server when an exception is thrown
|
|
||||||
LOGGER.error("ServerTickEvent error: " + e.getMessage(), e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
//===============//
|
//===============//
|
||||||
// server events //
|
// server events //
|
||||||
//===============//
|
//===============//
|
||||||
@@ -106,15 +82,15 @@ public class ServerApi
|
|||||||
// level events //
|
// level events //
|
||||||
//==============//
|
//==============//
|
||||||
|
|
||||||
public void serverLevelLoadEvent(IServerLevelWrapper level)
|
public void serverLevelLoadEvent(IServerLevelWrapper levelWrapper)
|
||||||
{
|
{
|
||||||
LOGGER.debug("Server Level " + level + " loading");
|
LOGGER.debug("Server Level " + levelWrapper + " loading");
|
||||||
|
|
||||||
AbstractDhWorld serverWorld = SharedApi.getAbstractDhWorld();
|
AbstractDhWorld serverWorld = SharedApi.getAbstractDhWorld();
|
||||||
if (serverWorld != null)
|
if (serverWorld != null)
|
||||||
{
|
{
|
||||||
serverWorld.getOrLoadLevel(level);
|
serverWorld.getOrLoadLevel(levelWrapper);
|
||||||
ApiEventInjector.INSTANCE.fireAllEvents(DhApiLevelLoadEvent.class, new DhApiLevelLoadEvent.EventParam(level));
|
ApiEventInjector.INSTANCE.fireAllEvents(DhApiLevelLoadEvent.class, new DhApiLevelLoadEvent.EventParam(levelWrapper));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
public void serverLevelUnloadEvent(IServerLevelWrapper level)
|
public void serverLevelUnloadEvent(IServerLevelWrapper level)
|
||||||
@@ -152,7 +128,7 @@ public class ServerApi
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
IDhServerWorld serverWorld = SharedApi.getIDhServerWorld();
|
IDhServerWorld serverWorld = SharedApi.tryGetDhServerWorld();
|
||||||
LOGGER.info("Player ["+player.getName()+"] joined.");
|
LOGGER.info("Player ["+player.getName()+"] joined.");
|
||||||
if (serverWorld != null)
|
if (serverWorld != null)
|
||||||
{
|
{
|
||||||
@@ -166,7 +142,7 @@ public class ServerApi
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
IDhServerWorld serverWorld = SharedApi.getIDhServerWorld();
|
IDhServerWorld serverWorld = SharedApi.tryGetDhServerWorld();
|
||||||
LOGGER.info("Player ["+player.getName()+"] disconnected.");
|
LOGGER.info("Player ["+player.getName()+"] disconnected.");
|
||||||
if (serverWorld != null)
|
if (serverWorld != null)
|
||||||
{
|
{
|
||||||
@@ -180,7 +156,7 @@ public class ServerApi
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
IDhServerWorld serverWorld = SharedApi.getIDhServerWorld();
|
IDhServerWorld serverWorld = SharedApi.tryGetDhServerWorld();
|
||||||
LOGGER.info("Player ["+player.getName()+"] changed level: ["+originLevel.getKeyedLevelDimensionName()+"] -> ["+destinationLevel.getKeyedLevelDimensionName()+"].");
|
LOGGER.info("Player ["+player.getName()+"] changed level: ["+originLevel.getKeyedLevelDimensionName()+"] -> ["+destinationLevel.getKeyedLevelDimensionName()+"].");
|
||||||
if (serverWorld != null)
|
if (serverWorld != null)
|
||||||
{
|
{
|
||||||
@@ -200,7 +176,7 @@ public class ServerApi
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
IDhServerWorld serverWorld = SharedApi.getIDhServerWorld();
|
IDhServerWorld serverWorld = SharedApi.tryGetDhServerWorld();
|
||||||
if (serverWorld != null)
|
if (serverWorld != null)
|
||||||
{
|
{
|
||||||
serverWorld.getServerPlayerStateManager().handlePluginMessage(player, message);
|
serverWorld.getServerPlayerStateManager().handlePluginMessage(player, message);
|
||||||
|
|||||||
@@ -25,6 +25,7 @@ import com.seibel.distanthorizons.core.Initializer;
|
|||||||
import com.seibel.distanthorizons.core.api.internal.chunkUpdating.ChunkUpdateData;
|
import com.seibel.distanthorizons.core.api.internal.chunkUpdating.ChunkUpdateData;
|
||||||
import com.seibel.distanthorizons.core.api.internal.chunkUpdating.ChunkUpdateQueueManager;
|
import com.seibel.distanthorizons.core.api.internal.chunkUpdating.ChunkUpdateQueueManager;
|
||||||
import com.seibel.distanthorizons.core.config.Config;
|
import com.seibel.distanthorizons.core.config.Config;
|
||||||
|
import com.seibel.distanthorizons.core.config.eventHandlers.IgnoredDimensionCsvHandler;
|
||||||
import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
|
import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
|
||||||
import com.seibel.distanthorizons.core.generation.DhLightingEngine;
|
import com.seibel.distanthorizons.core.generation.DhLightingEngine;
|
||||||
import com.seibel.distanthorizons.core.level.DhClientLevel;
|
import com.seibel.distanthorizons.core.level.DhClientLevel;
|
||||||
@@ -47,7 +48,7 @@ import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftSha
|
|||||||
import com.seibel.distanthorizons.core.wrapperInterfaces.world.IClientLevelWrapper;
|
import com.seibel.distanthorizons.core.wrapperInterfaces.world.IClientLevelWrapper;
|
||||||
import com.seibel.distanthorizons.core.wrapperInterfaces.world.ILevelWrapper;
|
import com.seibel.distanthorizons.core.wrapperInterfaces.world.ILevelWrapper;
|
||||||
import com.seibel.distanthorizons.coreapi.DependencyInjection.ApiEventInjector;
|
import com.seibel.distanthorizons.coreapi.DependencyInjection.ApiEventInjector;
|
||||||
import org.apache.logging.log4j.Logger;
|
import com.seibel.distanthorizons.core.logging.DhLogger;
|
||||||
import org.jetbrains.annotations.Nullable;
|
import org.jetbrains.annotations.Nullable;
|
||||||
|
|
||||||
import java.util.*;
|
import java.util.*;
|
||||||
@@ -58,7 +59,7 @@ public class SharedApi
|
|||||||
{
|
{
|
||||||
public static final SharedApi INSTANCE = new SharedApi();
|
public static final SharedApi INSTANCE = new SharedApi();
|
||||||
|
|
||||||
private static final Logger LOGGER = DhLoggerBuilder.getLogger();
|
private static final DhLogger LOGGER = new DhLoggerBuilder().build();
|
||||||
/** will be null on the server-side */
|
/** will be null on the server-side */
|
||||||
@Nullable
|
@Nullable
|
||||||
private static final IMinecraftRenderWrapper MC_RENDER = SingletonInjector.INSTANCE.get(IMinecraftRenderWrapper.class);
|
private static final IMinecraftRenderWrapper MC_RENDER = SingletonInjector.INSTANCE.get(IMinecraftRenderWrapper.class);
|
||||||
@@ -141,24 +142,16 @@ public class SharedApi
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void worldGenTick(Runnable worldGenRunnable)
|
|
||||||
{
|
|
||||||
lastWorldGenTickDelta--;
|
|
||||||
if (lastWorldGenTickDelta <= 0)
|
|
||||||
{
|
|
||||||
worldGenRunnable.run();
|
|
||||||
lastWorldGenTickDelta = 20;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Nullable
|
@Nullable
|
||||||
public static AbstractDhWorld getAbstractDhWorld() { return currentWorld; }
|
public static AbstractDhWorld getAbstractDhWorld() { return currentWorld; }
|
||||||
/** returns null if the {@link SharedApi#currentWorld} isn't a {@link DhClientServerWorld} */
|
|
||||||
public static DhClientServerWorld getDhClientServerWorld() { return (currentWorld instanceof DhClientServerWorld) ? (DhClientServerWorld) currentWorld : null; }
|
|
||||||
/** returns null if the {@link SharedApi#currentWorld} isn't a {@link DhClientWorld} or {@link DhClientServerWorld} */
|
/** returns null if the {@link SharedApi#currentWorld} isn't a {@link DhClientWorld} or {@link DhClientServerWorld} */
|
||||||
public static IDhClientWorld getIDhClientWorld() { return (currentWorld instanceof IDhClientWorld) ? (IDhClientWorld) currentWorld : null; }
|
@Nullable
|
||||||
|
public static IDhClientWorld tryGetDhClientWorld() { return (currentWorld instanceof IDhClientWorld) ? (IDhClientWorld) currentWorld : null; }
|
||||||
|
|
||||||
/** returns null if the {@link SharedApi#currentWorld} isn't a {@link DhServerWorld} or {@link DhClientServerWorld} */
|
/** returns null if the {@link SharedApi#currentWorld} isn't a {@link DhServerWorld} or {@link DhClientServerWorld} */
|
||||||
public static IDhServerWorld getIDhServerWorld() { return (currentWorld instanceof IDhServerWorld) ? (IDhServerWorld) currentWorld : null; }
|
@Nullable
|
||||||
|
public static IDhServerWorld tryGetDhServerWorld() { return (currentWorld instanceof IDhServerWorld) ? (IDhServerWorld) currentWorld : null; }
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@@ -192,12 +185,11 @@ public class SharedApi
|
|||||||
public void chunkBlockChangedEvent(IChunkWrapper chunk, ILevelWrapper level) { this.applyChunkUpdate(chunk, level, true, false); }
|
public void chunkBlockChangedEvent(IChunkWrapper chunk, ILevelWrapper level) { this.applyChunkUpdate(chunk, level, true, false); }
|
||||||
public void chunkLoadEvent(IChunkWrapper chunk, ILevelWrapper level) { this.applyChunkUpdate(chunk, level, true, true); }
|
public void chunkLoadEvent(IChunkWrapper chunk, ILevelWrapper level) { this.applyChunkUpdate(chunk, level, true, true); }
|
||||||
|
|
||||||
//public void applyChunkUpdate(IChunkWrapper chunkWrapper, ILevelWrapper level, boolean canGetNeighboringChunks) { this.applyChunkUpdate(chunkWrapper, level, canGetNeighboringChunks, false); }
|
|
||||||
public void applyChunkUpdate(IChunkWrapper chunkWrapper, ILevelWrapper level, boolean canGetNeighboringChunks, boolean newlyLoaded)
|
public void applyChunkUpdate(IChunkWrapper chunkWrapper, ILevelWrapper level, boolean canGetNeighboringChunks, boolean newlyLoaded)
|
||||||
{
|
{
|
||||||
//========================//
|
//===================//
|
||||||
// world and level checks //
|
// validation checks //
|
||||||
//========================//
|
//===================//
|
||||||
|
|
||||||
if (chunkWrapper == null)
|
if (chunkWrapper == null)
|
||||||
{
|
{
|
||||||
@@ -225,7 +217,6 @@ public class SharedApi
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// only continue if the level is loaded
|
// only continue if the level is loaded
|
||||||
IDhLevel dhLevel = dhWorld.getLevel(level);
|
IDhLevel dhLevel = dhWorld.getLevel(level);
|
||||||
if (dhLevel == null)
|
if (dhLevel == null)
|
||||||
@@ -240,6 +231,7 @@ public class SharedApi
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// ignore chunk updates if the network should handle them
|
||||||
if (dhLevel instanceof DhClientLevel)
|
if (dhLevel instanceof DhClientLevel)
|
||||||
{
|
{
|
||||||
if (!((DhClientLevel) dhLevel).shouldProcessChunkUpdate(chunkWrapper.getChunkPos()))
|
if (!((DhClientLevel) dhLevel).shouldProcessChunkUpdate(chunkWrapper.getChunkPos()))
|
||||||
@@ -248,7 +240,14 @@ public class SharedApi
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// shoudln't normally happen, but just in case
|
// ignore chunk updates for non-rendered levels
|
||||||
|
String dimName = dhLevel.getLevelWrapper().getDimensionName();
|
||||||
|
if (IgnoredDimensionCsvHandler.INSTANCE.dimensionNameShouldBeIgnored(dimName))
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// shouldn't normally happen, but just in case
|
||||||
if (CHUNK_UPDATE_QUEUE_MANAGER.contains(chunkWrapper.getChunkPos()))
|
if (CHUNK_UPDATE_QUEUE_MANAGER.contains(chunkWrapper.getChunkPos()))
|
||||||
{
|
{
|
||||||
// TODO this will prevent some LODs from updating across dimensions if multiple levels are loaded
|
// TODO this will prevent some LODs from updating across dimensions if multiple levels are loaded
|
||||||
@@ -256,94 +255,20 @@ public class SharedApi
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
queueChunkUpdate(chunkWrapper, dhLevel);
|
||||||
//===============================//
|
|
||||||
// update the necessary chunk(s) //
|
|
||||||
//===============================//
|
|
||||||
|
|
||||||
if (!canGetNeighboringChunks)
|
|
||||||
{
|
|
||||||
// only update the center chunk
|
|
||||||
queueChunkUpdate(chunkWrapper, null, dhLevel, false);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
ArrayList<IChunkWrapper> neighboringChunkList = getNeighborChunkListForChunk(chunkWrapper, dhLevel);
|
|
||||||
|
|
||||||
if (newlyLoaded)
|
|
||||||
{
|
|
||||||
// this means this chunkWrapper is a newly loaded chunk
|
|
||||||
// which may be missing some neighboring chunk data
|
|
||||||
// because it is bordering the render distance
|
|
||||||
// thus, only the chunks neighboring this chunkWrapper will get updated
|
|
||||||
// because those are more likely to have their full neighboring chunk data
|
|
||||||
//TODO this does not prevent those neighboring chunks from updating
|
|
||||||
// this newly loaded chunk that were just skipped
|
|
||||||
// leading to occasional lighting issues
|
|
||||||
for (IChunkWrapper neighboringChunk : neighboringChunkList)
|
|
||||||
{
|
|
||||||
if (neighboringChunk == chunkWrapper)
|
|
||||||
{
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
this.applyChunkUpdate(neighboringChunk, level, true, false);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
// if not all neighboring chunk data is available, do not try to update
|
|
||||||
if (neighboringChunkList.size() < 9)
|
|
||||||
{
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// update the center with any existing neighbour chunks.
|
|
||||||
// this is done so lighting changes are propagated correctly
|
|
||||||
queueChunkUpdate(chunkWrapper, neighboringChunkList, dhLevel, true);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
private static ArrayList<IChunkWrapper> getNeighborChunkListForChunk(IChunkWrapper chunkWrapper, IDhLevel dhLevel)
|
|
||||||
{
|
|
||||||
// get the neighboring chunk list
|
|
||||||
ArrayList<IChunkWrapper> neighborChunkList = new ArrayList<>(9);
|
|
||||||
for (int xOffset = -1; xOffset <= 1; xOffset++)
|
|
||||||
{
|
|
||||||
for (int zOffset = -1; zOffset <= 1; zOffset++)
|
|
||||||
{
|
|
||||||
if (xOffset == 0 && zOffset == 0)
|
|
||||||
{
|
|
||||||
// center chunk
|
|
||||||
neighborChunkList.add(chunkWrapper);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
// neighboring chunk
|
|
||||||
DhChunkPos neighborPos = new DhChunkPos(chunkWrapper.getChunkPos().getX() + xOffset, chunkWrapper.getChunkPos().getZ() + zOffset);
|
|
||||||
IChunkWrapper neighborChunk = dhLevel.getLevelWrapper().tryGetChunk(neighborPos);
|
|
||||||
if (neighborChunk != null)
|
|
||||||
{
|
|
||||||
neighborChunkList.add(neighborChunk);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return neighborChunkList;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private static void queueChunkUpdate(IChunkWrapper chunkWrapper, @Nullable ArrayList<IChunkWrapper> neighborChunkList, IDhLevel dhLevel, boolean canGetNeighboringChunks)
|
private static void queueChunkUpdate(IChunkWrapper chunkWrapper, IDhLevel dhLevel)
|
||||||
{
|
{
|
||||||
|
|
||||||
// return if the chunk is already queued
|
// return if the chunk is already queued
|
||||||
if (CHUNK_UPDATE_QUEUE_MANAGER.contains(chunkWrapper.getChunkPos()))
|
if (CHUNK_UPDATE_QUEUE_MANAGER.contains(chunkWrapper.getChunkPos()))
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// add chunk update data to preUpdate queue
|
// add chunk update data to preUpdate queue
|
||||||
ChunkUpdateData updateData = new ChunkUpdateData(chunkWrapper, neighborChunkList, dhLevel, canGetNeighboringChunks);
|
ChunkUpdateData updateData = new ChunkUpdateData(chunkWrapper, dhLevel);
|
||||||
CHUNK_UPDATE_QUEUE_MANAGER.addItemToPreUpdateQueue(chunkWrapper.getChunkPos(), updateData);
|
CHUNK_UPDATE_QUEUE_MANAGER.addItemToPreUpdateQueue(chunkWrapper.getChunkPos(), updateData);
|
||||||
|
|
||||||
|
|
||||||
@@ -351,7 +276,8 @@ public class SharedApi
|
|||||||
// (this prevents doing extra work queuing tasks that may not be necessary)
|
// (this prevents doing extra work queuing tasks that may not be necessary)
|
||||||
// and makes sure the chunks closest to the player are updated first
|
// and makes sure the chunks closest to the player are updated first
|
||||||
PriorityTaskPicker.Executor executor = ThreadPoolUtil.getChunkToLodBuilderExecutor();
|
PriorityTaskPicker.Executor executor = ThreadPoolUtil.getChunkToLodBuilderExecutor();
|
||||||
if (executor != null && executor.getQueueSize() < executor.getPoolSize())
|
if (executor != null
|
||||||
|
&& executor.getQueueSize() < executor.getPoolSize())
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
@@ -391,10 +317,7 @@ public class SharedApi
|
|||||||
// update the necessary chunk(s) //
|
// update the necessary chunk(s) //
|
||||||
//===============================//
|
//===============================//
|
||||||
|
|
||||||
// process preUpdate queue
|
|
||||||
processQueuedChunkPreUpdate();
|
processQueuedChunkPreUpdate();
|
||||||
|
|
||||||
// process update queue
|
|
||||||
processQueuedChunkUpdate();
|
processQueuedChunkUpdate();
|
||||||
|
|
||||||
// queue the next position if there are still positions to process
|
// queue the next position if there are still positions to process
|
||||||
@@ -423,8 +346,7 @@ public class SharedApi
|
|||||||
|
|
||||||
IDhLevel dhLevel = preUpdateData.dhLevel;
|
IDhLevel dhLevel = preUpdateData.dhLevel;
|
||||||
IChunkWrapper chunkWrapper = preUpdateData.chunkWrapper;
|
IChunkWrapper chunkWrapper = preUpdateData.chunkWrapper;
|
||||||
boolean canGetNeighboringChunks = preUpdateData.canGetNeighboringChunks;
|
chunkWrapper.createDhHeightMaps();
|
||||||
ArrayList<IChunkWrapper> neighborChunkList = preUpdateData.neighborChunkList;
|
|
||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
@@ -441,34 +363,6 @@ public class SharedApi
|
|||||||
// do not update the chunk if the hash is the same
|
// do not update the chunk if the hash is the same
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// if this chunk will update and can get neighbors
|
|
||||||
// then queue neighboring chunks to update as well
|
|
||||||
// neighboring chunk will get added directly to the update queue
|
|
||||||
// so they won't queue further chunk updates
|
|
||||||
if (neighborChunkList != null
|
|
||||||
&& !neighborChunkList.isEmpty())
|
|
||||||
{
|
|
||||||
for (IChunkWrapper adjacentChunk : neighborChunkList)
|
|
||||||
{
|
|
||||||
// pulling a new chunkWrapper is necessary to prevent concurrent modification on the existing chunkWrappers
|
|
||||||
IChunkWrapper newCenterChunk = dhLevel.getLevelWrapper().tryGetChunk(adjacentChunk.getChunkPos());
|
|
||||||
if (newCenterChunk != null)
|
|
||||||
{
|
|
||||||
ChunkUpdateData newUpdateData;
|
|
||||||
if (canGetNeighboringChunks)
|
|
||||||
{
|
|
||||||
newUpdateData = new ChunkUpdateData(newCenterChunk, getNeighborChunkListForChunk(newCenterChunk, dhLevel), dhLevel, true);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
newUpdateData = new ChunkUpdateData(newCenterChunk, null, dhLevel, false);
|
|
||||||
}
|
|
||||||
|
|
||||||
CHUNK_UPDATE_QUEUE_MANAGER.addItemToUpdateQueue(newCenterChunk.getChunkPos(), newUpdateData);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
CHUNK_UPDATE_QUEUE_MANAGER.addItemToUpdateQueue(chunkWrapper.getChunkPos(), preUpdateData);
|
CHUNK_UPDATE_QUEUE_MANAGER.addItemToUpdateQueue(chunkWrapper.getChunkPos(), preUpdateData);
|
||||||
@@ -481,8 +375,6 @@ public class SharedApi
|
|||||||
|
|
||||||
private static void processQueuedChunkUpdate()
|
private static void processQueuedChunkUpdate()
|
||||||
{
|
{
|
||||||
//LOGGER.trace(chunkWrapper.getChunkPos() + " " + executor.getActiveCount() + " / " + executor.getQueue().size() + " - " + executor.getCompletedTaskCount());
|
|
||||||
|
|
||||||
ChunkUpdateData updateData = CHUNK_UPDATE_QUEUE_MANAGER.updateQueue.popClosest();
|
ChunkUpdateData updateData = CHUNK_UPDATE_QUEUE_MANAGER.updateQueue.popClosest();
|
||||||
if (updateData == null)
|
if (updateData == null)
|
||||||
{
|
{
|
||||||
@@ -491,20 +383,17 @@ public class SharedApi
|
|||||||
|
|
||||||
IChunkWrapper chunkWrapper = updateData.chunkWrapper;
|
IChunkWrapper chunkWrapper = updateData.chunkWrapper;
|
||||||
IDhLevel dhLevel = updateData.dhLevel;
|
IDhLevel dhLevel = updateData.dhLevel;
|
||||||
// having a list of the nearby chunks is needed for lighting and beacon generation
|
ILevelWrapper levelWrapper = dhLevel.getLevelWrapper();
|
||||||
@Nullable ArrayList<IChunkWrapper> nearbyChunkList = updateData.neighborChunkList;
|
|
||||||
|
// having a list of the nearby chunks is needed for lighting and beacon generation
|
||||||
|
ArrayList<IChunkWrapper> nearbyChunkList = tryGetNeighborChunkListForChunk(chunkWrapper);
|
||||||
|
|
||||||
|
|
||||||
// a non-null list is needed for the lighting engine
|
|
||||||
if (nearbyChunkList == null)
|
|
||||||
{
|
|
||||||
nearbyChunkList = new ArrayList<IChunkWrapper>();
|
|
||||||
nearbyChunkList.add(chunkWrapper);
|
|
||||||
}
|
|
||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
// sky lighting is populated later at the data source level
|
// sky lighting is populated later at the data source level
|
||||||
DhLightingEngine.INSTANCE.bakeChunkBlockLighting(chunkWrapper, nearbyChunkList, dhLevel.hasSkyLight() ? LodUtil.MAX_MC_LIGHT : LodUtil.MIN_MC_LIGHT);
|
DhLightingEngine.INSTANCE.bakeChunkBlockLighting(chunkWrapper, nearbyChunkList, levelWrapper.hasSkyLight() ? LodUtil.MAX_MC_LIGHT : LodUtil.MIN_MC_LIGHT);
|
||||||
|
|
||||||
dhLevel.updateBeaconBeamsForChunk(chunkWrapper, nearbyChunkList);
|
dhLevel.updateBeaconBeamsForChunk(chunkWrapper, nearbyChunkList);
|
||||||
|
|
||||||
@@ -515,6 +404,35 @@ public class SharedApi
|
|||||||
{
|
{
|
||||||
LOGGER.error("Unexpected error when updating chunk at pos: [" + chunkWrapper.getChunkPos() + "]", e);
|
LOGGER.error("Unexpected error when updating chunk at pos: [" + chunkWrapper.getChunkPos() + "]", e);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
CHUNK_UPDATE_QUEUE_MANAGER.queuedChunkWrapperByChunkPos.remove(updateData.chunkWrapper.getChunkPos());
|
||||||
|
}
|
||||||
|
private static ArrayList<IChunkWrapper> tryGetNeighborChunkListForChunk(IChunkWrapper chunkWrapper)
|
||||||
|
{
|
||||||
|
// get the neighboring chunk list
|
||||||
|
ArrayList<IChunkWrapper> neighborChunkList = new ArrayList<>(9);
|
||||||
|
for (int xOffset = -1; xOffset <= 1; xOffset++)
|
||||||
|
{
|
||||||
|
for (int zOffset = -1; zOffset <= 1; zOffset++)
|
||||||
|
{
|
||||||
|
if (xOffset == 0 && zOffset == 0)
|
||||||
|
{
|
||||||
|
// center chunk
|
||||||
|
neighborChunkList.add(chunkWrapper);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
// neighboring chunk
|
||||||
|
DhChunkPos neighborPos = new DhChunkPos(chunkWrapper.getChunkPos().getX() + xOffset, chunkWrapper.getChunkPos().getZ() + zOffset);
|
||||||
|
IChunkWrapper neighborChunk = CHUNK_UPDATE_QUEUE_MANAGER.tryGetChunk(neighborPos);
|
||||||
|
if (neighborChunk != null)
|
||||||
|
{
|
||||||
|
neighborChunkList.add(neighborChunk);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return neighborChunkList;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
+1
-6
@@ -9,18 +9,13 @@ import java.util.ArrayList;
|
|||||||
public class ChunkUpdateData
|
public class ChunkUpdateData
|
||||||
{
|
{
|
||||||
public IChunkWrapper chunkWrapper;
|
public IChunkWrapper chunkWrapper;
|
||||||
@Nullable
|
|
||||||
public ArrayList<IChunkWrapper> neighborChunkList;
|
|
||||||
public IDhLevel dhLevel;
|
public IDhLevel dhLevel;
|
||||||
public boolean canGetNeighboringChunks;
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
public ChunkUpdateData(IChunkWrapper chunkWrapper, @Nullable ArrayList<IChunkWrapper> neighborChunkList, IDhLevel dhLevel, boolean canGetNeighborChunks)
|
public ChunkUpdateData(IChunkWrapper chunkWrapper, IDhLevel dhLevel)
|
||||||
{
|
{
|
||||||
this.chunkWrapper = chunkWrapper;
|
this.chunkWrapper = chunkWrapper;
|
||||||
this.neighborChunkList = neighborChunkList;
|
|
||||||
this.dhLevel = dhLevel;
|
this.dhLevel = dhLevel;
|
||||||
this.canGetNeighboringChunks = canGetNeighborChunks;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+67
-30
@@ -1,21 +1,39 @@
|
|||||||
package com.seibel.distanthorizons.core.api.internal.chunkUpdating;
|
package com.seibel.distanthorizons.core.api.internal.chunkUpdating;
|
||||||
|
|
||||||
|
import com.google.common.cache.Cache;
|
||||||
|
import com.google.common.cache.CacheBuilder;
|
||||||
import com.seibel.distanthorizons.core.api.internal.ClientApi;
|
import com.seibel.distanthorizons.core.api.internal.ClientApi;
|
||||||
import com.seibel.distanthorizons.core.api.internal.SharedApi;
|
import com.seibel.distanthorizons.core.api.internal.SharedApi;
|
||||||
import com.seibel.distanthorizons.core.config.Config;
|
import com.seibel.distanthorizons.core.config.Config;
|
||||||
import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
|
import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
|
||||||
|
import com.seibel.distanthorizons.core.multiplayer.client.SyncOnLoadRequestQueue;
|
||||||
import com.seibel.distanthorizons.core.pos.DhChunkPos;
|
import com.seibel.distanthorizons.core.pos.DhChunkPos;
|
||||||
import com.seibel.distanthorizons.core.world.EWorldEnvironment;
|
import com.seibel.distanthorizons.core.world.EWorldEnvironment;
|
||||||
import org.apache.logging.log4j.Logger;
|
import com.seibel.distanthorizons.core.logging.DhLogger;
|
||||||
|
import com.seibel.distanthorizons.core.wrapperInterfaces.chunk.IChunkWrapper;
|
||||||
|
import org.jetbrains.annotations.Nullable;
|
||||||
|
|
||||||
|
import java.util.Collections;
|
||||||
|
import java.util.Set;
|
||||||
|
import java.util.concurrent.ConcurrentHashMap;
|
||||||
|
import java.util.concurrent.ConcurrentMap;
|
||||||
|
import java.util.concurrent.TimeUnit;
|
||||||
|
|
||||||
public class ChunkUpdateQueueManager
|
public class ChunkUpdateQueueManager
|
||||||
{
|
{
|
||||||
private static final Logger LOGGER = DhLoggerBuilder.getLogger();
|
private static final DhLogger LOGGER = new DhLoggerBuilder().build();
|
||||||
|
|
||||||
|
|
||||||
public final ChunkPosQueue updateQueue;
|
public final ChunkPosQueue updateQueue;
|
||||||
public final ChunkPosQueue preUpdateQueue;
|
public final ChunkPosQueue preUpdateQueue;
|
||||||
|
public final Set<DhChunkPos> ignoredChunkPosSet = Collections.newSetFromMap(new ConcurrentHashMap<>());
|
||||||
|
|
||||||
|
public final ConcurrentMap<DhChunkPos, IChunkWrapper> queuedChunkWrapperByChunkPos = CacheBuilder.newBuilder()
|
||||||
|
.expireAfterWrite(20, TimeUnit.SECONDS)
|
||||||
|
.<DhChunkPos, IChunkWrapper>build()
|
||||||
|
.asMap();
|
||||||
|
|
||||||
|
/** dynamically changes based on the number of threads currently available */
|
||||||
public int maxSize = 500;
|
public int maxSize = 500;
|
||||||
|
|
||||||
private static long lastOverloadedLogMessageMsTime = 0;
|
private static long lastOverloadedLogMessageMsTime = 0;
|
||||||
@@ -38,12 +56,18 @@ public class ChunkUpdateQueueManager
|
|||||||
// list/set methods //
|
// list/set methods //
|
||||||
//==================//
|
//==================//
|
||||||
|
|
||||||
public boolean contains(DhChunkPos pos) { return this.updateQueue.contains(pos) || this.preUpdateQueue.contains(pos); }
|
public boolean contains(DhChunkPos pos)
|
||||||
|
{
|
||||||
|
return this.updateQueue.contains(pos)
|
||||||
|
|| this.ignoredChunkPosSet.contains(pos)
|
||||||
|
|| this.preUpdateQueue.contains(pos);
|
||||||
|
}
|
||||||
|
|
||||||
public void clear()
|
public void clear()
|
||||||
{
|
{
|
||||||
this.updateQueue.clear();
|
this.updateQueue.clear();
|
||||||
this.preUpdateQueue.clear();
|
this.preUpdateQueue.clear();
|
||||||
|
this.ignoredChunkPosSet.clear();
|
||||||
}
|
}
|
||||||
public int getQueuedCount() { return this.updateQueue.getQueuedCount() + this.preUpdateQueue.getQueuedCount(); }
|
public int getQueuedCount() { return this.updateQueue.getQueuedCount() + this.preUpdateQueue.getQueuedCount(); }
|
||||||
public boolean isEmpty()
|
public boolean isEmpty()
|
||||||
@@ -57,22 +81,24 @@ public class ChunkUpdateQueueManager
|
|||||||
* If there are no more slots, replaces the item furthest from the center in the update queue.
|
* If there are no more slots, replaces the item furthest from the center in the update queue.
|
||||||
*/
|
*/
|
||||||
public void addItemToPreUpdateQueue(DhChunkPos pos, ChunkUpdateData updateData)
|
public void addItemToPreUpdateQueue(DhChunkPos pos, ChunkUpdateData updateData)
|
||||||
|
{ this.addItemToQueue(pos, updateData, this.preUpdateQueue); }
|
||||||
|
|
||||||
|
public void addItemToUpdateQueue(DhChunkPos pos, ChunkUpdateData updateData)
|
||||||
|
{ this.addItemToQueue(pos, updateData, this.updateQueue); }
|
||||||
|
|
||||||
|
private void addItemToQueue(DhChunkPos pos, ChunkUpdateData updateData, ChunkPosQueue queue)
|
||||||
{
|
{
|
||||||
int remainingSlots = this.maxSize - this.getQueuedCount();
|
int remainingSlots = this.maxSize - this.getQueuedCount();
|
||||||
|
|
||||||
// If no slots are left, get one by removing the item furthest from the center
|
// If no slots are left, get one by removing the item furthest from the center
|
||||||
if (remainingSlots <= 0)
|
if (remainingSlots <= 0)
|
||||||
{
|
{
|
||||||
if (!this.updateQueue.isEmpty())
|
ChunkUpdateData removedData = queue.popFurthest();
|
||||||
{
|
this.queuedChunkWrapperByChunkPos.remove(removedData.chunkWrapper.getChunkPos());
|
||||||
this.updateQueue.popFurthest();
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
this.preUpdateQueue.popFurthest();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
this.preUpdateQueue.addItem(pos, updateData);
|
|
||||||
|
queue.addItem(pos,updateData);
|
||||||
|
this.queuedChunkWrapperByChunkPos.putIfAbsent(pos, updateData.chunkWrapper);
|
||||||
|
|
||||||
remainingSlots = this.maxSize - this.getQueuedCount();
|
remainingSlots = this.maxSize - this.getQueuedCount();
|
||||||
if (remainingSlots <= 0)
|
if (remainingSlots <= 0)
|
||||||
@@ -81,24 +107,6 @@ public class ChunkUpdateQueueManager
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public void addItemToUpdateQueue(DhChunkPos pos, ChunkUpdateData updateData)
|
|
||||||
{
|
|
||||||
int remainingSlots = this.maxSize - this.getQueuedCount();
|
|
||||||
|
|
||||||
// If no slots are left, get one by removing the item furthest from the center
|
|
||||||
if (remainingSlots <= 0)
|
|
||||||
{
|
|
||||||
this.updateQueue.popFurthest();
|
|
||||||
}
|
|
||||||
|
|
||||||
this.updateQueue.addItem(pos,updateData);
|
|
||||||
|
|
||||||
remainingSlots = this.maxSize - this.getQueuedCount();
|
|
||||||
if (remainingSlots <= 0)
|
|
||||||
{
|
|
||||||
this.sendOverloadMessage();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private void sendOverloadMessage()
|
private void sendOverloadMessage()
|
||||||
{
|
{
|
||||||
@@ -129,6 +137,35 @@ public class ChunkUpdateQueueManager
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Tries to return a cloned chunk wrapper from memory.
|
||||||
|
* Returns null if no chunk is available.
|
||||||
|
* <br><br>
|
||||||
|
* This is done instead of accessing the MC level since
|
||||||
|
* accessing the level often requires running on the render or server
|
||||||
|
* thread, which causes stuttering.
|
||||||
|
*/
|
||||||
|
@Nullable
|
||||||
|
public IChunkWrapper tryGetChunk(DhChunkPos pos)
|
||||||
|
{
|
||||||
|
IChunkWrapper existingWrapper = this.queuedChunkWrapperByChunkPos.get(pos);
|
||||||
|
if (existingWrapper == null)
|
||||||
|
{
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
return existingWrapper.copy();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
//=========//
|
||||||
|
// ignores //
|
||||||
|
//=========//
|
||||||
|
|
||||||
|
public void addPosToIgnore(DhChunkPos chunkPos) { this.ignoredChunkPosSet.add(chunkPos); }
|
||||||
|
public void removePosToIgnore(DhChunkPos chunkPos) { this.ignoredChunkPosSet.remove(chunkPos); }
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
//==================//
|
//==================//
|
||||||
|
|||||||
+1
-1
@@ -9,7 +9,7 @@ import com.seibel.distanthorizons.core.wrapperInterfaces.world.IClientLevelWrapp
|
|||||||
*
|
*
|
||||||
* @see ClientApi
|
* @see ClientApi
|
||||||
*/
|
*/
|
||||||
public class RenderState
|
public class DhRenderState
|
||||||
{
|
{
|
||||||
public Mat4f mcModelViewMatrix = null;
|
public Mat4f mcModelViewMatrix = null;
|
||||||
public Mat4f mcProjectionMatrix = null;
|
public Mat4f mcProjectionMatrix = null;
|
||||||
@@ -1,54 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of the Distant Horizons mod
|
|
||||||
* licensed under the GNU LGPL v3 License.
|
|
||||||
*
|
|
||||||
* Copyright (C) 2020 James Seibel
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU Lesser General Public License as published by
|
|
||||||
* the Free Software Foundation, version 3.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU Lesser General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Lesser General Public License
|
|
||||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package com.seibel.distanthorizons.core.config;
|
|
||||||
|
|
||||||
import com.seibel.distanthorizons.core.config.types.ConfigEntry;
|
|
||||||
|
|
||||||
// TODO: Make this integrate with the config system
|
|
||||||
public class AppliedConfigState<T>
|
|
||||||
{
|
|
||||||
final ConfigEntry<T> entry;
|
|
||||||
T activeValue;
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
public AppliedConfigState(ConfigEntry<T> entryToWatch)
|
|
||||||
{
|
|
||||||
this.entry = entryToWatch;
|
|
||||||
this.activeValue = entryToWatch.get();
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/** Returns true if the value was changed */
|
|
||||||
public boolean pollNewValue()
|
|
||||||
{
|
|
||||||
T newValue = this.entry.get();
|
|
||||||
if (newValue.equals(this.activeValue))
|
|
||||||
{
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
this.activeValue = newValue;
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
public T get() { return this.activeValue; }
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -33,31 +33,27 @@ import com.seibel.distanthorizons.core.config.types.enums.*;
|
|||||||
import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
|
import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
|
||||||
import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
|
import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
|
||||||
import com.seibel.distanthorizons.core.pos.DhSectionPos;
|
import com.seibel.distanthorizons.core.pos.DhSectionPos;
|
||||||
|
import com.seibel.distanthorizons.core.util.NativeDialogUtil;
|
||||||
import com.seibel.distanthorizons.core.wrapperInterfaces.IWrapperFactory;
|
import com.seibel.distanthorizons.core.wrapperInterfaces.IWrapperFactory;
|
||||||
import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftSharedWrapper;
|
import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftSharedWrapper;
|
||||||
import com.seibel.distanthorizons.coreapi.ModInfo;
|
import com.seibel.distanthorizons.coreapi.ModInfo;
|
||||||
import org.apache.logging.log4j.Logger;
|
import com.seibel.distanthorizons.core.logging.DhLogger;
|
||||||
import org.lwjgl.util.tinyfd.TinyFileDialogs;
|
|
||||||
|
|
||||||
import java.awt.*;
|
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.util.*;
|
import java.util.*;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This handles any configuration the user has access to. <br><br>
|
* This handles any configuration the user has access to.
|
||||||
*
|
|
||||||
* Note: <br>
|
|
||||||
* Only add simpler listeners here (IE listeners that only depend on 1 config entry).
|
|
||||||
* For listeners that depend on 2 or more config entries, add them before the config menu is opened.
|
|
||||||
* Otherwise, you will have issues where only some of the config entries will exist when your listener is created.
|
|
||||||
*
|
*
|
||||||
* @author coolGi
|
* @author coolGi
|
||||||
|
*
|
||||||
|
* @see ConfigHandler
|
||||||
*/
|
*/
|
||||||
@SuppressWarnings("ConcatenationWithEmptyString")
|
@SuppressWarnings("ConcatenationWithEmptyString")
|
||||||
public class Config
|
public class Config
|
||||||
{
|
{
|
||||||
private static final Logger LOGGER = DhLoggerBuilder.getLogger();
|
private static final DhLogger LOGGER = new DhLoggerBuilder().build();
|
||||||
|
|
||||||
public static ConfigCategory client = new ConfigCategory.Builder().set(Client.class).build();
|
public static ConfigCategory client = new ConfigCategory.Builder().set(Client.class).build();
|
||||||
|
|
||||||
@@ -106,10 +102,7 @@ public class Config
|
|||||||
|
|
||||||
public static ConfigUiLinkedEntry quickEnableWorldGenerator = new ConfigUiLinkedEntry(Common.WorldGenerator.enableDistantGeneration);
|
public static ConfigUiLinkedEntry quickEnableWorldGenerator = new ConfigUiLinkedEntry(Common.WorldGenerator.enableDistantGeneration);
|
||||||
|
|
||||||
public static ConfigEntry<Boolean> quickShowWorldGenProgress = new ConfigEntry.Builder<Boolean>()
|
public static ConfigUiLinkedEntry quickShowWorldGenProgress = new ConfigUiLinkedEntry(Common.WorldGenerator.showGenerationProgress);
|
||||||
.set(true)
|
|
||||||
.setAppearance(EConfigEntryAppearance.ONLY_IN_GUI)
|
|
||||||
.build();
|
|
||||||
|
|
||||||
public static ConfigUiLinkedEntry quickLodCloudRendering = new ConfigUiLinkedEntry(Advanced.Graphics.GenericRendering.enableCloudRendering);
|
public static ConfigUiLinkedEntry quickLodCloudRendering = new ConfigUiLinkedEntry(Advanced.Graphics.GenericRendering.enableCloudRendering);
|
||||||
|
|
||||||
@@ -129,7 +122,6 @@ public class Config
|
|||||||
{
|
{
|
||||||
// common config links need to have their destination
|
// common config links need to have their destination
|
||||||
// since they aren't part of "client" config class
|
// since they aren't part of "client" config class
|
||||||
// TODO determine their destination programically instead of hard coding the value
|
|
||||||
|
|
||||||
public static ConfigUIComment advancedHeader = new ConfigUIComment.Builder().setParentConfigClass(Advanced.class).build();
|
public static ConfigUIComment advancedHeader = new ConfigUIComment.Builder().setParentConfigClass(Advanced.class).build();
|
||||||
|
|
||||||
@@ -175,6 +167,20 @@ public class Config
|
|||||||
public static ConfigCategory culling = new ConfigCategory.Builder().set(Culling.class).build();
|
public static ConfigCategory culling = new ConfigCategory.Builder().set(Culling.class).build();
|
||||||
public static ConfigUISpacer cullingSpacer = new ConfigUISpacer.Builder().build();
|
public static ConfigUISpacer cullingSpacer = new ConfigUISpacer.Builder().build();
|
||||||
|
|
||||||
|
public static ConfigEntry<Boolean> overrideVanillaGraphicsSettings = new ConfigEntry.Builder<Boolean>()
|
||||||
|
.set(true)
|
||||||
|
.comment("" +
|
||||||
|
"If true some vanilla graphics settings will be automatically changed \n" +
|
||||||
|
"during DH setup to provide a better experience. \n" +
|
||||||
|
" \n" +
|
||||||
|
"IE disabling vanilla clouds (which render on top of DH LODs), \n" +
|
||||||
|
" and chunk fading (DH already fades MC chunks) \n" +
|
||||||
|
"")
|
||||||
|
.build();
|
||||||
|
public static ConfigUISpacer overrideVanillaSpacer = new ConfigUISpacer.Builder().build();
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
public static ConfigCategory experimental = new ConfigCategory.Builder().set(Experimental.class).build();
|
public static ConfigCategory experimental = new ConfigCategory.Builder().set(Experimental.class).build();
|
||||||
|
|
||||||
|
|
||||||
@@ -188,7 +194,6 @@ public class Config
|
|||||||
.comment("" +
|
.comment("" +
|
||||||
"The radius of the mod's render distance. (measured in chunks)\n" +
|
"The radius of the mod's render distance. (measured in chunks)\n" +
|
||||||
"")
|
"")
|
||||||
.setPerformance(EConfigEntryPerformance.HIGH)
|
|
||||||
.build();
|
.build();
|
||||||
|
|
||||||
public static ConfigEntry<EDhApiHorizontalQuality> horizontalQuality = new ConfigEntry.Builder<EDhApiHorizontalQuality>()
|
public static ConfigEntry<EDhApiHorizontalQuality> horizontalQuality = new ConfigEntry.Builder<EDhApiHorizontalQuality>()
|
||||||
@@ -197,7 +202,7 @@ public class Config
|
|||||||
+ "This indicates how quickly LODs decrease in quality the further away they are. \n"
|
+ "This indicates how quickly LODs decrease in quality the further away they are. \n"
|
||||||
+ "Higher settings will render higher quality fake chunks farther away, \n"
|
+ "Higher settings will render higher quality fake chunks farther away, \n"
|
||||||
+ "but will increase memory and GPU usage.")
|
+ "but will increase memory and GPU usage.")
|
||||||
.setPerformance(EConfigEntryPerformance.MEDIUM)
|
.addListener(ReloadLodsConfigEventHandler.DELAYED_INSTANCE)
|
||||||
.build();
|
.build();
|
||||||
|
|
||||||
public static ConfigEntry<EDhApiMaxHorizontalResolution> maxHorizontalResolution = new ConfigEntry.Builder<EDhApiMaxHorizontalResolution>()
|
public static ConfigEntry<EDhApiMaxHorizontalResolution> maxHorizontalResolution = new ConfigEntry.Builder<EDhApiMaxHorizontalResolution>()
|
||||||
@@ -214,7 +219,6 @@ public class Config
|
|||||||
+ "\n"
|
+ "\n"
|
||||||
+ "Lowest Quality: " + EDhApiMaxHorizontalResolution.CHUNK + "\n"
|
+ "Lowest Quality: " + EDhApiMaxHorizontalResolution.CHUNK + "\n"
|
||||||
+ "Highest Quality: " + EDhApiMaxHorizontalResolution.BLOCK)
|
+ "Highest Quality: " + EDhApiMaxHorizontalResolution.BLOCK)
|
||||||
.setPerformance(EConfigEntryPerformance.MEDIUM)
|
|
||||||
.addListener(ReloadLodsConfigEventHandler.DELAYED_INSTANCE)
|
.addListener(ReloadLodsConfigEventHandler.DELAYED_INSTANCE)
|
||||||
.build();
|
.build();
|
||||||
|
|
||||||
@@ -228,7 +232,6 @@ public class Config
|
|||||||
+ "\n"
|
+ "\n"
|
||||||
+ "Lowest Quality: " + EDhApiVerticalQuality.HEIGHT_MAP + "\n"
|
+ "Lowest Quality: " + EDhApiVerticalQuality.HEIGHT_MAP + "\n"
|
||||||
+ "Highest Quality: " + EDhApiVerticalQuality.EXTREME)
|
+ "Highest Quality: " + EDhApiVerticalQuality.EXTREME)
|
||||||
.setPerformance(EConfigEntryPerformance.VERY_HIGH)
|
|
||||||
.addListener(ReloadLodsConfigEventHandler.DELAYED_INSTANCE)
|
.addListener(ReloadLodsConfigEventHandler.DELAYED_INSTANCE)
|
||||||
.build();
|
.build();
|
||||||
|
|
||||||
@@ -241,7 +244,6 @@ public class Config
|
|||||||
+ EDhApiTransparency.FAKE + ": LODs will be opaque, but shaded to match the blocks underneath. \n"
|
+ EDhApiTransparency.FAKE + ": LODs will be opaque, but shaded to match the blocks underneath. \n"
|
||||||
+ EDhApiTransparency.DISABLED + ": LODs will be opaque. \n"
|
+ EDhApiTransparency.DISABLED + ": LODs will be opaque. \n"
|
||||||
+ "")
|
+ "")
|
||||||
.setPerformance(EConfigEntryPerformance.MEDIUM)
|
|
||||||
.addListener(ReloadLodsConfigEventHandler.DELAYED_INSTANCE)
|
.addListener(ReloadLodsConfigEventHandler.DELAYED_INSTANCE)
|
||||||
.build();
|
.build();
|
||||||
|
|
||||||
@@ -253,7 +255,6 @@ public class Config
|
|||||||
+ EDhApiBlocksToAvoid.NONE + ": Represent all blocks in the LODs \n"
|
+ EDhApiBlocksToAvoid.NONE + ": Represent all blocks in the LODs \n"
|
||||||
+ EDhApiBlocksToAvoid.NON_COLLIDING + ": Only represent solid blocks in the LODs (tall grass, torches, etc. won't count for a LOD's height) \n"
|
+ EDhApiBlocksToAvoid.NON_COLLIDING + ": Only represent solid blocks in the LODs (tall grass, torches, etc. won't count for a LOD's height) \n"
|
||||||
+ "")
|
+ "")
|
||||||
.setPerformance(EConfigEntryPerformance.NONE)
|
|
||||||
.addListener(ReloadLodsConfigEventHandler.DELAYED_INSTANCE)
|
.addListener(ReloadLodsConfigEventHandler.DELAYED_INSTANCE)
|
||||||
.build();
|
.build();
|
||||||
|
|
||||||
@@ -265,14 +266,13 @@ public class Config
|
|||||||
+ "True: a red flower will tint the grass below it red. \n"
|
+ "True: a red flower will tint the grass below it red. \n"
|
||||||
+ "False: skipped blocks will not change color of surface below them. "
|
+ "False: skipped blocks will not change color of surface below them. "
|
||||||
+ "")
|
+ "")
|
||||||
.setPerformance(EConfigEntryPerformance.NONE)
|
|
||||||
.addListener(ReloadLodsConfigEventHandler.DELAYED_INSTANCE)
|
.addListener(ReloadLodsConfigEventHandler.DELAYED_INSTANCE)
|
||||||
.build();
|
.build();
|
||||||
|
|
||||||
public static ConfigEntry<Double> lodBias = new ConfigEntry.Builder<Double>()
|
public static ConfigEntry<Double> lodBias = new ConfigEntry.Builder<Double>()
|
||||||
.setMinDefaultMax(0d, 0d, null)
|
.setMinDefaultMax(0d, 0d, null)
|
||||||
.comment(""
|
.comment(""
|
||||||
+ "What the value should vanilla Minecraft's texture LodBias be? \n"
|
+ "What value should vanilla Minecraft's texture LodBias be? \n"
|
||||||
+ "If set to 0 the mod wont overwrite vanilla's default (which so happens to also be 0)")
|
+ "If set to 0 the mod wont overwrite vanilla's default (which so happens to also be 0)")
|
||||||
.build();
|
.build();
|
||||||
|
|
||||||
@@ -286,7 +286,6 @@ public class Config
|
|||||||
+ " Can be used to force LOD shading when using some shaders. \n"
|
+ " Can be used to force LOD shading when using some shaders. \n"
|
||||||
+ EDhApiLodShading.DISABLED + ": All LOD sides will be rendered with the same brightness. \n"
|
+ EDhApiLodShading.DISABLED + ": All LOD sides will be rendered with the same brightness. \n"
|
||||||
+ "")
|
+ "")
|
||||||
.setPerformance(EConfigEntryPerformance.NONE)
|
|
||||||
.addListener(ReloadLodsConfigEventHandler.DELAYED_INSTANCE)
|
.addListener(ReloadLodsConfigEventHandler.DELAYED_INSTANCE)
|
||||||
.build();
|
.build();
|
||||||
|
|
||||||
@@ -299,7 +298,6 @@ public class Config
|
|||||||
+ EDhApiGrassSideRendering.FADE_TO_DIRT + ": sides fade from grass to dirt. \n"
|
+ EDhApiGrassSideRendering.FADE_TO_DIRT + ": sides fade from grass to dirt. \n"
|
||||||
+ EDhApiGrassSideRendering.AS_DIRT + ": sides render entirely as dirt. \n"
|
+ EDhApiGrassSideRendering.AS_DIRT + ": sides render entirely as dirt. \n"
|
||||||
+ "")
|
+ "")
|
||||||
.setPerformance(EConfigEntryPerformance.NONE)
|
|
||||||
.addListener(ReloadLodsConfigEventHandler.DELAYED_INSTANCE)
|
.addListener(ReloadLodsConfigEventHandler.DELAYED_INSTANCE)
|
||||||
.build();
|
.build();
|
||||||
|
|
||||||
@@ -310,7 +308,6 @@ public class Config
|
|||||||
+ "If false LODs will cut off abruptly at a set distance from the camera. \n"
|
+ "If false LODs will cut off abruptly at a set distance from the camera. \n"
|
||||||
+ "This setting is affected by the vanilla overdraw prevention config. \n"
|
+ "This setting is affected by the vanilla overdraw prevention config. \n"
|
||||||
+ "")
|
+ "")
|
||||||
.setPerformance(EConfigEntryPerformance.LOW)
|
|
||||||
.build();
|
.build();
|
||||||
|
|
||||||
public static ConfigEntry<EDhApiMcRenderingFadeMode> vanillaFadeMode = new ConfigEntry.Builder<EDhApiMcRenderingFadeMode>()
|
public static ConfigEntry<EDhApiMcRenderingFadeMode> vanillaFadeMode = new ConfigEntry.Builder<EDhApiMcRenderingFadeMode>()
|
||||||
@@ -322,7 +319,14 @@ public class Config
|
|||||||
+ EDhApiMcRenderingFadeMode.SINGLE_PASS + ": Fades after MC's transparent pass, opaque blocks underwater won't be faded. \n"
|
+ EDhApiMcRenderingFadeMode.SINGLE_PASS + ": Fades after MC's transparent pass, opaque blocks underwater won't be faded. \n"
|
||||||
+ EDhApiMcRenderingFadeMode.DOUBLE_PASS + ": Slowest, fades after both MC's opaque and transparent passes, provides the smoothest transition. \n"
|
+ EDhApiMcRenderingFadeMode.DOUBLE_PASS + ": Slowest, fades after both MC's opaque and transparent passes, provides the smoothest transition. \n"
|
||||||
+ "")
|
+ "")
|
||||||
.setPerformance(EConfigEntryPerformance.LOW)
|
.build();
|
||||||
|
|
||||||
|
public static ConfigEntry<Boolean> dhFadeFarClipPlane = new ConfigEntry.Builder<Boolean>()
|
||||||
|
.set(true)
|
||||||
|
.comment(""
|
||||||
|
+ "Should DH fade out before reaching the far clip plane? \n"
|
||||||
|
+ "This is helpful to prevent DH clouds from cutting off in the distance. \n"
|
||||||
|
+ "")
|
||||||
.build();
|
.build();
|
||||||
|
|
||||||
public static ConfigEntry<Double> brightnessMultiplier = new ConfigEntry.Builder<Double>() // TODO: Make this a float (the ClassicConfigGUI doesnt support floats)
|
public static ConfigEntry<Double> brightnessMultiplier = new ConfigEntry.Builder<Double>() // TODO: Make this a float (the ClassicConfigGUI doesnt support floats)
|
||||||
@@ -367,7 +371,6 @@ public class Config
|
|||||||
public static ConfigEntry<Boolean> enableSsao = new ConfigEntry.Builder<Boolean>()
|
public static ConfigEntry<Boolean> enableSsao = new ConfigEntry.Builder<Boolean>()
|
||||||
.set(true)
|
.set(true)
|
||||||
.comment("Enable Screen Space Ambient Occlusion")
|
.comment("Enable Screen Space Ambient Occlusion")
|
||||||
.setPerformance(EConfigEntryPerformance.MEDIUM)
|
|
||||||
.build();
|
.build();
|
||||||
|
|
||||||
public static ConfigEntry<Integer> sampleCount = new ConfigEntry.Builder<Integer>()
|
public static ConfigEntry<Integer> sampleCount = new ConfigEntry.Builder<Integer>()
|
||||||
@@ -376,7 +379,6 @@ public class Config
|
|||||||
"Determines how many points in space are sampled for the occlusion test. \n" +
|
"Determines how many points in space are sampled for the occlusion test. \n" +
|
||||||
"Higher numbers will improve quality and reduce banding, but will increase GPU load." +
|
"Higher numbers will improve quality and reduce banding, but will increase GPU load." +
|
||||||
"")
|
"")
|
||||||
.setPerformance(EConfigEntryPerformance.MEDIUM)
|
|
||||||
.build();
|
.build();
|
||||||
|
|
||||||
public static ConfigEntry<Double> radius = new ConfigEntry.Builder<Double>()
|
public static ConfigEntry<Double> radius = new ConfigEntry.Builder<Double>()
|
||||||
@@ -384,7 +386,6 @@ public class Config
|
|||||||
.comment("" +
|
.comment("" +
|
||||||
"Determines the radius Screen Space Ambient Occlusion is applied, measured in blocks." +
|
"Determines the radius Screen Space Ambient Occlusion is applied, measured in blocks." +
|
||||||
"")
|
"")
|
||||||
.setPerformance(EConfigEntryPerformance.NONE)
|
|
||||||
.build();
|
.build();
|
||||||
|
|
||||||
public static ConfigEntry<Double> strength = new ConfigEntry.Builder<Double>()
|
public static ConfigEntry<Double> strength = new ConfigEntry.Builder<Double>()
|
||||||
@@ -392,7 +393,6 @@ public class Config
|
|||||||
.comment("" +
|
.comment("" +
|
||||||
"Determines how dark the Screen Space Ambient Occlusion effect will be." +
|
"Determines how dark the Screen Space Ambient Occlusion effect will be." +
|
||||||
"")
|
"")
|
||||||
.setPerformance(EConfigEntryPerformance.NONE)
|
|
||||||
.build();
|
.build();
|
||||||
|
|
||||||
public static ConfigEntry<Double> bias = new ConfigEntry.Builder<Double>()
|
public static ConfigEntry<Double> bias = new ConfigEntry.Builder<Double>()
|
||||||
@@ -400,7 +400,6 @@ public class Config
|
|||||||
.comment("" +
|
.comment("" +
|
||||||
"Increasing the value can reduce banding at the cost of reducing the strength of the effect." +
|
"Increasing the value can reduce banding at the cost of reducing the strength of the effect." +
|
||||||
"")
|
"")
|
||||||
.setPerformance(EConfigEntryPerformance.NONE)
|
|
||||||
.build();
|
.build();
|
||||||
|
|
||||||
public static ConfigEntry<Double> minLight = new ConfigEntry.Builder<Double>()
|
public static ConfigEntry<Double> minLight = new ConfigEntry.Builder<Double>()
|
||||||
@@ -410,7 +409,6 @@ public class Config
|
|||||||
"0 = totally black at the corners \n" +
|
"0 = totally black at the corners \n" +
|
||||||
"1 = no shadow" +
|
"1 = no shadow" +
|
||||||
"")
|
"")
|
||||||
.setPerformance(EConfigEntryPerformance.NONE)
|
|
||||||
.build();
|
.build();
|
||||||
|
|
||||||
public static ConfigEntry<Integer> blurRadius = new ConfigEntry.Builder<Integer>()
|
public static ConfigEntry<Integer> blurRadius = new ConfigEntry.Builder<Integer>()
|
||||||
@@ -419,7 +417,14 @@ public class Config
|
|||||||
"The radius, measured in pixels, that blurring is calculated for the SSAO. \n" +
|
"The radius, measured in pixels, that blurring is calculated for the SSAO. \n" +
|
||||||
"Higher numbers will reduce banding at the cost of GPU performance." +
|
"Higher numbers will reduce banding at the cost of GPU performance." +
|
||||||
"")
|
"")
|
||||||
.setPerformance(EConfigEntryPerformance.HIGH)
|
.build();
|
||||||
|
|
||||||
|
public static ConfigEntry<Integer> fadeDistanceInBlocks = new ConfigEntry.Builder<Integer>()
|
||||||
|
.setMinDefaultMax(0, 1_600, 30_000_000)
|
||||||
|
.comment("" +
|
||||||
|
"The distance in blocks from the camera where the SSAO will fade out to. \n"+
|
||||||
|
"This is done to prevent banding and noise at extreme distances. \n"+
|
||||||
|
"")
|
||||||
.build();
|
.build();
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -482,7 +487,6 @@ public class Config
|
|||||||
.comment(""
|
.comment(""
|
||||||
+ "Determines if fog is drawn on DH LODs. \n"
|
+ "Determines if fog is drawn on DH LODs. \n"
|
||||||
+ "")
|
+ "")
|
||||||
.setPerformance(EConfigEntryPerformance.MEDIUM)
|
|
||||||
.build();
|
.build();
|
||||||
|
|
||||||
public static ConfigEntry<EDhApiFogColorMode> colorMode = new ConfigEntry.Builder<EDhApiFogColorMode>()
|
public static ConfigEntry<EDhApiFogColorMode> colorMode = new ConfigEntry.Builder<EDhApiFogColorMode>()
|
||||||
@@ -492,7 +496,6 @@ public class Config
|
|||||||
+ "\n"
|
+ "\n"
|
||||||
+ EDhApiFogColorMode.USE_WORLD_FOG_COLOR + ": Use the world's fog color. \n"
|
+ EDhApiFogColorMode.USE_WORLD_FOG_COLOR + ": Use the world's fog color. \n"
|
||||||
+ EDhApiFogColorMode.USE_SKY_COLOR + ": Use the sky's color.")
|
+ EDhApiFogColorMode.USE_SKY_COLOR + ": Use the sky's color.")
|
||||||
.setPerformance(EConfigEntryPerformance.NONE)
|
|
||||||
.build();
|
.build();
|
||||||
|
|
||||||
public static ConfigEntry<Boolean> enableVanillaFog = new ConfigEntry.Builder<Boolean>()
|
public static ConfigEntry<Boolean> enableVanillaFog = new ConfigEntry.Builder<Boolean>()
|
||||||
@@ -502,11 +505,6 @@ public class Config
|
|||||||
+ "Note: Other mods may conflict with this setting. \n"
|
+ "Note: Other mods may conflict with this setting. \n"
|
||||||
+ "")
|
+ "")
|
||||||
.build();
|
.build();
|
||||||
@Deprecated
|
|
||||||
public static ConfigEntry<Boolean> disableVanillaFog = new ConfigEntry.Builder<Boolean>()
|
|
||||||
.set(!enableVanillaFog.get())
|
|
||||||
.setAppearance(EConfigEntryAppearance.ONLY_IN_API)
|
|
||||||
.build();
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@@ -568,14 +566,6 @@ public class Config
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
static
|
|
||||||
{
|
|
||||||
disableVanillaFog.addListener(
|
|
||||||
new ConfigChangeListener<Boolean>(disableVanillaFog,
|
|
||||||
(disableVanillaFog) -> enableVanillaFog.setApiValue(disableVanillaFog))
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
public static class HeightFog
|
public static class HeightFog
|
||||||
{
|
{
|
||||||
public static ConfigUIComment heightFogHeader = new ConfigUIComment.Builder().setParentConfigClass(HeightFog.class).build();
|
public static ConfigUIComment heightFogHeader = new ConfigUIComment.Builder().setParentConfigClass(HeightFog.class).build();
|
||||||
@@ -727,12 +717,10 @@ public class Config
|
|||||||
+ "\n"
|
+ "\n"
|
||||||
+ "Increasing the vanilla render distance increases the effectiveness of this setting."
|
+ "Increasing the vanilla render distance increases the effectiveness of this setting."
|
||||||
+ "")
|
+ "")
|
||||||
.setPerformance(EConfigEntryPerformance.NONE)
|
|
||||||
.build();
|
.build();
|
||||||
|
|
||||||
public static ConfigEntry<Boolean> enableCaveCulling = new ConfigEntry.Builder<Boolean>()
|
public static ConfigEntry<Boolean> enableCaveCulling = new ConfigEntry.Builder<Boolean>()
|
||||||
.set(true)
|
.set(true)
|
||||||
.setPerformance(EConfigEntryPerformance.HIGH)
|
|
||||||
.comment(""
|
.comment(""
|
||||||
+ "If enabled caves won't be rendered. \n"
|
+ "If enabled caves won't be rendered. \n"
|
||||||
+ "\n"
|
+ "\n"
|
||||||
@@ -792,6 +780,11 @@ public class Config
|
|||||||
+ "A comma separated list of block resource locations that won't be rendered by DH. \n"
|
+ "A comma separated list of block resource locations that won't be rendered by DH. \n"
|
||||||
+ "Air is always included in this list. \n"
|
+ "Air is always included in this list. \n"
|
||||||
+ "Requires a restart to change. \n"
|
+ "Requires a restart to change. \n"
|
||||||
|
+ "\n"
|
||||||
|
+ "Note:\n"
|
||||||
|
+ "If you see gaps, or holes you may have to change\n"
|
||||||
|
+ "worldCompression to ["+EDhApiWorldCompressionMode.MERGE_SAME_BLOCKS+"] and re-generate the LODs.\n"
|
||||||
|
+ "Black spots may happen occur to block lighting being zero for covered blocks.\n"
|
||||||
+ "")
|
+ "")
|
||||||
.build();
|
.build();
|
||||||
|
|
||||||
@@ -840,7 +833,7 @@ public class Config
|
|||||||
public static ConfigUIComment experimentalHeader = new ConfigUIComment.Builder().setParentConfigClass(Experimental.class).build();
|
public static ConfigUIComment experimentalHeader = new ConfigUIComment.Builder().setParentConfigClass(Experimental.class).build();
|
||||||
|
|
||||||
public static ConfigEntry<Integer> earthCurveRatio = new ConfigEntry.Builder<Integer>()
|
public static ConfigEntry<Integer> earthCurveRatio = new ConfigEntry.Builder<Integer>()
|
||||||
.setMinDefaultMax(0, 0, 5000)
|
.setMinDefaultMax(-5000, 0, 5000)
|
||||||
.comment(""
|
.comment(""
|
||||||
+ "This is the earth size ratio when applying the curvature shader effect. \n"
|
+ "This is the earth size ratio when applying the curvature shader effect. \n"
|
||||||
+ "Note: Enabling this feature may cause rendering bugs. \n"
|
+ "Note: Enabling this feature may cause rendering bugs. \n"
|
||||||
@@ -850,11 +843,26 @@ public class Config
|
|||||||
+ "100 = 1 to 100 (63,710 blocks) \n"
|
+ "100 = 1 to 100 (63,710 blocks) \n"
|
||||||
+ "10000 = 1 to 10000 (637.1 blocks) \n"
|
+ "10000 = 1 to 10000 (637.1 blocks) \n"
|
||||||
+ "\n"
|
+ "\n"
|
||||||
+ "Note: Due to current limitations, the min value is 50 \n"
|
+ "Note: Due to current limitations, the min value is ["+WorldCurvatureConfigEventHandler.MIN_VALID_CURVE_VALUE+"] \n"
|
||||||
+ "and the max value is 5000. Any values outside this range \n"
|
+ "and the max value is 5000. Any values outside this range \n"
|
||||||
+ "will be set to 0 (disabled).")
|
+ "will be set to 0 (disabled).")
|
||||||
.addListener(WorldCurvatureConfigEventHandler.INSTANCE)
|
.addListener(WorldCurvatureConfigEventHandler.INSTANCE)
|
||||||
.build();
|
.build();
|
||||||
|
|
||||||
|
public static ConfigEntry<String> ignoredDimensionCsv = new ConfigEntry.Builder<String>()
|
||||||
|
.set("")
|
||||||
|
.comment(""
|
||||||
|
+ "A comma separated list of dimension resource locations where DH won't render. \n"
|
||||||
|
+ "\n"
|
||||||
|
+ "Example: \"minecraft:the_nether,minecraft:the_end\"\n"
|
||||||
|
+ "\n"
|
||||||
|
+ "Note:\n"
|
||||||
|
+ "Some DH settings will be disabled and/or changed to improve \n"
|
||||||
|
+ "visuals when DH rendering is disabled. \n"
|
||||||
|
+ "")
|
||||||
|
.addListener(IgnoredDimensionCsvHandler.INSTANCE)
|
||||||
|
.build();
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -1086,11 +1094,10 @@ public class Config
|
|||||||
+ "")
|
+ "")
|
||||||
.build();
|
.build();
|
||||||
|
|
||||||
public static ConfigEntry<Boolean> validateBufferIdsBeforeRendering = new ConfigEntry.Builder<Boolean>()
|
public static ConfigEntry<EDhApiGpuUploadMethod> glUploadMode = new ConfigEntry.Builder<EDhApiGpuUploadMethod>()
|
||||||
.set(false)
|
.set(EDhApiGpuUploadMethod.AUTO)
|
||||||
.comment(""
|
.comment(""
|
||||||
+ "Massively reduces FPS. \n"
|
+ "\n"
|
||||||
+ "Should only be used if mysterious EXCEPTION_ACCESS_VIOLATION crashes are happening in DH's rendering code for troubleshooting. \n"
|
|
||||||
+ "")
|
+ "")
|
||||||
.build();
|
.build();
|
||||||
|
|
||||||
@@ -1237,23 +1244,17 @@ public class Config
|
|||||||
.setAppearance(EConfigEntryAppearance.ONLY_IN_FILE) // no GUI renderer set up currently
|
.setAppearance(EConfigEntryAppearance.ONLY_IN_FILE) // no GUI renderer set up currently
|
||||||
.build();
|
.build();
|
||||||
|
|
||||||
public static ConfigUIButton uiButtonTest = new ConfigUIButton(() ->
|
public static ConfigUIButton uiButtonTest = new ConfigUIButton(() ->
|
||||||
{
|
{
|
||||||
// running on a separate thread is necessary to prevent locking
|
// running on a separate thread is necessary to prevent locking
|
||||||
new Thread(() ->
|
new Thread(() -> onButtonPressed()).start();
|
||||||
{
|
|
||||||
if (!GraphicsEnvironment.isHeadless())
|
|
||||||
{
|
|
||||||
LOGGER.info("Attempting to show tinyfd message box...");
|
|
||||||
boolean buttonPress = TinyFileDialogs.tinyfd_messageBox("Button pressed!", "UITester dialog", "ok", "info", false);
|
|
||||||
LOGGER.info("dialog returned with ["+(buttonPress ? "TRUE" : "FALSE")+"]");
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
LOGGER.info("button pressed!");
|
|
||||||
}
|
|
||||||
}).start();
|
|
||||||
});
|
});
|
||||||
|
public static void onButtonPressed()
|
||||||
|
{
|
||||||
|
LOGGER.info("Attempting to show tinyfd message box...");
|
||||||
|
boolean buttonPress = NativeDialogUtil.showDialog("Button pressed!", "UITester dialog", "ok", "info");
|
||||||
|
LOGGER.info("dialog returned with ["+(buttonPress ? "TRUE" : "FALSE")+"]");
|
||||||
|
}
|
||||||
|
|
||||||
public static ConfigCategory categoryTest = new ConfigCategory.Builder().set(CategoryTest.class).build();
|
public static ConfigCategory categoryTest = new ConfigCategory.Builder().set(CategoryTest.class).build();
|
||||||
|
|
||||||
@@ -1369,6 +1370,37 @@ public class Config
|
|||||||
+ "")
|
+ "")
|
||||||
.build();
|
.build();
|
||||||
|
|
||||||
|
public static ConfigEntry<Integer> generationCenterChunkX = new ConfigEntry.Builder<Integer>()
|
||||||
|
.setChatCommandName("generation.bounds.centerChunk.x")
|
||||||
|
.setAppearance(EConfigEntryAppearance.ONLY_IN_FILE)
|
||||||
|
.setMinDefaultMax(Integer.MIN_VALUE, 0, Integer.MAX_VALUE)
|
||||||
|
.comment("" +
|
||||||
|
"The center X chunk position that the world gen max radius is centered around. \n" +
|
||||||
|
"")
|
||||||
|
.build();
|
||||||
|
public static ConfigEntry<Integer> generationCenterChunkZ = new ConfigEntry.Builder<Integer>()
|
||||||
|
.setChatCommandName("generation.bounds.centerChunk.z")
|
||||||
|
.setAppearance(EConfigEntryAppearance.ONLY_IN_FILE)
|
||||||
|
.setMinDefaultMax(Integer.MIN_VALUE, 0, Integer.MAX_VALUE)
|
||||||
|
.comment("" +
|
||||||
|
"The center Z chunk position that the world gen max radius is centered around. \n" +
|
||||||
|
"")
|
||||||
|
.build();
|
||||||
|
public static ConfigEntry<Integer> generationMaxChunkRadius = new ConfigEntry.Builder<Integer>()
|
||||||
|
.setChatCommandName("generation.bounds.radiusInChunks")
|
||||||
|
.setAppearance(EConfigEntryAppearance.ONLY_IN_FILE)
|
||||||
|
.setMinDefaultMax(0, 0, Integer.MAX_VALUE)
|
||||||
|
.comment("" +
|
||||||
|
"The max radius in chunks around the central point where world generation is allowed. \n" +
|
||||||
|
"If this value is set to 0, generation bounds are disabled and the render distance will be used. \n" +
|
||||||
|
"\n" +
|
||||||
|
"This should only be set if you have a pre-generated world that has a very limited size. \n" +
|
||||||
|
"Setting this on a normal MC world will prevent the world generator from filling \n" +
|
||||||
|
"out your render distance. \n" +
|
||||||
|
"")
|
||||||
|
.build();
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public static class LodBuilding
|
public static class LodBuilding
|
||||||
@@ -1379,7 +1411,7 @@ public class Config
|
|||||||
.set(false)
|
.set(false)
|
||||||
// enabling this can be quite detrimental to performance,
|
// enabling this can be quite detrimental to performance,
|
||||||
// so hiding it in the config file should reduce people accidentally enabling it
|
// so hiding it in the config file should reduce people accidentally enabling it
|
||||||
.setAppearance(isRunningInDevEnvironment() ? EConfigEntryAppearance.ALL : EConfigEntryAppearance.ONLY_IN_FILE)
|
.setAppearance(EConfigEntryAppearance.ONLY_IN_FILE)
|
||||||
.comment(""
|
.comment(""
|
||||||
+ "Enabling this will drastically increase chunk processing time\n"
|
+ "Enabling this will drastically increase chunk processing time\n"
|
||||||
+ "and you may need to increase your CPU load to handle it.\n"
|
+ "and you may need to increase your CPU load to handle it.\n"
|
||||||
@@ -1394,37 +1426,9 @@ public class Config
|
|||||||
.build();
|
.build();
|
||||||
|
|
||||||
public static ConfigEntry<EDhApiDataCompressionMode> dataCompression = new ConfigEntry.Builder<EDhApiDataCompressionMode>()
|
public static ConfigEntry<EDhApiDataCompressionMode> dataCompression = new ConfigEntry.Builder<EDhApiDataCompressionMode>()
|
||||||
.set(EDhApiDataCompressionMode.Z_STD)
|
.set(EDhApiDataCompressionMode.Z_STD_BLOCK)
|
||||||
.comment(""
|
// only visible via the API since there is no reason to use any compressor except ZStandard as of 2025-11-24
|
||||||
+ "What algorithm should be used to compress new LOD data? \n"
|
.setAppearance(EConfigEntryAppearance.ONLY_IN_API)
|
||||||
+ "This setting will only affect new or updated LOD data, \n"
|
|
||||||
+ "any data already generated when this setting is changed will be\n"
|
|
||||||
+ "unaffected until it needs to be re-written to the database.\n"
|
|
||||||
+ "\n"
|
|
||||||
+ EDhApiDataCompressionMode.UNCOMPRESSED + " \n"
|
|
||||||
+ "Should only be used for testing, is worse in every way vs ["+EDhApiDataCompressionMode.LZ4+"].\n"
|
|
||||||
+ "Expected Compression Ratio: 1.0\n"
|
|
||||||
+ "Estimated average DTO read speed: 6.09 milliseconds\n"
|
|
||||||
+ "Estimated average DTO write speed: 6.01 milliseconds\n"
|
|
||||||
+ "\n"
|
|
||||||
+ EDhApiDataCompressionMode.LZ4 + " \n"
|
|
||||||
+ "A good option if you're CPU limited and have plenty of hard drive space.\n"
|
|
||||||
+ "Expected Compression Ratio: 0.4513\n"
|
|
||||||
+ "Estimated average DTO read speed: 3.25 ms\n"
|
|
||||||
+ "Estimated average DTO write speed: 5.99 ms\n"
|
|
||||||
+ "\n"
|
|
||||||
+ EDhApiDataCompressionMode.Z_STD + " \n"
|
|
||||||
+ "A good option if you're CPU limited and have plenty of hard drive space.\n"
|
|
||||||
+ "Expected Compression Ratio: 0.2606\n"
|
|
||||||
+ "Estimated average DTO read speed: 9.31 ms\n"
|
|
||||||
+ "Estimated average DTO write speed: 15.13 ms\n"
|
|
||||||
+ "\n"
|
|
||||||
+ EDhApiDataCompressionMode.LZMA2 + " \n"
|
|
||||||
+ "Slow but very good compression.\n"
|
|
||||||
+ "Expected Compression Ratio: 0.2\n"
|
|
||||||
+ "Estimated average DTO read speed: 13.29 ms\n"
|
|
||||||
+ "Estimated average DTO write speed: 70.95 ms\n"
|
|
||||||
+ "")
|
|
||||||
.build();
|
.build();
|
||||||
|
|
||||||
public static ConfigEntry<EDhApiWorldCompressionMode> worldCompression = new ConfigEntry.Builder<EDhApiWorldCompressionMode>()
|
public static ConfigEntry<EDhApiWorldCompressionMode> worldCompression = new ConfigEntry.Builder<EDhApiWorldCompressionMode>()
|
||||||
@@ -1447,49 +1451,6 @@ public class Config
|
|||||||
+ "")
|
+ "")
|
||||||
.build();
|
.build();
|
||||||
|
|
||||||
public static ConfigEntry<Boolean> recalculateChunkHeightmaps = new ConfigEntry.Builder<Boolean>()
|
|
||||||
.set(false)
|
|
||||||
.comment(""
|
|
||||||
+ "True: Recalculate chunk height maps before chunks can be used by DH.\n"
|
|
||||||
+ " This can fix problems with worlds created by World Painter or \n"
|
|
||||||
+ " other external tools where the heightmap format may be incorrect. \n"
|
|
||||||
+ "False: Assume any height maps handled by Minecraft are correct. \n"
|
|
||||||
+ "\n"
|
|
||||||
+ "Fastest: False\n"
|
|
||||||
+ "Most Compatible: True\n"
|
|
||||||
+ "")
|
|
||||||
.build();
|
|
||||||
|
|
||||||
public static ConfigEntry<Boolean> pullLightingForPregeneratedChunks = new ConfigEntry.Builder<Boolean>()
|
|
||||||
.set(false)
|
|
||||||
.comment(""
|
|
||||||
+ "If true LOD generation for pre-existing chunks will attempt to pull the lighting data \n"
|
|
||||||
+ "saved in Minecraft's Region files. \n"
|
|
||||||
+ "If false DH will pull in chunks without lighting and re-light them. \n"
|
|
||||||
+ " \n"
|
|
||||||
+ "Setting this to true will result in faster LOD generation \n"
|
|
||||||
+ "for already generated worlds, but is broken by most lighting mods. \n"
|
|
||||||
+ " \n"
|
|
||||||
+ "Set this to false if LODs are black. \n"
|
|
||||||
+ "")
|
|
||||||
.build();
|
|
||||||
|
|
||||||
public static ConfigEntry<Boolean> assumePreExistingChunksAreFinished = new ConfigEntry.Builder<Boolean>()
|
|
||||||
.set(false)
|
|
||||||
.comment(""
|
|
||||||
+ "When DH pulls in pre-existing chunks it will attempt to \n"
|
|
||||||
+ "run any missing world generation steps; for example: \n"
|
|
||||||
+ "if a chunk has the status SURFACE, DH will skip BIOMES \n"
|
|
||||||
+ "and SURFACE, but will run FEATURES. \n"
|
|
||||||
+ " \n"
|
|
||||||
+ "However if for some reason the chunks are malformed \n"
|
|
||||||
+ "or there's some other issue that causes the status \n"
|
|
||||||
+ "to be incorrect that can either cause world gen \n"
|
|
||||||
+ "lock-ups and/or crashes. \n"
|
|
||||||
+ "If either of those happen try setting this to True. \n"
|
|
||||||
+ "")
|
|
||||||
.build();
|
|
||||||
|
|
||||||
public static ConfigCategory experimental = new ConfigCategory.Builder().set(Experimental.class).build();
|
public static ConfigCategory experimental = new ConfigCategory.Builder().set(Experimental.class).build();
|
||||||
|
|
||||||
|
|
||||||
@@ -1531,6 +1492,7 @@ public class Config
|
|||||||
+ "How many threads should be used by Distant Horizons? \n"
|
+ "How many threads should be used by Distant Horizons? \n"
|
||||||
+ "")
|
+ "")
|
||||||
.build();
|
.build();
|
||||||
|
|
||||||
public static final ConfigEntry<Double> threadRunTimeRatio = new ConfigEntry.Builder<Double>()
|
public static final ConfigEntry<Double> threadRunTimeRatio = new ConfigEntry.Builder<Double>()
|
||||||
.setChatCommandName("threading.threadRunTimeRatio")
|
.setChatCommandName("threading.threadRunTimeRatio")
|
||||||
.setMinDefaultMax(0.01, ThreadPresetConfigEventHandler.getDefaultRunTimeRatio(), 1.0)
|
.setMinDefaultMax(0.01, ThreadPresetConfigEventHandler.getDefaultRunTimeRatio(), 1.0)
|
||||||
@@ -1544,6 +1506,19 @@ public class Config
|
|||||||
"")
|
"")
|
||||||
.build();
|
.build();
|
||||||
|
|
||||||
|
public static final ConfigEntry<Integer> threadPriority = new ConfigEntry.Builder<Integer>()
|
||||||
|
.setAppearance(EConfigEntryAppearance.ONLY_IN_FILE) // only in file since this requires a MC reboot to change
|
||||||
|
.setMinDefaultMax(Thread.MIN_PRIORITY, // 1
|
||||||
|
Thread.NORM_PRIORITY, // 5 (1 higher than C2ME's default priority of 4 which can help reduce issues with Chunky)
|
||||||
|
Thread.MAX_PRIORITY) // 10
|
||||||
|
.comment(""
|
||||||
|
+ "What Java thread priority should DH's primary thread pools run with? \n"
|
||||||
|
+ "\n"
|
||||||
|
+ "You probably don't need to change this unless you are also \n"
|
||||||
|
+ "running C2ME and are seeing thread starvation in either C2ME or DH. \n"
|
||||||
|
+ "")
|
||||||
|
.build();
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -1552,54 +1527,79 @@ public class Config
|
|||||||
{
|
{
|
||||||
public static ConfigUIComment loggingHeader = new ConfigUIComment.Builder().setParentConfigClass(Logging.class).build();
|
public static ConfigUIComment loggingHeader = new ConfigUIComment.Builder().setParentConfigClass(Logging.class).build();
|
||||||
|
|
||||||
// TODO add change all option
|
|
||||||
// TODO default to error chat and info file
|
public static ConfigEntry<EDhApiLoggerLevel> globalFileMaxLevel = new ConfigEntry.Builder<EDhApiLoggerLevel>()
|
||||||
public static ConfigEntry<EDhApiLoggerMode> logWorldGenEvent = new ConfigEntry.Builder<EDhApiLoggerMode>()
|
.setChatCommandName("logging.globalFileMaxLevel")
|
||||||
|
.set(EDhApiLoggerLevel.INFO)
|
||||||
|
.comment(""
|
||||||
|
+ ""
|
||||||
|
+ "")
|
||||||
|
.build();
|
||||||
|
|
||||||
|
public static ConfigEntry<EDhApiLoggerLevel> globalChatMaxLevel = new ConfigEntry.Builder<EDhApiLoggerLevel>()
|
||||||
|
.setChatCommandName("logging.globalChatMaxLevel")
|
||||||
|
.set(EDhApiLoggerLevel.ERROR)
|
||||||
|
.comment(""
|
||||||
|
+ ""
|
||||||
|
+ "")
|
||||||
|
.build();
|
||||||
|
|
||||||
|
public static ConfigUISpacer globalLoggingSpacer = new ConfigUISpacer.Builder().build();
|
||||||
|
|
||||||
|
|
||||||
|
public static ConfigEntry<EDhApiLoggerLevel> logWorldGenEventToFile = new ConfigEntry.Builder<EDhApiLoggerLevel>()
|
||||||
.setChatCommandName("logging.logWorldGenEvent")
|
.setChatCommandName("logging.logWorldGenEvent")
|
||||||
.set(EDhApiLoggerMode.LOG_ERROR_TO_CHAT_AND_INFO_TO_FILE)
|
.set(EDhApiLoggerLevel.INFO)
|
||||||
.comment(""
|
.comment(""
|
||||||
+ "If enabled, the mod will log information about the world generation process. \n"
|
+ "If enabled, the mod will log information about the world generation process. \n"
|
||||||
+ "This can be useful for debugging.")
|
+ "This can be useful for debugging.")
|
||||||
.build();
|
.build();
|
||||||
|
|
||||||
public static ConfigEntry<EDhApiLoggerMode> logWorldGenPerformance = new ConfigEntry.Builder<EDhApiLoggerMode>()
|
public static ConfigEntry<EDhApiLoggerLevel> logWorldGenChunkLoadEventToFile = new ConfigEntry.Builder<EDhApiLoggerLevel>()
|
||||||
.setChatCommandName("logging.logWorldGenPerformance")
|
|
||||||
.set(EDhApiLoggerMode.LOG_ERROR_TO_CHAT_AND_INFO_TO_FILE)
|
|
||||||
.comment(""
|
|
||||||
+ "If enabled, the mod will log performance about the world generation process. \n"
|
|
||||||
+ "This can be useful for debugging.")
|
|
||||||
.build();
|
|
||||||
|
|
||||||
public static ConfigEntry<EDhApiLoggerMode> logWorldGenLoadEvent = new ConfigEntry.Builder<EDhApiLoggerMode>()
|
|
||||||
.setChatCommandName("logging.logWorldGenLoadEvent")
|
.setChatCommandName("logging.logWorldGenLoadEvent")
|
||||||
.set(EDhApiLoggerMode.LOG_ERROR_TO_CHAT_AND_INFO_TO_FILE)
|
.set(EDhApiLoggerLevel.INFO)
|
||||||
.comment(""
|
.comment(""
|
||||||
+ "If enabled, the mod will log information about the world generation process. \n"
|
+ "If enabled, the mod will log information about the world generation process. \n"
|
||||||
+ "This can be useful for debugging.")
|
+ "This can be useful for debugging.")
|
||||||
.build();
|
.build();
|
||||||
|
|
||||||
public static ConfigEntry<EDhApiLoggerMode> logRendererBufferEvent = new ConfigEntry.Builder<EDhApiLoggerMode>()
|
public static ConfigEntry<EDhApiLoggerLevel> logRendererEventToFile = new ConfigEntry.Builder<EDhApiLoggerLevel>()
|
||||||
.set(EDhApiLoggerMode.LOG_ERROR_TO_CHAT_AND_INFO_TO_FILE)
|
.set(EDhApiLoggerLevel.INFO)
|
||||||
.comment(""
|
.comment(""
|
||||||
+ "If enabled, the mod will log information about the renderer buffer process. \n"
|
+ "If enabled, the mod will log information about the renderer setup, cleanup, and any issues it may encounter. \n"
|
||||||
+ "This can be useful for debugging.")
|
+ "This can be useful for debugging.")
|
||||||
.build();
|
.build();
|
||||||
|
|
||||||
public static ConfigEntry<EDhApiLoggerMode> logRendererGLEvent = new ConfigEntry.Builder<EDhApiLoggerMode>()
|
public static ConfigEntry<EDhApiLoggerLevel> logRendererGLEventToFile = new ConfigEntry.Builder<EDhApiLoggerLevel>()
|
||||||
.set(EDhApiLoggerMode.LOG_ERROR_TO_CHAT_AND_INFO_TO_FILE)
|
.set(EDhApiLoggerLevel.INFO)
|
||||||
.comment(""
|
.comment(""
|
||||||
+ "If enabled, the mod will log information about the renderer OpenGL process. \n"
|
+ "If enabled, the mod will log information about the renderer OpenGL process. \n"
|
||||||
+ "This can be useful for debugging.")
|
+ "This can be useful for debugging.")
|
||||||
.build();
|
.build();
|
||||||
|
|
||||||
public static ConfigEntry<EDhApiLoggerMode> logNetworkEvent = new ConfigEntry.Builder<EDhApiLoggerMode>()
|
public static ConfigEntry<EDhApiLoggerLevel> logRendererGLEventToChat = new ConfigEntry.Builder<EDhApiLoggerLevel>()
|
||||||
|
.set(EDhApiLoggerLevel.ERROR)
|
||||||
|
.comment(""
|
||||||
|
+ "If enabled, the mod will log information about the renderer OpenGL process. \n"
|
||||||
|
+ "This can be useful for debugging.")
|
||||||
|
.build();
|
||||||
|
|
||||||
|
public static ConfigEntry<EDhApiLoggerLevel> logNetworkEventToFile = new ConfigEntry.Builder<EDhApiLoggerLevel>()
|
||||||
.setChatCommandName("logging.logNetworkEvent")
|
.setChatCommandName("logging.logNetworkEvent")
|
||||||
.set(EDhApiLoggerMode.LOG_ERROR_TO_CHAT_AND_WARNING_TO_FILE)
|
.set(EDhApiLoggerLevel.INFO)
|
||||||
.comment(""
|
.comment(""
|
||||||
+ "If enabled, the mod will log information about network operations. \n"
|
+ "If enabled, the mod will log information about network operations. \n"
|
||||||
+ "This can be useful for debugging.")
|
+ "This can be useful for debugging.")
|
||||||
.build();
|
.build();
|
||||||
|
|
||||||
|
public static ConfigEntry<EDhApiLoggerLevel> logConnectionConfigChangesToFile = new ConfigEntry.Builder<EDhApiLoggerLevel>()
|
||||||
|
.setChatCommandName("logging.logConnectionConfigChanges")
|
||||||
|
.set(EDhApiLoggerLevel.WARN)
|
||||||
|
.comment(""
|
||||||
|
+ "If enabled, config changes sent by the server will be logged. \n"
|
||||||
|
+ "")
|
||||||
|
.build();
|
||||||
|
|
||||||
public static ConfigCategory warning = new ConfigCategory.Builder().set(Warning.class).build();
|
public static ConfigCategory warning = new ConfigCategory.Builder().set(Warning.class).build();
|
||||||
|
|
||||||
|
|
||||||
@@ -1648,6 +1648,14 @@ public class Config
|
|||||||
+ "")
|
+ "")
|
||||||
.build();
|
.build();
|
||||||
|
|
||||||
|
public static ConfigEntry<Boolean> showSlowWorldGenSettingWarnings = new ConfigEntry.Builder<Boolean>()
|
||||||
|
.set(true)
|
||||||
|
.comment(""
|
||||||
|
+ "If enabled, a chat message will be displayed when DH has too many chunks \n"
|
||||||
|
+ "queued for updating. \n"
|
||||||
|
+ "")
|
||||||
|
.build();
|
||||||
|
|
||||||
public static ConfigEntry<Boolean> showModCompatibilityWarningsOnStartup = new ConfigEntry.Builder<Boolean>()
|
public static ConfigEntry<Boolean> showModCompatibilityWarningsOnStartup = new ConfigEntry.Builder<Boolean>()
|
||||||
.set(true)
|
.set(true)
|
||||||
.comment(""
|
.comment(""
|
||||||
@@ -1656,6 +1664,15 @@ public class Config
|
|||||||
+ "")
|
+ "")
|
||||||
.build();
|
.build();
|
||||||
|
|
||||||
|
public static ConfigEntry<Boolean> logGarbageCollectorWarning = new ConfigEntry.Builder<Boolean>()
|
||||||
|
.set(true)
|
||||||
|
.comment(""
|
||||||
|
+ "If enabled, a message will be logged if the garbage \n"
|
||||||
|
+ "collector Java is currently using is known \n"
|
||||||
|
+ "to cause stutters and/or issues. \n"
|
||||||
|
+ "")
|
||||||
|
.build();
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1674,6 +1691,28 @@ public class Config
|
|||||||
+ "")
|
+ "")
|
||||||
.build();
|
.build();
|
||||||
|
|
||||||
|
public static ConfigEntry<Integer> serverId = new ConfigEntry.Builder<Integer>()
|
||||||
|
.set(new Random().nextInt())
|
||||||
|
.setAppearance(EConfigEntryAppearance.ONLY_IN_FILE)
|
||||||
|
.comment(""
|
||||||
|
+ "DO NOT CHANGE UNLESS YOU KNOW WHAT YOU'RE DOING.\n"
|
||||||
|
+ "Autogenerated ID used to prevent multiple independent servers from accidentally\n"
|
||||||
|
+ "writing over each other's LODs when the same serverKey is set on both.\n"
|
||||||
|
+ "")
|
||||||
|
.build();
|
||||||
|
|
||||||
|
public static ConfigEntry<String> serverKey = new ConfigEntry.Builder<String>()
|
||||||
|
.setChatCommandName("levelKeys.serverKey")
|
||||||
|
.setAppearance(EConfigEntryAppearance.ONLY_IN_FILE)
|
||||||
|
.set("")
|
||||||
|
.comment(""
|
||||||
|
+ "Custom server key used which can be used to always reuse the same LOD data folder,\n"
|
||||||
|
+ "for cases when the server doesn't have a static IP for some reason.\n"
|
||||||
|
+ "If this value is empty, the client itself decides which folder name to use.\n"
|
||||||
|
+ "Requires rejoining the server to apply after changing.\n"
|
||||||
|
+ "")
|
||||||
|
.build();
|
||||||
|
|
||||||
public static ConfigEntry<String> levelKeyPrefix = new ConfigEntry.Builder<String>()
|
public static ConfigEntry<String> levelKeyPrefix = new ConfigEntry.Builder<String>()
|
||||||
.setChatCommandName("levelKeys.prefix")
|
.setChatCommandName("levelKeys.prefix")
|
||||||
.set("")
|
.set("")
|
||||||
@@ -1701,33 +1740,6 @@ public class Config
|
|||||||
.comment("" +
|
.comment("" +
|
||||||
"Defines the distance allowed to generate around the player." +
|
"Defines the distance allowed to generate around the player." +
|
||||||
"")
|
"")
|
||||||
.setPerformance(EConfigEntryPerformance.HIGH)
|
|
||||||
.build();
|
|
||||||
|
|
||||||
public static ConfigEntry<Integer> generationBoundsX = new ConfigEntry.Builder<Integer>()
|
|
||||||
.setChatCommandName("generation.bounds.x")
|
|
||||||
.setAppearance(EConfigEntryAppearance.ONLY_IN_FILE)
|
|
||||||
.setMinDefaultMax(Integer.MIN_VALUE, 0, Integer.MAX_VALUE)
|
|
||||||
.comment("" +
|
|
||||||
"Defines the X-coordinate of the central point for generation boundaries, in blocks. \n" +
|
|
||||||
"")
|
|
||||||
.build();
|
|
||||||
public static ConfigEntry<Integer> generationBoundsZ = new ConfigEntry.Builder<Integer>()
|
|
||||||
.setChatCommandName("generation.bounds.z")
|
|
||||||
.setAppearance(EConfigEntryAppearance.ONLY_IN_FILE)
|
|
||||||
.setMinDefaultMax(Integer.MIN_VALUE, 0, Integer.MAX_VALUE)
|
|
||||||
.comment("" +
|
|
||||||
"Defines the Z-coordinate of the central point for generation boundaries, in blocks. \n" +
|
|
||||||
"")
|
|
||||||
.build();
|
|
||||||
public static ConfigEntry<Integer> generationBoundsRadius = new ConfigEntry.Builder<Integer>()
|
|
||||||
.setChatCommandName("generation.bounds.radius")
|
|
||||||
.setAppearance(EConfigEntryAppearance.ONLY_IN_FILE)
|
|
||||||
.setMinDefaultMax(0, 0, Integer.MAX_VALUE)
|
|
||||||
.comment("" +
|
|
||||||
"Defines the radius around the central point within which generation is allowed, in blocks. \n" +
|
|
||||||
"If this value is set to 0, generation bounds are disabled." +
|
|
||||||
"")
|
|
||||||
.build();
|
.build();
|
||||||
|
|
||||||
|
|
||||||
@@ -1746,7 +1758,6 @@ public class Config
|
|||||||
.comment("" +
|
.comment("" +
|
||||||
"Defines the distance the player will receive updates around." +
|
"Defines the distance the player will receive updates around." +
|
||||||
"")
|
"")
|
||||||
.setPerformance(EConfigEntryPerformance.HIGH)
|
|
||||||
.build();
|
.build();
|
||||||
|
|
||||||
|
|
||||||
@@ -1775,7 +1786,6 @@ public class Config
|
|||||||
"Defines the distance allowed to be synchronized around the player. \n" +
|
"Defines the distance allowed to be synchronized around the player. \n" +
|
||||||
"Should be the same or larger than maxGenerationRequestDistance in most cases." +
|
"Should be the same or larger than maxGenerationRequestDistance in most cases." +
|
||||||
"")
|
"")
|
||||||
.setPerformance(EConfigEntryPerformance.HIGH)
|
|
||||||
.build();
|
.build();
|
||||||
|
|
||||||
|
|
||||||
@@ -1849,11 +1859,11 @@ public class Config
|
|||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
// TODO automatically get all instances of AbstractPresetConfigEventHandler and fire "setUiOnlyConfigValues"
|
|
||||||
ThreadPresetConfigEventHandler.INSTANCE.setUiOnlyConfigValues();
|
ThreadPresetConfigEventHandler.INSTANCE.setUiOnlyConfigValues();
|
||||||
RenderQualityPresetConfigEventHandler.INSTANCE.setUiOnlyConfigValues();
|
RenderQualityPresetConfigEventHandler.INSTANCE.setUiOnlyConfigValues();
|
||||||
QuickRenderToggleConfigEventHandler.INSTANCE.setUiOnlyConfigValues();
|
QuickRenderToggleConfigEventHandler.INSTANCE.setUiOnlyConfigValues();
|
||||||
QuickShowWorldGenProgressConfigEventHandler.INSTANCE.setUiOnlyConfigValues();
|
|
||||||
|
IgnoredDimensionCsvHandler.INSTANCE.onConfigValueSet();
|
||||||
}
|
}
|
||||||
catch (Exception e)
|
catch (Exception e)
|
||||||
{
|
{
|
||||||
|
|||||||
+84
-71
@@ -26,28 +26,27 @@ import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
|
|||||||
import com.seibel.distanthorizons.core.wrapperInterfaces.config.ILangWrapper;
|
import com.seibel.distanthorizons.core.wrapperInterfaces.config.ILangWrapper;
|
||||||
import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftSharedWrapper;
|
import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftSharedWrapper;
|
||||||
import com.seibel.distanthorizons.coreapi.ModInfo;
|
import com.seibel.distanthorizons.coreapi.ModInfo;
|
||||||
import org.apache.logging.log4j.LogManager;
|
import com.seibel.distanthorizons.core.logging.DhLogger;
|
||||||
import org.apache.logging.log4j.Logger;
|
|
||||||
|
|
||||||
import java.lang.invoke.MethodHandles;
|
|
||||||
import java.lang.reflect.Field;
|
import java.lang.reflect.Field;
|
||||||
import java.nio.file.Path;
|
import java.nio.file.Path;
|
||||||
import java.util.*;
|
import java.util.*;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Indexes and sets everything up for the file handling and gui.
|
* Sets up everything in {@link Config} for the file/GUI and keeps track of all
|
||||||
* This should be init after singletons have been bound
|
* entries therein. <br>
|
||||||
|
* This should be run after the singletons have been bound.
|
||||||
*
|
*
|
||||||
* @author coolGi
|
* @author coolGi
|
||||||
* @author Ran
|
* @author Ran
|
||||||
* @version 2023-8-26
|
*
|
||||||
|
* @see Config
|
||||||
*/
|
*/
|
||||||
public class ConfigBase
|
public class ConfigHandler
|
||||||
{
|
{
|
||||||
/** Our own config instance, don't modify unless you are the DH mod */
|
private static final DhLogger LOGGER = new DhLoggerBuilder().build();
|
||||||
public static ConfigBase INSTANCE;
|
|
||||||
|
|
||||||
private static final Logger LOGGER = DhLoggerBuilder.getLogger();
|
private static final IMinecraftSharedWrapper MC_SHARED = SingletonInjector.INSTANCE.get(IMinecraftSharedWrapper.class);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* What the config works with
|
* What the config works with
|
||||||
@@ -69,7 +68,7 @@ public class ConfigBase
|
|||||||
* <br> Map<String, T>
|
* <br> Map<String, T>
|
||||||
* <br> HashMap<String, T>
|
* <br> HashMap<String, T>
|
||||||
*/
|
*/
|
||||||
public static final List<Class<?>> ACCEPTABLE_INPUTS = new ArrayList<Class<?>>()
|
private static final List<Class<?>> ACCEPTABLE_INPUTS = new ArrayList<Class<?>>()
|
||||||
{{
|
{{
|
||||||
this.add(Boolean.class);
|
this.add(Boolean.class);
|
||||||
this.add(Byte.class);
|
this.add(Byte.class);
|
||||||
@@ -80,7 +79,7 @@ public class ConfigBase
|
|||||||
this.add(Float.class);
|
this.add(Float.class);
|
||||||
this.add(String.class);
|
this.add(String.class);
|
||||||
|
|
||||||
// TODO[CONFIG]: Check the type of these is valid
|
// partially implemented but not entirely
|
||||||
this.add(List.class);
|
this.add(List.class);
|
||||||
this.add(ArrayList.class);
|
this.add(ArrayList.class);
|
||||||
this.add(Map.class);
|
this.add(Map.class);
|
||||||
@@ -89,15 +88,17 @@ public class ConfigBase
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
public ConfigFileHandler configFileHandler;
|
public static final ConfigHandler INSTANCE = new ConfigHandler();
|
||||||
|
|
||||||
public final int configVersion;
|
public final ConfigFileHandler configFileHandler = new ConfigFileHandler(getConfigPath());
|
||||||
|
public final List<AbstractConfigBase<?>> configBaseList = new ArrayList<>();
|
||||||
|
|
||||||
public boolean isLoaded = false;
|
public boolean isLoaded = false;
|
||||||
|
/**
|
||||||
/** Disables the minimum and maximum of any variable */
|
* Disables the minimum and maximum validation. <Br>
|
||||||
public boolean disableMinMax = false; // Very fun to use, but should always be disabled by default
|
* Fun to use, but should be disabled by default.
|
||||||
public final List<AbstractConfigType<?, ?>> entries = new ArrayList<>();
|
*/
|
||||||
|
public boolean runMinMaxValidation = true;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@@ -105,92 +106,104 @@ public class ConfigBase
|
|||||||
// constructor //
|
// constructor //
|
||||||
//=============//
|
//=============//
|
||||||
|
|
||||||
public static void RunFirstTimeSetup()
|
public static void tryRunFirstTimeSetup()
|
||||||
{
|
{
|
||||||
if (INSTANCE != null)
|
if (INSTANCE.isLoaded)
|
||||||
{
|
{
|
||||||
LOGGER.debug("ConfigBase setup already run, ignoring.");
|
LOGGER.debug("ConfigHandler setup already run, ignoring.");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
INSTANCE = new ConfigBase(Config.class, ModInfo.CONFIG_FILE_VERSION);
|
INSTANCE.runFirstTimeSetup();
|
||||||
}
|
}
|
||||||
|
private void runFirstTimeSetup()
|
||||||
private ConfigBase(Class<?> configClass, int configVersion)
|
|
||||||
{
|
{
|
||||||
LOGGER.info("Initialising config for [" + ModInfo.NAME + "]");
|
LOGGER.info("Initialising config for [" + ModInfo.NAME + "]");
|
||||||
|
|
||||||
this.configVersion = configVersion;
|
this.initNestedClass(Config.class, ""); // Init root category
|
||||||
|
|
||||||
this.initNestedClass(configClass, ""); // Init root category
|
|
||||||
|
|
||||||
Path configPath = getConfigPath(ModInfo.NAME);
|
|
||||||
this.configFileHandler = new ConfigFileHandler(this, configPath);
|
|
||||||
this.configFileHandler.loadFromFile();
|
this.configFileHandler.loadFromFile();
|
||||||
|
this.runMinMaxValidation = !Config.Client.Advanced.Debugging.allowUnsafeValues.get();
|
||||||
|
|
||||||
this.isLoaded = true;
|
this.isLoaded = true;
|
||||||
LOGGER.info("Config for [" + ModInfo.NAME + "] initialised");
|
LOGGER.info("[" + ModInfo.NAME + "] Config initialised");
|
||||||
}
|
}
|
||||||
/** Gets the default config path given a mod name */
|
/** Gets the default config path given a mod name */
|
||||||
private static Path getConfigPath(String modName)
|
private static Path getConfigPath()
|
||||||
{
|
{
|
||||||
return SingletonInjector.INSTANCE.get(IMinecraftSharedWrapper.class)
|
return MC_SHARED
|
||||||
.getInstallationDirectory().toPath().resolve("config").resolve(modName + ".toml");
|
.getInstallationDirectory().toPath()
|
||||||
|
.resolve("config")
|
||||||
|
.resolve(ModInfo.NAME + ".toml");
|
||||||
}
|
}
|
||||||
|
/** Put all the config entries into configEntryList */
|
||||||
private void initNestedClass(Class<?> configClass, String category)
|
private void initNestedClass(Class<?> configClass, String category)
|
||||||
{
|
{
|
||||||
// Put all the entries in entries
|
Field[] fields = configClass.getFields();
|
||||||
|
for (Field field : fields)
|
||||||
for (Field field : configClass.getFields())
|
|
||||||
{
|
{
|
||||||
if (AbstractConfigType.class.isAssignableFrom(field.getType()))
|
// ignore any non-config variables
|
||||||
|
if (!AbstractConfigBase.class.isAssignableFrom(field.getType()))
|
||||||
{
|
{
|
||||||
try
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
// add this config to the master list
|
||||||
|
try
|
||||||
|
{
|
||||||
|
this.configBaseList.add((AbstractConfigBase<?>) field.get(field.getType()));
|
||||||
|
}
|
||||||
|
catch (IllegalAccessException e)
|
||||||
|
{
|
||||||
|
LOGGER.warn("Unable to add config ["+field.getType().getName()+"], error: ["+e.getMessage()+"].", e);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
// set any necessary variables in this config
|
||||||
|
AbstractConfigBase<?> configBase = this.configBaseList.get(this.configBaseList.size() - 1);
|
||||||
|
configBase.category = category;
|
||||||
|
configBase.name = field.getName();
|
||||||
|
|
||||||
|
|
||||||
|
// validate the config's input type
|
||||||
|
if (ConfigEntry.class.isAssignableFrom(field.getType()))
|
||||||
|
{
|
||||||
|
if (!isAcceptableType(configBase.getType()))
|
||||||
{
|
{
|
||||||
this.entries.add((AbstractConfigType<?, ?>) field.get(field.getType()));
|
LOGGER.error("Invalid variable type at [" + (category.isEmpty() ? "" : category + ".") + field.getName() + "].");
|
||||||
|
LOGGER.error("Type [" + configBase.getType() + "] is not one of these types [" + ACCEPTABLE_INPUTS.toString() + "]");
|
||||||
|
this.configBaseList.remove(this.configBaseList.size() - 1); // Delete the entry if it is invalid so the game can still run
|
||||||
}
|
}
|
||||||
catch (IllegalAccessException exception)
|
}
|
||||||
|
|
||||||
|
// recursively add deeper categories if present
|
||||||
|
if (ConfigCategory.class.isAssignableFrom(field.getType()))
|
||||||
|
{
|
||||||
|
ConfigCategory configCategory = (ConfigCategory) configBase;
|
||||||
|
|
||||||
|
if (configCategory.getDestination() == null)
|
||||||
{
|
{
|
||||||
LOGGER.warn(exception);
|
configCategory.destination = configBase.getNameAndCategory();
|
||||||
}
|
}
|
||||||
|
|
||||||
AbstractConfigType<?, ?> entry = this.entries.get(this.entries.size() - 1);
|
// shouldn't happen, but just in case
|
||||||
entry.category = category;
|
if (configBase.get() != null)
|
||||||
entry.name = field.getName();
|
{
|
||||||
entry.configBase = this;
|
this.initNestedClass(configCategory.get(), configCategory.getDestination());
|
||||||
|
|
||||||
if (ConfigEntry.class.isAssignableFrom(field.getType()))
|
|
||||||
{
|
|
||||||
// If item is type ConfigEntry
|
|
||||||
if (!isAcceptableType(entry.getType()))
|
|
||||||
{
|
|
||||||
LOGGER.error("Invalid variable type at [" + (category.isEmpty() ? "" : category + ".") + field.getName() + "].");
|
|
||||||
LOGGER.error("Type [" + entry.getType() + "] is not one of these types [" + ACCEPTABLE_INPUTS.toString() + "]");
|
|
||||||
this.entries.remove(this.entries.size() - 1); // Delete the entry if it is invalid so the game can still run
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (ConfigCategory.class.isAssignableFrom(field.getType()))
|
|
||||||
{ // If it's a category then init the stuff inside it and put it in the category list
|
|
||||||
assert entry instanceof ConfigCategory;
|
|
||||||
if (((ConfigCategory) entry).getDestination() == null)
|
|
||||||
((ConfigCategory) entry).destination = entry.getNameWCategory();
|
|
||||||
if (entry.get() != null)
|
|
||||||
{
|
|
||||||
this.initNestedClass(((ConfigCategory) entry).get(), ((ConfigCategory) entry).getDestination());
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
private static boolean isAcceptableType(Class<?> Clazz)
|
private static boolean isAcceptableType(Class<?> inputClass)
|
||||||
{
|
{
|
||||||
if (Clazz.isEnum())
|
if (inputClass.isEnum())
|
||||||
{
|
{
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
return ACCEPTABLE_INPUTS.contains(Clazz);
|
return ACCEPTABLE_INPUTS.contains(inputClass);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -219,9 +232,9 @@ public class ConfigBase
|
|||||||
String ending = "\",\n";
|
String ending = "\",\n";
|
||||||
|
|
||||||
// config entries
|
// config entries
|
||||||
for (AbstractConfigType<?, ?> entry : this.entries)
|
for (AbstractConfigBase<?> entry : this.configBaseList)
|
||||||
{
|
{
|
||||||
String entryPrefix = "distanthorizons.config." + entry.getNameWCategory();
|
String entryPrefix = "distanthorizons.config." + entry.getNameAndCategory();
|
||||||
|
|
||||||
if (checkEnums
|
if (checkEnums
|
||||||
&& entry.getType().isEnum()
|
&& entry.getType().isEnum()
|
||||||
+10
-2
@@ -24,7 +24,7 @@ import com.seibel.distanthorizons.core.config.types.ConfigEntry;
|
|||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.HashSet;
|
import java.util.HashSet;
|
||||||
|
|
||||||
public class ConfigEntryWithPresetOptions<TQuickEnum, TConfig>
|
public class ConfigPresetOptions<TQuickEnum, TConfig>
|
||||||
{
|
{
|
||||||
public final ConfigEntry<TConfig> configEntry;
|
public final ConfigEntry<TConfig> configEntry;
|
||||||
|
|
||||||
@@ -32,7 +32,11 @@ public class ConfigEntryWithPresetOptions<TQuickEnum, TConfig>
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
public ConfigEntryWithPresetOptions(ConfigEntry<TConfig> configEntry, HashMap<TQuickEnum, TConfig> configOptionByQualityOption)
|
//=============//
|
||||||
|
// constructor //
|
||||||
|
//=============//
|
||||||
|
|
||||||
|
public ConfigPresetOptions(ConfigEntry<TConfig> configEntry, HashMap<TQuickEnum, TConfig> configOptionByQualityOption)
|
||||||
{
|
{
|
||||||
this.configEntry = configEntry;
|
this.configEntry = configEntry;
|
||||||
this.configOptionByQualityOption = configOptionByQualityOption;
|
this.configOptionByQualityOption = configOptionByQualityOption;
|
||||||
@@ -40,6 +44,10 @@ public class ConfigEntryWithPresetOptions<TQuickEnum, TConfig>
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
//=========//
|
||||||
|
// methods //
|
||||||
|
//=========//
|
||||||
|
|
||||||
public void updateConfigEntry(TQuickEnum quickQuality)
|
public void updateConfigEntry(TQuickEnum quickQuality)
|
||||||
{
|
{
|
||||||
TConfig newValue = this.configOptionByQualityOption.get(quickQuality);
|
TConfig newValue = this.configOptionByQualityOption.get(quickQuality);
|
||||||
+20
-20
@@ -17,12 +17,12 @@
|
|||||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package com.seibel.distanthorizons.api.objects.config;
|
package com.seibel.distanthorizons.core.config.api;
|
||||||
|
|
||||||
import com.seibel.distanthorizons.api.interfaces.config.IDhApiConfigValue;
|
import com.seibel.distanthorizons.api.interfaces.config.IDhApiConfigValue;
|
||||||
import com.seibel.distanthorizons.coreapi.interfaces.config.IConfigEntry;
|
import com.seibel.distanthorizons.core.config.types.ConfigEntry;
|
||||||
import com.seibel.distanthorizons.coreapi.interfaces.config.IConverter;
|
import com.seibel.distanthorizons.coreapi.interfaces.config.IConverter;
|
||||||
import com.seibel.distanthorizons.coreapi.util.converters.DefaultConverter;
|
import com.seibel.distanthorizons.core.config.api.converters.DefaultConverter;
|
||||||
|
|
||||||
import java.util.function.Consumer;
|
import java.util.function.Consumer;
|
||||||
|
|
||||||
@@ -41,7 +41,7 @@ import java.util.function.Consumer;
|
|||||||
*/
|
*/
|
||||||
public class DhApiConfigValue<coreType, apiType> implements IDhApiConfigValue<apiType>
|
public class DhApiConfigValue<coreType, apiType> implements IDhApiConfigValue<apiType>
|
||||||
{
|
{
|
||||||
private final IConfigEntry<coreType> configEntry;
|
private final ConfigEntry<coreType> configBase;
|
||||||
|
|
||||||
private final IConverter<coreType, apiType> configConverter;
|
private final IConverter<coreType, apiType> configConverter;
|
||||||
|
|
||||||
@@ -53,9 +53,9 @@ public class DhApiConfigValue<coreType, apiType> implements IDhApiConfigValue<ap
|
|||||||
* Uses the default object converter, this requires coreType and apiType to be the same.
|
* Uses the default object converter, this requires coreType and apiType to be the same.
|
||||||
*/
|
*/
|
||||||
@SuppressWarnings("unchecked") // DefaultConverter's cast is safe
|
@SuppressWarnings("unchecked") // DefaultConverter's cast is safe
|
||||||
public DhApiConfigValue(IConfigEntry<coreType> newConfigEntry)
|
public DhApiConfigValue(ConfigEntry<coreType> configBase)
|
||||||
{
|
{
|
||||||
this.configEntry = newConfigEntry;
|
this.configBase = configBase;
|
||||||
this.configConverter = (IConverter<coreType, apiType>) new DefaultConverter<coreType>();
|
this.configConverter = (IConverter<coreType, apiType>) new DefaultConverter<coreType>();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -63,22 +63,22 @@ public class DhApiConfigValue<coreType, apiType> implements IDhApiConfigValue<ap
|
|||||||
* This constructor should only be called internally. <br>
|
* This constructor should only be called internally. <br>
|
||||||
* There is no reason for API users to create this object. <br><br>
|
* There is no reason for API users to create this object. <br><br>
|
||||||
*/
|
*/
|
||||||
public DhApiConfigValue(IConfigEntry<coreType> newConfigEntry, IConverter<coreType, apiType> newConverter)
|
public DhApiConfigValue(ConfigEntry<coreType> configBase, IConverter<coreType, apiType> newConverter)
|
||||||
{
|
{
|
||||||
this.configEntry = newConfigEntry;
|
this.configBase = configBase;
|
||||||
this.configConverter = newConverter;
|
this.configConverter = newConverter;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public apiType getValue() { return this.configConverter.convertToApiType(this.configEntry.get()); }
|
public apiType getValue() { return this.configConverter.convertToApiType(this.configBase.get()); }
|
||||||
public apiType getTrueValue() { return this.configConverter.convertToApiType(this.configEntry.getTrueValue()); }
|
public apiType getTrueValue() { return this.configConverter.convertToApiType(this.configBase.getTrueValue()); }
|
||||||
public apiType getApiValue() { return this.configConverter.convertToApiType(this.configEntry.getApiValue()); }
|
public apiType getApiValue() { return this.configConverter.convertToApiType(this.configBase.getApiValue()); }
|
||||||
|
|
||||||
public boolean setValue(apiType newValue)
|
public boolean setValue(apiType newValue)
|
||||||
{
|
{
|
||||||
if (this.configEntry.getAllowApiOverride())
|
if (this.configBase.getAllowApiOverride())
|
||||||
{
|
{
|
||||||
this.configEntry.setApiValue(this.configConverter.convertToCoreType(newValue));
|
this.configBase.setApiValue(this.configConverter.convertToCoreType(newValue));
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
@@ -89,11 +89,11 @@ public class DhApiConfigValue<coreType, apiType> implements IDhApiConfigValue<ap
|
|||||||
|
|
||||||
public boolean clearValue()
|
public boolean clearValue()
|
||||||
{
|
{
|
||||||
if (this.configEntry.getAllowApiOverride())
|
if (this.configBase.getAllowApiOverride())
|
||||||
{
|
{
|
||||||
// no converter should be used here since null objects may need to be handled differently
|
// no converter should be used here since null objects may need to be handled differently
|
||||||
// TODO the API should just have a bool to keep track of whether the API value is in use instead of using NULL
|
// TODO the API should just have a bool to keep track of whether the API value is in use instead of using NULL
|
||||||
this.configEntry.setApiValue(null);
|
this.configBase.setApiValue(null);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
@@ -102,16 +102,16 @@ public class DhApiConfigValue<coreType, apiType> implements IDhApiConfigValue<ap
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean getCanBeOverrodeByApi() { return this.configEntry.getAllowApiOverride(); }
|
public boolean getCanBeOverrodeByApi() { return this.configBase.getAllowApiOverride(); }
|
||||||
|
|
||||||
public apiType getDefaultValue() { return this.configConverter.convertToApiType(this.configEntry.getDefaultValue()); }
|
public apiType getDefaultValue() { return this.configConverter.convertToApiType(this.configBase.getDefaultValue()); }
|
||||||
public apiType getMaxValue() { return this.configConverter.convertToApiType(this.configEntry.getMax()); }
|
public apiType getMaxValue() { return this.configConverter.convertToApiType(this.configBase.getMax()); }
|
||||||
public apiType getMinValue() { return this.configConverter.convertToApiType(this.configEntry.getMin()); }
|
public apiType getMinValue() { return this.configConverter.convertToApiType(this.configBase.getMin()); }
|
||||||
|
|
||||||
|
|
||||||
public void addChangeListener(Consumer<apiType> onValueChangeFunc)
|
public void addChangeListener(Consumer<apiType> onValueChangeFunc)
|
||||||
{
|
{
|
||||||
this.configEntry.addValueChangeListener((coreValue) ->
|
this.configBase.addValueChangeListener((coreValue) ->
|
||||||
{
|
{
|
||||||
apiType apiValue = this.configConverter.convertToApiType(coreValue);
|
apiType apiValue = this.configConverter.convertToApiType(coreValue);
|
||||||
onValueChangeFunc.accept(apiValue);
|
onValueChangeFunc.accept(apiValue);
|
||||||
+1
-1
@@ -17,7 +17,7 @@
|
|||||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package com.seibel.distanthorizons.coreapi.util.converters;
|
package com.seibel.distanthorizons.core.config.api.converters;
|
||||||
|
|
||||||
import com.seibel.distanthorizons.api.enums.rendering.EDhApiFogDrawMode;
|
import com.seibel.distanthorizons.api.enums.rendering.EDhApiFogDrawMode;
|
||||||
import com.seibel.distanthorizons.coreapi.interfaces.config.IConverter;
|
import com.seibel.distanthorizons.coreapi.interfaces.config.IConverter;
|
||||||
+1
-1
@@ -17,7 +17,7 @@
|
|||||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package com.seibel.distanthorizons.coreapi.util.converters;
|
package com.seibel.distanthorizons.core.config.api.converters;
|
||||||
|
|
||||||
import com.seibel.distanthorizons.coreapi.interfaces.config.IConverter;
|
import com.seibel.distanthorizons.coreapi.interfaces.config.IConverter;
|
||||||
|
|
||||||
+15
-22
@@ -17,34 +17,27 @@
|
|||||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package com.seibel.distanthorizons.core.enums.worldGeneration;
|
package com.seibel.distanthorizons.core.config.api.converters;
|
||||||
|
|
||||||
|
import com.seibel.distanthorizons.api.enums.rendering.EDhApiRendererMode;
|
||||||
|
import com.seibel.distanthorizons.coreapi.interfaces.config.IConverter;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* MULTI_THREADED, <br>
|
* Used to support deprecated config options that may be identical
|
||||||
* SINGLE_THREADED, <br>
|
* in implementation but with the On/Off values flipped.
|
||||||
* SERVER_THREAD, <br>
|
|
||||||
*
|
*
|
||||||
* @author James Seibel
|
* @author James Seibel
|
||||||
* @version 7-25-2022
|
* @version 2025-12-22
|
||||||
*/
|
*/
|
||||||
public enum EWorldGenThreadMode
|
public class InvertedBoolConverter implements IConverter<Boolean, Boolean>
|
||||||
{
|
{
|
||||||
/**
|
|
||||||
* This world generator can be run on an unlimited number
|
|
||||||
* of concurrent threads.
|
|
||||||
*/
|
|
||||||
MULTI_THREADED,
|
|
||||||
|
|
||||||
/**
|
@Override
|
||||||
* This world generator can only be run on one thread at
|
public Boolean convertToCoreType(Boolean core)
|
||||||
* a time, however that thread can run concurrently
|
{ return !core; }
|
||||||
* to Minecraft's server thread.
|
|
||||||
*/
|
@Override
|
||||||
SINGLE_THREADED,
|
public Boolean convertToApiType(Boolean api)
|
||||||
|
{ return !api; }
|
||||||
|
|
||||||
/**
|
|
||||||
* This world generator can only be run on Minecraft's
|
|
||||||
* server thread.
|
|
||||||
*/
|
|
||||||
SERVER_THREAD,
|
|
||||||
}
|
}
|
||||||
+1
-1
@@ -17,7 +17,7 @@
|
|||||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package com.seibel.distanthorizons.coreapi.util.converters;
|
package com.seibel.distanthorizons.core.config.api.converters;
|
||||||
|
|
||||||
import com.seibel.distanthorizons.api.enums.rendering.EDhApiRendererMode;
|
import com.seibel.distanthorizons.api.enums.rendering.EDhApiRendererMode;
|
||||||
import com.seibel.distanthorizons.coreapi.interfaces.config.IConverter;
|
import com.seibel.distanthorizons.coreapi.interfaces.config.IConverter;
|
||||||
+125
@@ -0,0 +1,125 @@
|
|||||||
|
/*
|
||||||
|
* This file is part of the Distant Horizons mod
|
||||||
|
* licensed under the GNU LGPL v3 License.
|
||||||
|
*
|
||||||
|
* Copyright (C) 2020 James Seibel
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU Lesser General Public License as published by
|
||||||
|
* the Free Software Foundation, version 3.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU Lesser General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU Lesser General Public License
|
||||||
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package com.seibel.distanthorizons.core.config.eventHandlers;
|
||||||
|
|
||||||
|
import com.seibel.distanthorizons.api.enums.config.EDhApiMcRenderingFadeMode;
|
||||||
|
import com.seibel.distanthorizons.api.methods.events.abstractEvents.DhApiBeforeRenderEvent;
|
||||||
|
import com.seibel.distanthorizons.api.methods.events.sharedParameterObjects.DhApiCancelableEventParam;
|
||||||
|
import com.seibel.distanthorizons.api.methods.events.sharedParameterObjects.DhApiRenderParam;
|
||||||
|
import com.seibel.distanthorizons.core.config.Config;
|
||||||
|
import com.seibel.distanthorizons.core.config.listeners.IConfigListener;
|
||||||
|
import com.seibel.distanthorizons.core.logging.DhLogger;
|
||||||
|
import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
|
||||||
|
import com.seibel.distanthorizons.coreapi.util.StringUtil;
|
||||||
|
|
||||||
|
public class IgnoredDimensionCsvHandler extends DhApiBeforeRenderEvent implements IConfigListener
|
||||||
|
{
|
||||||
|
private static final DhLogger LOGGER = new DhLoggerBuilder().build();
|
||||||
|
|
||||||
|
public static IgnoredDimensionCsvHandler INSTANCE = new IgnoredDimensionCsvHandler();
|
||||||
|
|
||||||
|
private String[] dimensionNames = null;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
//=============//
|
||||||
|
// constructor //
|
||||||
|
//=============//
|
||||||
|
|
||||||
|
/** private since we only ever need one handler at a time */
|
||||||
|
private IgnoredDimensionCsvHandler() { }
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
//=================//
|
||||||
|
// config handling //
|
||||||
|
//=================//
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onConfigValueSet()
|
||||||
|
{
|
||||||
|
String ignoredDimensionCsvString = Config.Client.Advanced.Graphics.Experimental.ignoredDimensionCsv.get();
|
||||||
|
if (ignoredDimensionCsvString == null
|
||||||
|
|| ignoredDimensionCsvString.isEmpty())
|
||||||
|
{
|
||||||
|
LOGGER.info("Dimension ignoring disabled, DH will render all dimensions.");
|
||||||
|
this.dimensionNames = null;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
this.dimensionNames = ignoredDimensionCsvString.split(",");
|
||||||
|
LOGGER.info("DH set to ignore dimensions: ["+ StringUtil.join(", ", this.dimensionNames)+"].");
|
||||||
|
}
|
||||||
|
catch (Exception e)
|
||||||
|
{
|
||||||
|
LOGGER.error("Failed to separate ignored dimensions from CSV string, error: ["+e.getMessage()+"].", e);
|
||||||
|
this.dimensionNames = null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
//===================//
|
||||||
|
// external handling //
|
||||||
|
//===================//
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void beforeRender(DhApiCancelableEventParam<DhApiRenderParam> event)
|
||||||
|
{
|
||||||
|
String dimName = event.value.clientLevelWrapper.getDimensionName();
|
||||||
|
if (IgnoredDimensionCsvHandler.INSTANCE.dimensionNameShouldBeIgnored(dimName))
|
||||||
|
{
|
||||||
|
event.cancelEvent();
|
||||||
|
Config.Client.Advanced.Graphics.Fog.enableVanillaFog.setApiValue(true);
|
||||||
|
Config.Client.Advanced.Graphics.Quality.vanillaFadeMode.setApiValue(EDhApiMcRenderingFadeMode.NONE);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
Config.Client.Advanced.Graphics.Fog.enableVanillaFog.setApiValue(null);
|
||||||
|
Config.Client.Advanced.Graphics.Quality.vanillaFadeMode.setApiValue(null);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public boolean dimensionNameShouldBeIgnored(String dimName)
|
||||||
|
{
|
||||||
|
if (this.dimensionNames == null
|
||||||
|
|| this.dimensionNames.length == 0)
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
for (int i = 0; i < this.dimensionNames.length; i++)
|
||||||
|
{
|
||||||
|
String dimNameToIgnore = this.dimensionNames[i];
|
||||||
|
if (dimName.equalsIgnoreCase(dimNameToIgnore))
|
||||||
|
{
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
+8
-9
@@ -20,23 +20,22 @@
|
|||||||
package com.seibel.distanthorizons.core.config.eventHandlers;
|
package com.seibel.distanthorizons.core.config.eventHandlers;
|
||||||
|
|
||||||
import com.seibel.distanthorizons.core.config.Config;
|
import com.seibel.distanthorizons.core.config.Config;
|
||||||
|
import com.seibel.distanthorizons.core.config.ConfigHandler;
|
||||||
import com.seibel.distanthorizons.core.config.listeners.IConfigListener;
|
import com.seibel.distanthorizons.core.config.listeners.IConfigListener;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* handles enabling/disabling config validation when the
|
||||||
|
* {@link Config.Client.Advanced.Debugging#allowUnsafeValues} option
|
||||||
|
* is changed.
|
||||||
|
*/
|
||||||
public class UnsafeValuesConfigListener implements IConfigListener
|
public class UnsafeValuesConfigListener implements IConfigListener
|
||||||
{
|
{
|
||||||
public static UnsafeValuesConfigListener INSTANCE = new UnsafeValuesConfigListener();
|
public static UnsafeValuesConfigListener INSTANCE = new UnsafeValuesConfigListener();
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onConfigValueSet()
|
public void onConfigValueSet()
|
||||||
{
|
{ ConfigHandler.INSTANCE.runMinMaxValidation = !Config.Client.Advanced.Debugging.allowUnsafeValues.get(); }
|
||||||
Config.Client.Advanced.Debugging.allowUnsafeValues.configBase.disableMinMax =
|
|
||||||
Config.Client.Advanced.Debugging.allowUnsafeValues.get();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onUiModify()
|
|
||||||
{
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
+6
-1
@@ -35,7 +35,7 @@ public class WorldCurvatureConfigEventHandler implements IConfigListener
|
|||||||
{
|
{
|
||||||
public static WorldCurvatureConfigEventHandler INSTANCE = new WorldCurvatureConfigEventHandler();
|
public static WorldCurvatureConfigEventHandler INSTANCE = new WorldCurvatureConfigEventHandler();
|
||||||
|
|
||||||
private static final int MIN_VALID_CURVE_VALUE = 50;
|
public static final int MIN_VALID_CURVE_VALUE = 50;
|
||||||
|
|
||||||
|
|
||||||
/** private since we only ever need one handler at a time */
|
/** private since we only ever need one handler at a time */
|
||||||
@@ -52,6 +52,11 @@ public class WorldCurvatureConfigEventHandler implements IConfigListener
|
|||||||
// shouldn't update the UI, otherwise we may end up fighting the user
|
// shouldn't update the UI, otherwise we may end up fighting the user
|
||||||
Config.Client.Advanced.Graphics.Experimental.earthCurveRatio.set(MIN_VALID_CURVE_VALUE);
|
Config.Client.Advanced.Graphics.Experimental.earthCurveRatio.set(MIN_VALID_CURVE_VALUE);
|
||||||
}
|
}
|
||||||
|
else if (curveRatio < 0 && curveRatio > -MIN_VALID_CURVE_VALUE)
|
||||||
|
{
|
||||||
|
// same as above, but in the negative direction
|
||||||
|
Config.Client.Advanced.Graphics.Experimental.earthCurveRatio.set(-MIN_VALID_CURVE_VALUE);
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+16
-16
@@ -19,30 +19,30 @@
|
|||||||
|
|
||||||
package com.seibel.distanthorizons.core.config.eventHandlers.presets;
|
package com.seibel.distanthorizons.core.config.eventHandlers.presets;
|
||||||
|
|
||||||
import com.seibel.distanthorizons.core.config.ConfigBase;
|
import com.seibel.distanthorizons.core.config.ConfigHandler;
|
||||||
import com.seibel.distanthorizons.core.config.ConfigEntryWithPresetOptions;
|
import com.seibel.distanthorizons.core.config.ConfigPresetOptions;
|
||||||
import com.seibel.distanthorizons.core.config.listeners.IConfigListener;
|
import com.seibel.distanthorizons.core.config.listeners.IConfigListener;
|
||||||
|
import com.seibel.distanthorizons.core.config.types.AbstractConfigBase;
|
||||||
import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
|
import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
|
||||||
|
import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
|
||||||
import com.seibel.distanthorizons.core.util.TimerUtil;
|
import com.seibel.distanthorizons.core.util.TimerUtil;
|
||||||
import com.seibel.distanthorizons.core.wrapperInterfaces.config.IConfigGui;
|
import com.seibel.distanthorizons.core.wrapperInterfaces.config.IConfigGui;
|
||||||
import com.seibel.distanthorizons.coreapi.interfaces.config.IConfigEntry;
|
|
||||||
import com.seibel.distanthorizons.coreapi.util.StringUtil;
|
import com.seibel.distanthorizons.coreapi.util.StringUtil;
|
||||||
import org.apache.logging.log4j.LogManager;
|
import org.apache.logging.log4j.LogManager;
|
||||||
import org.apache.logging.log4j.Logger;
|
import com.seibel.distanthorizons.core.logging.DhLogger;
|
||||||
import org.jetbrains.annotations.Nullable;
|
import org.jetbrains.annotations.Nullable;
|
||||||
|
|
||||||
import java.util.*;
|
import java.util.*;
|
||||||
|
|
||||||
public abstract class AbstractPresetConfigEventHandler<TPresetEnum extends Enum<?>> implements IConfigListener
|
public abstract class AbstractPresetConfigEventHandler<TPresetEnum extends Enum<?>> implements IConfigListener
|
||||||
{
|
{
|
||||||
private static final Logger LOGGER = LogManager.getLogger();
|
private static final DhLogger LOGGER = new DhLoggerBuilder().build();
|
||||||
private static final long MS_DELAY_BEFORE_APPLYING_PRESET = 3_000;
|
private static final long MS_DELAY_BEFORE_APPLYING_PRESET = 3_000;
|
||||||
|
|
||||||
@Nullable
|
@Nullable
|
||||||
private static IConfigGui configGui = SingletonInjector.INSTANCE.get(IConfigGui.class);
|
private static final IConfigGui CONFIG_GUI = SingletonInjector.INSTANCE.get(IConfigGui.class);
|
||||||
private static boolean guiListenersAdded = false;
|
|
||||||
|
|
||||||
protected final ArrayList<ConfigEntryWithPresetOptions<TPresetEnum, ?>> configList = new ArrayList<>();
|
protected final ArrayList<ConfigPresetOptions<TPresetEnum, ?>> configList = new ArrayList<>();
|
||||||
/** this timer is used so each preset isn't applied while a user is clicking through the config options */
|
/** this timer is used so each preset isn't applied while a user is clicking through the config options */
|
||||||
protected Timer applyPresetTimer = null;
|
protected Timer applyPresetTimer = null;
|
||||||
/** the enum to apply after the timer expires or the UI screen changes. */
|
/** the enum to apply after the timer expires or the UI screen changes. */
|
||||||
@@ -59,9 +59,9 @@ public abstract class AbstractPresetConfigEventHandler<TPresetEnum extends Enum<
|
|||||||
public AbstractPresetConfigEventHandler()
|
public AbstractPresetConfigEventHandler()
|
||||||
{
|
{
|
||||||
// don't update the UI when running on a server
|
// don't update the UI when running on a server
|
||||||
if (configGui != null)
|
if (CONFIG_GUI != null)
|
||||||
{
|
{
|
||||||
configGui.addOnScreenChangeListener(this::onConfigUiClosed);
|
CONFIG_GUI.addOnScreenChangeListener(this::onConfigUiClosed);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -90,7 +90,7 @@ public abstract class AbstractPresetConfigEventHandler<TPresetEnum extends Enum<
|
|||||||
public void onConfigValueSet()
|
public void onConfigValueSet()
|
||||||
{
|
{
|
||||||
// don't try modifying the config before it's been loaded from file
|
// don't try modifying the config before it's been loaded from file
|
||||||
if (!ConfigBase.INSTANCE.isLoaded)
|
if (!ConfigHandler.INSTANCE.isLoaded)
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -140,11 +140,11 @@ public abstract class AbstractPresetConfigEventHandler<TPresetEnum extends Enum<
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
LOGGER.info("changing preset to: " + newPresetEnum);
|
LOGGER.debug("changing preset to: [" + newPresetEnum + "].");
|
||||||
this.changingPreset = true;
|
this.changingPreset = true;
|
||||||
|
|
||||||
// update the controlled config values
|
// update the controlled config values
|
||||||
for (ConfigEntryWithPresetOptions<TPresetEnum, ?> configEntry : this.configList)
|
for (ConfigPresetOptions<TPresetEnum, ?> configEntry : this.configList)
|
||||||
{
|
{
|
||||||
configEntry.updateConfigEntry(newPresetEnum);
|
configEntry.updateConfigEntry(newPresetEnum);
|
||||||
}
|
}
|
||||||
@@ -152,7 +152,7 @@ public abstract class AbstractPresetConfigEventHandler<TPresetEnum extends Enum<
|
|||||||
this.setUiOnlyConfigValues();
|
this.setUiOnlyConfigValues();
|
||||||
|
|
||||||
this.changingPreset = false;
|
this.changingPreset = false;
|
||||||
LOGGER.info("preset active: " + newPresetEnum);
|
LOGGER.debug("preset active: [" + newPresetEnum + "].");
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -200,7 +200,7 @@ public abstract class AbstractPresetConfigEventHandler<TPresetEnum extends Enum<
|
|||||||
|
|
||||||
|
|
||||||
// remove any quick options that aren't possible with the currently selected options
|
// remove any quick options that aren't possible with the currently selected options
|
||||||
for (ConfigEntryWithPresetOptions<TPresetEnum, ?> configEntry : this.configList)
|
for (ConfigPresetOptions<TPresetEnum, ?> configEntry : this.configList)
|
||||||
{
|
{
|
||||||
HashSet<TPresetEnum> optionPresetSet = configEntry.getPossibleQualitiesFromCurrentOptionValue();
|
HashSet<TPresetEnum> optionPresetSet = configEntry.getPossibleQualitiesFromCurrentOptionValue();
|
||||||
possiblePresetSet.retainAll(optionPresetSet);
|
possiblePresetSet.retainAll(optionPresetSet);
|
||||||
@@ -230,7 +230,7 @@ public abstract class AbstractPresetConfigEventHandler<TPresetEnum extends Enum<
|
|||||||
// abstract methods //
|
// abstract methods //
|
||||||
//==================//
|
//==================//
|
||||||
|
|
||||||
protected abstract IConfigEntry<TPresetEnum> getPresetConfigEntry();
|
protected abstract AbstractConfigBase<TPresetEnum> getPresetConfigEntry();
|
||||||
|
|
||||||
protected abstract List<TPresetEnum> getPresetEnumList();
|
protected abstract List<TPresetEnum> getPresetEnumList();
|
||||||
protected abstract TPresetEnum getCustomPresetEnum();
|
protected abstract TPresetEnum getCustomPresetEnum();
|
||||||
|
|||||||
-63
@@ -1,63 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of the Distant Horizons mod
|
|
||||||
* licensed under the GNU LGPL v3 License.
|
|
||||||
*
|
|
||||||
* Copyright (C) 2020 James Seibel
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU Lesser General Public License as published by
|
|
||||||
* the Free Software Foundation, version 3.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU Lesser General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Lesser General Public License
|
|
||||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package com.seibel.distanthorizons.core.config.eventHandlers.presets;
|
|
||||||
|
|
||||||
import com.seibel.distanthorizons.api.enums.rendering.EDhApiRendererMode;
|
|
||||||
import com.seibel.distanthorizons.api.enums.worldGeneration.EDhApiDistantGeneratorProgressDisplayLocation;
|
|
||||||
import com.seibel.distanthorizons.core.config.Config;
|
|
||||||
import com.seibel.distanthorizons.core.config.listeners.ConfigChangeListener;
|
|
||||||
|
|
||||||
public class QuickShowWorldGenProgressConfigEventHandler
|
|
||||||
{
|
|
||||||
public static QuickShowWorldGenProgressConfigEventHandler INSTANCE = new QuickShowWorldGenProgressConfigEventHandler();
|
|
||||||
|
|
||||||
private final ConfigChangeListener<Boolean> quickChangeListener;
|
|
||||||
private final ConfigChangeListener<EDhApiDistantGeneratorProgressDisplayLocation> fullChangeListener;
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/** private since we only ever need one handler at a time */
|
|
||||||
private QuickShowWorldGenProgressConfigEventHandler()
|
|
||||||
{
|
|
||||||
this.quickChangeListener = new ConfigChangeListener<>(Config.Client.quickShowWorldGenProgress,
|
|
||||||
(val) ->
|
|
||||||
{
|
|
||||||
Config.Common.WorldGenerator.showGenerationProgress.set(Config.Client.quickShowWorldGenProgress.get()
|
|
||||||
? Config.Common.WorldGenerator.showGenerationProgress.getDefaultValue()
|
|
||||||
: EDhApiDistantGeneratorProgressDisplayLocation.DISABLED);
|
|
||||||
});
|
|
||||||
this.fullChangeListener = new ConfigChangeListener<>(Config.Common.WorldGenerator.showGenerationProgress,
|
|
||||||
(val) ->
|
|
||||||
{
|
|
||||||
Config.Client.quickShowWorldGenProgress.set(Config.Common.WorldGenerator.showGenerationProgress.get() != EDhApiDistantGeneratorProgressDisplayLocation.DISABLED);
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Set the UI only config based on what is set in the file. <br>
|
|
||||||
* This should only be called once.
|
|
||||||
*/
|
|
||||||
public void setUiOnlyConfigValues()
|
|
||||||
{
|
|
||||||
boolean showProgress = Config.Common.WorldGenerator.showGenerationProgress.get() != EDhApiDistantGeneratorProgressDisplayLocation.DISABLED;
|
|
||||||
Config.Client.quickShowWorldGenProgress.set(showProgress);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
+26
-16
@@ -26,11 +26,11 @@ import com.seibel.distanthorizons.api.enums.config.EDhApiVerticalQuality;
|
|||||||
import com.seibel.distanthorizons.api.enums.config.quickOptions.EDhApiQualityPreset;
|
import com.seibel.distanthorizons.api.enums.config.quickOptions.EDhApiQualityPreset;
|
||||||
import com.seibel.distanthorizons.api.enums.rendering.EDhApiTransparency;
|
import com.seibel.distanthorizons.api.enums.rendering.EDhApiTransparency;
|
||||||
import com.seibel.distanthorizons.core.config.Config;
|
import com.seibel.distanthorizons.core.config.Config;
|
||||||
import com.seibel.distanthorizons.core.config.ConfigEntryWithPresetOptions;
|
import com.seibel.distanthorizons.core.config.ConfigPresetOptions;
|
||||||
import com.seibel.distanthorizons.core.config.listeners.ConfigChangeListener;
|
import com.seibel.distanthorizons.core.config.listeners.ConfigChangeListener;
|
||||||
import com.seibel.distanthorizons.coreapi.interfaces.config.IConfigEntry;
|
import com.seibel.distanthorizons.core.config.types.AbstractConfigBase;
|
||||||
import org.apache.logging.log4j.LogManager;
|
import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
|
||||||
import org.apache.logging.log4j.Logger;
|
import com.seibel.distanthorizons.core.logging.DhLogger;
|
||||||
|
|
||||||
import java.util.*;
|
import java.util.*;
|
||||||
|
|
||||||
@@ -39,10 +39,10 @@ public class RenderQualityPresetConfigEventHandler extends AbstractPresetConfigE
|
|||||||
{
|
{
|
||||||
public static final RenderQualityPresetConfigEventHandler INSTANCE = new RenderQualityPresetConfigEventHandler();
|
public static final RenderQualityPresetConfigEventHandler INSTANCE = new RenderQualityPresetConfigEventHandler();
|
||||||
|
|
||||||
private static final Logger LOGGER = LogManager.getLogger();
|
private static final DhLogger LOGGER = new DhLoggerBuilder().build();
|
||||||
|
|
||||||
|
|
||||||
private final ConfigEntryWithPresetOptions<EDhApiQualityPreset, EDhApiMaxHorizontalResolution> drawResolution = new ConfigEntryWithPresetOptions<>(Config.Client.Advanced.Graphics.Quality.maxHorizontalResolution,
|
private final ConfigPresetOptions<EDhApiQualityPreset, EDhApiMaxHorizontalResolution> drawResolution = new ConfigPresetOptions<>(Config.Client.Advanced.Graphics.Quality.maxHorizontalResolution,
|
||||||
new HashMap<EDhApiQualityPreset, EDhApiMaxHorizontalResolution>()
|
new HashMap<EDhApiQualityPreset, EDhApiMaxHorizontalResolution>()
|
||||||
{{
|
{{
|
||||||
this.put(EDhApiQualityPreset.MINIMUM, EDhApiMaxHorizontalResolution.TWO_BLOCKS);
|
this.put(EDhApiQualityPreset.MINIMUM, EDhApiMaxHorizontalResolution.TWO_BLOCKS);
|
||||||
@@ -51,7 +51,7 @@ public class RenderQualityPresetConfigEventHandler extends AbstractPresetConfigE
|
|||||||
this.put(EDhApiQualityPreset.HIGH, EDhApiMaxHorizontalResolution.BLOCK);
|
this.put(EDhApiQualityPreset.HIGH, EDhApiMaxHorizontalResolution.BLOCK);
|
||||||
this.put(EDhApiQualityPreset.EXTREME, EDhApiMaxHorizontalResolution.BLOCK);
|
this.put(EDhApiQualityPreset.EXTREME, EDhApiMaxHorizontalResolution.BLOCK);
|
||||||
}});
|
}});
|
||||||
private final ConfigEntryWithPresetOptions<EDhApiQualityPreset, EDhApiVerticalQuality> verticalQuality = new ConfigEntryWithPresetOptions<>(Config.Client.Advanced.Graphics.Quality.verticalQuality,
|
private final ConfigPresetOptions<EDhApiQualityPreset, EDhApiVerticalQuality> verticalQuality = new ConfigPresetOptions<>(Config.Client.Advanced.Graphics.Quality.verticalQuality,
|
||||||
new HashMap<EDhApiQualityPreset, EDhApiVerticalQuality>()
|
new HashMap<EDhApiQualityPreset, EDhApiVerticalQuality>()
|
||||||
{{
|
{{
|
||||||
this.put(EDhApiQualityPreset.MINIMUM, EDhApiVerticalQuality.HEIGHT_MAP);
|
this.put(EDhApiQualityPreset.MINIMUM, EDhApiVerticalQuality.HEIGHT_MAP);
|
||||||
@@ -60,7 +60,7 @@ public class RenderQualityPresetConfigEventHandler extends AbstractPresetConfigE
|
|||||||
this.put(EDhApiQualityPreset.HIGH, EDhApiVerticalQuality.HIGH);
|
this.put(EDhApiQualityPreset.HIGH, EDhApiVerticalQuality.HIGH);
|
||||||
this.put(EDhApiQualityPreset.EXTREME, EDhApiVerticalQuality.EXTREME);
|
this.put(EDhApiQualityPreset.EXTREME, EDhApiVerticalQuality.EXTREME);
|
||||||
}});
|
}});
|
||||||
private final ConfigEntryWithPresetOptions<EDhApiQualityPreset, EDhApiHorizontalQuality> horizontalQuality = new ConfigEntryWithPresetOptions<>(Config.Client.Advanced.Graphics.Quality.horizontalQuality,
|
private final ConfigPresetOptions<EDhApiQualityPreset, EDhApiHorizontalQuality> horizontalQuality = new ConfigPresetOptions<>(Config.Client.Advanced.Graphics.Quality.horizontalQuality,
|
||||||
new HashMap<EDhApiQualityPreset, EDhApiHorizontalQuality>()
|
new HashMap<EDhApiQualityPreset, EDhApiHorizontalQuality>()
|
||||||
{{
|
{{
|
||||||
this.put(EDhApiQualityPreset.MINIMUM, EDhApiHorizontalQuality.LOWEST);
|
this.put(EDhApiQualityPreset.MINIMUM, EDhApiHorizontalQuality.LOWEST);
|
||||||
@@ -69,7 +69,7 @@ public class RenderQualityPresetConfigEventHandler extends AbstractPresetConfigE
|
|||||||
this.put(EDhApiQualityPreset.HIGH, EDhApiHorizontalQuality.HIGH);
|
this.put(EDhApiQualityPreset.HIGH, EDhApiHorizontalQuality.HIGH);
|
||||||
this.put(EDhApiQualityPreset.EXTREME, EDhApiHorizontalQuality.EXTREME);
|
this.put(EDhApiQualityPreset.EXTREME, EDhApiHorizontalQuality.EXTREME);
|
||||||
}});
|
}});
|
||||||
private final ConfigEntryWithPresetOptions<EDhApiQualityPreset, EDhApiTransparency> transparency = new ConfigEntryWithPresetOptions<>(Config.Client.Advanced.Graphics.Quality.transparency,
|
private final ConfigPresetOptions<EDhApiQualityPreset, EDhApiTransparency> transparency = new ConfigPresetOptions<>(Config.Client.Advanced.Graphics.Quality.transparency,
|
||||||
new HashMap<EDhApiQualityPreset, EDhApiTransparency>()
|
new HashMap<EDhApiQualityPreset, EDhApiTransparency>()
|
||||||
{{
|
{{
|
||||||
this.put(EDhApiQualityPreset.MINIMUM, EDhApiTransparency.DISABLED);
|
this.put(EDhApiQualityPreset.MINIMUM, EDhApiTransparency.DISABLED);
|
||||||
@@ -78,7 +78,7 @@ public class RenderQualityPresetConfigEventHandler extends AbstractPresetConfigE
|
|||||||
this.put(EDhApiQualityPreset.HIGH, EDhApiTransparency.COMPLETE);
|
this.put(EDhApiQualityPreset.HIGH, EDhApiTransparency.COMPLETE);
|
||||||
this.put(EDhApiQualityPreset.EXTREME, EDhApiTransparency.COMPLETE);
|
this.put(EDhApiQualityPreset.EXTREME, EDhApiTransparency.COMPLETE);
|
||||||
}});
|
}});
|
||||||
private final ConfigEntryWithPresetOptions<EDhApiQualityPreset, Boolean> ssaoEnabled = new ConfigEntryWithPresetOptions<>(Config.Client.Advanced.Graphics.Ssao.enableSsao,
|
private final ConfigPresetOptions<EDhApiQualityPreset, Boolean> ssaoEnabled = new ConfigPresetOptions<>(Config.Client.Advanced.Graphics.Ssao.enableSsao,
|
||||||
new HashMap<EDhApiQualityPreset, Boolean>()
|
new HashMap<EDhApiQualityPreset, Boolean>()
|
||||||
{{
|
{{
|
||||||
this.put(EDhApiQualityPreset.MINIMUM, false);
|
this.put(EDhApiQualityPreset.MINIMUM, false);
|
||||||
@@ -87,7 +87,7 @@ public class RenderQualityPresetConfigEventHandler extends AbstractPresetConfigE
|
|||||||
this.put(EDhApiQualityPreset.HIGH, true);
|
this.put(EDhApiQualityPreset.HIGH, true);
|
||||||
this.put(EDhApiQualityPreset.EXTREME, true);
|
this.put(EDhApiQualityPreset.EXTREME, true);
|
||||||
}});
|
}});
|
||||||
private final ConfigEntryWithPresetOptions<EDhApiQualityPreset, EDhApiMcRenderingFadeMode> vanillaFade = new ConfigEntryWithPresetOptions<>(Config.Client.Advanced.Graphics.Quality.vanillaFadeMode,
|
private final ConfigPresetOptions<EDhApiQualityPreset, EDhApiMcRenderingFadeMode> vanillaFade = new ConfigPresetOptions<>(Config.Client.Advanced.Graphics.Quality.vanillaFadeMode,
|
||||||
new HashMap<EDhApiQualityPreset, EDhApiMcRenderingFadeMode>()
|
new HashMap<EDhApiQualityPreset, EDhApiMcRenderingFadeMode>()
|
||||||
{{
|
{{
|
||||||
this.put(EDhApiQualityPreset.MINIMUM, EDhApiMcRenderingFadeMode.NONE);
|
this.put(EDhApiQualityPreset.MINIMUM, EDhApiMcRenderingFadeMode.NONE);
|
||||||
@@ -96,7 +96,16 @@ public class RenderQualityPresetConfigEventHandler extends AbstractPresetConfigE
|
|||||||
this.put(EDhApiQualityPreset.HIGH, EDhApiMcRenderingFadeMode.DOUBLE_PASS);
|
this.put(EDhApiQualityPreset.HIGH, EDhApiMcRenderingFadeMode.DOUBLE_PASS);
|
||||||
this.put(EDhApiQualityPreset.EXTREME, EDhApiMcRenderingFadeMode.DOUBLE_PASS);
|
this.put(EDhApiQualityPreset.EXTREME, EDhApiMcRenderingFadeMode.DOUBLE_PASS);
|
||||||
}});
|
}});
|
||||||
private final ConfigEntryWithPresetOptions<EDhApiQualityPreset, Boolean> dhDither = new ConfigEntryWithPresetOptions<>(Config.Client.Advanced.Graphics.Quality.ditherDhFade,
|
private final ConfigPresetOptions<EDhApiQualityPreset, Boolean> dhFadeFarClipPlane = new ConfigPresetOptions<>(Config.Client.Advanced.Graphics.Quality.dhFadeFarClipPlane,
|
||||||
|
new HashMap<EDhApiQualityPreset, Boolean>()
|
||||||
|
{{
|
||||||
|
this.put(EDhApiQualityPreset.MINIMUM, false);
|
||||||
|
this.put(EDhApiQualityPreset.LOW, false);
|
||||||
|
this.put(EDhApiQualityPreset.MEDIUM, true);
|
||||||
|
this.put(EDhApiQualityPreset.HIGH, true);
|
||||||
|
this.put(EDhApiQualityPreset.EXTREME, true);
|
||||||
|
}});
|
||||||
|
private final ConfigPresetOptions<EDhApiQualityPreset, Boolean> dhDither = new ConfigPresetOptions<>(Config.Client.Advanced.Graphics.Quality.ditherDhFade,
|
||||||
new HashMap<EDhApiQualityPreset, Boolean>()
|
new HashMap<EDhApiQualityPreset, Boolean>()
|
||||||
{{
|
{{
|
||||||
this.put(EDhApiQualityPreset.MINIMUM, false);
|
this.put(EDhApiQualityPreset.MINIMUM, false);
|
||||||
@@ -105,7 +114,7 @@ public class RenderQualityPresetConfigEventHandler extends AbstractPresetConfigE
|
|||||||
this.put(EDhApiQualityPreset.HIGH, true);
|
this.put(EDhApiQualityPreset.HIGH, true);
|
||||||
this.put(EDhApiQualityPreset.EXTREME, true);
|
this.put(EDhApiQualityPreset.EXTREME, true);
|
||||||
}});
|
}});
|
||||||
private final ConfigEntryWithPresetOptions<EDhApiQualityPreset, Boolean> caveCulling = new ConfigEntryWithPresetOptions<>(Config.Client.Advanced.Graphics.Culling.enableCaveCulling,
|
private final ConfigPresetOptions<EDhApiQualityPreset, Boolean> caveCulling = new ConfigPresetOptions<>(Config.Client.Advanced.Graphics.Culling.enableCaveCulling,
|
||||||
new HashMap<EDhApiQualityPreset, Boolean>()
|
new HashMap<EDhApiQualityPreset, Boolean>()
|
||||||
{{
|
{{
|
||||||
this.put(EDhApiQualityPreset.MINIMUM, true);
|
this.put(EDhApiQualityPreset.MINIMUM, true);
|
||||||
@@ -114,7 +123,7 @@ public class RenderQualityPresetConfigEventHandler extends AbstractPresetConfigE
|
|||||||
this.put(EDhApiQualityPreset.HIGH, false);
|
this.put(EDhApiQualityPreset.HIGH, false);
|
||||||
this.put(EDhApiQualityPreset.EXTREME, false);
|
this.put(EDhApiQualityPreset.EXTREME, false);
|
||||||
}});
|
}});
|
||||||
private final ConfigEntryWithPresetOptions<EDhApiQualityPreset, Integer> biomeBlending = new ConfigEntryWithPresetOptions<>(Config.Client.Advanced.Graphics.Quality.lodBiomeBlending,
|
private final ConfigPresetOptions<EDhApiQualityPreset, Integer> biomeBlending = new ConfigPresetOptions<>(Config.Client.Advanced.Graphics.Quality.lodBiomeBlending,
|
||||||
new HashMap<EDhApiQualityPreset, Integer>()
|
new HashMap<EDhApiQualityPreset, Integer>()
|
||||||
{{
|
{{
|
||||||
this.put(EDhApiQualityPreset.MINIMUM, 0);
|
this.put(EDhApiQualityPreset.MINIMUM, 0);
|
||||||
@@ -139,13 +148,14 @@ public class RenderQualityPresetConfigEventHandler extends AbstractPresetConfigE
|
|||||||
this.configList.add(this.horizontalQuality);
|
this.configList.add(this.horizontalQuality);
|
||||||
this.configList.add(this.transparency);
|
this.configList.add(this.transparency);
|
||||||
this.configList.add(this.ssaoEnabled);
|
this.configList.add(this.ssaoEnabled);
|
||||||
|
this.configList.add(this.dhFadeFarClipPlane);
|
||||||
this.configList.add(this.vanillaFade);
|
this.configList.add(this.vanillaFade);
|
||||||
this.configList.add(this.dhDither);
|
this.configList.add(this.dhDither);
|
||||||
this.configList.add(this.caveCulling);
|
this.configList.add(this.caveCulling);
|
||||||
this.configList.add(this.biomeBlending);
|
this.configList.add(this.biomeBlending);
|
||||||
|
|
||||||
|
|
||||||
for (ConfigEntryWithPresetOptions<EDhApiQualityPreset, ?> config : this.configList)
|
for (ConfigPresetOptions<EDhApiQualityPreset, ?> config : this.configList)
|
||||||
{
|
{
|
||||||
// ignore try-using, the listener should only ever be added once and should never be removed
|
// ignore try-using, the listener should only ever be added once and should never be removed
|
||||||
new ConfigChangeListener<>(config.configEntry, (val) -> { this.onConfigValueChanged(); });
|
new ConfigChangeListener<>(config.configEntry, (val) -> { this.onConfigValueChanged(); });
|
||||||
@@ -159,7 +169,7 @@ public class RenderQualityPresetConfigEventHandler extends AbstractPresetConfigE
|
|||||||
//==============//
|
//==============//
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected IConfigEntry<EDhApiQualityPreset> getPresetConfigEntry() { return Config.Client.qualityPresetSetting; }
|
protected AbstractConfigBase<EDhApiQualityPreset> getPresetConfigEntry() { return Config.Client.qualityPresetSetting; }
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected List<EDhApiQualityPreset> getPresetEnumList() { return Arrays.asList(EDhApiQualityPreset.values()); }
|
protected List<EDhApiQualityPreset> getPresetEnumList() { return Arrays.asList(EDhApiQualityPreset.values()); }
|
||||||
|
|||||||
+9
-8
@@ -22,11 +22,12 @@ package com.seibel.distanthorizons.core.config.eventHandlers.presets;
|
|||||||
import com.seibel.distanthorizons.api.enums.config.quickOptions.EDhApiThreadPreset;
|
import com.seibel.distanthorizons.api.enums.config.quickOptions.EDhApiThreadPreset;
|
||||||
import com.seibel.distanthorizons.core.config.listeners.ConfigChangeListener;
|
import com.seibel.distanthorizons.core.config.listeners.ConfigChangeListener;
|
||||||
import com.seibel.distanthorizons.core.config.Config;
|
import com.seibel.distanthorizons.core.config.Config;
|
||||||
import com.seibel.distanthorizons.core.config.ConfigEntryWithPresetOptions;
|
import com.seibel.distanthorizons.core.config.ConfigPresetOptions;
|
||||||
import com.seibel.distanthorizons.coreapi.interfaces.config.IConfigEntry;
|
import com.seibel.distanthorizons.core.config.types.AbstractConfigBase;
|
||||||
|
import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
|
||||||
import com.seibel.distanthorizons.coreapi.util.MathUtil;
|
import com.seibel.distanthorizons.coreapi.util.MathUtil;
|
||||||
import org.apache.logging.log4j.LogManager;
|
import org.apache.logging.log4j.LogManager;
|
||||||
import org.apache.logging.log4j.Logger;
|
import com.seibel.distanthorizons.core.logging.DhLogger;
|
||||||
|
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
@@ -37,11 +38,11 @@ public class ThreadPresetConfigEventHandler extends AbstractPresetConfigEventHan
|
|||||||
{
|
{
|
||||||
public static final ThreadPresetConfigEventHandler INSTANCE = new ThreadPresetConfigEventHandler();
|
public static final ThreadPresetConfigEventHandler INSTANCE = new ThreadPresetConfigEventHandler();
|
||||||
|
|
||||||
private static final Logger LOGGER = LogManager.getLogger();
|
private static final DhLogger LOGGER = new DhLoggerBuilder().build();
|
||||||
|
|
||||||
|
|
||||||
public static int getDefaultThreadCount() { return getThreadCountByPercent(0.5); }
|
public static int getDefaultThreadCount() { return getThreadCountByPercent(0.5); }
|
||||||
private final ConfigEntryWithPresetOptions<EDhApiThreadPreset, Integer> threadCount = new ConfigEntryWithPresetOptions<>(Config.Common.MultiThreading.numberOfThreads,
|
private final ConfigPresetOptions<EDhApiThreadPreset, Integer> threadCount = new ConfigPresetOptions<>(Config.Common.MultiThreading.numberOfThreads,
|
||||||
new HashMap<EDhApiThreadPreset, Integer>()
|
new HashMap<EDhApiThreadPreset, Integer>()
|
||||||
{{
|
{{
|
||||||
this.put(EDhApiThreadPreset.MINIMAL_IMPACT, getThreadCountByPercent(0.1));
|
this.put(EDhApiThreadPreset.MINIMAL_IMPACT, getThreadCountByPercent(0.1));
|
||||||
@@ -51,7 +52,7 @@ public class ThreadPresetConfigEventHandler extends AbstractPresetConfigEventHan
|
|||||||
this.put(EDhApiThreadPreset.I_PAID_FOR_THE_WHOLE_CPU, getThreadCountByPercent(1.0));
|
this.put(EDhApiThreadPreset.I_PAID_FOR_THE_WHOLE_CPU, getThreadCountByPercent(1.0));
|
||||||
}});
|
}});
|
||||||
public static double getDefaultRunTimeRatio() { return 1.0; }
|
public static double getDefaultRunTimeRatio() { return 1.0; }
|
||||||
private final ConfigEntryWithPresetOptions<EDhApiThreadPreset, Double> threadRunTime = new ConfigEntryWithPresetOptions<>(Config.Common.MultiThreading.threadRunTimeRatio,
|
private final ConfigPresetOptions<EDhApiThreadPreset, Double> threadRunTime = new ConfigPresetOptions<>(Config.Common.MultiThreading.threadRunTimeRatio,
|
||||||
new HashMap<EDhApiThreadPreset, Double>()
|
new HashMap<EDhApiThreadPreset, Double>()
|
||||||
{{
|
{{
|
||||||
this.put(EDhApiThreadPreset.MINIMAL_IMPACT, 0.5);
|
this.put(EDhApiThreadPreset.MINIMAL_IMPACT, 0.5);
|
||||||
@@ -74,7 +75,7 @@ public class ThreadPresetConfigEventHandler extends AbstractPresetConfigEventHan
|
|||||||
this.configList.add(this.threadCount);
|
this.configList.add(this.threadCount);
|
||||||
this.configList.add(this.threadRunTime);
|
this.configList.add(this.threadRunTime);
|
||||||
|
|
||||||
for (ConfigEntryWithPresetOptions<EDhApiThreadPreset, ?> config : this.configList)
|
for (ConfigPresetOptions<EDhApiThreadPreset, ?> config : this.configList)
|
||||||
{
|
{
|
||||||
// ignore try-using, the listeners should only ever be added once and should never be removed
|
// ignore try-using, the listeners should only ever be added once and should never be removed
|
||||||
new ConfigChangeListener<>(config.configEntry, (val) -> { this.onConfigValueChanged(); });
|
new ConfigChangeListener<>(config.configEntry, (val) -> { this.onConfigValueChanged(); });
|
||||||
@@ -119,7 +120,7 @@ public class ThreadPresetConfigEventHandler extends AbstractPresetConfigEventHan
|
|||||||
//==============//
|
//==============//
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected IConfigEntry<EDhApiThreadPreset> getPresetConfigEntry() { return Config.Client.threadPresetSetting; }
|
protected AbstractConfigBase<EDhApiThreadPreset> getPresetConfigEntry() { return Config.Client.threadPresetSetting; }
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected List<EDhApiThreadPreset> getPresetEnumList() { return Arrays.asList(EDhApiThreadPreset.values()); }
|
protected List<EDhApiThreadPreset> getPresetEnumList() { return Arrays.asList(EDhApiThreadPreset.values()); }
|
||||||
|
|||||||
+37
-38
@@ -20,17 +20,18 @@
|
|||||||
package com.seibel.distanthorizons.core.config.file;
|
package com.seibel.distanthorizons.core.config.file;
|
||||||
|
|
||||||
import com.electronwill.nightconfig.core.file.CommentedFileConfig;
|
import com.electronwill.nightconfig.core.file.CommentedFileConfig;
|
||||||
|
import com.seibel.distanthorizons.core.config.ConfigHandler;
|
||||||
import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
|
import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
|
||||||
import com.seibel.distanthorizons.core.config.ConfigBase;
|
import com.seibel.distanthorizons.core.config.types.AbstractConfigBase;
|
||||||
import com.seibel.distanthorizons.core.config.types.AbstractConfigType;
|
|
||||||
import com.seibel.distanthorizons.core.config.types.ConfigEntry;
|
import com.seibel.distanthorizons.core.config.types.ConfigEntry;
|
||||||
|
import com.seibel.distanthorizons.core.jar.EPlatform;
|
||||||
import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
|
import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
|
||||||
import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper;
|
import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper;
|
||||||
import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftSharedWrapper;
|
|
||||||
import com.seibel.distanthorizons.coreapi.ModInfo;
|
import com.seibel.distanthorizons.coreapi.ModInfo;
|
||||||
import org.apache.logging.log4j.LogManager;
|
import org.apache.logging.log4j.LogManager;
|
||||||
import org.apache.logging.log4j.Logger;
|
import com.seibel.distanthorizons.core.logging.DhLogger;
|
||||||
|
|
||||||
|
import java.io.File;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.nio.file.Files;
|
import java.nio.file.Files;
|
||||||
import java.nio.file.Path;
|
import java.nio.file.Path;
|
||||||
@@ -44,14 +45,11 @@ import java.util.concurrent.locks.ReentrantLock;
|
|||||||
*/
|
*/
|
||||||
public class ConfigFileHandler
|
public class ConfigFileHandler
|
||||||
{
|
{
|
||||||
private static final Logger LOGGER = DhLoggerBuilder.getLogger();
|
private static final DhLogger LOGGER = new DhLoggerBuilder().build();
|
||||||
|
|
||||||
|
|
||||||
public final ConfigBase configBase;
|
|
||||||
public final Path configPath;
|
public final Path configPath;
|
||||||
|
|
||||||
private final Logger logger;
|
|
||||||
|
|
||||||
/** This is the object for night-config */
|
/** This is the object for night-config */
|
||||||
private final CommentedFileConfig nightConfig;
|
private final CommentedFileConfig nightConfig;
|
||||||
|
|
||||||
@@ -64,10 +62,8 @@ public class ConfigFileHandler
|
|||||||
// constructor //
|
// constructor //
|
||||||
//=============//
|
//=============//
|
||||||
|
|
||||||
public ConfigFileHandler(ConfigBase configBase, Path configPath)
|
public ConfigFileHandler(Path configPath)
|
||||||
{
|
{
|
||||||
this.logger = LogManager.getLogger(this.getClass().getSimpleName() + ", " + ModInfo.ID);
|
|
||||||
this.configBase = configBase;
|
|
||||||
this.configPath = configPath;
|
this.configPath = configPath;
|
||||||
|
|
||||||
this.nightConfig = CommentedFileConfig
|
this.nightConfig = CommentedFileConfig
|
||||||
@@ -104,7 +100,7 @@ public class ConfigFileHandler
|
|||||||
this.loadNightConfig(nightConfig);
|
this.loadNightConfig(nightConfig);
|
||||||
|
|
||||||
|
|
||||||
for (AbstractConfigType<?, ?> entry : this.configBase.entries)
|
for (AbstractConfigBase<?> entry : ConfigHandler.INSTANCE.configBaseList)
|
||||||
{
|
{
|
||||||
if (ConfigEntry.class.isAssignableFrom(entry.getClass()))
|
if (ConfigEntry.class.isAssignableFrom(entry.getClass()))
|
||||||
{
|
{
|
||||||
@@ -142,7 +138,7 @@ public class ConfigFileHandler
|
|||||||
{
|
{
|
||||||
this.readWriteLock.lock();
|
this.readWriteLock.lock();
|
||||||
|
|
||||||
int currentCfgVersion = this.configBase.configVersion;
|
int currentCfgVersion = ModInfo.CONFIG_FILE_VERSION;
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
// Dont load the real `this.nightConfig`, instead create a tempoary one
|
// Dont load the real `this.nightConfig`, instead create a tempoary one
|
||||||
@@ -154,29 +150,29 @@ public class ConfigFileHandler
|
|||||||
}
|
}
|
||||||
catch (Exception ignored) { }
|
catch (Exception ignored) { }
|
||||||
|
|
||||||
if (currentCfgVersion == this.configBase.configVersion)
|
if (currentCfgVersion == ModInfo.CONFIG_FILE_VERSION)
|
||||||
{
|
{
|
||||||
// handle normally
|
// handle normally
|
||||||
}
|
}
|
||||||
else if (currentCfgVersion > this.configBase.configVersion)
|
else if (currentCfgVersion > ModInfo.CONFIG_FILE_VERSION)
|
||||||
{
|
{
|
||||||
this.logger.warn("Found config version [" + currentCfgVersion + "] which is newer than current mods config version of [" + this.configBase.configVersion + "]. You may have downgraded the mod and items may have been moved, you have been warned");
|
LOGGER.warn("Found config version [" + currentCfgVersion + "] which is newer than current mods config version of [" + ModInfo.CONFIG_FILE_VERSION + "]. You may have downgraded the mod and items may have been moved, you have been warned");
|
||||||
}
|
}
|
||||||
else // if (currentCfgVersion < configBase.configVersion)
|
else // if (currentCfgVersion < configBase.configVersion)
|
||||||
{
|
{
|
||||||
this.logger.warn(ModInfo.NAME + " config is of an older version, currently there is no config updater... so resetting config");
|
LOGGER.warn(ModInfo.NAME + " config is of an older version, currently there is no config updater... so resetting config");
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
Files.delete(this.configPath);
|
Files.delete(this.configPath);
|
||||||
}
|
}
|
||||||
catch (Exception e)
|
catch (Exception e)
|
||||||
{
|
{
|
||||||
this.logger.error(e);
|
LOGGER.error("Unable to delete outdated config file at: ["+this.configPath+"], error: ["+e.getMessage()+"].", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
this.loadFromFile(this.nightConfig);
|
this.loadFromFile(this.nightConfig);
|
||||||
this.nightConfig.set("_version", this.configBase.configVersion);
|
this.nightConfig.set("_version", ModInfo.CONFIG_FILE_VERSION);
|
||||||
}
|
}
|
||||||
finally
|
finally
|
||||||
{
|
{
|
||||||
@@ -202,7 +198,7 @@ public class ConfigFileHandler
|
|||||||
|
|
||||||
|
|
||||||
// Load all the entries
|
// Load all the entries
|
||||||
for (AbstractConfigType<?, ?> entry : this.configBase.entries)
|
for (AbstractConfigBase<?> entry : ConfigHandler.INSTANCE.configBaseList)
|
||||||
{
|
{
|
||||||
if (ConfigEntry.class.isAssignableFrom(entry.getClass())
|
if (ConfigEntry.class.isAssignableFrom(entry.getClass())
|
||||||
&& entry.getAppearance().showInFile)
|
&& entry.getAppearance().showInFile)
|
||||||
@@ -246,10 +242,10 @@ public class ConfigFileHandler
|
|||||||
else if (entry.getTrueValue() == null)
|
else if (entry.getTrueValue() == null)
|
||||||
{
|
{
|
||||||
// TODO when can this happen?
|
// TODO when can this happen?
|
||||||
throw new IllegalArgumentException("Entry [" + entry.getNameWCategory() + "] is null, this may be a problem with [" + ModInfo.NAME + "]. Please contact the authors.");
|
throw new IllegalArgumentException("BlockBiomeWrapperPair [" + entry.getNameAndCategory() + "] is null, this may be a problem with [" + ModInfo.NAME + "]. Please contact the authors.");
|
||||||
}
|
}
|
||||||
|
|
||||||
workConfig.set(entry.getNameWCategory(), ConfigTypeConverters.attemptToConvertToString(entry.getType(), entry.getTrueValue()));
|
workConfig.set(entry.getNameAndCategory(), ConfigTypeConverters.attemptToConvertToString(entry.getType(), entry.getTrueValue()));
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Loads an entry when only given the entry */
|
/** Loads an entry when only given the entry */
|
||||||
@@ -259,9 +255,11 @@ public class ConfigFileHandler
|
|||||||
public <T> void loadEntry(ConfigEntry<T> entry, CommentedFileConfig nightConfig)
|
public <T> void loadEntry(ConfigEntry<T> entry, CommentedFileConfig nightConfig)
|
||||||
{
|
{
|
||||||
if (!entry.getAppearance().showInFile)
|
if (!entry.getAppearance().showInFile)
|
||||||
|
{
|
||||||
return;
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
if (!nightConfig.contains(entry.getNameWCategory()))
|
if (!nightConfig.contains(entry.getNameAndCategory()))
|
||||||
{
|
{
|
||||||
this.saveEntry(entry, nightConfig);
|
this.saveEntry(entry, nightConfig);
|
||||||
return;
|
return;
|
||||||
@@ -272,34 +270,33 @@ public class ConfigFileHandler
|
|||||||
{
|
{
|
||||||
if (entry.getType().isEnum())
|
if (entry.getType().isEnum())
|
||||||
{
|
{
|
||||||
entry.pureSet((T) (nightConfig.getEnum(entry.getNameWCategory(), (Class<? extends Enum>) entry.getType())));
|
entry.setWithoutFiringEvents((T) (nightConfig.getEnum(entry.getNameAndCategory(), (Class<? extends Enum>) entry.getType())));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// try converting the value if necessary
|
// try converting the value if necessary
|
||||||
Class<?> expectedValueClass = entry.getType();
|
Class<?> expectedValueClass = entry.getType();
|
||||||
Object value = nightConfig.get(entry.getNameWCategory());
|
Object value = nightConfig.get(entry.getNameAndCategory());
|
||||||
Object convertedValue = ConfigTypeConverters.attemptToConvertFromString(expectedValueClass, value);
|
Object convertedValue = ConfigTypeConverters.attemptToConvertFromString(expectedValueClass, value);
|
||||||
if (!convertedValue.getClass().equals(expectedValueClass))
|
if (!convertedValue.getClass().equals(expectedValueClass))
|
||||||
{
|
{
|
||||||
this.logger.error("Unable to convert config value ["+value+"] from ["+(value != null ? value.getClass() : "NULL")+"] to ["+expectedValueClass+"] for config ["+entry.name+"], " +
|
LOGGER.error("Unable to convert config value ["+value+"] from ["+(value != null ? value.getClass() : "NULL")+"] to ["+expectedValueClass+"] for config ["+entry.name+"], " +
|
||||||
"the default config value will be used instead ["+entry.getDefaultValue()+"]. " +
|
"the default config value will be used instead ["+entry.getDefaultValue()+"]. " +
|
||||||
"Make sure a converter is defined in ["+ConfigTypeConverters.class.getSimpleName()+"].");
|
"Make sure a converter is defined in ["+ConfigTypeConverters.class.getSimpleName()+"].");
|
||||||
convertedValue = entry.getDefaultValue();
|
convertedValue = entry.getDefaultValue();
|
||||||
}
|
}
|
||||||
entry.pureSet((T) convertedValue);
|
entry.setWithoutFiringEvents((T) convertedValue);
|
||||||
|
|
||||||
if (entry.getTrueValue() == null)
|
if (entry.getTrueValue() == null)
|
||||||
{
|
{
|
||||||
this.logger.warn("Entry [" + entry.getNameWCategory() + "] returned as null from the config. Using default value.");
|
LOGGER.warn("BlockBiomeWrapperPair [" + entry.getNameAndCategory() + "] returned as null from the config. Using default value.");
|
||||||
entry.pureSet(entry.getDefaultValue());
|
entry.setWithoutFiringEvents(entry.getDefaultValue());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
catch (Exception e)
|
catch (Exception e)
|
||||||
{
|
{
|
||||||
// e.printStackTrace();
|
LOGGER.warn("BlockBiomeWrapperPair [" + entry.getNameAndCategory() + "] had an invalid value when loading the config. Using default value.");
|
||||||
this.logger.warn("Entry [" + entry.getNameWCategory() + "] had an invalid value when loading the config. Using default value.");
|
entry.setWithoutFiringEvents(entry.getDefaultValue());
|
||||||
entry.pureSet(entry.getDefaultValue());
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -320,7 +317,7 @@ public class ConfigFileHandler
|
|||||||
// the new line makes it easier to read and separate configs
|
// the new line makes it easier to read and separate configs
|
||||||
// the space makes sure the first word of a comment isn't directly in line with the "#"
|
// the space makes sure the first word of a comment isn't directly in line with the "#"
|
||||||
comment = "\n " + comment;
|
comment = "\n " + comment;
|
||||||
nightConfig.setComment(entry.getNameWCategory(), comment);
|
nightConfig.setComment(entry.getNameAndCategory(), comment);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -352,18 +349,20 @@ public class ConfigFileHandler
|
|||||||
}
|
}
|
||||||
catch (Exception e)
|
catch (Exception e)
|
||||||
{
|
{
|
||||||
this.logger.warn("Loading file failed because of this expectation:\n" + e);
|
LOGGER.warn("Loading file failed because of this expectation:\n" + e);
|
||||||
|
|
||||||
reCreateFile(this.configPath);
|
reCreateFile(this.configPath);
|
||||||
|
|
||||||
nightConfig.load();
|
nightConfig.load();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception e)
|
||||||
{
|
{
|
||||||
System.out.println("Creating file failed");
|
LOGGER.error("File creation failed at ["+this.configPath+"], error: ["+e.getMessage()+"].", e);
|
||||||
this.logger.error(ex);
|
|
||||||
SingletonInjector.INSTANCE.get(IMinecraftClientWrapper.class).crashMinecraft("Loading file and resetting config file failed at path [" + this.configPath + "]. Please check the file is ok and you have the permissions", ex);
|
// TODO is there a reason this is lazily gotten?
|
||||||
|
IMinecraftClientWrapper mc = SingletonInjector.INSTANCE.get(IMinecraftClientWrapper.class);
|
||||||
|
mc.crashMinecraft("Loading file and resetting config file failed at path [" + this.configPath + "]. Please check the file is ok and you have the permissions", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+2
-2
@@ -23,7 +23,7 @@ import com.electronwill.nightconfig.core.Config;
|
|||||||
import com.electronwill.nightconfig.core.io.ParsingMode;
|
import com.electronwill.nightconfig.core.io.ParsingMode;
|
||||||
import com.electronwill.nightconfig.json.JsonFormat;
|
import com.electronwill.nightconfig.json.JsonFormat;
|
||||||
import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
|
import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
|
||||||
import org.apache.logging.log4j.Logger;
|
import com.seibel.distanthorizons.core.logging.DhLogger;
|
||||||
|
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
@@ -36,7 +36,7 @@ import java.util.Map;
|
|||||||
*/
|
*/
|
||||||
public class ConfigTypeConverters
|
public class ConfigTypeConverters
|
||||||
{
|
{
|
||||||
private static final Logger LOGGER = DhLoggerBuilder.getLogger();
|
private static final DhLogger LOGGER = new DhLoggerBuilder().build();
|
||||||
|
|
||||||
// Once you've made a converter add it to here where the first value is the type you want to convert and the 2nd value is the converter
|
// Once you've made a converter add it to here where the first value is the type you want to convert and the 2nd value is the converter
|
||||||
public static final Map<Class<?>, ConverterBase> convertObjects = new HashMap<Class<?>, ConverterBase>()
|
public static final Map<Class<?>, ConverterBase> convertObjects = new HashMap<Class<?>, ConverterBase>()
|
||||||
|
|||||||
@@ -0,0 +1,10 @@
|
|||||||
|
package com.seibel.distanthorizons.core.config.gui;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Points to a Common object that holds the GUI state.
|
||||||
|
* Having this interface allows for cleaner casting.
|
||||||
|
*/
|
||||||
|
public interface IConfigGuiInfo
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
+10
-8
@@ -19,25 +19,27 @@
|
|||||||
|
|
||||||
package com.seibel.distanthorizons.core.config.types;
|
package com.seibel.distanthorizons.core.config.types;
|
||||||
|
|
||||||
import com.seibel.distanthorizons.core.config.ConfigBase;
|
import com.seibel.distanthorizons.core.config.gui.IConfigGuiInfo;
|
||||||
import com.seibel.distanthorizons.core.config.types.enums.EConfigEntryAppearance;
|
import com.seibel.distanthorizons.core.config.types.enums.EConfigEntryAppearance;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The class where all config options should extend
|
* The class all config options should extend
|
||||||
*
|
*
|
||||||
* @author coolGi
|
* @author coolGi
|
||||||
*/
|
*/
|
||||||
// Note for devs: The "S" is the class that is extending this
|
public abstract class AbstractConfigBase<T>
|
||||||
public abstract class AbstractConfigType<T, S>
|
|
||||||
{
|
{
|
||||||
public String category = ""; // This should only be set once in the init
|
public String category = ""; // This should only be set once in the init
|
||||||
public String name; // This should only be set once in the init
|
public String name; // This should only be set once in the init
|
||||||
protected final T defaultValue;
|
protected final T defaultValue;
|
||||||
protected final boolean isFloatingPointNumber;
|
protected final boolean isFloatingPointNumber;
|
||||||
protected T value;
|
protected T value;
|
||||||
public ConfigBase configBase;
|
|
||||||
|
|
||||||
public Object guiValue; // This is a storage variable something like the gui can use
|
/**
|
||||||
|
* This stores information related to the GUI state.
|
||||||
|
* This is set during config UI setup.
|
||||||
|
*/
|
||||||
|
public IConfigGuiInfo guiValue;
|
||||||
|
|
||||||
protected EConfigEntryAppearance appearance;
|
protected EConfigEntryAppearance appearance;
|
||||||
|
|
||||||
@@ -47,7 +49,7 @@ public abstract class AbstractConfigType<T, S>
|
|||||||
// constructor //
|
// constructor //
|
||||||
//=============//
|
//=============//
|
||||||
|
|
||||||
protected AbstractConfigType(EConfigEntryAppearance appearance, T defaultValue)
|
protected AbstractConfigBase(EConfigEntryAppearance appearance, T defaultValue)
|
||||||
{
|
{
|
||||||
this.defaultValue = defaultValue;
|
this.defaultValue = defaultValue;
|
||||||
this.value = defaultValue;
|
this.value = defaultValue;
|
||||||
@@ -74,7 +76,7 @@ public abstract class AbstractConfigType<T, S>
|
|||||||
|
|
||||||
public String getCategory() { return this.category; }
|
public String getCategory() { return this.category; }
|
||||||
public String getName() { return this.name; }
|
public String getName() { return this.name; }
|
||||||
public String getNameWCategory() { return (this.category.isEmpty() ? "" : this.category + ".") + this.name; }
|
public String getNameAndCategory() { return (this.category.isEmpty() ? "" : this.category + ".") + this.name; }
|
||||||
|
|
||||||
|
|
||||||
/** Gets the class of T */
|
/** Gets the class of T */
|
||||||
+27
-12
@@ -27,10 +27,19 @@ import com.seibel.distanthorizons.core.config.types.enums.EConfigEntryAppearance
|
|||||||
*
|
*
|
||||||
* @author coolGi
|
* @author coolGi
|
||||||
*/
|
*/
|
||||||
public class ConfigCategory extends AbstractConfigType<Class<?>, ConfigCategory>
|
public class ConfigCategory extends AbstractConfigBase<Class<?>>
|
||||||
{
|
{
|
||||||
/** This should not be set by anything other than the config system itself */
|
/**
|
||||||
public String destination; // Where the category goes to
|
* Defines where this category points to. <br>
|
||||||
|
* May be defined during config setup.
|
||||||
|
*/
|
||||||
|
public String destination;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
//=============//
|
||||||
|
// constructor //
|
||||||
|
//=============//
|
||||||
|
|
||||||
private ConfigCategory(EConfigEntryAppearance appearance, Class<?> value, String destination)
|
private ConfigCategory(EConfigEntryAppearance appearance, Class<?> value, String destination)
|
||||||
{
|
{
|
||||||
@@ -38,20 +47,26 @@ public class ConfigCategory extends AbstractConfigType<Class<?>, ConfigCategory>
|
|||||||
this.destination = destination;
|
this.destination = destination;
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getDestination()
|
|
||||||
{
|
|
||||||
return this.destination;
|
//==================//
|
||||||
}
|
// property getters //
|
||||||
|
//==================//
|
||||||
|
|
||||||
|
public String getDestination() { return this.destination; }
|
||||||
|
|
||||||
/** Use get() instead for category */
|
/** Use get() instead for category */
|
||||||
@Override
|
@Override
|
||||||
@Deprecated
|
@Deprecated
|
||||||
public Class<?> getType()
|
public Class<?> getType() { return this.value; }
|
||||||
{
|
|
||||||
return value;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static class Builder extends AbstractConfigType.Builder<Class<?>, Builder>
|
|
||||||
|
|
||||||
|
//=========//
|
||||||
|
// builder //
|
||||||
|
//=========//
|
||||||
|
|
||||||
|
public static class Builder extends AbstractConfigBase.Builder<Class<?>, Builder>
|
||||||
{
|
{
|
||||||
private String tmpDestination = null;
|
private String tmpDestination = null;
|
||||||
|
|
||||||
|
|||||||
+138
-168
@@ -20,13 +20,13 @@
|
|||||||
package com.seibel.distanthorizons.core.config.types;
|
package com.seibel.distanthorizons.core.config.types;
|
||||||
|
|
||||||
|
|
||||||
import com.seibel.distanthorizons.core.config.NumberUtil;
|
import com.seibel.distanthorizons.core.config.ConfigHandler;
|
||||||
|
import com.seibel.distanthorizons.core.util.NumberUtil;
|
||||||
import com.seibel.distanthorizons.core.config.file.ConfigFileHandler;
|
import com.seibel.distanthorizons.core.config.file.ConfigFileHandler;
|
||||||
import com.seibel.distanthorizons.core.config.listeners.ConfigChangeListener;
|
import com.seibel.distanthorizons.core.config.listeners.ConfigChangeListener;
|
||||||
import com.seibel.distanthorizons.core.config.listeners.IConfigListener;
|
import com.seibel.distanthorizons.core.config.listeners.IConfigListener;
|
||||||
import com.seibel.distanthorizons.core.config.types.enums.EConfigEntryAppearance;
|
import com.seibel.distanthorizons.core.config.types.enums.EConfigEntryAppearance;
|
||||||
import com.seibel.distanthorizons.core.config.types.enums.EConfigEntryPerformance;
|
import com.seibel.distanthorizons.core.config.types.enums.EConfigValidity;
|
||||||
import com.seibel.distanthorizons.coreapi.interfaces.config.IConfigEntry;
|
|
||||||
import org.jetbrains.annotations.Nullable;
|
import org.jetbrains.annotations.Nullable;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
@@ -34,40 +34,38 @@ import java.util.Arrays;
|
|||||||
import java.util.function.Consumer;
|
import java.util.function.Consumer;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Use for making the config variables
|
* This config type allows for entering text, number, or enum values.
|
||||||
* for types that are not supported by it look in ConfigBase
|
|
||||||
*
|
*
|
||||||
* @author coolGi
|
* @author coolGi
|
||||||
* @version 2023-7-16
|
|
||||||
*/
|
*/
|
||||||
public class ConfigEntry<T> extends AbstractConfigType<T, ConfigEntry<T>> implements IConfigEntry<T>
|
public class ConfigEntry<T> extends AbstractConfigBase<T>
|
||||||
{
|
{
|
||||||
private String comment;
|
private final String comment;
|
||||||
private T min;
|
private T min;
|
||||||
private T max;
|
private T max;
|
||||||
private final ArrayList<IConfigListener> listenerList;
|
private final ArrayList<IConfigListener> listenerList;
|
||||||
private final String chatCommandName;
|
private final String chatCommandName;
|
||||||
|
|
||||||
private final EConfigEntryPerformance performance;
|
|
||||||
|
|
||||||
// API control //
|
|
||||||
/**
|
/**
|
||||||
* If true this config can be controlled by the API <br>
|
* If true this config can be controlled by the API <br>
|
||||||
* and any get() method calls will return the apiValue if it is set.
|
* and any get() method calls will return the apiValue if it is set.
|
||||||
*/
|
*/
|
||||||
public final boolean allowApiOverride;
|
private final boolean allowApiOverride;
|
||||||
/** Will be null if un-set */
|
/** Will be null if un-set */
|
||||||
@Nullable
|
@Nullable
|
||||||
private T apiValue;
|
private T apiValue;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/** Creates the entry */
|
//=============//
|
||||||
|
// constructor //
|
||||||
|
//=============//
|
||||||
|
|
||||||
private ConfigEntry(
|
private ConfigEntry(
|
||||||
EConfigEntryAppearance appearance,
|
EConfigEntryAppearance appearance,
|
||||||
T value, String comment, T min, T max,
|
String comment, String chatCommandName,
|
||||||
String chatCommandName, boolean allowApiOverride,
|
T value, T min, T max,
|
||||||
EConfigEntryPerformance performance,
|
boolean allowApiOverride,
|
||||||
ArrayList<IConfigListener> listenerList)
|
ArrayList<IConfigListener> listenerList)
|
||||||
{
|
{
|
||||||
super(appearance, value);
|
super(appearance, value);
|
||||||
@@ -77,40 +75,57 @@ public class ConfigEntry<T> extends AbstractConfigType<T, ConfigEntry<T>> implem
|
|||||||
this.max = max;
|
this.max = max;
|
||||||
this.chatCommandName = chatCommandName;
|
this.chatCommandName = chatCommandName;
|
||||||
this.allowApiOverride = allowApiOverride;
|
this.allowApiOverride = allowApiOverride;
|
||||||
this.performance = performance;
|
|
||||||
this.listenerList = listenerList;
|
this.listenerList = listenerList;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/** Gets the default value of the option */
|
//==========================//
|
||||||
@Override
|
// property getters/setters //
|
||||||
public T getDefaultValue() { return super.defaultValue; }
|
//==========================//
|
||||||
|
|
||||||
|
/** the string used when entering the config into the command line or chat */
|
||||||
|
public String getChatCommandName() { return this.chatCommandName; }
|
||||||
|
|
||||||
|
public String getComment() { return this.comment; }
|
||||||
|
|
||||||
|
/**
|
||||||
|
* If true this config can be controlled by the API <br>
|
||||||
|
* and any get() method calls will return the apiValue if it is set.
|
||||||
|
*/
|
||||||
|
public boolean getAllowApiOverride() { return this.allowApiOverride; }
|
||||||
|
|
||||||
|
public T getMin() { return this.min; }
|
||||||
|
public void setMin(T newMin) { this.min = newMin; }
|
||||||
|
public T getMax() { return this.max; }
|
||||||
|
public void setMax(T newMax) { this.max = newMax; }
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
//===============//
|
||||||
|
// value setters //
|
||||||
|
//===============//
|
||||||
|
|
||||||
@Override
|
|
||||||
public void setApiValue(T newApiValue)
|
public void setApiValue(T newApiValue)
|
||||||
{
|
{
|
||||||
this.apiValue = newApiValue;
|
this.apiValue = newApiValue;
|
||||||
this.listenerList.forEach(IConfigListener::onConfigValueSet);
|
this.listenerList.forEach(IConfigListener::onConfigValueSet);
|
||||||
}
|
}
|
||||||
@Override
|
|
||||||
public T getApiValue() { return this.apiValue; }
|
|
||||||
@Override
|
|
||||||
public boolean apiIsOverriding() { return this.allowApiOverride && this.apiValue != null; }
|
|
||||||
@Override
|
|
||||||
public boolean getAllowApiOverride() { return this.allowApiOverride; }
|
|
||||||
|
|
||||||
/**
|
public boolean apiIsOverriding()
|
||||||
* DONT USE THIS IN YOUR CODE <br>
|
{
|
||||||
* Sets the value without informing the rest of the code (ie, doesnt call listeners, or saves the value). <br>
|
return this.allowApiOverride
|
||||||
* Should only be used when loading the config from the file (in places like the {@link ConfigFileHandler} or {@link com.seibel.distanthorizons.core.config.ConfigBase})
|
&& this.apiValue != null;
|
||||||
*/
|
|
||||||
public void pureSet(T newValue) {
|
|
||||||
super.set(newValue);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Should only be used when loading the config from file. <Br>
|
||||||
|
* Sets the value without informing the rest of the code (ie, it doesn't call listeners, or saving the value to file).
|
||||||
|
* @see ConfigFileHandler
|
||||||
|
*/
|
||||||
|
public void setWithoutFiringEvents(T newValue) { super.set(newValue); }
|
||||||
|
|
||||||
/** Sets the value without saving */
|
/** Sets the value without saving */
|
||||||
@Override
|
|
||||||
public void setWithoutSaving(T newValue)
|
public void setWithoutSaving(T newValue)
|
||||||
{
|
{
|
||||||
super.set(newValue);
|
super.set(newValue);
|
||||||
@@ -135,74 +150,35 @@ public class ConfigEntry<T> extends AbstractConfigType<T, ConfigEntry<T>> implem
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
//===============//
|
||||||
|
// value getters //
|
||||||
|
//===============//
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public T get()
|
public T get()
|
||||||
{
|
{
|
||||||
if (this.allowApiOverride && this.apiValue != null)
|
if (this.allowApiOverride
|
||||||
|
&& this.apiValue != null)
|
||||||
{
|
{
|
||||||
return this.apiValue;
|
return this.apiValue;
|
||||||
}
|
}
|
||||||
|
|
||||||
return super.get();
|
return super.get();
|
||||||
}
|
}
|
||||||
@Override
|
/** Ignores the API value if set. */
|
||||||
public T getTrueValue()
|
public T getTrueValue() { return super.get(); }
|
||||||
{
|
|
||||||
return super.get();
|
public T getDefaultValue() { return super.defaultValue; }
|
||||||
}
|
|
||||||
|
@Nullable
|
||||||
|
public T getApiValue() { return this.apiValue; }
|
||||||
|
|
||||||
|
|
||||||
/** Gets the min value */
|
|
||||||
@Override
|
|
||||||
public T getMin() { return this.min; }
|
|
||||||
/** Sets the min value */
|
|
||||||
@Override
|
|
||||||
public void setMin(T newMin) { this.min = newMin; }
|
|
||||||
/** Gets the max value */
|
|
||||||
@Override
|
|
||||||
public T getMax() { return this.max; }
|
|
||||||
/** Sets the max value */
|
|
||||||
@Override
|
|
||||||
public void setMax(T newMax) { this.max = newMax; }
|
|
||||||
/** Sets the min and max within a single setter */
|
|
||||||
@Override
|
|
||||||
public void setMinMax(T newMin, T newMax)
|
|
||||||
{
|
|
||||||
this.setMin(newMin);
|
|
||||||
this.setMax(newMax);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
//===========//
|
||||||
* Clamps the value within the set range
|
// listeners //
|
||||||
*
|
//===========//
|
||||||
* @apiNote This does not save the value
|
|
||||||
*/
|
|
||||||
public void clampWithinRange() { this.clampWithinRange(this.min, this.max); }
|
|
||||||
/**
|
|
||||||
* Clamps the value within a set range
|
|
||||||
*
|
|
||||||
* @param min The minimum that the value can be
|
|
||||||
* @param max The maximum that the value can be
|
|
||||||
* @apiNote This does not save the value
|
|
||||||
*/
|
|
||||||
@SuppressWarnings("unchecked") // Suppress due to its always safe
|
|
||||||
public void clampWithinRange(T min, T max)
|
|
||||||
{
|
|
||||||
byte validness = this.isValid(min, max);
|
|
||||||
if (validness == -1) this.value = (T) NumberUtil.getMinimum(this.value.getClass());
|
|
||||||
if (validness == 1) this.value = (T) NumberUtil.getMaximum(this.value.getClass());
|
|
||||||
}
|
|
||||||
|
|
||||||
// TODO is this for command line use?
|
|
||||||
public String getChatCommandName() { return this.chatCommandName; }
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String getComment() { return this.comment; }
|
|
||||||
@Override
|
|
||||||
public void setComment(String newComment) { this.comment = newComment; }
|
|
||||||
|
|
||||||
/** Gets the performance impact of an option */
|
|
||||||
public EConfigEntryPerformance getPerformance() { return this.performance; }
|
|
||||||
|
|
||||||
/** Fired whenever the config value changes to a new value. */
|
/** Fired whenever the config value changes to a new value. */
|
||||||
public void addValueChangeListener(Consumer<T> onValueChangeFunc)
|
public void addValueChangeListener(Consumer<T> onValueChangeFunc)
|
||||||
@@ -227,116 +203,114 @@ public class ConfigEntry<T> extends AbstractConfigType<T, ConfigEntry<T>> implem
|
|||||||
public void setListeners(IConfigListener... newListeners) { this.listenerList.addAll(Arrays.asList(newListeners)); }
|
public void setListeners(IConfigListener... newListeners) { this.listenerList.addAll(Arrays.asList(newListeners)); }
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Checks if the option is valid
|
//====================//
|
||||||
*
|
// min/max validation //
|
||||||
* @return 0 == valid
|
//====================//
|
||||||
* <p> 2 == invalid
|
|
||||||
* <p> 1 == number too high
|
/** Checks if this config's current value is valid */
|
||||||
* <p> -1 == number too low
|
public EConfigValidity getValidity() { return this.getValidity(this.value, this.min, this.max); }
|
||||||
*/
|
/** Checks if the given value is valid */
|
||||||
@Override
|
public EConfigValidity getValidity(@Nullable T value) { return this.getValidity(value, this.min, this.max); }
|
||||||
public byte isValid() { return isValid(this.value, this.min, this.max); }
|
/** Checks if the given value is valid */
|
||||||
/**
|
public EConfigValidity getValidity(@Nullable T value, @Nullable T min, @Nullable T max)
|
||||||
* Checks if a new value is valid
|
|
||||||
*
|
|
||||||
* @param value Value that is being checked whether valid
|
|
||||||
* @return 0 == valid
|
|
||||||
* <p> 2 == invalid
|
|
||||||
* <p> 1 == number too high
|
|
||||||
* <p> -1 == number too low
|
|
||||||
*/
|
|
||||||
@Override
|
|
||||||
public byte isValid(T value) { return this.isValid(value, this.min, this.max); }
|
|
||||||
/**
|
|
||||||
* Checks if a new value is valid
|
|
||||||
*
|
|
||||||
* @param min The minimum that the value can be
|
|
||||||
* @param max The maximum that the value can be
|
|
||||||
* @return 0 == valid
|
|
||||||
* <p> 2 == invalid
|
|
||||||
* <p> 1 == number too high
|
|
||||||
* <p> -1 == number too low
|
|
||||||
*/
|
|
||||||
public byte isValid(T min, T max) { return this.isValid(this.value, min, max); }
|
|
||||||
/**
|
|
||||||
* Checks if a new value is valid
|
|
||||||
*
|
|
||||||
* @param value Value that is being checked whether valid
|
|
||||||
* @param min The minimum that the value can be
|
|
||||||
* @param max The maximum that the value can be
|
|
||||||
* @return 0 == valid
|
|
||||||
* <p> 2 == invalid
|
|
||||||
* <p> 1 == number too high
|
|
||||||
* <p> -1 == number too low
|
|
||||||
*/
|
|
||||||
public byte isValid(T value, T min, T max)
|
|
||||||
{
|
{
|
||||||
if (this.configBase.disableMinMax)
|
if (!ConfigHandler.INSTANCE.runMinMaxValidation)
|
||||||
{
|
{
|
||||||
return 0;
|
return EConfigValidity.VALID;
|
||||||
}
|
}
|
||||||
else if (min == null && max == null)
|
else if (min == null
|
||||||
|
&& max == null)
|
||||||
{
|
{
|
||||||
// no validation is needed for this field
|
// no validation is needed for this field
|
||||||
return 0;
|
return EConfigValidity.VALID;
|
||||||
}
|
}
|
||||||
else if (value == null || this.value == null
|
else if (value == null
|
||||||
|
|| this.value == null
|
||||||
|| value.getClass() != this.value.getClass())
|
|| value.getClass() != this.value.getClass())
|
||||||
{
|
{
|
||||||
// If the 2 variables aren't the same type then it will be invalid
|
// If the 2 variables aren't the same type
|
||||||
return 2;
|
// or the input is missing
|
||||||
|
// then it will be invalid
|
||||||
|
return EConfigValidity.INVALID;
|
||||||
}
|
}
|
||||||
else if (Number.class.isAssignableFrom(value.getClass()))
|
else if (value instanceof Number)
|
||||||
{
|
{
|
||||||
// Only check min max if it is a number
|
// Only check min/max if this config's type is a number
|
||||||
if (max != null && NumberUtil.greaterThan((Number) value, (Number) max))
|
if (max != null
|
||||||
|
&& NumberUtil.greaterThan((Number) value, (Number) max))
|
||||||
{
|
{
|
||||||
return 1;
|
return EConfigValidity.NUMBER_TOO_HIGH;
|
||||||
}
|
|
||||||
if (min != null && NumberUtil.lessThan((Number) value, (Number) min))
|
|
||||||
{
|
|
||||||
return -1;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return 0;
|
if (min != null
|
||||||
|
&& NumberUtil.lessThan((Number) value, (Number) min))
|
||||||
|
{
|
||||||
|
return EConfigValidity.NUMBER_TOO_LOW;
|
||||||
|
}
|
||||||
|
|
||||||
|
return EConfigValidity.VALID;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
return 0;
|
return EConfigValidity.VALID;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
//===============//
|
||||||
|
// file handling //
|
||||||
|
//===============//
|
||||||
|
|
||||||
/** This should normally not be called since set() automatically calls this */
|
/** This should normally not be called since set() automatically calls this */
|
||||||
public void save() { configBase.configFileHandler.saveEntry(this); }
|
public void save() { ConfigHandler.INSTANCE.configFileHandler.saveEntry(this); }
|
||||||
/** This should normally not be called except for special circumstances */
|
/** This should normally not be called except for special circumstances */
|
||||||
public void load() { configBase.configFileHandler.loadEntry(this); }
|
public void load() { ConfigHandler.INSTANCE.configFileHandler.loadEntry(this); }
|
||||||
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean equals(IConfigEntry<?> obj) { return obj.getClass() == ConfigEntry.class && equals((ConfigEntry<?>) obj); }
|
//================//
|
||||||
|
// base overrides //
|
||||||
|
//================//
|
||||||
|
|
||||||
|
public boolean equals(AbstractConfigBase<?> obj)
|
||||||
|
{
|
||||||
|
return obj.getClass() == ConfigEntry.class
|
||||||
|
&& this.equals((ConfigEntry<?>) obj);
|
||||||
|
}
|
||||||
/** Is the value of this equal to another */
|
/** Is the value of this equal to another */
|
||||||
public boolean equals(ConfigEntry<?> obj)
|
public boolean equals(ConfigEntry<?> obj)
|
||||||
{
|
{
|
||||||
// Can all of this just be "return this.value.equals(obj.value)"?
|
// Can all of this just be "return this.value.equals(obj.value)"?
|
||||||
|
|
||||||
if (Number.class.isAssignableFrom(this.value.getClass()))
|
if (Number.class.isAssignableFrom(this.value.getClass()))
|
||||||
|
{
|
||||||
return this.value == obj.value;
|
return this.value == obj.value;
|
||||||
|
}
|
||||||
else
|
else
|
||||||
|
{
|
||||||
return this.value.equals(obj.value);
|
return this.value.equals(obj.value);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public static class Builder<T> extends AbstractConfigType.Builder<T, Builder<T>>
|
|
||||||
|
//=========//
|
||||||
|
// builder //
|
||||||
|
//=========//
|
||||||
|
|
||||||
|
public static class Builder<T> extends AbstractConfigBase.Builder<T, Builder<T>>
|
||||||
{
|
{
|
||||||
private String tmpComment = null;
|
private String tmpComment = null;
|
||||||
private T tmpMin = null;
|
private T tmpMin = null;
|
||||||
private T tmpMax = null;
|
private T tmpMax = null;
|
||||||
protected String tmpChatCommandName = null;
|
protected String tmpChatCommandName = null;
|
||||||
private boolean tmpUseApiOverwrite = true;
|
private boolean tmpUseApiOverwrite = true;
|
||||||
private EConfigEntryPerformance tmpPerformance = EConfigEntryPerformance.DONT_SHOW;
|
|
||||||
protected ArrayList<IConfigListener> tmpIConfigListener = new ArrayList<>();
|
protected ArrayList<IConfigListener> tmpIConfigListener = new ArrayList<>();
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
public Builder<T> comment(String newComment)
|
public Builder<T> comment(String newComment)
|
||||||
{
|
{
|
||||||
this.tmpComment = newComment;
|
this.tmpComment = newComment;
|
||||||
@@ -382,12 +356,6 @@ public class ConfigEntry<T> extends AbstractConfigType<T, ConfigEntry<T>> implem
|
|||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Builder<T> setPerformance(EConfigEntryPerformance newPerformance)
|
|
||||||
{
|
|
||||||
this.tmpPerformance = newPerformance;
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
public Builder<T> replaceListeners(ArrayList<IConfigListener> newConfigListener)
|
public Builder<T> replaceListeners(ArrayList<IConfigListener> newConfigListener)
|
||||||
@@ -416,13 +384,15 @@ public class ConfigEntry<T> extends AbstractConfigType<T, ConfigEntry<T>> implem
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
// build //
|
||||||
|
|
||||||
public ConfigEntry<T> build()
|
public ConfigEntry<T> build()
|
||||||
{
|
{
|
||||||
return new ConfigEntry<>(
|
return new ConfigEntry<>(
|
||||||
this.tmpAppearance,
|
this.tmpAppearance,
|
||||||
this.tmpValue, this.tmpComment, this.tmpMin, this.tmpMax,
|
this.tmpComment, this.tmpChatCommandName, this.tmpValue, this.tmpMin, this.tmpMax,
|
||||||
this.tmpChatCommandName, this.tmpUseApiOverwrite,
|
this.tmpUseApiOverwrite,
|
||||||
this.tmpPerformance, this.tmpIConfigListener);
|
this.tmpIConfigListener);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
+27
-14
@@ -21,29 +21,42 @@ package com.seibel.distanthorizons.core.config.types;
|
|||||||
|
|
||||||
import com.seibel.distanthorizons.core.config.types.enums.EConfigEntryAppearance;
|
import com.seibel.distanthorizons.core.config.types.enums.EConfigEntryAppearance;
|
||||||
|
|
||||||
public class ConfigUIButton extends AbstractConfigType<Runnable, ConfigUIButton>
|
public class ConfigUIButton extends AbstractConfigBase<Runnable>
|
||||||
{
|
{
|
||||||
public ConfigUIButton(Runnable runnable)
|
//=============//
|
||||||
{
|
// constructor //
|
||||||
super(EConfigEntryAppearance.ONLY_IN_GUI, runnable);
|
//=============//
|
||||||
}
|
|
||||||
|
|
||||||
/** Runs the action of the button. NOTE: Will run on the main thread (so can halt the main process if not offloaded to a different thread) */
|
public ConfigUIButton(Runnable runnable)
|
||||||
|
{ super(EConfigEntryAppearance.ONLY_IN_GUI, runnable); }
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
//=========//
|
||||||
|
// actions //
|
||||||
|
//=========//
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Runs the action of the button.
|
||||||
|
* NOTE: This will run on the render thread
|
||||||
|
* (so it can halt the main process if it takes too long and isn't offloaded to another thread)
|
||||||
|
*/
|
||||||
public void runAction() { this.value.run(); }
|
public void runAction() { this.value.run(); }
|
||||||
|
|
||||||
public static class Builder extends AbstractConfigType.Builder<Runnable, Builder>
|
|
||||||
|
|
||||||
|
//=========//
|
||||||
|
// builder //
|
||||||
|
//=========//
|
||||||
|
|
||||||
|
public static class Builder extends AbstractConfigBase.Builder<Runnable, Builder>
|
||||||
{
|
{
|
||||||
/** Appearance shouldn't be changed */
|
/** Appearance shouldn't be changed */
|
||||||
@Override
|
@Override
|
||||||
public Builder setAppearance(EConfigEntryAppearance newAppearance)
|
public Builder setAppearance(EConfigEntryAppearance newAppearance) { return this; }
|
||||||
{
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
|
|
||||||
public ConfigUIButton build()
|
public ConfigUIButton build()
|
||||||
{
|
{ return new ConfigUIButton(this.tmpValue); }
|
||||||
return new ConfigUIButton(this.tmpValue);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+22
-6
@@ -23,7 +23,7 @@ import com.seibel.distanthorizons.core.config.Config;
|
|||||||
import com.seibel.distanthorizons.core.config.types.enums.EConfigCommentTextPosition;
|
import com.seibel.distanthorizons.core.config.types.enums.EConfigCommentTextPosition;
|
||||||
import com.seibel.distanthorizons.core.config.types.enums.EConfigEntryAppearance;
|
import com.seibel.distanthorizons.core.config.types.enums.EConfigEntryAppearance;
|
||||||
import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
|
import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
|
||||||
import org.apache.logging.log4j.Logger;
|
import com.seibel.distanthorizons.core.logging.DhLogger;
|
||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
import org.jetbrains.annotations.Nullable;
|
import org.jetbrains.annotations.Nullable;
|
||||||
|
|
||||||
@@ -32,9 +32,9 @@ import org.jetbrains.annotations.Nullable;
|
|||||||
*
|
*
|
||||||
* @author coolGi
|
* @author coolGi
|
||||||
*/
|
*/
|
||||||
public class ConfigUIComment extends AbstractConfigType<String, ConfigUIComment>
|
public class ConfigUIComment extends AbstractConfigBase<String>
|
||||||
{
|
{
|
||||||
private static final Logger LOGGER = DhLoggerBuilder.getLogger();
|
private static final DhLogger LOGGER = new DhLoggerBuilder().build();
|
||||||
|
|
||||||
|
|
||||||
public String parentConfigPath = null;
|
public String parentConfigPath = null;
|
||||||
@@ -43,8 +43,11 @@ public class ConfigUIComment extends AbstractConfigType<String, ConfigUIComment>
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
public ConfigUIComment() { this(null, null); }
|
//=============//
|
||||||
public ConfigUIComment(String parentConfigPath, EConfigCommentTextPosition textPosition)
|
// constructor //
|
||||||
|
//=============//
|
||||||
|
|
||||||
|
public ConfigUIComment(String parentConfigPath, @Nullable EConfigCommentTextPosition textPosition)
|
||||||
{
|
{
|
||||||
super(EConfigEntryAppearance.ONLY_IN_GUI, "");
|
super(EConfigEntryAppearance.ONLY_IN_GUI, "");
|
||||||
this.parentConfigPath = parentConfigPath;
|
this.parentConfigPath = parentConfigPath;
|
||||||
@@ -53,6 +56,10 @@ public class ConfigUIComment extends AbstractConfigType<String, ConfigUIComment>
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
//=========//
|
||||||
|
// setters //
|
||||||
|
//=========//
|
||||||
|
|
||||||
/** Appearance shouldn't be changed */
|
/** Appearance shouldn't be changed */
|
||||||
@Override
|
@Override
|
||||||
public void setAppearance(EConfigEntryAppearance newAppearance) { }
|
public void setAppearance(EConfigEntryAppearance newAppearance) { }
|
||||||
@@ -63,9 +70,14 @@ public class ConfigUIComment extends AbstractConfigType<String, ConfigUIComment>
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
public static class Builder extends AbstractConfigType.Builder<String, Builder>
|
//=========//
|
||||||
|
// builder //
|
||||||
|
//=========//
|
||||||
|
|
||||||
|
public static class Builder extends AbstractConfigBase.Builder<String, Builder>
|
||||||
{
|
{
|
||||||
public String tempParentConfigPath = null;
|
public String tempParentConfigPath = null;
|
||||||
|
@Nullable
|
||||||
public EConfigCommentTextPosition tempTextPosition = null;
|
public EConfigCommentTextPosition tempTextPosition = null;
|
||||||
|
|
||||||
|
|
||||||
@@ -155,9 +167,13 @@ public class ConfigUIComment extends AbstractConfigType<String, ConfigUIComment>
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
// build //
|
||||||
|
|
||||||
public ConfigUIComment build()
|
public ConfigUIComment build()
|
||||||
{ return new ConfigUIComment(this.tempParentConfigPath, this.tempTextPosition); }
|
{ return new ConfigUIComment(this.tempParentConfigPath, this.tempTextPosition); }
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
+14
-2
@@ -25,13 +25,21 @@ import com.seibel.distanthorizons.core.config.types.enums.EConfigEntryAppearance
|
|||||||
* Adds empty space the height of a button.
|
* Adds empty space the height of a button.
|
||||||
* Useful for separating different categories.
|
* Useful for separating different categories.
|
||||||
*/
|
*/
|
||||||
public class ConfigUISpacer extends AbstractConfigType<String, ConfigUISpacer>
|
public class ConfigUISpacer extends AbstractConfigBase<String>
|
||||||
{
|
{
|
||||||
|
//=============//
|
||||||
|
// constructor //
|
||||||
|
//=============//
|
||||||
|
|
||||||
public ConfigUISpacer()
|
public ConfigUISpacer()
|
||||||
{ super(EConfigEntryAppearance.ONLY_IN_GUI, ""); }
|
{ super(EConfigEntryAppearance.ONLY_IN_GUI, ""); }
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
//=========//
|
||||||
|
// setters //
|
||||||
|
//=========//
|
||||||
|
|
||||||
/** Appearance shouldn't be changed */
|
/** Appearance shouldn't be changed */
|
||||||
@Override
|
@Override
|
||||||
public void setAppearance(EConfigEntryAppearance newAppearance) { }
|
public void setAppearance(EConfigEntryAppearance newAppearance) { }
|
||||||
@@ -42,7 +50,11 @@ public class ConfigUISpacer extends AbstractConfigType<String, ConfigUISpacer>
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
public static class Builder extends AbstractConfigType.Builder<String, Builder>
|
//=========//
|
||||||
|
// builder //
|
||||||
|
//=========//
|
||||||
|
|
||||||
|
public static class Builder extends AbstractConfigBase.Builder<String, Builder>
|
||||||
{
|
{
|
||||||
/** Appearance shouldn't be changed */
|
/** Appearance shouldn't be changed */
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
+23
-8
@@ -23,16 +23,24 @@ import com.seibel.distanthorizons.core.config.types.enums.EConfigEntryAppearance
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Creates a UI element that copies everything from another element.
|
* Creates a UI element that copies everything from another element.
|
||||||
* This only effects the UI
|
* This element is only visible in the GUI.
|
||||||
*
|
*
|
||||||
* @author coolGi
|
* @author coolGi
|
||||||
*/
|
*/
|
||||||
public class ConfigUiLinkedEntry extends AbstractConfigType<AbstractConfigType<?, ?>, ConfigUiLinkedEntry>
|
public class ConfigUiLinkedEntry extends AbstractConfigBase<AbstractConfigBase<?>>
|
||||||
{
|
{
|
||||||
public ConfigUiLinkedEntry(AbstractConfigType<?, ?> value)
|
//=============//
|
||||||
{
|
// constructor //
|
||||||
super(EConfigEntryAppearance.ONLY_IN_GUI, value);
|
//=============//
|
||||||
}
|
|
||||||
|
public ConfigUiLinkedEntry(AbstractConfigBase<?> value)
|
||||||
|
{ super(EConfigEntryAppearance.ONLY_IN_GUI, value); }
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
//=========//
|
||||||
|
// setters //
|
||||||
|
//=========//
|
||||||
|
|
||||||
/** Appearance shouldn't be changed */
|
/** Appearance shouldn't be changed */
|
||||||
@Override
|
@Override
|
||||||
@@ -40,10 +48,15 @@ public class ConfigUiLinkedEntry extends AbstractConfigType<AbstractConfigType<?
|
|||||||
|
|
||||||
/** Value shouldn't be changed after creation */
|
/** Value shouldn't be changed after creation */
|
||||||
@Override
|
@Override
|
||||||
public void set(AbstractConfigType<?, ?> newValue) { }
|
public void set(AbstractConfigBase<?> newValue) { }
|
||||||
|
|
||||||
|
|
||||||
public static class Builder extends AbstractConfigType.Builder<AbstractConfigType<?, ?>, Builder>
|
|
||||||
|
//=========//
|
||||||
|
// builder //
|
||||||
|
//=========//
|
||||||
|
|
||||||
|
public static class Builder extends AbstractConfigBase.Builder<AbstractConfigBase<?>, Builder>
|
||||||
{
|
{
|
||||||
/** Appearance shouldn't be changed */
|
/** Appearance shouldn't be changed */
|
||||||
@Override
|
@Override
|
||||||
@@ -59,4 +72,6 @@ public class ConfigUiLinkedEntry extends AbstractConfigType<AbstractConfigType<?
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
+15
@@ -0,0 +1,15 @@
|
|||||||
|
package com.seibel.distanthorizons.core.config.types.enums;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* VALID
|
||||||
|
* INVALID
|
||||||
|
* NUMBER_TOO_HIGH
|
||||||
|
* NUMBER_TOO_LOW
|
||||||
|
*/
|
||||||
|
public enum EConfigValidity
|
||||||
|
{
|
||||||
|
VALID,
|
||||||
|
INVALID,
|
||||||
|
NUMBER_TOO_HIGH,
|
||||||
|
NUMBER_TOO_LOW,
|
||||||
|
}
|
||||||
+151
@@ -0,0 +1,151 @@
|
|||||||
|
package com.seibel.distanthorizons.core.dataObjects;
|
||||||
|
|
||||||
|
import com.seibel.distanthorizons.core.dataObjects.fullData.FullDataPointIdMap;
|
||||||
|
import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
|
||||||
|
import com.seibel.distanthorizons.core.util.objects.DataCorruptedException;
|
||||||
|
import com.seibel.distanthorizons.core.wrapperInterfaces.IWrapperFactory;
|
||||||
|
import com.seibel.distanthorizons.core.wrapperInterfaces.block.IBlockStateWrapper;
|
||||||
|
import com.seibel.distanthorizons.core.wrapperInterfaces.world.IBiomeWrapper;
|
||||||
|
import com.seibel.distanthorizons.core.wrapperInterfaces.world.ILevelWrapper;
|
||||||
|
|
||||||
|
import java.util.concurrent.ConcurrentHashMap;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A pooled compound key between the biome and blockState. <br>
|
||||||
|
* These objects are pooled since we will need this compound key
|
||||||
|
* many times.
|
||||||
|
*
|
||||||
|
* @see FullDataPointIdMap
|
||||||
|
* @see IBlockStateWrapper
|
||||||
|
* @see IBiomeWrapper
|
||||||
|
*/
|
||||||
|
public class BlockBiomeWrapperPair
|
||||||
|
{
|
||||||
|
private static final IWrapperFactory WRAPPER_FACTORY = SingletonInjector.INSTANCE.get(IWrapperFactory.class);
|
||||||
|
|
||||||
|
/** two levels are present so we don't need to use a key object */
|
||||||
|
private static final ConcurrentHashMap<IBlockStateWrapper, ConcurrentHashMap<IBiomeWrapper, BlockBiomeWrapperPair>> CACHED_PAIR_BY_BIOME_BY_BLOCK = new ConcurrentHashMap<>();
|
||||||
|
|
||||||
|
public final IBiomeWrapper biome;
|
||||||
|
public final IBlockStateWrapper blockState;
|
||||||
|
|
||||||
|
private int hashCode = 0;
|
||||||
|
private boolean hashGenerated = false;
|
||||||
|
private String serialString = null;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
//=============//
|
||||||
|
// constructor //
|
||||||
|
//=============//
|
||||||
|
|
||||||
|
public static BlockBiomeWrapperPair get(IBlockStateWrapper blockState, IBiomeWrapper biome)
|
||||||
|
{
|
||||||
|
// check for existing entry
|
||||||
|
ConcurrentHashMap<IBiomeWrapper, BlockBiomeWrapperPair> pairByBiomeWrapper = CACHED_PAIR_BY_BIOME_BY_BLOCK.get(blockState);
|
||||||
|
if (pairByBiomeWrapper != null)
|
||||||
|
{
|
||||||
|
BlockBiomeWrapperPair pair = pairByBiomeWrapper.get(biome);
|
||||||
|
if (pair != null)
|
||||||
|
{
|
||||||
|
return pair;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Lazily create the inner map and new BlockBiomeWrapperPair
|
||||||
|
return CACHED_PAIR_BY_BIOME_BY_BLOCK
|
||||||
|
.computeIfAbsent(blockState, newBlockState -> new ConcurrentHashMap<>())
|
||||||
|
.computeIfAbsent(biome, newBiome -> new BlockBiomeWrapperPair(biome, blockState));
|
||||||
|
}
|
||||||
|
private BlockBiomeWrapperPair(IBiomeWrapper biome, IBlockStateWrapper blockState)
|
||||||
|
{
|
||||||
|
this.biome = biome;
|
||||||
|
this.blockState = blockState;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
//===========//
|
||||||
|
// overrides //
|
||||||
|
//===========//
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Reminder: this hash code won't always be unique, collisions can occur;
|
||||||
|
* because of that this hash shouldn't be the only unique identifier for this object.
|
||||||
|
*/
|
||||||
|
@Override
|
||||||
|
public int hashCode()
|
||||||
|
{
|
||||||
|
// cache the hash code to improve speed
|
||||||
|
if (!this.hashGenerated)
|
||||||
|
{
|
||||||
|
this.hashCode = generateHashCode(this);
|
||||||
|
this.hashGenerated = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
return this.hashCode;
|
||||||
|
}
|
||||||
|
private static int generateHashCode(BlockBiomeWrapperPair pair) { return generateHashCode(pair.biome, pair.blockState); }
|
||||||
|
private static int generateHashCode(IBiomeWrapper biome, IBlockStateWrapper blockState)
|
||||||
|
{
|
||||||
|
final int prime = 31;
|
||||||
|
|
||||||
|
int result = 1;
|
||||||
|
// the biome and blockstate hashcode should be already calculated by the time
|
||||||
|
// we get here, so this operation should be very fast
|
||||||
|
result = prime * result + (biome == null ? 0 : biome.hashCode());
|
||||||
|
result = prime * result + (blockState == null ? 0 : blockState.hashCode());
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean equals(Object otherObj)
|
||||||
|
{
|
||||||
|
if (otherObj == this)
|
||||||
|
{
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!(otherObj instanceof BlockBiomeWrapperPair))
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
BlockBiomeWrapperPair other = (BlockBiomeWrapperPair) otherObj;
|
||||||
|
return other.biome.getSerialString().equals(this.biome.getSerialString())
|
||||||
|
&& other.blockState.getSerialString().equals(this.blockState.getSerialString());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String toString() { return this.serialize(); }
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
//=================//
|
||||||
|
// (de)serializing //
|
||||||
|
//=================//
|
||||||
|
|
||||||
|
public String serialize()
|
||||||
|
{
|
||||||
|
if (this.serialString == null)
|
||||||
|
{
|
||||||
|
this.serialString = this.biome.getSerialString() + FullDataPointIdMap.BLOCK_STATE_SEPARATOR_STRING + this.blockState.getSerialString();
|
||||||
|
}
|
||||||
|
|
||||||
|
return this.serialString;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static BlockBiomeWrapperPair deserialize(String str, ILevelWrapper levelWrapper) throws DataCorruptedException
|
||||||
|
{
|
||||||
|
int separatorIndex = str.indexOf(FullDataPointIdMap.BLOCK_STATE_SEPARATOR_STRING);
|
||||||
|
if (separatorIndex == -1)
|
||||||
|
{
|
||||||
|
throw new DataCorruptedException("Failed to deserialize BiomeBlockStateEntry ["+str+"], unable to find separator.");
|
||||||
|
}
|
||||||
|
|
||||||
|
IBiomeWrapper biome = WRAPPER_FACTORY.deserializeBiomeWrapperOrGetDefault(str.substring(0, separatorIndex), levelWrapper);
|
||||||
|
IBlockStateWrapper blockState = WRAPPER_FACTORY.deserializeBlockStateWrapperOrGetDefault(str.substring(separatorIndex+FullDataPointIdMap.BLOCK_STATE_SEPARATOR_STRING.length()), levelWrapper);
|
||||||
|
return BlockBiomeWrapperPair.get(blockState, biome);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
+56
-193
@@ -19,7 +19,8 @@
|
|||||||
|
|
||||||
package com.seibel.distanthorizons.core.dataObjects.fullData;
|
package com.seibel.distanthorizons.core.dataObjects.fullData;
|
||||||
|
|
||||||
import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
|
import com.seibel.distanthorizons.core.dataObjects.BlockBiomeWrapperPair;
|
||||||
|
import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
|
||||||
import com.seibel.distanthorizons.core.pos.DhSectionPos;
|
import com.seibel.distanthorizons.core.pos.DhSectionPos;
|
||||||
import com.seibel.distanthorizons.core.util.LodUtil;
|
import com.seibel.distanthorizons.core.util.LodUtil;
|
||||||
import com.seibel.distanthorizons.core.util.objects.DataCorruptedException;
|
import com.seibel.distanthorizons.core.util.objects.DataCorruptedException;
|
||||||
@@ -27,10 +28,8 @@ import com.seibel.distanthorizons.core.util.objects.dataStreams.DhDataInputStrea
|
|||||||
import com.seibel.distanthorizons.core.util.objects.dataStreams.DhDataOutputStream;
|
import com.seibel.distanthorizons.core.util.objects.dataStreams.DhDataOutputStream;
|
||||||
import com.seibel.distanthorizons.core.wrapperInterfaces.block.IBlockStateWrapper;
|
import com.seibel.distanthorizons.core.wrapperInterfaces.block.IBlockStateWrapper;
|
||||||
import com.seibel.distanthorizons.core.wrapperInterfaces.world.IBiomeWrapper;
|
import com.seibel.distanthorizons.core.wrapperInterfaces.world.IBiomeWrapper;
|
||||||
import com.seibel.distanthorizons.core.wrapperInterfaces.IWrapperFactory;
|
|
||||||
import com.seibel.distanthorizons.core.wrapperInterfaces.world.ILevelWrapper;
|
import com.seibel.distanthorizons.core.wrapperInterfaces.world.ILevelWrapper;
|
||||||
import org.apache.logging.log4j.LogManager;
|
import com.seibel.distanthorizons.core.logging.DhLogger;
|
||||||
import org.apache.logging.log4j.Logger;
|
|
||||||
|
|
||||||
import java.io.*;
|
import java.io.*;
|
||||||
import java.util.*;
|
import java.util.*;
|
||||||
@@ -51,7 +50,7 @@ import java.util.concurrent.ConcurrentHashMap;
|
|||||||
*/
|
*/
|
||||||
public class FullDataPointIdMap
|
public class FullDataPointIdMap
|
||||||
{
|
{
|
||||||
private static final Logger LOGGER = LogManager.getLogger();
|
private static final DhLogger LOGGER = new DhLoggerBuilder().build();
|
||||||
/**
|
/**
|
||||||
* Should only be enabled when debugging.
|
* Should only be enabled when debugging.
|
||||||
* Has the system check if any duplicate Entries were read/written
|
* Has the system check if any duplicate Entries were read/written
|
||||||
@@ -59,15 +58,15 @@ public class FullDataPointIdMap
|
|||||||
*/
|
*/
|
||||||
private static final boolean RUN_SERIALIZATION_DUPLICATE_VALIDATION = false;
|
private static final boolean RUN_SERIALIZATION_DUPLICATE_VALIDATION = false;
|
||||||
/** Distant Horizons - Block State Wrapper */
|
/** Distant Horizons - Block State Wrapper */
|
||||||
private static final String BLOCK_STATE_SEPARATOR_STRING = "_DH-BSW_";
|
public static final String BLOCK_STATE_SEPARATOR_STRING = "_DH-BSW_";
|
||||||
|
|
||||||
|
|
||||||
/** should only be used for debugging */
|
/** should only be used for debugging */
|
||||||
private long pos;
|
private long pos;
|
||||||
|
|
||||||
/** The index should be the same as the Entry's ID */
|
/** The index should be the same as the BlockBiomeWrapperPair's ID */
|
||||||
private final ArrayList<Entry> entryList = new ArrayList<>();
|
private final ArrayList<BlockBiomeWrapperPair> blockBiomePairList = new ArrayList<>();
|
||||||
private final ConcurrentHashMap<Entry, Integer> idMap = new ConcurrentHashMap<>();
|
private final ConcurrentHashMap<BlockBiomeWrapperPair, Integer> idMap = new ConcurrentHashMap<>();
|
||||||
|
|
||||||
private int cachedHashCode = 0;
|
private int cachedHashCode = 0;
|
||||||
|
|
||||||
@@ -89,28 +88,28 @@ public class FullDataPointIdMap
|
|||||||
public IBiomeWrapper getBiomeWrapper(int id) throws IndexOutOfBoundsException { return this.getEntry(id).biome; }
|
public IBiomeWrapper getBiomeWrapper(int id) throws IndexOutOfBoundsException { return this.getEntry(id).biome; }
|
||||||
/** @see FullDataPointIdMap#getEntry(int) */
|
/** @see FullDataPointIdMap#getEntry(int) */
|
||||||
public IBlockStateWrapper getBlockStateWrapper(int id) throws IndexOutOfBoundsException { return this.getEntry(id).blockState; }
|
public IBlockStateWrapper getBlockStateWrapper(int id) throws IndexOutOfBoundsException { return this.getEntry(id).blockState; }
|
||||||
/** @throws IndexOutOfBoundsException if the given ID isn't in the {@link FullDataPointIdMap#entryList} */
|
/** @throws IndexOutOfBoundsException if the given ID isn't in the {@link FullDataPointIdMap#blockBiomePairList} */
|
||||||
private Entry getEntry(int id) throws IndexOutOfBoundsException
|
private BlockBiomeWrapperPair getEntry(int id) throws IndexOutOfBoundsException
|
||||||
{
|
{
|
||||||
Entry entry;
|
BlockBiomeWrapperPair pair;
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
entry = this.entryList.get(id);
|
pair = this.blockBiomePairList.get(id);
|
||||||
}
|
}
|
||||||
catch (IndexOutOfBoundsException e)
|
catch (IndexOutOfBoundsException e)
|
||||||
{
|
{
|
||||||
throw new IndexOutOfBoundsException("FullData ID Map out of sync for pos: "+this.pos+". ID: ["+id+"] greater than the number of known ID's: ["+this.entryList.size()+"].");
|
throw new IndexOutOfBoundsException("FullData ID Map out of sync for pos: "+DhSectionPos.toString(this.pos)+". ID: ["+id+"] greater than the number of known ID's: ["+this.blockBiomePairList.size()+"].");
|
||||||
}
|
}
|
||||||
|
|
||||||
return entry;
|
return pair;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/** @return -1 if the list is empty */
|
/** @return -1 if the list is empty */
|
||||||
public int getMaxValidId() { return this.entryList.size() - 1; }
|
public int getMaxValidId() { return this.blockBiomePairList.size() - 1; }
|
||||||
public int size() { return this.entryList.size(); }
|
public int size() { return this.blockBiomePairList.size(); }
|
||||||
|
|
||||||
public boolean isEmpty() { return this.entryList.isEmpty(); }
|
public boolean isEmpty() { return this.blockBiomePairList.isEmpty(); }
|
||||||
|
|
||||||
public long getPos() { return this.pos; }
|
public long getPos() { return this.pos; }
|
||||||
|
|
||||||
@@ -124,11 +123,11 @@ public class FullDataPointIdMap
|
|||||||
* If an entry with the given values already exists nothing will
|
* If an entry with the given values already exists nothing will
|
||||||
* be added but the existing item's ID will still be returned.
|
* be added but the existing item's ID will still be returned.
|
||||||
*/
|
*/
|
||||||
public int addIfNotPresentAndGetId(IBiomeWrapper biome, IBlockStateWrapper blockState) { return this.addIfNotPresentAndGetId(Entry.getEntry(biome, blockState)); }
|
public int addIfNotPresentAndGetId(IBiomeWrapper biome, IBlockStateWrapper blockState) { return this.addIfNotPresentAndGetId(BlockBiomeWrapperPair.get(blockState, biome)); }
|
||||||
private int addIfNotPresentAndGetId(Entry biomeBlockStateEntry)
|
private int addIfNotPresentAndGetId(BlockBiomeWrapperPair pair)
|
||||||
{
|
{
|
||||||
// try getting the existing ID
|
// try getting the existing ID
|
||||||
Integer nullableId = this.idMap.get(biomeBlockStateEntry);
|
Integer nullableId = this.idMap.get(pair);
|
||||||
if (nullableId != null)
|
if (nullableId != null)
|
||||||
{
|
{
|
||||||
return nullableId;
|
return nullableId;
|
||||||
@@ -136,7 +135,7 @@ public class FullDataPointIdMap
|
|||||||
|
|
||||||
|
|
||||||
// create the new ID
|
// create the new ID
|
||||||
return this.idMap.compute(biomeBlockStateEntry, (Entry newBiomeBlockStateEntry, Integer currentId) ->
|
return this.idMap.compute(pair, (BlockBiomeWrapperPair newPair, Integer currentId) ->
|
||||||
{
|
{
|
||||||
if (currentId != null)
|
if (currentId != null)
|
||||||
{
|
{
|
||||||
@@ -145,8 +144,8 @@ public class FullDataPointIdMap
|
|||||||
|
|
||||||
|
|
||||||
// Add the new ID
|
// Add the new ID
|
||||||
currentId = this.entryList.size();
|
currentId = this.blockBiomePairList.size();
|
||||||
this.entryList.add(biomeBlockStateEntry);
|
this.blockBiomePairList.add(newPair);
|
||||||
|
|
||||||
// invalidate the cached hash code
|
// invalidate the cached hash code
|
||||||
this.cachedHashCode = 0;
|
this.cachedHashCode = 0;
|
||||||
@@ -156,7 +155,7 @@ public class FullDataPointIdMap
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Adds every {@link Entry} from inputMap into this map. <br>
|
* Adds every {@link BlockBiomeWrapperPair} from inputMap into this map. <br>
|
||||||
* Allows duplicate entries. <br><br>
|
* Allows duplicate entries. <br><br>
|
||||||
*
|
*
|
||||||
* Allowing duplicate entries should be done if a datasource is just being read in and
|
* Allowing duplicate entries should be done if a datasource is just being read in and
|
||||||
@@ -166,19 +165,19 @@ public class FullDataPointIdMap
|
|||||||
*/
|
*/
|
||||||
public void addAll(FullDataPointIdMap inputMap)
|
public void addAll(FullDataPointIdMap inputMap)
|
||||||
{
|
{
|
||||||
ArrayList<Entry> entriesToMerge = inputMap.entryList;
|
ArrayList<BlockBiomeWrapperPair> pairsToMerge = inputMap.blockBiomePairList;
|
||||||
for (int i = 0; i < entriesToMerge.size(); i++)
|
for (int i = 0; i < pairsToMerge.size(); i++)
|
||||||
{
|
{
|
||||||
Entry entity = entriesToMerge.get(i);
|
BlockBiomeWrapperPair pair = pairsToMerge.get(i);
|
||||||
this.add(entity);
|
this.add(pair);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
/** allows for adding duplicate {@link Entry} */
|
/** allows for adding duplicate {@link BlockBiomeWrapperPair} */
|
||||||
private void add(Entry biomeBlockStateEntry)
|
private void add(BlockBiomeWrapperPair pair)
|
||||||
{
|
{
|
||||||
int id = this.entryList.size();
|
int id = this.blockBiomePairList.size();
|
||||||
this.entryList.add(biomeBlockStateEntry);
|
this.blockBiomePairList.add(pair);
|
||||||
this.idMap.put(biomeBlockStateEntry, id);
|
this.idMap.put(pair, id);
|
||||||
|
|
||||||
// invalidate the cached hash code
|
// invalidate the cached hash code
|
||||||
this.cachedHashCode = 0;
|
this.cachedHashCode = 0;
|
||||||
@@ -195,23 +194,23 @@ public class FullDataPointIdMap
|
|||||||
*/
|
*/
|
||||||
public int[] mergeAndReturnRemappedEntityIds(FullDataPointIdMap inputMap)
|
public int[] mergeAndReturnRemappedEntityIds(FullDataPointIdMap inputMap)
|
||||||
{
|
{
|
||||||
ArrayList<Entry> entriesToMerge = inputMap.entryList;
|
ArrayList<BlockBiomeWrapperPair> entriesToMerge = inputMap.blockBiomePairList;
|
||||||
int[] remappedEntryIds = new int[entriesToMerge.size()];
|
int[] remappedPairIds = new int[entriesToMerge.size()];
|
||||||
for (int i = 0; i < entriesToMerge.size(); i++)
|
for (int i = 0; i < entriesToMerge.size(); i++)
|
||||||
{
|
{
|
||||||
Entry entity = entriesToMerge.get(i);
|
BlockBiomeWrapperPair entity = entriesToMerge.get(i);
|
||||||
int id = this.addIfNotPresentAndGetId(entity);
|
int id = this.addIfNotPresentAndGetId(entity);
|
||||||
remappedEntryIds[i] = id;
|
remappedPairIds[i] = id;
|
||||||
}
|
}
|
||||||
|
|
||||||
return remappedEntryIds;
|
return remappedPairIds;
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Should only be used if this map is going to be reused, otherwise bad things will happen. */
|
/** Should only be used if this map is going to be reused, otherwise bad things will happen. */
|
||||||
public void clear(long pos)
|
public void clear(long pos)
|
||||||
{
|
{
|
||||||
this.pos = pos;
|
this.pos = pos;
|
||||||
this.entryList.clear();
|
this.blockBiomePairList.clear();
|
||||||
this.idMap.clear();
|
this.idMap.clear();
|
||||||
this.cachedHashCode = 0;
|
this.cachedHashCode = 0;
|
||||||
}
|
}
|
||||||
@@ -225,27 +224,27 @@ public class FullDataPointIdMap
|
|||||||
/** Serializes all contained entries into the given stream, formatted in UTF */
|
/** Serializes all contained entries into the given stream, formatted in UTF */
|
||||||
public void serialize(DhDataOutputStream outputStream) throws IOException
|
public void serialize(DhDataOutputStream outputStream) throws IOException
|
||||||
{
|
{
|
||||||
outputStream.writeInt(this.entryList.size());
|
outputStream.writeInt(this.blockBiomePairList.size());
|
||||||
|
|
||||||
// only used when debugging
|
// only used when debugging
|
||||||
HashMap<String, FullDataPointIdMap.Entry> dataPointEntryBySerialization = new HashMap<>();
|
HashMap<String, BlockBiomeWrapperPair> dataPointEntryBySerialization = new HashMap<>();
|
||||||
|
|
||||||
for (Entry entry : this.entryList)
|
for (BlockBiomeWrapperPair pair : this.blockBiomePairList)
|
||||||
{
|
{
|
||||||
String entryString = entry.serialize();
|
String entryString = pair.serialize();
|
||||||
outputStream.writeUTF(entryString);
|
outputStream.writeUTF(entryString);
|
||||||
|
|
||||||
if (RUN_SERIALIZATION_DUPLICATE_VALIDATION)
|
if (RUN_SERIALIZATION_DUPLICATE_VALIDATION)
|
||||||
{
|
{
|
||||||
if (dataPointEntryBySerialization.containsKey(entryString))
|
if (dataPointEntryBySerialization.containsKey(entryString))
|
||||||
{
|
{
|
||||||
LOGGER.error("Duplicate serialized entry found with serial: " + entryString);
|
LOGGER.error("Duplicate serialized pair found with serial: " + entryString);
|
||||||
}
|
}
|
||||||
if (dataPointEntryBySerialization.containsValue(entry))
|
if (dataPointEntryBySerialization.containsValue(pair))
|
||||||
{
|
{
|
||||||
LOGGER.error("Duplicate serialized entry found with value: " + entry.serialize());
|
LOGGER.error("Duplicate serialized pair found with value: " + pair.serialize());
|
||||||
}
|
}
|
||||||
dataPointEntryBySerialization.put(entryString, entry);
|
dataPointEntryBySerialization.put(entryString, pair);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -261,7 +260,7 @@ public class FullDataPointIdMap
|
|||||||
|
|
||||||
|
|
||||||
// only used when debugging
|
// only used when debugging
|
||||||
HashMap<String, FullDataPointIdMap.Entry> dataPointEntryBySerialization = new HashMap<>();
|
HashMap<String, BlockBiomeWrapperPair> dataPointEntryBySerialization = new HashMap<>();
|
||||||
|
|
||||||
FullDataPointIdMap newMap = new FullDataPointIdMap(pos);
|
FullDataPointIdMap newMap = new FullDataPointIdMap(pos);
|
||||||
for (int i = 0; i < entityCount; i++)
|
for (int i = 0; i < entityCount; i++)
|
||||||
@@ -269,13 +268,13 @@ public class FullDataPointIdMap
|
|||||||
// necessary to prevent issues with deserializing objects after the level has been closed
|
// necessary to prevent issues with deserializing objects after the level has been closed
|
||||||
if (Thread.interrupted())
|
if (Thread.interrupted())
|
||||||
{
|
{
|
||||||
throw new InterruptedException(FullDataPointIdMap.class.getSimpleName() + " task interrupted.");
|
throw new InterruptedException("[" + FullDataPointIdMap.class.getSimpleName() + "] deserializing interrupted.");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
String entryString = inputStream.readUTF();
|
String entryString = inputStream.readUTF();
|
||||||
Entry newEntry = Entry.deserialize(entryString, levelWrapper);
|
BlockBiomeWrapperPair newPair = BlockBiomeWrapperPair.deserialize(entryString, levelWrapper);
|
||||||
newMap.entryList.add(newEntry);
|
newMap.blockBiomePairList.add(newPair);
|
||||||
|
|
||||||
if (RUN_SERIALIZATION_DUPLICATE_VALIDATION)
|
if (RUN_SERIALIZATION_DUPLICATE_VALIDATION)
|
||||||
{
|
{
|
||||||
@@ -283,11 +282,11 @@ public class FullDataPointIdMap
|
|||||||
{
|
{
|
||||||
LOGGER.error("Duplicate deserialized entry found with serial: " + entryString);
|
LOGGER.error("Duplicate deserialized entry found with serial: " + entryString);
|
||||||
}
|
}
|
||||||
if (dataPointEntryBySerialization.containsValue(newEntry))
|
if (dataPointEntryBySerialization.containsValue(newPair))
|
||||||
{
|
{
|
||||||
LOGGER.error("Duplicate deserialized entry found with value: " + newEntry.serialize());
|
LOGGER.error("Duplicate deserialized entry found with value: " + newPair.serialize());
|
||||||
}
|
}
|
||||||
dataPointEntryBySerialization.put(entryString, newEntry);
|
dataPointEntryBySerialization.put(entryString, newPair);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -333,149 +332,13 @@ public class FullDataPointIdMap
|
|||||||
private void generateHashCode()
|
private void generateHashCode()
|
||||||
{
|
{
|
||||||
int result = DhSectionPos.hashCode(this.pos);
|
int result = DhSectionPos.hashCode(this.pos);
|
||||||
for (int i = 0; i < this.entryList.size(); i++)
|
for (int i = 0; i < this.blockBiomePairList.size(); i++)
|
||||||
{
|
{
|
||||||
result = 31 * result + this.entryList.hashCode();
|
result = 31 * result + this.blockBiomePairList.hashCode();
|
||||||
}
|
}
|
||||||
this.cachedHashCode = result;
|
this.cachedHashCode = result;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
//==============//
|
|
||||||
// helper class //
|
|
||||||
//==============//
|
|
||||||
|
|
||||||
private static final class Entry
|
|
||||||
{
|
|
||||||
private static final IWrapperFactory WRAPPER_FACTORY = SingletonInjector.INSTANCE.get(IWrapperFactory.class);
|
|
||||||
|
|
||||||
/** two levels are present so we don't need to use a key object */
|
|
||||||
private static final ConcurrentHashMap<IBiomeWrapper, ConcurrentHashMap<IBlockStateWrapper, Entry>> ENTRY_BY_BLOCKSTATE_BY_BIOMEWRAPPER = new ConcurrentHashMap<>();
|
|
||||||
|
|
||||||
public final IBiomeWrapper biome;
|
|
||||||
public final IBlockStateWrapper blockState;
|
|
||||||
|
|
||||||
private int hashCode = 0;
|
|
||||||
private boolean hashGenerated = false;
|
|
||||||
private String serialString = null;
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
//=============//
|
|
||||||
// constructor //
|
|
||||||
//=============//
|
|
||||||
|
|
||||||
public static Entry getEntry(IBiomeWrapper biome, IBlockStateWrapper blockState)
|
|
||||||
{
|
|
||||||
// check for existing entry
|
|
||||||
ConcurrentHashMap<IBlockStateWrapper, Entry> entryByBlockState = ENTRY_BY_BLOCKSTATE_BY_BIOMEWRAPPER.get(biome);
|
|
||||||
if (entryByBlockState != null)
|
|
||||||
{
|
|
||||||
Entry entry = entryByBlockState.get(blockState);
|
|
||||||
if (entry != null)
|
|
||||||
{
|
|
||||||
return entry;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Lazily create the inner map and new Entry
|
|
||||||
return ENTRY_BY_BLOCKSTATE_BY_BIOMEWRAPPER
|
|
||||||
.computeIfAbsent(biome, newBiome -> new ConcurrentHashMap<>())
|
|
||||||
.computeIfAbsent(blockState, newBlockState -> new Entry(biome, blockState));
|
|
||||||
}
|
|
||||||
private Entry(IBiomeWrapper biome, IBlockStateWrapper blockState)
|
|
||||||
{
|
|
||||||
this.biome = biome;
|
|
||||||
this.blockState = blockState;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
//===========//
|
|
||||||
// overrides //
|
|
||||||
//===========//
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Reminder: this hash code won't always be unique, collisions can occur;
|
|
||||||
* because of that this hash shouldn't be the only unique identifier for this object.
|
|
||||||
*/
|
|
||||||
@Override
|
|
||||||
public int hashCode()
|
|
||||||
{
|
|
||||||
// cache the hash code to improve speed
|
|
||||||
if (!this.hashGenerated)
|
|
||||||
{
|
|
||||||
this.hashCode = generateHashCode(this);
|
|
||||||
this.hashGenerated = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
return this.hashCode;
|
|
||||||
}
|
|
||||||
private static int generateHashCode(Entry entry) { return generateHashCode(entry.biome, entry.blockState); }
|
|
||||||
private static int generateHashCode(IBiomeWrapper biome, IBlockStateWrapper blockState)
|
|
||||||
{
|
|
||||||
final int prime = 31;
|
|
||||||
|
|
||||||
int result = 1;
|
|
||||||
// the biome and blockstate hashcode should be already calculated by the time
|
|
||||||
// we get here, so this operation should be very fast
|
|
||||||
result = prime * result + (biome == null ? 0 : biome.hashCode());
|
|
||||||
result = prime * result + (blockState == null ? 0 : blockState.hashCode());
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean equals(Object otherObj)
|
|
||||||
{
|
|
||||||
if (otherObj == this)
|
|
||||||
{
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!(otherObj instanceof Entry))
|
|
||||||
{
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
Entry other = (Entry) otherObj;
|
|
||||||
return other.biome.getSerialString().equals(this.biome.getSerialString())
|
|
||||||
&& other.blockState.getSerialString().equals(this.blockState.getSerialString());
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String toString() { return this.serialize(); }
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
//=================//
|
|
||||||
// (de)serializing //
|
|
||||||
//=================//
|
|
||||||
|
|
||||||
public String serialize()
|
|
||||||
{
|
|
||||||
if (this.serialString == null)
|
|
||||||
{
|
|
||||||
this.serialString = this.biome.getSerialString() + BLOCK_STATE_SEPARATOR_STRING + this.blockState.getSerialString();
|
|
||||||
}
|
|
||||||
|
|
||||||
return this.serialString;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static Entry deserialize(String str, ILevelWrapper levelWrapper) throws DataCorruptedException
|
|
||||||
{
|
|
||||||
int separatorIndex = str.indexOf(BLOCK_STATE_SEPARATOR_STRING);
|
|
||||||
if (separatorIndex == -1)
|
|
||||||
{
|
|
||||||
throw new DataCorruptedException("Failed to deserialize BiomeBlockStateEntry ["+str+"], unable to find separator.");
|
|
||||||
}
|
|
||||||
|
|
||||||
IBiomeWrapper biome = WRAPPER_FACTORY.deserializeBiomeWrapperOrGetDefault(str.substring(0, separatorIndex), levelWrapper);
|
|
||||||
IBlockStateWrapper blockState = WRAPPER_FACTORY.deserializeBlockStateWrapperOrGetDefault(str.substring(separatorIndex+BLOCK_STATE_SEPARATOR_STRING.length()), levelWrapper);
|
|
||||||
return Entry.getEntry(biome, blockState);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
+8
-34
@@ -20,8 +20,8 @@
|
|||||||
package com.seibel.distanthorizons.core.dataObjects.fullData.sources;
|
package com.seibel.distanthorizons.core.dataObjects.fullData.sources;
|
||||||
|
|
||||||
import com.seibel.distanthorizons.api.enums.worldGeneration.EDhApiWorldGenerationStep;
|
import com.seibel.distanthorizons.api.enums.worldGeneration.EDhApiWorldGenerationStep;
|
||||||
import com.seibel.distanthorizons.core.file.IDataSource;
|
|
||||||
import com.seibel.distanthorizons.core.level.IDhLevel;
|
import com.seibel.distanthorizons.core.level.IDhLevel;
|
||||||
|
import com.seibel.distanthorizons.core.logging.DhLogger;
|
||||||
import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
|
import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
|
||||||
import com.seibel.distanthorizons.core.pos.DhSectionPos;
|
import com.seibel.distanthorizons.core.pos.DhSectionPos;
|
||||||
import com.seibel.distanthorizons.core.sql.dto.FullDataSourceV1DTO;
|
import com.seibel.distanthorizons.core.sql.dto.FullDataSourceV1DTO;
|
||||||
@@ -33,7 +33,6 @@ import com.seibel.distanthorizons.core.util.objects.dataStreams.DhDataOutputStre
|
|||||||
import com.seibel.distanthorizons.core.dataObjects.fullData.FullDataPointIdMap;
|
import com.seibel.distanthorizons.core.dataObjects.fullData.FullDataPointIdMap;
|
||||||
import com.seibel.distanthorizons.core.wrapperInterfaces.world.ILevelWrapper;
|
import com.seibel.distanthorizons.core.wrapperInterfaces.world.ILevelWrapper;
|
||||||
import com.seibel.distanthorizons.coreapi.util.BitShiftUtil;
|
import com.seibel.distanthorizons.coreapi.util.BitShiftUtil;
|
||||||
import org.apache.logging.log4j.Logger;
|
|
||||||
|
|
||||||
import java.io.*;
|
import java.io.*;
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
@@ -47,9 +46,9 @@ import java.util.Arrays;
|
|||||||
* @see FullDataPointUtil
|
* @see FullDataPointUtil
|
||||||
* @see FullDataSourceV2
|
* @see FullDataSourceV2
|
||||||
*/
|
*/
|
||||||
public class FullDataSourceV1 implements IDataSource<IDhLevel>
|
public class FullDataSourceV1
|
||||||
{
|
{
|
||||||
private static final Logger LOGGER = DhLoggerBuilder.getLogger();
|
private static final DhLogger LOGGER = new DhLoggerBuilder().build();
|
||||||
|
|
||||||
public static final byte SECTION_SIZE_OFFSET = DhSectionPos.SECTION_MINIMUM_DETAIL_LEVEL;
|
public static final byte SECTION_SIZE_OFFSET = DhSectionPos.SECTION_MINIMUM_DETAIL_LEVEL;
|
||||||
/** measured in dataPoints */
|
/** measured in dataPoints */
|
||||||
@@ -94,28 +93,13 @@ public class FullDataSourceV1 implements IDataSource<IDhLevel>
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
//======//
|
|
||||||
// data //
|
|
||||||
//======//
|
|
||||||
|
|
||||||
@Deprecated
|
|
||||||
@Override
|
|
||||||
public boolean update(FullDataSourceV2 dataSource, IDhLevel level) { throw new UnsupportedOperationException("Deprecated"); }
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
//=====================//
|
//=====================//
|
||||||
// setters and getters //
|
// setters and getters //
|
||||||
//=====================//
|
//=====================//
|
||||||
|
|
||||||
@Override
|
|
||||||
public Long getKey() { return this.pos; }
|
public Long getKey() { return this.pos; }
|
||||||
@Override
|
|
||||||
public String getKeyDisplayString() { return DhSectionPos.toString(this.pos); }
|
public String getKeyDisplayString() { return DhSectionPos.toString(this.pos); }
|
||||||
|
|
||||||
@Override
|
|
||||||
public long getPos() { return this.pos; }
|
public long getPos() { return this.pos; }
|
||||||
|
|
||||||
public void resizeDataStructuresForRepopulation(long pos)
|
public void resizeDataStructuresForRepopulation(long pos)
|
||||||
@@ -124,7 +108,6 @@ public class FullDataSourceV1 implements IDataSource<IDhLevel>
|
|||||||
this.pos = pos;
|
this.pos = pos;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public byte getDataDetailLevel() { return (byte) (DhSectionPos.getDetailLevel(this.pos) - SECTION_SIZE_OFFSET); }
|
public byte getDataDetailLevel() { return (byte) (DhSectionPos.getDetailLevel(this.pos) - SECTION_SIZE_OFFSET); }
|
||||||
|
|
||||||
public boolean isEmpty() { return this.isEmpty; }
|
public boolean isEmpty() { return this.isEmpty; }
|
||||||
@@ -197,7 +180,7 @@ public class FullDataSourceV1 implements IDataSource<IDhLevel>
|
|||||||
{
|
{
|
||||||
outputStream.writeInt(this.getDataDetailLevel());
|
outputStream.writeInt(this.getDataDetailLevel());
|
||||||
outputStream.writeInt(WIDTH);
|
outputStream.writeInt(WIDTH);
|
||||||
outputStream.writeInt(level.getMinY());
|
outputStream.writeInt(level.getLevelWrapper().getMinHeight());
|
||||||
outputStream.writeByte(this.worldGenStep.value);
|
outputStream.writeByte(this.worldGenStep.value);
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -206,19 +189,19 @@ public class FullDataSourceV1 implements IDataSource<IDhLevel>
|
|||||||
int dataDetail = inputStream.readInt();
|
int dataDetail = inputStream.readInt();
|
||||||
if (dataDetail != dto.dataDetailLevel)
|
if (dataDetail != dto.dataDetailLevel)
|
||||||
{
|
{
|
||||||
throw new IOException(LodUtil.formatLog("Data level mismatch. Expected: ["+dto.dataDetailLevel+"], found ["+dataDetail+"]."));
|
throw new IOException("Data level mismatch. Expected: ["+dto.dataDetailLevel+"], found ["+dataDetail+"].");
|
||||||
}
|
}
|
||||||
|
|
||||||
int width = inputStream.readInt();
|
int width = inputStream.readInt();
|
||||||
if (width != WIDTH)
|
if (width != WIDTH)
|
||||||
{
|
{
|
||||||
throw new IOException(LodUtil.formatLog("Section width mismatch: " + width + " != " + WIDTH + " (Currently only 1 section width is supported)"));
|
throw new IOException("Section width mismatch: [" + width + "] != [" + WIDTH + "] (Currently only 1 section width is supported)");
|
||||||
}
|
}
|
||||||
|
|
||||||
int minY = inputStream.readInt();
|
int minY = inputStream.readInt();
|
||||||
if (minY != level.getMinY())
|
if (minY != level.getLevelWrapper().getMinHeight())
|
||||||
{
|
{
|
||||||
LOGGER.warn("Data minY mismatch: " + minY + " != " + level.getMinY() + ". Will ignore data's y level");
|
LOGGER.warn("Data minY mismatch: [" + minY + "] != [" + level.getLevelWrapper().getMinHeight() + "]. Will ignore data's y level");
|
||||||
}
|
}
|
||||||
|
|
||||||
byte worldGenByte = inputStream.readByte();
|
byte worldGenByte = inputStream.readByte();
|
||||||
@@ -377,15 +360,6 @@ public class FullDataSourceV1 implements IDataSource<IDhLevel>
|
|||||||
public void setIdMapping(FullDataPointIdMap mappings) { this.mapping.mergeAndReturnRemappedEntityIds(mappings); }
|
public void setIdMapping(FullDataPointIdMap mappings) { this.mapping.mergeAndReturnRemappedEntityIds(mappings); }
|
||||||
|
|
||||||
|
|
||||||
//==================//
|
|
||||||
// override methods //
|
|
||||||
//==================//
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void close()
|
|
||||||
{ /* not currently needed */ }
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
//================//
|
//================//
|
||||||
// helper classes //
|
// helper classes //
|
||||||
|
|||||||
+388
-283
@@ -23,11 +23,13 @@ import com.seibel.distanthorizons.api.enums.config.EDhApiWorldCompressionMode;
|
|||||||
import com.seibel.distanthorizons.api.enums.worldGeneration.EDhApiWorldGenerationStep;
|
import com.seibel.distanthorizons.api.enums.worldGeneration.EDhApiWorldGenerationStep;
|
||||||
import com.seibel.distanthorizons.api.objects.data.DhApiTerrainDataPoint;
|
import com.seibel.distanthorizons.api.objects.data.DhApiTerrainDataPoint;
|
||||||
import com.seibel.distanthorizons.api.objects.data.IDhApiFullDataSource;
|
import com.seibel.distanthorizons.api.objects.data.IDhApiFullDataSource;
|
||||||
|
import com.seibel.distanthorizons.core.config.Config;
|
||||||
import com.seibel.distanthorizons.core.dataObjects.fullData.FullDataPointIdMap;
|
import com.seibel.distanthorizons.core.dataObjects.fullData.FullDataPointIdMap;
|
||||||
|
import com.seibel.distanthorizons.core.dataObjects.transformers.FullDataOcclusionCuller;
|
||||||
import com.seibel.distanthorizons.core.dataObjects.transformers.LodDataBuilder;
|
import com.seibel.distanthorizons.core.dataObjects.transformers.LodDataBuilder;
|
||||||
import com.seibel.distanthorizons.core.file.AbstractDataSourceHandler;
|
import com.seibel.distanthorizons.core.enums.EDhDirection;
|
||||||
import com.seibel.distanthorizons.core.file.IDataSource;
|
import com.seibel.distanthorizons.core.file.fullDatafile.V2.FullDataSourceProviderV2;
|
||||||
import com.seibel.distanthorizons.core.level.IDhLevel;
|
import com.seibel.distanthorizons.core.logging.DhLogger;
|
||||||
import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
|
import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
|
||||||
import com.seibel.distanthorizons.core.pooling.AbstractPhantomArrayList;
|
import com.seibel.distanthorizons.core.pooling.AbstractPhantomArrayList;
|
||||||
import com.seibel.distanthorizons.core.pooling.PhantomArrayListCheckout;
|
import com.seibel.distanthorizons.core.pooling.PhantomArrayListCheckout;
|
||||||
@@ -35,17 +37,18 @@ import com.seibel.distanthorizons.core.pooling.PhantomArrayListPool;
|
|||||||
import com.seibel.distanthorizons.core.pos.DhLodPos;
|
import com.seibel.distanthorizons.core.pos.DhLodPos;
|
||||||
import com.seibel.distanthorizons.core.pos.DhSectionPos;
|
import com.seibel.distanthorizons.core.pos.DhSectionPos;
|
||||||
import com.seibel.distanthorizons.core.pos.blockPos.DhBlockPos;
|
import com.seibel.distanthorizons.core.pos.blockPos.DhBlockPos;
|
||||||
|
import com.seibel.distanthorizons.core.sql.dto.util.FullDataMinMaxPosUtil;
|
||||||
import com.seibel.distanthorizons.core.util.*;
|
import com.seibel.distanthorizons.core.util.*;
|
||||||
import com.seibel.distanthorizons.core.util.objects.DataCorruptedException;
|
import com.seibel.distanthorizons.core.util.objects.DataCorruptedException;
|
||||||
import com.seibel.distanthorizons.core.wrapperInterfaces.chunk.IChunkWrapper;
|
import com.seibel.distanthorizons.core.wrapperInterfaces.chunk.IChunkWrapper;
|
||||||
import com.seibel.distanthorizons.core.wrapperInterfaces.world.ILevelWrapper;
|
import com.seibel.distanthorizons.core.wrapperInterfaces.world.ILevelWrapper;
|
||||||
import com.seibel.distanthorizons.coreapi.ModInfo;
|
import com.seibel.distanthorizons.coreapi.ModInfo;
|
||||||
import it.unimi.dsi.fastutil.bytes.ByteArrayList;
|
import it.unimi.dsi.fastutil.bytes.ByteArrayList;
|
||||||
|
import it.unimi.dsi.fastutil.ints.IntArrayList;
|
||||||
import it.unimi.dsi.fastutil.longs.LongArrayList;
|
import it.unimi.dsi.fastutil.longs.LongArrayList;
|
||||||
import org.apache.logging.log4j.Logger;
|
|
||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
|
import org.jetbrains.annotations.Nullable;
|
||||||
|
|
||||||
import javax.annotation.Nullable;
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
@@ -58,9 +61,9 @@ import java.util.List;
|
|||||||
*/
|
*/
|
||||||
public class FullDataSourceV2
|
public class FullDataSourceV2
|
||||||
extends AbstractPhantomArrayList
|
extends AbstractPhantomArrayList
|
||||||
implements IDataSource<IDhLevel>, IDhApiFullDataSource
|
implements IDhApiFullDataSource
|
||||||
{
|
{
|
||||||
private static final Logger LOGGER = DhLoggerBuilder.getLogger();
|
private static final DhLogger LOGGER = new DhLoggerBuilder().build();
|
||||||
/** useful for debugging, but can slow down update operations quite a bit due to being called so often. */
|
/** useful for debugging, but can slow down update operations quite a bit due to being called so often. */
|
||||||
private static final boolean RUN_UPDATE_DEV_VALIDATION = false;
|
private static final boolean RUN_UPDATE_DEV_VALIDATION = false;
|
||||||
/**
|
/**
|
||||||
@@ -75,8 +78,6 @@ public class FullDataSourceV2
|
|||||||
/** how many chunks wide this datasource is at detail level 0. */
|
/** how many chunks wide this datasource is at detail level 0. */
|
||||||
public static final int NUMB_OF_CHUNKS_WIDE = WIDTH / LodUtil.CHUNK_WIDTH;
|
public static final int NUMB_OF_CHUNKS_WIDE = WIDTH / LodUtil.CHUNK_WIDTH;
|
||||||
|
|
||||||
public static final byte DATA_FORMAT_VERSION = 1;
|
|
||||||
|
|
||||||
public static final PhantomArrayListPool ARRAY_LIST_POOL = new PhantomArrayListPool("FullDataV2");
|
public static final PhantomArrayListPool ARRAY_LIST_POOL = new PhantomArrayListPool("FullDataV2");
|
||||||
|
|
||||||
|
|
||||||
@@ -84,10 +85,6 @@ public class FullDataSourceV2
|
|||||||
private int cachedHashCode = 0;
|
private int cachedHashCode = 0;
|
||||||
|
|
||||||
private final long pos;
|
private final long pos;
|
||||||
@Override
|
|
||||||
public Long getKey() { return this.pos; }
|
|
||||||
@Override
|
|
||||||
public String getKeyDisplayString() { return DhSectionPos.toString(this.pos); }
|
|
||||||
|
|
||||||
|
|
||||||
public final FullDataPointIdMap mapping;
|
public final FullDataPointIdMap mapping;
|
||||||
@@ -96,8 +93,6 @@ public class FullDataSourceV2
|
|||||||
public long lastModifiedUnixDateTime;
|
public long lastModifiedUnixDateTime;
|
||||||
public long createdUnixDateTime;
|
public long createdUnixDateTime;
|
||||||
|
|
||||||
public int levelMinY;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* stores how far each column has been generated should start with {@link EDhApiWorldGenerationStep#EMPTY}
|
* stores how far each column has been generated should start with {@link EDhApiWorldGenerationStep#EMPTY}
|
||||||
*
|
*
|
||||||
@@ -113,9 +108,7 @@ public class FullDataSourceV2
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* stored x/z, y <br>
|
* stored x/z, y <br>
|
||||||
* The y data should be sorted from top to bottom <br>
|
* The y data should be sorted from top to bottom
|
||||||
* TODO that ordering feels weird, it'd be nice to reverse that order, unfortunately
|
|
||||||
* there's something in the render data logic that expects this order so we can't change it right now
|
|
||||||
*/
|
*/
|
||||||
public final LongArrayList[] dataPoints;
|
public final LongArrayList[] dataPoints;
|
||||||
|
|
||||||
@@ -128,7 +121,7 @@ public class FullDataSourceV2
|
|||||||
public Boolean applyToChildren = null;
|
public Boolean applyToChildren = null;
|
||||||
|
|
||||||
/** should only be used by methods exposed via the DH API */
|
/** should only be used by methods exposed via the DH API */
|
||||||
private boolean runApiChunkValidation = false;
|
private boolean runApiSetterValidation = false;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@@ -209,8 +202,9 @@ public class FullDataSourceV2
|
|||||||
|
|
||||||
public static FullDataSourceV2 createEmpty(long pos)
|
public static FullDataSourceV2 createEmpty(long pos)
|
||||||
{
|
{
|
||||||
|
FullDataPointIdMap map = new FullDataPointIdMap(pos);
|
||||||
return new FullDataSourceV2(
|
return new FullDataSourceV2(
|
||||||
pos, new FullDataPointIdMap(pos),
|
pos, map,
|
||||||
// data points, genSteps, and columnCompression are all null since
|
// data points, genSteps, and columnCompression are all null since
|
||||||
// nothing has been generated yet.
|
// nothing has been generated yet.
|
||||||
// Using the default value of all 0's is adequate
|
// Using the default value of all 0's is adequate
|
||||||
@@ -225,7 +219,7 @@ public class FullDataSourceV2
|
|||||||
private FullDataSourceV2(
|
private FullDataSourceV2(
|
||||||
long pos,
|
long pos,
|
||||||
FullDataPointIdMap mapping, @Nullable LongArrayList[] data,
|
FullDataPointIdMap mapping, @Nullable LongArrayList[] data,
|
||||||
@Nullable byte[] columnGenerationSteps, @Nullable byte[] columnWorldCompressionMode,
|
byte @Nullable [] columnGenerationSteps, byte @Nullable [] columnWorldCompressionMode,
|
||||||
boolean empty)
|
boolean empty)
|
||||||
{
|
{
|
||||||
super(ARRAY_LIST_POOL, 2, 0, WIDTH * WIDTH);
|
super(ARRAY_LIST_POOL, 2, 0, WIDTH * WIDTH);
|
||||||
@@ -282,20 +276,32 @@ public class FullDataSourceV2
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
//======//
|
//=========//
|
||||||
// getters //
|
// getters //
|
||||||
//======//
|
//=========//
|
||||||
|
|
||||||
public LongArrayList get(int relX, int relZ) throws IndexOutOfBoundsException
|
public LongArrayList getColumnAtRelPos(int relX, int relZ) throws IndexOutOfBoundsException
|
||||||
{ return this.dataPoints[relativePosToIndex(relX, relZ)]; }
|
{ return this.dataPoints[relativePosToIndex(relX, relZ)]; }
|
||||||
|
|
||||||
|
@Nullable
|
||||||
|
public LongArrayList tryGetColumnAtRelPos(int relX, int relZ)
|
||||||
|
{
|
||||||
|
int index = tryGetRelativePosToIndex(relX, relZ);
|
||||||
|
if (index == -1)
|
||||||
|
{
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
return this.dataPoints[index];
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* returns {@link FullDataPointUtil#EMPTY_DATA_POINT} if the given {@link DhBlockPos}
|
* returns {@link FullDataPointUtil#EMPTY_DATA_POINT} if the given {@link DhBlockPos}
|
||||||
* is outside this data source's boundaries.
|
* is outside this data source's boundaries.
|
||||||
*/
|
*/
|
||||||
public long getAtBlockPos(DhBlockPos blockPos)
|
public long getDataPointAtBlockPos(int blockPosX, int blockPosY, int blockPosZ, int levelMinY)
|
||||||
{
|
{
|
||||||
DhLodPos requestedPos = new DhLodPos(LodUtil.BLOCK_DETAIL_LEVEL, blockPos.getX(), blockPos.getZ());
|
DhLodPos requestedPos = new DhLodPos(LodUtil.BLOCK_DETAIL_LEVEL, blockPosX, blockPosZ);
|
||||||
|
|
||||||
// stop if the requested blockPos is outside this datasource
|
// stop if the requested blockPos is outside this datasource
|
||||||
{
|
{
|
||||||
@@ -317,7 +323,7 @@ public class FullDataSourceV2
|
|||||||
DhLodPos relativePos = requestedPos.getDhSectionRelativePositionForDetailLevel(requestDetailLevel);
|
DhLodPos relativePos = requestedPos.getDhSectionRelativePositionForDetailLevel(requestDetailLevel);
|
||||||
|
|
||||||
// get the data column
|
// get the data column
|
||||||
LongArrayList dataColumn = this.get(relativePos.x, relativePos.z);
|
LongArrayList dataColumn = this.getColumnAtRelPos(relativePos.x, relativePos.z);
|
||||||
if (dataColumn == null)
|
if (dataColumn == null)
|
||||||
{
|
{
|
||||||
return FullDataPointUtil.EMPTY_DATA_POINT;
|
return FullDataPointUtil.EMPTY_DATA_POINT;
|
||||||
@@ -325,6 +331,7 @@ public class FullDataSourceV2
|
|||||||
|
|
||||||
|
|
||||||
// search for a datapoint that contains the given block y position
|
// search for a datapoint that contains the given block y position
|
||||||
|
int relBlockPosY = blockPosY - levelMinY;
|
||||||
long dataPoint;
|
long dataPoint;
|
||||||
for (int i = 0; i < dataColumn.size(); i++)
|
for (int i = 0; i < dataColumn.size(); i++)
|
||||||
{
|
{
|
||||||
@@ -339,14 +346,13 @@ public class FullDataSourceV2
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
int requestedY = blockPos.getY();
|
int bottomY = FullDataPointUtil.getBottomY(dataPoint);
|
||||||
int bottomY = FullDataPointUtil.getBottomY(dataPoint) + this.levelMinY;
|
|
||||||
int height = FullDataPointUtil.getHeight(dataPoint);
|
int height = FullDataPointUtil.getHeight(dataPoint);
|
||||||
int topY = bottomY + height;
|
int topY = bottomY + height;
|
||||||
|
|
||||||
// does this datapoint contain the requested Y position?
|
// does this datapoint contain the requested Y position?
|
||||||
if (bottomY <= requestedY
|
if (bottomY <= relBlockPosY
|
||||||
&& requestedY < topY) // blockPositions start from the bottom of the block, thus "<=" for bottomY, just "<" for topY
|
&& relBlockPosY < topY) // blockPositions start from the bottom of the block, thus "<=" for bottomY, just "<" for topY
|
||||||
{
|
{
|
||||||
return dataPoint;
|
return dataPoint;
|
||||||
}
|
}
|
||||||
@@ -361,9 +367,7 @@ public class FullDataSourceV2
|
|||||||
// updating //
|
// updating //
|
||||||
//==========//
|
//==========//
|
||||||
|
|
||||||
@Override
|
public boolean updateFromDataSource(@NotNull FullDataSourceV2 inputDataSource)
|
||||||
public boolean update(@NotNull FullDataSourceV2 inputDataSource, @Nullable IDhLevel level) { return this.update(inputDataSource); }
|
|
||||||
public boolean update(@NotNull FullDataSourceV2 inputDataSource)
|
|
||||||
{
|
{
|
||||||
// don't try updating if the input is empty
|
// don't try updating if the input is empty
|
||||||
if (inputDataSource.mapping.isEmpty())
|
if (inputDataSource.mapping.isEmpty())
|
||||||
@@ -391,7 +395,7 @@ public class FullDataSourceV2
|
|||||||
// copy over application flag if either are set to continue propagating
|
// copy over application flag if either are set to continue propagating
|
||||||
(BoolUtil.falseIfNull(this.applyToParent) || BoolUtil.falseIfNull(inputDataSource.applyToParent))
|
(BoolUtil.falseIfNull(this.applyToParent) || BoolUtil.falseIfNull(inputDataSource.applyToParent))
|
||||||
// don't propagate past the top of the tree
|
// don't propagate past the top of the tree
|
||||||
&& (DhSectionPos.getDetailLevel(this.pos) < AbstractDataSourceHandler.TOP_SECTION_DETAIL_LEVEL);
|
&& (DhSectionPos.getDetailLevel(this.pos) < FullDataSourceProviderV2.ROOT_SECTION_DETAIL_LEVEL);
|
||||||
}
|
}
|
||||||
|
|
||||||
// null check to prevent setting a flag we don't want to save in the DB
|
// null check to prevent setting a flag we don't want to save in the DB
|
||||||
@@ -400,7 +404,7 @@ public class FullDataSourceV2
|
|||||||
this.applyToChildren =
|
this.applyToChildren =
|
||||||
(BoolUtil.falseIfNull(this.applyToChildren) || BoolUtil.falseIfNull(inputDataSource.applyToChildren))
|
(BoolUtil.falseIfNull(this.applyToChildren) || BoolUtil.falseIfNull(inputDataSource.applyToChildren))
|
||||||
// don't propagate past the bottom of the tree
|
// don't propagate past the bottom of the tree
|
||||||
&& (DhSectionPos.getDetailLevel(this.pos) > AbstractDataSourceHandler.MIN_SECTION_DETAIL_LEVEL);
|
&& (DhSectionPos.getDetailLevel(this.pos) > FullDataSourceProviderV2.LEAF_SECTION_DETAIL_LEVEL);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if (inputDetailLevel + 1 == thisDetailLevel)
|
else if (inputDetailLevel + 1 == thisDetailLevel)
|
||||||
@@ -411,7 +415,7 @@ public class FullDataSourceV2
|
|||||||
this.applyToParent =
|
this.applyToParent =
|
||||||
dataChanged
|
dataChanged
|
||||||
&& (BoolUtil.falseIfNull(this.applyToParent) || BoolUtil.falseIfNull(inputDataSource.applyToParent))
|
&& (BoolUtil.falseIfNull(this.applyToParent) || BoolUtil.falseIfNull(inputDataSource.applyToParent))
|
||||||
&& (DhSectionPos.getDetailLevel(this.pos) < AbstractDataSourceHandler.TOP_SECTION_DETAIL_LEVEL);
|
&& (DhSectionPos.getDetailLevel(this.pos) < FullDataSourceProviderV2.ROOT_SECTION_DETAIL_LEVEL);
|
||||||
|
|
||||||
}
|
}
|
||||||
else if (inputDetailLevel - 1 == thisDetailLevel)
|
else if (inputDetailLevel - 1 == thisDetailLevel)
|
||||||
@@ -423,7 +427,7 @@ public class FullDataSourceV2
|
|||||||
this.applyToChildren =
|
this.applyToChildren =
|
||||||
dataChanged
|
dataChanged
|
||||||
&& (BoolUtil.falseIfNull(this.applyToChildren) || BoolUtil.falseIfNull(inputDataSource.applyToChildren))
|
&& (BoolUtil.falseIfNull(this.applyToChildren) || BoolUtil.falseIfNull(inputDataSource.applyToChildren))
|
||||||
&& (DhSectionPos.getDetailLevel(this.pos) > AbstractDataSourceHandler.MIN_SECTION_DETAIL_LEVEL);
|
&& (DhSectionPos.getDetailLevel(this.pos) > FullDataSourceProviderV2.LEAF_SECTION_DETAIL_LEVEL);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@@ -434,8 +438,31 @@ public class FullDataSourceV2
|
|||||||
throw new UnsupportedOperationException("Unsupported data source update. Expected input detail level of ["+(thisDetailLevel-1)+"], ["+thisDetailLevel+"], or ["+(thisDetailLevel+1)+"], received detail level ["+inputDetailLevel+"].");
|
throw new UnsupportedOperationException("Unsupported data source update. Expected input detail level of ["+(thisDetailLevel-1)+"], ["+thisDetailLevel+"], or ["+(thisDetailLevel+1)+"], received detail level ["+inputDetailLevel+"].");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
if (dataChanged)
|
if (dataChanged)
|
||||||
{
|
{
|
||||||
|
EDhApiWorldCompressionMode worldCompressionMode = Config.Common.LodBuilding.worldCompression.get();
|
||||||
|
boolean cullHiddenBlocks = (worldCompressionMode != EDhApiWorldCompressionMode.MERGE_SAME_BLOCKS);
|
||||||
|
if (cullHiddenBlocks)
|
||||||
|
{
|
||||||
|
for (int x = 0; x < WIDTH; x++)
|
||||||
|
{
|
||||||
|
for (int z = 0; z < WIDTH; z++)
|
||||||
|
{
|
||||||
|
LongArrayList dataColumn = this.getColumnAtRelPos(x, z);
|
||||||
|
if (dataColumn != null
|
||||||
|
&& dataColumn.size() > 1)
|
||||||
|
{
|
||||||
|
FullDataOcclusionCuller.cullHiddenDatapointsInColumn(this, x, z);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
// update the hash code
|
// update the hash code
|
||||||
this.generateHashCode();
|
this.generateHashCode();
|
||||||
}
|
}
|
||||||
@@ -443,7 +470,7 @@ public class FullDataSourceV2
|
|||||||
return dataChanged;
|
return dataChanged;
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean updateFromSameDetailLevel(FullDataSourceV2 inputDataSource, int[] remappedIds)
|
private boolean updateFromSameDetailLevel(FullDataSourceV2 inputDataSource, int[] remappedIds)
|
||||||
{
|
{
|
||||||
// both data sources should have the same detail level
|
// both data sources should have the same detail level
|
||||||
if (DhSectionPos.getDetailLevel(inputDataSource.pos) != DhSectionPos.getDetailLevel(this.pos))
|
if (DhSectionPos.getDetailLevel(inputDataSource.pos) != DhSectionPos.getDetailLevel(this.pos))
|
||||||
@@ -459,96 +486,103 @@ public class FullDataSourceV2
|
|||||||
for (int z = 0; z < WIDTH; z++)
|
for (int z = 0; z < WIDTH; z++)
|
||||||
{
|
{
|
||||||
int index = relativePosToIndex(x, z);
|
int index = relativePosToIndex(x, z);
|
||||||
|
|
||||||
LongArrayList inputDataArray = inputDataSource.dataPoints[index];
|
LongArrayList inputDataArray = inputDataSource.dataPoints[index];
|
||||||
if (inputDataArray != null)
|
if (inputDataArray == null)
|
||||||
{
|
{
|
||||||
byte thisGenState = this.columnGenerationSteps.getByte(index);
|
continue;
|
||||||
byte inputGenState = inputDataSource.columnGenerationSteps.getByte(index);
|
}
|
||||||
|
|
||||||
|
|
||||||
// determine if this column should be updated
|
|
||||||
boolean genStateAllowsUpdating = false;
|
byte thisGenState = this.columnGenerationSteps.getByte(index);
|
||||||
// if the input is downsampled, we only want to replace empty or downsampled values
|
byte inputGenState = inputDataSource.columnGenerationSteps.getByte(index);
|
||||||
if (inputGenState == EDhApiWorldGenerationStep.DOWN_SAMPLED.value
|
|
||||||
&&
|
|
||||||
(
|
// determine if this column should be updated
|
||||||
thisGenState == EDhApiWorldGenerationStep.EMPTY.value
|
boolean genStateAllowsUpdating = false;
|
||||||
|| thisGenState == EDhApiWorldGenerationStep.DOWN_SAMPLED.value
|
// if the input is downsampled, we only want to replace empty or downsampled values
|
||||||
))
|
if (inputGenState == EDhApiWorldGenerationStep.DOWN_SAMPLED.value
|
||||||
|
&&
|
||||||
|
(
|
||||||
|
thisGenState == EDhApiWorldGenerationStep.EMPTY.value
|
||||||
|
|| thisGenState == EDhApiWorldGenerationStep.DOWN_SAMPLED.value
|
||||||
|
))
|
||||||
|
{
|
||||||
|
genStateAllowsUpdating = true;
|
||||||
|
}
|
||||||
|
// if the input is any other non-empty value,
|
||||||
|
// replace anything that is less-complete
|
||||||
|
else if (inputGenState != EDhApiWorldGenerationStep.EMPTY.value
|
||||||
|
&& thisGenState <= inputGenState)
|
||||||
|
{
|
||||||
|
// don't apply less-complete generation data
|
||||||
|
genStateAllowsUpdating = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!genStateAllowsUpdating)
|
||||||
|
{
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
// check if the data changed
|
||||||
|
if (this.dataPoints[index] == null)
|
||||||
|
{
|
||||||
|
// no data was present previously
|
||||||
|
this.dataPoints[index] = new LongArrayList(inputDataArray);
|
||||||
|
dataChanged = true;
|
||||||
|
}
|
||||||
|
else if (this.dataPoints[index].size() != inputDataArray.size())
|
||||||
|
{
|
||||||
|
// data is present, but the size is different
|
||||||
|
dataChanged = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
int oldDataHash = 0;
|
||||||
|
if (!dataChanged)
|
||||||
|
{
|
||||||
|
// some old data existed with the same length,
|
||||||
|
// we'll have to compare the caches
|
||||||
|
oldDataHash = this.dataPoints[index].hashCode();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
// copy over the new data
|
||||||
|
this.dataPoints[index].clear();
|
||||||
|
this.dataPoints[index].addAll(inputDataArray);
|
||||||
|
this.remapDataColumn(index, remappedIds);
|
||||||
|
|
||||||
|
if (RUN_DATA_ORDER_VALIDATION)
|
||||||
|
{
|
||||||
|
throwIfDataColumnInWrongOrder(inputDataSource.pos, this.dataPoints[index]);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
if (!dataChanged)
|
||||||
|
{
|
||||||
|
// check if the identical length data column hashes are the same
|
||||||
|
// hashes need to be compared after the ID's have been remapped otherwise the ID's won't match even if the data is the same
|
||||||
|
if (oldDataHash != this.dataPoints[index].hashCode())
|
||||||
{
|
{
|
||||||
genStateAllowsUpdating = true;
|
// the hashes are different, something was changed
|
||||||
}
|
dataChanged = true;
|
||||||
// if the input is any other non-empty value,
|
|
||||||
// replace anything that is less-complete
|
|
||||||
else if (inputGenState != EDhApiWorldGenerationStep.EMPTY.value
|
|
||||||
&& thisGenState <= inputGenState)
|
|
||||||
{
|
|
||||||
// don't apply less-complete generation data
|
|
||||||
genStateAllowsUpdating = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
if (genStateAllowsUpdating)
|
|
||||||
{
|
|
||||||
// check if the data changed
|
|
||||||
if (this.dataPoints[index] == null)
|
|
||||||
{
|
|
||||||
// no data was present previously
|
|
||||||
this.dataPoints[index] = new LongArrayList(inputDataArray);
|
|
||||||
dataChanged = true;
|
|
||||||
}
|
|
||||||
else if (this.dataPoints[index].size() != inputDataArray.size())
|
|
||||||
{
|
|
||||||
// data is present, but the size is different
|
|
||||||
dataChanged = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
int oldDataHash = 0;
|
|
||||||
if (!dataChanged)
|
|
||||||
{
|
|
||||||
// some old data existed with the same length,
|
|
||||||
// we'll have to compare the caches
|
|
||||||
oldDataHash = this.dataPoints[index].hashCode();
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
// copy over the new data
|
|
||||||
this.dataPoints[index].clear();
|
|
||||||
this.dataPoints[index].addAll(inputDataArray);
|
|
||||||
this.remapDataColumn(index, remappedIds);
|
|
||||||
|
|
||||||
if (RUN_DATA_ORDER_VALIDATION)
|
|
||||||
{
|
|
||||||
throwIfDataColumnInWrongOrder(inputDataSource.pos, this.dataPoints[index]);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
if (!dataChanged)
|
|
||||||
{
|
|
||||||
// check if the identical length data column hashes are the same
|
|
||||||
// hashes need to be compared after the ID's have been remapped otherwise the ID's won't match even if the data is the same
|
|
||||||
if (oldDataHash != this.dataPoints[index].hashCode())
|
|
||||||
{
|
|
||||||
// the hashes are different, something was changed
|
|
||||||
dataChanged = true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
this.columnGenerationSteps.set(index, inputGenState);
|
|
||||||
// always overwrite the compression mode since we're replacing this column
|
|
||||||
this.columnWorldCompressionMode.set(index, inputDataSource.columnWorldCompressionMode.getByte(index));
|
|
||||||
this.isEmpty = false;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
this.columnGenerationSteps.set(index, inputGenState);
|
||||||
|
// always overwrite the compression mode since we're replacing this column
|
||||||
|
this.columnWorldCompressionMode.set(index, inputDataSource.columnWorldCompressionMode.getByte(index));
|
||||||
|
this.isEmpty = false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return dataChanged;
|
return dataChanged;
|
||||||
}
|
}
|
||||||
public boolean updateFromOneBelowDetailLevel(FullDataSourceV2 inputDataSource, int[] remappedIds)
|
|
||||||
|
private boolean updateFromOneBelowDetailLevel(FullDataSourceV2 inputDataSource, int[] remappedIds)
|
||||||
{
|
{
|
||||||
if (DhSectionPos.getDetailLevel(inputDataSource.pos) + 1 != DhSectionPos.getDetailLevel(this.pos))
|
if (DhSectionPos.getDetailLevel(inputDataSource.pos) + 1 != DhSectionPos.getDetailLevel(this.pos))
|
||||||
{
|
{
|
||||||
@@ -684,176 +718,221 @@ public class FullDataSourceV2
|
|||||||
{
|
{
|
||||||
LongArrayList newColumnList = new LongArrayList();
|
LongArrayList newColumnList = new LongArrayList();
|
||||||
|
|
||||||
// special numbers:
|
|
||||||
// -2 = the column's height hasn't been determined yet
|
//=========================//
|
||||||
// -1 = we've reached the end of the column
|
// get the 4 input columns //
|
||||||
int[] currentDatapointIndex = new int[] { -2, -2, -2, -2 };
|
//=========================//
|
||||||
|
|
||||||
|
LongArrayList[] inputColumns = new LongArrayList[4];
|
||||||
|
int colIndex = 0;
|
||||||
|
for (int inputX = x; inputX < x + 2; inputX++)
|
||||||
|
{
|
||||||
|
for (int inputZ = z; inputZ < z + 2; inputZ++, colIndex++)
|
||||||
|
{
|
||||||
|
inputColumns[colIndex] = inputDataSource.dataPoints[relativePosToIndex(inputX, inputZ)];
|
||||||
|
if (inputColumns[colIndex] != null
|
||||||
|
&& RUN_DATA_ORDER_VALIDATION)
|
||||||
|
{
|
||||||
|
throwIfDataColumnInWrongOrder(inputDataSource.pos, inputColumns[colIndex]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
//========================================//
|
||||||
|
// find all y levels where changes happen //
|
||||||
|
//========================================//
|
||||||
|
|
||||||
|
IntArrayList yTransitions = new IntArrayList();
|
||||||
|
for (int i = 0; i < 4; i++)
|
||||||
|
{
|
||||||
|
if (inputColumns[i] == null
|
||||||
|
|| inputColumns[i].isEmpty())
|
||||||
|
{
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
for (int j = 0; j < inputColumns[i].size(); j++)
|
||||||
|
{
|
||||||
|
long datapoint = inputColumns[i].getLong(j);
|
||||||
|
int minY = FullDataPointUtil.getBottomY(datapoint);
|
||||||
|
int maxY = minY + FullDataPointUtil.getHeight(datapoint);
|
||||||
|
|
||||||
|
if (!yTransitions.contains(minY))
|
||||||
|
{
|
||||||
|
yTransitions.add(minY);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!yTransitions.contains(maxY))
|
||||||
|
{
|
||||||
|
yTransitions.add(maxY);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// can happen if the columns are empty
|
||||||
|
if (yTransitions.isEmpty())
|
||||||
|
{
|
||||||
|
return newColumnList;
|
||||||
|
}
|
||||||
|
|
||||||
|
// sort the transitions from bottom to top // TODO
|
||||||
|
yTransitions.sort(null);
|
||||||
|
|
||||||
|
// create index trackers for each column,
|
||||||
|
// starting with the top-most datapoint
|
||||||
|
int[] currentIndices = new int[4];
|
||||||
|
for (int i = 0; i < 4; i++)
|
||||||
|
{
|
||||||
|
if (inputColumns[i] != null
|
||||||
|
&& !inputColumns[i].isEmpty())
|
||||||
|
{
|
||||||
|
currentIndices[i] = inputColumns[i].size() - 1;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
currentIndices[i] = -1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
//=======================//
|
||||||
|
// process each Y change //
|
||||||
|
//=======================//
|
||||||
|
|
||||||
int lastId = 0;
|
int lastId = 0;
|
||||||
byte lastBlockLight = 0;
|
byte lastBlockLight = 0;
|
||||||
byte lastSkyLight = 0;
|
byte lastSkyLight = 0;
|
||||||
int height = 0;
|
int currentMinY = yTransitions.getInt(0);
|
||||||
int minY = 0;
|
int accumulatedHeight = 0;
|
||||||
|
|
||||||
|
|
||||||
// these arrays will be reused quite often, so re-using them helps reduce some GC pressure
|
|
||||||
long[] datapointsForYSlice = new long[4];
|
|
||||||
int[] mergeIds = new int[4];
|
int[] mergeIds = new int[4];
|
||||||
int[] mergeBlockLights = new int[4];
|
int[] mergeBlockLights = new int[4];
|
||||||
int[] mergeSkyLights = new int[4];
|
int[] mergeSkyLights = new int[4];
|
||||||
|
|
||||||
|
for (int yIndex = 0; yIndex < yTransitions.size() - 1; yIndex++)
|
||||||
for (int blockY = 0; blockY < RenderDataPointUtil.MAX_WORLD_Y_SIZE; blockY++, height++)
|
|
||||||
{
|
{
|
||||||
// if each column has reached the end of their data, nothing more needs to be done
|
int sliceMinY = yTransitions.getInt(yIndex);
|
||||||
if (currentDatapointIndex[0] == -1
|
int sliceMaxY = yTransitions.getInt(yIndex + 1);
|
||||||
&& currentDatapointIndex[1] == -1
|
int sliceHeight = sliceMaxY - sliceMinY;
|
||||||
&& currentDatapointIndex[2] == -1
|
|
||||||
&& currentDatapointIndex[3] == -1
|
|
||||||
)
|
|
||||||
{
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
// scary double loop but,
|
|
||||||
// this will only ever loop 4 times,
|
|
||||||
// once for each of the 4 input columns
|
|
||||||
Arrays.fill(datapointsForYSlice, 0L);
|
|
||||||
int colIndex = 0;
|
|
||||||
for (int inputX = x; inputX < x + 2; inputX++)
|
|
||||||
{
|
|
||||||
for (int inputZ = z; inputZ < z + 2; inputZ++, colIndex++)
|
|
||||||
{
|
|
||||||
// TODO throw an assertion if the column isn't in top-down order or just fix it...
|
|
||||||
LongArrayList inputDataArray = inputDataSource.dataPoints[relativePosToIndex(inputX, inputZ)];
|
|
||||||
if (inputDataArray == null || inputDataArray.size() == 0)
|
|
||||||
{
|
|
||||||
currentDatapointIndex[colIndex] = -1;
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
// determine the last index (the lowest data point) for each column
|
|
||||||
if (currentDatapointIndex[colIndex] == -2)
|
|
||||||
{
|
|
||||||
currentDatapointIndex[colIndex] = inputDataArray.size() - 1;
|
|
||||||
|
|
||||||
if (RUN_DATA_ORDER_VALIDATION)
|
|
||||||
{
|
|
||||||
throwIfDataColumnInWrongOrder(inputDataSource.pos, inputDataArray);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
int dataPointIndex = currentDatapointIndex[colIndex];
|
|
||||||
if (dataPointIndex == -1)
|
|
||||||
{
|
|
||||||
// went over the end
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
long datapoint = inputDataArray.getLong(dataPointIndex);
|
|
||||||
|
|
||||||
int datapointMinY = FullDataPointUtil.getBottomY(datapoint);
|
|
||||||
int numbOfBlocksTall = FullDataPointUtil.getHeight(datapoint);
|
|
||||||
int datapointMaxY = (datapointMinY + numbOfBlocksTall);
|
|
||||||
|
|
||||||
|
|
||||||
// check if y position is inside this datapoint
|
|
||||||
if (blockY < datapointMinY)
|
|
||||||
{
|
|
||||||
// this y-slice is below this datapoint, nothing can be added
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
else if (blockY >= datapointMaxY)
|
|
||||||
{
|
|
||||||
// this y-slice is above the current datapoint,
|
|
||||||
// try the next data point
|
|
||||||
|
|
||||||
int newDatapointIndex = currentDatapointIndex[colIndex] - 1;
|
|
||||||
if (newDatapointIndex < 0)
|
|
||||||
{
|
|
||||||
// went to far, no additional data present
|
|
||||||
newDatapointIndex = -1;
|
|
||||||
}
|
|
||||||
currentDatapointIndex[colIndex] = newDatapointIndex;
|
|
||||||
|
|
||||||
|
|
||||||
// try again with the next data point
|
|
||||||
inputZ--;
|
|
||||||
colIndex--;
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
datapointsForYSlice[colIndex] = datapoint;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
// Sample at the midpoint of this slice
|
||||||
|
int sampleY = sliceMinY + (sliceHeight / 2);
|
||||||
|
|
||||||
|
// Get data from each column at this Y level
|
||||||
Arrays.fill(mergeIds, 0);
|
Arrays.fill(mergeIds, 0);
|
||||||
Arrays.fill(mergeBlockLights, 0);
|
Arrays.fill(mergeBlockLights, 0);
|
||||||
Arrays.fill(mergeSkyLights, 0);
|
Arrays.fill(mergeSkyLights, 0);
|
||||||
|
|
||||||
for (int i = 0; i < 4; i++)
|
for (int i = 0; i < 4; i++)
|
||||||
{
|
{
|
||||||
mergeIds[i] = FullDataPointUtil.getId(datapointsForYSlice[i]);
|
// skip columns that are empty or where we have already reached the bottom
|
||||||
mergeBlockLights[i] = FullDataPointUtil.getBlockLight(datapointsForYSlice[i]);
|
if (currentIndices[i] == -1)
|
||||||
mergeSkyLights[i] = FullDataPointUtil.getSkyLight(datapointsForYSlice[i]);
|
{
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
LongArrayList column = inputColumns[i];
|
||||||
|
if (column == null)
|
||||||
|
{
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
// move the index down if we've passed the current datapoint
|
||||||
|
while (currentIndices[i] >= 0)
|
||||||
|
{
|
||||||
|
long datapoint = column.getLong(currentIndices[i]);
|
||||||
|
int inputMinY = FullDataPointUtil.getBottomY(datapoint);
|
||||||
|
int inputMaxY = inputMinY + FullDataPointUtil.getHeight(datapoint);
|
||||||
|
|
||||||
|
if (sampleY >= inputMaxY)
|
||||||
|
{
|
||||||
|
// Sample point is above this datapoint, move to next (lower) one
|
||||||
|
currentIndices[i]--;
|
||||||
|
}
|
||||||
|
else if (sampleY >= inputMinY
|
||||||
|
&& sampleY < inputMaxY)
|
||||||
|
{
|
||||||
|
// Sample point is within this datapoint
|
||||||
|
mergeIds[i] = FullDataPointUtil.getId(datapoint);
|
||||||
|
mergeBlockLights[i] = FullDataPointUtil.getBlockLight(datapoint);
|
||||||
|
mergeSkyLights[i] = FullDataPointUtil.getSkyLight(datapoint);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
// Sample point is below this datapoint
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// determine the most common values for this slice
|
|
||||||
int id = determineMostValueInColumnSlice(mergeIds, inputDataSource.mapping);
|
// Determine merged values for this slice
|
||||||
|
int id = determineMostCommonValueInColumnSlice(mergeIds, inputDataSource.mapping);
|
||||||
byte blockLight = (byte) determineAverageValueInColumnSlice(mergeBlockLights);
|
byte blockLight = (byte) determineAverageValueInColumnSlice(mergeBlockLights);
|
||||||
byte skyLight = (byte) determineAverageValueInColumnSlice(mergeSkyLights);
|
byte skyLight = (byte) determineAverageValueInColumnSlice(mergeSkyLights);
|
||||||
|
|
||||||
// if this slice is different then the last one, create a new one
|
// Check if we need to start a new datapoint
|
||||||
if (id != lastId
|
if (accumulatedHeight == 0)
|
||||||
// block and sky light might not be necessary
|
|
||||||
|| blockLight != lastBlockLight
|
|
||||||
|| skyLight != lastSkyLight)
|
|
||||||
{
|
{
|
||||||
if (height != 0)
|
// first datapoint
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
long datapoint = FullDataPointUtil.encode(lastId, height, minY, lastBlockLight, lastSkyLight);
|
|
||||||
newColumnList.add(datapoint);
|
|
||||||
}
|
|
||||||
catch (DataCorruptedException e)
|
|
||||||
{
|
|
||||||
// shouldn't happen, (especially if validation is disabled) but just in case
|
|
||||||
LOGGER.warn("Skipping corrupt datapoint for pos "+inputDataSource.pos+" at relative position ["+x+","+z+"] with data: ID["+lastId+"], Height["+height+"], minY["+minY+"], lastBlockLight["+lastBlockLight+"], lastSkyLight["+lastSkyLight+"].");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
lastId = id;
|
lastId = id;
|
||||||
lastBlockLight = blockLight;
|
lastBlockLight = blockLight;
|
||||||
lastSkyLight = skyLight;
|
lastSkyLight = skyLight;
|
||||||
height = 0;
|
currentMinY = sliceMinY;
|
||||||
minY = blockY;
|
accumulatedHeight = sliceHeight;
|
||||||
|
}
|
||||||
|
else if (id != lastId
|
||||||
|
|| blockLight != lastBlockLight
|
||||||
|
|| skyLight != lastSkyLight)
|
||||||
|
{
|
||||||
|
// the data changed, create a new datapoint
|
||||||
|
try
|
||||||
|
{
|
||||||
|
long datapoint = FullDataPointUtil.encode(lastId, accumulatedHeight, currentMinY, lastBlockLight, lastSkyLight);
|
||||||
|
newColumnList.add(datapoint);
|
||||||
|
}
|
||||||
|
catch (DataCorruptedException e)
|
||||||
|
{
|
||||||
|
LOGGER.warn("Skipping corrupt datapoint for pos ["+DhSectionPos.toString(inputDataSource.pos)+"] at relative position ["+x+","+z+"] with data: ID["+lastId+"], Height["+accumulatedHeight+"], minY["+currentMinY+"], lastBlockLight["+lastBlockLight+"], lastSkyLight["+lastSkyLight+"].");
|
||||||
|
}
|
||||||
|
|
||||||
|
// start the next datapoint
|
||||||
|
lastId = id;
|
||||||
|
lastBlockLight = blockLight;
|
||||||
|
lastSkyLight = skyLight;
|
||||||
|
currentMinY = sliceMinY;
|
||||||
|
accumulatedHeight = sliceHeight;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
// this datapoint is the same as the last one,
|
||||||
|
// just extend it's height
|
||||||
|
accumulatedHeight += sliceHeight;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// add the last slice if present
|
|
||||||
if (height != 0)
|
// add the final datapoint if needed
|
||||||
|
if (accumulatedHeight > 0)
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
newColumnList.add(FullDataPointUtil.encode(lastId, height, minY, lastBlockLight, lastSkyLight));
|
newColumnList.add(FullDataPointUtil.encode(lastId, accumulatedHeight, currentMinY, lastBlockLight, lastSkyLight));
|
||||||
}
|
}
|
||||||
catch (DataCorruptedException e)
|
catch (DataCorruptedException e)
|
||||||
{
|
{
|
||||||
// shouldn't happen, (especially if validation is disabled) but just in case
|
LOGGER.warn("Skipping corrupt datapoint for pos ["+DhSectionPos.toString(inputDataSource.pos)+"] at relative position ["+x+","+z+"] with data: ID["+lastId+"], Height["+accumulatedHeight+"], minY["+currentMinY+"], lastBlockLight["+lastBlockLight+"], lastSkyLight["+lastSkyLight+"].");
|
||||||
LOGGER.warn("Skipping corrupt datapoint for pos "+inputDataSource.pos+" at relative position ["+x+","+z+"] with data: ID["+lastId+"], Height["+height+"], minY["+minY+"], lastBlockLight["+lastBlockLight+"], lastSkyLight["+lastSkyLight+"].");
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// flip the array if necessary
|
// confirm the array is in the correct order
|
||||||
// TODO why is this sometimes necessary? What did I (James) screw up that causes the mergedInputDataArray
|
|
||||||
// to sometimes be in a different order? Is it potentially related to what detail level is coming in?
|
|
||||||
ensureDataColumnOrder(newColumnList);
|
ensureDataColumnOrder(newColumnList);
|
||||||
|
|
||||||
return newColumnList;
|
return newColumnList;
|
||||||
@@ -871,23 +950,8 @@ public class FullDataSourceV2
|
|||||||
dataColumn.set(i, FullDataPointUtil.remap(remappedIds, dataColumn.getLong(i)));
|
dataColumn.set(i, FullDataPointUtil.remap(remappedIds, dataColumn.getLong(i)));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
private static boolean areDataColumnsDifferent(long[] oldDataArray, long[] newDataArray)
|
|
||||||
{
|
|
||||||
if (oldDataArray == null || oldDataArray.length != newDataArray.length)
|
|
||||||
{
|
|
||||||
// new data was added/removed
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
// check if the new column data is different
|
|
||||||
int oldArrayHash = Arrays.hashCode(oldDataArray);
|
|
||||||
int newArrayHash = Arrays.hashCode(newDataArray);
|
|
||||||
return (newArrayHash != oldArrayHash);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
/** @param mapping can be included to ignore air ID's, otherwise all 4 values are treated equally */
|
/** @param mapping can be included to ignore air ID's, otherwise all 4 values are treated equally */
|
||||||
private static int determineMostValueInColumnSlice(int[] sliceArray, @Nullable FullDataPointIdMap mapping)
|
private static int determineMostCommonValueInColumnSlice(int[] sliceArray, @Nullable FullDataPointIdMap mapping)
|
||||||
{
|
{
|
||||||
if (RUN_UPDATE_DEV_VALIDATION)
|
if (RUN_UPDATE_DEV_VALIDATION)
|
||||||
{
|
{
|
||||||
@@ -931,7 +995,7 @@ public class FullDataSourceV2
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// return the most common occurance
|
// return the most common occurrence
|
||||||
int maxCount = Math.max(count0, Math.max(count1, Math.max(count2, count3)));
|
int maxCount = Math.max(count0, Math.max(count1, Math.max(count2, count3)));
|
||||||
if (maxCount == count0)
|
if (maxCount == count0)
|
||||||
// if the max count is 1 then we'll just go with the first column
|
// if the max count is 1 then we'll just go with the first column
|
||||||
@@ -1067,23 +1131,72 @@ public class FullDataSourceV2
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
//===================//
|
||||||
|
// adjacent clearing //
|
||||||
|
//===================//
|
||||||
|
|
||||||
|
/** Removes any non-adjacent data from the given direction. */
|
||||||
|
public void clearAllNonAdjData(EDhDirection direction)
|
||||||
|
{
|
||||||
|
long encodedMinMaxPos = FullDataMinMaxPosUtil.getEncodedMinMaxPos(direction);
|
||||||
|
int minX = FullDataMinMaxPosUtil.getAdjMinX(encodedMinMaxPos);
|
||||||
|
int maxX = FullDataMinMaxPosUtil.getAdjMaxX(encodedMinMaxPos);
|
||||||
|
int minZ = FullDataMinMaxPosUtil.getAdjMinZ(encodedMinMaxPos);
|
||||||
|
int maxZ = FullDataMinMaxPosUtil.getAdjMaxZ(encodedMinMaxPos);
|
||||||
|
|
||||||
|
for (int relX = 0; relX < FullDataSourceV2.WIDTH; relX++)
|
||||||
|
{
|
||||||
|
for (int relZ = 0; relZ < FullDataSourceV2.WIDTH; relZ++)
|
||||||
|
{
|
||||||
|
// skip non-adjacent data
|
||||||
|
if (relX >= minX && relX < maxX
|
||||||
|
&& relZ >= minZ && relZ < maxZ)
|
||||||
|
{
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
LongArrayList dataColumn = this.getColumnAtRelPos(relX, relZ);
|
||||||
|
dataColumn.clear();
|
||||||
|
dataColumn.add(FullDataPointUtil.EMPTY_DATA_POINT);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
//================//
|
//================//
|
||||||
// helper methods //
|
// helper methods //
|
||||||
//================//
|
//================//
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Usually this should just be used internally, but there may be instances
|
||||||
|
* where the raw data arrays are available without the data source object.
|
||||||
|
*
|
||||||
|
* @return -1 if given an out-of-bounds relative position
|
||||||
|
*/
|
||||||
|
public static int tryGetRelativePosToIndex(int relX, int relZ)
|
||||||
|
{
|
||||||
|
if (relX < 0 || relZ < 0
|
||||||
|
|| relX >= WIDTH || relZ >= WIDTH)
|
||||||
|
{
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
return (relX * WIDTH) + relZ;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Usually this should just be used internally, but there may be instances
|
* Usually this should just be used internally, but there may be instances
|
||||||
* where the raw data arrays are available without the data source object.
|
* where the raw data arrays are available without the data source object.
|
||||||
*/
|
*/
|
||||||
public static int relativePosToIndex(int relX, int relZ) throws IndexOutOfBoundsException
|
public static int relativePosToIndex(int relX, int relZ) throws IndexOutOfBoundsException
|
||||||
{
|
{
|
||||||
if (relX < 0 || relZ < 0 ||
|
int index = tryGetRelativePosToIndex(relX, relZ);
|
||||||
relX > WIDTH || relZ > WIDTH)
|
if (index < 0)
|
||||||
{
|
{
|
||||||
throw new IndexOutOfBoundsException("Relative data source positions must be between [0] and ["+WIDTH+"] (inclusive) the relative pos: ["+relX+","+relZ+"] is outside of those boundaries.");
|
throw new IndexOutOfBoundsException("Relative data source positions must be between [0] (inclusive) and ["+WIDTH+"] (exclusive) the relative pos: ["+relX+","+relZ+"] is outside those boundaries.");
|
||||||
}
|
}
|
||||||
|
|
||||||
return (relX * WIDTH) + relZ;
|
return index;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -1150,18 +1263,10 @@ public class FullDataSourceV2
|
|||||||
// setters and getters //
|
// setters and getters //
|
||||||
//=====================//
|
//=====================//
|
||||||
|
|
||||||
@Override
|
|
||||||
public long getPos() { return this.pos; }
|
public long getPos() { return this.pos; }
|
||||||
|
|
||||||
@Override
|
|
||||||
public byte getDataDetailLevel() { return (byte) (DhSectionPos.getDetailLevel(this.pos) - DhSectionPos.SECTION_MINIMUM_DETAIL_LEVEL); }
|
public byte getDataDetailLevel() { return (byte) (DhSectionPos.getDetailLevel(this.pos) - DhSectionPos.SECTION_MINIMUM_DETAIL_LEVEL); }
|
||||||
|
|
||||||
public EDhApiWorldGenerationStep getWorldGenStepAtRelativePos(int relX, int relZ)
|
|
||||||
{
|
|
||||||
int index = relativePosToIndex(relX, relZ);
|
|
||||||
return EDhApiWorldGenerationStep.fromValue(this.columnGenerationSteps.getByte(index));
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setSingleColumn(LongArrayList longArray, int relX, int relZ, EDhApiWorldGenerationStep worldGenStep, EDhApiWorldCompressionMode worldCompressionMode)
|
public void setSingleColumn(LongArrayList longArray, int relX, int relZ, EDhApiWorldGenerationStep worldGenStep, EDhApiWorldCompressionMode worldCompressionMode)
|
||||||
{
|
{
|
||||||
int index = relativePosToIndex(relX, relZ);
|
int index = relativePosToIndex(relX, relZ);
|
||||||
@@ -1192,7 +1297,7 @@ public class FullDataSourceV2
|
|||||||
// API methods //
|
// API methods //
|
||||||
//=============//
|
//=============//
|
||||||
|
|
||||||
public void setRunApiChunkValidation(boolean runValidation) { this.runApiChunkValidation = runValidation; }
|
public void setRunApiSetterValidation(boolean runValidation) { this.runApiSetterValidation = runValidation; }
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public int getWidthInDataColumns() { return WIDTH; }
|
public int getWidthInDataColumns() { return WIDTH; }
|
||||||
@@ -1203,13 +1308,13 @@ public class FullDataSourceV2
|
|||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
LodDataBuilder.correctDataColumnOrder(columnDataPoints);
|
LodDataBuilder.putListInTopDownOrder(columnDataPoints);
|
||||||
if (this.runApiChunkValidation)
|
if (this.runApiSetterValidation)
|
||||||
{
|
{
|
||||||
LodDataBuilder.validateOrThrowApiDataColumn(columnDataPoints);
|
LodDataBuilder.validateOrThrowApiDataColumn(columnDataPoints);
|
||||||
}
|
}
|
||||||
|
|
||||||
LongArrayList packedDataPoints = LodDataBuilder.convertApiDataPointListToPackedLongArray(columnDataPoints, this, 0);
|
LongArrayList packedDataPoints = LodDataBuilder.convertApiDataPointListToPackedLongArray(columnDataPoints, this, 0, true);
|
||||||
|
|
||||||
// TODO there should be an "unknown" compression and generation step, or be defined via the datapoints
|
// TODO there should be an "unknown" compression and generation step, or be defined via the datapoints
|
||||||
this.setSingleColumn(packedDataPoints, relX, relZ, EDhApiWorldGenerationStep.SURFACE, EDhApiWorldCompressionMode.MERGE_SAME_BLOCKS);
|
this.setSingleColumn(packedDataPoints, relX, relZ, EDhApiWorldGenerationStep.SURFACE, EDhApiWorldCompressionMode.MERGE_SAME_BLOCKS);
|
||||||
@@ -1225,14 +1330,14 @@ public class FullDataSourceV2
|
|||||||
@Override
|
@Override
|
||||||
public List<DhApiTerrainDataPoint> getApiDataPointColumn(int relX, int relZ) throws IndexOutOfBoundsException
|
public List<DhApiTerrainDataPoint> getApiDataPointColumn(int relX, int relZ) throws IndexOutOfBoundsException
|
||||||
{
|
{
|
||||||
LongArrayList dataColumn = this.get(relX, relZ);
|
LongArrayList dataColumn = this.getColumnAtRelPos(relX, relZ);
|
||||||
|
|
||||||
ArrayList<DhApiTerrainDataPoint> apiList = new ArrayList<>();
|
ArrayList<DhApiTerrainDataPoint> apiList = new ArrayList<>();
|
||||||
for (int i = 0; i < dataColumn.size(); i++)
|
for (int i = 0; i < dataColumn.size(); i++)
|
||||||
{
|
{
|
||||||
long datapoint = dataColumn.getLong(i);
|
long datapoint = dataColumn.getLong(i);
|
||||||
|
|
||||||
DhApiTerrainDataPoint apiDataPoint = DhApiTerrainDataPointUtil.createApiDatapoint(this.levelMinY, this.mapping, DhSectionPos.getDetailLevel(this.pos), datapoint);
|
DhApiTerrainDataPoint apiDataPoint = DhApiTerrainDataPointUtil.createApiDatapoint(0, this.mapping, DhSectionPos.getDetailLevel(this.pos), datapoint);
|
||||||
apiList.add(apiDataPoint);
|
apiList.add(apiDataPoint);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
-96
@@ -1,96 +0,0 @@
|
|||||||
package com.seibel.distanthorizons.core.dataObjects.render;
|
|
||||||
|
|
||||||
import com.google.common.cache.Cache;
|
|
||||||
import org.jetbrains.annotations.NotNull;
|
|
||||||
import org.jetbrains.annotations.Nullable;
|
|
||||||
|
|
||||||
import java.util.concurrent.CompletableFuture;
|
|
||||||
import java.util.concurrent.atomic.AtomicInteger;
|
|
||||||
import java.util.concurrent.locks.ReentrantLock;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Wrapper for {@link ColumnRenderSource} that handles reference counting
|
|
||||||
* and cache tracking.
|
|
||||||
*/
|
|
||||||
public class CachedColumnRenderSource implements AutoCloseable
|
|
||||||
{
|
|
||||||
/** an externally handled future that will complete once the {@link CachedColumnRenderSource#columnRenderSource} has finished loading */
|
|
||||||
public final CompletableFuture<CachedColumnRenderSource> loadFuture;
|
|
||||||
/** will be null initially, should be non-null once the corresponding load future is done */
|
|
||||||
@Nullable
|
|
||||||
public ColumnRenderSource columnRenderSource = null;
|
|
||||||
|
|
||||||
private final AtomicInteger referenceCount;
|
|
||||||
private final Cache<Long, CachedColumnRenderSource> cachedRenderSourceByPos;
|
|
||||||
private final ReentrantLock getterLock;
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
//=============//
|
|
||||||
// constructor //
|
|
||||||
//=============//
|
|
||||||
|
|
||||||
public CachedColumnRenderSource(
|
|
||||||
@NotNull CompletableFuture<CachedColumnRenderSource> loadFuture,
|
|
||||||
@NotNull ReentrantLock getterLock,
|
|
||||||
@NotNull Cache<Long, CachedColumnRenderSource> cachedRenderSourceByPos)
|
|
||||||
{
|
|
||||||
this.loadFuture = loadFuture;
|
|
||||||
this.getterLock = getterLock;
|
|
||||||
this.referenceCount = new AtomicInteger(1);
|
|
||||||
this.cachedRenderSourceByPos = cachedRenderSourceByPos;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
//====================//
|
|
||||||
// reference counting //
|
|
||||||
//====================//
|
|
||||||
|
|
||||||
public void markInUse() { this.referenceCount.getAndIncrement(); }
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
//================//
|
|
||||||
// base overrides //
|
|
||||||
//================//
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Will be called multiple times,
|
|
||||||
* however it will only close the underlying data once
|
|
||||||
* all references have closed.
|
|
||||||
*/
|
|
||||||
@Override
|
|
||||||
public void close() throws IllegalStateException
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
// lock to prevent other threads for accessing the cache if we invalidate it
|
|
||||||
this.getterLock.lock();
|
|
||||||
|
|
||||||
// should only happen if something goes wrong up-stream
|
|
||||||
if (this.columnRenderSource == null)
|
|
||||||
{
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
// only close once everyone is done with this datasource
|
|
||||||
int refCount = this.referenceCount.decrementAndGet();
|
|
||||||
if (refCount == 0)
|
|
||||||
{
|
|
||||||
this.cachedRenderSourceByPos.invalidate(this.columnRenderSource.pos);
|
|
||||||
this.columnRenderSource.close();
|
|
||||||
}
|
|
||||||
else if (refCount < 0)
|
|
||||||
{
|
|
||||||
throw new IllegalStateException("Render source ["+this.columnRenderSource.pos+"] reference count incorrect. Object already closed.");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
finally
|
|
||||||
{
|
|
||||||
this.getterLock.unlock();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
+18
-27
@@ -23,16 +23,12 @@ import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
|
|||||||
import com.seibel.distanthorizons.core.pooling.AbstractPhantomArrayList;
|
import com.seibel.distanthorizons.core.pooling.AbstractPhantomArrayList;
|
||||||
import com.seibel.distanthorizons.core.pooling.PhantomArrayListPool;
|
import com.seibel.distanthorizons.core.pooling.PhantomArrayListPool;
|
||||||
import com.seibel.distanthorizons.core.pos.DhSectionPos;
|
import com.seibel.distanthorizons.core.pos.DhSectionPos;
|
||||||
import com.seibel.distanthorizons.coreapi.ModInfo;
|
|
||||||
import com.seibel.distanthorizons.core.dataObjects.render.columnViews.ColumnArrayView;
|
import com.seibel.distanthorizons.core.dataObjects.render.columnViews.ColumnArrayView;
|
||||||
import com.seibel.distanthorizons.core.dataObjects.render.columnViews.ColumnQuadView;
|
import com.seibel.distanthorizons.core.dataObjects.render.columnViews.ColumnQuadView;
|
||||||
import com.seibel.distanthorizons.coreapi.util.BitShiftUtil;
|
|
||||||
import com.seibel.distanthorizons.core.util.ColorUtil;
|
import com.seibel.distanthorizons.core.util.ColorUtil;
|
||||||
import com.seibel.distanthorizons.core.util.RenderDataPointUtil;
|
import com.seibel.distanthorizons.core.util.RenderDataPointUtil;
|
||||||
import it.unimi.dsi.fastutil.longs.LongArrayList;
|
import it.unimi.dsi.fastutil.longs.LongArrayList;
|
||||||
import org.apache.logging.log4j.Logger;
|
import com.seibel.distanthorizons.core.logging.DhLogger;
|
||||||
|
|
||||||
import java.util.concurrent.atomic.AtomicLong;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Stores the render data used to generate OpenGL buffers.
|
* Stores the render data used to generate OpenGL buffers.
|
||||||
@@ -41,12 +37,10 @@ import java.util.concurrent.atomic.AtomicLong;
|
|||||||
*/
|
*/
|
||||||
public class ColumnRenderSource extends AbstractPhantomArrayList
|
public class ColumnRenderSource extends AbstractPhantomArrayList
|
||||||
{
|
{
|
||||||
private static final Logger LOGGER = DhLoggerBuilder.getLogger();
|
private static final DhLogger LOGGER = new DhLoggerBuilder().build();
|
||||||
|
|
||||||
public static final boolean DO_SAFETY_CHECKS = ModInfo.IS_DEV_BUILD;
|
/** measured in data columns */
|
||||||
public static final byte SECTION_SIZE_OFFSET = DhSectionPos.SECTION_MINIMUM_DETAIL_LEVEL;
|
public static final int WIDTH = 64;
|
||||||
/** width of this data in columns */
|
|
||||||
public static final int SECTION_SIZE = BitShiftUtil.powerOfTwo(SECTION_SIZE_OFFSET); // 64
|
|
||||||
|
|
||||||
public static final PhantomArrayListPool ARRAY_LIST_POOL = new PhantomArrayListPool("Render Source");
|
public static final PhantomArrayListPool ARRAY_LIST_POOL = new PhantomArrayListPool("Render Source");
|
||||||
|
|
||||||
@@ -63,8 +57,6 @@ public class ColumnRenderSource extends AbstractPhantomArrayList
|
|||||||
|
|
||||||
private boolean isEmpty = true;
|
private boolean isEmpty = true;
|
||||||
|
|
||||||
public AtomicLong localVersion = new AtomicLong(0); // used to track changes to the data source, so that buffers can be updated when necessary
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
//==============//
|
//==============//
|
||||||
@@ -88,9 +80,9 @@ public class ColumnRenderSource extends AbstractPhantomArrayList
|
|||||||
|
|
||||||
this.verticalDataCount = maxVerticalSize;
|
this.verticalDataCount = maxVerticalSize;
|
||||||
|
|
||||||
this.renderDataContainer = this.pooledArraysCheckout.getLongArray(0, SECTION_SIZE * SECTION_SIZE * this.verticalDataCount);
|
this.renderDataContainer = this.pooledArraysCheckout.getLongArray(0, WIDTH * WIDTH * this.verticalDataCount);
|
||||||
|
|
||||||
this.debugSourceFlags = new DebugSourceFlag[SECTION_SIZE * SECTION_SIZE];
|
this.debugSourceFlags = new DebugSourceFlag[WIDTH * WIDTH];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -99,19 +91,19 @@ public class ColumnRenderSource extends AbstractPhantomArrayList
|
|||||||
// datapoint manipulation //
|
// datapoint manipulation //
|
||||||
//========================//
|
//========================//
|
||||||
|
|
||||||
public long getDataPoint(int posX, int posZ, int verticalIndex) { return this.renderDataContainer.getLong(posX * SECTION_SIZE * this.verticalDataCount + posZ * this.verticalDataCount + verticalIndex); }
|
public long getDataPoint(int posX, int posZ, int verticalIndex) { return this.renderDataContainer.getLong(posX * WIDTH * this.verticalDataCount + posZ * this.verticalDataCount + verticalIndex); }
|
||||||
|
|
||||||
public ColumnArrayView getVerticalDataPointView(int posX, int posZ)
|
public ColumnArrayView getVerticalDataPointView(int posX, int posZ)
|
||||||
{
|
{
|
||||||
int offset = posX * SECTION_SIZE * this.verticalDataCount + posZ * this.verticalDataCount;
|
int offset = posX * WIDTH * this.verticalDataCount + posZ * this.verticalDataCount;
|
||||||
|
|
||||||
// don't allow returning views that are outside this render source's bounds
|
// don't allow returning views that are outside this render source's bounds
|
||||||
if (offset >= this.renderDataContainer.size())
|
if (offset >= this.renderDataContainer.size())
|
||||||
{
|
{
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
else if (posX < 0 || posX >= SECTION_SIZE
|
else if (posX < 0 || posX >= WIDTH
|
||||||
|| posZ < 0 || posZ >= SECTION_SIZE)
|
|| posZ < 0 || posZ >= WIDTH)
|
||||||
{
|
{
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
@@ -120,8 +112,8 @@ public class ColumnRenderSource extends AbstractPhantomArrayList
|
|||||||
offset, this.verticalDataCount);
|
offset, this.verticalDataCount);
|
||||||
}
|
}
|
||||||
|
|
||||||
public ColumnQuadView getFullQuadView() { return this.getQuadViewOverRange(0, 0, SECTION_SIZE, SECTION_SIZE); }
|
public ColumnQuadView getFullQuadView() { return this.getQuadViewOverRange(0, 0, WIDTH, WIDTH); }
|
||||||
public ColumnQuadView getQuadViewOverRange(int quadX, int quadZ, int quadXSize, int quadZSize) { return new ColumnQuadView(this.renderDataContainer, SECTION_SIZE, this.verticalDataCount, quadX, quadZ, quadXSize, quadZSize); }
|
public ColumnQuadView getQuadViewOverRange(int quadX, int quadZ, int quadXSize, int quadZSize) { return new ColumnQuadView(this.renderDataContainer, WIDTH, this.verticalDataCount, quadX, quadZ, quadXSize, quadZSize); }
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@@ -131,9 +123,8 @@ public class ColumnRenderSource extends AbstractPhantomArrayList
|
|||||||
|
|
||||||
public Long getPos() { return this.pos; }
|
public Long getPos() { return this.pos; }
|
||||||
public Long getKey() { return this.pos; }
|
public Long getKey() { return this.pos; }
|
||||||
public String getKeyDisplayString() { return DhSectionPos.toString(this.pos); }
|
|
||||||
|
|
||||||
public byte getDataDetailLevel() { return (byte) (DhSectionPos.getDetailLevel(this.pos) - SECTION_SIZE_OFFSET); }
|
public byte getDataDetailLevel() { return (byte) (DhSectionPos.getDetailLevel(this.pos) - DhSectionPos.SECTION_MINIMUM_DETAIL_LEVEL); }
|
||||||
|
|
||||||
public boolean isEmpty() { return this.isEmpty; }
|
public boolean isEmpty() { return this.isEmpty; }
|
||||||
public void markNotEmpty() { this.isEmpty = false; }
|
public void markNotEmpty() { this.isEmpty = false; }
|
||||||
@@ -147,15 +138,15 @@ public class ColumnRenderSource extends AbstractPhantomArrayList
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
for (int x = 0; x < SECTION_SIZE; x++)
|
for (int x = 0; x < WIDTH; x++)
|
||||||
{
|
{
|
||||||
for (int z = 0; z < SECTION_SIZE; z++)
|
for (int z = 0; z < WIDTH; z++)
|
||||||
{
|
{
|
||||||
ColumnArrayView columnArrayView = this.getVerticalDataPointView(x,z);
|
ColumnArrayView columnArrayView = this.getVerticalDataPointView(x,z);
|
||||||
for (int i = 0; i < columnArrayView.size; i++)
|
for (int i = 0; i < columnArrayView.size; i++)
|
||||||
{
|
{
|
||||||
long dataPoint = columnArrayView.get(i);
|
long dataPoint = columnArrayView.get(i);
|
||||||
if (!RenderDataPointUtil.isVoid(dataPoint))
|
if (!RenderDataPointUtil.hasZeroHeight(dataPoint))
|
||||||
{
|
{
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
@@ -179,12 +170,12 @@ public class ColumnRenderSource extends AbstractPhantomArrayList
|
|||||||
{
|
{
|
||||||
for (int z = zStart; z < zStart + zWidth; z++)
|
for (int z = zStart; z < zStart + zWidth; z++)
|
||||||
{
|
{
|
||||||
this.debugSourceFlags[x * SECTION_SIZE + z] = flag;
|
this.debugSourceFlags[x * WIDTH + z] = flag;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public DebugSourceFlag debugGetFlag(int ox, int oz) { return this.debugSourceFlags[ox * SECTION_SIZE + oz]; }
|
public DebugSourceFlag debugGetFlag(int ox, int oz) { return this.debugSourceFlags[ox * WIDTH + oz]; }
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
+8
-8
@@ -35,7 +35,7 @@ public final class BufferQuad
|
|||||||
public static final int NORMAL_MAX_QUAD_WIDTH = 2048;
|
public static final int NORMAL_MAX_QUAD_WIDTH = 2048;
|
||||||
/**
|
/**
|
||||||
* The maximum number of blocks wide a quad can be
|
* The maximum number of blocks wide a quad can be
|
||||||
* when {@link Config.Client.Advanced.Graphics.AdvancedGraphics#earthCurveRatio earthCurveRatio}
|
* when {@link Config.Client.Advanced.Graphics.Experimental#earthCurveRatio earthCurveRatio}
|
||||||
* is enabled.
|
* is enabled.
|
||||||
*/
|
*/
|
||||||
public static final int MAX_QUAD_WIDTH_FOR_EARTH_CURVATURE = LodUtil.CHUNK_WIDTH;
|
public static final int MAX_QUAD_WIDTH_FOR_EARTH_CURVATURE = LodUtil.CHUNK_WIDTH;
|
||||||
@@ -99,7 +99,7 @@ public final class BufferQuad
|
|||||||
|
|
||||||
if (compareDirection == BufferMergeDirectionEnum.EastWest)
|
if (compareDirection == BufferMergeDirectionEnum.EastWest)
|
||||||
{
|
{
|
||||||
switch (this.direction.getAxis())
|
switch (this.direction.axis)
|
||||||
{
|
{
|
||||||
case X:
|
case X:
|
||||||
return threeDimensionalCompare(this.x, this.y, this.z, quad.x, quad.y, quad.z);
|
return threeDimensionalCompare(this.x, this.y, this.z, quad.x, quad.y, quad.z);
|
||||||
@@ -109,12 +109,12 @@ public final class BufferQuad
|
|||||||
return threeDimensionalCompare(this.z, this.y, this.x, quad.z, quad.y, quad.x);
|
return threeDimensionalCompare(this.z, this.y, this.x, quad.z, quad.y, quad.x);
|
||||||
|
|
||||||
default:
|
default:
|
||||||
throw new IllegalArgumentException("Invalid Axis enum: " + this.direction.getAxis());
|
throw new IllegalArgumentException("Invalid Axis enum: [" + this.direction.axis + "].");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
switch (this.direction.getAxis())
|
switch (this.direction.axis)
|
||||||
{
|
{
|
||||||
case X:
|
case X:
|
||||||
return threeDimensionalCompare(this.x, this.z, this.y, quad.x, quad.z, quad.y);
|
return threeDimensionalCompare(this.x, this.z, this.y, quad.x, quad.z, quad.y);
|
||||||
@@ -124,7 +124,7 @@ public final class BufferQuad
|
|||||||
return threeDimensionalCompare(this.z, this.x, this.y, quad.z, quad.x, quad.y);
|
return threeDimensionalCompare(this.z, this.x, this.y, quad.z, quad.x, quad.y);
|
||||||
|
|
||||||
default:
|
default:
|
||||||
throw new IllegalArgumentException("Invalid Axis enum: " + this.direction.getAxis());
|
throw new IllegalArgumentException("Invalid Axis enum: [" + this.direction.axis + "].");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -157,8 +157,8 @@ public final class BufferQuad
|
|||||||
return false;
|
return false;
|
||||||
|
|
||||||
// make sure these quads share the same perpendicular axis
|
// make sure these quads share the same perpendicular axis
|
||||||
if ((mergeDirection == BufferMergeDirectionEnum.EastWest && this.y != quad.y) ||
|
if ((mergeDirection == BufferMergeDirectionEnum.EastWest && this.y != quad.y)
|
||||||
(mergeDirection == BufferMergeDirectionEnum.NorthSouthOrUpDown && this.x != quad.x))
|
|| (mergeDirection == BufferMergeDirectionEnum.NorthSouthOrUpDown && this.x != quad.x))
|
||||||
{
|
{
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@@ -169,7 +169,7 @@ public final class BufferQuad
|
|||||||
short thisParallelCompareStartPos; // edge parallel to the merge direction
|
short thisParallelCompareStartPos; // edge parallel to the merge direction
|
||||||
short otherPerpendicularCompareStartPos;
|
short otherPerpendicularCompareStartPos;
|
||||||
short otherParallelCompareStartPos;
|
short otherParallelCompareStartPos;
|
||||||
switch (this.direction.getAxis())
|
switch (this.direction.axis)
|
||||||
{
|
{
|
||||||
default: // shouldn't normally happen, just here to make the compiler happy
|
default: // shouldn't normally happen, just here to make the compiler happy
|
||||||
case X:
|
case X:
|
||||||
|
|||||||
+289
-211
@@ -23,38 +23,26 @@ import com.seibel.distanthorizons.core.config.Config;
|
|||||||
import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
|
import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
|
||||||
import com.seibel.distanthorizons.core.enums.EDhDirection;
|
import com.seibel.distanthorizons.core.enums.EDhDirection;
|
||||||
import com.seibel.distanthorizons.core.level.IDhClientLevel;
|
import com.seibel.distanthorizons.core.level.IDhClientLevel;
|
||||||
|
import com.seibel.distanthorizons.core.pooling.PhantomArrayListCheckout;
|
||||||
import com.seibel.distanthorizons.core.util.ColorUtil;
|
import com.seibel.distanthorizons.core.util.ColorUtil;
|
||||||
import com.seibel.distanthorizons.core.util.LodUtil;
|
import com.seibel.distanthorizons.core.util.LodUtil;
|
||||||
import com.seibel.distanthorizons.core.util.RenderDataPointUtil;
|
import com.seibel.distanthorizons.core.util.RenderDataPointUtil;
|
||||||
import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper;
|
import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper;
|
||||||
import com.seibel.distanthorizons.core.dataObjects.render.columnViews.ColumnArrayView;
|
import com.seibel.distanthorizons.core.dataObjects.render.columnViews.ColumnArrayView;
|
||||||
import com.seibel.distanthorizons.core.render.renderer.LodRenderer;
|
import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftRenderWrapper;
|
||||||
import com.seibel.distanthorizons.coreapi.util.MathUtil;
|
import com.seibel.distanthorizons.coreapi.util.MathUtil;
|
||||||
|
import it.unimi.dsi.fastutil.longs.LongArrayList;
|
||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
|
|
||||||
import java.util.Arrays;
|
|
||||||
|
|
||||||
public class ColumnBox
|
public class ColumnBox
|
||||||
{
|
{
|
||||||
private static final IMinecraftClientWrapper MC = SingletonInjector.INSTANCE.get(IMinecraftClientWrapper.class);
|
private static final IMinecraftRenderWrapper MC_RENDER = SingletonInjector.INSTANCE.get(IMinecraftRenderWrapper.class);
|
||||||
|
|
||||||
/**
|
|
||||||
* if the skylight has this value that means
|
|
||||||
* no data is expected
|
|
||||||
*/
|
|
||||||
private static final byte SKYLIGHT_EMPTY = -1;
|
|
||||||
/**
|
/**
|
||||||
* if the skylight has this value that means
|
* if the skylight has this value that means
|
||||||
* that block position is covered/occuled by an adjacent block/column.
|
* that block position is covered/occluded by an adjacent block/column.
|
||||||
*/
|
*/
|
||||||
private static final byte SKYLIGHT_COVERED = -2;
|
private static final byte SKYLIGHT_COVERED = -1;
|
||||||
|
|
||||||
private static final ThreadLocal<byte[]> THREAD_LOCAL_SKY_LIGHT_ARRAY = ThreadLocal.withInitial(() ->
|
|
||||||
{
|
|
||||||
byte[] array = new byte[RenderDataPointUtil.MAX_WORLD_Y_SIZE];
|
|
||||||
Arrays.fill(array, SKYLIGHT_EMPTY);
|
|
||||||
return array;
|
|
||||||
});
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@@ -63,8 +51,8 @@ public class ColumnBox
|
|||||||
//=========//
|
//=========//
|
||||||
|
|
||||||
public static void addBoxQuadsToBuilder(
|
public static void addBoxQuadsToBuilder(
|
||||||
LodQuadBuilder builder, IDhClientLevel clientLevel,
|
LodQuadBuilder builder, PhantomArrayListCheckout phantomArrayCheckout, IDhClientLevel clientLevel,
|
||||||
short xSize, short ySize, short zSize,
|
short width, short yHeight,
|
||||||
short minX, short minY, short minZ,
|
short minX, short minY, short minZ,
|
||||||
int color, byte irisBlockMaterialId, byte skyLight, byte blockLight,
|
int color, byte irisBlockMaterialId, byte skyLight, byte blockLight,
|
||||||
long topData, long bottomData, ColumnArrayView[] adjData, boolean[] isAdjDataSameDetailLevel)
|
long topData, long bottomData, ColumnArrayView[] adjData, boolean[] isAdjDataSameDetailLevel)
|
||||||
@@ -73,23 +61,26 @@ public class ColumnBox
|
|||||||
// variable setup //
|
// variable setup //
|
||||||
//================//
|
//================//
|
||||||
|
|
||||||
short maxX = (short) (minX + xSize);
|
short maxX = (short) (minX + width);
|
||||||
short maxY = (short) (minY + ySize);
|
short maxY = (short) (minY + yHeight);
|
||||||
short maxZ = (short) (minZ + zSize);
|
short maxZ = (short) (minZ + width);
|
||||||
byte skyLightTop = skyLight;
|
byte skyLightTop = skyLight;
|
||||||
byte skyLightBot = RenderDataPointUtil.doesDataPointExist(bottomData) ? RenderDataPointUtil.getLightSky(bottomData) : 0;
|
byte skyLightBot = RenderDataPointUtil.doesDataPointExist(bottomData) ? RenderDataPointUtil.getLightSky(bottomData) : 0;
|
||||||
|
|
||||||
boolean isTransparent = ColorUtil.getAlpha(color) < 255 && LodRenderer.transparencyEnabled;
|
boolean transparencyEnabled = Config.Client.Advanced.Graphics.Quality.transparency.get().transparencyEnabled;
|
||||||
|
boolean fakeOceanFloor = Config.Client.Advanced.Graphics.Quality.transparency.get().fakeTransparencyEnabled;
|
||||||
|
|
||||||
|
boolean isTransparent = ColorUtil.getAlpha(color) < 255 && transparencyEnabled;
|
||||||
boolean overVoid = !RenderDataPointUtil.doesDataPointExist(bottomData);
|
boolean overVoid = !RenderDataPointUtil.doesDataPointExist(bottomData);
|
||||||
boolean isTopTransparent = RenderDataPointUtil.getAlpha(topData) < 255 && LodRenderer.transparencyEnabled;
|
boolean isTopTransparent = RenderDataPointUtil.getAlpha(topData) < 255 && transparencyEnabled;
|
||||||
boolean isBottomTransparent = RenderDataPointUtil.getAlpha(bottomData) < 255 && LodRenderer.transparencyEnabled;
|
boolean isBottomTransparent = RenderDataPointUtil.getAlpha(bottomData) < 255 && transparencyEnabled;
|
||||||
|
|
||||||
// defaulting to a value far below what we can normally render means we
|
// defaulting to a value far below what we can normally render means we
|
||||||
// don't need to have an additional "is cave culling enabled" check
|
// don't need to have an additional "is cave culling enabled" check
|
||||||
int caveCullingMaxY = Integer.MIN_VALUE;
|
int caveCullingMaxY = Integer.MIN_VALUE;
|
||||||
if (Config.Client.Advanced.Graphics.Culling.enableCaveCulling.get())
|
if (Config.Client.Advanced.Graphics.Culling.enableCaveCulling.get())
|
||||||
{
|
{
|
||||||
caveCullingMaxY = Config.Client.Advanced.Graphics.Culling.caveCullingHeight.get() - clientLevel.getMinY();
|
caveCullingMaxY = Config.Client.Advanced.Graphics.Culling.caveCullingHeight.get() - clientLevel.getLevelWrapper().getMinHeight();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -103,20 +94,20 @@ public class ColumnBox
|
|||||||
|
|
||||||
|
|
||||||
// fake ocean transparency
|
// fake ocean transparency
|
||||||
if (LodRenderer.transparencyEnabled && LodRenderer.fakeOceanFloor)
|
if (transparencyEnabled && fakeOceanFloor)
|
||||||
{
|
{
|
||||||
if (!isTransparent && isTopTransparent && RenderDataPointUtil.doesDataPointExist(topData))
|
if (!isTransparent && isTopTransparent && RenderDataPointUtil.doesDataPointExist(topData))
|
||||||
{
|
{
|
||||||
skyLightTop = (byte) MathUtil.clamp(0, 15 - (RenderDataPointUtil.getYMax(topData) - minY), 15);
|
skyLightTop = (byte) MathUtil.clamp(0, 15 - (RenderDataPointUtil.getYMax(topData) - minY), 15);
|
||||||
ySize = (short) (RenderDataPointUtil.getYMax(topData) - minY - 1);
|
yHeight = (short) (RenderDataPointUtil.getYMax(topData) - minY - 1);
|
||||||
}
|
}
|
||||||
else if (isTransparent && !isBottomTransparent && RenderDataPointUtil.doesDataPointExist(bottomData))
|
else if (isTransparent && !isBottomTransparent && RenderDataPointUtil.doesDataPointExist(bottomData))
|
||||||
{
|
{
|
||||||
minY = (short) (minY + ySize - 1);
|
minY = (short) (minY + yHeight - 1);
|
||||||
ySize = 1;
|
yHeight = 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
maxY = (short) (minY + ySize);
|
maxY = (short) (minY + yHeight);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -125,16 +116,26 @@ public class ColumnBox
|
|||||||
// add top and bottom faces //
|
// add top and bottom faces //
|
||||||
//==========================//
|
//==========================//
|
||||||
|
|
||||||
boolean skipTop = RenderDataPointUtil.doesDataPointExist(topData) && (RenderDataPointUtil.getYMin(topData) == maxY) && !isTopTransparent;
|
// top face
|
||||||
if (!skipTop)
|
|
||||||
{
|
{
|
||||||
builder.addQuadUp(minX, maxY, minZ, xSize, zSize, ColorUtil.applyShade(color, MC.getShade(EDhDirection.UP)), irisBlockMaterialId, skyLightTop, blockLight);
|
boolean skipTop = RenderDataPointUtil.doesDataPointExist(topData)
|
||||||
|
&& (RenderDataPointUtil.getYMin(topData) == maxY)
|
||||||
|
&& !isTopTransparent;
|
||||||
|
if (!skipTop)
|
||||||
|
{
|
||||||
|
builder.addQuadUp(minX, maxY, minZ, width, width, ColorUtil.applyShade(color, MC_RENDER.getShade(EDhDirection.UP)), irisBlockMaterialId, skyLightTop, blockLight);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
boolean skipBottom = RenderDataPointUtil.doesDataPointExist(bottomData) && (RenderDataPointUtil.getYMax(bottomData) == minY) && !isBottomTransparent;
|
// bottom face
|
||||||
if (!skipBottom)
|
|
||||||
{
|
{
|
||||||
builder.addQuadDown(minX, minY, minZ, xSize, zSize, ColorUtil.applyShade(color, MC.getShade(EDhDirection.DOWN)), irisBlockMaterialId, skyLightBot, blockLight);
|
boolean skipBottom = RenderDataPointUtil.doesDataPointExist(bottomData)
|
||||||
|
&& (RenderDataPointUtil.getYMax(bottomData) == minY)
|
||||||
|
&& !isBottomTransparent;
|
||||||
|
if (!skipBottom)
|
||||||
|
{
|
||||||
|
builder.addQuadDown(minX, minY, minZ, width, width, ColorUtil.applyShade(color, MC_RENDER.getShade(EDhDirection.DOWN)), irisBlockMaterialId, skyLightBot, blockLight);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -145,258 +146,285 @@ public class ColumnBox
|
|||||||
|
|
||||||
// NORTH face
|
// NORTH face
|
||||||
{
|
{
|
||||||
ColumnArrayView adjCol = adjData[EDhDirection.NORTH.ordinal() - 2]; // TODO can we use something other than ordinal-2?
|
ColumnArrayView adjCol = adjData[EDhDirection.NORTH.compassIndex];
|
||||||
boolean adjSameDetailLevel = isAdjDataSameDetailLevel[EDhDirection.NORTH.ordinal() - 2];
|
boolean adjSameDetailLevel = isAdjDataSameDetailLevel[EDhDirection.NORTH.compassIndex];
|
||||||
// if the adjacent column is null that generally means the adjacent area hasn't been generated yet
|
// if the adjacent column is null that generally means the adjacent area hasn't been generated yet
|
||||||
if (adjCol == null)
|
if (adjCol == null)
|
||||||
{
|
{
|
||||||
// Add an adjacent face if this is opaque face or transparent over the void.
|
// Add an adjacent face if this is opaque face or transparent over the void.
|
||||||
if (!isTransparent || overVoid)
|
if (!isTransparent || overVoid)
|
||||||
{
|
{
|
||||||
builder.addQuadAdj(EDhDirection.NORTH, minX, minY, minZ, xSize, ySize, color, irisBlockMaterialId, LodUtil.MAX_MC_LIGHT, blockLight);
|
builder.addQuadAdj(
|
||||||
|
EDhDirection.NORTH,
|
||||||
|
minX, minY, minZ,
|
||||||
|
width, yHeight,
|
||||||
|
color, irisBlockMaterialId, LodUtil.MAX_MC_LIGHT, blockLight);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
makeAdjVerticalQuad(builder, adjCol, adjSameDetailLevel, caveCullingMaxY, EDhDirection.NORTH, minX, minY, minZ, xSize, ySize,
|
makeAdjVerticalQuad(
|
||||||
|
builder, phantomArrayCheckout,
|
||||||
|
adjCol, adjSameDetailLevel, caveCullingMaxY, EDhDirection.NORTH,
|
||||||
|
minX, minY, minZ, width, yHeight,
|
||||||
color, irisBlockMaterialId, blockLight);
|
color, irisBlockMaterialId, blockLight);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// SOUTH face
|
// SOUTH face
|
||||||
{
|
{
|
||||||
ColumnArrayView adjCol = adjData[EDhDirection.SOUTH.ordinal() - 2];
|
ColumnArrayView adjCol = adjData[EDhDirection.SOUTH.compassIndex];
|
||||||
boolean adjSameDetailLevel = isAdjDataSameDetailLevel[EDhDirection.SOUTH.ordinal() - 2];
|
boolean adjSameDetailLevel = isAdjDataSameDetailLevel[EDhDirection.SOUTH.compassIndex];
|
||||||
if (adjCol == null)
|
if (adjCol == null)
|
||||||
{
|
{
|
||||||
if (!isTransparent || overVoid)
|
if (!isTransparent || overVoid)
|
||||||
{
|
{
|
||||||
builder.addQuadAdj(EDhDirection.SOUTH, minX, minY, maxZ, xSize, ySize, color, irisBlockMaterialId, LodUtil.MAX_MC_LIGHT, blockLight);
|
builder.addQuadAdj(
|
||||||
|
EDhDirection.SOUTH,
|
||||||
|
minX, minY, maxZ,
|
||||||
|
width, yHeight,
|
||||||
|
color, irisBlockMaterialId, LodUtil.MAX_MC_LIGHT, blockLight);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
makeAdjVerticalQuad(builder, adjCol, adjSameDetailLevel, caveCullingMaxY, EDhDirection.SOUTH, minX, minY, maxZ, xSize, ySize,
|
makeAdjVerticalQuad(
|
||||||
|
builder, phantomArrayCheckout,
|
||||||
|
adjCol, adjSameDetailLevel, caveCullingMaxY, EDhDirection.SOUTH,
|
||||||
|
minX, minY, maxZ, width, yHeight,
|
||||||
color, irisBlockMaterialId, blockLight);
|
color, irisBlockMaterialId, blockLight);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// WEST face
|
// WEST face
|
||||||
{
|
{
|
||||||
ColumnArrayView adjCol = adjData[EDhDirection.WEST.ordinal() - 2];
|
ColumnArrayView adjCol = adjData[EDhDirection.WEST.compassIndex];
|
||||||
boolean adjSameDetailLevel = isAdjDataSameDetailLevel[EDhDirection.WEST.ordinal() - 2];
|
boolean adjSameDetailLevel = isAdjDataSameDetailLevel[EDhDirection.WEST.compassIndex];
|
||||||
if (adjCol == null)
|
if (adjCol == null)
|
||||||
{
|
{
|
||||||
if (!isTransparent || overVoid)
|
if (!isTransparent || overVoid)
|
||||||
{
|
{
|
||||||
builder.addQuadAdj(EDhDirection.WEST, minX, minY, minZ, zSize, ySize, color, irisBlockMaterialId, LodUtil.MAX_MC_LIGHT, blockLight);
|
builder.addQuadAdj(
|
||||||
|
EDhDirection.WEST,
|
||||||
|
minX, minY, minZ,
|
||||||
|
width, yHeight,
|
||||||
|
color, irisBlockMaterialId, LodUtil.MAX_MC_LIGHT, blockLight);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
makeAdjVerticalQuad(builder, adjCol, adjSameDetailLevel, caveCullingMaxY, EDhDirection.WEST, minX, minY, minZ, zSize, ySize,
|
makeAdjVerticalQuad(
|
||||||
|
builder, phantomArrayCheckout,
|
||||||
|
adjCol, adjSameDetailLevel, caveCullingMaxY, EDhDirection.WEST,
|
||||||
|
minX, minY, minZ, width, yHeight,
|
||||||
color, irisBlockMaterialId, blockLight);
|
color, irisBlockMaterialId, blockLight);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// EAST face
|
// EAST face
|
||||||
{
|
{
|
||||||
ColumnArrayView adjCol = adjData[EDhDirection.EAST.ordinal() - 2];
|
ColumnArrayView adjCol = adjData[EDhDirection.EAST.compassIndex];
|
||||||
boolean adjSameDetailLevel = isAdjDataSameDetailLevel[EDhDirection.EAST.ordinal() - 2];
|
boolean adjSameDetailLevel = isAdjDataSameDetailLevel[EDhDirection.EAST.compassIndex];
|
||||||
if (adjCol == null)
|
if (adjCol == null)
|
||||||
{
|
{
|
||||||
if (!isTransparent || overVoid)
|
if (!isTransparent || overVoid)
|
||||||
{
|
{
|
||||||
builder.addQuadAdj(EDhDirection.EAST, maxX, minY, minZ, zSize, ySize, color, irisBlockMaterialId, LodUtil.MAX_MC_LIGHT, blockLight);
|
builder.addQuadAdj(
|
||||||
|
EDhDirection.EAST,
|
||||||
|
maxX, minY, minZ,
|
||||||
|
width, yHeight,
|
||||||
|
color, irisBlockMaterialId, LodUtil.MAX_MC_LIGHT, blockLight);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
makeAdjVerticalQuad(builder, adjCol, adjSameDetailLevel, caveCullingMaxY, EDhDirection.EAST, maxX, minY, minZ, zSize, ySize,
|
makeAdjVerticalQuad(
|
||||||
|
builder, phantomArrayCheckout,
|
||||||
|
adjCol, adjSameDetailLevel, caveCullingMaxY, EDhDirection.EAST,
|
||||||
|
maxX, minY, minZ, width, yHeight,
|
||||||
color, irisBlockMaterialId, blockLight);
|
color, irisBlockMaterialId, blockLight);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private static void makeAdjVerticalQuad(
|
private static void makeAdjVerticalQuad(
|
||||||
LodQuadBuilder builder, @NotNull ColumnArrayView adjColumnView, boolean adjacentIsSameDetailLevel, int caveCullingMaxY, EDhDirection direction,
|
LodQuadBuilder builder, PhantomArrayListCheckout phantomArrayCheckout,
|
||||||
short x, short yMin, short z, short horizontalWidth, short ySize,
|
@NotNull ColumnArrayView adjColumnView, boolean adjacentIsSameDetailLevel, int caveCullingMaxY, EDhDirection direction,
|
||||||
int color, byte irisBlockMaterialId, byte blockLight)
|
short x, short yMin, short z, short horizontalWidth, short ySize,
|
||||||
|
int color, byte irisBlockMaterialId, byte blockLight)
|
||||||
{
|
{
|
||||||
|
// pooled arrays
|
||||||
|
LongArrayList segments = phantomArrayCheckout.getLongArray(0, 0);
|
||||||
|
LongArrayList newSegments = phantomArrayCheckout.getLongArray(1, 0);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
//==================//
|
//==================//
|
||||||
// create face with //
|
// create face with //
|
||||||
// no adjacent data //
|
// no adjacent data //
|
||||||
//==================//
|
//==================//
|
||||||
|
|
||||||
color = ColorUtil.applyShade(color, MC.getShade(direction));
|
color = ColorUtil.applyShade(color, MC_RENDER.getShade(direction));
|
||||||
|
|
||||||
// if there isn't any data adjacent to this LOD,
|
if (adjColumnView.size == 0
|
||||||
// just add the full vertical quad
|
|| RenderDataPointUtil.hasZeroHeight(adjColumnView.get(0)))
|
||||||
if (adjColumnView.size == 0 || RenderDataPointUtil.isVoid(adjColumnView.get(0)))
|
|
||||||
{
|
{
|
||||||
|
|
||||||
builder.addQuadAdj(direction, x, yMin, z, horizontalWidth, ySize, color, irisBlockMaterialId, LodUtil.MAX_MC_LIGHT, blockLight);
|
builder.addQuadAdj(direction, x, yMin, z, horizontalWidth, ySize, color, irisBlockMaterialId, LodUtil.MAX_MC_LIGHT, blockLight);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
//===========================//
|
//=================================//
|
||||||
// Determine face visibility //
|
// determine face visibility/light //
|
||||||
// based on it's neighbors //
|
//=================================//
|
||||||
//===========================//
|
|
||||||
|
|
||||||
short yMax = (short) (yMin + ySize); // min is inclusive, max is exclusive
|
boolean transparencyEnabled = Config.Client.Advanced.Graphics.Quality.transparency.get().transparencyEnabled;
|
||||||
byte[] skyLightAtInputPos = THREAD_LOCAL_SKY_LIGHT_ARRAY.get();
|
boolean inputTransparent = ColorUtil.getAlpha(color) < 255 && transparencyEnabled;
|
||||||
|
short yMax = (short) (yMin + ySize);
|
||||||
|
|
||||||
try
|
|
||||||
|
int adjCount = adjColumnView.size();
|
||||||
|
|
||||||
|
// Start with the entire range at max light
|
||||||
|
segments.add(YSegmentUtil.encode(yMin, yMax, LodUtil.MAX_MC_LIGHT));
|
||||||
|
|
||||||
|
// Process each adjacent datapoint and split segments as needed
|
||||||
|
for (int adjIndex = 0; adjIndex < adjCount; adjIndex++)
|
||||||
{
|
{
|
||||||
// set the initial sky-lights for this face,
|
long adjPoint = adjColumnView.get(adjIndex);
|
||||||
// if nothing overlaps or overhangs the face should have max sky light
|
short adjMinY = RenderDataPointUtil.getYMin(adjPoint);
|
||||||
Arrays.fill(skyLightAtInputPos, yMin, yMax, LodUtil.MAX_MC_LIGHT);
|
short adjMaxY = RenderDataPointUtil.getYMax(adjPoint);
|
||||||
|
|
||||||
// iterate top down
|
// skip empty adjacent points
|
||||||
int adjCount = adjColumnView.size();
|
// or points below this one
|
||||||
for (int adjIndex = 0; adjIndex < adjCount; adjIndex++)
|
if (!RenderDataPointUtil.doesDataPointExist(adjPoint)
|
||||||
|
|| RenderDataPointUtil.hasZeroHeight(adjPoint)
|
||||||
|
|| yMax <= adjMinY)
|
||||||
{
|
{
|
||||||
long adjPoint = adjColumnView.get(adjIndex);
|
continue;
|
||||||
short adjMinY = RenderDataPointUtil.getYMin(adjPoint);
|
|
||||||
short adjMaxY = RenderDataPointUtil.getYMax(adjPoint);
|
|
||||||
|
|
||||||
// skip empty adjacent datapoints
|
|
||||||
if (!RenderDataPointUtil.doesDataPointExist(adjPoint)
|
|
||||||
|| RenderDataPointUtil.isVoid(adjPoint))
|
|
||||||
{
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
// skip this adjacent datapoint if it's above the input datapoint (since it can't affect the input data point)
|
|
||||||
if (yMax <= adjMinY)
|
|
||||||
{
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
long adjAbovePoint = (adjIndex != 0) ? adjColumnView.get(adjIndex - 1) : RenderDataPointUtil.EMPTY_DATA;
|
|
||||||
long adjBelowPoint = (adjIndex + 1 < adjCount) ? adjColumnView.get(adjIndex + 1) : RenderDataPointUtil.EMPTY_DATA;
|
|
||||||
|
|
||||||
// if the adjacent data point is over the void
|
|
||||||
// don't consider it as transparent
|
|
||||||
boolean adjOverVoid = !RenderDataPointUtil.doesDataPointExist(adjBelowPoint);
|
|
||||||
boolean adjTransparent = !adjOverVoid && RenderDataPointUtil.getAlpha(adjPoint) < 255 && LodRenderer.transparencyEnabled;
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
//=================================//
|
|
||||||
// set sky light based on adjacent //
|
|
||||||
//=================================//
|
|
||||||
|
|
||||||
// set light based on overlapping adjacent
|
|
||||||
if (!adjTransparent)
|
|
||||||
{
|
|
||||||
// adj opaque
|
|
||||||
// mark positions adjacent is covering
|
|
||||||
byte adjSkyLight = RenderDataPointUtil.getLightSky(adjPoint);
|
|
||||||
for (int i = adjMinY; i < adjMaxY; i++)
|
|
||||||
{
|
|
||||||
byte skyLightAtPos = skyLightAtInputPos[i];
|
|
||||||
|
|
||||||
// if the adjacent is a different detail level, we want to render adjacent opaque
|
|
||||||
// faces to try and reduce the chance of holes on detail level borders
|
|
||||||
boolean adjacentCoversThis =
|
|
||||||
// if the adjacent is the same detail level, no special handling is necessary
|
|
||||||
!adjacentIsSameDetailLevel
|
|
||||||
// if the adjacent face is underground we probably don't need it
|
|
||||||
&& RenderDataPointUtil.getYMax(adjPoint) >= caveCullingMaxY
|
|
||||||
// check if this face is on a border
|
|
||||||
&&
|
|
||||||
(
|
|
||||||
(x == 0 && direction == EDhDirection.WEST)
|
|
||||||
|| (z == 0 && direction == EDhDirection.NORTH)
|
|
||||||
// TODO why does 256 represent a border? aren't LODs only 64 datapoints wide?
|
|
||||||
|| (x == 256 && direction == EDhDirection.EAST)
|
|
||||||
|| (z == 256 && direction == EDhDirection.SOUTH)
|
|
||||||
);
|
|
||||||
|
|
||||||
byte newSkyLightAtPos = adjacentCoversThis ? adjSkyLight : SKYLIGHT_COVERED;
|
|
||||||
skyLightAtInputPos[i] = (byte) Math.min(newSkyLightAtPos, skyLightAtPos);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
// adjacent is transparent,
|
|
||||||
// use datapoint below adjacent for lighting
|
|
||||||
byte belowSkyLight = RenderDataPointUtil.getLightSky(adjBelowPoint);
|
|
||||||
for (int i = adjMinY; i < adjMaxY; i++)
|
|
||||||
{
|
|
||||||
byte skyLightAtPos = skyLightAtInputPos[i];
|
|
||||||
skyLightAtInputPos[i] = (byte) Math.min(belowSkyLight, skyLightAtPos);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
// fill in sky light up to the next DP,
|
|
||||||
// this is done to handle overhangs
|
|
||||||
byte adjSkyLight = RenderDataPointUtil.getLightSky(adjPoint);
|
|
||||||
int adjAboveMinY = RenderDataPointUtil.getYMin(adjAbovePoint);
|
|
||||||
for (int i = adjMaxY; i < adjAboveMinY; i++)
|
|
||||||
{
|
|
||||||
byte skyLightAtPos = skyLightAtInputPos[i];
|
|
||||||
skyLightAtInputPos[i] = (byte) Math.min(adjSkyLight, skyLightAtPos);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
long adjAbovePoint = (adjIndex != 0) ? adjColumnView.get(adjIndex - 1) : RenderDataPointUtil.EMPTY_DATA;
|
||||||
|
long adjBelowPoint = (adjIndex + 1 < adjCount) ? adjColumnView.get(adjIndex + 1) : RenderDataPointUtil.EMPTY_DATA;
|
||||||
|
|
||||||
//=======================//
|
boolean adjOverVoid = !RenderDataPointUtil.doesDataPointExist(adjBelowPoint);
|
||||||
// create vertical faces //
|
boolean adjTransparent =
|
||||||
//=======================//
|
!adjOverVoid
|
||||||
|
&& RenderDataPointUtil.getAlpha(adjPoint) < 255
|
||||||
|
&& transparencyEnabled;
|
||||||
|
|
||||||
boolean inputTransparent = ColorUtil.getAlpha(color) < 255 && LodRenderer.transparencyEnabled;
|
byte adjSkyLight = RenderDataPointUtil.getLightSky(adjPoint);
|
||||||
byte lastSkyLight = skyLightAtInputPos[yMin];
|
byte lightToApply;
|
||||||
int quadBottomY = yMin;
|
|
||||||
int quadTopY = -1;
|
|
||||||
|
|
||||||
// walk up the sky lights and create a new face
|
if (!adjTransparent)
|
||||||
// whenever the light changes to different valid value
|
|
||||||
for (int i = yMin; i < yMax; i++)
|
|
||||||
{
|
{
|
||||||
byte skyLight = skyLightAtInputPos[i];
|
// Adjacent is opaque
|
||||||
if (skyLight != lastSkyLight)
|
boolean adjacentCoversThis =
|
||||||
{
|
!adjacentIsSameDetailLevel
|
||||||
// the sky light changed, create the in-progress face
|
&& RenderDataPointUtil.getYMax(adjPoint) >= caveCullingMaxY
|
||||||
tryAddVerticalFaceWithSkyLightToBuilder(
|
&&
|
||||||
builder, direction,
|
(
|
||||||
x, z, horizontalWidth,
|
(x == 0 && direction == EDhDirection.WEST)
|
||||||
color, irisBlockMaterialId, blockLight,
|
|| (z == 0 && direction == EDhDirection.NORTH)
|
||||||
lastSkyLight, inputTransparent, quadTopY, quadBottomY
|
|| (x == 256 && direction == EDhDirection.EAST)
|
||||||
);
|
|| (z == 256 && direction == EDhDirection.SOUTH)
|
||||||
|
);
|
||||||
lastSkyLight = skyLight;
|
|
||||||
quadBottomY = i;
|
|
||||||
}
|
|
||||||
|
|
||||||
quadTopY = (i + 1);
|
lightToApply = adjacentCoversThis ? adjSkyLight : SKYLIGHT_COVERED;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
// Adjacent is transparent, use below light
|
||||||
|
lightToApply = RenderDataPointUtil.getLightSky(adjBelowPoint);
|
||||||
}
|
}
|
||||||
|
|
||||||
// add the in-progress face if present
|
|
||||||
if (quadTopY != -1)
|
// Apply light to the range [adjMinY, adjMaxY)
|
||||||
|
applyLightToRange(segments, newSegments, adjMinY, adjMaxY, lightToApply);
|
||||||
|
|
||||||
|
// Fill overhang area [adjMaxY, adjAboveMinY) with adjSkyLight
|
||||||
|
short adjAboveMinY = RenderDataPointUtil.getYMin(adjAbovePoint);
|
||||||
|
if (adjMaxY < adjAboveMinY)
|
||||||
{
|
{
|
||||||
tryAddVerticalFaceWithSkyLightToBuilder(
|
applyLightToRange(segments, newSegments, adjMaxY, adjAboveMinY, adjSkyLight);
|
||||||
builder, direction,
|
|
||||||
x, z, horizontalWidth,
|
|
||||||
color, irisBlockMaterialId, blockLight,
|
|
||||||
lastSkyLight, inputTransparent, quadTopY, quadBottomY
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
finally
|
|
||||||
|
|
||||||
|
|
||||||
|
//=======================//
|
||||||
|
// Create vertical faces //
|
||||||
|
// from segments //
|
||||||
|
//=======================//
|
||||||
|
|
||||||
|
for (int i = 0; i < segments.size(); i++)
|
||||||
{
|
{
|
||||||
// clean up the array before the next thread uses it
|
long segment = segments.getLong(i);
|
||||||
// (may be unnecessary since we only work between the yMin-yMax anyway, but is helpful for debugging)
|
tryAddVerticalFaceWithSkyLightToBuilder(
|
||||||
Arrays.fill(skyLightAtInputPos, yMin, yMax, SKYLIGHT_EMPTY);
|
builder, direction,
|
||||||
|
x, z, horizontalWidth,
|
||||||
|
color, irisBlockMaterialId, blockLight,
|
||||||
|
YSegmentUtil.getSkyLight(segment), inputTransparent, YSegmentUtil.getEndY(segment), YSegmentUtil.getStartY(segment)
|
||||||
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Apply the new light value over the given y range,
|
||||||
|
* splitting segments as needed
|
||||||
|
* <p>
|
||||||
|
* source: claude.ai
|
||||||
|
*/
|
||||||
|
private static void applyLightToRange(
|
||||||
|
LongArrayList segments, LongArrayList newSegments,
|
||||||
|
short rangeStart, short rangeEnd,
|
||||||
|
byte newLight)
|
||||||
|
{
|
||||||
|
// clear the pooled array that the new segments will go into
|
||||||
|
newSegments.clear();
|
||||||
|
|
||||||
|
for (int i = 0; i < segments.size(); i++)
|
||||||
|
{
|
||||||
|
long seg = segments.getLong(i);
|
||||||
|
short endY = YSegmentUtil.getEndY(seg);
|
||||||
|
short startY = YSegmentUtil.getStartY(seg);
|
||||||
|
byte skyLight = YSegmentUtil.getSkyLight(seg);
|
||||||
|
|
||||||
|
// No overlap
|
||||||
|
if (endY <= rangeStart
|
||||||
|
|| startY >= rangeEnd)
|
||||||
|
{
|
||||||
|
newSegments.add(seg);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Partial or complete overlap - need to split
|
||||||
|
|
||||||
|
// Part before the range
|
||||||
|
if (startY < rangeStart)
|
||||||
|
{
|
||||||
|
newSegments.add(YSegmentUtil.encode(startY, rangeStart, skyLight));
|
||||||
|
}
|
||||||
|
|
||||||
|
// Overlapping part - take minimum light
|
||||||
|
short overlapStart = (short)Math.max(startY, rangeStart);
|
||||||
|
short overlapEnd = (short)Math.min(endY, rangeEnd);
|
||||||
|
byte minLight = (byte) Math.min(newLight, skyLight);
|
||||||
|
newSegments.add(YSegmentUtil.encode(overlapStart, overlapEnd, minLight));
|
||||||
|
|
||||||
|
// Part after the range
|
||||||
|
if (endY > rangeEnd)
|
||||||
|
{
|
||||||
|
newSegments.add(YSegmentUtil.encode(rangeEnd, endY, skyLight));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
segments.clear();
|
||||||
|
segments.addAll(newSegments);
|
||||||
|
}
|
||||||
|
|
||||||
private static void tryAddVerticalFaceWithSkyLightToBuilder(
|
private static void tryAddVerticalFaceWithSkyLightToBuilder(
|
||||||
LodQuadBuilder builder, EDhDirection direction,
|
LodQuadBuilder builder, EDhDirection direction,
|
||||||
short x, short z, short horizontalWidth,
|
short x, short z, short horizontalWidth,
|
||||||
@@ -405,22 +433,72 @@ public class ColumnBox
|
|||||||
)
|
)
|
||||||
{
|
{
|
||||||
// invalid positions will have a negative skylight
|
// invalid positions will have a negative skylight
|
||||||
if (lastSkyLight >= 0)
|
if (lastSkyLight < 0)
|
||||||
{
|
{
|
||||||
// Don't add transparent vertical faces
|
return;
|
||||||
// unless the adjacent position is empty.
|
|
||||||
// This is done to prevent walls between water blocks in the ocean.
|
|
||||||
if (!inputTransparent
|
|
||||||
|| (lastSkyLight == LodUtil.MAX_MC_LIGHT))
|
|
||||||
{
|
|
||||||
// don't add negative/empty height faces
|
|
||||||
short height = (short) (quadTopY - quadBottomY);
|
|
||||||
if (height > 0)
|
|
||||||
{
|
|
||||||
builder.addQuadAdj(direction, x, (short) quadBottomY, z, horizontalWidth, height, color, irisBlockMaterialId, lastSkyLight, blockLight);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Don't add transparent vertical faces
|
||||||
|
// unless the adjacent position is empty.
|
||||||
|
// This is done to prevent walls between water blocks in the ocean.
|
||||||
|
if (inputTransparent
|
||||||
|
&& (lastSkyLight != LodUtil.MAX_MC_LIGHT))
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// don't add negative/empty height faces
|
||||||
|
short height = (short) (quadTopY - quadBottomY);
|
||||||
|
if (height <= 0)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
builder.addQuadAdj(
|
||||||
|
direction,
|
||||||
|
x, (short) quadBottomY, z,
|
||||||
|
horizontalWidth, height,
|
||||||
|
color, irisBlockMaterialId, lastSkyLight, blockLight);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
//================//
|
||||||
|
// helper classes //
|
||||||
|
//================//
|
||||||
|
|
||||||
|
/**
|
||||||
|
* encodes height/light data into a long
|
||||||
|
* to reduce object allocations.
|
||||||
|
*/
|
||||||
|
private static class YSegmentUtil
|
||||||
|
{
|
||||||
|
private static final int HEIGHT_WIDTH = Short.SIZE;
|
||||||
|
private static final int SKY_LIGHT_WIDTH = Byte.SIZE;
|
||||||
|
|
||||||
|
private static final int START_Y_MASK = (int) Math.pow(2, HEIGHT_WIDTH) - 1;
|
||||||
|
private static final int END_Y_MASK = (int) Math.pow(2, HEIGHT_WIDTH) - 1;
|
||||||
|
private static final int SKY_LIGHT_MASK = (int) Math.pow(2, SKY_LIGHT_WIDTH) - 1;
|
||||||
|
|
||||||
|
private static final int START_Y_OFFSET = 0;
|
||||||
|
private static final int END_Y_OFFSET = START_Y_OFFSET + HEIGHT_WIDTH;
|
||||||
|
private static final int SKY_LIGHT_OFFSET = END_Y_OFFSET + HEIGHT_WIDTH;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
public static long encode(short startY, short endY, byte skyLight)
|
||||||
|
{
|
||||||
|
long data = 0L;
|
||||||
|
data |= (long) (startY & START_Y_MASK) << START_Y_OFFSET;
|
||||||
|
data |= (long) (endY & END_Y_MASK) << END_Y_OFFSET;
|
||||||
|
data |= (long) (skyLight & SKY_LIGHT_MASK) << SKY_LIGHT_OFFSET;
|
||||||
|
return data;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static short getStartY(long data) { return (short) ((data >> START_Y_OFFSET) & START_Y_MASK); }
|
||||||
|
public static short getEndY(long data) { return (short) ((data >> END_Y_OFFSET) & END_Y_MASK); }
|
||||||
|
public static byte getSkyLight(long data) { return (byte) ((data >> SKY_LIGHT_OFFSET) & SKY_LIGHT_MASK); }
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
+188
-189
@@ -25,20 +25,17 @@ import com.seibel.distanthorizons.core.enums.EDhDirection;
|
|||||||
import com.seibel.distanthorizons.core.config.Config;
|
import com.seibel.distanthorizons.core.config.Config;
|
||||||
import com.seibel.distanthorizons.core.dataObjects.render.ColumnRenderSource;
|
import com.seibel.distanthorizons.core.dataObjects.render.ColumnRenderSource;
|
||||||
import com.seibel.distanthorizons.core.level.IDhClientLevel;
|
import com.seibel.distanthorizons.core.level.IDhClientLevel;
|
||||||
import com.seibel.distanthorizons.core.logging.ConfigBasedLogger;
|
import com.seibel.distanthorizons.core.logging.DhLogger;
|
||||||
import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
|
import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
|
||||||
|
import com.seibel.distanthorizons.core.pooling.PhantomArrayListCheckout;
|
||||||
|
import com.seibel.distanthorizons.core.pooling.PhantomArrayListPool;
|
||||||
import com.seibel.distanthorizons.core.pos.blockPos.DhBlockPos;
|
import com.seibel.distanthorizons.core.pos.blockPos.DhBlockPos;
|
||||||
import com.seibel.distanthorizons.core.pos.DhSectionPos;
|
import com.seibel.distanthorizons.core.pos.DhSectionPos;
|
||||||
import com.seibel.distanthorizons.core.render.glObject.GLProxy;
|
import com.seibel.distanthorizons.core.render.glObject.GLProxy;
|
||||||
import com.seibel.distanthorizons.core.util.ColorUtil;
|
import com.seibel.distanthorizons.core.util.ColorUtil;
|
||||||
import com.seibel.distanthorizons.core.util.LodUtil;
|
import com.seibel.distanthorizons.core.util.LodUtil;
|
||||||
import com.seibel.distanthorizons.core.util.RenderDataPointUtil;
|
import com.seibel.distanthorizons.core.util.RenderDataPointUtil;
|
||||||
import com.seibel.distanthorizons.core.util.objects.UncheckedInterruptedException;
|
|
||||||
import com.seibel.distanthorizons.core.dataObjects.render.columnViews.ColumnArrayView;
|
import com.seibel.distanthorizons.core.dataObjects.render.columnViews.ColumnArrayView;
|
||||||
import com.seibel.distanthorizons.core.util.threading.ThreadPoolUtil;
|
|
||||||
import com.seibel.distanthorizons.coreapi.util.BitShiftUtil;
|
|
||||||
import org.apache.logging.log4j.LogManager;
|
|
||||||
import org.apache.logging.log4j.Logger;
|
|
||||||
|
|
||||||
import java.util.concurrent.CompletableFuture;
|
import java.util.concurrent.CompletableFuture;
|
||||||
|
|
||||||
@@ -49,9 +46,9 @@ import java.util.concurrent.CompletableFuture;
|
|||||||
*/
|
*/
|
||||||
public class ColumnRenderBufferBuilder
|
public class ColumnRenderBufferBuilder
|
||||||
{
|
{
|
||||||
public static final ConfigBasedLogger EVENT_LOGGER = new ConfigBasedLogger(LogManager.getLogger(),
|
private static final DhLogger LOGGER = new DhLoggerBuilder().build();
|
||||||
() -> Config.Common.Logging.logRendererBufferEvent.get());
|
|
||||||
private static final Logger LOGGER = DhLoggerBuilder.getLogger();
|
public static final PhantomArrayListPool ARRAY_LIST_POOL = new PhantomArrayListPool("Column Buffer Builder");
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@@ -60,14 +57,15 @@ public class ColumnRenderBufferBuilder
|
|||||||
//==============//
|
//==============//
|
||||||
|
|
||||||
/** @link adjData should be null for adjacent sections that cross detail level boundaries */
|
/** @link adjData should be null for adjacent sections that cross detail level boundaries */
|
||||||
public static CompletableFuture<ColumnRenderBuffer> uploadBuffersAsync(
|
public static CompletableFuture<LodBufferContainer> uploadBuffersAsync(
|
||||||
IDhClientLevel clientLevel,
|
IDhClientLevel clientLevel,
|
||||||
long pos,
|
long pos,
|
||||||
LodQuadBuilder quadBuilder
|
LodQuadBuilder quadBuilder
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
ColumnRenderBuffer buffer = new ColumnRenderBuffer(new DhBlockPos(DhSectionPos.getMinCornerBlockX(pos), clientLevel.getMinY(), DhSectionPos.getMinCornerBlockZ(pos)));
|
DhBlockPos minBlockPos = new DhBlockPos(DhSectionPos.getMinCornerBlockX(pos), clientLevel.getLevelWrapper().getMinHeight(), DhSectionPos.getMinCornerBlockZ(pos));
|
||||||
CompletableFuture<ColumnRenderBuffer> uploadFuture = buffer.makeAndUploadBuffersAsync(quadBuilder, GLProxy.getInstance().getGpuUploadMethod());
|
LodBufferContainer bufferContainer = new LodBufferContainer(pos, minBlockPos);
|
||||||
|
CompletableFuture<LodBufferContainer> uploadFuture = bufferContainer.makeAndUploadBuffersAsync(quadBuilder);
|
||||||
uploadFuture.whenComplete((uploadedBuffer, exception) ->
|
uploadFuture.whenComplete((uploadedBuffer, exception) ->
|
||||||
{
|
{
|
||||||
// clean up if not uploaded
|
// clean up if not uploaded
|
||||||
@@ -109,208 +107,209 @@ public class ColumnRenderBufferBuilder
|
|||||||
// build each column //
|
// build each column //
|
||||||
//===================//
|
//===================//
|
||||||
|
|
||||||
byte thisDetailLevel = renderSource.getDataDetailLevel();
|
// pooled arrays for ColumnBox use
|
||||||
for (int relX = 0; relX < ColumnRenderSource.SECTION_SIZE; relX++)
|
try (PhantomArrayListCheckout phantomArrayCheckout = ARRAY_LIST_POOL.checkoutArrays(0, 0, 2))
|
||||||
{
|
{
|
||||||
for (int relZ = 0; relZ < ColumnRenderSource.SECTION_SIZE; relZ++)
|
byte thisDetailLevel = renderSource.getDataDetailLevel();
|
||||||
|
for (int relX = 0; relX < ColumnRenderSource.WIDTH; relX++)
|
||||||
{
|
{
|
||||||
// stop the builder if requested
|
for (int relZ = 0; relZ < ColumnRenderSource.WIDTH; relZ++)
|
||||||
UncheckedInterruptedException.throwIfInterrupted();
|
|
||||||
|
|
||||||
// ignore empty/null columns
|
|
||||||
ColumnArrayView columnRenderData = renderSource.getVerticalDataPointView(relX, relZ);
|
|
||||||
if (columnRenderData.size() == 0
|
|
||||||
|| !RenderDataPointUtil.doesDataPointExist(columnRenderData.get(0))
|
|
||||||
|| RenderDataPointUtil.isVoid(columnRenderData.get(0)))
|
|
||||||
{
|
{
|
||||||
continue;
|
// ignore empty/null columns
|
||||||
}
|
ColumnArrayView columnRenderData = renderSource.getVerticalDataPointView(relX, relZ);
|
||||||
|
if (columnRenderData.size() == 0
|
||||||
|
|| !RenderDataPointUtil.doesDataPointExist(columnRenderData.get(0))
|
||||||
|
|| RenderDataPointUtil.hasZeroHeight(columnRenderData.get(0)))
|
||||||
//=============//
|
|
||||||
// debug limit //
|
|
||||||
//=============//
|
|
||||||
|
|
||||||
// can be used to limit the buffer building to a specific relative position.
|
|
||||||
// useful for debugging a single column
|
|
||||||
if (columnBuilderDebugEnabled)
|
|
||||||
{
|
|
||||||
int wantedX = Config.Client.Advanced.Debugging.ColumnBuilderDebugging.columnBuilderDebugXRow.get();
|
|
||||||
if (wantedX >= 0 && relX != wantedX)
|
|
||||||
{
|
{
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
int wantedZ = Config.Client.Advanced.Debugging.ColumnBuilderDebugging.columnBuilderDebugZRow.get();
|
|
||||||
if (wantedZ >= 0 && relZ != wantedZ)
|
|
||||||
|
|
||||||
|
//=============//
|
||||||
|
// debug limit //
|
||||||
|
//=============//
|
||||||
|
|
||||||
|
// can be used to limit the buffer building to a specific relative position.
|
||||||
|
// useful for debugging a single column
|
||||||
|
if (columnBuilderDebugEnabled)
|
||||||
{
|
{
|
||||||
continue;
|
int wantedX = Config.Client.Advanced.Debugging.ColumnBuilderDebugging.columnBuilderDebugXRow.get();
|
||||||
}
|
if (wantedX >= 0 && relX != wantedX)
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
//==================================//
|
|
||||||
// get adjacent render data columns //
|
|
||||||
//==================================//
|
|
||||||
|
|
||||||
ColumnArrayView[] adjColumnViews = new ColumnArrayView[EDhDirection.ADJ_DIRECTIONS.length];
|
|
||||||
for (EDhDirection lodDirection : EDhDirection.ADJ_DIRECTIONS)
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
int xAdj = relX + lodDirection.getNormal().x;
|
|
||||||
int zAdj = relZ + lodDirection.getNormal().z;
|
|
||||||
boolean isCrossRenderSourceBoundary =
|
|
||||||
(xAdj < 0 || xAdj >= ColumnRenderSource.SECTION_SIZE) ||
|
|
||||||
(zAdj < 0 || zAdj >= ColumnRenderSource.SECTION_SIZE);
|
|
||||||
|
|
||||||
ColumnRenderSource adjRenderSource;
|
|
||||||
byte adjDetailLevel;
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
//=========================//
|
|
||||||
// get the adjacent render //
|
|
||||||
// source if present //
|
|
||||||
//=========================//
|
|
||||||
|
|
||||||
if (!isCrossRenderSourceBoundary)
|
|
||||||
{
|
{
|
||||||
// the adjacent position is inside this same render source
|
continue;
|
||||||
adjRenderSource = renderSource;
|
|
||||||
adjDetailLevel = thisDetailLevel;
|
|
||||||
}
|
}
|
||||||
else
|
int wantedZ = Config.Client.Advanced.Debugging.ColumnBuilderDebugging.columnBuilderDebugZRow.get();
|
||||||
{
|
if (wantedZ >= 0 && relZ != wantedZ)
|
||||||
// the adjacent position is outside this render source
|
|
||||||
|
|
||||||
// skip empty sections
|
|
||||||
adjRenderSource = adjRegions[lodDirection.ordinal() - 2];
|
|
||||||
if (adjRenderSource == null)
|
|
||||||
{
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
adjDetailLevel = adjRenderSource.getDataDetailLevel();
|
|
||||||
if (adjDetailLevel == thisDetailLevel)
|
|
||||||
{
|
|
||||||
// if the adjacent position is outside this render source,
|
|
||||||
// wrap the position around so it's inside the adjacent source
|
|
||||||
|
|
||||||
if (xAdj < 0)
|
|
||||||
{
|
|
||||||
xAdj += ColumnRenderSource.SECTION_SIZE;
|
|
||||||
}
|
|
||||||
if (xAdj >= ColumnRenderSource.SECTION_SIZE)
|
|
||||||
{
|
|
||||||
xAdj -= ColumnRenderSource.SECTION_SIZE;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (zAdj < 0)
|
|
||||||
{
|
|
||||||
zAdj += ColumnRenderSource.SECTION_SIZE;
|
|
||||||
}
|
|
||||||
if (zAdj >= ColumnRenderSource.SECTION_SIZE)
|
|
||||||
{
|
|
||||||
zAdj -= ColumnRenderSource.SECTION_SIZE;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
//========================//
|
|
||||||
// get the adjacent views //
|
|
||||||
//========================//
|
|
||||||
|
|
||||||
// the old logic handled additional cases, but they never appeared to fire,
|
|
||||||
// so just these two cases should be fine
|
|
||||||
boolean expectedDetailLevels = (adjDetailLevel == thisDetailLevel) || (adjDetailLevel > thisDetailLevel);
|
|
||||||
if (!expectedDetailLevels)
|
|
||||||
{
|
|
||||||
LodUtil.assertNotReach("Mismatch between adjacent detail level ["+adjDetailLevel+"] and this render source's detail level ["+thisDetailLevel+"]. Detail levels should be adj >= this.");
|
|
||||||
}
|
|
||||||
|
|
||||||
adjColumnViews[lodDirection.ordinal() - 2] = adjRenderSource.getVerticalDataPointView(xAdj, zAdj);
|
|
||||||
}
|
|
||||||
catch (RuntimeException e)
|
|
||||||
{
|
|
||||||
EVENT_LOGGER.warn("Failed to get adj data for relative pos: [" + thisDetailLevel + ":" + relX + "," + relZ + "] at [" + lodDirection + "], Error: "+e.getMessage(), e);
|
|
||||||
}
|
|
||||||
} // for adjacent directions
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
//==========================//
|
|
||||||
// build this render column //
|
|
||||||
//==========================//
|
|
||||||
|
|
||||||
ColumnRenderSource.DebugSourceFlag debugSourceFlag = renderSource.debugGetFlag(relX, relZ);
|
|
||||||
|
|
||||||
// We render every vertical lod present in this position
|
|
||||||
// We only stop when we find a block that is void or non-existing block
|
|
||||||
for (int i = 0; i < columnRenderData.size(); i++)
|
|
||||||
{
|
|
||||||
// can be uncommented to limit which vertical LOD is generated
|
|
||||||
if (Config.Client.Advanced.Debugging.ColumnBuilderDebugging.columnBuilderDebugEnable.get())
|
|
||||||
{
|
|
||||||
int wantedColumnIndex = Config.Client.Advanced.Debugging.ColumnBuilderDebugging.columnBuilderDebugColumnIndex.get();
|
|
||||||
if (wantedColumnIndex >= 0 && i != wantedColumnIndex)
|
|
||||||
{
|
{
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
long data = columnRenderData.get(i);
|
|
||||||
// If the data is not render-able (Void or non-existing) we stop since there is
|
|
||||||
// no data left in this position
|
//==================================//
|
||||||
if (RenderDataPointUtil.isVoid(data) || !RenderDataPointUtil.doesDataPointExist(data))
|
// get adjacent render data columns //
|
||||||
|
//==================================//
|
||||||
|
|
||||||
|
ColumnArrayView[] adjColumnViews = new ColumnArrayView[EDhDirection.CARDINAL_COMPASS.length];
|
||||||
|
for (EDhDirection direction : EDhDirection.CARDINAL_COMPASS)
|
||||||
{
|
{
|
||||||
break;
|
try
|
||||||
|
{
|
||||||
|
int xAdj = relX + direction.normal.x;
|
||||||
|
int zAdj = relZ + direction.normal.z;
|
||||||
|
boolean isCrossRenderSourceBoundary =
|
||||||
|
(xAdj < 0 || xAdj >= ColumnRenderSource.WIDTH) ||
|
||||||
|
(zAdj < 0 || zAdj >= ColumnRenderSource.WIDTH);
|
||||||
|
|
||||||
|
ColumnRenderSource adjRenderSource;
|
||||||
|
byte adjDetailLevel;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
//=========================//
|
||||||
|
// get the adjacent render //
|
||||||
|
// source if present //
|
||||||
|
//=========================//
|
||||||
|
|
||||||
|
if (!isCrossRenderSourceBoundary)
|
||||||
|
{
|
||||||
|
// the adjacent position is inside this same render source
|
||||||
|
adjRenderSource = renderSource;
|
||||||
|
adjDetailLevel = thisDetailLevel;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
// the adjacent position is outside this render source
|
||||||
|
|
||||||
|
// skip empty sections
|
||||||
|
adjRenderSource = adjRegions[direction.compassIndex];
|
||||||
|
if (adjRenderSource == null)
|
||||||
|
{
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
adjDetailLevel = adjRenderSource.getDataDetailLevel();
|
||||||
|
if (adjDetailLevel == thisDetailLevel)
|
||||||
|
{
|
||||||
|
// if the adjacent position is outside this render source,
|
||||||
|
// wrap the position around so it's inside the adjacent source
|
||||||
|
|
||||||
|
if (xAdj < 0)
|
||||||
|
{
|
||||||
|
xAdj += ColumnRenderSource.WIDTH;
|
||||||
|
}
|
||||||
|
if (xAdj >= ColumnRenderSource.WIDTH)
|
||||||
|
{
|
||||||
|
xAdj -= ColumnRenderSource.WIDTH;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (zAdj < 0)
|
||||||
|
{
|
||||||
|
zAdj += ColumnRenderSource.WIDTH;
|
||||||
|
}
|
||||||
|
if (zAdj >= ColumnRenderSource.WIDTH)
|
||||||
|
{
|
||||||
|
zAdj -= ColumnRenderSource.WIDTH;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
//========================//
|
||||||
|
// get the adjacent views //
|
||||||
|
//========================//
|
||||||
|
|
||||||
|
// the old logic handled additional cases, but they never appeared to fire,
|
||||||
|
// so just these two cases should be fine
|
||||||
|
boolean expectedDetailLevels = (adjDetailLevel == thisDetailLevel) || (adjDetailLevel > thisDetailLevel);
|
||||||
|
if (!expectedDetailLevels)
|
||||||
|
{
|
||||||
|
LodUtil.assertNotReach("Mismatch between adjacent detail level ["+adjDetailLevel+"] and this render source's detail level ["+thisDetailLevel+"]. Detail levels should be adj >= this.");
|
||||||
|
}
|
||||||
|
|
||||||
|
adjColumnViews[direction.compassIndex] = adjRenderSource.getVerticalDataPointView(xAdj, zAdj);
|
||||||
|
}
|
||||||
|
catch (RuntimeException e)
|
||||||
|
{
|
||||||
|
LOGGER.warn("Failed to get adj data for relative pos: [" + thisDetailLevel + ":" + relX + "," + relZ + "] at [" + direction + "], Error: [" + e.getMessage() + "].", e);
|
||||||
|
}
|
||||||
|
} // for adjacent directions
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
//==========================//
|
||||||
|
// build this render column //
|
||||||
|
//==========================//
|
||||||
|
|
||||||
|
ColumnRenderSource.DebugSourceFlag debugSourceFlag = renderSource.debugGetFlag(relX, relZ);
|
||||||
|
|
||||||
|
for (int i = 0; i < columnRenderData.size(); i++)
|
||||||
|
{
|
||||||
|
// can be uncommented to limit which vertical LOD is generated
|
||||||
|
if (Config.Client.Advanced.Debugging.ColumnBuilderDebugging.columnBuilderDebugEnable.get())
|
||||||
|
{
|
||||||
|
int wantedColumnIndex = Config.Client.Advanced.Debugging.ColumnBuilderDebugging.columnBuilderDebugColumnIndex.get();
|
||||||
|
if (wantedColumnIndex >= 0
|
||||||
|
&& i != wantedColumnIndex)
|
||||||
|
{
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
long data = columnRenderData.get(i);
|
||||||
|
// If the data is not render-able (Void or non-existing) we stop since there is
|
||||||
|
// no data left in this position
|
||||||
|
if (RenderDataPointUtil.hasZeroHeight(data)
|
||||||
|
|| !RenderDataPointUtil.doesDataPointExist(data))
|
||||||
|
{
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
long topDataPoint = (i - 1) >= 0 ? columnRenderData.get(i - 1) : RenderDataPointUtil.EMPTY_DATA;
|
||||||
|
long bottomDataPoint = (i + 1) < columnRenderData.size() ? columnRenderData.get(i + 1) : RenderDataPointUtil.EMPTY_DATA;
|
||||||
|
|
||||||
|
addRenderDataPointToBuilder(
|
||||||
|
clientLevel, phantomArrayCheckout,
|
||||||
|
data, topDataPoint, bottomDataPoint,
|
||||||
|
adjColumnViews, isSameDetailLevel,
|
||||||
|
thisDetailLevel, relX, relZ,
|
||||||
|
quadBuilder, debugSourceFlag);
|
||||||
}
|
}
|
||||||
|
|
||||||
long topDataPoint = (i - 1) >= 0 ? columnRenderData.get(i - 1) : RenderDataPointUtil.EMPTY_DATA;
|
}// for z
|
||||||
long bottomDataPoint = (i + 1) < columnRenderData.size() ? columnRenderData.get(i + 1) : RenderDataPointUtil.EMPTY_DATA;
|
}// for x
|
||||||
|
}// phantom checkout
|
||||||
addLodToBuffer(
|
|
||||||
clientLevel,
|
|
||||||
data, topDataPoint, bottomDataPoint,
|
|
||||||
adjColumnViews, isSameDetailLevel,
|
|
||||||
thisDetailLevel, relX, relZ,
|
|
||||||
quadBuilder, debugSourceFlag);
|
|
||||||
}
|
|
||||||
|
|
||||||
}// for z
|
|
||||||
}// for x
|
|
||||||
|
|
||||||
quadBuilder.mergeQuads();
|
quadBuilder.mergeQuads();
|
||||||
}
|
}
|
||||||
private static void addLodToBuffer(
|
private static void addRenderDataPointToBuilder(
|
||||||
IDhClientLevel clientLevel,
|
IDhClientLevel clientLevel, PhantomArrayListCheckout phantomArrayCheckout,
|
||||||
long data, long topData, long bottomData,
|
long renderData, long topRenderData, long bottomRenderData,
|
||||||
ColumnArrayView[] adjColumnViews, boolean[] isSameDetailLevel,
|
ColumnArrayView[] adjColumnViews, boolean[] isSameDetailLevel,
|
||||||
byte detailLevel, int renderSourceOffsetPosX, int renderSourceOffsetPosZ,
|
byte detailLevel, int renderSourceOffsetPosX, int renderSourceOffsetPosZ,
|
||||||
LodQuadBuilder quadBuilder, ColumnRenderSource.DebugSourceFlag debugSource)
|
LodQuadBuilder quadBuilder, ColumnRenderSource.DebugSourceFlag debugSource)
|
||||||
{
|
{
|
||||||
long sectionPos = DhSectionPos.encode(detailLevel, renderSourceOffsetPosX, renderSourceOffsetPosZ);
|
long sectionPos = DhSectionPos.encode(detailLevel, renderSourceOffsetPosX, renderSourceOffsetPosZ);
|
||||||
|
|
||||||
short width = (short) BitShiftUtil.powerOfTwo(detailLevel);
|
short blockWidth = (short) DhSectionPos.getDetailLevelWidthInBlocks(detailLevel);
|
||||||
short xMin = (short) DhSectionPos.getMinCornerBlockX(sectionPos);
|
short blockMinX = (short) DhSectionPos.getMinCornerBlockX(sectionPos);
|
||||||
short yMin = RenderDataPointUtil.getYMin(data);
|
short blockMinY = RenderDataPointUtil.getYMin(renderData);
|
||||||
short zMin = (short) DhSectionPos.getMinCornerBlockZ(sectionPos);
|
short blockMinZ = (short) DhSectionPos.getMinCornerBlockZ(sectionPos);
|
||||||
short ySize = (short) (RenderDataPointUtil.getYMax(data) - yMin);
|
short blockMaxY = (short) (RenderDataPointUtil.getYMax(renderData) - blockMinY);
|
||||||
|
|
||||||
if (ySize == 0)
|
if (blockMaxY == 0)
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
else if (ySize < 0)
|
else if (blockMaxY < 0)
|
||||||
{
|
{
|
||||||
throw new IllegalArgumentException("Negative y size for the data! Data: [" + RenderDataPointUtil.toString(data) + "].");
|
throw new IllegalArgumentException("Negative y size for the renderDataPoint! Data: [" + RenderDataPointUtil.toString(renderData) + "].");
|
||||||
}
|
}
|
||||||
|
|
||||||
byte blockMaterialId = RenderDataPointUtil.getBlockMaterialId(data);
|
byte blockMaterialId = RenderDataPointUtil.getBlockMaterialId(renderData);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@@ -325,11 +324,11 @@ public class ColumnRenderBufferBuilder
|
|||||||
float brightnessMultiplier = Config.Client.Advanced.Graphics.Quality.brightnessMultiplier.get().floatValue();
|
float brightnessMultiplier = Config.Client.Advanced.Graphics.Quality.brightnessMultiplier.get().floatValue();
|
||||||
if (saturationMultiplier == 1.0 && brightnessMultiplier == 1.0)
|
if (saturationMultiplier == 1.0 && brightnessMultiplier == 1.0)
|
||||||
{
|
{
|
||||||
color = RenderDataPointUtil.getColor(data);
|
color = RenderDataPointUtil.getColor(renderData);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
float[] ahsv = ColorUtil.argbToAhsv(RenderDataPointUtil.getColor(data));
|
float[] ahsv = ColorUtil.argbToAhsv(RenderDataPointUtil.getColor(renderData));
|
||||||
color = ColorUtil.ahsvToArgb(ahsv[0], ahsv[1], ahsv[2] * saturationMultiplier, ahsv[3] * brightnessMultiplier);
|
color = ColorUtil.ahsvToArgb(ahsv[0], ahsv[1], ahsv[2] * saturationMultiplier, ahsv[3] * brightnessMultiplier);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
@@ -419,14 +418,14 @@ public class ColumnRenderBufferBuilder
|
|||||||
}
|
}
|
||||||
|
|
||||||
ColumnBox.addBoxQuadsToBuilder(
|
ColumnBox.addBoxQuadsToBuilder(
|
||||||
quadBuilder, clientLevel,
|
quadBuilder, phantomArrayCheckout, clientLevel,
|
||||||
width, ySize, width,
|
blockWidth, blockMaxY,
|
||||||
xMin, yMin, zMin,
|
blockMinX, blockMinY, blockMinZ,
|
||||||
color,
|
color,
|
||||||
blockMaterialId,
|
blockMaterialId,
|
||||||
RenderDataPointUtil.getLightSky(data),
|
RenderDataPointUtil.getLightSky(renderData),
|
||||||
fullBright ? 15 : RenderDataPointUtil.getLightBlock(data),
|
fullBright ? LodUtil.MAX_MC_LIGHT : RenderDataPointUtil.getLightBlock(renderData),
|
||||||
topData, bottomData, adjColumnViews, isSameDetailLevel);
|
topRenderData, bottomRenderData, adjColumnViews, isSameDetailLevel);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
+28
-86
@@ -19,16 +19,14 @@
|
|||||||
|
|
||||||
package com.seibel.distanthorizons.core.dataObjects.render.bufferBuilding;
|
package com.seibel.distanthorizons.core.dataObjects.render.bufferBuilding;
|
||||||
|
|
||||||
import com.seibel.distanthorizons.api.methods.events.sharedParameterObjects.DhApiRenderParam;
|
import com.seibel.distanthorizons.core.logging.DhLogger;
|
||||||
import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
|
import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
|
||||||
import com.seibel.distanthorizons.core.pos.blockPos.DhBlockPos;
|
import com.seibel.distanthorizons.core.pos.blockPos.DhBlockPos;
|
||||||
import com.seibel.distanthorizons.core.render.glObject.GLProxy;
|
import com.seibel.distanthorizons.core.render.glObject.GLProxy;
|
||||||
import com.seibel.distanthorizons.core.render.glObject.buffer.GLVertexBuffer;
|
import com.seibel.distanthorizons.core.render.glObject.buffer.GLVertexBuffer;
|
||||||
import com.seibel.distanthorizons.core.render.renderer.LodRenderer;
|
|
||||||
import com.seibel.distanthorizons.core.util.LodUtil;
|
import com.seibel.distanthorizons.core.util.LodUtil;
|
||||||
import com.seibel.distanthorizons.core.util.objects.StatsMap;
|
import com.seibel.distanthorizons.core.util.objects.StatsMap;
|
||||||
import com.seibel.distanthorizons.api.enums.config.EDhApiGpuUploadMethod;
|
import com.seibel.distanthorizons.api.enums.config.EDhApiGpuUploadMethod;
|
||||||
import org.apache.logging.log4j.Logger;
|
|
||||||
import org.lwjgl.system.MemoryUtil;
|
import org.lwjgl.system.MemoryUtil;
|
||||||
|
|
||||||
import java.nio.ByteBuffer;
|
import java.nio.ByteBuffer;
|
||||||
@@ -40,9 +38,9 @@ import java.util.concurrent.*;
|
|||||||
*
|
*
|
||||||
* @see ColumnRenderBufferBuilder
|
* @see ColumnRenderBufferBuilder
|
||||||
*/
|
*/
|
||||||
public class ColumnRenderBuffer implements AutoCloseable
|
public class LodBufferContainer implements AutoCloseable
|
||||||
{
|
{
|
||||||
private static final Logger LOGGER = DhLoggerBuilder.getLogger();
|
private static final DhLogger LOGGER = new DhLoggerBuilder().build();
|
||||||
|
|
||||||
/** number of bytes a single quad takes */
|
/** number of bytes a single quad takes */
|
||||||
public static final int QUADS_BYTE_SIZE = LodUtil.LOD_VERTEX_FORMAT.getByteSize() * 4;
|
public static final int QUADS_BYTE_SIZE = LodUtil.LOD_VERTEX_FORMAT.getByteSize() * 4;
|
||||||
@@ -52,15 +50,16 @@ public class ColumnRenderBuffer implements AutoCloseable
|
|||||||
public static final int FULL_SIZED_BUFFER = MAX_QUADS_PER_BUFFER * QUADS_BYTE_SIZE;
|
public static final int FULL_SIZED_BUFFER = MAX_QUADS_PER_BUFFER * QUADS_BYTE_SIZE;
|
||||||
|
|
||||||
|
|
||||||
|
/** the position closest to minimum X/Z infinity and the level's lowest Y */
|
||||||
public final DhBlockPos blockPos;
|
public final DhBlockPos minCornerBlockPos;
|
||||||
|
public final long pos;
|
||||||
|
|
||||||
public boolean buffersUploaded = false;
|
public boolean buffersUploaded = false;
|
||||||
|
|
||||||
private GLVertexBuffer[] vbos;
|
public GLVertexBuffer[] vbos;
|
||||||
private GLVertexBuffer[] vbosTransparent;
|
public GLVertexBuffer[] vbosTransparent;
|
||||||
|
|
||||||
private CompletableFuture<ColumnRenderBuffer> uploadFuture = null;
|
private CompletableFuture<LodBufferContainer> uploadFuture = null;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@@ -68,9 +67,10 @@ public class ColumnRenderBuffer implements AutoCloseable
|
|||||||
// constructors //
|
// constructors //
|
||||||
//==============//
|
//==============//
|
||||||
|
|
||||||
public ColumnRenderBuffer(DhBlockPos blockPos)
|
public LodBufferContainer(long pos, DhBlockPos minCornerBlockPos)
|
||||||
{
|
{
|
||||||
this.blockPos = blockPos;
|
this.pos = pos;
|
||||||
|
this.minCornerBlockPos = minCornerBlockPos;
|
||||||
this.vbos = new GLVertexBuffer[0];
|
this.vbos = new GLVertexBuffer[0];
|
||||||
this.vbosTransparent = new GLVertexBuffer[0];
|
this.vbosTransparent = new GLVertexBuffer[0];
|
||||||
}
|
}
|
||||||
@@ -82,10 +82,10 @@ public class ColumnRenderBuffer implements AutoCloseable
|
|||||||
//==================//
|
//==================//
|
||||||
|
|
||||||
/** Should be run on a DH thread. */
|
/** Should be run on a DH thread. */
|
||||||
public synchronized CompletableFuture<ColumnRenderBuffer> makeAndUploadBuffersAsync(LodQuadBuilder builder, EDhApiGpuUploadMethod gpuUploadMethod)
|
public synchronized CompletableFuture<LodBufferContainer> makeAndUploadBuffersAsync(LodQuadBuilder builder)
|
||||||
{
|
{
|
||||||
// separate variable to prevent race condition when checking null
|
// separate variable to prevent race condition when checking null
|
||||||
CompletableFuture<ColumnRenderBuffer> future = this.uploadFuture;
|
CompletableFuture<LodBufferContainer> future = this.uploadFuture;
|
||||||
if (future != null)
|
if (future != null)
|
||||||
{
|
{
|
||||||
// upload already in process
|
// upload already in process
|
||||||
@@ -107,16 +107,19 @@ public class ColumnRenderBuffer implements AutoCloseable
|
|||||||
|
|
||||||
|
|
||||||
// upload on MC's render thread
|
// upload on MC's render thread
|
||||||
GLProxy.getInstance().queueRunningOnRenderThread(() ->
|
GLProxy.queueRunningOnRenderThread(() ->
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
// skip this event if requested
|
// skip this event if requested
|
||||||
if (Thread.interrupted() || this.uploadFuture.isCancelled())
|
if (Thread.interrupted()
|
||||||
|
|| this.uploadFuture.isCancelled())
|
||||||
{
|
{
|
||||||
throw new InterruptedException();
|
throw new InterruptedException();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
EDhApiGpuUploadMethod gpuUploadMethod = GLProxy.getInstance().getGpuUploadMethod();
|
||||||
|
|
||||||
// upload on the render thread
|
// upload on the render thread
|
||||||
uploadBuffersDirect(this.vbos, opaqueBuffers, gpuUploadMethod);
|
uploadBuffersDirect(this.vbos, opaqueBuffers, gpuUploadMethod);
|
||||||
uploadBuffersDirect(this.vbosTransparent, transparentBuffers, gpuUploadMethod);
|
uploadBuffersDirect(this.vbosTransparent, transparentBuffers, gpuUploadMethod);
|
||||||
@@ -133,7 +136,7 @@ public class ColumnRenderBuffer implements AutoCloseable
|
|||||||
}
|
}
|
||||||
catch (Exception e)
|
catch (Exception e)
|
||||||
{
|
{
|
||||||
LOGGER.error("Unexpected issue uploading buffer ["+this.blockPos +"], error: ["+e.getMessage()+"].", e);
|
LOGGER.error("Unexpected issue uploading buffer ["+this.minCornerBlockPos +"], error: ["+e.getMessage()+"].", e);
|
||||||
|
|
||||||
this.uploadFuture.completeExceptionally(e);
|
this.uploadFuture.completeExceptionally(e);
|
||||||
this.uploadFuture = null;
|
this.uploadFuture = null;
|
||||||
@@ -177,7 +180,9 @@ public class ColumnRenderBuffer implements AutoCloseable
|
|||||||
}
|
}
|
||||||
return newVbos;
|
return newVbos;
|
||||||
}
|
}
|
||||||
private static void uploadBuffersDirect(GLVertexBuffer[] vbos, ArrayList<ByteBuffer> byteBuffers, EDhApiGpuUploadMethod method) throws InterruptedException
|
private static void uploadBuffersDirect(
|
||||||
|
GLVertexBuffer[] vbos, ArrayList<ByteBuffer> byteBuffers,
|
||||||
|
EDhApiGpuUploadMethod uploadMethod) throws InterruptedException
|
||||||
{
|
{
|
||||||
int vboIndex = 0;
|
int vboIndex = 0;
|
||||||
for (int i = 0; i < byteBuffers.size(); i++)
|
for (int i = 0; i < byteBuffers.size(); i++)
|
||||||
@@ -191,7 +196,7 @@ public class ColumnRenderBuffer implements AutoCloseable
|
|||||||
// get or create the VBO
|
// get or create the VBO
|
||||||
if (vbos[vboIndex] == null)
|
if (vbos[vboIndex] == null)
|
||||||
{
|
{
|
||||||
vbos[vboIndex] = new GLVertexBuffer(method.useBufferStorage);
|
vbos[vboIndex] = new GLVertexBuffer(uploadMethod.useBufferStorage);
|
||||||
}
|
}
|
||||||
GLVertexBuffer vbo = vbos[vboIndex];
|
GLVertexBuffer vbo = vbos[vboIndex];
|
||||||
|
|
||||||
@@ -202,13 +207,13 @@ public class ColumnRenderBuffer implements AutoCloseable
|
|||||||
try
|
try
|
||||||
{
|
{
|
||||||
vbo.bind();
|
vbo.bind();
|
||||||
vbo.uploadBuffer(buffer, size / LodUtil.LOD_VERTEX_FORMAT.getByteSize(), method, FULL_SIZED_BUFFER);
|
vbo.uploadBuffer(buffer, size / LodUtil.LOD_VERTEX_FORMAT.getByteSize(), uploadMethod, FULL_SIZED_BUFFER);
|
||||||
}
|
}
|
||||||
catch (Exception e)
|
catch (Exception e)
|
||||||
{
|
{
|
||||||
vbos[vboIndex] = null;
|
vbos[vboIndex] = null;
|
||||||
vbo.close();
|
vbo.close();
|
||||||
LOGGER.error("Failed to upload buffer: ", e);
|
LOGGER.error("Failed to upload buffer. Error: ["+e.getMessage()+"].", e);
|
||||||
}
|
}
|
||||||
|
|
||||||
vboIndex++;
|
vboIndex++;
|
||||||
@@ -222,69 +227,6 @@ public class ColumnRenderBuffer implements AutoCloseable
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
//========//
|
|
||||||
// render //
|
|
||||||
//========//
|
|
||||||
|
|
||||||
/** @return true if something was rendered, false otherwise */
|
|
||||||
public boolean renderOpaque(LodRenderer renderContext, DhApiRenderParam renderEventParam)
|
|
||||||
{
|
|
||||||
boolean hasRendered = false;
|
|
||||||
renderContext.setModelViewMatrixOffset(this.blockPos, renderEventParam);
|
|
||||||
for (GLVertexBuffer vbo : this.vbos)
|
|
||||||
{
|
|
||||||
if (vbo == null)
|
|
||||||
{
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (vbo.getVertexCount() == 0)
|
|
||||||
{
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
hasRendered = true;
|
|
||||||
renderContext.drawVbo(vbo, this);
|
|
||||||
}
|
|
||||||
return hasRendered;
|
|
||||||
}
|
|
||||||
|
|
||||||
/** @return true if something was rendered, false otherwise */
|
|
||||||
public boolean renderTransparent(LodRenderer renderContext, DhApiRenderParam renderEventParam)
|
|
||||||
{
|
|
||||||
boolean hasRendered = false;
|
|
||||||
|
|
||||||
try
|
|
||||||
{
|
|
||||||
// can throw an IllegalStateException if the GL program was freed before it should've been
|
|
||||||
renderContext.setModelViewMatrixOffset(this.blockPos, renderEventParam);
|
|
||||||
|
|
||||||
for (GLVertexBuffer vbo : this.vbosTransparent)
|
|
||||||
{
|
|
||||||
if (vbo == null)
|
|
||||||
{
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (vbo.getVertexCount() == 0)
|
|
||||||
{
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
hasRendered = true;
|
|
||||||
renderContext.drawVbo(vbo, this);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
catch (IllegalStateException e)
|
|
||||||
{
|
|
||||||
LOGGER.error("renderContext program doesn't exist for pos: "+this.blockPos, e);
|
|
||||||
}
|
|
||||||
|
|
||||||
return hasRendered;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
//================//
|
//================//
|
||||||
// helper methods //
|
// helper methods //
|
||||||
//================//
|
//================//
|
||||||
@@ -328,7 +270,7 @@ public class ColumnRenderBuffer implements AutoCloseable
|
|||||||
|
|
||||||
if (vertexBuffer.getSize() == 0)
|
if (vertexBuffer.getSize() == 0)
|
||||||
{
|
{
|
||||||
GLProxy.GL_LOGGER.warn("VBO with size 0");
|
GLProxy.LOGGER.warn("VBO with size 0");
|
||||||
}
|
}
|
||||||
statsMap.incBytesStat("TotalUsage", vertexBuffer.getSize());
|
statsMap.incBytesStat("TotalUsage", vertexBuffer.getSize());
|
||||||
}
|
}
|
||||||
@@ -353,7 +295,7 @@ public class ColumnRenderBuffer implements AutoCloseable
|
|||||||
{
|
{
|
||||||
this.buffersUploaded = false;
|
this.buffersUploaded = false;
|
||||||
|
|
||||||
GLProxy.getInstance().queueRunningOnRenderThread(() ->
|
GLProxy.queueRunningOnRenderThread(() ->
|
||||||
{
|
{
|
||||||
for (GLVertexBuffer buffer : this.vbos)
|
for (GLVertexBuffer buffer : this.vbos)
|
||||||
{
|
{
|
||||||
+60
-46
@@ -20,9 +20,7 @@
|
|||||||
package com.seibel.distanthorizons.core.dataObjects.render.bufferBuilding;
|
package com.seibel.distanthorizons.core.dataObjects.render.bufferBuilding;
|
||||||
|
|
||||||
import java.nio.ByteBuffer;
|
import java.nio.ByteBuffer;
|
||||||
import java.nio.ByteOrder;
|
|
||||||
import java.util.*;
|
import java.util.*;
|
||||||
import java.util.concurrent.atomic.AtomicLong;
|
|
||||||
|
|
||||||
import com.seibel.distanthorizons.api.enums.config.EDhApiGrassSideRendering;
|
import com.seibel.distanthorizons.api.enums.config.EDhApiGrassSideRendering;
|
||||||
import com.seibel.distanthorizons.api.enums.rendering.EDhApiBlockMaterial;
|
import com.seibel.distanthorizons.api.enums.rendering.EDhApiBlockMaterial;
|
||||||
@@ -30,15 +28,13 @@ import com.seibel.distanthorizons.api.enums.rendering.EDhApiDebugRendering;
|
|||||||
import com.seibel.distanthorizons.core.config.Config;
|
import com.seibel.distanthorizons.core.config.Config;
|
||||||
import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
|
import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
|
||||||
import com.seibel.distanthorizons.core.enums.EDhDirection;
|
import com.seibel.distanthorizons.core.enums.EDhDirection;
|
||||||
|
import com.seibel.distanthorizons.core.logging.DhLogger;
|
||||||
import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
|
import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
|
||||||
import com.seibel.distanthorizons.core.render.glObject.buffer.GLVertexBuffer;
|
|
||||||
import com.seibel.distanthorizons.core.util.ColorUtil;
|
import com.seibel.distanthorizons.core.util.ColorUtil;
|
||||||
import com.seibel.distanthorizons.api.enums.config.EDhApiGpuUploadMethod;
|
|
||||||
import com.seibel.distanthorizons.core.wrapperInterfaces.block.IBlockStateWrapper;
|
|
||||||
import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper;
|
import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper;
|
||||||
|
import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftRenderWrapper;
|
||||||
import com.seibel.distanthorizons.core.wrapperInterfaces.world.IClientLevelWrapper;
|
import com.seibel.distanthorizons.core.wrapperInterfaces.world.IClientLevelWrapper;
|
||||||
import com.seibel.distanthorizons.coreapi.util.MathUtil;
|
import com.seibel.distanthorizons.coreapi.util.MathUtil;
|
||||||
import org.apache.logging.log4j.Logger;
|
|
||||||
import org.lwjgl.system.MemoryUtil;
|
import org.lwjgl.system.MemoryUtil;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -48,8 +44,8 @@ import org.lwjgl.system.MemoryUtil;
|
|||||||
*/
|
*/
|
||||||
public class LodQuadBuilder
|
public class LodQuadBuilder
|
||||||
{
|
{
|
||||||
private static final Logger LOGGER = DhLoggerBuilder.getLogger();
|
private static final DhLogger LOGGER = new DhLoggerBuilder().build();
|
||||||
private static final IMinecraftClientWrapper MC = SingletonInjector.INSTANCE.get(IMinecraftClientWrapper.class);
|
private static final IMinecraftRenderWrapper MC_RENDER = SingletonInjector.INSTANCE.get(IMinecraftRenderWrapper.class);
|
||||||
|
|
||||||
@SuppressWarnings("unchecked")
|
@SuppressWarnings("unchecked")
|
||||||
private final ArrayList<BufferQuad>[] opaqueQuads = (ArrayList<BufferQuad>[]) new ArrayList[6];
|
private final ArrayList<BufferQuad>[] opaqueQuads = (ArrayList<BufferQuad>[]) new ArrayList[6];
|
||||||
@@ -143,7 +139,8 @@ public class LodQuadBuilder
|
|||||||
//===========//
|
//===========//
|
||||||
|
|
||||||
public void addQuadAdj(
|
public void addQuadAdj(
|
||||||
EDhDirection dir, short x, short y, short z,
|
EDhDirection dir,
|
||||||
|
short x, short y, short z,
|
||||||
short widthEastWest, short widthNorthSouthOrUpDown,
|
short widthEastWest, short widthNorthSouthOrUpDown,
|
||||||
int color, byte irisBlockMaterialId, byte skyLight, byte blockLight)
|
int color, byte irisBlockMaterialId, byte skyLight, byte blockLight)
|
||||||
{
|
{
|
||||||
@@ -152,13 +149,23 @@ public class LodQuadBuilder
|
|||||||
throw new IllegalArgumentException("addQuadAdj() is only for adj direction! Not UP or Down!");
|
throw new IllegalArgumentException("addQuadAdj() is only for adj direction! Not UP or Down!");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
ArrayList<BufferQuad> quadList;
|
||||||
|
if (this.doTransparency && ColorUtil.getAlpha(color) < 255)
|
||||||
|
{
|
||||||
|
quadList = this.transparentQuads[dir.ordinal()];
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
quadList = this.opaqueQuads[dir.ordinal()];
|
||||||
|
}
|
||||||
|
|
||||||
BufferQuad quad = new BufferQuad(x, y, z, widthEastWest, widthNorthSouthOrUpDown, color, irisBlockMaterialId, skyLight, blockLight, dir);
|
BufferQuad quad = new BufferQuad(x, y, z, widthEastWest, widthNorthSouthOrUpDown, color, irisBlockMaterialId, skyLight, blockLight, dir);
|
||||||
ArrayList<BufferQuad> quadList = (this.doTransparency && ColorUtil.getAlpha(color) < 255) ? this.transparentQuads[dir.ordinal()] : this.opaqueQuads[dir.ordinal()];
|
if (!quadList.isEmpty()
|
||||||
if (!quadList.isEmpty() &&
|
&& (
|
||||||
(
|
quadList.get(quadList.size() - 1).tryMerge(quad, BufferMergeDirectionEnum.EastWest)
|
||||||
quadList.get(quadList.size() - 1).tryMerge(quad, BufferMergeDirectionEnum.EastWest)
|
|| quadList.get(quadList.size() - 1).tryMerge(quad, BufferMergeDirectionEnum.NorthSouthOrUpDown))
|
||||||
|| quadList.get(quadList.size() - 1).tryMerge(quad, BufferMergeDirectionEnum.NorthSouthOrUpDown))
|
)
|
||||||
)
|
|
||||||
{
|
{
|
||||||
this.premergeCount++;
|
this.premergeCount++;
|
||||||
return;
|
return;
|
||||||
@@ -170,18 +177,23 @@ public class LodQuadBuilder
|
|||||||
// XZ
|
// XZ
|
||||||
public void addQuadUp(short minX, short maxY, short minZ, short widthEastWest, short widthNorthSouthOrUpDown, int color, byte irisBlockMaterialId, byte skylight, byte blocklight) // TODO argument names are wrong
|
public void addQuadUp(short minX, short maxY, short minZ, short widthEastWest, short widthNorthSouthOrUpDown, int color, byte irisBlockMaterialId, byte skylight, byte blocklight) // TODO argument names are wrong
|
||||||
{
|
{
|
||||||
BufferQuad quad = new BufferQuad(minX, maxY, minZ, widthEastWest, widthNorthSouthOrUpDown, color, irisBlockMaterialId, skylight, blocklight, EDhDirection.UP);
|
|
||||||
boolean isTransparent = (this.doTransparency && ColorUtil.getAlpha(color) < 255);
|
boolean isTransparent = (this.doTransparency && ColorUtil.getAlpha(color) < 255);
|
||||||
ArrayList<BufferQuad> quadList = isTransparent ? this.transparentQuads[EDhDirection.UP.ordinal()] : this.opaqueQuads[EDhDirection.UP.ordinal()];
|
ArrayList<BufferQuad> quadList = isTransparent
|
||||||
|
? this.transparentQuads[EDhDirection.UP.ordinal()]
|
||||||
|
: this.opaqueQuads[EDhDirection.UP.ordinal()];
|
||||||
|
|
||||||
|
BufferQuad quad = new BufferQuad(minX, maxY, minZ, widthEastWest, widthNorthSouthOrUpDown, color, irisBlockMaterialId, skylight, blocklight, EDhDirection.UP);
|
||||||
quadList.add(quad);
|
quadList.add(quad);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void addQuadDown(short x, short y, short z, short width, short wz, int color, byte irisBlockMaterialId, byte skylight, byte blocklight)
|
public void addQuadDown(short x, short y, short z, short width, short wz, int color, byte irisBlockMaterialId, byte skylight, byte blocklight)
|
||||||
{
|
{
|
||||||
|
ArrayList<BufferQuad> quadArray = (this.doTransparency && ColorUtil.getAlpha(color) < 255)
|
||||||
|
? this.transparentQuads[EDhDirection.DOWN.ordinal()]
|
||||||
|
: this.opaqueQuads[EDhDirection.DOWN.ordinal()];
|
||||||
|
|
||||||
BufferQuad quad = new BufferQuad(x, y, z, width, wz, color, irisBlockMaterialId, skylight, blocklight, EDhDirection.DOWN);
|
BufferQuad quad = new BufferQuad(x, y, z, width, wz, color, irisBlockMaterialId, skylight, blocklight, EDhDirection.DOWN);
|
||||||
ArrayList<BufferQuad> qs = (doTransparency && ColorUtil.getAlpha(color) < 255)
|
quadArray.add(quad);
|
||||||
? transparentQuads[EDhDirection.DOWN.ordinal()] : opaqueQuads[EDhDirection.DOWN.ordinal()];
|
|
||||||
qs.add(quad);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -285,7 +297,7 @@ public class LodQuadBuilder
|
|||||||
// create a new buffer
|
// create a new buffer
|
||||||
if (buffer == null || !buffer.hasRemaining())
|
if (buffer == null || !buffer.hasRemaining())
|
||||||
{
|
{
|
||||||
buffer = MemoryUtil.memAlloc(ColumnRenderBuffer.FULL_SIZED_BUFFER);
|
buffer = MemoryUtil.memAlloc(LodBufferContainer.FULL_SIZED_BUFFER);
|
||||||
byteBufferList.add(buffer);
|
byteBufferList.add(buffer);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -309,7 +321,7 @@ public class LodQuadBuilder
|
|||||||
short widthEastWest = quad.widthEastWest;
|
short widthEastWest = quad.widthEastWest;
|
||||||
short widthNorthSouth = quad.widthNorthSouthOrUpDown;
|
short widthNorthSouth = quad.widthNorthSouthOrUpDown;
|
||||||
byte normalIndex = (byte) quad.direction.ordinal();
|
byte normalIndex = (byte) quad.direction.ordinal();
|
||||||
EDhDirection.Axis axis = quad.direction.getAxis();
|
EDhDirection.Axis axis = quad.direction.axis;
|
||||||
for (int i = 0; i < quadBase.length; i++)
|
for (int i = 0; i < quadBase.length; i++)
|
||||||
{
|
{
|
||||||
short dx, dy, dz;
|
short dx, dy, dz;
|
||||||
@@ -357,18 +369,18 @@ public class LodQuadBuilder
|
|||||||
if (this.grassSideRenderingMode != EDhApiGrassSideRendering.AS_GRASS)
|
if (this.grassSideRenderingMode != EDhApiGrassSideRendering.AS_GRASS)
|
||||||
{
|
{
|
||||||
// only change the vertex color if it's on the side or bottom
|
// only change the vertex color if it's on the side or bottom
|
||||||
if (quad.direction.getAxis().isHorizontal() || quad.direction == EDhDirection.DOWN)
|
if (quad.direction.axis.isHorizontal() || quad.direction == EDhDirection.DOWN)
|
||||||
{
|
{
|
||||||
if (this.grassSideRenderingMode == EDhApiGrassSideRendering.AS_DIRT
|
if (this.grassSideRenderingMode == EDhApiGrassSideRendering.AS_DIRT
|
||||||
// if we want the color to fade, only apply the dirt color to the bottom vertices
|
// if we want the color to fade, only apply the dirt color to the bottom vertices
|
||||||
|| (this.grassSideRenderingMode == EDhApiGrassSideRendering.FADE_TO_DIRT && quadBase[i][1] == 0)
|
|| (this.grassSideRenderingMode == EDhApiGrassSideRendering.FADE_TO_DIRT && quadBase[i][1] == 0)
|
||||||
// always render the bottom as dirt
|
// always render the bottom as dirt
|
||||||
|| quad.direction == EDhDirection.DOWN)
|
|| quad.direction == EDhDirection.DOWN)
|
||||||
{
|
{
|
||||||
// for horizontal and bottom faces of grass blocks, use the dirt color to
|
// for horizontal and bottom faces of grass blocks, use the dirt color to
|
||||||
// prevent green cliff walls
|
// prevent green cliff walls
|
||||||
color = this.clientLevelWrapper.getDirtBlockColor();
|
color = this.clientLevelWrapper.getDirtBlockColor();
|
||||||
color = ColorUtil.applyShade(color, MC.getShade(quad.direction));
|
color = ColorUtil.applyShade(color, MC_RENDER.getShade(quad.direction));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -387,31 +399,33 @@ public class LodQuadBuilder
|
|||||||
}
|
}
|
||||||
private void putVertex(ByteBuffer bb, short x, short y, short z, int color, byte normalIndex, byte irisBlockMaterialId, byte skylight, byte blocklight, int mx, int my, int mz)
|
private void putVertex(ByteBuffer bb, short x, short y, short z, int color, byte normalIndex, byte irisBlockMaterialId, byte skylight, byte blocklight, int mx, int my, int mz)
|
||||||
{
|
{
|
||||||
skylight %= 16;
|
|
||||||
blocklight %= 16;
|
|
||||||
|
|
||||||
bb.putShort(x);
|
bb.putShort(x);
|
||||||
bb.putShort(y);
|
bb.putShort(y);
|
||||||
bb.putShort(z);
|
bb.putShort(z);
|
||||||
|
|
||||||
short meta = 0;
|
short meta = 0;
|
||||||
meta |= (skylight | (blocklight << 4));
|
{
|
||||||
byte mirco = 0;
|
skylight %= 16;
|
||||||
// mirco offset which is a xyz 2bit value
|
blocklight %= 16;
|
||||||
// 0b00 = no offset
|
meta |= (short) (skylight | (blocklight << 4));
|
||||||
// 0b01 = positive offset
|
|
||||||
// 0b11 = negative offset
|
byte mircoOffset = 0;
|
||||||
// format is: 0b00zzyyxx
|
// mirco offset which is a xyz 2bit value
|
||||||
if (mx != 0) mirco |= mx > 0 ? 0b01 : 0b11;
|
// 0b00 = no offset
|
||||||
if (my != 0) mirco |= my > 0 ? 0b0100 : 0b1100;
|
// 0b01 = positive offset
|
||||||
if (mz != 0) mirco |= mz > 0 ? 0b010000 : 0b110000;
|
// 0b11 = negative offset
|
||||||
meta |= mirco << 8;
|
// format is: 0b00zzyyxx
|
||||||
|
if (mx != 0) { mircoOffset |= (byte) (mx > 0 ? 0b01 : 0b11); }
|
||||||
|
if (my != 0) { mircoOffset |= (byte) (my > 0 ? 0b0100 : 0b1100); }
|
||||||
|
if (mz != 0) { mircoOffset |= (byte) (mz > 0 ? 0b010000 : 0b110000); }
|
||||||
|
meta |= (short) (mircoOffset << 8);
|
||||||
|
}
|
||||||
bb.putShort(meta);
|
bb.putShort(meta);
|
||||||
|
|
||||||
byte r = (byte) ColorUtil.getRed(color);
|
byte r = (byte) ColorUtil.getRed(color);
|
||||||
byte g = (byte) ColorUtil.getGreen(color);
|
byte g = (byte) ColorUtil.getGreen(color);
|
||||||
byte b = (byte) ColorUtil.getBlue(color);
|
byte b = (byte) ColorUtil.getBlue(color);
|
||||||
byte a = this.doTransparency ? (byte) ColorUtil.getAlpha(color) : (byte) 255; // TODO should this be called here or happen somewhere else?
|
byte a = this.doTransparency ? (byte) ColorUtil.getAlpha(color) : (byte) 255;
|
||||||
bb.put(r);
|
bb.put(r);
|
||||||
bb.put(g);
|
bb.put(g);
|
||||||
bb.put(b);
|
bb.put(b);
|
||||||
@@ -456,7 +470,7 @@ public class LodQuadBuilder
|
|||||||
}
|
}
|
||||||
|
|
||||||
/** Returns how many GpuBuffers will be needed to render opaque quads in this builder. */
|
/** Returns how many GpuBuffers will be needed to render opaque quads in this builder. */
|
||||||
public int getCurrentNeededOpaqueVertexBufferCount() { return MathUtil.ceilDiv(this.getCurrentOpaqueQuadsCount(), ColumnRenderBuffer.MAX_QUADS_PER_BUFFER); }
|
public int getCurrentNeededOpaqueVertexBufferCount() { return MathUtil.ceilDiv(this.getCurrentOpaqueQuadsCount(), LodBufferContainer.MAX_QUADS_PER_BUFFER); }
|
||||||
/** Returns how many GpuBuffers will be needed to render transparent quads in this builder. */
|
/** Returns how many GpuBuffers will be needed to render transparent quads in this builder. */
|
||||||
public int getCurrentNeededTransparentVertexBufferCount()
|
public int getCurrentNeededTransparentVertexBufferCount()
|
||||||
{
|
{
|
||||||
@@ -465,7 +479,7 @@ public class LodQuadBuilder
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
return MathUtil.ceilDiv(this.getCurrentTransparentQuadsCount(), ColumnRenderBuffer.MAX_QUADS_PER_BUFFER);
|
return MathUtil.ceilDiv(this.getCurrentTransparentQuadsCount(), LodBufferContainer.MAX_QUADS_PER_BUFFER);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
+11
-25
@@ -101,9 +101,7 @@ public final class ColumnArrayView implements IColumnDataView
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public ColumnArrayView subView(int dataIndexStart, int dataCount)
|
public ColumnArrayView subView(int dataIndexStart, int dataCount)
|
||||||
{
|
{ return new ColumnArrayView(data, dataCount * verticalSize, offset + dataIndexStart * verticalSize, verticalSize); }
|
||||||
return new ColumnArrayView(data, dataCount * verticalSize, offset + dataIndexStart * verticalSize, verticalSize);
|
|
||||||
}
|
|
||||||
|
|
||||||
public void fill(long value) { Arrays.fill(data.elements(), offset, offset + size, value); }
|
public void fill(long value) { Arrays.fill(data.elements(), offset, offset + size, value); }
|
||||||
|
|
||||||
@@ -185,21 +183,11 @@ public final class ColumnArrayView implements IColumnDataView
|
|||||||
{
|
{
|
||||||
for (int i = 0; i < this.dataCount(); i++)
|
for (int i = 0; i < this.dataCount(); i++)
|
||||||
{
|
{
|
||||||
RenderDataPointUtil.mergeMultiData(source.subView(i, 1), subView(i, 1));
|
RenderDataPointUtil.mergeMultiData(source.subView(i, 1), this.subView(i, 1));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public void mergeMultiDataFrom(IColumnDataView source)
|
|
||||||
{
|
|
||||||
if (dataCount() != 1)
|
|
||||||
{
|
|
||||||
throw new IllegalArgumentException("output dataCount must be 1");
|
|
||||||
}
|
|
||||||
|
|
||||||
RenderDataPointUtil.mergeMultiData(source, this);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
//================//
|
//================//
|
||||||
@@ -210,15 +198,15 @@ public final class ColumnArrayView implements IColumnDataView
|
|||||||
public String toString()
|
public String toString()
|
||||||
{
|
{
|
||||||
StringBuilder sb = new StringBuilder();
|
StringBuilder sb = new StringBuilder();
|
||||||
sb.append("S:").append(size);
|
sb.append("S:").append(this.size);
|
||||||
sb.append(" V:").append(verticalSize);
|
sb.append(" V:").append(this.verticalSize);
|
||||||
sb.append(" O:").append(offset);
|
sb.append(" O:").append(this.offset);
|
||||||
|
|
||||||
sb.append(" [");
|
sb.append(" [");
|
||||||
for (int i = 0; i < size; i++)
|
for (int i = 0; i < this.size; i++)
|
||||||
{
|
{
|
||||||
sb.append(RenderDataPointUtil.toString(data.getLong(offset + i)));
|
sb.append(RenderDataPointUtil.toString(this.data.getLong(this.offset + i)));
|
||||||
if (i < size - 1)
|
if (i < this.size - 1)
|
||||||
{
|
{
|
||||||
sb.append(",\n");
|
sb.append(",\n");
|
||||||
}
|
}
|
||||||
@@ -229,11 +217,7 @@ public final class ColumnArrayView implements IColumnDataView
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public int getDataHash()
|
public int getDataHash() { return arrayHash(this.data, this.offset, this.size); }
|
||||||
{
|
|
||||||
return arrayHash(data, offset, size);
|
|
||||||
}
|
|
||||||
|
|
||||||
private static int arrayHash(LongArrayList a, int offset, int length)
|
private static int arrayHash(LongArrayList a, int offset, int length)
|
||||||
{
|
{
|
||||||
if (a == null)
|
if (a == null)
|
||||||
@@ -252,4 +236,6 @@ public final class ColumnArrayView implements IColumnDataView
|
|||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
-36
@@ -140,40 +140,4 @@ public class ColumnQuadView implements IColumnDataView
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public void copyTo(ColumnQuadView target)
|
|
||||||
{
|
|
||||||
if (target.xSize != xSize || target.zSize != zSize)
|
|
||||||
throw new IllegalArgumentException("Target view must have same size as this view");
|
|
||||||
|
|
||||||
for (int x = 0; x < xSize; x++)
|
|
||||||
{
|
|
||||||
target.getRow(x).changeVerticalSizeFrom(getRow(x));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public void mergeMultiColumnFrom(ColumnQuadView source)
|
|
||||||
{
|
|
||||||
if (source.xSize == xSize && source.zSize == zSize)
|
|
||||||
{
|
|
||||||
source.copyTo(this);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
if (source.xSize < xSize || source.zSize < zSize)
|
|
||||||
throw new IllegalArgumentException("Source view must have same or larger size as this view");
|
|
||||||
|
|
||||||
int srcXPerTrgX = source.xSize / xSize;
|
|
||||||
int srcZPerTrgZ = source.zSize / zSize;
|
|
||||||
if (source.xSize % xSize != 0 || source.zSize % zSize != 0)
|
|
||||||
throw new IllegalArgumentException("Source view's size must be a multiple of this view's size");
|
|
||||||
|
|
||||||
for (int x = 0; x < xSize; x++)
|
|
||||||
{
|
|
||||||
for (int z = 0; z < zSize; z++)
|
|
||||||
{
|
|
||||||
ColumnQuadView srcBlock = source.subView(x * srcXPerTrgX, z * srcZPerTrgZ, srcXPerTrgX, srcZPerTrgZ);
|
|
||||||
get(x, z).mergeMultiDataFrom(srcBlock);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
+199
@@ -0,0 +1,199 @@
|
|||||||
|
package com.seibel.distanthorizons.core.dataObjects.transformers;
|
||||||
|
|
||||||
|
import com.seibel.distanthorizons.core.dataObjects.fullData.sources.FullDataSourceV2;
|
||||||
|
import com.seibel.distanthorizons.core.util.FullDataPointUtil;
|
||||||
|
import com.seibel.distanthorizons.core.util.LodUtil;
|
||||||
|
import it.unimi.dsi.fastutil.longs.LongArrayList;
|
||||||
|
import org.jetbrains.annotations.NotNull;
|
||||||
|
|
||||||
|
public class FullDataOcclusionCuller
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* Mutates the given datasource so blocks that aren't visible
|
||||||
|
* (IE completely surrounded by other opaque blocks)
|
||||||
|
* are removed from the data column.
|
||||||
|
*
|
||||||
|
* @param dataSource
|
||||||
|
* @param relX relative X position in the datasource
|
||||||
|
* @param relZ relative Z position in the datasource
|
||||||
|
*/
|
||||||
|
public static void cullHiddenDatapointsInColumn(
|
||||||
|
FullDataSourceV2 dataSource,
|
||||||
|
int relX, int relZ
|
||||||
|
)
|
||||||
|
{
|
||||||
|
LongArrayList centerColumn = dataSource.getColumnAtRelPos(relX, relZ);
|
||||||
|
LongArrayList posXColumn = dataSource.tryGetColumnAtRelPos(relX + 1, relZ);
|
||||||
|
LongArrayList negXColumn = dataSource.tryGetColumnAtRelPos(relX - 1, relZ);
|
||||||
|
LongArrayList posZColumn = dataSource.tryGetColumnAtRelPos(relX, relZ + 1);
|
||||||
|
LongArrayList negZColumn = dataSource.tryGetColumnAtRelPos(relX, relZ - 1);
|
||||||
|
|
||||||
|
if (posXColumn == null || posXColumn.size() == 0
|
||||||
|
|| negXColumn == null || negXColumn.size() == 0
|
||||||
|
|| posZColumn == null || posZColumn.size() == 0
|
||||||
|
|| negZColumn == null || negZColumn.size() == 0)
|
||||||
|
{
|
||||||
|
// if any adjacent columns are empty then we can't
|
||||||
|
// cull this column, since at least one side will be open
|
||||||
|
// to air/void
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
int centerIndex = centerColumn.size() - 1;
|
||||||
|
int posXIndex = (posXColumn.size() - 1);
|
||||||
|
int negXIndex = (negXColumn.size() - 1);
|
||||||
|
int posZIndex = (posZColumn.size() - 1);
|
||||||
|
int negZIndex = (negZColumn.size() - 1);
|
||||||
|
|
||||||
|
for (; centerIndex >= 0; centerIndex--)
|
||||||
|
{
|
||||||
|
long currentPoint = centerColumn.getLong(centerIndex);
|
||||||
|
|
||||||
|
// Translucent data points are not eligible to be culled.
|
||||||
|
if (isTranslucent(dataSource, currentPoint))
|
||||||
|
{
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
// the top segment should never be culled.
|
||||||
|
if (centerIndex == 0
|
||||||
|
|| isTranslucent(dataSource, centerColumn.getLong(centerIndex - 1)))
|
||||||
|
{
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
// the bottom segment can sometimes be culled.
|
||||||
|
// assume it will not be seen from below,
|
||||||
|
// because this would imply the player is in the void.
|
||||||
|
if (centerIndex + 1 < centerColumn.size()
|
||||||
|
&& isTranslucent(dataSource, centerColumn.getLong(centerIndex + 1)))
|
||||||
|
{
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
// the lowest/bedrock segment should not be culled
|
||||||
|
if (centerIndex + 1 == centerColumn.size())
|
||||||
|
{
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
posXIndex = checkOcclusion(dataSource, currentPoint, posXColumn, posXIndex);
|
||||||
|
if (posXIndex < 0)
|
||||||
|
{
|
||||||
|
posXIndex = ~posXIndex;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
negXIndex = checkOcclusion(dataSource, currentPoint, negXColumn, negXIndex);
|
||||||
|
if (negXIndex < 0)
|
||||||
|
{
|
||||||
|
negXIndex = ~negXIndex;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
posZIndex = checkOcclusion(dataSource, currentPoint, posZColumn, posZIndex);
|
||||||
|
if (posZIndex < 0)
|
||||||
|
{
|
||||||
|
posZIndex = ~posZIndex;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
negZIndex = checkOcclusion(dataSource, currentPoint, negZColumn, negZIndex);
|
||||||
|
if (negZIndex < 0)
|
||||||
|
{
|
||||||
|
negZIndex = ~negZIndex;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
// Current point is fully surrounded. remove it.
|
||||||
|
centerColumn.removeLong(centerIndex);
|
||||||
|
|
||||||
|
// Make the above data point cover the area that the current point used to occupy.
|
||||||
|
// The element that was at `centerIndex - 1` is still at that position even after removal of centerIndex.
|
||||||
|
long above = centerColumn.getLong(centerIndex - 1);
|
||||||
|
above = FullDataPointUtil.setBottomY(above, FullDataPointUtil.getBottomY(currentPoint));
|
||||||
|
above = FullDataPointUtil.setHeight(above, FullDataPointUtil.getHeight(currentPoint) + FullDataPointUtil.getHeight(above));
|
||||||
|
centerColumn.set(centerIndex - 1, above);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
/**
|
||||||
|
checks if centerPoint is "covered" by opaque data points in adjacentColumn.
|
||||||
|
centerPoint counts as covered if, and only if, for all Y levels in its height range,
|
||||||
|
there exists an opaque data point in adjacentColumn which overlaps with that Y level.
|
||||||
|
|
||||||
|
@param source used to lookup blocks (and their opacities) based on their IDs.
|
||||||
|
@param centerPoint the point being checked to see if it's fully covered.
|
||||||
|
@param adjacentColumn the data points which might cover centerPoint.
|
||||||
|
@param adjacentIndex the starting index in adjacentColumn to start scanning at.
|
||||||
|
indices greater than adjacentIndex have already been checked and confirmed to
|
||||||
|
not overlap or only overlap partially with centerPoint's Y range.
|
||||||
|
|
||||||
|
@return if centerPoint is covered, returns the index of the segment which finishes covering it.
|
||||||
|
the start of the covering may be a smaller index. in this case, the returned index may be used
|
||||||
|
as the adjacentIndex provided to this method on the next iteration which yields a new centerPoint.
|
||||||
|
|
||||||
|
if centerPoint is NOT covered, returns the bitwise negation of the index of the
|
||||||
|
segment which did not cover it. this guarantees that the returned value is negative.
|
||||||
|
the caller should check for negative return values and manually un-negate them to proceed with the loop.
|
||||||
|
|
||||||
|
in other words, this function returns the index of the next adjacent data
|
||||||
|
point to use in the loop, AND a boolean indicating whether or not the
|
||||||
|
centerPoint is covered; both are packed into the same int, and returned.
|
||||||
|
*/
|
||||||
|
private static int checkOcclusion(@NotNull FullDataSourceV2 source, long centerPoint, @NotNull LongArrayList adjacentColumn, int adjacentIndex)
|
||||||
|
{
|
||||||
|
// check if this point is adjacent to an empty column
|
||||||
|
// if so it will always be shown
|
||||||
|
if (adjacentColumn.isEmpty())
|
||||||
|
{
|
||||||
|
return ~adjacentIndex;
|
||||||
|
}
|
||||||
|
else if (adjacentColumn.size() == 1
|
||||||
|
&& adjacentColumn.getLong(0) == FullDataPointUtil.EMPTY_DATA_POINT)
|
||||||
|
{
|
||||||
|
return ~adjacentIndex;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
int bottomOfCenter = FullDataPointUtil.getBottomY(centerPoint);
|
||||||
|
int topOfCenter = bottomOfCenter + FullDataPointUtil.getHeight(centerPoint);
|
||||||
|
for (; adjacentIndex >= 0; adjacentIndex--)
|
||||||
|
{
|
||||||
|
long adjacentPoint = adjacentColumn.getLong(adjacentIndex);
|
||||||
|
int topOfAdjacent = FullDataPointUtil.getBottomY(adjacentPoint) + FullDataPointUtil.getHeight(adjacentPoint);
|
||||||
|
if (topOfAdjacent <= bottomOfCenter)
|
||||||
|
{
|
||||||
|
// the adjacent point is below the center point,
|
||||||
|
// check the next one
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
else if (isTranslucent(source, adjacentPoint))
|
||||||
|
{
|
||||||
|
// this point is adjacent to a transparent LOD and should be shown
|
||||||
|
return ~adjacentIndex;
|
||||||
|
}
|
||||||
|
else if (topOfAdjacent >= topOfCenter)
|
||||||
|
{
|
||||||
|
// the adjacent point covers the center point
|
||||||
|
return adjacentIndex;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
// the Adjacent column ends before center column does,
|
||||||
|
// this point should be visible
|
||||||
|
return ~adjacentIndex;
|
||||||
|
}
|
||||||
|
private static boolean isTranslucent(FullDataSourceV2 source, long point)
|
||||||
|
{
|
||||||
|
int id = FullDataPointUtil.getId(point);
|
||||||
|
int opacity = source.mapping.getBlockStateWrapper(id).getOpacity();
|
||||||
|
return opacity < LodUtil.BLOCK_FULLY_OPAQUE;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
+57
-46
@@ -34,13 +34,12 @@ import com.seibel.distanthorizons.core.pos.blockPos.DhBlockPosMutable;
|
|||||||
import com.seibel.distanthorizons.core.util.*;
|
import com.seibel.distanthorizons.core.util.*;
|
||||||
import com.seibel.distanthorizons.core.wrapperInterfaces.IWrapperFactory;
|
import com.seibel.distanthorizons.core.wrapperInterfaces.IWrapperFactory;
|
||||||
import com.seibel.distanthorizons.core.wrapperInterfaces.block.IBlockStateWrapper;
|
import com.seibel.distanthorizons.core.wrapperInterfaces.block.IBlockStateWrapper;
|
||||||
import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper;
|
|
||||||
import com.seibel.distanthorizons.core.wrapperInterfaces.world.IBiomeWrapper;
|
import com.seibel.distanthorizons.core.wrapperInterfaces.world.IBiomeWrapper;
|
||||||
import com.seibel.distanthorizons.core.wrapperInterfaces.world.IClientLevelWrapper;
|
import com.seibel.distanthorizons.core.wrapperInterfaces.world.IClientLevelWrapper;
|
||||||
import com.seibel.distanthorizons.coreapi.util.BitShiftUtil;
|
import com.seibel.distanthorizons.coreapi.util.BitShiftUtil;
|
||||||
import it.unimi.dsi.fastutil.longs.LongArrayList;
|
import it.unimi.dsi.fastutil.longs.LongArrayList;
|
||||||
import it.unimi.dsi.fastutil.longs.LongOpenHashSet;
|
import it.unimi.dsi.fastutil.longs.LongOpenHashSet;
|
||||||
import org.apache.logging.log4j.Logger;
|
import com.seibel.distanthorizons.core.logging.DhLogger;
|
||||||
import org.jetbrains.annotations.Nullable;
|
import org.jetbrains.annotations.Nullable;
|
||||||
|
|
||||||
import java.util.HashSet;
|
import java.util.HashSet;
|
||||||
@@ -50,14 +49,14 @@ import java.util.HashSet;
|
|||||||
*/
|
*/
|
||||||
public class FullDataToRenderDataTransformer
|
public class FullDataToRenderDataTransformer
|
||||||
{
|
{
|
||||||
private static final Logger LOGGER = DhLoggerBuilder.getLogger();
|
private static final DhLogger LOGGER = new DhLoggerBuilder().build();
|
||||||
|
|
||||||
private static final IWrapperFactory WRAPPER_FACTORY = SingletonInjector.INSTANCE.get(IWrapperFactory.class);
|
private static final IWrapperFactory WRAPPER_FACTORY = SingletonInjector.INSTANCE.get(IWrapperFactory.class);
|
||||||
private static final IMinecraftClientWrapper MC = SingletonInjector.INSTANCE.get(IMinecraftClientWrapper.class);
|
|
||||||
|
|
||||||
private static final LongOpenHashSet brokenPos = new LongOpenHashSet();
|
private static final LongOpenHashSet BROKEN_POS_SET = new LongOpenHashSet();
|
||||||
|
private static final PhantomArrayListPool ARRAY_LIST_POOL = new PhantomArrayListPool("Data Transformer");
|
||||||
|
|
||||||
public static final PhantomArrayListPool ARRAY_LIST_POOL = new PhantomArrayListPool("Data Transformer");
|
private static HashSet<IBlockStateWrapper> snowLayerBlockStates = null;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@@ -66,7 +65,8 @@ public class FullDataToRenderDataTransformer
|
|||||||
//==============================//
|
//==============================//
|
||||||
|
|
||||||
@Nullable
|
@Nullable
|
||||||
public static ColumnRenderSource transformFullDataToRenderSource(@Nullable FullDataSourceV2 fullDataSource, @Nullable IClientLevelWrapper levelWrapper)
|
public static ColumnRenderSource transformFullDataToRenderSource(
|
||||||
|
@Nullable FullDataSourceV2 fullDataSource, @Nullable IClientLevelWrapper levelWrapper)
|
||||||
{
|
{
|
||||||
if (fullDataSource == null)
|
if (fullDataSource == null)
|
||||||
{
|
{
|
||||||
@@ -102,7 +102,8 @@ public class FullDataToRenderDataTransformer
|
|||||||
* @throws InterruptedException Can be caused by interrupting the thread upstream.
|
* @throws InterruptedException Can be caused by interrupting the thread upstream.
|
||||||
* Generally thrown if the method is running after the client leaves the current world.
|
* Generally thrown if the method is running after the client leaves the current world.
|
||||||
*/
|
*/
|
||||||
private static ColumnRenderSource transformCompleteFullDataToColumnData(IClientLevelWrapper levelWrapper, FullDataSourceV2 fullDataSource) throws InterruptedException
|
private static ColumnRenderSource transformCompleteFullDataToColumnData(
|
||||||
|
IClientLevelWrapper levelWrapper, FullDataSourceV2 fullDataSource) throws InterruptedException
|
||||||
{
|
{
|
||||||
final long pos = fullDataSource.getPos();
|
final long pos = fullDataSource.getPos();
|
||||||
final byte dataDetail = fullDataSource.getDataDetailLevel();
|
final byte dataDetail = fullDataSource.getDataDetailLevel();
|
||||||
@@ -125,10 +126,8 @@ public class FullDataToRenderDataTransformer
|
|||||||
{
|
{
|
||||||
for (int z = 0; z < FullDataSourceV2.WIDTH; z++)
|
for (int z = 0; z < FullDataSourceV2.WIDTH; z++)
|
||||||
{
|
{
|
||||||
throwIfThreadInterrupted();
|
|
||||||
|
|
||||||
ColumnArrayView columnArrayView = columnSource.getVerticalDataPointView(x, z);
|
ColumnArrayView columnArrayView = columnSource.getVerticalDataPointView(x, z);
|
||||||
LongArrayList dataColumn = fullDataSource.get(x, z);
|
LongArrayList dataColumn = fullDataSource.getColumnAtRelPos(x, z);
|
||||||
|
|
||||||
updateOrReplaceRenderDataViewColumnWithFullDataColumn(
|
updateOrReplaceRenderDataViewColumnWithFullDataColumn(
|
||||||
levelWrapper, fullDataSource,
|
levelWrapper, fullDataSource,
|
||||||
@@ -138,7 +137,7 @@ public class FullDataToRenderDataTransformer
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
columnSource.fillDebugFlag(0, 0, ColumnRenderSource.SECTION_SIZE, ColumnRenderSource.SECTION_SIZE, ColumnRenderSource.DebugSourceFlag.FULL);
|
columnSource.fillDebugFlag(0, 0, ColumnRenderSource.WIDTH, ColumnRenderSource.WIDTH, ColumnRenderSource.DebugSourceFlag.FULL);
|
||||||
|
|
||||||
return columnSource;
|
return columnSource;
|
||||||
}
|
}
|
||||||
@@ -173,6 +172,7 @@ public class FullDataToRenderDataTransformer
|
|||||||
// expand the ColumnArrayView to fit the new larger max vertical size
|
// expand the ColumnArrayView to fit the new larger max vertical size
|
||||||
ColumnArrayView newColumnArrayView = new ColumnArrayView(dataArrayList, fullDataLength, 0, fullDataLength);
|
ColumnArrayView newColumnArrayView = new ColumnArrayView(dataArrayList, fullDataLength, 0, fullDataLength);
|
||||||
setRenderColumnView(levelWrapper, fullDataSource, blockX, blockZ, newColumnArrayView, fullDataColumn);
|
setRenderColumnView(levelWrapper, fullDataSource, blockX, blockZ, newColumnArrayView, fullDataColumn);
|
||||||
|
|
||||||
columnArrayView.changeVerticalSizeFrom(newColumnArrayView);
|
columnArrayView.changeVerticalSizeFrom(newColumnArrayView);
|
||||||
}
|
}
|
||||||
finally
|
finally
|
||||||
@@ -196,6 +196,16 @@ public class FullDataToRenderDataTransformer
|
|||||||
HashSet<IBlockStateWrapper> blockStatesToIgnore = WRAPPER_FACTORY.getRendererIgnoredBlocks(levelWrapper);
|
HashSet<IBlockStateWrapper> blockStatesToIgnore = WRAPPER_FACTORY.getRendererIgnoredBlocks(levelWrapper);
|
||||||
HashSet<IBlockStateWrapper> caveBlockStatesToIgnore = WRAPPER_FACTORY.getRendererIgnoredCaveBlocks(levelWrapper);
|
HashSet<IBlockStateWrapper> caveBlockStatesToIgnore = WRAPPER_FACTORY.getRendererIgnoredCaveBlocks(levelWrapper);
|
||||||
|
|
||||||
|
// build snow block cache if needed
|
||||||
|
if (snowLayerBlockStates == null)
|
||||||
|
{
|
||||||
|
snowLayerBlockStates = new HashSet<>();
|
||||||
|
// ignore snow layers 1-3, everything above should be considered a full block
|
||||||
|
snowLayerBlockStates.add(WRAPPER_FACTORY.deserializeBlockStateWrapperOrGetDefault("minecraft:snow_STATE_{layers:1}", levelWrapper));
|
||||||
|
snowLayerBlockStates.add(WRAPPER_FACTORY.deserializeBlockStateWrapperOrGetDefault("minecraft:snow_STATE_{layers:2}", levelWrapper));
|
||||||
|
snowLayerBlockStates.add(WRAPPER_FACTORY.deserializeBlockStateWrapperOrGetDefault("minecraft:snow_STATE_{layers:3}", levelWrapper));
|
||||||
|
}
|
||||||
|
|
||||||
int caveCullingMaxY = Config.Client.Advanced.Graphics.Culling.caveCullingHeight.get() - levelWrapper.getMinHeight();
|
int caveCullingMaxY = Config.Client.Advanced.Graphics.Culling.caveCullingHeight.get() - levelWrapper.getMinHeight();
|
||||||
boolean caveCullingEnabled =
|
boolean caveCullingEnabled =
|
||||||
Config.Client.Advanced.Graphics.Culling.enableCaveCulling.get()
|
Config.Client.Advanced.Graphics.Culling.enableCaveCulling.get()
|
||||||
@@ -250,9 +260,9 @@ public class FullDataToRenderDataTransformer
|
|||||||
}
|
}
|
||||||
catch (IndexOutOfBoundsException e)
|
catch (IndexOutOfBoundsException e)
|
||||||
{
|
{
|
||||||
if (!brokenPos.contains(fullDataMapping.getPos()))
|
if (!BROKEN_POS_SET.contains(fullDataMapping.getPos()))
|
||||||
{
|
{
|
||||||
brokenPos.add(fullDataMapping.getPos());
|
BROKEN_POS_SET.add(fullDataMapping.getPos());
|
||||||
String levelId = levelWrapper.getDhIdentifier();
|
String levelId = levelWrapper.getDhIdentifier();
|
||||||
LOGGER.warn("Unable to get data point with id ["+id+"] " +
|
LOGGER.warn("Unable to get data point with id ["+id+"] " +
|
||||||
"(Max possible ID: ["+fullDataMapping.getMaxValidId()+"]) " +
|
"(Max possible ID: ["+fullDataMapping.getMaxValidId()+"]) " +
|
||||||
@@ -277,18 +287,18 @@ public class FullDataToRenderDataTransformer
|
|||||||
if (caveBlock)
|
if (caveBlock)
|
||||||
{
|
{
|
||||||
if (caveCullingEnabled
|
if (caveCullingEnabled
|
||||||
// assume this data point is underground if it has no sky-light
|
// assume this data point is underground if it has no sky-light
|
||||||
&& skyLight == LodUtil.MIN_MC_LIGHT
|
&& skyLight == LodUtil.MIN_MC_LIGHT
|
||||||
// ignore caves above a certain height to prevent floating islands from having walls underneath them
|
// ignore caves above a certain height to prevent floating islands from having walls underneath them
|
||||||
&& topY < caveCullingMaxY
|
&& topY < caveCullingMaxY
|
||||||
// cave culling shouldn't happen when at the top of the world
|
// cave culling shouldn't happen when at the top of the world
|
||||||
&& renderDataIndex != 0 && fullDataIndex != 0
|
&& renderDataIndex != 0 && fullDataIndex != 0
|
||||||
// cave culling can't happen when at the bottom of the world
|
// cave culling can't happen when at the bottom of the world
|
||||||
&& (fullDataIndex+1) < fullColumnData.size())
|
&& (fullDataIndex + 1) < fullColumnData.size())
|
||||||
{
|
{
|
||||||
// we need to get the next sky/block lights because
|
// we need to get the next sky/block lights because
|
||||||
// the air block here will always have a light of 0/0 due to only the top of the LOD's light being saved.
|
// the air block here will always have a light of 0/0 due to only the top of the LOD's light being saved.
|
||||||
long nextFullData = fullColumnData.getLong(fullDataIndex+1);
|
long nextFullData = fullColumnData.getLong(fullDataIndex + 1);
|
||||||
int nextSkyLight = FullDataPointUtil.getSkyLight(nextFullData);
|
int nextSkyLight = FullDataPointUtil.getSkyLight(nextFullData);
|
||||||
|
|
||||||
if (nextSkyLight == LodUtil.MIN_MC_LIGHT
|
if (nextSkyLight == LodUtil.MIN_MC_LIGHT
|
||||||
@@ -322,10 +332,26 @@ public class FullDataToRenderDataTransformer
|
|||||||
// non-solid block check //
|
// non-solid block check //
|
||||||
//=======================//
|
//=======================//
|
||||||
|
|
||||||
if (ignoreNonCollidingBlocks
|
boolean ignoreNonSolidBlock =
|
||||||
&& !block.isSolid()
|
ignoreNonCollidingBlocks
|
||||||
&& !block.isLiquid()
|
&& !block.isSolid()
|
||||||
&& block.getOpacity() != LodUtil.BLOCK_FULLY_OPAQUE)
|
&& !block.isLiquid()
|
||||||
|
&& block.getOpacity() != LodUtil.BLOCK_FULLY_OPAQUE;
|
||||||
|
|
||||||
|
// merge snow into the block below it
|
||||||
|
if (snowLayerBlockStates.contains(block))
|
||||||
|
{
|
||||||
|
// sometimes a snow datapoint will be multiple blocks tall,
|
||||||
|
// in that case we just want to drop the top by 1
|
||||||
|
blockHeight -= 1;
|
||||||
|
if (blockHeight == 0)
|
||||||
|
{
|
||||||
|
// this snow block was entirely removed, just color the block below it
|
||||||
|
ignoreNonSolidBlock = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (ignoreNonSolidBlock)
|
||||||
{
|
{
|
||||||
if (colorBelowWithAvoidedBlocks)
|
if (colorBelowWithAvoidedBlocks)
|
||||||
{
|
{
|
||||||
@@ -335,7 +361,7 @@ public class FullDataToRenderDataTransformer
|
|||||||
// this prevents issues if grass is transparent
|
// this prevents issues if grass is transparent
|
||||||
if (ColorUtil.getAlpha(tempColor) != 0)
|
if (ColorUtil.getAlpha(tempColor) != 0)
|
||||||
{
|
{
|
||||||
colorToApplyToNextBlock = ColorUtil.setAlpha(tempColor,255);
|
colorToApplyToNextBlock = ColorUtil.setAlpha(tempColor, 255);
|
||||||
skylightToApplyToNextBlock = skyLight;
|
skylightToApplyToNextBlock = skyLight;
|
||||||
blocklightToApplyToNextBlock = blockLight;
|
blocklightToApplyToNextBlock = blockLight;
|
||||||
}
|
}
|
||||||
@@ -368,7 +394,9 @@ public class FullDataToRenderDataTransformer
|
|||||||
//=============================//
|
//=============================//
|
||||||
|
|
||||||
// check if they share a top-bottom face and if they have same color
|
// check if they share a top-bottom face and if they have same color
|
||||||
if (color == lastColor && bottomY + blockHeight == lastBottom && renderDataIndex > 0)
|
if (color == lastColor
|
||||||
|
&& bottomY + blockHeight == lastBottom
|
||||||
|
&& renderDataIndex > 0)
|
||||||
{
|
{
|
||||||
//replace the previous block with new bottom
|
//replace the previous block with new bottom
|
||||||
long columnData = renderColumnData.get(renderDataIndex - 1);
|
long columnData = renderColumnData.get(renderDataIndex - 1);
|
||||||
@@ -396,21 +424,4 @@ public class FullDataToRenderDataTransformer
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
//================//
|
|
||||||
// helper methods //
|
|
||||||
//================//
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Called in loops that may run for an extended period of time. <br>
|
|
||||||
* This is necessary to allow canceling these transformers since running
|
|
||||||
* them after the client has left a given world will throw exceptions.
|
|
||||||
*/
|
|
||||||
private static void throwIfThreadInterrupted() throws InterruptedException
|
|
||||||
{
|
|
||||||
if (Thread.interrupted())
|
|
||||||
{
|
|
||||||
throw new InterruptedException(FullDataToRenderDataTransformer.class.getSimpleName() + " task interrupted.");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
+112
-188
@@ -24,8 +24,6 @@ import java.util.List;
|
|||||||
|
|
||||||
import com.seibel.distanthorizons.api.enums.config.EDhApiWorldCompressionMode;
|
import com.seibel.distanthorizons.api.enums.config.EDhApiWorldCompressionMode;
|
||||||
import com.seibel.distanthorizons.api.enums.worldGeneration.EDhApiWorldGenerationStep;
|
import com.seibel.distanthorizons.api.enums.worldGeneration.EDhApiWorldGenerationStep;
|
||||||
import com.seibel.distanthorizons.api.interfaces.block.IDhApiBiomeWrapper;
|
|
||||||
import com.seibel.distanthorizons.api.interfaces.block.IDhApiBlockStateWrapper;
|
|
||||||
import com.seibel.distanthorizons.api.methods.events.abstractEvents.DhApiChunkProcessingEvent;
|
import com.seibel.distanthorizons.api.methods.events.abstractEvents.DhApiChunkProcessingEvent;
|
||||||
import com.seibel.distanthorizons.api.objects.data.DhApiChunk;
|
import com.seibel.distanthorizons.api.objects.data.DhApiChunk;
|
||||||
import com.seibel.distanthorizons.api.objects.data.DhApiTerrainDataPoint;
|
import com.seibel.distanthorizons.api.objects.data.DhApiTerrainDataPoint;
|
||||||
@@ -46,12 +44,12 @@ import com.seibel.distanthorizons.core.wrapperInterfaces.IWrapperFactory;
|
|||||||
import com.seibel.distanthorizons.core.wrapperInterfaces.world.ILevelWrapper;
|
import com.seibel.distanthorizons.core.wrapperInterfaces.world.ILevelWrapper;
|
||||||
import com.seibel.distanthorizons.coreapi.DependencyInjection.ApiEventInjector;
|
import com.seibel.distanthorizons.coreapi.DependencyInjection.ApiEventInjector;
|
||||||
import it.unimi.dsi.fastutil.longs.LongArrayList;
|
import it.unimi.dsi.fastutil.longs.LongArrayList;
|
||||||
import org.apache.logging.log4j.Logger;
|
import com.seibel.distanthorizons.core.logging.DhLogger;
|
||||||
import org.jetbrains.annotations.Nullable;
|
import org.jetbrains.annotations.Nullable;
|
||||||
|
|
||||||
public class LodDataBuilder
|
public class LodDataBuilder
|
||||||
{
|
{
|
||||||
private static final Logger LOGGER = DhLoggerBuilder.getLogger();
|
private static final DhLogger LOGGER = new DhLoggerBuilder().build();
|
||||||
private static final IWrapperFactory WRAPPER_FACTORY = SingletonInjector.INSTANCE.get(IWrapperFactory.class);
|
private static final IWrapperFactory WRAPPER_FACTORY = SingletonInjector.INSTANCE.get(IWrapperFactory.class);
|
||||||
private static final IBlockStateWrapper AIR = WRAPPER_FACTORY.getAirBlockStateWrapper();
|
private static final IBlockStateWrapper AIR = WRAPPER_FACTORY.getAirBlockStateWrapper();
|
||||||
|
|
||||||
@@ -76,7 +74,7 @@ public class LodDataBuilder
|
|||||||
long pos = DhSectionPos.encode(DhSectionPos.SECTION_BLOCK_DETAIL_LEVEL, sectionPosX, sectionPosZ);
|
long pos = DhSectionPos.encode(DhSectionPos.SECTION_BLOCK_DETAIL_LEVEL, sectionPosX, sectionPosZ);
|
||||||
|
|
||||||
FullDataSourceV2 dataSource = FullDataSourceV2.createEmpty(pos);
|
FullDataSourceV2 dataSource = FullDataSourceV2.createEmpty(pos);
|
||||||
dataSource.isEmpty = false;
|
dataSource.isEmpty = false; // this will be set to "true" if any blocks are found
|
||||||
// chunk updates always propagate up
|
// chunk updates always propagate up
|
||||||
dataSource.applyToParent = true;
|
dataSource.applyToParent = true;
|
||||||
|
|
||||||
@@ -118,7 +116,6 @@ public class LodDataBuilder
|
|||||||
//==========================//
|
//==========================//
|
||||||
|
|
||||||
EDhApiWorldCompressionMode worldCompressionMode = Config.Common.LodBuilding.worldCompression.get();
|
EDhApiWorldCompressionMode worldCompressionMode = Config.Common.LodBuilding.worldCompression.get();
|
||||||
boolean ignoreHiddenBlocks = (worldCompressionMode != EDhApiWorldCompressionMode.MERGE_SAME_BLOCKS);
|
|
||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
@@ -142,7 +139,7 @@ public class LodDataBuilder
|
|||||||
int columnZ = relBlockZ + chunkOffsetZ;
|
int columnZ = relBlockZ + chunkOffsetZ;
|
||||||
|
|
||||||
// Get column data
|
// Get column data
|
||||||
LongArrayList longs = dataSource.get(columnX, columnZ);
|
LongArrayList longs = dataSource.getColumnAtRelPos(columnX, columnZ);
|
||||||
if (longs == null)
|
if (longs == null)
|
||||||
{
|
{
|
||||||
longs = new LongArrayList(dataCapacity);
|
longs = new LongArrayList(dataCapacity);
|
||||||
@@ -247,6 +244,15 @@ public class LodDataBuilder
|
|||||||
blockLight = newBlockLight;
|
blockLight = newBlockLight;
|
||||||
skyLight = newSkyLight;
|
skyLight = newSkyLight;
|
||||||
lastY = y;
|
lastY = y;
|
||||||
|
|
||||||
|
|
||||||
|
// mark the data source as non-empty if we find any non-air blocks
|
||||||
|
if (dataSource.isEmpty
|
||||||
|
&& newBlockState != null
|
||||||
|
&& !newBlockState.isAir())
|
||||||
|
{
|
||||||
|
dataSource.isEmpty = false;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -257,11 +263,6 @@ public class LodDataBuilder
|
|||||||
dataSource.setSingleColumn(longs, columnX, columnZ, EDhApiWorldGenerationStep.LIGHT, worldCompressionMode);
|
dataSource.setSingleColumn(longs, columnX, columnZ, EDhApiWorldGenerationStep.LIGHT, worldCompressionMode);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (ignoreHiddenBlocks)
|
|
||||||
{
|
|
||||||
cullHiddenBlocks(dataSource, chunkOffsetX, chunkOffsetZ);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
catch (DataCorruptedException e)
|
catch (DataCorruptedException e)
|
||||||
{
|
{
|
||||||
@@ -269,157 +270,9 @@ public class LodDataBuilder
|
|||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
LodUtil.assertTrue(!dataSource.isEmpty);
|
|
||||||
return dataSource;
|
return dataSource;
|
||||||
}
|
}
|
||||||
|
|
||||||
private static void cullHiddenBlocks(FullDataSourceV2 dataSource, int chunkOffsetX, int chunkOffsetZ)
|
|
||||||
{
|
|
||||||
for (int relZ = 1; relZ < LodUtil.CHUNK_WIDTH - 1; relZ++)
|
|
||||||
{
|
|
||||||
for (int relX = 1; relX < LodUtil.CHUNK_WIDTH - 1; relX++)
|
|
||||||
{
|
|
||||||
LongArrayList
|
|
||||||
centerColumn = dataSource.get(relX + chunkOffsetX, relZ + chunkOffsetZ),
|
|
||||||
posXColumn = dataSource.get(relX + chunkOffsetX + 1, relZ + chunkOffsetZ),
|
|
||||||
negXColumn = dataSource.get(relX + chunkOffsetX - 1, relZ + chunkOffsetZ),
|
|
||||||
posZColumn = dataSource.get(relX + chunkOffsetX, relZ + chunkOffsetZ + 1),
|
|
||||||
negZColumn = dataSource.get(relX + chunkOffsetX, relZ + chunkOffsetZ - 1);
|
|
||||||
int
|
|
||||||
centerIndex = centerColumn.size() - 1,
|
|
||||||
posXIndex = posXColumn.size() - 1,
|
|
||||||
negXIndex = negXColumn.size() - 1,
|
|
||||||
posZIndex = posZColumn.size() - 1,
|
|
||||||
negZIndex = negZColumn.size() - 1;
|
|
||||||
for (; centerIndex >= 0; centerIndex--)
|
|
||||||
{
|
|
||||||
long currentPoint = centerColumn.getLong(centerIndex);
|
|
||||||
|
|
||||||
// Translucent data points are not eligible to be culled.
|
|
||||||
if (isTranslucent(dataSource, currentPoint))
|
|
||||||
{
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
// the top segment should never be culled.
|
|
||||||
if (centerIndex == 0
|
|
||||||
|| isTranslucent(dataSource, centerColumn.getLong(centerIndex - 1))
|
|
||||||
)
|
|
||||||
{
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
// the bottom segment can sometimes be culled.
|
|
||||||
// assume it will not be seen from below,
|
|
||||||
// because this would imply the player is in the void.
|
|
||||||
if (centerIndex + 1 < centerColumn.size()
|
|
||||||
&& isTranslucent(dataSource, centerColumn.getLong(centerIndex + 1))
|
|
||||||
)
|
|
||||||
{
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
// the lowest/bedrock segment should not be culled
|
|
||||||
if (centerIndex + 1 == centerColumn.size())
|
|
||||||
{
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
posXIndex = checkOcclusion(dataSource, currentPoint, posXColumn, posXIndex);
|
|
||||||
if (posXIndex < 0)
|
|
||||||
{
|
|
||||||
posXIndex = ~posXIndex;
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
negXIndex = checkOcclusion(dataSource, currentPoint, negXColumn, negXIndex);
|
|
||||||
if (negXIndex < 0)
|
|
||||||
{
|
|
||||||
negXIndex = ~negXIndex;
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
posZIndex = checkOcclusion(dataSource, currentPoint, posZColumn, posZIndex);
|
|
||||||
if (posZIndex < 0)
|
|
||||||
{
|
|
||||||
posZIndex = ~posZIndex;
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
negZIndex = checkOcclusion(dataSource, currentPoint, negZColumn, negZIndex);
|
|
||||||
if (negZIndex < 0)
|
|
||||||
{
|
|
||||||
negZIndex = ~negZIndex;
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Current point is fully surrounded. remove it.
|
|
||||||
centerColumn.removeLong(centerIndex);
|
|
||||||
|
|
||||||
// Make the above data point cover the area that the current point used to occupy.
|
|
||||||
// The element that was at `centerIndex - 1` is still at that position even after removal of centerIndex.
|
|
||||||
long above = centerColumn.getLong(centerIndex - 1);
|
|
||||||
above = FullDataPointUtil.setBottomY(above, FullDataPointUtil.getBottomY(currentPoint));
|
|
||||||
above = FullDataPointUtil.setHeight(above, FullDataPointUtil.getHeight(currentPoint) + FullDataPointUtil.getHeight(above));
|
|
||||||
centerColumn.set(centerIndex - 1, above);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
checks if centerPoint is "covered" by opaque data points in adjacentColumn.
|
|
||||||
centerPoint counts as covered if, and only if, for all Y levels in its height range,
|
|
||||||
there exists an opaque data point in adjacentColumn which overlaps with that Y level.
|
|
||||||
|
|
||||||
@param source used to lookup blocks (and their opacities) based on their IDs.
|
|
||||||
@param centerPoint the point being checked to see if it's fully covered.
|
|
||||||
@param adjacentColumn the data points which might cover centerPoint.
|
|
||||||
@param adjacentIndex the starting index in adjacentColumn to start scanning at.
|
|
||||||
indices greater than adjacentIndex have already been checked and confirmed to
|
|
||||||
not overlap or only overlap partially with centerPoint's Y range.
|
|
||||||
|
|
||||||
@return if centerPoint is covered, returns the index of the segment which finishes covering it.
|
|
||||||
the start of the covering may be a smaller index. in this case, the returned index may be used
|
|
||||||
as the adjacentIndex provided to this method on the next iteration which yields a new centerPoint.
|
|
||||||
|
|
||||||
if centerPoint is NOT covered, returns the bitwise negation of the index of the
|
|
||||||
segment which did not cover it. this guarantees that the returned value is negative.
|
|
||||||
the caller should check for negative return values and manually un-negate them to proceed with the loop.
|
|
||||||
|
|
||||||
in other words, this function returns the index of the next adjacent data
|
|
||||||
point to use in the loop, AND a boolean indicating whether or not the
|
|
||||||
centerPoint is covered; both are packed into the same int, and returned.
|
|
||||||
*/
|
|
||||||
private static int checkOcclusion(FullDataSourceV2 source, long centerPoint, LongArrayList adjacentColumn, int adjacentIndex)
|
|
||||||
{
|
|
||||||
int bottomOfCenter = FullDataPointUtil.getBottomY(centerPoint);
|
|
||||||
int topOfCenter = bottomOfCenter + FullDataPointUtil.getHeight(centerPoint);
|
|
||||||
for (; adjacentIndex >= 0; adjacentIndex--)
|
|
||||||
{
|
|
||||||
long adjacentPoint = adjacentColumn.getLong(adjacentIndex);
|
|
||||||
int topOfAdjacent = FullDataPointUtil.getBottomY(adjacentPoint) + FullDataPointUtil.getHeight(adjacentPoint);
|
|
||||||
if (topOfAdjacent <= bottomOfCenter)
|
|
||||||
{
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
else if (isTranslucent(source, adjacentPoint))
|
|
||||||
{
|
|
||||||
return ~adjacentIndex;
|
|
||||||
}
|
|
||||||
else if (topOfAdjacent >= topOfCenter)
|
|
||||||
{
|
|
||||||
return adjacentIndex;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
throw new LodUtil.AssertFailureException("Adjacent column ends before center column does.");
|
|
||||||
}
|
|
||||||
|
|
||||||
private static boolean isTranslucent(FullDataSourceV2 source, long point) {
|
|
||||||
return source.mapping.getBlockStateWrapper(FullDataPointUtil.getId(point)).getOpacity() < LodUtil.BLOCK_FULLY_OPAQUE;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/** @throws ClassCastException if an API user returns the wrong object type(s) */
|
/** @throws ClassCastException if an API user returns the wrong object type(s) */
|
||||||
@@ -444,13 +297,29 @@ public class LodDataBuilder
|
|||||||
for (int relBlockX = 0; relBlockX < LodUtil.CHUNK_WIDTH; relBlockX++)
|
for (int relBlockX = 0; relBlockX < LodUtil.CHUNK_WIDTH; relBlockX++)
|
||||||
{
|
{
|
||||||
List<DhApiTerrainDataPoint> columnDataPoints = apiChunk.getDataPoints(relBlockX, relBlockZ);
|
List<DhApiTerrainDataPoint> columnDataPoints = apiChunk.getDataPoints(relBlockX, relBlockZ);
|
||||||
LodDataBuilder.correctDataColumnOrder(columnDataPoints);
|
|
||||||
|
// mark the data source as non-empty if we find any non-air blocks
|
||||||
|
if (dataSource.isEmpty)
|
||||||
|
{
|
||||||
|
for (int i = 0; i < columnDataPoints.size(); i++)
|
||||||
|
{
|
||||||
|
DhApiTerrainDataPoint dataPoint = columnDataPoints.get(i);
|
||||||
|
if (dataPoint.blockStateWrapper != null
|
||||||
|
&& !dataPoint.blockStateWrapper.isAir())
|
||||||
|
{
|
||||||
|
dataSource.isEmpty = false;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
LodDataBuilder.putListInTopDownOrder(columnDataPoints);
|
||||||
if (runAdditionalValidation)
|
if (runAdditionalValidation)
|
||||||
{
|
{
|
||||||
validateOrThrowApiDataColumn(columnDataPoints);
|
validateOrThrowApiDataColumn(columnDataPoints);
|
||||||
}
|
}
|
||||||
|
|
||||||
LongArrayList packedDataPoints = convertApiDataPointListToPackedLongArray(columnDataPoints, dataSource, apiChunk.bottomYBlockPos);
|
LongArrayList packedDataPoints = convertApiDataPointListToPackedLongArray(columnDataPoints, dataSource, apiChunk.bottomYBlockPos, runAdditionalValidation);
|
||||||
|
|
||||||
// TODO add the ability for API users to define a different compression mode
|
// TODO add the ability for API users to define a different compression mode
|
||||||
// or add a "unkown" compression mode
|
// or add a "unkown" compression mode
|
||||||
@@ -458,7 +327,6 @@ public class LodDataBuilder
|
|||||||
packedDataPoints,
|
packedDataPoints,
|
||||||
relBlockX + relSourceBlockX, relBlockZ + relSourceBlockZ,
|
relBlockX + relSourceBlockX, relBlockZ + relSourceBlockZ,
|
||||||
EDhApiWorldGenerationStep.LIGHT, EDhApiWorldCompressionMode.MERGE_SAME_BLOCKS);
|
EDhApiWorldGenerationStep.LIGHT, EDhApiWorldCompressionMode.MERGE_SAME_BLOCKS);
|
||||||
dataSource.isEmpty = false;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return dataSource;
|
return dataSource;
|
||||||
@@ -472,41 +340,97 @@ public class LodDataBuilder
|
|||||||
|
|
||||||
/** @see FullDataPointUtil */
|
/** @see FullDataPointUtil */
|
||||||
public static LongArrayList convertApiDataPointListToPackedLongArray(
|
public static LongArrayList convertApiDataPointListToPackedLongArray(
|
||||||
@Nullable List<DhApiTerrainDataPoint> columnDataPoints, FullDataSourceV2 dataSource,
|
@Nullable List<DhApiTerrainDataPoint> topDownColumnDataPoints, FullDataSourceV2 dataSource,
|
||||||
int bottomYBlockPos) throws DataCorruptedException
|
int bottomYBlockPos, boolean runAdditionalValidation) throws DataCorruptedException
|
||||||
{
|
{
|
||||||
// this null check does 2 nice things at the same time:
|
if (topDownColumnDataPoints == null
|
||||||
// if columnDataPoints is null,
|
|| topDownColumnDataPoints.size() == 0)
|
||||||
// then packedDataPoints will be of length 0
|
|
||||||
// AND the below loop won't run.
|
|
||||||
int size = (columnDataPoints != null) ? columnDataPoints.size() : 0;
|
|
||||||
|
|
||||||
// TODO make missing air LODs
|
|
||||||
// TODO merge duplicate datapoints
|
|
||||||
LongArrayList packedDataPoints = new LongArrayList(new long[size]);
|
|
||||||
for (int index = 0; index < size; index++)
|
|
||||||
{
|
{
|
||||||
DhApiTerrainDataPoint dataPoint = columnDataPoints.get(index);
|
return new LongArrayList(0);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
// array to store data
|
||||||
|
int size = topDownColumnDataPoints.size();
|
||||||
|
LongArrayList packedDataPoints = new LongArrayList(size);
|
||||||
|
packedDataPoints.clear();
|
||||||
|
|
||||||
|
|
||||||
|
if (runAdditionalValidation)
|
||||||
|
{
|
||||||
|
// check for missing data
|
||||||
|
int lastTopY = Integer.MAX_VALUE;
|
||||||
|
for (int i = 0; i < size; i++)
|
||||||
|
{
|
||||||
|
DhApiTerrainDataPoint apiDataPoint = topDownColumnDataPoints.get(i);
|
||||||
|
|
||||||
|
if (lastTopY != apiDataPoint.topYBlockPos
|
||||||
|
// the first index won't have a lastTopY value
|
||||||
|
&& i != 0)
|
||||||
|
{
|
||||||
|
throw new DataCorruptedException("LOD data has a gap between ["+lastTopY+"] and ["+apiDataPoint.bottomYBlockPos+"]. Empty areas should be filled with air datapoints so light propagates correctly.");
|
||||||
|
}
|
||||||
|
lastTopY = apiDataPoint.bottomYBlockPos;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
// go through data from top down
|
||||||
|
long lastDataPoint = FullDataPointUtil.EMPTY_DATA_POINT;
|
||||||
|
for (int i = 0; i < size; i++)
|
||||||
|
{
|
||||||
|
DhApiTerrainDataPoint apiDataPoint = topDownColumnDataPoints.get(i);
|
||||||
|
|
||||||
int id = dataSource.mapping.addIfNotPresentAndGetId(
|
int thisId = dataSource.mapping.addIfNotPresentAndGetId(
|
||||||
(IBiomeWrapper) (dataPoint.biomeWrapper),
|
(IBiomeWrapper) (apiDataPoint.biomeWrapper),
|
||||||
(IBlockStateWrapper) (dataPoint.blockStateWrapper)
|
(IBlockStateWrapper) (apiDataPoint.blockStateWrapper)
|
||||||
);
|
);
|
||||||
|
int thisHeight = (apiDataPoint.topYBlockPos - apiDataPoint.bottomYBlockPos);
|
||||||
|
|
||||||
packedDataPoints.set(index, FullDataPointUtil.encode(
|
int lastId = FullDataPointUtil.getId(lastDataPoint);
|
||||||
id,
|
byte lastBlockLight = (byte)FullDataPointUtil.getBlockLight(lastDataPoint);
|
||||||
dataPoint.topYBlockPos - dataPoint.bottomYBlockPos,
|
byte lastSkyLight = (byte)FullDataPointUtil.getSkyLight(lastDataPoint);
|
||||||
dataPoint.bottomYBlockPos - bottomYBlockPos,
|
|
||||||
(byte) (dataPoint.blockLightLevel),
|
|
||||||
(byte) (dataPoint.skyLightLevel)
|
// if the ID and light are the same, merge the height
|
||||||
));
|
if (thisId == lastId
|
||||||
|
&& apiDataPoint.blockLightLevel == lastBlockLight
|
||||||
|
&& apiDataPoint.skyLightLevel == lastSkyLight
|
||||||
|
// the first index should always be added to the list
|
||||||
|
&& i != 0 )
|
||||||
|
{
|
||||||
|
// add adjacent height
|
||||||
|
int lastHeight = FullDataPointUtil.getHeight(lastDataPoint);
|
||||||
|
int newHeight = (lastHeight + thisHeight);
|
||||||
|
lastDataPoint = FullDataPointUtil.setHeight(lastDataPoint, newHeight);
|
||||||
|
|
||||||
|
// subtract bottom Y
|
||||||
|
int lastBottomY = FullDataPointUtil.getBottomY(lastDataPoint);
|
||||||
|
int newBottomY = lastBottomY - thisHeight;
|
||||||
|
lastDataPoint = FullDataPointUtil.setBottomY(lastDataPoint, newBottomY);
|
||||||
|
|
||||||
|
packedDataPoints.set(packedDataPoints.size()-1, lastDataPoint);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
// data changed, create a new datapoint
|
||||||
|
long dataPoint = FullDataPointUtil.encode(
|
||||||
|
thisId,
|
||||||
|
thisHeight,
|
||||||
|
apiDataPoint.bottomYBlockPos - bottomYBlockPos,
|
||||||
|
(byte) (apiDataPoint.blockLightLevel),
|
||||||
|
(byte) (apiDataPoint.skyLightLevel)
|
||||||
|
);
|
||||||
|
lastDataPoint = dataPoint;
|
||||||
|
packedDataPoints.add(dataPoint);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return packedDataPoints;
|
return packedDataPoints;
|
||||||
}
|
}
|
||||||
|
|
||||||
/** also corrects the order if it's backwards */
|
public static void putListInTopDownOrder(List<DhApiTerrainDataPoint> dataPoints)
|
||||||
public static void correctDataColumnOrder(List<DhApiTerrainDataPoint> dataPoints)
|
|
||||||
{
|
{
|
||||||
// order doesn't need to be checked if there is 0 or 1 items
|
// order doesn't need to be checked if there is 0 or 1 items
|
||||||
if (dataPoints.size() > 1)
|
if (dataPoints.size() > 1)
|
||||||
|
|||||||
+2
-2
@@ -23,7 +23,7 @@ import com.seibel.distanthorizons.coreapi.DependencyInjection.DependencyInjector
|
|||||||
import com.seibel.distanthorizons.coreapi.interfaces.dependencyInjection.IBindable;
|
import com.seibel.distanthorizons.coreapi.interfaces.dependencyInjection.IBindable;
|
||||||
import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
|
import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
|
||||||
import com.seibel.distanthorizons.core.wrapperInterfaces.modAccessor.IModAccessor;
|
import com.seibel.distanthorizons.core.wrapperInterfaces.modAccessor.IModAccessor;
|
||||||
import org.apache.logging.log4j.Logger;
|
import com.seibel.distanthorizons.core.logging.DhLogger;
|
||||||
|
|
||||||
import java.lang.invoke.MethodHandles;
|
import java.lang.invoke.MethodHandles;
|
||||||
|
|
||||||
@@ -40,7 +40,7 @@ import java.lang.invoke.MethodHandles;
|
|||||||
*/
|
*/
|
||||||
public class ModAccessorInjector extends DependencyInjector<IModAccessor>
|
public class ModAccessorInjector extends DependencyInjector<IModAccessor>
|
||||||
{
|
{
|
||||||
private static final Logger LOGGER = DhLoggerBuilder.getLogger(MethodHandles.lookup().lookupClass().getSimpleName());
|
private static final DhLogger LOGGER = new DhLoggerBuilder().build();
|
||||||
|
|
||||||
public static final ModAccessorInjector INSTANCE = new ModAccessorInjector(IModAccessor.class);
|
public static final ModAccessorInjector INSTANCE = new ModAccessorInjector(IModAccessor.class);
|
||||||
|
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user