- *
+ *
* For full method documentation please see: {@link IWrapperFactory#createChunkWrapper}
+ *
* @see IWrapperFactory#createChunkWrapper
*/
public IChunkWrapper createChunkWrapper(Object[] objectArray) throws ClassCastException
@@ -105,14 +107,14 @@ public class WrapperFactory implements IWrapperFactory
{
throw new ClassCastException(createChunkWrapperErrorMessage(objectArray));
}
- ChunkAccess chunk = (ChunkAccess)objectArray[0];
+ ChunkAccess chunk = (ChunkAccess) objectArray[0];
// light source
if (!(objectArray[1] instanceof LevelReader))
{
throw new ClassCastException(createChunkWrapperErrorMessage(objectArray));
}
- LevelReader lightSource = (LevelReader)objectArray[1];
+ LevelReader lightSource = (LevelReader) objectArray[1];
return new ChunkWrapper(chunk, lightSource, /*A DH wrapped level isn't necessary*/null);
@@ -133,9 +135,9 @@ public class WrapperFactory implements IWrapperFactory
not implemented for this version of Minecraft!
#endif
}
- /**
- * Note: when this is updated for different MC versions,
- * make sure you also update the documentation in {@link IDhApiWorldGenerator#generateChunks}.
+ /**
+ * Note: when this is updated for different MC versions,
+ * make sure you also update the documentation in {@link IDhApiWorldGenerator#generateChunks}.
*/
private static String createChunkWrapperErrorMessage(Object[] objectArray)
{
@@ -145,8 +147,8 @@ public class WrapperFactory implements IWrapperFactory
// MC 1.16, 1.18, 1.19, 1.20
#if POST_MC_1_17_1 || MC_1_16_5
- message.append("["+ChunkAccess.class.getName()+"], \n");
- message.append("["+LevelReader.class.getName()+"]. \n");
+ message.append("[" + ChunkAccess.class.getName() + "], \n");
+ message.append("[" + LevelReader.class.getName() + "]. \n");
#else
// See preprocessor comment in createChunkWrapper() for full documentation
not implemented for this version of Minecraft!
diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/BiomeWrapper.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/BiomeWrapper.java
index eb225280e..be8e7620c 100644
--- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/BiomeWrapper.java
+++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/BiomeWrapper.java
@@ -23,6 +23,7 @@ import java.io.IOException;
import java.util.Objects;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
+
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
@@ -63,15 +64,15 @@ public class BiomeWrapper implements IBiomeWrapper
private static final Logger LOGGER = LogManager.getLogger();
- #if PRE_MC_1_18_2
- public static final ConcurrentMap biomeWrapperMap = new ConcurrentHashMap<>();
- public final Biome biome;
- #else
- public static final ConcurrentMap, BiomeWrapper> biomeWrapperMap = new ConcurrentHashMap<>();
- public final Holder biome;
+ #if PRE_MC_1_18_2
+ public static final ConcurrentMap biomeWrapperMap = new ConcurrentHashMap<>();
+ public final Biome biome;
+ #else
+ public static final ConcurrentMap, BiomeWrapper> biomeWrapperMap = new ConcurrentHashMap<>();
+ public final Holder biome;
#endif
- /**
+ /**
* Cached so it can be quickly used as a semi-stable hashing method.
* This may also fix the issue where we can serialize and save after a level has been shut down.
*/
@@ -83,15 +84,15 @@ public class BiomeWrapper implements IBiomeWrapper
// constructors //
//==============//
- static public IBiomeWrapper getBiomeWrapper(#if PRE_MC_1_18_2 Biome #else Holder #endif biome)
- {
- return biomeWrapperMap.computeIfAbsent(biome, BiomeWrapper::new);
- }
-
- private BiomeWrapper(#if PRE_MC_1_18_2 Biome #else Holder #endif biome)
- {
- this.biome = biome;
- }
+ static public IBiomeWrapper getBiomeWrapper(#if PRE_MC_1_18_2 Biome #else Holder #endif biome)
+ {
+ return biomeWrapperMap.computeIfAbsent(biome, BiomeWrapper::new);
+ }
+
+ private BiomeWrapper(#if PRE_MC_1_18_2 Biome #else Holder #endif biome)
+ {
+ this.biome = biome;
+ }
@@ -100,34 +101,34 @@ public class BiomeWrapper implements IBiomeWrapper
//=========//
@Override
- public String getName()
- {
+ public String getName()
+ {
#if PRE_MC_1_18_2
- return biome.toString();
+ return biome.toString();
#else
- return this.biome.unwrapKey().orElse(Biomes.THE_VOID).registry().toString();
+ return this.biome.unwrapKey().orElse(Biomes.THE_VOID).registry().toString();
#endif
- }
-
- @Override
- public boolean equals(Object obj)
- {
- if (this == obj)
- {
+ }
+
+ @Override
+ public boolean equals(Object obj)
+ {
+ if (this == obj)
+ {
return true;
- }
- else if (obj == null || this.getClass() != obj.getClass())
- {
+ }
+ else if (obj == null || this.getClass() != obj.getClass())
+ {
return false;
- }
+ }
- BiomeWrapper that = (BiomeWrapper) obj;
- // the serialized value is used so we can test the contents instead of the references
- return Objects.equals(this.serialize(), that.serialize());
- }
-
- @Override
- public int hashCode() { return Objects.hash(this.serialize()); }
+ BiomeWrapper that = (BiomeWrapper) obj;
+ // the serialized value is used so we can test the contents instead of the references
+ return Objects.equals(this.serialize(), that.serialize());
+ }
+
+ @Override
+ public int hashCode() { return Objects.hash(this.serialize()); }
@Override
public String serialize() // FIXME pass in level to prevent null pointers (or maybe just RegistryAccess?)
@@ -154,13 +155,13 @@ public class BiomeWrapper implements IBiomeWrapper
biomeName = this.biome.value().toString();
#endif
- LOGGER.warn("unable to serialize: "+biomeName);
+ LOGGER.warn("unable to serialize: " + biomeName);
// shouldn't normally happen, but just in case
this.serializationResult = "";
}
else
{
- this.serializationResult = resourceLocation.getNamespace()+":"+resourceLocation.getPath();
+ this.serializationResult = resourceLocation.getNamespace() + ":" + resourceLocation.getPath();
}
}
@@ -182,9 +183,9 @@ public class BiomeWrapper implements IBiomeWrapper
int separatorIndex = resourceLocationString.indexOf(":");
if (separatorIndex == -1)
{
- throw new IOException("Unable to parse resource location string: ["+resourceLocationString+"].");
+ throw new IOException("Unable to parse resource location string: [" + resourceLocationString + "].");
}
- ResourceLocation resourceLocation = new ResourceLocation(resourceLocationString.substring(0, separatorIndex), resourceLocationString.substring(separatorIndex+1));
+ ResourceLocation resourceLocation = new ResourceLocation(resourceLocationString.substring(0, separatorIndex), resourceLocationString.substring(separatorIndex + 1));
try
@@ -200,7 +201,7 @@ public class BiomeWrapper implements IBiomeWrapper
Biome unwrappedBiome = registryAccess.registryOrThrow(Registries.BIOME).get(resourceLocation);
if (unwrappedBiome == null)
{
- LOGGER.warn("null biome string deserialized from string: "+resourceLocationString);
+ LOGGER.warn("null biome string deserialized from string: " + resourceLocationString);
}
Holder biome = new Holder.Direct<>(unwrappedBiome);
#endif
@@ -209,12 +210,12 @@ public class BiomeWrapper implements IBiomeWrapper
}
catch (Exception e)
{
- throw new IOException("Failed to deserialize the string ["+resourceLocationString+"] into a BiomeWrapper: "+e.getMessage(), e);
+ throw new IOException("Failed to deserialize the string [" + resourceLocationString + "] into a BiomeWrapper: " + e.getMessage(), e);
}
}
- @Override
+ @Override
public Object getWrappedMcObject() { return this.biome; }
@Override
diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/BlockStateWrapper.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/BlockStateWrapper.java
index 6a1c5f430..817dfcab8 100644
--- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/BlockStateWrapper.java
+++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/BlockStateWrapper.java
@@ -40,7 +40,7 @@ public class BlockStateWrapper implements IBlockStateWrapper
private static final Logger LOGGER = DhLoggerBuilder.getLogger();
public static final BlockStateWrapper AIR = new BlockStateWrapper(null);
- public static final ConcurrentHashMap cache = new ConcurrentHashMap<>();
+ public static final ConcurrentHashMap cache = new ConcurrentHashMap<>();
/**
* Cached so it can be quickly used as a semi-stable hashing method.
@@ -53,22 +53,22 @@ public class BlockStateWrapper implements IBlockStateWrapper
// constructors //
//==============//
- public static BlockStateWrapper fromBlockState(BlockState blockState)
+ public static BlockStateWrapper fromBlockState(BlockState blockState)
{
- if (blockState == null || blockState.isAir())
- {
- return AIR;
- }
+ if (blockState == null || blockState.isAir())
+ {
+ return AIR;
+ }
- return cache.computeIfAbsent(blockState, BlockStateWrapper::new);
- }
-
- public final BlockState blockState;
- BlockStateWrapper(BlockState blockState)
- {
- this.blockState = blockState;
- LOGGER.trace("Created BlockStateWrapper for ["+blockState+"]");
- }
+ return cache.computeIfAbsent(blockState, BlockStateWrapper::new);
+ }
+
+ public final BlockState blockState;
+ BlockStateWrapper(BlockState blockState)
+ {
+ this.blockState = blockState;
+ LOGGER.trace("Created BlockStateWrapper for [" + blockState + "]");
+ }
@@ -97,7 +97,7 @@ public class BlockStateWrapper implements IBlockStateWrapper
@Override
- public String serialize() // FIXME pass in level to prevent null pointers (or maybe just RegistryAccess?)
+ public String serialize() // FIXME pass in level to prevent null pointers (or maybe just RegistryAccess?)
{
// cache the serialization result so it can be quickly used as a semi-stable hashing method
if (this.serializationResult == null)
@@ -120,7 +120,7 @@ public class BlockStateWrapper implements IBlockStateWrapper
if (resourceLocation == null)
{
- LOGGER.warn("unable to serialize: "+this.blockState);
+ LOGGER.warn("unable to serialize: " + this.blockState);
}
this.serializationResult = resourceLocation.getNamespace() + RESOURCE_LOCATION_SEPARATOR + resourceLocation.getPath()
@@ -144,18 +144,18 @@ public class BlockStateWrapper implements IBlockStateWrapper
int stateSeparatorIndex = resourceStateString.indexOf(STATE_STRING_SEPARATOR);
if (stateSeparatorIndex == -1)
{
- throw new IOException("Unable to parse BlockState out of string: ["+resourceStateString+"].");
+ throw new IOException("Unable to parse BlockState out of string: [" + resourceStateString + "].");
}
- String blockStatePropertiesString = resourceStateString.substring(stateSeparatorIndex+STATE_STRING_SEPARATOR.length());
- resourceStateString = resourceStateString.substring(0, stateSeparatorIndex);
+ String blockStatePropertiesString = resourceStateString.substring(stateSeparatorIndex + STATE_STRING_SEPARATOR.length());
+ resourceStateString = resourceStateString.substring(0, stateSeparatorIndex);
// parse the resource location
int resourceSeparatorIndex = resourceStateString.indexOf(RESOURCE_LOCATION_SEPARATOR);
if (resourceSeparatorIndex == -1)
{
- throw new IOException("Unable to parse Resource Location out of string: ["+resourceStateString+"].");
+ throw new IOException("Unable to parse Resource Location out of string: [" + resourceStateString + "].");
}
- ResourceLocation resourceLocation = new ResourceLocation(resourceStateString.substring(0, resourceSeparatorIndex), resourceStateString.substring(resourceSeparatorIndex+1));
+ ResourceLocation resourceLocation = new ResourceLocation(resourceStateString.substring(0, resourceSeparatorIndex), resourceStateString.substring(resourceSeparatorIndex + 1));
@@ -190,16 +190,16 @@ public class BlockStateWrapper implements IBlockStateWrapper
// use the default if no state was found
if (foundState == null)
{
- LOGGER.warn("Unable to find BlockState for Block ["+resourceLocation+"] with properties: ["+blockStatePropertiesString+"].");
+ LOGGER.warn("Unable to find BlockState for Block [" + resourceLocation + "] with properties: [" + blockStatePropertiesString + "].");
foundState = block.defaultBlockState();
}
return new BlockStateWrapper(foundState);
}
catch (Exception e)
{
- throw new IOException("Failed to deserialize the string ["+resourceStateString+"] into a BlockStateWrapper: "+e.getMessage(), e);
+ throw new IOException("Failed to deserialize the string [" + resourceStateString + "] into a BlockStateWrapper: " + e.getMessage(), e);
}
- }
+ }
/** used to compare and save BlockStates based on their properties */
private static String serializeBlockStateProperties(BlockState blockState)
@@ -209,7 +209,7 @@ public class BlockStateWrapper implements IBlockStateWrapper
// alphabetically sort the list so they are always in the same order
List> sortedBlockPropteryList = new ArrayList<>(blockPropertyCollection);
- sortedBlockPropteryList.sort((a,b) -> a.getName().compareTo(b.getName()));
+ sortedBlockPropteryList.sort((a, b) -> a.getName().compareTo(b.getName()));
StringBuilder stringBuilder = new StringBuilder();
@@ -232,26 +232,26 @@ public class BlockStateWrapper implements IBlockStateWrapper
}
- @Override
- public boolean equals(Object obj)
- {
- if (this == obj)
+ @Override
+ public boolean equals(Object obj)
+ {
+ if (this == obj)
{
return true;
- }
+ }
- if (obj == null || this.getClass() != obj.getClass())
- {
+ if (obj == null || this.getClass() != obj.getClass())
+ {
return false;
- }
+ }
- BlockStateWrapper that = (BlockStateWrapper) obj;
- // the serialized value is used so we can test the contents instead of the references
- return Objects.equals(this.serialize(), that.serialize());
- }
-
- @Override
- public int hashCode() { return Objects.hash(this.serialize()); }
+ BlockStateWrapper that = (BlockStateWrapper) obj;
+ // the serialized value is used so we can test the contents instead of the references
+ return Objects.equals(this.serialize(), that.serialize());
+ }
+
+ @Override
+ public int hashCode() { return Objects.hash(this.serialize()); }
@Override
@@ -262,17 +262,17 @@ public class BlockStateWrapper implements IBlockStateWrapper
public boolean isAir(BlockState blockState) { return blockState == null || blockState.isAir(); }
@Override
- public boolean isSolid()
+ public boolean isSolid()
{
#if PRE_MC_1_20_1
- return this.blockState.getMaterial().isSolid();
+ return this.blockState.getMaterial().isSolid();
#else
- return !this.blockState.getCollisionShape(EmptyBlockGetter.INSTANCE, BlockPos.ZERO).isEmpty();
+ return !this.blockState.getCollisionShape(EmptyBlockGetter.INSTANCE, BlockPos.ZERO).isEmpty();
#endif
- }
+ }
@Override
- public boolean isLiquid()
+ public boolean isLiquid()
{
if (this.isAir())
{
@@ -280,11 +280,11 @@ public class BlockStateWrapper implements IBlockStateWrapper
}
#if PRE_MC_1_20_1
- return this.blockState.getMaterial().isLiquid();
+ return this.blockState.getMaterial().isLiquid();
#else
- return !this.blockState.getFluidState().isEmpty();
+ return !this.blockState.getFluidState().isEmpty();
#endif
- }
+ }
@Override
public String toString() { return this.serialize(); }
diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/TextureAtlasSpriteWrapper.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/TextureAtlasSpriteWrapper.java
index 6b2bc4dd0..1be216135 100644
--- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/TextureAtlasSpriteWrapper.java
+++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/TextureAtlasSpriteWrapper.java
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU Lesser General Public License
* along with this program. If not, see .
*/
-
+
package com.seibel.distanthorizons.common.wrappers.block;
@@ -24,36 +24,42 @@ import net.minecraft.client.renderer.texture.TextureAtlasSprite;
/**
* For wrapping/utilizing around TextureAtlasSprite
+ *
* @author Ran
*/
-public class TextureAtlasSpriteWrapper {
-
- /**
- * This code is from Minecraft Forge
- * Which is licensed under the terms of GNU Lesser General Public License
- * as published by the Free Software Foundation version 2.1
- * of the License.
- *
- * The code has been modified to use TextureAtlasSprite
- */
- public static int getPixelRGBA(TextureAtlasSprite sprite, int frameIndex, int x, int y) {
+public class TextureAtlasSpriteWrapper
+{
+
+ /**
+ * This code is from Minecraft Forge
+ * Which is licensed under the terms of GNU Lesser General Public License
+ * as published by the Free Software Foundation version 2.1
+ * of the License.
+ *
+ * The code has been modified to use TextureAtlasSprite
+ */
+ public static int getPixelRGBA(TextureAtlasSprite sprite, int frameIndex, int x, int y)
+ {
#if PRE_MC_1_17_1
return sprite.mainImage[0].getPixelRGBA(
x + sprite.framesX[frameIndex] * sprite.getWidth(),
y + sprite.framesY[frameIndex] * sprite.getHeight());
#elif PRE_MC_1_19_4
- if (sprite.animatedTexture != null) {
- x += sprite.animatedTexture.getFrameX(frameIndex) * sprite.width;
- y += sprite.animatedTexture.getFrameY(frameIndex) * sprite.height;
- }
- return sprite.mainImage[0].getPixelRGBA(x, y);
+ if (sprite.animatedTexture != null)
+ {
+ x += sprite.animatedTexture.getFrameX(frameIndex) * sprite.width;
+ y += sprite.animatedTexture.getFrameY(frameIndex) * sprite.height;
+ }
+ return sprite.mainImage[0].getPixelRGBA(x, y);
#else
- if (sprite.contents().animatedTexture != null) {
- x += sprite.contents().animatedTexture.getFrameX(frameIndex) * sprite.contents().width();
- y += sprite.contents().animatedTexture.getFrameY(frameIndex) * sprite.contents().width();
- }
- return sprite.contents().originalImage.getPixelRGBA(x, y);
+ if (sprite.contents().animatedTexture != null)
+ {
+ x += sprite.contents().animatedTexture.getFrameX(frameIndex) * sprite.contents().width();
+ y += sprite.contents().animatedTexture.getFrameY(frameIndex) * sprite.contents().width();
+ }
+ return sprite.contents().originalImage.getPixelRGBA(x, y);
#endif
-
- }
+
+ }
+
}
diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/TintGetterOverrideFast.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/TintGetterOverrideFast.java
index 8242a139a..434d5a3c5 100644
--- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/TintGetterOverrideFast.java
+++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/TintGetterOverrideFast.java
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU Lesser General Public License
* along with this program. If not, see .
*/
-
+
package com.seibel.distanthorizons.common.wrappers.block;
import com.seibel.distanthorizons.common.LodCommonMain;
@@ -39,171 +39,205 @@ import java.util.Optional;
import java.util.function.Supplier;
import java.util.stream.Stream;
-public class TintGetterOverrideFast implements BlockAndTintGetter {
- LevelReader parent;
-
- public TintGetterOverrideFast(LevelReader parent) {
- this.parent = parent;
- }
-
- private Biome _getBiome(BlockPos pos) {
+public class TintGetterOverrideFast implements BlockAndTintGetter
+{
+ LevelReader parent;
+
+ public TintGetterOverrideFast(LevelReader parent)
+ {
+ this.parent = parent;
+ }
+
+ private Biome _getBiome(BlockPos pos)
+ {
#if POST_MC_1_18_2
- return parent.getBiome(pos).value();
+ return parent.getBiome(pos).value();
#else
return parent.getBiome(pos);
#endif
- }
-
- @Override
- public int getBlockTint(BlockPos blockPos, ColorResolver colorResolver) {
- if (LodCommonMain.forgeMethodCaller != null) {
- return LodCommonMain.forgeMethodCaller.colorResolverGetColor(colorResolver, _getBiome(blockPos),
- blockPos.getX(), blockPos.getZ());
- } else {
- return colorResolver.getColor(_getBiome(blockPos), blockPos.getX(), blockPos.getZ());
- }
- }
-
- @Override
- public float getShade(Direction direction, boolean bl) { return this.parent.getShade(direction, bl); }
-
- @Override
- public LevelLightEngine getLightEngine() {
- return parent.getLightEngine();
- }
-
- @Override
- public int getBrightness(LightLayer lightLayer, BlockPos blockPos) {
- return parent.getBrightness(lightLayer, blockPos);
- }
-
- @Override
- public int getRawBrightness(BlockPos blockPos, int i) {
- return parent.getRawBrightness(blockPos, i);
- }
-
- @Override
- public boolean canSeeSky(BlockPos blockPos) {
- return parent.canSeeSky(blockPos);
- }
-
- @Override
- @Nullable
- public BlockEntity getBlockEntity(BlockPos blockPos) {
- return parent.getBlockEntity(blockPos);
- }
-
-
- @Override
- public BlockState getBlockState(BlockPos blockPos) {
- return parent.getBlockState(blockPos);
- }
-
- @Override
- public FluidState getFluidState(BlockPos blockPos) {
- return parent.getFluidState(blockPos);
- }
-
- @Override
- public int getLightEmission(BlockPos blockPos) {
- return parent.getLightEmission(blockPos);
- }
-
- @Override
- public int getMaxLightLevel() {
- return parent.getMaxLightLevel();
- }
-
- @Override
- public Stream getBlockStates(AABB aABB) {
- return parent.getBlockStates(aABB);
- }
-
- @Override
- public BlockHitResult clip(ClipContext clipContext) {
- return parent.clip(clipContext);
- }
-
- @Override
- @Nullable
- public BlockHitResult clipWithInteractionOverride(Vec3 vec3, Vec3 vec32, BlockPos blockPos, VoxelShape voxelShape, BlockState blockState) {
- return parent.clipWithInteractionOverride(vec3, vec32, blockPos, voxelShape, blockState);
- }
-
- @Override
- public double getBlockFloorHeight(VoxelShape voxelShape, Supplier supplier) {
- return parent.getBlockFloorHeight(voxelShape, supplier);
- }
-
- @Override
- public double getBlockFloorHeight(BlockPos blockPos) {
- return parent.getBlockFloorHeight(blockPos);
- }
-
- @Override
- public int getMaxBuildHeight() {
- return parent.getMaxBuildHeight();
- }
-
- #if POST_MC_1_17_1
- @Override
- public Optional getBlockEntity(BlockPos blockPos, BlockEntityType blockEntityType) {
- return parent.getBlockEntity(blockPos, blockEntityType);
- }
-
- @Override
- public BlockHitResult isBlockInLine(ClipBlockStateContext clipBlockStateContext) {
- return parent.isBlockInLine(clipBlockStateContext);
- }
-
- @Override
- public int getHeight() {
- return parent.getHeight();
- }
-
- @Override
- public int getMinBuildHeight() {
- return parent.getMinBuildHeight();
- }
-
- @Override
- public int getSectionsCount() {
- return parent.getSectionsCount();
- }
-
- @Override
- public int getMinSection() {
- return parent.getMinSection();
- }
-
- @Override
- public int getMaxSection() {
- return parent.getMaxSection();
- }
-
- @Override
- public boolean isOutsideBuildHeight(BlockPos blockPos) {
- return parent.isOutsideBuildHeight(blockPos);
- }
-
- @Override
- public boolean isOutsideBuildHeight(int i) {
- return parent.isOutsideBuildHeight(i);
- }
-
- @Override
- public int getSectionIndex(int i) {
- return parent.getSectionIndex(i);
- }
-
- @Override
- public int getSectionIndexFromSectionY(int i) {
- return parent.getSectionIndexFromSectionY(i);
- }
-
- @Override
- public int getSectionYFromSectionIndex(int i) {
- return parent.getSectionYFromSectionIndex(i);
- }
+ }
+
+ @Override
+ public int getBlockTint(BlockPos blockPos, ColorResolver colorResolver)
+ {
+ if (LodCommonMain.forgeMethodCaller != null)
+ {
+ return LodCommonMain.forgeMethodCaller.colorResolverGetColor(colorResolver, _getBiome(blockPos),
+ blockPos.getX(), blockPos.getZ());
+ }
+ else
+ {
+ return colorResolver.getColor(_getBiome(blockPos), blockPos.getX(), blockPos.getZ());
+ }
+ }
+
+ @Override
+ public float getShade(Direction direction, boolean bl) { return this.parent.getShade(direction, bl); }
+
+ @Override
+ public LevelLightEngine getLightEngine()
+ {
+ return parent.getLightEngine();
+ }
+
+ @Override
+ public int getBrightness(LightLayer lightLayer, BlockPos blockPos)
+ {
+ return parent.getBrightness(lightLayer, blockPos);
+ }
+
+ @Override
+ public int getRawBrightness(BlockPos blockPos, int i)
+ {
+ return parent.getRawBrightness(blockPos, i);
+ }
+
+ @Override
+ public boolean canSeeSky(BlockPos blockPos)
+ {
+ return parent.canSeeSky(blockPos);
+ }
+
+ @Override
+ @Nullable
+ public BlockEntity getBlockEntity(BlockPos blockPos)
+ {
+ return parent.getBlockEntity(blockPos);
+ }
+
+
+ @Override
+ public BlockState getBlockState(BlockPos blockPos)
+ {
+ return parent.getBlockState(blockPos);
+ }
+
+ @Override
+ public FluidState getFluidState(BlockPos blockPos)
+ {
+ return parent.getFluidState(blockPos);
+ }
+
+ @Override
+ public int getLightEmission(BlockPos blockPos)
+ {
+ return parent.getLightEmission(blockPos);
+ }
+
+ @Override
+ public int getMaxLightLevel()
+ {
+ return parent.getMaxLightLevel();
+ }
+
+ @Override
+ public Stream getBlockStates(AABB aABB)
+ {
+ return parent.getBlockStates(aABB);
+ }
+
+ @Override
+ public BlockHitResult clip(ClipContext clipContext)
+ {
+ return parent.clip(clipContext);
+ }
+
+ @Override
+ @Nullable
+ public BlockHitResult clipWithInteractionOverride(Vec3 vec3, Vec3 vec32, BlockPos blockPos, VoxelShape voxelShape, BlockState blockState)
+ {
+ return parent.clipWithInteractionOverride(vec3, vec32, blockPos, voxelShape, blockState);
+ }
+
+ @Override
+ public double getBlockFloorHeight(VoxelShape voxelShape, Supplier supplier)
+ {
+ return parent.getBlockFloorHeight(voxelShape, supplier);
+ }
+
+ @Override
+ public double getBlockFloorHeight(BlockPos blockPos)
+ {
+ return parent.getBlockFloorHeight(blockPos);
+ }
+
+ @Override
+ public int getMaxBuildHeight()
+ {
+ return parent.getMaxBuildHeight();
+ }
+
+ #if POST_MC_1_17_1
+ @Override
+ public Optional getBlockEntity(BlockPos blockPos, BlockEntityType blockEntityType)
+ {
+ return parent.getBlockEntity(blockPos, blockEntityType);
+ }
+
+ @Override
+ public BlockHitResult isBlockInLine(ClipBlockStateContext clipBlockStateContext)
+ {
+ return parent.isBlockInLine(clipBlockStateContext);
+ }
+
+ @Override
+ public int getHeight()
+ {
+ return parent.getHeight();
+ }
+
+ @Override
+ public int getMinBuildHeight()
+ {
+ return parent.getMinBuildHeight();
+ }
+
+ @Override
+ public int getSectionsCount()
+ {
+ return parent.getSectionsCount();
+ }
+
+ @Override
+ public int getMinSection()
+ {
+ return parent.getMinSection();
+ }
+
+ @Override
+ public int getMaxSection()
+ {
+ return parent.getMaxSection();
+ }
+
+ @Override
+ public boolean isOutsideBuildHeight(BlockPos blockPos)
+ {
+ return parent.isOutsideBuildHeight(blockPos);
+ }
+
+ @Override
+ public boolean isOutsideBuildHeight(int i)
+ {
+ return parent.isOutsideBuildHeight(i);
+ }
+
+ @Override
+ public int getSectionIndex(int i)
+ {
+ return parent.getSectionIndex(i);
+ }
+
+ @Override
+ public int getSectionIndexFromSectionY(int i)
+ {
+ return parent.getSectionIndexFromSectionY(i);
+ }
+
+ @Override
+ public int getSectionYFromSectionIndex(int i)
+ {
+ return parent.getSectionYFromSectionIndex(i);
+ }
#endif
}
diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/TintGetterOverrideSmooth.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/TintGetterOverrideSmooth.java
index a1e7e9e03..a078107b0 100644
--- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/TintGetterOverrideSmooth.java
+++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/TintGetterOverrideSmooth.java
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU Lesser General Public License
* along with this program. If not, see .
*/
-
+
package com.seibel.distanthorizons.common.wrappers.block;
import com.seibel.distanthorizons.common.LodCommonMain;
@@ -40,196 +40,230 @@ import java.util.Optional;
import java.util.function.Supplier;
import java.util.stream.Stream;
-public class TintGetterOverrideSmooth implements BlockAndTintGetter {
- LevelReader parent;
- public int smoothingRange;
-
- public TintGetterOverrideSmooth(LevelReader parent, int smoothingRange) {
- this.parent = parent;
- this.smoothingRange = smoothingRange;
- }
-
- private Biome _getBiome(BlockPos pos) {
+public class TintGetterOverrideSmooth implements BlockAndTintGetter
+{
+ LevelReader parent;
+ public int smoothingRange;
+
+ public TintGetterOverrideSmooth(LevelReader parent, int smoothingRange)
+ {
+ this.parent = parent;
+ this.smoothingRange = smoothingRange;
+ }
+
+ private Biome _getBiome(BlockPos pos)
+ {
#if POST_MC_1_18_2
- return parent.getBiome(pos).value();
+ return parent.getBiome(pos).value();
#else
- return parent.getBiome(pos);
+ return parent.getBiome(pos);
#endif
- }
-
- public int calculateBlockTint(BlockPos blockPos, ColorResolver colorResolver)
- {
- int i = smoothingRange;
- if (i == 0)
- return colorResolver.getColor(_getBiome(blockPos), blockPos.getX(), blockPos.getZ());
- int j = (i * 2 + 1) * (i * 2 + 1);
- int k = 0;
- int l = 0;
- int m = 0;
- Cursor3D cursor3D = new Cursor3D(blockPos.getX() - i, blockPos.getY(), blockPos.getZ() - i, blockPos.getX() + i, blockPos.getY(), blockPos.getZ() + i);
- BlockPos.MutableBlockPos mutableBlockPos = new BlockPos.MutableBlockPos();
- while (cursor3D.advance())
- {
- mutableBlockPos.set(cursor3D.nextX(), cursor3D.nextY(), cursor3D.nextZ());
- int n;
- if (LodCommonMain.forgeMethodCaller != null) {
- n = LodCommonMain.forgeMethodCaller.colorResolverGetColor(colorResolver, _getBiome(mutableBlockPos),
- mutableBlockPos.getX(), mutableBlockPos.getZ());
- } else {
- n = colorResolver.getColor(_getBiome(mutableBlockPos), mutableBlockPos.getX(), mutableBlockPos.getZ());
- }
-
- k += (n & 0xFF0000) >> 16;
- l += (n & 0xFF00) >> 8;
- m += n & 0xFF;
- }
- return (k / j & 0xFF) << 16 | (l / j & 0xFF) << 8 | m / j & 0xFF;
- }
-
- @Override
- public int getBlockTint(BlockPos blockPos, ColorResolver colorResolver) {
- return calculateBlockTint(blockPos, colorResolver);
- }
-
- @Override
- public float getShade(Direction direction, boolean bl) { return this.parent.getShade(direction, bl); }
-
- @Override
- public LevelLightEngine getLightEngine() {
- return parent.getLightEngine();
- }
-
- @Override
- public int getBrightness(LightLayer lightLayer, BlockPos blockPos) {
- return parent.getBrightness(lightLayer, blockPos);
- }
-
- @Override
- public int getRawBrightness(BlockPos blockPos, int i) {
- return parent.getRawBrightness(blockPos, i);
- }
-
- @Override
- public boolean canSeeSky(BlockPos blockPos) {
- return parent.canSeeSky(blockPos);
- }
-
- @Override
- @Nullable
- public BlockEntity getBlockEntity(BlockPos blockPos) {
- return parent.getBlockEntity(blockPos);
- }
-
- @Override
- public BlockState getBlockState(BlockPos blockPos) {
- return parent.getBlockState(blockPos);
- }
-
- @Override
- public FluidState getFluidState(BlockPos blockPos) {
- return parent.getFluidState(blockPos);
- }
-
- @Override
- public int getLightEmission(BlockPos blockPos) {
- return parent.getLightEmission(blockPos);
- }
-
- @Override
- public int getMaxLightLevel() {
- return parent.getMaxLightLevel();
- }
-
- @Override
- public Stream getBlockStates(AABB aABB) {
- return parent.getBlockStates(aABB);
- }
-
- @Override
- public BlockHitResult clip(ClipContext clipContext) {
- return parent.clip(clipContext);
- }
-
- @Override
- @Nullable
- public BlockHitResult clipWithInteractionOverride(Vec3 vec3, Vec3 vec32, BlockPos blockPos, VoxelShape voxelShape, BlockState blockState) {
- return parent.clipWithInteractionOverride(vec3, vec32, blockPos, voxelShape, blockState);
- }
-
- @Override
- public double getBlockFloorHeight(VoxelShape voxelShape, Supplier supplier) {
- return parent.getBlockFloorHeight(voxelShape, supplier);
- }
-
- @Override
- public double getBlockFloorHeight(BlockPos blockPos) {
- return parent.getBlockFloorHeight(blockPos);
- }
-
- @Override
- public int getMaxBuildHeight() {
- return parent.getMaxBuildHeight();
- }
-
- #if POST_MC_1_17_1
- @Override
- public Optional getBlockEntity(BlockPos blockPos, BlockEntityType blockEntityType) {
- return parent.getBlockEntity(blockPos, blockEntityType);
- }
-
- @Override
- public BlockHitResult isBlockInLine(ClipBlockStateContext clipBlockStateContext) {
- return parent.isBlockInLine(clipBlockStateContext);
- }
-
- @Override
- public int getHeight() {
- return parent.getHeight();
- }
-
- @Override
- public int getMinBuildHeight() {
- return parent.getMinBuildHeight();
- }
-
- @Override
- public int getSectionsCount() {
- return parent.getSectionsCount();
- }
-
- @Override
- public int getMinSection() {
- return parent.getMinSection();
- }
-
- @Override
- public int getMaxSection() {
- return parent.getMaxSection();
- }
-
- @Override
- public boolean isOutsideBuildHeight(BlockPos blockPos) {
- return parent.isOutsideBuildHeight(blockPos);
- }
-
- @Override
- public boolean isOutsideBuildHeight(int i) {
- return parent.isOutsideBuildHeight(i);
- }
-
- @Override
- public int getSectionIndex(int i) {
- return parent.getSectionIndex(i);
- }
-
- @Override
- public int getSectionIndexFromSectionY(int i) {
- return parent.getSectionIndexFromSectionY(i);
- }
-
- @Override
- public int getSectionYFromSectionIndex(int i) {
- return parent.getSectionYFromSectionIndex(i);
- }
+ }
+
+ public int calculateBlockTint(BlockPos blockPos, ColorResolver colorResolver)
+ {
+ int i = smoothingRange;
+ if (i == 0)
+ return colorResolver.getColor(_getBiome(blockPos), blockPos.getX(), blockPos.getZ());
+ int j = (i * 2 + 1) * (i * 2 + 1);
+ int k = 0;
+ int l = 0;
+ int m = 0;
+ Cursor3D cursor3D = new Cursor3D(blockPos.getX() - i, blockPos.getY(), blockPos.getZ() - i, blockPos.getX() + i, blockPos.getY(), blockPos.getZ() + i);
+ BlockPos.MutableBlockPos mutableBlockPos = new BlockPos.MutableBlockPos();
+ while (cursor3D.advance())
+ {
+ mutableBlockPos.set(cursor3D.nextX(), cursor3D.nextY(), cursor3D.nextZ());
+ int n;
+ if (LodCommonMain.forgeMethodCaller != null)
+ {
+ n = LodCommonMain.forgeMethodCaller.colorResolverGetColor(colorResolver, _getBiome(mutableBlockPos),
+ mutableBlockPos.getX(), mutableBlockPos.getZ());
+ }
+ else
+ {
+ n = colorResolver.getColor(_getBiome(mutableBlockPos), mutableBlockPos.getX(), mutableBlockPos.getZ());
+ }
+
+ k += (n & 0xFF0000) >> 16;
+ l += (n & 0xFF00) >> 8;
+ m += n & 0xFF;
+ }
+ return (k / j & 0xFF) << 16 | (l / j & 0xFF) << 8 | m / j & 0xFF;
+ }
+
+ @Override
+ public int getBlockTint(BlockPos blockPos, ColorResolver colorResolver)
+ {
+ return calculateBlockTint(blockPos, colorResolver);
+ }
+
+ @Override
+ public float getShade(Direction direction, boolean bl) { return this.parent.getShade(direction, bl); }
+
+ @Override
+ public LevelLightEngine getLightEngine()
+ {
+ return parent.getLightEngine();
+ }
+
+ @Override
+ public int getBrightness(LightLayer lightLayer, BlockPos blockPos)
+ {
+ return parent.getBrightness(lightLayer, blockPos);
+ }
+
+ @Override
+ public int getRawBrightness(BlockPos blockPos, int i)
+ {
+ return parent.getRawBrightness(blockPos, i);
+ }
+
+ @Override
+ public boolean canSeeSky(BlockPos blockPos)
+ {
+ return parent.canSeeSky(blockPos);
+ }
+
+ @Override
+ @Nullable
+ public BlockEntity getBlockEntity(BlockPos blockPos)
+ {
+ return parent.getBlockEntity(blockPos);
+ }
+
+ @Override
+ public BlockState getBlockState(BlockPos blockPos)
+ {
+ return parent.getBlockState(blockPos);
+ }
+
+ @Override
+ public FluidState getFluidState(BlockPos blockPos)
+ {
+ return parent.getFluidState(blockPos);
+ }
+
+ @Override
+ public int getLightEmission(BlockPos blockPos)
+ {
+ return parent.getLightEmission(blockPos);
+ }
+
+ @Override
+ public int getMaxLightLevel()
+ {
+ return parent.getMaxLightLevel();
+ }
+
+ @Override
+ public Stream getBlockStates(AABB aABB)
+ {
+ return parent.getBlockStates(aABB);
+ }
+
+ @Override
+ public BlockHitResult clip(ClipContext clipContext)
+ {
+ return parent.clip(clipContext);
+ }
+
+ @Override
+ @Nullable
+ public BlockHitResult clipWithInteractionOverride(Vec3 vec3, Vec3 vec32, BlockPos blockPos, VoxelShape voxelShape, BlockState blockState)
+ {
+ return parent.clipWithInteractionOverride(vec3, vec32, blockPos, voxelShape, blockState);
+ }
+
+ @Override
+ public double getBlockFloorHeight(VoxelShape voxelShape, Supplier supplier)
+ {
+ return parent.getBlockFloorHeight(voxelShape, supplier);
+ }
+
+ @Override
+ public double getBlockFloorHeight(BlockPos blockPos)
+ {
+ return parent.getBlockFloorHeight(blockPos);
+ }
+
+ @Override
+ public int getMaxBuildHeight()
+ {
+ return parent.getMaxBuildHeight();
+ }
+
+ #if POST_MC_1_17_1
+ @Override
+ public Optional getBlockEntity(BlockPos blockPos, BlockEntityType blockEntityType)
+ {
+ return parent.getBlockEntity(blockPos, blockEntityType);
+ }
+
+ @Override
+ public BlockHitResult isBlockInLine(ClipBlockStateContext clipBlockStateContext)
+ {
+ return parent.isBlockInLine(clipBlockStateContext);
+ }
+
+ @Override
+ public int getHeight()
+ {
+ return parent.getHeight();
+ }
+
+ @Override
+ public int getMinBuildHeight()
+ {
+ return parent.getMinBuildHeight();
+ }
+
+ @Override
+ public int getSectionsCount()
+ {
+ return parent.getSectionsCount();
+ }
+
+ @Override
+ public int getMinSection()
+ {
+ return parent.getMinSection();
+ }
+
+ @Override
+ public int getMaxSection()
+ {
+ return parent.getMaxSection();
+ }
+
+ @Override
+ public boolean isOutsideBuildHeight(BlockPos blockPos)
+ {
+ return parent.isOutsideBuildHeight(blockPos);
+ }
+
+ @Override
+ public boolean isOutsideBuildHeight(int i)
+ {
+ return parent.isOutsideBuildHeight(i);
+ }
+
+ @Override
+ public int getSectionIndex(int i)
+ {
+ return parent.getSectionIndex(i);
+ }
+
+ @Override
+ public int getSectionIndexFromSectionY(int i)
+ {
+ return parent.getSectionIndexFromSectionY(i);
+ }
+
+ @Override
+ public int getSectionYFromSectionIndex(int i)
+ {
+ return parent.getSectionYFromSectionIndex(i);
+ }
#endif
}
diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/TintWithoutLevelOverrider.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/TintWithoutLevelOverrider.java
index 9fece690a..6a098e593 100644
--- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/TintWithoutLevelOverrider.java
+++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/TintWithoutLevelOverrider.java
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU Lesser General Public License
* along with this program. If not, see .
*/
-
+
package com.seibel.distanthorizons.common.wrappers.block;
import net.minecraft.core.BlockPos;
@@ -33,57 +33,68 @@ import org.jetbrains.annotations.Nullable;
import net.minecraft.core.Holder;
#endif
-public class TintWithoutLevelOverrider implements BlockAndTintGetter {
- final BiomeWrapper biome;
-
- public TintWithoutLevelOverrider(BiomeWrapper biome) {
- this.biome = biome;
- }
- @Override
- public int getBlockTint(BlockPos blockPos, ColorResolver colorResolver) {
- return colorResolver.getColor(_unwrap(biome.biome), blockPos.getX(), blockPos.getZ());
- }
- private Biome _unwrap(#if POST_MC_1_18_2 Holder #else Biome #endif biome) {
+public class TintWithoutLevelOverrider implements BlockAndTintGetter
+{
+ final BiomeWrapper biome;
+
+ public TintWithoutLevelOverrider(BiomeWrapper biome)
+ {
+ this.biome = biome;
+ }
+ @Override
+ public int getBlockTint(BlockPos blockPos, ColorResolver colorResolver)
+ {
+ return colorResolver.getColor(_unwrap(biome.biome), blockPos.getX(), blockPos.getZ());
+ }
+ private Biome _unwrap(#if POST_MC_1_18_2 Holder #else Biome #endif biome)
+ {
#if POST_MC_1_18_2
- return biome.value();
+ return biome.value();
#else
- return biome;
+ return biome;
#endif
- }
-
- @Override
- public float getShade(Direction direction, boolean shade) {
- throw new UnsupportedOperationException("ERROR: getShade() called on TintWithoutLevelOverrider. Object is for tinting only.");
- }
- @Override
- public LevelLightEngine getLightEngine() {
- throw new UnsupportedOperationException("ERROR: getLightEngine() called on TintWithoutLevelOverrider. Object is for tinting only.");
- }
- @Nullable
- @Override
- public BlockEntity getBlockEntity(BlockPos pos) {
- throw new UnsupportedOperationException("ERROR: getBlockEntity() called on TintWithoutLevelOverrider. Object is for tinting only.");
- }
-
- @Override
- public BlockState getBlockState(BlockPos pos) {
- throw new UnsupportedOperationException("ERROR: getBlockState() called on TintWithoutLevelOverrider. Object is for tinting only.");
- }
- @Override
- public FluidState getFluidState(BlockPos pos) {
- throw new UnsupportedOperationException("ERROR: getFluidState() called on TintWithoutLevelOverrider. Object is for tinting only.");
- }
+ }
+
+ @Override
+ public float getShade(Direction direction, boolean shade)
+ {
+ throw new UnsupportedOperationException("ERROR: getShade() called on TintWithoutLevelOverrider. Object is for tinting only.");
+ }
+ @Override
+ public LevelLightEngine getLightEngine()
+ {
+ throw new UnsupportedOperationException("ERROR: getLightEngine() called on TintWithoutLevelOverrider. Object is for tinting only.");
+ }
+ @Nullable
+ @Override
+ public BlockEntity getBlockEntity(BlockPos pos)
+ {
+ throw new UnsupportedOperationException("ERROR: getBlockEntity() called on TintWithoutLevelOverrider. Object is for tinting only.");
+ }
+
+ @Override
+ public BlockState getBlockState(BlockPos pos)
+ {
+ throw new UnsupportedOperationException("ERROR: getBlockState() called on TintWithoutLevelOverrider. Object is for tinting only.");
+ }
+ @Override
+ public FluidState getFluidState(BlockPos pos)
+ {
+ throw new UnsupportedOperationException("ERROR: getFluidState() called on TintWithoutLevelOverrider. Object is for tinting only.");
+ }
#if MC_1_17_1 || POST_MC_1_18_2
- @Override
- public int getHeight() {
- throw new UnsupportedOperationException("ERROR: getHeight() called on TintWithoutLevelOverrider. Object is for tinting only.");
- }
- @Override
- public int getMinBuildHeight() {
- throw new UnsupportedOperationException("ERROR: getMinBuildHeight() called on TintWithoutLevelOverrider. Object is for tinting only.");
- }
+ @Override
+ public int getHeight()
+ {
+ throw new UnsupportedOperationException("ERROR: getHeight() called on TintWithoutLevelOverrider. Object is for tinting only.");
+ }
+ @Override
+ public int getMinBuildHeight()
+ {
+ throw new UnsupportedOperationException("ERROR: getMinBuildHeight() called on TintWithoutLevelOverrider. Object is for tinting only.");
+ }
#endif
}
diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/TintWithoutLevelSmoothOverrider.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/TintWithoutLevelSmoothOverrider.java
index 9e3562e5b..6bbce5bab 100644
--- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/TintWithoutLevelSmoothOverrider.java
+++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/TintWithoutLevelSmoothOverrider.java
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU Lesser General Public License
* along with this program. If not, see .
*/
-
+
package com.seibel.distanthorizons.common.wrappers.block;
import net.minecraft.core.BlockPos;
@@ -34,25 +34,29 @@ import org.jetbrains.annotations.Nullable;
import net.minecraft.core.Holder;
#endif
-public class TintWithoutLevelSmoothOverrider implements BlockAndTintGetter {
- final BiomeWrapper biome;
- public int smoothingRange;
-
- public TintWithoutLevelSmoothOverrider(BiomeWrapper biome, int smoothingRange) {
- this.biome = biome;
- this.smoothingRange = smoothingRange;
- }
- @Override
- public int getBlockTint(BlockPos blockPos, ColorResolver colorResolver) {
- return colorResolver.getColor(_unwrap(biome.biome), blockPos.getX(), blockPos.getZ());
- }
- private Biome _unwrap(#if POST_MC_1_18_2 Holder #else Biome #endif biome) {
+public class TintWithoutLevelSmoothOverrider implements BlockAndTintGetter
+{
+ final BiomeWrapper biome;
+ public int smoothingRange;
+
+ public TintWithoutLevelSmoothOverrider(BiomeWrapper biome, int smoothingRange)
+ {
+ this.biome = biome;
+ this.smoothingRange = smoothingRange;
+ }
+ @Override
+ public int getBlockTint(BlockPos blockPos, ColorResolver colorResolver)
+ {
+ return colorResolver.getColor(_unwrap(biome.biome), blockPos.getX(), blockPos.getZ());
+ }
+ private Biome _unwrap(#if POST_MC_1_18_2 Holder #else Biome #endif biome)
+ {
#if POST_MC_1_18_2
- return biome.value();
+ return biome.value();
#else
- return biome;
+ return biome;
#endif
- }
+ }
//
// public int calculateBlockTint(BlockPos blockPos, ColorResolver colorResolver)
// {
@@ -82,40 +86,47 @@ public class TintWithoutLevelSmoothOverrider implements BlockAndTintGetter {
// }
// return (k / j & 0xFF) << 16 | (l / j & 0xFF) << 8 | m / j & 0xFF;
// }
-
- @Override
- public float getShade(Direction direction, boolean shade) {
- throw new UnsupportedOperationException("ERROR: getShade() called on TintWithoutLevelOverrider. Object is for tinting only.");
- }
- @Override
- public LevelLightEngine getLightEngine() {
- throw new UnsupportedOperationException("ERROR: getLightEngine() called on TintWithoutLevelOverrider. Object is for tinting only.");
- }
- @Nullable
- @Override
- public BlockEntity getBlockEntity(BlockPos pos) {
- throw new UnsupportedOperationException("ERROR: getBlockEntity() called on TintWithoutLevelOverrider. Object is for tinting only.");
- }
-
- @Override
- public BlockState getBlockState(BlockPos pos) {
- throw new UnsupportedOperationException("ERROR: getBlockState() called on TintWithoutLevelOverrider. Object is for tinting only.");
- }
- @Override
- public FluidState getFluidState(BlockPos pos) {
- throw new UnsupportedOperationException("ERROR: getFluidState() called on TintWithoutLevelOverrider. Object is for tinting only.");
- }
-
+
+ @Override
+ public float getShade(Direction direction, boolean shade)
+ {
+ throw new UnsupportedOperationException("ERROR: getShade() called on TintWithoutLevelOverrider. Object is for tinting only.");
+ }
+ @Override
+ public LevelLightEngine getLightEngine()
+ {
+ throw new UnsupportedOperationException("ERROR: getLightEngine() called on TintWithoutLevelOverrider. Object is for tinting only.");
+ }
+ @Nullable
+ @Override
+ public BlockEntity getBlockEntity(BlockPos pos)
+ {
+ throw new UnsupportedOperationException("ERROR: getBlockEntity() called on TintWithoutLevelOverrider. Object is for tinting only.");
+ }
+
+ @Override
+ public BlockState getBlockState(BlockPos pos)
+ {
+ throw new UnsupportedOperationException("ERROR: getBlockState() called on TintWithoutLevelOverrider. Object is for tinting only.");
+ }
+ @Override
+ public FluidState getFluidState(BlockPos pos)
+ {
+ throw new UnsupportedOperationException("ERROR: getFluidState() called on TintWithoutLevelOverrider. Object is for tinting only.");
+ }
+
#if MC_1_17_1 || POST_MC_1_18_2
- @Override
- public int getHeight() {
- throw new UnsupportedOperationException("ERROR: getHeight() called on TintWithoutLevelOverrider. Object is for tinting only.");
- }
- @Override
- public int getMinBuildHeight() {
- throw new UnsupportedOperationException("ERROR: getMinBuildHeight() called on TintWithoutLevelOverrider. Object is for tinting only.");
- }
+ @Override
+ public int getHeight()
+ {
+ throw new UnsupportedOperationException("ERROR: getHeight() called on TintWithoutLevelOverrider. Object is for tinting only.");
+ }
+ @Override
+ public int getMinBuildHeight()
+ {
+ throw new UnsupportedOperationException("ERROR: getMinBuildHeight() called on TintWithoutLevelOverrider. Object is for tinting only.");
+ }
#endif
}
diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/cache/ClientBlockDetailMap.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/cache/ClientBlockDetailMap.java
index e8bfdce3f..5e95387e6 100644
--- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/cache/ClientBlockDetailMap.java
+++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/cache/ClientBlockDetailMap.java
@@ -7,19 +7,23 @@ import net.minecraft.world.level.block.state.BlockState;
import java.util.concurrent.ConcurrentHashMap;
-public class ClientBlockDetailMap {
- private final ConcurrentHashMap blockCache = new ConcurrentHashMap<>();
- //private final ConcurrentHashMap<#if PRE_MC_1_18_2 Biome #else Holder #endif, Biome> biomeMap = new ConcurrentHashMap<>();
- private final ClientLevelWrapper level;
- public ClientBlockDetailMap(ClientLevelWrapper level) { this.level = level; }
-
- public ClientBlockStateCache getBlockStateData(BlockState state, DhBlockPos pos) { //TODO: Allow a per pos unique setting
- return blockCache.computeIfAbsent(state, (s) -> new ClientBlockStateCache(s, level, new DhBlockPos(0,0,0)));
- }
-
- public void clear() { blockCache.clear(); }
-
- public int getColor(BlockState state, BiomeWrapper biome, DhBlockPos pos) {
- return getBlockStateData(state, pos).getAndResolveFaceColor(biome);
- }
+public class ClientBlockDetailMap
+{
+ private final ConcurrentHashMap blockCache = new ConcurrentHashMap<>();
+ //private final ConcurrentHashMap<#if PRE_MC_1_18_2 Biome #else Holder #endif, Biome> biomeMap = new ConcurrentHashMap<>();
+ private final ClientLevelWrapper level;
+ public ClientBlockDetailMap(ClientLevelWrapper level) { this.level = level; }
+
+ public ClientBlockStateCache getBlockStateData(BlockState state, DhBlockPos pos)
+ { //TODO: Allow a per pos unique setting
+ return blockCache.computeIfAbsent(state, (s) -> new ClientBlockStateCache(s, level, pos));
+ }
+
+ public void clear() { blockCache.clear(); }
+
+ public int getColor(BlockState state, BiomeWrapper biome, DhBlockPos pos)
+ {
+ return getBlockStateData(state, pos).getAndResolveFaceColor(biome);
+ }
+
}
diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/cache/ClientBlockStateCache.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/cache/ClientBlockStateCache.java
index e080f600e..ea5512f28 100644
--- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/cache/ClientBlockStateCache.java
+++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/cache/ClientBlockStateCache.java
@@ -29,178 +29,196 @@ import java.util.List;
import java.util.Random;
/**
- *
* @version 2022-9-16
*/
public class ClientBlockStateCache
{
-
- private static final Logger LOGGER = DhLoggerBuilder.getLogger();
-
+
+ private static final Logger LOGGER = DhLoggerBuilder.getLogger();
+
#if PRE_MC_1_19_2
- public static final Random random = new Random(0);
+ public static final Random random = new Random(0);
#else
- public static final RandomSource random = RandomSource.create();
+ public static final RandomSource random = RandomSource.create();
#endif
-
- public final BlockState state;
- public final LevelReader level;
- public final BlockPos pos;
- public ClientBlockStateCache(BlockState blockState, IClientLevelWrapper samplingLevel, DhBlockPos samplingPos) {
- state = blockState;
- level = (LevelReader) samplingLevel.getWrappedMcObject();
- pos = McObjectConverter.Convert(samplingPos);
- resolveColors();
- //LOGGER.info("ClientBlocKCache created for {}", blockState);
- }
-
- boolean isColorResolved = false;
- int baseColor = 0; //TODO: Impl per-face color
- boolean needShade = true;
- boolean needPostTinting = false;
- int tintIndex = 0;
-
-
- public static final int FLOWER_COLOR_SCALE = 5;
-
- enum ColorMode {
- Default,
- Flower,
- Leaves;
- static ColorMode getColorMode(Block b) {
- if (b instanceof LeavesBlock) return Leaves;
- if (b instanceof FlowerBlock) return Flower;
- return Default;
- }
- }
-
- private static int getWidth(TextureAtlasSprite texture) {
+
+ public final BlockState state;
+ public final LevelReader level;
+ public final BlockPos pos;
+ public ClientBlockStateCache(BlockState blockState, IClientLevelWrapper samplingLevel, DhBlockPos samplingPos)
+ {
+ state = blockState;
+ level = (LevelReader) samplingLevel.getWrappedMcObject();
+ pos = McObjectConverter.Convert(samplingPos);
+ resolveColors();
+ //LOGGER.info("ClientBlocKCache created for {}", blockState);
+ }
+
+ boolean isColorResolved = false;
+ int baseColor = 0; //TODO: Impl per-face color
+ boolean needShade = true;
+ boolean needPostTinting = false;
+ int tintIndex = 0;
+
+
+ public static final int FLOWER_COLOR_SCALE = 5;
+
+ enum ColorMode
+ {
+ Default,
+ Flower,
+ Leaves;
+ static ColorMode getColorMode(Block b)
+ {
+ if (b instanceof LeavesBlock) return Leaves;
+ if (b instanceof FlowerBlock) return Flower;
+ return Default;
+ }
+ }
+
+ private static int getWidth(TextureAtlasSprite texture)
+ {
#if PRE_MC_1_19_4
- return texture.getWidth();
+ return texture.getWidth();
#else
- return texture.contents().width();
+ return texture.contents().width();
#endif
- }
-
- private static int getHeight(TextureAtlasSprite texture) {
+ }
+
+ private static int getHeight(TextureAtlasSprite texture)
+ {
#if PRE_MC_1_19_4
- return texture.getHeight();
+ return texture.getHeight();
#else
- return texture.contents().height();
+ return texture.contents().height();
#endif
- }
-
- //TODO: Perhaps make this not just use the first frame?
- private static int calculateColorFromTexture(TextureAtlasSprite texture, ColorMode colorMode) {
- int count = 0;
- double alpha = 0;
- double red = 0;
- double green = 0;
- double blue = 0;
- int tempColor;
- {
- // textures normally use u and v instead of x and y
- for (int u = 0; u < getWidth(texture); u++)
- {
- for (int v = 0; v < getHeight(texture); v++)
- {
- //note: Minecraft color format is: 0xAA BB GG RR
- //________ DH mod color format is: 0xAA RR GG BB
- //OpenGL RGBA format native order: 0xRR GG BB AA
- //_ OpenGL RGBA format Java Order: 0xAA BB GG RR
- tempColor = TextureAtlasSpriteWrapper.getPixelRGBA(texture, 0, u, v);
-
- double r = ((tempColor & 0x000000FF) )/255.;
- double g = ((tempColor & 0x0000FF00) >>> 8)/255.;
- double b = ((tempColor & 0x00FF0000) >>> 16)/255.;
- double a = ((tempColor & 0xFF000000) >>> 24)/255.;
- int scale = 1;
-
- if (colorMode == ColorMode.Leaves) {
- r *= a;
- g *= a;
- b *= a;
- a = 1.;
- } else if (a==0.) {
- continue;
- } else if (colorMode == ColorMode.Flower && (g+0.1 quads = null;
- for (Direction direction : DIRECTION_ORDER)
- {
- quads = Minecraft.getInstance().getModelManager().getBlockModelShaper().
- getBlockModel(state).getQuads(state, direction, random);
- if (quads != null && !quads.isEmpty() &&
- !(state.getBlock() instanceof RotatedPillarBlock && direction == Direction.UP))
- break;
- };
- if (quads == null || quads.isEmpty()) {
- quads = Minecraft.getInstance().getModelManager().getBlockModelShaper().
- getBlockModel(state).getQuads(state, null, random);
- }
- if (quads != null && !quads.isEmpty()) {
- needPostTinting = quads.get(0).isTinted();
- needShade = quads.get(0).isShade();
- tintIndex = quads.get(0).getTintIndex();
- baseColor = calculateColorFromTexture(
+ }
+
+ //TODO: Perhaps make this not just use the first frame?
+ private static int calculateColorFromTexture(TextureAtlasSprite texture, ColorMode colorMode)
+ {
+ int count = 0;
+ double alpha = 0;
+ double red = 0;
+ double green = 0;
+ double blue = 0;
+ int tempColor;
+ {
+ // textures normally use u and v instead of x and y
+ for (int u = 0; u < getWidth(texture); u++)
+ {
+ for (int v = 0; v < getHeight(texture); v++)
+ {
+ //note: Minecraft color format is: 0xAA BB GG RR
+ //________ DH mod color format is: 0xAA RR GG BB
+ //OpenGL RGBA format native order: 0xRR GG BB AA
+ //_ OpenGL RGBA format Java Order: 0xAA BB GG RR
+ tempColor = TextureAtlasSpriteWrapper.getPixelRGBA(texture, 0, u, v);
+
+ double r = ((tempColor & 0x000000FF)) / 255.;
+ double g = ((tempColor & 0x0000FF00) >>> 8) / 255.;
+ double b = ((tempColor & 0x00FF0000) >>> 16) / 255.;
+ double a = ((tempColor & 0xFF000000) >>> 24) / 255.;
+ int scale = 1;
+
+ if (colorMode == ColorMode.Leaves)
+ {
+ r *= a;
+ g *= a;
+ b *= a;
+ a = 1.;
+ }
+ else if (a == 0.)
+ {
+ continue;
+ }
+ else if (colorMode == ColorMode.Flower && (g + 0.1 < b || g + 0.1 < r))
+ {
+ scale = FLOWER_COLOR_SCALE;
+ }
+
+ count += scale;
+ alpha += a * a * scale;
+ red += r * r * scale;
+ green += g * g * scale;
+ blue += b * b * scale;
+ }
+ }
+ }
+
+ if (count == 0)
+ // this block is entirely transparent
+ tempColor = ColorUtil.rgbToInt(0, 255, 255, 255);
+ else
+ {
+ // determine the average color
+ tempColor = ColorUtil.rgbToInt(
+ (int) (Math.sqrt(alpha / count) * 255.),
+ (int) (Math.sqrt(red / count) * 255.),
+ (int) (Math.sqrt(green / count) * 255.),
+ (int) (Math.sqrt(blue / count) * 255.));
+ }
+ return tempColor;
+ }
+ private static final Direction[] DIRECTION_ORDER = {Direction.UP, Direction.NORTH, Direction.EAST, Direction.WEST, Direction.SOUTH, Direction.DOWN};
+
+ private void resolveColors()
+ {
+ if (isColorResolved) return;
+ if (state.getFluidState().isEmpty())
+ {
+ List quads = null;
+ for (Direction direction : DIRECTION_ORDER)
+ {
+ quads = Minecraft.getInstance().getModelManager().getBlockModelShaper().
+ getBlockModel(state).getQuads(state, direction, random);
+ if (quads != null && !quads.isEmpty() &&
+ !(state.getBlock() instanceof RotatedPillarBlock && direction == Direction.UP))
+ break;
+ } ;
+ if (quads == null || quads.isEmpty())
+ {
+ quads = Minecraft.getInstance().getModelManager().getBlockModelShaper().
+ getBlockModel(state).getQuads(state, null, random);
+ }
+ if (quads != null && !quads.isEmpty())
+ {
+ needPostTinting = quads.get(0).isTinted();
+ needShade = quads.get(0).isShade();
+ tintIndex = quads.get(0).getTintIndex();
+ baseColor = calculateColorFromTexture(
#if PRE_MC_1_17_1 quads.get(0).sprite,
#else quads.get(0).getSprite(), #endif
- ColorMode.getColorMode(state.getBlock()));
- } else { // Backup method.
- needPostTinting = false;
- needShade = false;
- tintIndex = 0;
- baseColor = calculateColorFromTexture(Minecraft.getInstance().getModelManager().getBlockModelShaper().getParticleIcon(state),
- ColorMode.getColorMode(state.getBlock()));
- }
- } else { // Liquid Block
- needPostTinting = true;
- needShade = false;
- tintIndex = 0;
- baseColor = calculateColorFromTexture(Minecraft.getInstance().getModelManager().getBlockModelShaper().getParticleIcon(state),
- ColorMode.getColorMode(state.getBlock()));
- }
- isColorResolved = true;
- }
-
- public int getAndResolveFaceColor(BiomeWrapper biome)
- {
- // FIXME: impl per-face colors
- if (!needPostTinting) return baseColor;
- int tintColor = Minecraft.getInstance().getBlockColors()
- .getColor(state, new TintWithoutLevelOverrider(biome), pos, tintIndex);
- if (tintColor == -1) return baseColor;
- return ColorUtil.multiplyARGBwithRGB(baseColor, tintColor);
- }
-
+ ColorMode.getColorMode(state.getBlock()));
+ }
+ else
+ { // Backup method.
+ needPostTinting = false;
+ needShade = false;
+ tintIndex = 0;
+ baseColor = calculateColorFromTexture(Minecraft.getInstance().getModelManager().getBlockModelShaper().getParticleIcon(state),
+ ColorMode.getColorMode(state.getBlock()));
+ }
+ }
+ else
+ { // Liquid Block
+ needPostTinting = true;
+ needShade = false;
+ tintIndex = 0;
+ baseColor = calculateColorFromTexture(Minecraft.getInstance().getModelManager().getBlockModelShaper().getParticleIcon(state),
+ ColorMode.getColorMode(state.getBlock()));
+ }
+ isColorResolved = true;
+ }
+
+ public int getAndResolveFaceColor(BiomeWrapper biome)
+ {
+ // FIXME: impl per-face colors
+ if (!needPostTinting) return baseColor;
+ int tintColor = Minecraft.getInstance().getBlockColors()
+ .getColor(state, new TintWithoutLevelOverrider(biome), pos, tintIndex);
+ if (tintColor == -1) return baseColor;
+ return ColorUtil.multiplyARGBwithRGB(baseColor, tintColor);
+ }
+
}
diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/cache/ServerBlockDetailMap.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/cache/ServerBlockDetailMap.java
index 7eaa8e0e0..d7d3a2646 100644
--- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/cache/ServerBlockDetailMap.java
+++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/cache/ServerBlockDetailMap.java
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU Lesser General Public License
* along with this program. If not, see .
*/
-
+
package com.seibel.distanthorizons.common.wrappers.block.cache;
import java.util.concurrent.ConcurrentHashMap;
@@ -32,10 +32,12 @@ public class ServerBlockDetailMap
//private final ConcurrentHashMap<#if PRE_MC_1_18_2 Biome #else Holder #endif, Biome> biomeMap = new ConcurrentHashMap<>();
private final ServerLevelWrapper level;
public ServerBlockDetailMap(ServerLevelWrapper level) { this.level = level; }
-
- public ServerBlockStateCache getBlockStateData(BlockState state, DhBlockPos pos) { //TODO: Allow a per pos unique setting
- return blockCache.computeIfAbsent(state, (s) -> new ServerBlockStateCache(s, level, new DhBlockPos(0,0,0)));
+
+ public ServerBlockStateCache getBlockStateData(BlockState state, DhBlockPos pos)
+ { //TODO: Allow a per pos unique setting
+ return blockCache.computeIfAbsent(state, (s) -> new ServerBlockStateCache(s, level, new DhBlockPos(0, 0, 0)));
}
-
+
public void clear() { blockCache.clear(); }
+
}
diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/cache/ServerBlockStateCache.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/cache/ServerBlockStateCache.java
index 60c2fe44e..55b7beb36 100644
--- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/cache/ServerBlockStateCache.java
+++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/cache/ServerBlockStateCache.java
@@ -15,63 +15,71 @@ import org.apache.logging.log4j.Logger;
import java.util.Arrays;
/**
- *
* @version 2022-9-16
*/
public class ServerBlockStateCache
{
- private static final Logger LOGGER = DhLoggerBuilder.getLogger();
-
- public final BlockState state;
- public final LevelReader level;
- public final BlockPos pos;
-
- public ServerBlockStateCache(BlockState blockState, ILevelWrapper samplingLevel, DhBlockPos samplingPos) {
- state = blockState;
- level = (LevelReader) samplingLevel.getWrappedMcObject();
- pos = McObjectConverter.Convert(samplingPos);
- resolveShapes();
- //LOGGER.info("ServerBlockState created for {}", blockState);
- }
-
- boolean noCollision = false;
- boolean[] occludeFaces = null;
- boolean[] fullFaces = null;
- boolean isShapeResolved = false;
- public void resolveShapes() {
- if (isShapeResolved) return;
- if (state.getFluidState().isEmpty()) {
- noCollision = state.getCollisionShape(level, pos).isEmpty();
- occludeFaces = new boolean[6];
- if (state.canOcclude()) {
- for (Direction dir : Direction.values()) {
- // Note: isEmpty() isn't quite correct... best would be a isFull() or something...
- occludeFaces[McObjectConverter.Convert(dir).ordinal()]
+ private static final Logger LOGGER = DhLoggerBuilder.getLogger();
+
+ public final BlockState state;
+ public final LevelReader level;
+ public final BlockPos pos;
+
+ public ServerBlockStateCache(BlockState blockState, ILevelWrapper samplingLevel, DhBlockPos samplingPos)
+ {
+ state = blockState;
+ level = (LevelReader) samplingLevel.getWrappedMcObject();
+ pos = McObjectConverter.Convert(samplingPos);
+ resolveShapes();
+ //LOGGER.info("ServerBlockState created for {}", blockState);
+ }
+
+ boolean noCollision = false;
+ boolean[] occludeFaces = null;
+ boolean[] fullFaces = null;
+ boolean isShapeResolved = false;
+ public void resolveShapes()
+ {
+ if (isShapeResolved) return;
+ if (state.getFluidState().isEmpty())
+ {
+ noCollision = state.getCollisionShape(level, pos).isEmpty();
+ occludeFaces = new boolean[6];
+ if (state.canOcclude())
+ {
+ for (Direction dir : Direction.values())
+ {
+ // Note: isEmpty() isn't quite correct... best would be a isFull() or something...
+ occludeFaces[McObjectConverter.Convert(dir).ordinal()]
= !state.getFaceOcclusionShape(level, pos, dir).isEmpty();
}
- }
-
- VoxelShape voxelShape = state.getShape(level, pos);
- fullFaces = new boolean[6];
- if (!voxelShape.isEmpty()) {
- for (Direction dir : Direction.values()) {
- VoxelShape faceShape = voxelShape.getFaceShape(dir);
- AABB aabb = faceShape.bounds();
- boolean xFull = aabb.minX <= 0.01 && aabb.maxX >= 0.99;
- boolean yFull = aabb.minY <= 0.01 && aabb.maxY >= 0.99;
- boolean zFull = aabb.minZ <= 0.01 && aabb.maxZ >= 0.99;
- fullFaces[McObjectConverter.Convert(dir).ordinal()] =
- (xFull || dir.getAxis().equals(Direction.Axis.X))
- && (yFull || dir.getAxis().equals(Direction.Axis.Y))
- && (zFull || dir.getAxis().equals(Direction.Axis.Z));
- }
- }
- } else { // Liquid Block. Treat as full block
- occludeFaces = new boolean[6];
- Arrays.fill(occludeFaces, true);
- fullFaces = new boolean[6];
- Arrays.fill(fullFaces, true);
- }
- }
-
+ }
+
+ VoxelShape voxelShape = state.getShape(level, pos);
+ fullFaces = new boolean[6];
+ if (!voxelShape.isEmpty())
+ {
+ for (Direction dir : Direction.values())
+ {
+ VoxelShape faceShape = voxelShape.getFaceShape(dir);
+ AABB aabb = faceShape.bounds();
+ boolean xFull = aabb.minX <= 0.01 && aabb.maxX >= 0.99;
+ boolean yFull = aabb.minY <= 0.01 && aabb.maxY >= 0.99;
+ boolean zFull = aabb.minZ <= 0.01 && aabb.maxZ >= 0.99;
+ fullFaces[McObjectConverter.Convert(dir).ordinal()] =
+ (xFull || dir.getAxis().equals(Direction.Axis.X))
+ && (yFull || dir.getAxis().equals(Direction.Axis.Y))
+ && (zFull || dir.getAxis().equals(Direction.Axis.Z));
+ }
+ }
+ }
+ else
+ { // Liquid Block. Treat as full block
+ occludeFaces = new boolean[6];
+ Arrays.fill(occludeFaces, true);
+ fullFaces = new boolean[6];
+ Arrays.fill(fullFaces, true);
+ }
+ }
+
}
diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/chunk/ChunkWrapper.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/chunk/ChunkWrapper.java
index dce2ed586..ed0a612cb 100644
--- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/chunk/ChunkWrapper.java
+++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/chunk/ChunkWrapper.java
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU Lesser General Public License
* along with this program. If not, see .
*/
-
+
package com.seibel.distanthorizons.common.wrappers.chunk;
import com.seibel.distanthorizons.api.enums.config.ELightGenerationMode;
@@ -78,7 +78,7 @@ public class ChunkWrapper implements IChunkWrapper
* just before the light engine is ticked, (right after all light changes is marked to the engine to be processed).
* To fix this, on client-only mode, we mixin-redirect the `isClientLightReady()` so that after the call, it will
* trigger a synchronous update of this flag here on all chunks that are wrapped.
- *
+ *
* Note: Using a static weak hash map to store the chunks that need to be updated, as instance of chunk wrapper
* can be duplicated, with same chunk instance. And the data stored here are all temporary, and thus will not be
* visible when a chunk is re-wrapped later.
@@ -169,10 +169,10 @@ public class ChunkWrapper implements IChunkWrapper
QuartPos.fromBlock(relX), QuartPos.fromBlock(relY), QuartPos.fromBlock(relZ)));
#endif
}
-
+
@Override
public DhChunkPos getChunkPos() { return this.chunkPos; }
-
+
public ChunkAccess getChunk() { return this.chunk; }
@Override
@@ -217,29 +217,29 @@ public class ChunkWrapper implements IChunkWrapper
weakMapLock.readLock().unlock();
return fixedIsClientLightReady;
}
-
+
// called when in single player or in dedicated server, and the chunk is a level chunk (active)
return this.chunk.isLightCorrect() && levelChunk.loaded;
}
else
{
// called when in a single player world and the chunk is a proto chunk (in world gen, and not active)
- return this.chunk.isLightCorrect();
+ return this.chunk.isLightCorrect();
}
#endif
}
@Override
- public int getDhBlockLight(int relX, int y, int relZ)
+ public int getDhBlockLight(int relX, int y, int relZ)
{
this.throwIndexOutOfBoundsIfRelativePosOutsideChunkBounds(relX, y, relZ);
int index = this.relativeBlockPosToIndex(relX, y, relZ);
- return this.blockLightArray[index];
+ return this.blockLightArray[index];
}
@Override
- public void setDhBlockLight(int relX, int y, int relZ, int lightValue)
+ public void setDhBlockLight(int relX, int y, int relZ, int lightValue)
{
this.throwIndexOutOfBoundsIfRelativePosOutsideChunkBounds(relX, y, relZ);
@@ -248,7 +248,7 @@ public class ChunkWrapper implements IChunkWrapper
}
@Override
- public int getDhSkyLight(int relX, int y, int relZ)
+ public int getDhSkyLight(int relX, int y, int relZ)
{
this.throwIndexOutOfBoundsIfRelativePosOutsideChunkBounds(relX, y, relZ);
@@ -256,7 +256,7 @@ public class ChunkWrapper implements IChunkWrapper
return this.skyLightArray[index];
}
@Override
- public void setDhSkyLight(int relX, int y, int relZ, int lightValue)
+ public void setDhSkyLight(int relX, int y, int relZ, int lightValue)
{
this.throwIndexOutOfBoundsIfRelativePosOutsideChunkBounds(relX, y, relZ);
@@ -282,7 +282,7 @@ public class ChunkWrapper implements IChunkWrapper
// note: this returns 0 if the chunk is unload
// MC lighting method
- return this.lightSource.getBrightness(LightLayer.BLOCK, new BlockPos(relX +this.getMinBlockX(), y, relZ +this.getMinBlockZ()));
+ return this.lightSource.getBrightness(LightLayer.BLOCK, new BlockPos(relX + this.getMinBlockX(), y, relZ + this.getMinBlockZ()));
}
}
@@ -301,11 +301,11 @@ public class ChunkWrapper implements IChunkWrapper
else
{
// MC lighting method
- return this.lightSource.getBrightness(LightLayer.SKY, new BlockPos(relX +this.getMinBlockX(), y, relZ +this.getMinBlockZ()));
+ return this.lightSource.getBrightness(LightLayer.SKY, new BlockPos(relX + this.getMinBlockX(), y, relZ + this.getMinBlockZ()));
}
}
- @Override
+ @Override
public List getBlockLightPosList()
{
// only populate the list once
@@ -315,12 +315,12 @@ public class ChunkWrapper implements IChunkWrapper
#if PRE_MC_1_20_1
- this.chunk.getLights().forEach((blockPos) ->
+ this.chunk.getLights().forEach((blockPos) ->
{
this.blockLightPosList.add(new DhBlockPos(blockPos.getX(), blockPos.getY(), blockPos.getZ()));
});
#elif MC_1_20_1
- this.chunk.findBlockLightSources((blockPos, blockState) ->
+ this.chunk.findBlockLightSources((blockPos, blockState) ->
{
this.blockLightPosList.add(new DhBlockPos(blockPos.getX(), blockPos.getY(), blockPos.getZ()));
});
@@ -357,49 +357,52 @@ public class ChunkWrapper implements IChunkWrapper
}
public LevelReader getColorResolver() { return this.lightSource; }
-
+
@Override
public String toString() { return this.chunk.getClass().getSimpleName() + this.chunk.getPos(); }
-
+
@Override
public IBlockStateWrapper getBlockState(int relX, int relY, int relZ)
{
//if (wrappedLevel != null) return wrappedLevel.getBlockState(new DhBlockPos(x + getMinX(), y, z + getMinZ()));
return BlockStateWrapper.fromBlockState(this.chunk.getBlockState(new BlockPos(relX, relY, relZ)));
}
-
+
@Override
public boolean isStillValid() { return this.wrappedLevel == null || this.wrappedLevel.tryGetChunk(this.chunkPos) == this; }
-
+
#if POST_MC_1_20_1
- private static boolean checkLightSectionsOnChunk(LevelChunk chunk, LevelLightEngine engine) {
+ private static boolean checkLightSectionsOnChunk(LevelChunk chunk, LevelLightEngine engine)
+ {
LevelChunkSection[] sections = chunk.getSections();
int minY = chunk.getMinSection();
int maxY = chunk.getMaxSection();
- for (int y = minY; y < maxY; ++y) {
+ for (int y = minY; y < maxY; ++y)
+ {
LevelChunkSection section = sections[chunk.getSectionIndexFromSectionY(y)];
if (section.hasOnlyAir()) continue;
- if (!engine.lightOnInSection(SectionPos.of(chunk.getPos(), y))) {
+ if (!engine.lightOnInSection(SectionPos.of(chunk.getPos(), y)))
+ {
return false;
}
}
return true;
}
#endif
-
+
// Should be called after client light updates are triggered.
private static boolean updateClientLightReady(ChunkAccess chunk, boolean oldValue)
{
- if (chunk instanceof LevelChunk && ((LevelChunk)chunk).getLevel() instanceof ClientLevel)
+ if (chunk instanceof LevelChunk && ((LevelChunk) chunk).getLevel() instanceof ClientLevel)
{
- LevelChunk levelChunk = (LevelChunk)chunk;
- ClientChunkCache clientChunkCache = ((ClientLevel)levelChunk.getLevel()).getChunkSource();
+ LevelChunk levelChunk = (LevelChunk) chunk;
+ ClientChunkCache clientChunkCache = ((ClientLevel) levelChunk.getLevel()).getChunkSource();
return clientChunkCache.getChunkForLighting(chunk.getPos().x, chunk.getPos().z) != null &&
#if MC_1_16_5 || MC_1_17_1
levelChunk.isLightCorrect();
- #elif PRE_MC_1_20_1
+ #elif PRE_MC_1_20_1
levelChunk.isClientLightReady();
- #else
+ #else
checkLightSectionsOnChunk(levelChunk, levelChunk.getLevel().getLightEngine());
#endif
}
@@ -408,7 +411,7 @@ public class ChunkWrapper implements IChunkWrapper
return oldValue;
}
}
-
+
public static void syncedUpdateClientLightStatus()
{
#if PRE_MC_1_18_2
@@ -419,7 +422,7 @@ public class ChunkWrapper implements IChunkWrapper
{
chunksToUpdateClientLightReady.replaceAll(ChunkWrapper::updateClientLightReady);
}
- finally
+ finally
{
weakMapLock.writeLock().unlock();
}
@@ -436,16 +439,16 @@ public class ChunkWrapper implements IChunkWrapper
private void throwIndexOutOfBoundsIfRelativePosOutsideChunkBounds(int x, int y, int z) throws IndexOutOfBoundsException
{
// FIXME +/-1 is to handle the fact that LodDataBuilder adds +1 to all block lighting calculations, also done in the relative position validator
- int minHeight = this.getMinBuildHeight()-1;
- int maxHeight = this.getMaxBuildHeight()+1;
-
+ int minHeight = this.getMinBuildHeight() - 1;
+ int maxHeight = this.getMaxBuildHeight() + 1;
+
if (x < 0 || x >= LodUtil.CHUNK_WIDTH
- || z < 0 || z >= LodUtil.CHUNK_WIDTH
- || y < minHeight || y > maxHeight)
+ || z < 0 || z >= LodUtil.CHUNK_WIDTH
+ || y < minHeight || y > maxHeight)
{
- String errorMessage = "Relative position ["+x+","+y+","+z+"] out of bounds. \n" +
+ String errorMessage = "Relative position [" + x + "," + y + "," + z + "] out of bounds. \n" +
"X/Z must be between 0 and 15 (inclusive) \n" +
- "Y must be between ["+minHeight+"] and ["+maxHeight+"] (inclusive).";
+ "Y must be between [" + minHeight + "] and [" + maxHeight + "] (inclusive).";
throw new IndexOutOfBoundsException(errorMessage);
}
}
@@ -455,21 +458,21 @@ public class ChunkWrapper implements IChunkWrapper
* Converts a 3D position into a 1D array index.
*
* Source:
- * stackoverflow
+ * stackoverflow
*/
- public int relativeBlockPosToIndex(int xRel, int y, int zRel)
+ public int relativeBlockPosToIndex(int xRel, int y, int zRel)
{
int yRel = y - this.getMinBuildHeight();
- return (zRel * LodUtil.CHUNK_WIDTH * this.getHeight()) + (yRel * LodUtil.CHUNK_WIDTH) + xRel;
+ return (zRel * LodUtil.CHUNK_WIDTH * this.getHeight()) + (yRel * LodUtil.CHUNK_WIDTH) + xRel;
}
/**
* Converts a 3D position into a 1D array index.
*
* Source:
- * stackoverflow
+ * stackoverflow
*/
- public DhBlockPos indexToRelativeBlockPos(int index)
+ public DhBlockPos indexToRelativeBlockPos(int index)
{
final int zRel = index / (LodUtil.CHUNK_WIDTH * this.getHeight());
index -= (zRel * LodUtil.CHUNK_WIDTH * this.getHeight());
diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/ClassicConfigGUI.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/ClassicConfigGUI.java
index f70e231bc..770e1a319 100644
--- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/ClassicConfigGUI.java
+++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/ClassicConfigGUI.java
@@ -47,7 +47,7 @@ import net.minecraft.client.gui.components.events.GuiEventListener;
import net.minecraft.client.gui.screens.Screen;
import net.minecraft.network.chat.CommonComponents;
import net.minecraft.network.chat.Component;
-import net.minecraft.client.resources.language.I18n; // translation
+import net.minecraft.client.resources.language.I18n; // translation
#if POST_MC_1_17_1
import net.minecraft.client.gui.narration.NarratableEntry;
#endif
@@ -68,6 +68,7 @@ import static com.seibel.distanthorizons.common.wrappers.gui.GuiHelper.*;
* @version 5-21-2022
*/
// FLOATS DONT WORK WITH THIS
+
/** This file is going to be removed sometime soon, please dont hook onto anything within this file until the new UI is compleated */
@SuppressWarnings("unchecked")
public class ClassicConfigGUI
@@ -78,338 +79,388 @@ public class ClassicConfigGUI
private static final Logger LOGGER = LogManager.getLogger();
-
- //==============//
- // Initializers //
- //==============//
-
- // Some regexes to check if an input is valid
- private static final Pattern INTEGER_ONLY_REGEX = Pattern.compile("(-?[0-9]*)");
- private static final Pattern DECIMAL_ONLY_REGEX = Pattern.compile("-?([\\d]+\\.?[\\d]*|[\\d]*\\.?[\\d]+|\\.)");
-
- private static class ConfigScreenConfigs {
- // This contains all the configs for the configs
- public static final int SpaceFromRightScreen = 10;
- public static final int ButtonWidthSpacing = 5;
- public static final int ResetButtonWidth = 40;
- }
-
- /**
- * The terribly coded old stuff
- */
- public static class EntryInfo {
- Object widget;
- Map.Entry error;
- String tempValue;
- int index;
- }
-
- /**
- * creates a text field
- */
- private static void textField(AbstractConfigType info, Function func, Pattern pattern, boolean cast) {
- boolean isNumber = pattern != null;
- ((EntryInfo) info.guiValue).widget = (BiFunction>) (editBox, button) -> stringValue ->
- {
- stringValue = stringValue.trim();
- if (!(stringValue.isEmpty() || !isNumber || pattern.matcher(stringValue).matches()))
- return false;
-
- Number value = 0;
- ((EntryInfo) info.guiValue).error = null;
- if (isNumber && !stringValue.isEmpty() && !stringValue.equals("-") && !stringValue.equals(".")) {
- try {
- value = func.apply(stringValue);
- } catch (Exception e) {
- value = null;
- }
-
- byte isValid = ((ConfigEntry) info).isValid(value);
- switch (isValid) {
- case 0: ((EntryInfo) info.guiValue).error = null; break;
- case -1: ((EntryInfo) info.guiValue).error = new AbstractMap.SimpleEntry<>(editBox, TextOrTranslatable("§cMinimum length is " + ((ConfigEntry) info).getMin())); break;
- case 1: ((EntryInfo) info.guiValue).error = new AbstractMap.SimpleEntry<>(editBox, TextOrTranslatable("§cMaximum length is " + ((ConfigEntry) info).getMax())); break;
- case 2: ((EntryInfo) info.guiValue).error = new AbstractMap.SimpleEntry<>(editBox, TextOrTranslatable("§cValue is invalid")); break;
- }
- }
-
- ((EntryInfo) info.guiValue).tempValue = stringValue;
- editBox.setTextColor(((ConfigEntry) info).isValid(value) == 0 ? 0xFFFFFFFF : 0xFFFF7777);
+
+ //==============//
+ // Initializers //
+ //==============//
+
+ // Some regexes to check if an input is valid
+ private static final Pattern INTEGER_ONLY_REGEX = Pattern.compile("(-?[0-9]*)");
+ private static final Pattern DECIMAL_ONLY_REGEX = Pattern.compile("-?([\\d]+\\.?[\\d]*|[\\d]*\\.?[\\d]+|\\.)");
+
+ private static class ConfigScreenConfigs
+ {
+ // This contains all the configs for the configs
+ public static final int SpaceFromRightScreen = 10;
+ public static final int ButtonWidthSpacing = 5;
+ public static final int ResetButtonWidth = 40;
+
+ }
+
+ /**
+ * The terribly coded old stuff
+ */
+ public static class EntryInfo
+ {
+ Object widget;
+ Map.Entry error;
+ String tempValue;
+ int index;
+
+ }
+
+ /**
+ * creates a text field
+ */
+ private static void textField(AbstractConfigType info, Function func, Pattern pattern, boolean cast)
+ {
+ boolean isNumber = pattern != null;
+ ((EntryInfo) info.guiValue).widget = (BiFunction>) (editBox, button) -> stringValue ->
+ {
+ stringValue = stringValue.trim();
+ if (!(stringValue.isEmpty() || !isNumber || pattern.matcher(stringValue).matches()))
+ return false;
+
+ Number value = 0;
+ ((EntryInfo) info.guiValue).error = null;
+ if (isNumber && !stringValue.isEmpty() && !stringValue.equals("-") && !stringValue.equals("."))
+ {
+ try
+ {
+ value = func.apply(stringValue);
+ }
+ catch (Exception e)
+ {
+ value = null;
+ }
+
+ byte isValid = ((ConfigEntry) info).isValid(value);
+ switch (isValid)
+ {
+ case 0:
+ ((EntryInfo) info.guiValue).error = null; break;
+ case -1:
+ ((EntryInfo) info.guiValue).error = new AbstractMap.SimpleEntry<>(editBox, TextOrTranslatable("§cMinimum length is " + ((ConfigEntry) info).getMin())); break;
+ case 1:
+ ((EntryInfo) info.guiValue).error = new AbstractMap.SimpleEntry<>(editBox, TextOrTranslatable("§cMaximum length is " + ((ConfigEntry) info).getMax())); break;
+ case 2:
+ ((EntryInfo) info.guiValue).error = new AbstractMap.SimpleEntry<>(editBox, TextOrTranslatable("§cValue is invalid")); break;
+ }
+ }
+
+ ((EntryInfo) info.guiValue).tempValue = stringValue;
+ editBox.setTextColor(((ConfigEntry) info).isValid(value) == 0 ? 0xFFFFFFFF : 0xFFFF7777);
// button.active = entries.stream().allMatch(e -> e.inLimits);
-
-
- if (((ConfigEntry) info).isValid(value) == 0 && info.getType() != List.class) {
- if (!cast)
- ((ConfigEntry) info).setWithoutSaving(value);
- else
- ((ConfigEntry) info).setWithoutSaving(value.intValue());
- }
+
+
+ if (((ConfigEntry) info).isValid(value) == 0 && info.getType() != List.class)
+ {
+ if (!cast)
+ ((ConfigEntry) info).setWithoutSaving(value);
+ else
+ ((ConfigEntry) info).setWithoutSaving(value.intValue());
+ }
// else if (((ConfigEntry) info).isValidMemoryAddress() == 0)
// {
// if (((List) info.get()).size() == ((EntryInfo) info.guiValue).index)
// info.set(((List) info.get()).add(""));
// info.set(((List) info.get()).set(((EntryInfo) info.guiValue).index, Arrays.stream(((EntryInfo) info.guiValue).tempValue.replace("[", "").replace("]", "").split(", ")).collect(Collectors.toList()).get(0)));
// }
-
- return true;
- };
- }
-
- //==============//
- // GUI handling //
- //==============//
-
- /**
- * if you want to get this config gui's screen call this
- */
- public static Screen getScreen(ConfigBase configBase, Screen parent, String category) {
- return new ConfigScreen(configBase, parent, category);
- }
-
- /**
- * Pain
- */
- private static class ConfigScreen extends DhScreen {
- protected ConfigScreen(ConfigBase configBase, Screen parent, String category) {
- super(Translatable(
- I18n.exists(configBase.modID + ".config" + (category.isEmpty() ? "." + category : "") + ".title") ?
- configBase.modID + ".config.title" :
- configBase.modID + ".config" + (category.isEmpty() ? "" : "." + category) + ".title")
- );
- this.configBase = configBase;
- this.parent = parent;
- this.category = category;
- this.translationPrefix = configBase.modID + ".config.";
- }
- private final ConfigBase configBase;
-
- private final String translationPrefix;
- private final Screen parent;
- private final String category;
- private ConfigListWidget list;
- private boolean reload = false;
-
- private Button doneButton;
-
- // Real Time config update //
- @Override
- public void tick() {
- super.tick();
- }
-
-
- /**
- * When you close it, it goes to the previous screen and saves
- */
- @Override
- public void onClose() {
- ConfigBase.INSTANCE.configFileINSTANCE.saveToFile();
- Objects.requireNonNull(minecraft).setScreen(this.parent);
- }
-
- @Override
- protected void init() {
- super.init();
- if (!reload)
- ConfigBase.INSTANCE.configFileINSTANCE.loadFromFile();
-
- // Changelog button
- if (Config.Client.Advanced.AutoUpdater.enableAutoUpdater.get())
+
+ return true;
+ };
+ }
+
+ //==============//
+ // GUI handling //
+ //==============//
+
+ /**
+ * if you want to get this config gui's screen call this
+ */
+ public static Screen getScreen(ConfigBase configBase, Screen parent, String category)
+ {
+ return new ConfigScreen(configBase, parent, category);
+ }
+
+ /**
+ * Pain
+ */
+ private static class ConfigScreen extends DhScreen
+ {
+ protected ConfigScreen(ConfigBase configBase, Screen parent, String category)
+ {
+ super(Translatable(
+ I18n.exists(configBase.modID + ".config" + (category.isEmpty() ? "." + category : "") + ".title") ?
+ configBase.modID + ".config.title" :
+ configBase.modID + ".config" + (category.isEmpty() ? "" : "." + category) + ".title")
+ );
+ this.configBase = configBase;
+ this.parent = parent;
+ this.category = category;
+ this.translationPrefix = configBase.modID + ".config.";
+ }
+ private final ConfigBase configBase;
+
+ private final String translationPrefix;
+ private final Screen parent;
+ private final String category;
+ private ConfigListWidget list;
+ private boolean reload = false;
+
+ private Button doneButton;
+
+ // Real Time config update //
+ @Override
+ public void tick()
+ {
+ super.tick();
+ }
+
+
+ /**
+ * When you close it, it goes to the previous screen and saves
+ */
+ @Override
+ public void onClose()
+ {
+ ConfigBase.INSTANCE.configFileINSTANCE.saveToFile();
+ Objects.requireNonNull(minecraft).setScreen(this.parent);
+ }
+
+ @Override
+ protected void init()
+ {
+ super.init();
+ if (!reload)
+ ConfigBase.INSTANCE.configFileINSTANCE.loadFromFile();
+
+ // Changelog button
+ if (Config.Client.Advanced.AutoUpdater.enableAutoUpdater.get())
{
- this.addBtn(new TexturedButtonWidget(
- // Where the button is on the screen
- this.width - 28, this.height - 28,
- // Width and height of the button
- 20, 20,
- // Offset
- 0, 0,
- // Some textuary stuff
- 0, new ResourceLocation(ModInfo.ID, "textures/gui/changelog.png"), 20, 20,
- // Create the button and tell it where to go
- (buttonWidget) -> Objects.requireNonNull(minecraft).setScreen(new ChangelogScreen(this)),
- // Add a title to the button
- Translatable(ModInfo.ID + ".updater.title")
- ));
- }
-
-
- addBtn(MakeBtn(CommonComponents.GUI_CANCEL, this.width / 2 - 154, this.height - 28, 150, 20, button -> {
- ConfigBase.INSTANCE.configFileINSTANCE.loadFromFile();
- Objects.requireNonNull(minecraft).setScreen(parent);
- }));
- doneButton = addBtn(MakeBtn( CommonComponents.GUI_DONE,this.width / 2 + 4, this.height - 28, 150, 20, (button) -> {
- ConfigBase.INSTANCE.configFileINSTANCE.saveToFile();
- Objects.requireNonNull(minecraft).setScreen(parent);
- }));
-
- this.list = new ConfigListWidget(this.minecraft, this.width * 2, this.height, 32, this.height - 32, 25);
- if (this.minecraft != null && this.minecraft.level != null)
- this.list.setRenderBackground(false);
-
- this.addWidget(this.list);
-
- for (AbstractConfigType info : ConfigBase.INSTANCE.entries) {
- try {
- if (info.getCategory().matches(category) && info.getAppearance().showInGui)
- addMenuItem(info);
- } catch (Exception e) {
- System.out.println("ERROR: Failed to show ["+info.getNameWCategory()+"]");
- if (info.get() != null)
- System.out.print(" with the value ["+info.get()+"] with type ["+info.getType()+"]");
- e.printStackTrace();
- }
- }
- }
-
- private void addMenuItem(AbstractConfigType info) {
- initEntry(info, this.translationPrefix);
- Component name = Translatable(translationPrefix + info.getNameWCategory());
-
- if (ConfigEntry.class.isAssignableFrom(info.getClass())) {
- Button.OnPress btnAction = button -> {
- ((ConfigEntry) info).setWithoutSaving(((ConfigEntry) info).getDefaultValue());
- ((EntryInfo) info.guiValue).index = 0;
- this.reload = true;
- Objects.requireNonNull(minecraft).setScreen(this);
- };
- int a = this.width - ConfigScreenConfigs.SpaceFromRightScreen - 150 - ConfigScreenConfigs.ButtonWidthSpacing - ConfigScreenConfigs.ResetButtonWidth;
- int b = 0;
- int c = ConfigScreenConfigs.ResetButtonWidth;
- int d = 20;
-
- Button resetButton = MakeBtn(TextOrLiteral("Reset") .withStyle(ChatFormatting.RED), a, b, c, d, btnAction);
-
- if (((EntryInfo) info.guiValue).widget instanceof Map.Entry) {
- Map.Entry> widget = (Map.Entry>) ((EntryInfo) info.guiValue).widget;
- if (info.getType().isEnum()) {
- widget.setValue(value -> Translatable(translationPrefix + "enum." + info.getType().getSimpleName() + "." + info.get().toString()));
- }
- this.list.addButton(MakeBtn(widget.getValue().apply(info.get()), this.width - 150 - ConfigScreenConfigs.SpaceFromRightScreen, 0, 150, 20, widget.getKey()), resetButton, null, name);
- return;
- } else if (((EntryInfo) info.guiValue).widget != null) {
- EditBox widget = new EditBox(font, this.width - 150 - ConfigScreenConfigs.SpaceFromRightScreen + 2, 0, 150 - 4, 20, null);
- widget.setMaxLength(150);
- widget.insertText(String.valueOf(info.get()));
- Predicate processor = ((BiFunction>) ((EntryInfo) info.guiValue).widget).apply(widget, doneButton);
- widget.setFilter(processor);
- this.list.addButton(widget, resetButton, null, name);
- return;
- }
- }
- if (ConfigCategory.class.isAssignableFrom(info.getClass())) {
- Button widget = MakeBtn(name, this.width / 2 - 100, this.height - 28, 100 * 2, 20, (button -> {
- ConfigBase.INSTANCE.configFileINSTANCE.saveToFile();
- Objects.requireNonNull(minecraft).setScreen(ClassicConfigGUI.getScreen(this.configBase, this, ((ConfigCategory) info).getDestination()));
- }));
- this.list.addButton(widget, null, null, null);
- return;
- }
- if (ConfigUIButton.class.isAssignableFrom(info.getClass())) {
- Button widget = MakeBtn(name, this.width / 2 - 100, this.height - 28, 100 * 2, 20, (button -> {
- ((ConfigUIButton) info).runAction();
- }));
- this.list.addButton(widget, null, null, null);
- return;
- }
- if (ConfigUIComment.class.isAssignableFrom(info.getClass())) {
- this.list.addButton(null, null, null, name);
- return;
- }
- if (ConfigLinkedEntry.class.isAssignableFrom(info.getClass())) {
- this.addMenuItem(((ConfigLinkedEntry) info).get());
- return;
- }
-
- LOGGER.warn("Config ["+ info.getNameWCategory() +"] failed to show. Please try something like changing its type.");
- }
-
- @Override
+ this.addBtn(new TexturedButtonWidget(
+ // Where the button is on the screen
+ this.width - 28, this.height - 28,
+ // Width and height of the button
+ 20, 20,
+ // Offset
+ 0, 0,
+ // Some textuary stuff
+ 0, new ResourceLocation(ModInfo.ID, "textures/gui/changelog.png"), 20, 20,
+ // Create the button and tell it where to go
+ (buttonWidget) -> Objects.requireNonNull(minecraft).setScreen(new ChangelogScreen(this)),
+ // Add a title to the button
+ Translatable(ModInfo.ID + ".updater.title")
+ ));
+ }
+
+
+ addBtn(MakeBtn(CommonComponents.GUI_CANCEL, this.width / 2 - 154, this.height - 28, 150, 20, button -> {
+ ConfigBase.INSTANCE.configFileINSTANCE.loadFromFile();
+ Objects.requireNonNull(minecraft).setScreen(parent);
+ }));
+ doneButton = addBtn(MakeBtn(CommonComponents.GUI_DONE, this.width / 2 + 4, this.height - 28, 150, 20, (button) -> {
+ ConfigBase.INSTANCE.configFileINSTANCE.saveToFile();
+ Objects.requireNonNull(minecraft).setScreen(parent);
+ }));
+
+ this.list = new ConfigListWidget(this.minecraft, this.width * 2, this.height, 32, this.height - 32, 25);
+ if (this.minecraft != null && this.minecraft.level != null)
+ this.list.setRenderBackground(false);
+
+ this.addWidget(this.list);
+
+ for (AbstractConfigType info : ConfigBase.INSTANCE.entries)
+ {
+ try
+ {
+ if (info.getCategory().matches(category) && info.getAppearance().showInGui)
+ addMenuItem(info);
+ }
+ catch (Exception e)
+ {
+ System.out.println("ERROR: Failed to show [" + info.getNameWCategory() + "]");
+ if (info.get() != null)
+ System.out.print(" with the value [" + info.get() + "] with type [" + info.getType() + "]");
+ e.printStackTrace();
+ }
+ }
+ }
+
+ private void addMenuItem(AbstractConfigType info)
+ {
+ initEntry(info, this.translationPrefix);
+ Component name = Translatable(translationPrefix + info.getNameWCategory());
+
+ if (ConfigEntry.class.isAssignableFrom(info.getClass()))
+ {
+ Button.OnPress btnAction = button -> {
+ ((ConfigEntry) info).setWithoutSaving(((ConfigEntry) info).getDefaultValue());
+ ((EntryInfo) info.guiValue).index = 0;
+ this.reload = true;
+ Objects.requireNonNull(minecraft).setScreen(this);
+ };
+ int a = this.width - ConfigScreenConfigs.SpaceFromRightScreen - 150 - ConfigScreenConfigs.ButtonWidthSpacing - ConfigScreenConfigs.ResetButtonWidth;
+ int b = 0;
+ int c = ConfigScreenConfigs.ResetButtonWidth;
+ int d = 20;
+
+ Button resetButton = MakeBtn(TextOrLiteral("Reset").withStyle(ChatFormatting.RED), a, b, c, d, btnAction);
+
+ if (((EntryInfo) info.guiValue).widget instanceof Map.Entry)
+ {
+ Map.Entry> widget = (Map.Entry>) ((EntryInfo) info.guiValue).widget;
+ if (info.getType().isEnum())
+ {
+ widget.setValue(value -> Translatable(translationPrefix + "enum." + info.getType().getSimpleName() + "." + info.get().toString()));
+ }
+ this.list.addButton(MakeBtn(widget.getValue().apply(info.get()), this.width - 150 - ConfigScreenConfigs.SpaceFromRightScreen, 0, 150, 20, widget.getKey()), resetButton, null, name);
+ return;
+ }
+ else if (((EntryInfo) info.guiValue).widget != null)
+ {
+ EditBox widget = new EditBox(font, this.width - 150 - ConfigScreenConfigs.SpaceFromRightScreen + 2, 0, 150 - 4, 20, null);
+ widget.setMaxLength(150);
+ widget.insertText(String.valueOf(info.get()));
+ Predicate processor = ((BiFunction>) ((EntryInfo) info.guiValue).widget).apply(widget, doneButton);
+ widget.setFilter(processor);
+ this.list.addButton(widget, resetButton, null, name);
+ return;
+ }
+ }
+ if (ConfigCategory.class.isAssignableFrom(info.getClass()))
+ {
+ Button widget = MakeBtn(name, this.width / 2 - 100, this.height - 28, 100 * 2, 20, (button -> {
+ ConfigBase.INSTANCE.configFileINSTANCE.saveToFile();
+ Objects.requireNonNull(minecraft).setScreen(ClassicConfigGUI.getScreen(this.configBase, this, ((ConfigCategory) info).getDestination()));
+ }));
+ this.list.addButton(widget, null, null, null);
+ return;
+ }
+ if (ConfigUIButton.class.isAssignableFrom(info.getClass()))
+ {
+ Button widget = MakeBtn(name, this.width / 2 - 100, this.height - 28, 100 * 2, 20, (button -> {
+ ((ConfigUIButton) info).runAction();
+ }));
+ this.list.addButton(widget, null, null, null);
+ return;
+ }
+ if (ConfigUIComment.class.isAssignableFrom(info.getClass()))
+ {
+ this.list.addButton(null, null, null, name);
+ return;
+ }
+ if (ConfigLinkedEntry.class.isAssignableFrom(info.getClass()))
+ {
+ this.addMenuItem(((ConfigLinkedEntry) info).get());
+ return;
+ }
+
+ LOGGER.warn("Config [" + info.getNameWCategory() + "] failed to show. Please try something like changing its type.");
+ }
+
+ @Override
#if PRE_MC_1_20_1
- public void render(PoseStack matrices, int mouseX, int mouseY, float delta)
+ public void render(PoseStack matrices, int mouseX, int mouseY, float delta)
#else
- public void render(GuiGraphics matrices, int mouseX, int mouseY, float delta)
+ public void render(GuiGraphics matrices, int mouseX, int mouseY, float delta)
#endif
- {
- this.renderBackground(matrices); // Renders background
- this.list.render(matrices, mouseX, mouseY, delta); // Render buttons
-
- DhDrawCenteredString(matrices, font, title, width / 2, 15, 0xFFFFFF); // Render title
-
- // If the update is pending, display this message to inform the user that it will apply when the game restarts
- if (SelfUpdater.deleteOldOnClose)
- DhDrawString(matrices, font, Translatable(configBase.modID + ".updater.waitingForClose"), 4, height-38, 0xFFFFFF);
-
-
- // Render the tooltip only if it can find a tooltip in the language file
- for (AbstractConfigType info : ConfigBase.INSTANCE.entries) {
- if (info.getCategory().matches(category) && info.getAppearance().showInGui) {
- if (list.getHoveredButton(mouseX, mouseY).isPresent()) {
- AbstractWidget buttonWidget = list.getHoveredButton(mouseX, mouseY).get();
- Component text = ButtonEntry.buttonsWithText.get(buttonWidget);
- // A quick fix for tooltips on linked entries
- AbstractConfigType newInfo = ConfigLinkedEntry.class.isAssignableFrom(info.getClass())?
- ((ConfigLinkedEntry) info).get():
- info;
-
- Component name = Translatable(this.translationPrefix + (info.category.isEmpty() ? "" : info.category + ".") + info.getName());
- String key = translationPrefix + (newInfo.category.isEmpty() ? "" : newInfo.category + ".") + newInfo.getName() + ".@tooltip";
-
- if (((EntryInfo) newInfo.guiValue).error != null && text.equals(name))
- DhRenderTooltip(matrices, font, ((EntryInfo) newInfo.guiValue).error.getValue(), mouseX, mouseY);
- else if (I18n.exists(key) && (text != null && text.equals(name))) {
- List list = new ArrayList<>();
- for (String str : I18n.get(key).split("\n")) {
- list.add(TextOrTranslatable(str));
- }
- DhRenderComponentTooltip(matrices, font, list, mouseX, mouseY);
- }
- }
- }
- }
- super.render(matrices, mouseX, mouseY, delta);
- }
- }
-
-
-
-
-
- private static void initEntry(AbstractConfigType info, String translationPrefix) {
- info.guiValue = new EntryInfo();
- Class fieldClass = info.getType();
-
- if (ConfigEntry.class.isAssignableFrom(info.getClass())) {
- if (fieldClass == Integer.class) {
- // For int
- textField(info, Integer::parseInt, INTEGER_ONLY_REGEX, true);
- } else if (fieldClass == Double.class) {
- // For double
- textField(info, Double::parseDouble, DECIMAL_ONLY_REGEX, false);
- } else if (fieldClass == String.class || fieldClass == List.class) {
- // For string or list
- textField(info, String::length, null, true);
- } else if (fieldClass == Boolean.class) {
- // For boolean
- Function func = value -> TextOrTranslatable((Boolean) value ? "True" : "False").withStyle((Boolean) value ? ChatFormatting.GREEN : ChatFormatting.RED);
-
- ((EntryInfo) info.guiValue).widget = new AbstractMap.SimpleEntry>(button -> {
- ((ConfigEntry) info).setWithoutSaving(!(Boolean) info.get());
- button.setMessage(func.apply(info.get()));
- }, func);
- }
- else if (fieldClass.isEnum())
- {
- // For enum
- List values = Arrays.asList(info.getType().getEnumConstants());
- Function func = value -> Translatable(translationPrefix + "enum." + fieldClass.getSimpleName() + "." + info.get().toString());
- ((EntryInfo) info.guiValue).widget = new AbstractMap.SimpleEntry>(button -> {
+ {
+ this.renderBackground(matrices); // Renders background
+ this.list.render(matrices, mouseX, mouseY, delta); // Render buttons
+
+ DhDrawCenteredString(matrices, font, title, width / 2, 15, 0xFFFFFF); // Render title
+
+ // If the update is pending, display this message to inform the user that it will apply when the game restarts
+ if (SelfUpdater.deleteOldOnClose)
+ DhDrawString(matrices, font, Translatable(configBase.modID + ".updater.waitingForClose"), 4, height - 38, 0xFFFFFF);
+
+
+ // Render the tooltip only if it can find a tooltip in the language file
+ for (AbstractConfigType info : ConfigBase.INSTANCE.entries)
+ {
+ if (info.getCategory().matches(category) && info.getAppearance().showInGui)
+ {
+ if (list.getHoveredButton(mouseX, mouseY).isPresent())
+ {
+ AbstractWidget buttonWidget = list.getHoveredButton(mouseX, mouseY).get();
+ Component text = ButtonEntry.buttonsWithText.get(buttonWidget);
+ // A quick fix for tooltips on linked entries
+ AbstractConfigType newInfo = ConfigLinkedEntry.class.isAssignableFrom(info.getClass()) ?
+ ((ConfigLinkedEntry) info).get() :
+ info;
+
+ Component name = Translatable(this.translationPrefix + (info.category.isEmpty() ? "" : info.category + ".") + info.getName());
+ String key = translationPrefix + (newInfo.category.isEmpty() ? "" : newInfo.category + ".") + newInfo.getName() + ".@tooltip";
+
+ if (((EntryInfo) newInfo.guiValue).error != null && text.equals(name))
+ DhRenderTooltip(matrices, font, ((EntryInfo) newInfo.guiValue).error.getValue(), mouseX, mouseY);
+ else if (I18n.exists(key) && (text != null && text.equals(name)))
+ {
+ List list = new ArrayList<>();
+ for (String str : I18n.get(key).split("\n"))
+ {
+ list.add(TextOrTranslatable(str));
+ }
+ DhRenderComponentTooltip(matrices, font, list, mouseX, mouseY);
+ }
+ }
+ }
+ }
+ super.render(matrices, mouseX, mouseY, delta);
+ }
+
+ }
+
+
+
+
+
+ private static void initEntry(AbstractConfigType info, String translationPrefix)
+ {
+ info.guiValue = new EntryInfo();
+ Class fieldClass = info.getType();
+
+ if (ConfigEntry.class.isAssignableFrom(info.getClass()))
+ {
+ if (fieldClass == Integer.class)
+ {
+ // For int
+ textField(info, Integer::parseInt, INTEGER_ONLY_REGEX, true);
+ }
+ else if (fieldClass == Double.class)
+ {
+ // For double
+ textField(info, Double::parseDouble, DECIMAL_ONLY_REGEX, false);
+ }
+ else if (fieldClass == String.class || fieldClass == List.class)
+ {
+ // For string or list
+ textField(info, String::length, null, true);
+ }
+ else if (fieldClass == Boolean.class)
+ {
+ // For boolean
+ Function func = value -> TextOrTranslatable((Boolean) value ? "True" : "False").withStyle((Boolean) value ? ChatFormatting.GREEN : ChatFormatting.RED);
+
+ ((EntryInfo) info.guiValue).widget = new AbstractMap.SimpleEntry>(button -> {
+ ((ConfigEntry) info).setWithoutSaving(!(Boolean) info.get());
+ button.setMessage(func.apply(info.get()));
+ }, func);
+ }
+ else if (fieldClass.isEnum())
+ {
+ // For enum
+ List values = Arrays.asList(info.getType().getEnumConstants());
+ Function func = value -> Translatable(translationPrefix + "enum." + fieldClass.getSimpleName() + "." + info.get().toString());
+ ((EntryInfo) info.guiValue).widget = new AbstractMap.SimpleEntry>(button -> {
// get the currently selected enum and enum index
int startingIndex = values.indexOf(info.get());
Enum enumValue = (Enum) values.get(startingIndex);
// search for the next enum that is selectable
- int index = startingIndex+1;
+ int index = startingIndex + 1;
index = (index >= values.size()) ? 0 : index;
while (index != startingIndex)
{
@@ -429,116 +480,135 @@ public class ClassicConfigGUI
{
// none of the enums should be selectable, this is a programmer error
enumValue = (Enum) values.get(startingIndex);
- LOGGER.warn("Enum ["+enumValue.getClass()+"] doesn't contain any values that should be selectable via the UI, sticking to the currently selected value ["+enumValue+"].");
+ LOGGER.warn("Enum [" + enumValue.getClass() + "] doesn't contain any values that should be selectable via the UI, sticking to the currently selected value [" + enumValue + "].");
}
info.set(enumValue);
button.setMessage(func.apply(info.get()));
}, func);
- }
- } else if (ConfigCategory.class.isAssignableFrom(info.getClass())) {
+ }
+ }
+ else if (ConfigCategory.class.isAssignableFrom(info.getClass()))
+ {
// if (!info.info.getName().equals(""))
// info.name = new TranslatableComponent(info.info.getName());
- }
+ }
// return info;
- }
-
- public static class ConfigListWidget extends ContainerObjectSelectionList {
- Font textRenderer;
-
- public ConfigListWidget(Minecraft minecraftClient, int i, int j, int k, int l, int m) {
- super(minecraftClient, i, j, k, l, m);
- this.centerListVertically = false;
- textRenderer = minecraftClient.font;
- }
-
- public void addButton(AbstractWidget button, AbstractWidget resetButton, AbstractWidget indexButton, Component text) {
- this.addEntry(ButtonEntry.create(button, text, resetButton, indexButton));
- }
-
- @Override
- public int getRowWidth() {
- return 10000;
- }
-
- public Optional getHoveredButton(double mouseX, double mouseY) {
- for (ButtonEntry buttonEntry : this.children()) {
- if (buttonEntry.button != null && buttonEntry.button.isMouseOver(mouseX, mouseY)) {
- return Optional.of(buttonEntry.button);
- }
- }
- return Optional.empty();
- }
- }
-
-
- public static class ButtonEntry extends ContainerObjectSelectionList.Entry {
- private static final Font textRenderer = Minecraft.getInstance().font;
- public final AbstractWidget button;
- private final AbstractWidget resetButton;
- private final AbstractWidget indexButton;
- private final Component text;
- private final List children = new ArrayList<>();
- public static final Map buttonsWithText = new HashMap<>();
-
- private ButtonEntry(AbstractWidget button, Component text, AbstractWidget resetButton, AbstractWidget indexButton) {
- buttonsWithText.put(button, text);
- this.button = button;
- this.resetButton = resetButton;
- this.text = text;
- this.indexButton = indexButton;
- if (button != null)
- children.add(button);
- if (resetButton != null)
- children.add(resetButton);
- if (indexButton != null)
- children.add(indexButton);
- }
-
- public static ButtonEntry create(AbstractWidget button, Component text, AbstractWidget resetButton, AbstractWidget indexButton) {
- return new ButtonEntry(button, text, resetButton, indexButton);
- }
-
- @Override
+ }
+
+ public static class ConfigListWidget extends ContainerObjectSelectionList
+ {
+ Font textRenderer;
+
+ public ConfigListWidget(Minecraft minecraftClient, int i, int j, int k, int l, int m)
+ {
+ super(minecraftClient, i, j, k, l, m);
+ this.centerListVertically = false;
+ textRenderer = minecraftClient.font;
+ }
+
+ public void addButton(AbstractWidget button, AbstractWidget resetButton, AbstractWidget indexButton, Component text)
+ {
+ this.addEntry(ButtonEntry.create(button, text, resetButton, indexButton));
+ }
+
+ @Override
+ public int getRowWidth()
+ {
+ return 10000;
+ }
+
+ public Optional getHoveredButton(double mouseX, double mouseY)
+ {
+ for (ButtonEntry buttonEntry : this.children())
+ {
+ if (buttonEntry.button != null && buttonEntry.button.isMouseOver(mouseX, mouseY))
+ {
+ return Optional.of(buttonEntry.button);
+ }
+ }
+ return Optional.empty();
+ }
+
+ }
+
+
+ public static class ButtonEntry extends ContainerObjectSelectionList.Entry
+ {
+ private static final Font textRenderer = Minecraft.getInstance().font;
+ public final AbstractWidget button;
+ private final AbstractWidget resetButton;
+ private final AbstractWidget indexButton;
+ private final Component text;
+ private final List children = new ArrayList<>();
+ public static final Map buttonsWithText = new HashMap<>();
+
+ private ButtonEntry(AbstractWidget button, Component text, AbstractWidget resetButton, AbstractWidget indexButton)
+ {
+ buttonsWithText.put(button, text);
+ this.button = button;
+ this.resetButton = resetButton;
+ this.text = text;
+ this.indexButton = indexButton;
+ if (button != null)
+ children.add(button);
+ if (resetButton != null)
+ children.add(resetButton);
+ if (indexButton != null)
+ children.add(indexButton);
+ }
+
+ public static ButtonEntry create(AbstractWidget button, Component text, AbstractWidget resetButton, AbstractWidget indexButton)
+ {
+ return new ButtonEntry(button, text, resetButton, indexButton);
+ }
+
+ @Override
#if PRE_MC_1_20_1
- public void render(PoseStack matrices, int index, int y, int x, int entryWidth, int entryHeight, int mouseX, int mouseY, boolean hovered, float tickDelta)
+ public void render(PoseStack matrices, int index, int y, int x, int entryWidth, int entryHeight, int mouseX, int mouseY, boolean hovered, float tickDelta)
#else
- public void render(GuiGraphics matrices, int index, int y, int x, int entryWidth, int entryHeight, int mouseX, int mouseY, boolean hovered, float tickDelta)
+ public void render(GuiGraphics matrices, int index, int y, int x, int entryWidth, int entryHeight, int mouseX, int mouseY, boolean hovered, float tickDelta)
#endif
- {
- if (button != null) {
- SetY(button, y);
- button.render(matrices, mouseX, mouseY, tickDelta);
- }
- if (resetButton != null) {
- SetY(resetButton, y);
- resetButton.render(matrices, mouseX, mouseY, tickDelta);
- }
- if (indexButton != null) {
- SetY(indexButton, y);
- indexButton.render(matrices, mouseX, mouseY, tickDelta);
- }
- if (text != null && (!text.getString().contains("spacer") || button != null))
+ {
+ if (button != null)
+ {
+ SetY(button, y);
+ button.render(matrices, mouseX, mouseY, tickDelta);
+ }
+ if (resetButton != null)
+ {
+ SetY(resetButton, y);
+ resetButton.render(matrices, mouseX, mouseY, tickDelta);
+ }
+ if (indexButton != null)
+ {
+ SetY(indexButton, y);
+ indexButton.render(matrices, mouseX, mouseY, tickDelta);
+ }
+ if (text != null && (!text.getString().contains("spacer") || button != null))
#if PRE_MC_1_20_1
GuiComponent.drawString(matrices, textRenderer, text, 12, y + 5, 0xFFFFFF);
#else
- matrices.drawString(textRenderer, text, 12, y + 5, 0xFFFFFF);
+ matrices.drawString(textRenderer, text, 12, y + 5, 0xFFFFFF);
#endif
- }
-
- @Override
- public List children() {
- return children;
- }
-
- // Only for 1.17 and over
- // Remove in 1.16 and below
+ }
+
+ @Override
+ public List children()
+ {
+ return children;
+ }
+
+ // Only for 1.17 and over
+ // Remove in 1.16 and below
#if POST_MC_1_17_1
- @Override
- public List narratables() {
- return children;
- }
+ @Override
+ public List narratables()
+ {
+ return children;
+ }
#endif
- }
+ }
+
}
diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/DhScreen.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/DhScreen.java
index 8d120725c..fbeb7f4c3 100644
--- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/DhScreen.java
+++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/DhScreen.java
@@ -12,53 +12,66 @@ import net.minecraft.network.chat.Component;
import java.util.List;
-public class DhScreen extends Screen {
-
- protected DhScreen(Component $$0) {
- super($$0);
- }
-
- // addRenderableWidget in 1.17 and over
- // addButton in 1.16 and below
- protected Button addBtn(Button button) {
+public class DhScreen extends Screen
+{
+
+ protected DhScreen(Component $$0)
+ {
+ super($$0);
+ }
+
+ // addRenderableWidget in 1.17 and over
+ // addButton in 1.16 and below
+ protected Button addBtn(Button button)
+ {
#if PRE_MC_1_17_1
return this.addButton(button);
#else
- return this.addRenderableWidget(button);
+ return this.addRenderableWidget(button);
#endif
- }
-
- #if PRE_MC_1_20_1
- protected void DhDrawCenteredString(PoseStack guiStack, Font font, Component text, int x, int y, int color) {
- drawCenteredString(guiStack, font, text, x, y, color);
- }
- protected void DhDrawString(PoseStack guiStack, Font font, Component text, int x, int y, int color) {
- drawString(guiStack, font, text, x, y, color);
- }
- protected void DhRenderTooltip(PoseStack guiStack, Font font, List text, int x, int y) {
- renderTooltip(guiStack, text, x, y);
- }
- protected void DhRenderComponentTooltip(PoseStack guiStack, Font font, List comp, int x, int y) {
- renderComponentTooltip(guiStack, comp, x, y);
- }
- protected void DhRenderTooltip(PoseStack guiStack, Font font, Component comp, int x, int y) {
- renderTooltip(guiStack, comp, x, y);
- }
- #else
- protected void DhDrawCenteredString(GuiGraphics guiStack, Font font, Component text, int x, int y, int color) {
- guiStack.drawCenteredString(font, text, x, y, color);
- }
- protected void DhDrawString(GuiGraphics guiStack, Font font, Component text, int x, int y, int color) {
- guiStack.drawString(font, text, x, y, color);
- }
- protected void DhRenderTooltip(GuiGraphics guiStack, Font font, List text, int x, int y) {
- guiStack.renderTooltip(font, text, x, y);
- }
- protected void DhRenderComponentTooltip(GuiGraphics guiStack, Font font, List comp, int x, int y) {
- guiStack.renderComponentTooltip(font, comp, x, y);
- }
- protected void DhRenderTooltip(GuiGraphics guiStack, Font font, Component text, int x, int y) {
- guiStack.renderTooltip(font, text, x, y);
- }
+ }
+
+ #if PRE_MC_1_20_1
+ protected void DhDrawCenteredString(PoseStack guiStack, Font font, Component text, int x, int y, int color)
+ {
+ drawCenteredString(guiStack, font, text, x, y, color);
+ }
+ protected void DhDrawString(PoseStack guiStack, Font font, Component text, int x, int y, int color)
+ {
+ drawString(guiStack, font, text, x, y, color);
+ }
+ protected void DhRenderTooltip(PoseStack guiStack, Font font, List text, int x, int y)
+ {
+ renderTooltip(guiStack, text, x, y);
+ }
+ protected void DhRenderComponentTooltip(PoseStack guiStack, Font font, List comp, int x, int y)
+ {
+ renderComponentTooltip(guiStack, comp, x, y);
+ }
+ protected void DhRenderTooltip(PoseStack guiStack, Font font, Component comp, int x, int y)
+ {
+ renderTooltip(guiStack, comp, x, y);
+ }
+ #else
+ protected void DhDrawCenteredString(GuiGraphics guiStack, Font font, Component text, int x, int y, int color)
+ {
+ guiStack.drawCenteredString(font, text, x, y, color);
+ }
+ protected void DhDrawString(GuiGraphics guiStack, Font font, Component text, int x, int y, int color)
+ {
+ guiStack.drawString(font, text, x, y, color);
+ }
+ protected void DhRenderTooltip(GuiGraphics guiStack, Font font, List text, int x, int y)
+ {
+ guiStack.renderTooltip(font, text, x, y);
+ }
+ protected void DhRenderComponentTooltip(GuiGraphics guiStack, Font font, List comp, int x, int y)
+ {
+ guiStack.renderComponentTooltip(font, comp, x, y);
+ }
+ protected void DhRenderTooltip(GuiGraphics guiStack, Font font, Component text, int x, int y)
+ {
+ guiStack.renderTooltip(font, text, x, y);
+ }
#endif
}
diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/GetConfigScreen.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/GetConfigScreen.java
index b7c816b1a..9e1a165a0 100644
--- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/GetConfigScreen.java
+++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/GetConfigScreen.java
@@ -18,24 +18,26 @@ public class GetConfigScreen
OpenGL, // This was just an attempt, it didn't work out, and we are going to change to javafx soon (as soon as that works)
JavaFX;
}
-
- public static Screen getScreen(Screen parent)
+
+ public static Screen getScreen(Screen parent)
{
- // Generate the language
- // This shouldn't be here, but I need a way to test it after Minecraft inits its assets
- //System.out.println(ConfigBase.INSTANCE.generateLang(false, true));
+ // Generate the language
+ // This shouldn't be here, but I need a way to test it after Minecraft inits its assets
+ //System.out.println(ConfigBase.INSTANCE.generateLang(false, true));
- switch (useScreen)
+ switch (useScreen)
{
case Classic:
- return ClassicConfigGUI.getScreen(ConfigBase.INSTANCE, parent, "client");
- case OpenGL: MinecraftScreen.getScreen(parent, new OpenGLConfigScreen(), ModInfo.ID + ".title");
+ return ClassicConfigGUI.getScreen(ConfigBase.INSTANCE, parent, "client");
+ case OpenGL:
+ MinecraftScreen.getScreen(parent, new OpenGLConfigScreen(), ModInfo.ID + ".title");
return null;
// case JavaFX -> MinecraftScreen.getScreen(parent, new JavaScreenHandlerScreen(new JavaScreenHandlerScreen.ExampleScreen()), ModInfo.ID + ".title");
- case JavaFX:
+ case JavaFX:
return MinecraftScreen.getScreen(parent, new JavaScreenHandlerScreen(new ConfigScreen()), ModInfo.ID + ".title");
default:
return null;
- }
- }
+ }
+ }
+
}
\ No newline at end of file
diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/GuiHelper.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/GuiHelper.java
index de2449be0..1bd0655a1 100644
--- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/GuiHelper.java
+++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/GuiHelper.java
@@ -10,56 +10,63 @@ import net.minecraft.network.chat.TextComponent;
import net.minecraft.network.chat.TranslatableComponent;
#endif
-public class GuiHelper {
- /**
- * Helper static methods for versional compat
- */
- public static Button MakeBtn(Component base, int a, int b, int c, int d, Button.OnPress action) {
+public class GuiHelper
+{
+ /**
+ * Helper static methods for versional compat
+ */
+ public static Button MakeBtn(Component base, int a, int b, int c, int d, Button.OnPress action)
+ {
#if PRE_MC_1_19_4
- return new Button(a, b, c, d, base, action);
+ return new Button(a, b, c, d, base, action);
#else
- return Button.builder(base, action).bounds(a,b,c,d).build();
+ return Button.builder(base, action).bounds(a, b, c, d).build();
#endif
- }
-
- public static MutableComponent TextOrLiteral(String text) {
+ }
+
+ public static MutableComponent TextOrLiteral(String text)
+ {
#if PRE_MC_1_19_2
- return new TextComponent(text);
+ return new TextComponent(text);
#else
- return Component.literal(text);
+ return Component.literal(text);
#endif
- }
-
- public static MutableComponent TextOrTranslatable(String text) {
+ }
+
+ public static MutableComponent TextOrTranslatable(String text)
+ {
#if PRE_MC_1_19_2
- return new TextComponent(text);
+ return new TextComponent(text);
#else
- return Component.translatable(text);
+ return Component.translatable(text);
#endif
- }
-
- public static MutableComponent Translatable(String text, Object... args) {
+ }
+
+ public static MutableComponent Translatable(String text, Object... args)
+ {
#if PRE_MC_1_19_2
- return new TranslatableComponent(text, args);
+ return new TranslatableComponent(text, args);
#else
- return Component.translatable(text, args);
+ return Component.translatable(text, args);
#endif
- }
-
- public static void SetX(AbstractWidget w, int x) {
+ }
+
+ public static void SetX(AbstractWidget w, int x)
+ {
#if PRE_MC_1_19_4
- w.x = x;
+ w.x = x;
#else
- w.setX(x);
+ w.setX(x);
#endif
- }
-
- public static void SetY(AbstractWidget w, int y) {
+ }
+
+ public static void SetY(AbstractWidget w, int y)
+ {
#if PRE_MC_1_19_4
- w.y = y;
+ w.y = y;
#else
- w.setY(y);
+ w.setY(y);
#endif
- }
-
+ }
+
}
diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/LangWrapper.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/LangWrapper.java
index 6967930da..7f14108fd 100644
--- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/LangWrapper.java
+++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/LangWrapper.java
@@ -3,15 +3,19 @@ package com.seibel.distanthorizons.common.wrappers.gui;
import com.seibel.distanthorizons.core.wrapperInterfaces.config.ILangWrapper;
import net.minecraft.client.resources.language.I18n;
-public class LangWrapper implements ILangWrapper {
- public static final LangWrapper INSTANCE = new LangWrapper();
- @Override
- public boolean langExists(String str) {
- return I18n.exists(str);
- }
-
- @Override
- public String getLang(String str) {
- return I18n.get(str);
- }
+public class LangWrapper implements ILangWrapper
+{
+ public static final LangWrapper INSTANCE = new LangWrapper();
+ @Override
+ public boolean langExists(String str)
+ {
+ return I18n.exists(str);
+ }
+
+ @Override
+ public String getLang(String str)
+ {
+ return I18n.get(str);
+ }
+
}
diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/MinecraftScreen.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/MinecraftScreen.java
index bcc1bd3f9..cf42dd9db 100644
--- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/MinecraftScreen.java
+++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/MinecraftScreen.java
@@ -14,109 +14,125 @@ import org.jetbrains.annotations.NotNull;
import java.nio.file.Path;
import java.util.*;
-public class MinecraftScreen {
- public static Screen getScreen(Screen parent, AbstractScreen screen, String translationName) {
- return new ConfigScreenRenderer(parent, screen, translationName);
- }
-
- private static class ConfigScreenRenderer extends DhScreen {
- private final Screen parent;
- private ConfigListWidget list;
- private AbstractScreen screen;
-
-
- #if PRE_MC_1_19_2
- public static net.minecraft.network.chat.TranslatableComponent translate (String str, Object... args) {
- return new net.minecraft.network.chat.TranslatableComponent(str, args);
- }
- #else
- public static net.minecraft.network.chat.MutableComponent translate (String str, Object... args) {
- return net.minecraft.network.chat.Component.translatable(str, args);
- }
+public class MinecraftScreen
+{
+ public static Screen getScreen(Screen parent, AbstractScreen screen, String translationName)
+ {
+ return new ConfigScreenRenderer(parent, screen, translationName);
+ }
+
+ private static class ConfigScreenRenderer extends DhScreen
+ {
+ private final Screen parent;
+ private ConfigListWidget list;
+ private AbstractScreen screen;
+
+
+ #if PRE_MC_1_19_2
+ public static net.minecraft.network.chat.TranslatableComponent translate(String str, Object... args)
+ {
+ return new net.minecraft.network.chat.TranslatableComponent(str, args);
+ }
+ #else
+ public static net.minecraft.network.chat.MutableComponent translate(String str, Object... args)
+ {
+ return net.minecraft.network.chat.Component.translatable(str, args);
+ }
#endif
-
- protected ConfigScreenRenderer(Screen parent, AbstractScreen screen, String translationName) {
- super(translate(translationName));
- screen.minecraftWindow = Minecraft.getInstance().getWindow().getWindow();
- this.parent = parent;
- this.screen = screen;
- }
-
- @Override
- protected void init() {
- super.init(); // Init Minecraft's screen
- Window mcWindow = this.minecraft.getWindow();
- screen.width = mcWindow.getWidth();
- screen.height = mcWindow.getHeight();
- screen.scaledWidth = this.width;
- screen.scaledHeight = this.height;
- screen.init(); // Init our own config screen
-
- this.list = new ConfigListWidget(this.minecraft, this.width, this.height, 0, this.height, 25); // Select the area to tint
- if (this.minecraft != null && this.minecraft.level != null) // Check if in game
- this.list.setRenderBackground(false); // Disable from rendering
- this.addWidget(this.list); // Add the tint to the things to be rendered
- }
-
- @Override
+
+ protected ConfigScreenRenderer(Screen parent, AbstractScreen screen, String translationName)
+ {
+ super(translate(translationName));
+ screen.minecraftWindow = Minecraft.getInstance().getWindow().getWindow();
+ this.parent = parent;
+ this.screen = screen;
+ }
+
+ @Override
+ protected void init()
+ {
+ super.init(); // Init Minecraft's screen
+ Window mcWindow = this.minecraft.getWindow();
+ screen.width = mcWindow.getWidth();
+ screen.height = mcWindow.getHeight();
+ screen.scaledWidth = this.width;
+ screen.scaledHeight = this.height;
+ screen.init(); // Init our own config screen
+
+ this.list = new ConfigListWidget(this.minecraft, this.width, this.height, 0, this.height, 25); // Select the area to tint
+ if (this.minecraft != null && this.minecraft.level != null) // Check if in game
+ this.list.setRenderBackground(false); // Disable from rendering
+ this.addWidget(this.list); // Add the tint to the things to be rendered
+ }
+
+ @Override
#if PRE_MC_1_20_1
- public void render(PoseStack matrices, int mouseX, int mouseY, float delta)
+ public void render(PoseStack matrices, int mouseX, int mouseY, float delta)
#else
- public void render(GuiGraphics matrices, int mouseX, int mouseY, float delta)
+ public void render(GuiGraphics matrices, int mouseX, int mouseY, float delta)
#endif
- {
- this.renderBackground(matrices); // Render background
- this.list.render(matrices, mouseX, mouseY, delta); // Renders the items in the render list (currently only used to tint background darker)
-
- screen.mouseX = mouseX;
- screen.mouseY = mouseY;
- screen.render(delta); // Render everything on the main screen
-
- super.render(matrices, mouseX, mouseY, delta); // Render the vanilla stuff (currently only used for the background and tint)
- }
-
- @Override
- public void resize(Minecraft mc, int width, int height) {
- super.resize(mc, width, height); // Resize Minecraft's screen
- Window mcWindow = this.minecraft.getWindow();
- screen.width = mcWindow.getWidth();
- screen.height = mcWindow.getHeight();
- screen.scaledWidth = this.width;
- screen.scaledHeight = this.height;
- screen.onResize(); // Resize our screen
- }
-
- @Override
- public void tick() {
- super.tick(); // Tick Minecraft's screen
- screen.tick(); // Tick our screen
- if (screen.close) // If we decide to close the screen, then actually close the screen
- onClose();
- }
-
- @Override
- public void onClose() {
- screen.onClose(); // Close our screen
- Objects.requireNonNull(minecraft).setScreen(this.parent); // Goto the parent screen
- }
-
- @Override
- public void onFilesDrop(@NotNull List files) {
- screen.onFilesDrop(files);
- }
-
- // For checking if it should close when you press the escape key
- @Override
- public boolean shouldCloseOnEsc() {
- return screen.shouldCloseOnEsc;
- }
- }
-
- public static class ConfigListWidget extends ContainerObjectSelectionList {
- public ConfigListWidget(Minecraft minecraftClient, int i, int j, int k, int l, int m) {
- super(minecraftClient, i, j, k, l, m);
- this.centerListVertically = false;
- }
- }
-
+ {
+ this.renderBackground(matrices); // Render background
+ this.list.render(matrices, mouseX, mouseY, delta); // Renders the items in the render list (currently only used to tint background darker)
+
+ screen.mouseX = mouseX;
+ screen.mouseY = mouseY;
+ screen.render(delta); // Render everything on the main screen
+
+ super.render(matrices, mouseX, mouseY, delta); // Render the vanilla stuff (currently only used for the background and tint)
+ }
+
+ @Override
+ public void resize(Minecraft mc, int width, int height)
+ {
+ super.resize(mc, width, height); // Resize Minecraft's screen
+ Window mcWindow = this.minecraft.getWindow();
+ screen.width = mcWindow.getWidth();
+ screen.height = mcWindow.getHeight();
+ screen.scaledWidth = this.width;
+ screen.scaledHeight = this.height;
+ screen.onResize(); // Resize our screen
+ }
+
+ @Override
+ public void tick()
+ {
+ super.tick(); // Tick Minecraft's screen
+ screen.tick(); // Tick our screen
+ if (screen.close) // If we decide to close the screen, then actually close the screen
+ onClose();
+ }
+
+ @Override
+ public void onClose()
+ {
+ screen.onClose(); // Close our screen
+ Objects.requireNonNull(minecraft).setScreen(this.parent); // Goto the parent screen
+ }
+
+ @Override
+ public void onFilesDrop(@NotNull List files)
+ {
+ screen.onFilesDrop(files);
+ }
+
+ // For checking if it should close when you press the escape key
+ @Override
+ public boolean shouldCloseOnEsc()
+ {
+ return screen.shouldCloseOnEsc;
+ }
+
+ }
+
+ public static class ConfigListWidget extends ContainerObjectSelectionList
+ {
+ public ConfigListWidget(Minecraft minecraftClient, int i, int j, int k, int l, int m)
+ {
+ super(minecraftClient, i, j, k, l, m);
+ this.centerListVertically = false;
+ }
+
+ }
+
}
diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/TexturedButtonWidget.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/TexturedButtonWidget.java
index 74e051702..17b04b6dd 100644
--- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/TexturedButtonWidget.java
+++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/TexturedButtonWidget.java
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU Lesser General Public License
* along with this program. If not, see .
*/
-
+
package com.seibel.distanthorizons.common.wrappers.gui;
import com.mojang.blaze3d.systems.RenderSystem;
@@ -36,44 +36,50 @@ import net.minecraft.client.renderer.GameRenderer;
* Creates a button with a texture on it
*/
// TODO: Is this still needed? Can we switch to vanilla's ImageButton?
-public class TexturedButtonWidget extends ImageButton {
- #if POST_MC_1_17_1
- public TexturedButtonWidget(int x, int y, int width, int height, int u, int v, ResourceLocation texture, OnPress pressAction) {
- super(x, y, width, height, u, v, texture, pressAction);
- }
+public class TexturedButtonWidget extends ImageButton
+{
+ #if POST_MC_1_17_1
+ public TexturedButtonWidget(int x, int y, int width, int height, int u, int v, ResourceLocation texture, OnPress pressAction)
+ {
+ super(x, y, width, height, u, v, texture, pressAction);
+ }
#endif
-
- public TexturedButtonWidget(int x, int y, int width, int height, int u, int v, int hoveredVOffset, ResourceLocation texture, int textureWidth, int textureHeight, OnPress pressAction) {
- super(x, y, width, height, u, v, hoveredVOffset, texture, textureWidth, textureHeight, pressAction);
- }
-
- public TexturedButtonWidget(int x, int y, int width, int height, int u, int v, int hoveredVOffset, ResourceLocation texture, int textureWidth, int textureHeight, OnPress pressAction, Component text) {
- super(x, y, width, height, u, v, hoveredVOffset, texture, textureWidth, textureHeight, pressAction, text);
- }
-
- #if PRE_MC_1_19_2
- public TexturedButtonWidget(int x, int y, int width, int height, int u, int v, int hoveredVOffset, ResourceLocation texture, int textureWidth, int textureHeight, OnPress pressAction, OnTooltip tooltipSupplier, Component text) {
- super(x, y, width, height, u, v, hoveredVOffset, texture, textureWidth, textureHeight, pressAction, tooltipSupplier, text);
- }
-
- @Override
- public void renderButton(PoseStack matrices, int mouseX, int mouseY, float delta) {
+
+ public TexturedButtonWidget(int x, int y, int width, int height, int u, int v, int hoveredVOffset, ResourceLocation texture, int textureWidth, int textureHeight, OnPress pressAction)
+ {
+ super(x, y, width, height, u, v, hoveredVOffset, texture, textureWidth, textureHeight, pressAction);
+ }
+
+ public TexturedButtonWidget(int x, int y, int width, int height, int u, int v, int hoveredVOffset, ResourceLocation texture, int textureWidth, int textureHeight, OnPress pressAction, Component text)
+ {
+ super(x, y, width, height, u, v, hoveredVOffset, texture, textureWidth, textureHeight, pressAction, text);
+ }
+
+ #if PRE_MC_1_19_2
+ public TexturedButtonWidget(int x, int y, int width, int height, int u, int v, int hoveredVOffset, ResourceLocation texture, int textureWidth, int textureHeight, OnPress pressAction, OnTooltip tooltipSupplier, Component text)
+ {
+ super(x, y, width, height, u, v, hoveredVOffset, texture, textureWidth, textureHeight, pressAction, tooltipSupplier, text);
+ }
+
+ @Override
+ public void renderButton(PoseStack matrices, int mouseX, int mouseY, float delta)
+ {
#if PRE_MC_1_17_1
Minecraft.getInstance().getTextureManager().bind(WIDGETS_LOCATION);
RenderSystem.color4f(1.0F, 1.0F, 1.0F, this.alpha);
#else
- RenderSystem.setShader(GameRenderer::getPositionTexShader);
- RenderSystem.setShaderTexture(0, WIDGETS_LOCATION);
- RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, this.alpha);
+ RenderSystem.setShader(GameRenderer::getPositionTexShader);
+ RenderSystem.setShaderTexture(0, WIDGETS_LOCATION);
+ RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, this.alpha);
#endif
- int i = this.getYImage(this.isHovered);
- RenderSystem.enableBlend();
- RenderSystem.defaultBlendFunc();
- RenderSystem.enableDepthTest();
- this.blit(matrices, this.x, this.y, 0, 46 + i * 20, this.width / 2, this.height);
- this.blit(matrices, this.x + this.width / 2, this.y, 200 - this.width / 2, 46 + i * 20, this.width / 2, this.height);
-
- super.renderButton(matrices, mouseX, mouseY, delta);
- }
+ int i = this.getYImage(this.isHovered);
+ RenderSystem.enableBlend();
+ RenderSystem.defaultBlendFunc();
+ RenderSystem.enableDepthTest();
+ this.blit(matrices, this.x, this.y, 0, 46 + i * 20, this.width / 2, this.height);
+ this.blit(matrices, this.x + this.width / 2, this.y, 200 - this.width / 2, 46 + i * 20, this.width / 2, this.height);
+
+ super.renderButton(matrices, mouseX, mouseY, delta);
+ }
#endif
}
diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/updater/ChangelogScreen.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/updater/ChangelogScreen.java
index 55a2a0a89..df2cc3dc2 100644
--- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/updater/ChangelogScreen.java
+++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/updater/ChangelogScreen.java
@@ -37,162 +37,182 @@ import java.util.*;
*/
// TODO: After finishing the config, rewrite this in openGL as well
// TODO: Make this
-public class ChangelogScreen extends DhScreen {
- private Screen parent;
- private String versionID;
- private List changelog;
- private TextArea changelogArea;
-
- public ChangelogScreen(Screen parent) {
- this(parent, null);
-
- if (!ModrinthGetter.initted) // Make sure the modrinth stuff is initted
- ModrinthGetter.init();
- if (!ModrinthGetter.initted) // If its not initted the just close the screen
- onClose();
-
- setupChangelog(ModrinthGetter.getLatestIDForVersion(SingletonInjector.INSTANCE.get(IVersionConstants.class).getMinecraftVersion()));
- }
-
- public ChangelogScreen(Screen parent, String versionID) {
- super(Translatable(ModInfo.ID + ".updater.title"));
- this.parent = parent;
- this.versionID = versionID;
-
- if (versionID != null)
- setupChangelog(versionID);
- }
-
- private void setupChangelog(String versionID) {
- this.changelog = new ArrayList<>();
-
- // Put the new version name at the very top of the change log
- this.changelog.add("§lChangelog for " + ModrinthGetter.releaseNames.get(versionID) + "§r");
- this.changelog.add("");
- this.changelog.add("");
-
- // Get the release changelog and split it by the new lines
- String[] unwrappedChangelog = // Arrays.asList could be used if a list object is desired here vs List.of which is only available for Java 9+
- new MarkdownFormatter.MinecraftFormat().convertTo( // This formats markdown to minecraft's "§" characters
- ModrinthGetter.changeLogs.get(versionID)
- ).split("\\n");
- // Makes the words wrap around to not go off the screen
- for (String str: unwrappedChangelog) {
- this.changelog.addAll(
- MarkdownFormatter.splitString(str, 75)
- );
- }
- // Debugging
+public class ChangelogScreen extends DhScreen
+{
+ private Screen parent;
+ private String versionID;
+ private List changelog;
+ private TextArea changelogArea;
+
+ public ChangelogScreen(Screen parent)
+ {
+ this(parent, null);
+
+ if (!ModrinthGetter.initted) // Make sure the modrinth stuff is initted
+ ModrinthGetter.init();
+ if (!ModrinthGetter.initted) // If its not initted the just close the screen
+ onClose();
+
+ setupChangelog(ModrinthGetter.getLatestIDForVersion(SingletonInjector.INSTANCE.get(IVersionConstants.class).getMinecraftVersion()));
+ }
+
+ public ChangelogScreen(Screen parent, String versionID)
+ {
+ super(Translatable(ModInfo.ID + ".updater.title"));
+ this.parent = parent;
+ this.versionID = versionID;
+
+ if (versionID != null)
+ setupChangelog(versionID);
+ }
+
+ private void setupChangelog(String versionID)
+ {
+ this.changelog = new ArrayList<>();
+
+ // Put the new version name at the very top of the change log
+ this.changelog.add("§lChangelog for " + ModrinthGetter.releaseNames.get(versionID) + "§r");
+ this.changelog.add("");
+ this.changelog.add("");
+
+ // Get the release changelog and split it by the new lines
+ String[] unwrappedChangelog = // Arrays.asList could be used if a list object is desired here vs List.of which is only available for Java 9+
+ new MarkdownFormatter.MinecraftFormat().convertTo( // This formats markdown to minecraft's "§" characters
+ ModrinthGetter.changeLogs.get(versionID)
+ ).split("\\n");
+ // Makes the words wrap around to not go off the screen
+ for (String str : unwrappedChangelog)
+ {
+ this.changelog.addAll(
+ MarkdownFormatter.splitString(str, 75)
+ );
+ }
+ // Debugging
// System.out.println(this.changelog);
- }
-
-
-
- @Override
- protected void init() {
- super.init();
-
-
- this.addBtn( // Close
- MakeBtn(Translatable(ModInfo.ID + ".general.back"), 5, this.height - 25, 100, 20, (btn) -> {
- this.onClose();
- })
- );
-
-
- this.changelogArea = new TextArea(this.minecraft, this.width*2, this.height, 32, this.height - 32, 10);
- for (int i = 0; i < changelog.size(); i++) {
- this.changelogArea.addButton( TextOrLiteral(changelog.get(i)));
+ }
+
+
+
+ @Override
+ protected void init()
+ {
+ super.init();
+
+
+ this.addBtn( // Close
+ MakeBtn(Translatable(ModInfo.ID + ".general.back"), 5, this.height - 25, 100, 20, (btn) -> {
+ this.onClose();
+ })
+ );
+
+
+ this.changelogArea = new TextArea(this.minecraft, this.width * 2, this.height, 32, this.height - 32, 10);
+ for (int i = 0; i < changelog.size(); i++)
+ {
+ this.changelogArea.addButton(TextOrLiteral(changelog.get(i)));
// drawString(matrices, this.font, changelog.get(i), this.width / 2 - 175, this.height / 2 - 100 + i*10, 0xFFFFFF);
- }
-
- }
-
- @Override
+ }
+
+ }
+
+ @Override
#if PRE_MC_1_20_1
- public void render(PoseStack matrices, int mouseX, int mouseY, float delta)
+ public void render(PoseStack matrices, int mouseX, int mouseY, float delta)
#else
- public void render(GuiGraphics matrices, int mouseX, int mouseY, float delta)
+ public void render(GuiGraphics matrices, int mouseX, int mouseY, float delta)
#endif
- {
- this.renderBackground(matrices); // Render background
-
- // Set the scroll position to the mouse height relative to the screen
- // This is a bit of a hack as we cannot scroll on this area
- double scrollAmount = ((double) mouseY)/((double) this.height) * 1.1 * this.changelogArea.getMaxScroll();
+ {
+ this.renderBackground(matrices); // Render background
+
+ // Set the scroll position to the mouse height relative to the screen
+ // This is a bit of a hack as we cannot scroll on this area
+ double scrollAmount = ((double) mouseY) / ((double) this.height) * 1.1 * this.changelogArea.getMaxScroll();
#if MC_1_16_5 || MC_1_17_1
- this.changelogArea.setScrollAmount(scrollAmount);
+ this.changelogArea.setScrollAmount(scrollAmount);
#else
this.changelogArea.scrollAmount = scrollAmount;
#endif
-
-
- this.changelogArea.render(matrices, mouseX, mouseY, delta); // Render the changelog
-
- super.render(matrices, mouseX, mouseY, delta); // Render the buttons
-
- DhDrawCenteredString(matrices, font, title, width / 2, 15, 0xFFFFFF); // Render title
- }
-
- @Override
- public void onClose() {
- Objects.requireNonNull(minecraft).setScreen(this.parent); // Goto the parent screen
- }
-
- public static class TextArea extends ContainerObjectSelectionList {
- Font textRenderer;
-
- public TextArea(Minecraft minecraftClient, int i, int j, int k, int l, int m) {
- super(minecraftClient, i, j, k, l, m);
- this.centerListVertically = false;
- textRenderer = minecraftClient.font;
- }
-
- public void addButton(Component text) {
- this.addEntry(ButtonEntry.create(text));
- }
-
- @Override
- public int getRowWidth() {
- return 10000;
- }
- }
-
- public static class ButtonEntry extends ContainerObjectSelectionList.Entry
- {
- private static final Font textRenderer = Minecraft.getInstance().font;
- private final Component text;
- private final List children = new ArrayList<>();
-
- private ButtonEntry(Component text) {
- this.text = text;
- }
-
- public static ButtonEntry create(Component text) {
- return new ButtonEntry(text);
- }
-
- #if PRE_MC_1_20_1
- @Override
- public void render(PoseStack matrices, int index, int y, int x, int entryWidth, int entryHeight, int mouseX, int mouseY, boolean hovered, float tickDelta) {
- GuiComponent.drawString(matrices, textRenderer, text, 12, y + 5, 0xFFFFFF);
- }
- #else
- @Override
- public void render(GuiGraphics matrices, int index, int y, int x, int entryWidth, int entryHeight, int mouseX, int mouseY, boolean hovered, float tickDelta) {
- matrices.drawString(textRenderer, text, 12, y + 5, 0xFFFFFF);
- }
+
+
+ this.changelogArea.render(matrices, mouseX, mouseY, delta); // Render the changelog
+
+ super.render(matrices, mouseX, mouseY, delta); // Render the buttons
+
+ DhDrawCenteredString(matrices, font, title, width / 2, 15, 0xFFFFFF); // Render title
+ }
+
+ @Override
+ public void onClose()
+ {
+ Objects.requireNonNull(minecraft).setScreen(this.parent); // Goto the parent screen
+ }
+
+ public static class TextArea extends ContainerObjectSelectionList
+ {
+ Font textRenderer;
+
+ public TextArea(Minecraft minecraftClient, int i, int j, int k, int l, int m)
+ {
+ super(minecraftClient, i, j, k, l, m);
+ this.centerListVertically = false;
+ textRenderer = minecraftClient.font;
+ }
+
+ public void addButton(Component text)
+ {
+ this.addEntry(ButtonEntry.create(text));
+ }
+
+ @Override
+ public int getRowWidth()
+ {
+ return 10000;
+ }
+
+ }
+
+ public static class ButtonEntry extends ContainerObjectSelectionList.Entry
+ {
+ private static final Font textRenderer = Minecraft.getInstance().font;
+ private final Component text;
+ private final List children = new ArrayList<>();
+
+ private ButtonEntry(Component text)
+ {
+ this.text = text;
+ }
+
+ public static ButtonEntry create(Component text)
+ {
+ return new ButtonEntry(text);
+ }
+
+ #if PRE_MC_1_20_1
+ @Override
+ public void render(PoseStack matrices, int index, int y, int x, int entryWidth, int entryHeight, int mouseX, int mouseY, boolean hovered, float tickDelta)
+ {
+ GuiComponent.drawString(matrices, textRenderer, text, 12, y + 5, 0xFFFFFF);
+ }
+ #else
+ @Override
+ public void render(GuiGraphics matrices, int index, int y, int x, int entryWidth, int entryHeight, int mouseX, int mouseY, boolean hovered, float tickDelta)
+ {
+ matrices.drawString(textRenderer, text, 12, y + 5, 0xFFFFFF);
+ }
#endif
-
- @Override
- public List children() {
- return children;
- }
+
+ @Override
+ public List children()
+ {
+ return children;
+ }
#if POST_MC_1_17_1
- @Override
- public List narratables() {
- return children;
- }
+ @Override
+ public List narratables()
+ {
+ return children;
+ }
#endif
- }
+ }
+
}
\ No newline at end of file
diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/updater/UpdateModScreen.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/updater/UpdateModScreen.java
index 2807db2fe..a212ca583 100644
--- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/updater/UpdateModScreen.java
+++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/updater/UpdateModScreen.java
@@ -29,116 +29,126 @@ import java.util.*;
*/
// TODO: After finishing the config, rewrite this in openGL as well
// and also maybe add this suggestion https://discord.com/channels/881614130614767666/1035863487110467625/1035949054485594192
-public class UpdateModScreen extends DhScreen {
- private Screen parent;
- private String newVersionID;
-
-
- public UpdateModScreen(Screen parent, String newVersionID) {
- super(Translatable(ModInfo.ID + ".updater.title"));
- this.parent = parent;
- this.newVersionID = newVersionID;
- }
-
- @Override
- protected void init() {
- super.init();
-
-
- try {
- // We cannot get assets from the root of the mod so we use this hack
- // TODO: Load the icon.png and logo.png in the mod initialise rather than here
- ResourceLocation logoLocation = new ResourceLocation(ModInfo.ID, "logo.png");
- Minecraft.getInstance().getTextureManager().register(
- logoLocation,
- new DynamicTexture(NativeImage.read(JarUtils.accessFile("logo.png")))
- );
-
-
- // Logo image
- this.addBtn(new ImageButton(
- // Where the button is on the screen
- this.width / 2 - 65, this.height / 2 - 110,
- // Width and height of the button
- 130, 65,
- // Offset
- 0, 0,
- // Some textuary stuff
- 0, logoLocation, 130, 65,
- // Create the button and tell it where to go
- // For now it goes to the client option by default
- (buttonWidget) -> System.out.println("Nice, you found an easter egg :)"), // TODO: Add a proper easter egg to pressing the logo (maybe with confetti)
- // Add a title to the button
- Translatable(ModInfo.ID + ".updater.title")
- ));
- } catch (Exception e) { e.printStackTrace(); }
-
-
- this.addBtn(new TexturedButtonWidget(
- // Where the button is on the screen
- this.width / 2 - 97, this.height / 2 + 8,
- // Width and height of the button
- 20, 20,
- // Offset
- 0, 0,
- // Some textuary stuff
- 0, new ResourceLocation(ModInfo.ID, "textures/gui/changelog.png"), 20, 20,
- // Create the button and tell it where to go
- (buttonWidget) -> Objects.requireNonNull(minecraft).setScreen(new ChangelogScreen(this, this.newVersionID)), // TODO: Add a proper easter egg to pressing the logo (maybe with confetti)
- // Add a title to the button
- Translatable(ModInfo.ID + ".updater.title")
- ));
-
-
- this.addBtn( // Update
- MakeBtn(Translatable(ModInfo.ID + ".updater.update"), this.width / 2 - 75, this.height / 2 + 8, 150, 20, (btn) -> {
- SelfUpdater.updateMod();
- this.onClose();
- })
- );
- this.addBtn( // Silent update
- MakeBtn(Translatable(ModInfo.ID + ".updater.silent"), this.width / 2 - 75, this.height / 2 + 30, 150, 20, (btn) -> {
- Config.Client.Advanced.AutoUpdater.enableSilentUpdates.set(true);
- SelfUpdater.updateMod();
- this.onClose();
- })
- );
- this.addBtn( // Later (not now)
- MakeBtn(Translatable(ModInfo.ID + ".updater.later"), this.width / 2 + 2, this.height / 2 + 70, 100, 20, (btn) -> {
- this.onClose();
- })
- );
- this.addBtn( // Never
- MakeBtn(Translatable(ModInfo.ID + ".updater.never"), this.width / 2 - 102, this.height / 2 + 70, 100, 20, (btn) -> {
- Config.Client.Advanced.AutoUpdater.enableAutoUpdater.set(false);
- this.onClose();
- })
- );
-
- }
-
- @Override
+public class UpdateModScreen extends DhScreen
+{
+ private Screen parent;
+ private String newVersionID;
+
+
+ public UpdateModScreen(Screen parent, String newVersionID)
+ {
+ super(Translatable(ModInfo.ID + ".updater.title"));
+ this.parent = parent;
+ this.newVersionID = newVersionID;
+ }
+
+ @Override
+ protected void init()
+ {
+ super.init();
+
+
+ try
+ {
+ // We cannot get assets from the root of the mod so we use this hack
+ // TODO: Load the icon.png and logo.png in the mod initialise rather than here
+ ResourceLocation logoLocation = new ResourceLocation(ModInfo.ID, "logo.png");
+ Minecraft.getInstance().getTextureManager().register(
+ logoLocation,
+ new DynamicTexture(NativeImage.read(JarUtils.accessFile("logo.png")))
+ );
+
+
+ // Logo image
+ this.addBtn(new ImageButton(
+ // Where the button is on the screen
+ this.width / 2 - 65, this.height / 2 - 110,
+ // Width and height of the button
+ 130, 65,
+ // Offset
+ 0, 0,
+ // Some textuary stuff
+ 0, logoLocation, 130, 65,
+ // Create the button and tell it where to go
+ // For now it goes to the client option by default
+ (buttonWidget) -> System.out.println("Nice, you found an easter egg :)"), // TODO: Add a proper easter egg to pressing the logo (maybe with confetti)
+ // Add a title to the button
+ Translatable(ModInfo.ID + ".updater.title")
+ ));
+ }
+ catch (Exception e)
+ {
+ e.printStackTrace();
+ }
+
+
+ this.addBtn(new TexturedButtonWidget(
+ // Where the button is on the screen
+ this.width / 2 - 97, this.height / 2 + 8,
+ // Width and height of the button
+ 20, 20,
+ // Offset
+ 0, 0,
+ // Some textuary stuff
+ 0, new ResourceLocation(ModInfo.ID, "textures/gui/changelog.png"), 20, 20,
+ // Create the button and tell it where to go
+ (buttonWidget) -> Objects.requireNonNull(minecraft).setScreen(new ChangelogScreen(this, this.newVersionID)), // TODO: Add a proper easter egg to pressing the logo (maybe with confetti)
+ // Add a title to the button
+ Translatable(ModInfo.ID + ".updater.title")
+ ));
+
+
+ this.addBtn( // Update
+ MakeBtn(Translatable(ModInfo.ID + ".updater.update"), this.width / 2 - 75, this.height / 2 + 8, 150, 20, (btn) -> {
+ SelfUpdater.updateMod();
+ this.onClose();
+ })
+ );
+ this.addBtn( // Silent update
+ MakeBtn(Translatable(ModInfo.ID + ".updater.silent"), this.width / 2 - 75, this.height / 2 + 30, 150, 20, (btn) -> {
+ Config.Client.Advanced.AutoUpdater.enableSilentUpdates.set(true);
+ SelfUpdater.updateMod();
+ this.onClose();
+ })
+ );
+ this.addBtn( // Later (not now)
+ MakeBtn(Translatable(ModInfo.ID + ".updater.later"), this.width / 2 + 2, this.height / 2 + 70, 100, 20, (btn) -> {
+ this.onClose();
+ })
+ );
+ this.addBtn( // Never
+ MakeBtn(Translatable(ModInfo.ID + ".updater.never"), this.width / 2 - 102, this.height / 2 + 70, 100, 20, (btn) -> {
+ Config.Client.Advanced.AutoUpdater.enableAutoUpdater.set(false);
+ this.onClose();
+ })
+ );
+
+ }
+
+ @Override
#if PRE_MC_1_20_1
- public void render(PoseStack matrices, int mouseX, int mouseY, float delta)
+ public void render(PoseStack matrices, int mouseX, int mouseY, float delta)
#else
- public void render(GuiGraphics matrices, int mouseX, int mouseY, float delta)
+ public void render(GuiGraphics matrices, int mouseX, int mouseY, float delta)
#endif
- {
- this.renderBackground(matrices); // Render background
-
-
- // Render the text's
- DhDrawCenteredString(matrices, this.font, Translatable(ModInfo.ID + ".updater.text1"), this.width / 2, this.height / 2 - 35, 0xFFFFFF);
- DhDrawCenteredString(matrices, this.font, Translatable(ModInfo.ID + ".updater.text2", ModInfo.VERSION, ModrinthGetter.releaseNames.get(this.newVersionID)), this.width / 2, this.height / 2 -20, 0x52FD52);
-
- // TODO: add the tooltips for the buttons
- super.render(matrices, mouseX, mouseY, delta); // Render the buttons
-
- // TODO: Add tooltips
- }
-
- @Override
- public void onClose() {
- Objects.requireNonNull(minecraft).setScreen(this.parent); // Goto the parent screen
- }
+ {
+ this.renderBackground(matrices); // Render background
+
+
+ // Render the text's
+ DhDrawCenteredString(matrices, this.font, Translatable(ModInfo.ID + ".updater.text1"), this.width / 2, this.height / 2 - 35, 0xFFFFFF);
+ DhDrawCenteredString(matrices, this.font, Translatable(ModInfo.ID + ".updater.text2", ModInfo.VERSION, ModrinthGetter.releaseNames.get(this.newVersionID)), this.width / 2, this.height / 2 - 20, 0x52FD52);
+
+ // TODO: add the tooltips for the buttons
+ super.render(matrices, mouseX, mouseY, delta); // Render the buttons
+
+ // TODO: Add tooltips
+ }
+
+ @Override
+ public void onClose()
+ {
+ Objects.requireNonNull(minecraft).setScreen(this.parent); // Goto the parent screen
+ }
+
}
\ No newline at end of file
diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/minecraft/MinecraftClientWrapper.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/minecraft/MinecraftClientWrapper.java
index d6e21be3f..9e3345e9b 100644
--- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/minecraft/MinecraftClientWrapper.java
+++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/minecraft/MinecraftClientWrapper.java
@@ -63,243 +63,246 @@ import org.jetbrains.annotations.Nullable;
//@Environment(EnvType.CLIENT)
public class MinecraftClientWrapper implements IMinecraftClientWrapper, IMinecraftSharedWrapper
{
- private static final Logger LOGGER = DhLoggerBuilder.getLogger(MethodHandles.lookup().lookupClass().getSimpleName());
-
- public static final MinecraftClientWrapper INSTANCE = new MinecraftClientWrapper();
-
- public final Minecraft mc = Minecraft.getInstance();
-
- /**
- * The lightmap for the current:
- * Time, dimension, brightness setting, etc.
- */
- private NativeImage lightMap = null;
-
- private ProfilerWrapper profilerWrapper;
-
-
- private MinecraftClientWrapper()
- {
-
- }
-
-
-
- //================//
- // helper methods //
- //================//
-
- /**
- * This should be called at the beginning of every frame to
- * clear any Minecraft data that becomes out of date after a frame.
- *
- * LightMaps and other time sensitive objects fall in this category.
- *
- * This doesn't affect OpenGL objects in any way.
- */
- @Override
- public void clearFrameObjectCache()
- {
- lightMap = null;
- }
-
-
-
- //=================//
- // method wrappers //
- //=================//
+ private static final Logger LOGGER = DhLoggerBuilder.getLogger(MethodHandles.lookup().lookupClass().getSimpleName());
- @Override
- public float getShade(EDhDirection lodDirection)
- {
- ELodShading lodShading = Config.Client.Advanced.Graphics.AdvancedGraphics.lodShading.get();
- switch (lodShading)
- {
- default:
- case MINECRAFT:
- if (this.mc.level != null)
- {
- Direction mcDir = McObjectConverter.Convert(lodDirection);
- return this.mc.level.getShade(mcDir, true);
- }
- else
- {
- return 0.0f;
- }
-
- case OLD_LIGHTING:
- switch (lodDirection)
- {
- case DOWN:
- return 0.5F;
- default:
- case UP:
- return 1.0F;
- case NORTH:
- case SOUTH:
- return 0.8F;
- case WEST:
- case EAST:
- return 0.6F;
- }
-
- case NONE:
- return 1.0F;
- }
- }
+ public static final MinecraftClientWrapper INSTANCE = new MinecraftClientWrapper();
- @Override
- public boolean hasSinglePlayerServer() { return mc.hasSingleplayerServer(); }
- @Override
- public boolean clientConnectedToDedicatedServer() { return mc.getCurrentServer() != null && !this.hasSinglePlayerServer(); }
-
- @Override
- public String getCurrentServerName() { return mc.getCurrentServer().name; }
-
- @Override
- public String getCurrentServerIp() { return mc.getCurrentServer().ip; }
-
- @Override
- public String getCurrentServerVersion()
- {
- return mc.getCurrentServer().version.getString();
- }
-
- //=============//
- // Simple gets //
- //=============//
-
- public LocalPlayer getPlayer()
- {
- return mc.player;
- }
-
- @Override
- public boolean playerExists()
- {
- return mc.player != null;
- }
-
- @Override
- public UUID getPlayerUUID() {
- return getPlayer().getUUID();
- }
-
- @Override
- public DhBlockPos getPlayerBlockPos()
- {
- BlockPos playerPos = getPlayer().blockPosition();
- return new DhBlockPos(playerPos.getX(), playerPos.getY(), playerPos.getZ());
- }
-
- @Override
- public DhChunkPos getPlayerChunkPos()
- {
+ public final Minecraft mc = Minecraft.getInstance();
+
+ /**
+ * The lightmap for the current:
+ * Time, dimension, brightness setting, etc.
+ */
+ private NativeImage lightMap = null;
+
+ private ProfilerWrapper profilerWrapper;
+
+
+ private MinecraftClientWrapper()
+ {
+
+ }
+
+
+
+ //================//
+ // helper methods //
+ //================//
+
+ /**
+ * This should be called at the beginning of every frame to
+ * clear any Minecraft data that becomes out of date after a frame.
+ *
+ * LightMaps and other time sensitive objects fall in this category.
+ *
+ * This doesn't affect OpenGL objects in any way.
+ */
+ @Override
+ public void clearFrameObjectCache()
+ {
+ lightMap = null;
+ }
+
+
+
+ //=================//
+ // method wrappers //
+ //=================//
+
+ @Override
+ public float getShade(EDhDirection lodDirection)
+ {
+ ELodShading lodShading = Config.Client.Advanced.Graphics.AdvancedGraphics.lodShading.get();
+ switch (lodShading)
+ {
+ default:
+ case MINECRAFT:
+ if (this.mc.level != null)
+ {
+ Direction mcDir = McObjectConverter.Convert(lodDirection);
+ return this.mc.level.getShade(mcDir, true);
+ }
+ else
+ {
+ return 0.0f;
+ }
+
+ case OLD_LIGHTING:
+ switch (lodDirection)
+ {
+ case DOWN:
+ return 0.5F;
+ default:
+ case UP:
+ return 1.0F;
+ case NORTH:
+ case SOUTH:
+ return 0.8F;
+ case WEST:
+ case EAST:
+ return 0.6F;
+ }
+
+ case NONE:
+ return 1.0F;
+ }
+ }
+
+ @Override
+ public boolean hasSinglePlayerServer() { return mc.hasSingleplayerServer(); }
+ @Override
+ public boolean clientConnectedToDedicatedServer() { return mc.getCurrentServer() != null && !this.hasSinglePlayerServer(); }
+
+ @Override
+ public String getCurrentServerName() { return mc.getCurrentServer().name; }
+
+ @Override
+ public String getCurrentServerIp() { return mc.getCurrentServer().ip; }
+
+ @Override
+ public String getCurrentServerVersion()
+ {
+ return mc.getCurrentServer().version.getString();
+ }
+
+ //=============//
+ // Simple gets //
+ //=============//
+
+ public LocalPlayer getPlayer()
+ {
+ return mc.player;
+ }
+
+ @Override
+ public boolean playerExists()
+ {
+ return mc.player != null;
+ }
+
+ @Override
+ public UUID getPlayerUUID()
+ {
+ return getPlayer().getUUID();
+ }
+
+ @Override
+ public DhBlockPos getPlayerBlockPos()
+ {
+ BlockPos playerPos = getPlayer().blockPosition();
+ return new DhBlockPos(playerPos.getX(), playerPos.getY(), playerPos.getZ());
+ }
+
+ @Override
+ public DhChunkPos getPlayerChunkPos()
+ {
#if PRE_MC_1_17_1
ChunkPos playerPos = new ChunkPos(getPlayer().blockPosition());
#else
- ChunkPos playerPos = getPlayer().chunkPosition();
+ ChunkPos playerPos = getPlayer().chunkPosition();
#endif
- return new DhChunkPos(playerPos.x, playerPos.z);
- }
-
- public ModelManager getModelManager()
- {
- return mc.getModelManager();
- }
-
- @Nullable
- @Override
- public ILevelWrapper getWrappedClientWorld()
- {
+ return new DhChunkPos(playerPos.x, playerPos.z);
+ }
+
+ public ModelManager getModelManager()
+ {
+ return mc.getModelManager();
+ }
+
+ @Nullable
+ @Override
+ public ILevelWrapper getWrappedClientWorld()
+ {
if (mc.level == null)
{
return null;
}
- return ClientLevelWrapper.getWrapperIgnoringOverride(this.mc.level);
- }
-
- /** Please move over to getInstallationDirectory() */
- @Deprecated
- @Override
- public File getGameDirectory()
- {
- return getInstallationDirectory();
- }
-
- @Override
- public IProfilerWrapper getProfiler()
- {
- if (profilerWrapper == null)
- profilerWrapper = new ProfilerWrapper(mc.getProfiler());
- else if (mc.getProfiler() != profilerWrapper.profiler)
- profilerWrapper.profiler = mc.getProfiler();
- return profilerWrapper;
- }
-
- /** Returns all worlds available to the server */
- @Override
- public ArrayList getAllServerWorlds()
- {
- ArrayList worlds = new ArrayList();
-
- Iterable serverWorlds = mc.getSingleplayerServer().getAllLevels();
- for (ServerLevel world : serverWorlds)
- {
- worlds.add(ServerLevelWrapper.getWrapper(world));
- }
-
- return worlds;
- }
-
-
-
- @Override
- public void sendChatMessage(String string)
- {
- LocalPlayer p = getPlayer();
- if (p == null) return;
+ return ClientLevelWrapper.getWrapperIgnoringOverride(this.mc.level);
+ }
+
+ /** Please move over to getInstallationDirectory() */
+ @Deprecated
+ @Override
+ public File getGameDirectory()
+ {
+ return getInstallationDirectory();
+ }
+
+ @Override
+ public IProfilerWrapper getProfiler()
+ {
+ if (profilerWrapper == null)
+ profilerWrapper = new ProfilerWrapper(mc.getProfiler());
+ else if (mc.getProfiler() != profilerWrapper.profiler)
+ profilerWrapper.profiler = mc.getProfiler();
+ return profilerWrapper;
+ }
+
+ /** Returns all worlds available to the server */
+ @Override
+ public ArrayList getAllServerWorlds()
+ {
+ ArrayList worlds = new ArrayList();
+
+ Iterable serverWorlds = mc.getSingleplayerServer().getAllLevels();
+ for (ServerLevel world : serverWorlds)
+ {
+ worlds.add(ServerLevelWrapper.getWrapper(world));
+ }
+
+ return worlds;
+ }
+
+
+
+ @Override
+ public void sendChatMessage(String string)
+ {
+ LocalPlayer p = getPlayer();
+ if (p == null) return;
#if PRE_MC_1_19_2
- p.sendMessage(new TextComponent(string), getPlayer().getUUID());
+ p.sendMessage(new TextComponent(string), getPlayer().getUUID());
#else
- p.sendSystemMessage(net.minecraft.network.chat.Component.translatable(string));
+ p.sendSystemMessage(net.minecraft.network.chat.Component.translatable(string));
#endif
- }
-
- /**
- * Crashes Minecraft, displaying the given errorMessage
- * In the following format:
- *
- * The game crashed whilst errorMessage
- * Error: ExceptionClass: exceptionErrorMessage
- * Exit Code: -1
- */
- @Override
- public void crashMinecraft(String errorMessage, Throwable exception)
- {
- LOGGER.error(ModInfo.READABLE_NAME + " had the following error: [" + errorMessage + "]. Crashing Minecraft...", exception);
- CrashReport report = new CrashReport(errorMessage, exception);
- Minecraft.crash(report);
- }
-
- @Override
- public Object getOptionsObject()
- {
- return mc.options;
- }
-
- @Override
- public boolean isDedicatedServer() {
- return false;
- }
-
- @Override
- public File getInstallationDirectory() {
- return mc.gameDirectory;
- }
-
- @Override
- public void executeOnRenderThread(Runnable runnable) { this.mc.execute(runnable); }
+ }
+
+ /**
+ * Crashes Minecraft, displaying the given errorMessage
+ * In the following format:
+ *
+ * The game crashed whilst errorMessage
+ * Error: ExceptionClass: exceptionErrorMessage
+ * Exit Code: -1
+ */
+ @Override
+ public void crashMinecraft(String errorMessage, Throwable exception)
+ {
+ LOGGER.error(ModInfo.READABLE_NAME + " had the following error: [" + errorMessage + "]. Crashing Minecraft...", exception);
+ CrashReport report = new CrashReport(errorMessage, exception);
+ Minecraft.crash(report);
+ }
+
+ @Override
+ public Object getOptionsObject()
+ {
+ return mc.options;
+ }
+
+ @Override
+ public boolean isDedicatedServer()
+ {
+ return false;
+ }
+
+ @Override
+ public File getInstallationDirectory()
+ {
+ return mc.gameDirectory;
+ }
+
+ @Override
+ public void executeOnRenderThread(Runnable runnable) { this.mc.execute(runnable); }
}
diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/minecraft/MinecraftDedicatedServerWrapper.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/minecraft/MinecraftDedicatedServerWrapper.java
index cb46b0d16..af701e598 100644
--- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/minecraft/MinecraftDedicatedServerWrapper.java
+++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/minecraft/MinecraftDedicatedServerWrapper.java
@@ -6,18 +6,22 @@ import net.minecraft.server.dedicated.DedicatedServer;
import java.io.File;
//@Environment(EnvType.SERVER)
-public class MinecraftDedicatedServerWrapper implements IMinecraftSharedWrapper {
- public static final MinecraftDedicatedServerWrapper INSTANCE = new MinecraftDedicatedServerWrapper();
- private MinecraftDedicatedServerWrapper() {}
- public DedicatedServer dedicatedServer = null;
- @Override
- public boolean isDedicatedServer() {
- return true;
- }
- @Override
- public File getInstallationDirectory() {
- if (dedicatedServer == null)
- throw new IllegalStateException("Trying to get Installation Direction before Dedicated server complete initialization!");
- return dedicatedServer.getServerDirectory();
- }
+public class MinecraftDedicatedServerWrapper implements IMinecraftSharedWrapper
+{
+ public static final MinecraftDedicatedServerWrapper INSTANCE = new MinecraftDedicatedServerWrapper();
+ private MinecraftDedicatedServerWrapper() { }
+ public DedicatedServer dedicatedServer = null;
+ @Override
+ public boolean isDedicatedServer()
+ {
+ return true;
+ }
+ @Override
+ public File getInstallationDirectory()
+ {
+ if (dedicatedServer == null)
+ throw new IllegalStateException("Trying to get Installation Direction before Dedicated server complete initialization!");
+ return dedicatedServer.getServerDirectory();
+ }
+
}
diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/minecraft/MinecraftRenderWrapper.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/minecraft/MinecraftRenderWrapper.java
index c74c6c524..1a10e6ef2 100644
--- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/minecraft/MinecraftRenderWrapper.java
+++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/minecraft/MinecraftRenderWrapper.java
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU Lesser General Public License
* along with this program. If not, see .
*/
-
+
package com.seibel.distanthorizons.common.wrappers.minecraft;
import java.awt.Color;
@@ -87,11 +87,11 @@ public class MinecraftRenderWrapper implements IMinecraftRenderWrapper
private static final Logger LOGGER = DhLoggerBuilder.getLogger(MethodHandles.lookup().lookupClass().getSimpleName());
private static final Minecraft MC = Minecraft.getInstance();
private static final IWrapperFactory FACTORY = WrapperFactory.INSTANCE;
-
+
private static final IOptifineAccessor OPTIFINE_ACCESSOR = ModAccessorInjector.INSTANCE.get(IOptifineAccessor.class);
public LightMapWrapper lightmap = null;
-
+
@Override
@@ -146,7 +146,8 @@ public class MinecraftRenderWrapper implements IMinecraftRenderWrapper
}
@Override
- public Color getFogColor(float partialTicks) {
+ public Color getFogColor(float partialTicks)
+ {
#if PRE_MC_1_17_1
float[] colorValues = new float[4];
GL15.glGetFloatv(GL15.GL_FOG_COLOR, colorValues);
@@ -164,15 +165,18 @@ public class MinecraftRenderWrapper implements IMinecraftRenderWrapper
// getSpecialFogColor() is the same as getFogColor()
@Override
- public Color getSkyColor() {
- if (MC.level.dimensionType().hasSkyLight()) {
+ public Color getSkyColor()
+ {
+ if (MC.level.dimensionType().hasSkyLight())
+ {
#if PRE_MC_1_17_1
Vec3 colorValues = MC.level.getSkyColor(MC.gameRenderer.getMainCamera().getBlockPosition(), MC.getFrameTime());
#else
Vec3 colorValues = MC.level.getSkyColor(MC.gameRenderer.getMainCamera().getPosition(), MC.getFrameTime());
#endif
return new Color((float) colorValues.x, (float) colorValues.y, (float) colorValues.z);
- } else
+ }
+ else
return new Color(0, 0, 0);
}
@@ -229,58 +233,68 @@ public class MinecraftRenderWrapper implements IMinecraftRenderWrapper
return height;
}
- private RenderTarget getRenderTarget() {
- RenderTarget r = null; //MC.levelRenderer.getCloudsTarget();
- return r!=null ? r : MC.getMainRenderTarget();
- }
-
- @Override
- public int getTargetFrameBuffer() {
- return getRenderTarget().frameBufferId;
- }
-
+ private RenderTarget getRenderTarget()
+ {
+ RenderTarget r = null; //MC.levelRenderer.getCloudsTarget();
+ return r != null ? r : MC.getMainRenderTarget();
+ }
+
@Override
- public int getDepthTextureId() {
+ public int getTargetFrameBuffer()
+ {
+ return getRenderTarget().frameBufferId;
+ }
+
+ @Override
+ public int getDepthTextureId()
+ {
return getRenderTarget().getDepthTextureId();
}
-
+
@Override
- public int getTargetFrameBufferViewportWidth() {
- return getRenderTarget().viewWidth;
- }
-
- @Override
- public int getTargetFrameBufferViewportHeight() {
- return getRenderTarget().viewHeight;
- }
-
+ public int getTargetFrameBufferViewportWidth()
+ {
+ return getRenderTarget().viewWidth;
+ }
+
+ @Override
+ public int getTargetFrameBufferViewportHeight()
+ {
+ return getRenderTarget().viewHeight;
+ }
+
/**
* This method returns the ChunkPos of all chunks that Minecraft
* is going to render this frame.
*
*/
- public boolean usingBackupGetVanillaRenderedChunks = false;
+ public boolean usingBackupGetVanillaRenderedChunks = false;
@Override
- public HashSet getVanillaRenderedChunks() {
+ public HashSet getVanillaRenderedChunks()
+ {
ISodiumAccessor sodium = ModAccessorInjector.INSTANCE.get(ISodiumAccessor.class);
- if (sodium != null) {
+ if (sodium != null)
+ {
return sodium.getNormalRenderedChunks();
}
IOptifineAccessor optifine = ModAccessorInjector.INSTANCE.get(IOptifineAccessor.class);
- if (optifine != null) {
+ if (optifine != null)
+ {
HashSet pos = optifine.getNormalRenderedChunks();
if (pos == null)
pos = getMaximumRenderedChunks();
return pos;
}
- if (!usingBackupGetVanillaRenderedChunks) {
- try {
+ if (!usingBackupGetVanillaRenderedChunks)
+ {
+ try
+ {
LevelRenderer levelRenderer = MC.levelRenderer;
Collection chunks =
#if PRE_MC_1_18_2 levelRenderer.renderChunks;
#else levelRenderer.renderChunkStorage.get().renderChunks; #endif
-
+
return (chunks.stream().map((chunk) -> {
AABB chunkBoundingBox =
#if PRE_MC_1_18_2 chunk.chunk.bb;
@@ -288,14 +302,19 @@ public class MinecraftRenderWrapper implements IMinecraftRenderWrapper
return new DhChunkPos(Math.floorDiv((int) chunkBoundingBox.minX, 16),
Math.floorDiv((int) chunkBoundingBox.minZ, 16));
}).collect(Collectors.toCollection(HashSet::new)));
- } catch (LinkageError e) {
- try {
+ }
+ catch (LinkageError e)
+ {
+ try
+ {
MinecraftClientWrapper.INSTANCE.sendChatMessage(
"\u00A7e\u00A7l\u00A7uWARNING: Distant Horizons: getVanillaRenderedChunks method failed."
+ " Using Backup Method.");
MinecraftClientWrapper.INSTANCE.sendChatMessage(
"\u00A7eOverdraw prevention will be worse than normal.");
- } catch (Exception e2) {
+ }
+ catch (Exception e2)
+ {
}
LOGGER.error("getVanillaRenderedChunks Error: ", e);
usingBackupGetVanillaRenderedChunks = true;
@@ -303,14 +322,16 @@ public class MinecraftRenderWrapper implements IMinecraftRenderWrapper
}
return getMaximumRenderedChunks();
}
-
+
@Override
- public ILightMapWrapper getLightmapWrapper() {
+ public ILightMapWrapper getLightmapWrapper()
+ {
return lightmap;
}
@Override
- public boolean isFogStateSpecial() {
+ public boolean isFogStateSpecial()
+ {
#if PRE_MC_1_17_1
Camera camera = Minecraft.getInstance().gameRenderer.getMainCamera();
FluidState fluidState = camera.getFluidInCamera();
@@ -321,15 +342,18 @@ public class MinecraftRenderWrapper implements IMinecraftRenderWrapper
return isUnderWater;
#else
Entity entity = MC.gameRenderer.getMainCamera().getEntity();
- boolean isBlind = (entity instanceof LivingEntity) && ((LivingEntity)entity).hasEffect(MobEffects.BLINDNESS);
+ boolean isBlind = (entity instanceof LivingEntity) && ((LivingEntity) entity).hasEffect(MobEffects.BLINDNESS);
return MC.gameRenderer.getMainCamera().getFluidInCamera() != FogType.NONE || isBlind;
#endif
}
- public void updateLightmap(NativeImage lightPixels) {
- if (lightmap== null) {
+ public void updateLightmap(NativeImage lightPixels)
+ {
+ if (lightmap == null)
+ {
lightmap = new LightMapWrapper();
}
lightmap.uploadLightmap(lightPixels);
- }
+ }
+
}
diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/minecraft/ProfilerWrapper.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/minecraft/ProfilerWrapper.java
index caae34b3f..ec8118437 100644
--- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/minecraft/ProfilerWrapper.java
+++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/minecraft/ProfilerWrapper.java
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU Lesser General Public License
* along with this program. If not, see .
*/
-
+
package com.seibel.distanthorizons.common.wrappers.minecraft;
import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IProfilerWrapper;
@@ -29,32 +29,33 @@ import net.minecraft.util.profiling.ProfilerFiller;
*/
public class ProfilerWrapper implements IProfilerWrapper
{
- public ProfilerFiller profiler;
-
- public ProfilerWrapper(ProfilerFiller newProfiler)
- {
- profiler = newProfiler;
- }
-
-
- /** starts a new section inside the currently running section */
- @Override
- public void push(String newSection)
- {
- profiler.push(newSection);
- }
-
- /** ends the currently running section and starts a new one */
- @Override
- public void popPush(String newSection)
- {
- profiler.popPush(newSection);
- }
-
- /** ends the currently running section */
- @Override
- public void pop()
- {
- profiler.pop();
- }
+ public ProfilerFiller profiler;
+
+ public ProfilerWrapper(ProfilerFiller newProfiler)
+ {
+ profiler = newProfiler;
+ }
+
+
+ /** starts a new section inside the currently running section */
+ @Override
+ public void push(String newSection)
+ {
+ profiler.push(newSection);
+ }
+
+ /** ends the currently running section and starts a new one */
+ @Override
+ public void popPush(String newSection)
+ {
+ profiler.popPush(newSection);
+ }
+
+ /** ends the currently running section */
+ @Override
+ public void pop()
+ {
+ profiler.pop();
+ }
+
}
diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/misc/LightMapWrapper.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/misc/LightMapWrapper.java
index e66e46211..b49026bf2 100644
--- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/misc/LightMapWrapper.java
+++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/misc/LightMapWrapper.java
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU Lesser General Public License
* along with this program. If not, see .
*/
-
+
package com.seibel.distanthorizons.common.wrappers.misc;
import com.mojang.blaze3d.platform.NativeImage;
@@ -31,39 +31,43 @@ import java.nio.ByteBuffer;
*/
public class LightMapWrapper implements ILightMapWrapper
{
- private int textureId = 0;
-
- public LightMapWrapper()
- {
- }
-
- private void createLightmap(NativeImage image)
- {
- textureId = GL32.glGenTextures();
- GL32.glBindTexture(GL32.GL_TEXTURE_2D, textureId);
- GL32.glTexImage2D(GL32.GL_TEXTURE_2D, 0, image.format().glFormat(), image.getWidth(), image.getHeight(),
- 0, image.format().glFormat(), GL32.GL_UNSIGNED_BYTE, (ByteBuffer) null);
- }
-
- public void uploadLightmap(NativeImage image)
- {
- int currentBind = GL32.glGetInteger(GL32.GL_TEXTURE_BINDING_2D);
- GL32.glBindTexture(GL32.GL_TEXTURE_2D, textureId);
- if (textureId == 0) {
- createLightmap(image);
- }
- // NativeImage::upload(int levelOfDetail, int xOffset, int yOffset, bool shouldCleanup?)
- image.upload(0, 0, 0, false);
- GL32.glBindTexture(GL32.GL_TEXTURE_2D, currentBind);
- }
-
- @Override
- public void bind() {
- GL32.glBindTexture(GL32.GL_TEXTURE_2D, textureId);
- }
-
- @Override
- public void unbind() {
- GL32.glBindTexture(GL32.GL_TEXTURE_2D, 0);
- }
+ private int textureId = 0;
+
+ public LightMapWrapper()
+ {
+ }
+
+ private void createLightmap(NativeImage image)
+ {
+ textureId = GL32.glGenTextures();
+ GL32.glBindTexture(GL32.GL_TEXTURE_2D, textureId);
+ GL32.glTexImage2D(GL32.GL_TEXTURE_2D, 0, image.format().glFormat(), image.getWidth(), image.getHeight(),
+ 0, image.format().glFormat(), GL32.GL_UNSIGNED_BYTE, (ByteBuffer) null);
+ }
+
+ public void uploadLightmap(NativeImage image)
+ {
+ int currentBind = GL32.glGetInteger(GL32.GL_TEXTURE_BINDING_2D);
+ GL32.glBindTexture(GL32.GL_TEXTURE_2D, textureId);
+ if (textureId == 0)
+ {
+ createLightmap(image);
+ }
+ // NativeImage::upload(int levelOfDetail, int xOffset, int yOffset, bool shouldCleanup?)
+ image.upload(0, 0, 0, false);
+ GL32.glBindTexture(GL32.GL_TEXTURE_2D, currentBind);
+ }
+
+ @Override
+ public void bind()
+ {
+ GL32.glBindTexture(GL32.GL_TEXTURE_2D, textureId);
+ }
+
+ @Override
+ public void unbind()
+ {
+ GL32.glBindTexture(GL32.GL_TEXTURE_2D, 0);
+ }
+
}
diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/misc/ServerPlayerWrapper.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/misc/ServerPlayerWrapper.java
index 395aaacdd..b327c32a4 100644
--- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/misc/ServerPlayerWrapper.java
+++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/misc/ServerPlayerWrapper.java
@@ -9,40 +9,46 @@ import net.minecraft.server.level.ServerPlayer;
import java.util.UUID;
import java.util.concurrent.ConcurrentMap;
-public class ServerPlayerWrapper implements IServerPlayerWrapper {
- private static final ConcurrentMap
- serverPlayerWrapperMap = new MapMaker().weakKeys().makeMap();
-
- private final ServerPlayer serverPlayer;
-
- public static ServerPlayerWrapper getWrapper(ServerPlayer serverPlayer)
- {
- return serverPlayerWrapperMap.computeIfAbsent(serverPlayer, ServerPlayerWrapper::new);
- }
-
- private ServerPlayerWrapper(ServerPlayer serverPlayer) {
- this.serverPlayer = serverPlayer;
- }
-
- public UUID getUUID() {
- return serverPlayer.getUUID();
- }
-
- public IServerLevelWrapper getLevel()
+public class ServerPlayerWrapper implements IServerPlayerWrapper
+{
+ private static final ConcurrentMap
+ serverPlayerWrapperMap = new MapMaker().weakKeys().makeMap();
+
+ private final ServerPlayer serverPlayer;
+
+ public static ServerPlayerWrapper getWrapper(ServerPlayer serverPlayer)
+ {
+ return serverPlayerWrapperMap.computeIfAbsent(serverPlayer, ServerPlayerWrapper::new);
+ }
+
+ private ServerPlayerWrapper(ServerPlayer serverPlayer)
+ {
+ this.serverPlayer = serverPlayer;
+ }
+
+ public UUID getUUID()
+ {
+ return serverPlayer.getUUID();
+ }
+
+ public IServerLevelWrapper getLevel()
{
#if PRE_MC_1_20_1
return ServerLevelWrapper.getWrapper(this.serverPlayer.getLevel());
#else
return ServerLevelWrapper.getWrapper(this.serverPlayer.serverLevel());
#endif
- }
-
- public Object getWrappedMcObject() {
- return serverPlayer;
- }
-
- @Override
- public String toString() {
- return "Wrapped{" + serverPlayer.toString() + "}";
- }
+ }
+
+ public Object getWrappedMcObject()
+ {
+ return serverPlayer;
+ }
+
+ @Override
+ public String toString()
+ {
+ return "Wrapped{" + serverPlayer.toString() + "}";
+ }
+
}
diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/world/ClientLevelWrapper.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/world/ClientLevelWrapper.java
index 665bf9d7c..cc87ad645 100644
--- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/world/ClientLevelWrapper.java
+++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/world/ClientLevelWrapper.java
@@ -33,7 +33,7 @@ import java.util.concurrent.ConcurrentHashMap;
public class ClientLevelWrapper implements IClientLevelWrapper
{
private static final Logger LOGGER = DhLoggerBuilder.getLogger(ClientLevelWrapper.class.getSimpleName());
- private static final ConcurrentHashMap LEVEL_WRAPPER_BY_CLIENT_LEVEL = new ConcurrentHashMap<>();
+ private static final ConcurrentHashMap LEVEL_WRAPPER_BY_CLIENT_LEVEL = new ConcurrentHashMap<>();
private static final IKeyedClientLevelManager KEYED_CLIENT_LEVEL_MANAGER = SingletonInjector.INSTANCE.get(IKeyedClientLevelManager.class);
private final ClientLevel level;
@@ -45,7 +45,7 @@ public class ClientLevelWrapper implements IClientLevelWrapper
// constructor //
//=============//
- protected ClientLevelWrapper(ClientLevel level) { this.level = level; }
+ protected ClientLevelWrapper(ClientLevel level) { this.level = level; }
@@ -72,7 +72,7 @@ public class ClientLevelWrapper implements IClientLevelWrapper
@Nullable
- @Override
+ @Override
public IServerLevelWrapper tryGetServerSideWrapper()
{
try
@@ -89,14 +89,14 @@ public class ClientLevelWrapper implements IClientLevelWrapper
// attempt to find the server level with the same dimension type
// TODO this assumes only one level per dimension type, the SubDimensionLevelMatcher will need to be added for supporting multiple levels per dimension
ServerLevelWrapper foundLevelWrapper = null;
-
- // TODO: Surely there is a more efficient way to write this code
+
+ // TODO: Surely there is a more efficient way to write this code
for (ServerLevel serverLevel : serverLevels)
{
if (serverLevel.dimension() == this.level.dimension())
{
foundLevelWrapper = ServerLevelWrapper.getWrapper(serverLevel);
- break;
+ break;
}
}
@@ -104,16 +104,18 @@ public class ClientLevelWrapper implements IClientLevelWrapper
}
catch (Exception e)
{
- LOGGER.error("Failed to get server side wrapper for client level: "+level);
+ LOGGER.error("Failed to get server side wrapper for client level: " + level);
return null;
}
}
- public static void cleanCheck() {
- if (!LEVEL_WRAPPER_BY_CLIENT_LEVEL.isEmpty()) {
- LOGGER.warn("{} client levels havn't been freed!", LEVEL_WRAPPER_BY_CLIENT_LEVEL.size());
- LEVEL_WRAPPER_BY_CLIENT_LEVEL.clear();
- }
- }
+ public static void cleanCheck()
+ {
+ if (!LEVEL_WRAPPER_BY_CLIENT_LEVEL.isEmpty())
+ {
+ LOGGER.warn("{} client levels havn't been freed!", LEVEL_WRAPPER_BY_CLIENT_LEVEL.size());
+ LEVEL_WRAPPER_BY_CLIENT_LEVEL.clear();
+ }
+ }
@@ -121,83 +123,83 @@ public class ClientLevelWrapper implements IClientLevelWrapper
// base level methods //
//====================//
- @Override
- public int computeBaseColor(DhBlockPos pos, IBiomeWrapper biome, IBlockStateWrapper blockState)
- {
- return this.blockMap.getColor(((BlockStateWrapper)blockState).blockState, (BiomeWrapper)biome, pos);
- }
-
- @Override
- public IDhApiDimensionTypeWrapper getDimensionType() { return DimensionTypeWrapper.getDimensionTypeWrapper(this.level.dimensionType()); }
+ @Override
+ public int computeBaseColor(DhBlockPos pos, IBiomeWrapper biome, IBlockStateWrapper blockState)
+ {
+ return this.blockMap.getColor(((BlockStateWrapper) blockState).blockState, (BiomeWrapper) biome, pos);
+ }
- @Override
+ @Override
+ public IDhApiDimensionTypeWrapper getDimensionType() { return DimensionTypeWrapper.getDimensionTypeWrapper(this.level.dimensionType()); }
+
+ @Override
public EDhApiLevelType getLevelType() { return EDhApiLevelType.CLIENT_LEVEL; }
@Override
- public int getBlockLight(int x, int y, int z) { return this.level.getBrightness(LightLayer.BLOCK, new BlockPos(x,y,z)); }
-
- @Override
- public int getSkyLight(int x, int y, int z) { return this.level.getBrightness(LightLayer.SKY, new BlockPos(x,y,z)); }
-
- public ClientLevel getLevel() { return this.level; }
-
- @Override
- public boolean hasCeiling() { return this.level.dimensionType().hasCeiling(); }
-
- @Override
- public boolean hasSkyLight() { return this.level.dimensionType().hasSkyLight(); }
-
- @Override
- public int getHeight() { return this.level.getHeight(); }
-
- @Override
- public int getMinHeight()
- {
+ public int getBlockLight(int x, int y, int z) { return this.level.getBrightness(LightLayer.BLOCK, new BlockPos(x, y, z)); }
+
+ @Override
+ public int getSkyLight(int x, int y, int z) { return this.level.getBrightness(LightLayer.SKY, new BlockPos(x, y, z)); }
+
+ public ClientLevel getLevel() { return this.level; }
+
+ @Override
+ public boolean hasCeiling() { return this.level.dimensionType().hasCeiling(); }
+
+ @Override
+ public boolean hasSkyLight() { return this.level.dimensionType().hasSkyLight(); }
+
+ @Override
+ public int getHeight() { return this.level.getHeight(); }
+
+ @Override
+ public int getMinHeight()
+ {
#if PRE_MC_1_17_1
return 0;
#else
- return this.level.getMinBuildHeight();
+ return this.level.getMinBuildHeight();
#endif
- }
-
- @Override
- public IChunkWrapper tryGetChunk(DhChunkPos pos)
- {
- if (!this.level.hasChunk(pos.x, pos.z))
- {
+ }
+
+ @Override
+ public IChunkWrapper tryGetChunk(DhChunkPos pos)
+ {
+ if (!this.level.hasChunk(pos.x, pos.z))
+ {
return null;
- }
+ }
- ChunkAccess chunk = this.level.getChunk(pos.x, pos.z, ChunkStatus.EMPTY, false);
- if (chunk == null)
- {
+ ChunkAccess chunk = this.level.getChunk(pos.x, pos.z, ChunkStatus.EMPTY, false);
+ if (chunk == null)
+ {
return null;
- }
+ }
- return new ChunkWrapper(chunk, this.level, this);
- }
-
- @Override
- public boolean hasChunkLoaded(int chunkX, int chunkZ)
- {
- ChunkSource source = this.level.getChunkSource();
- return source.hasChunk(chunkX, chunkZ);
- }
-
- @Override
- public IBlockStateWrapper getBlockState(DhBlockPos pos)
- {
+ return new ChunkWrapper(chunk, this.level, this);
+ }
+
+ @Override
+ public boolean hasChunkLoaded(int chunkX, int chunkZ)
+ {
+ ChunkSource source = this.level.getChunkSource();
+ return source.hasChunk(chunkX, chunkZ);
+ }
+
+ @Override
+ public IBlockStateWrapper getBlockState(DhBlockPos pos)
+ {
return BlockStateWrapper.fromBlockState(this.level.getBlockState(McObjectConverter.Convert(pos)));
}
-
- @Override
- public IBiomeWrapper getBiome(DhBlockPos pos) { return BiomeWrapper.getBiomeWrapper(this.level.getBiome(McObjectConverter.Convert(pos))); }
-
- @Override
- public ClientLevel getWrappedMcObject() { return this.level; }
-
- @Override
- public String toString()
+
+ @Override
+ public IBiomeWrapper getBiome(DhBlockPos pos) { return BiomeWrapper.getBiomeWrapper(this.level.getBiome(McObjectConverter.Convert(pos))); }
+
+ @Override
+ public ClientLevel getWrappedMcObject() { return this.level; }
+
+ @Override
+ public String toString()
{
if (this.level == null)
{
@@ -206,5 +208,5 @@ public class ClientLevelWrapper implements IClientLevelWrapper
return "Wrapped{" + this.level.toString() + "@" + this.getDimensionType().getDimensionName() + "}";
}
-
+
}
diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/world/DimensionTypeWrapper.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/world/DimensionTypeWrapper.java
index a3e1ce6a6..6ddcfe38c 100644
--- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/world/DimensionTypeWrapper.java
+++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/world/DimensionTypeWrapper.java
@@ -32,58 +32,58 @@ import net.minecraft.world.level.dimension.DimensionType;
*/
public class DimensionTypeWrapper implements IDimensionTypeWrapper
{
- private static final ConcurrentMap dimensionTypeWrapperMap = new ConcurrentHashMap<>();
- private final DimensionType dimensionType;
-
- public DimensionTypeWrapper(DimensionType dimensionType)
- {
- this.dimensionType = dimensionType;
- }
-
- public static DimensionTypeWrapper getDimensionTypeWrapper(DimensionType dimensionType)
- {
- //first we check if the biome has already been wrapped
- if(dimensionTypeWrapperMap.containsKey(dimensionType) && dimensionTypeWrapperMap.get(dimensionType) != null)
- return dimensionTypeWrapperMap.get(dimensionType);
-
-
- //if it hasn't been created yet, we create it and save it in the map
- DimensionTypeWrapper dimensionTypeWrapper = new DimensionTypeWrapper(dimensionType);
- dimensionTypeWrapperMap.put(dimensionType, dimensionTypeWrapper);
-
- //we return the newly created wrapper
- return dimensionTypeWrapper;
- }
-
- public static void clearMap()
- {
- dimensionTypeWrapperMap.clear();
- }
-
-
- @Override
- public String getDimensionName()
- {
- return dimensionType.effectsLocation().getPath();
- }
-
- @Override
- public boolean hasCeiling()
- {
- return dimensionType.hasCeiling();
- }
-
- @Override
- public boolean hasSkyLight()
- {
- return dimensionType.hasSkyLight();
- }
+ private static final ConcurrentMap dimensionTypeWrapperMap = new ConcurrentHashMap<>();
+ private final DimensionType dimensionType;
+
+ public DimensionTypeWrapper(DimensionType dimensionType)
+ {
+ this.dimensionType = dimensionType;
+ }
+
+ public static DimensionTypeWrapper getDimensionTypeWrapper(DimensionType dimensionType)
+ {
+ //first we check if the biome has already been wrapped
+ if (dimensionTypeWrapperMap.containsKey(dimensionType) && dimensionTypeWrapperMap.get(dimensionType) != null)
+ return dimensionTypeWrapperMap.get(dimensionType);
+
+
+ //if it hasn't been created yet, we create it and save it in the map
+ DimensionTypeWrapper dimensionTypeWrapper = new DimensionTypeWrapper(dimensionType);
+ dimensionTypeWrapperMap.put(dimensionType, dimensionTypeWrapper);
+
+ //we return the newly created wrapper
+ return dimensionTypeWrapper;
+ }
+
+ public static void clearMap()
+ {
+ dimensionTypeWrapperMap.clear();
+ }
+
@Override
- public Object getWrappedMcObject()
- {
- return this.dimensionType;
- }
+ public String getDimensionName()
+ {
+ return dimensionType.effectsLocation().getPath();
+ }
+
+ @Override
+ public boolean hasCeiling()
+ {
+ return dimensionType.hasCeiling();
+ }
+
+ @Override
+ public boolean hasSkyLight()
+ {
+ return dimensionType.hasSkyLight();
+ }
+
+ @Override
+ public Object getWrappedMcObject()
+ {
+ return this.dimensionType;
+ }
diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/world/ServerLevelWrapper.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/world/ServerLevelWrapper.java
index 9c0b5c3b5..f018b531e 100644
--- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/world/ServerLevelWrapper.java
+++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/world/ServerLevelWrapper.java
@@ -49,41 +49,40 @@ import org.apache.logging.log4j.Logger;
import org.jetbrains.annotations.Nullable;
/**
- *
* @version 2022-9-16
*/
public class ServerLevelWrapper implements IServerLevelWrapper
{
private static final Logger LOGGER = DhLoggerBuilder.getLogger();
- private static final ConcurrentHashMap
- levelWrapperMap = new ConcurrentHashMap<>();
+ private static final ConcurrentHashMap
+ levelWrapperMap = new ConcurrentHashMap<>();
- public static ServerLevelWrapper getWrapper(ServerLevel level)
- {
- return levelWrapperMap.computeIfAbsent(level, ServerLevelWrapper::new);
- }
- public static void closeWrapper(ServerLevel level)
- {
- levelWrapperMap.remove(level);
- }
- public static void cleanCheck()
+ public static ServerLevelWrapper getWrapper(ServerLevel level)
+ {
+ return levelWrapperMap.computeIfAbsent(level, ServerLevelWrapper::new);
+ }
+ public static void closeWrapper(ServerLevel level)
+ {
+ levelWrapperMap.remove(level);
+ }
+ public static void cleanCheck()
{
if (!levelWrapperMap.isEmpty())
{
- LOGGER.warn(levelWrapperMap.size()+" server levels haven't been freed!");
+ LOGGER.warn(levelWrapperMap.size() + " server levels haven't been freed!");
levelWrapperMap.clear();
}
}
-
- final ServerLevel level;
- ServerBlockDetailMap blockMap = new ServerBlockDetailMap(this);
-
- public ServerLevelWrapper(ServerLevel level)
- {
- this.level = level;
- }
- @Nullable
- @Override
+
+ final ServerLevel level;
+ ServerBlockDetailMap blockMap = new ServerBlockDetailMap(this);
+
+ public ServerLevelWrapper(ServerLevel level)
+ {
+ this.level = level;
+ }
+ @Nullable
+ @Override
public IClientLevelWrapper tryGetClientLevelWrapper()
{
MinecraftClientWrapper client = MinecraftClientWrapper.INSTANCE;
@@ -94,99 +93,105 @@ public class ServerLevelWrapper implements IServerLevelWrapper
return ClientLevelWrapper.getWrapper(client.mc.level);
}
-
- @Override
- public File getSaveFolder()
- {
- return level.getChunkSource().getDataStorage().dataFolder;
- }
-
- @Override
- public DimensionTypeWrapper getDimensionType()
- {
- return DimensionTypeWrapper.getDimensionTypeWrapper(level.dimensionType());
- }
- @Override
+ @Override
+ public File getSaveFolder()
+ {
+ return level.getChunkSource().getDataStorage().dataFolder;
+ }
+
+ @Override
+ public DimensionTypeWrapper getDimensionType()
+ {
+ return DimensionTypeWrapper.getDimensionTypeWrapper(level.dimensionType());
+ }
+
+ @Override
public EDhApiLevelType getLevelType() { return EDhApiLevelType.SERVER_LEVEL; }
@Override
- public int getBlockLight(int x, int y, int z)
- {
- return level.getBrightness(LightLayer.BLOCK, new BlockPos(x,y,z));
- }
-
- @Override
- public int getSkyLight(int x, int y, int z)
- {
- return level.getBrightness(LightLayer.SKY, new BlockPos(x,y,z));
- }
-
- public ServerLevel getLevel()
- {
- return level;
- }
-
- @Override
- public boolean hasCeiling()
- {
- return level.dimensionType().hasCeiling();
- }
-
- @Override
- public boolean hasSkyLight()
- {
- return level.dimensionType().hasSkyLight();
- }
-
- @Override
- public int getHeight()
- {
- return level.getHeight();
- }
-
- @Override
- public int getMinHeight()
- {
+ public int getBlockLight(int x, int y, int z)
+ {
+ return level.getBrightness(LightLayer.BLOCK, new BlockPos(x, y, z));
+ }
+
+ @Override
+ public int getSkyLight(int x, int y, int z)
+ {
+ return level.getBrightness(LightLayer.SKY, new BlockPos(x, y, z));
+ }
+
+ public ServerLevel getLevel()
+ {
+ return level;
+ }
+
+ @Override
+ public boolean hasCeiling()
+ {
+ return level.dimensionType().hasCeiling();
+ }
+
+ @Override
+ public boolean hasSkyLight()
+ {
+ return level.dimensionType().hasSkyLight();
+ }
+
+ @Override
+ public int getHeight()
+ {
+ return level.getHeight();
+ }
+
+ @Override
+ public int getMinHeight()
+ {
#if PRE_MC_1_17_1
return 0;
#else
- return level.getMinBuildHeight();
+ return level.getMinBuildHeight();
#endif
- }
- @Override
- public IChunkWrapper tryGetChunk(DhChunkPos pos) {
- if (!level.hasChunk(pos.x, pos.z)) return null;
- ChunkAccess chunk = level.getChunk(pos.getX(), pos.getZ(), ChunkStatus.EMPTY, false);
- if (chunk == null) return null;
- return new ChunkWrapper(chunk, level, this);
- }
-
- @Override
- public boolean hasChunkLoaded(int chunkX, int chunkZ) {
- // world.hasChunk(chunkX, chunkZ); THIS DOES NOT WORK FOR CLIENT LEVEL CAUSE MOJANG ALWAYS RETURN TRUE FOR THAT!
- ChunkSource source = level.getChunkSource();
- return source.hasChunk(chunkX, chunkZ);
- }
-
- @Override
- public IBlockStateWrapper getBlockState(DhBlockPos pos) {
- return BlockStateWrapper.fromBlockState(level.getBlockState(McObjectConverter.Convert(pos)));
- }
-
- @Override
- public IBiomeWrapper getBiome(DhBlockPos pos) {
- return BiomeWrapper.getBiomeWrapper(level.getBiome(McObjectConverter.Convert(pos)));
- }
-
- @Override
- public ServerLevel getWrappedMcObject()
- {
- return level;
- }
-
- @Override
- public String toString() {
- return "Wrapped{" + level.toString() + "@" + getDimensionType().getDimensionName() + "}";
- }
+ }
+ @Override
+ public IChunkWrapper tryGetChunk(DhChunkPos pos)
+ {
+ if (!level.hasChunk(pos.x, pos.z)) return null;
+ ChunkAccess chunk = level.getChunk(pos.getX(), pos.getZ(), ChunkStatus.EMPTY, false);
+ if (chunk == null) return null;
+ return new ChunkWrapper(chunk, level, this);
+ }
+
+ @Override
+ public boolean hasChunkLoaded(int chunkX, int chunkZ)
+ {
+ // world.hasChunk(chunkX, chunkZ); THIS DOES NOT WORK FOR CLIENT LEVEL CAUSE MOJANG ALWAYS RETURN TRUE FOR THAT!
+ ChunkSource source = level.getChunkSource();
+ return source.hasChunk(chunkX, chunkZ);
+ }
+
+ @Override
+ public IBlockStateWrapper getBlockState(DhBlockPos pos)
+ {
+ return BlockStateWrapper.fromBlockState(level.getBlockState(McObjectConverter.Convert(pos)));
+ }
+
+ @Override
+ public IBiomeWrapper getBiome(DhBlockPos pos)
+ {
+ return BiomeWrapper.getBiomeWrapper(level.getBiome(McObjectConverter.Convert(pos)));
+ }
+
+ @Override
+ public ServerLevel getWrappedMcObject()
+ {
+ return level;
+ }
+
+ @Override
+ public String toString()
+ {
+ return "Wrapped{" + level.toString() + "@" + getDimensionType().getDimensionName() + "}";
+ }
+
}
diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/BatchGenerationEnvironment.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/BatchGenerationEnvironment.java
index 241ab0ea1..56d9d46d8 100644
--- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/BatchGenerationEnvironment.java
+++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/BatchGenerationEnvironment.java
@@ -96,7 +96,7 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv
{
public static final ConfigBasedSpamLogger PREF_LOGGER =
new ConfigBasedSpamLogger(LogManager.getLogger("LodWorldGen"),
- () -> Config.Client.Advanced.Logging.logWorldGenPerformance.get(),1);
+ () -> Config.Client.Advanced.Logging.logWorldGenPerformance.get(), 1);
public static final ConfigBasedLogger EVENT_LOGGER =
new ConfigBasedLogger(LogManager.getLogger("LodWorldGen"),
() -> Config.Client.Advanced.Logging.logWorldGenEvent.get());
@@ -128,7 +128,7 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv
public PerfCalculator()
{
- for(int i = 0; i < 11; i++)
+ for (int i = 0; i < 11; i++)
{
times.add(new Rolling(SIZE));
}
@@ -140,7 +140,7 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv
{
String name = e.name;
int index = Arrays.asList(TIME_NAMES).indexOf(name);
- if(index == -1) continue;
+ if (index == -1) continue;
times.get(index).add(e.timeNs);
}
times.get(0).add(event.getTotalTimeNs());
@@ -156,6 +156,7 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv
}
return sb.toString();
}
+
}
private final IDhServerLevel serverlevel;
@@ -177,9 +178,9 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv
public static final int RANGE_TO_RANGE_EMPTY_EXTENSION = 1;
public int unknownExceptionCount = 0;
public long lastExceptionTriggerTime = 0;
-
+
private AtomicReference regionFileStorageCacheRef = new AtomicReference<>();
-
+
public RegionFileStorageExternalCache getOrCreateRegionFileCache(RegionFileStorage storage)
{
RegionFileStorageExternalCache cache = regionFileStorageCacheRef.get();
@@ -197,16 +198,19 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv
public static ThreadLocal isDistantGeneratorThread = new ThreadLocal<>();
public static ThreadLocal