From 838d8be08bd64a6c37c49a059bc1361ad750cfc6 Mon Sep 17 00:00:00 2001 From: James Seibel Date: Tue, 10 Sep 2024 07:29:42 -0500 Subject: [PATCH] minor refactoring and style cleanup --- .../wrappers/misc/ServerPlayerWrapper.java | 3 +- .../wrappers/world/DimensionTypeWrapper.java | 6 ++-- .../wrappers/world/ServerLevelWrapper.java | 33 +++++-------------- .../fabric/FabricClientProxy.java | 9 ++--- .../distanthorizons/fabric/FabricMain.java | 6 ++++ .../neoforge/NeoforgeMain.java | 2 +- 6 files changed, 25 insertions(+), 34 deletions(-) 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 a9a401c04..63e54c45b 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 @@ -40,9 +40,10 @@ public class ServerPlayerWrapper implements IServerPlayerWrapper #endif } + @Override public Object getWrappedMcObject() { - return serverPlayer; + return this.serverPlayer(); } @Override 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 9f7dd1ccc..7264e7488 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 @@ -44,7 +44,9 @@ public class DimensionTypeWrapper implements IDimensionTypeWrapper { //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 @@ -70,13 +72,13 @@ public class DimensionTypeWrapper implements IDimensionTypeWrapper @Override public boolean hasCeiling() { - return dimensionType.hasCeiling(); + return this.dimensionType.hasCeiling(); } @Override public boolean hasSkyLight() { - return dimensionType.hasSkyLight(); + return this.dimensionType.hasSkyLight(); } @Override 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 b0231d980..84e8c81bb 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 @@ -81,10 +81,7 @@ public class ServerLevelWrapper implements IServerLevelWrapper //=========// @Override - public File getSaveFolder() - { - return level.getChunkSource().getDataStorage().dataFolder; - } + public File getSaveFolder() { return this.level.getChunkSource().getDataStorage().dataFolder; } @Override public DimensionTypeWrapper getDimensionType() @@ -95,28 +92,16 @@ public class ServerLevelWrapper implements IServerLevelWrapper @Override public EDhApiLevelType getLevelType() { return EDhApiLevelType.SERVER_LEVEL; } - public ServerLevel getLevel() - { - return level; - } + public ServerLevel getLevel() { return this.level; } @Override - public boolean hasCeiling() - { - return level.dimensionType().hasCeiling(); - } + public boolean hasCeiling() { return this.level.dimensionType().hasCeiling(); } @Override - public boolean hasSkyLight() - { - return level.dimensionType().hasSkyLight(); - } + public boolean hasSkyLight() { return this.level.dimensionType().hasSkyLight(); } @Override - public int getMaxHeight() - { - return level.getHeight(); - } + public int getMaxHeight() { return this.level.getHeight(); } @Override public int getMinHeight() @@ -124,7 +109,7 @@ public class ServerLevelWrapper implements IServerLevelWrapper #if MC_VER < MC_1_17_1 return 0; #else - return level.getMinBuildHeight(); + return this.level.getMinBuildHeight(); #endif } @@ -141,20 +126,20 @@ public class ServerLevelWrapper implements IServerLevelWrapper 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(); + ChunkSource source = this.level.getChunkSource(); return source.hasChunk(chunkX, chunkZ); } @Override public IBlockStateWrapper getBlockState(DhBlockPos pos) { - return BlockStateWrapper.fromBlockState(level.getBlockState(McObjectConverter.Convert(pos)), this); + return BlockStateWrapper.fromBlockState(this.level.getBlockState(McObjectConverter.Convert(pos)), this); } @Override public IBiomeWrapper getBiome(DhBlockPos pos) { - return BiomeWrapper.getBiomeWrapper(level.getBiome(McObjectConverter.Convert(pos)), this); + return BiomeWrapper.getBiomeWrapper(this.level.getBiome(McObjectConverter.Convert(pos)), this); } @Override diff --git a/fabric/src/main/java/com/seibel/distanthorizons/fabric/FabricClientProxy.java b/fabric/src/main/java/com/seibel/distanthorizons/fabric/FabricClientProxy.java index e3f3c35ef..3a98a2f40 100644 --- a/fabric/src/main/java/com/seibel/distanthorizons/fabric/FabricClientProxy.java +++ b/fabric/src/main/java/com/seibel/distanthorizons/fabric/FabricClientProxy.java @@ -19,8 +19,6 @@ package com.seibel.distanthorizons.fabric; -import com.mojang.blaze3d.systems.RenderSystem; -import com.mojang.blaze3d.vertex.PoseStack; import com.seibel.distanthorizons.common.AbstractModInitializer; import com.seibel.distanthorizons.common.wrappers.McObjectConverter; import com.seibel.distanthorizons.common.wrappers.world.ClientLevelWrapper; @@ -38,7 +36,6 @@ import com.seibel.distanthorizons.core.wrapperInterfaces.modAccessor.ISodiumAcce import com.seibel.distanthorizons.core.wrapperInterfaces.world.IClientLevelWrapper; import com.seibel.distanthorizons.core.util.math.Mat4f; import com.seibel.distanthorizons.fabric.wrappers.modAccessor.SodiumAccessor; -//import io.netty.buffer.ByteBuf; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientChunkEvents; @@ -60,7 +57,6 @@ import net.minecraft.world.InteractionResult; import net.minecraft.world.level.chunk.ChunkAccess; import net.minecraft.world.phys.HitResult; import org.apache.logging.log4j.Logger; -import org.joml.Matrix4f; import org.lwjgl.glfw.GLFW; /** @@ -89,6 +85,7 @@ public class FabricClientProxy implements AbstractModInitializer.IEventProxy * Registers Fabric Events * @author Ran */ + @Override public void registerEvents() { LOGGER.info("Registering Fabric Client Events"); @@ -285,14 +282,14 @@ public class FabricClientProxy implements AbstractModInitializer.IEventProxy // Diff and trigger events for (int keyCode : currentKeyDown) { - if (!previouslyPressKeyCodes.contains(keyCode)) + if (!this.previouslyPressKeyCodes.contains(keyCode)) { ClientApi.INSTANCE.keyPressedEvent(keyCode); } } // Update the set - previouslyPressKeyCodes = currentKeyDown; + this.previouslyPressKeyCodes = currentKeyDown; } } diff --git a/fabric/src/main/java/com/seibel/distanthorizons/fabric/FabricMain.java b/fabric/src/main/java/com/seibel/distanthorizons/fabric/FabricMain.java index 7765c5a2b..c5c60a66c 100644 --- a/fabric/src/main/java/com/seibel/distanthorizons/fabric/FabricMain.java +++ b/fabric/src/main/java/com/seibel/distanthorizons/fabric/FabricMain.java @@ -120,15 +120,21 @@ public class FabricMain extends AbstractModInitializer implements ClientModIniti SingletonInjector.INSTANCE.runDelayedSetup(); if (Config.Client.Advanced.Graphics.Fog.disableVanillaFog.get() && SingletonInjector.INSTANCE.get(IModChecker.class).isModLoaded("bclib")) + { ModAccessorInjector.INSTANCE.get(IBCLibAccessor.class).setRenderCustomFog(false); // Remove BCLib's fog + } #if MC_VER >= MC_1_20_1 if (SingletonInjector.INSTANCE.get(IModChecker.class).isModLoaded("sodium")) + { ModAccessorInjector.INSTANCE.get(ISodiumAccessor.class).setFogOcclusion(false); + } #endif if (ConfigBase.INSTANCE == null) + { throw new IllegalStateException("Config was not initialized. Make sure to call LodCommonMain.initConfig() before calling this method."); + } } } diff --git a/neoforge/src/main/java/com/seibel/distanthorizons/neoforge/NeoforgeMain.java b/neoforge/src/main/java/com/seibel/distanthorizons/neoforge/NeoforgeMain.java index 3cbebf3b4..f2369520c 100644 --- a/neoforge/src/main/java/com/seibel/distanthorizons/neoforge/NeoforgeMain.java +++ b/neoforge/src/main/java/com/seibel/distanthorizons/neoforge/NeoforgeMain.java @@ -46,7 +46,7 @@ import java.util.function.Consumer; #if MC_VER < MC_1_20_6 import net.neoforged.neoforge.client.ConfigScreenHandler; #else -import net.neoforged.neoforge.client.gui.IConfigScreenFactory; +import net.neoforged.neoforge.client.gui.IConfigScreenFactory; #endif /**