diff --git a/build.gradle b/build.gradle index 201ecd0ec..04cdeaa5c 100644 --- a/build.gradle +++ b/build.gradle @@ -297,10 +297,10 @@ allprojects { p -> // Set the java version if (p != project(":core")) { options.release = rootProject.java_version as Integer + options.compilerArgs += ['-Xplugin:Manifold'] } else { options.release = 8; // Core should use Java 8 no matter what } - options.compilerArgs += ['-Xplugin:Manifold'] // Apply manifold to all projects options.encoding = "UTF-8" // Not requred but better to have // TODO: make everything use java 8 diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/minecraft/MinecraftRenderWrapper.java b/common/src/main/java/com/seibel/lod/common/wrappers/minecraft/MinecraftRenderWrapper.java index d452eab71..91fd797f6 100644 --- a/common/src/main/java/com/seibel/lod/common/wrappers/minecraft/MinecraftRenderWrapper.java +++ b/common/src/main/java/com/seibel/lod/common/wrappers/minecraft/MinecraftRenderWrapper.java @@ -61,6 +61,7 @@ import net.minecraft.world.entity.LivingEntity; #if PRE_MC_1_17_1 import net.minecraft.tags.FluidTags; import net.minecraft.world.level.material.FluidState; +import org.lwjgl.opengl.GL15; #else import net.minecraft.world.level.material.FogType; #endif diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/mimicObject/ChunkLoader.java b/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/mimicObject/ChunkLoader.java index 87f548819..b43149a65 100644 --- a/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/mimicObject/ChunkLoader.java +++ b/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/mimicObject/ChunkLoader.java @@ -52,6 +52,7 @@ import net.minecraft.core.Holder; import net.minecraft.world.level.lighting.LevelLightEngine; import net.minecraft.world.level.material.Fluid; +import net.minecraft.world.level.material.Fluids; public class ChunkLoader { diff --git a/fabric/src/main/java/com/seibel/lod/fabric/ClientProxy.java b/fabric/src/main/java/com/seibel/lod/fabric/ClientProxy.java index 1aaa5e07d..4b911fce6 100644 --- a/fabric/src/main/java/com/seibel/lod/fabric/ClientProxy.java +++ b/fabric/src/main/java/com/seibel/lod/fabric/ClientProxy.java @@ -30,6 +30,7 @@ import com.seibel.lod.common.wrappers.world.WorldWrapper; import com.seibel.lod.core.wrapperInterfaces.chunk.IChunkWrapper; import com.seibel.lod.core.wrapperInterfaces.config.ILodConfigWrapperSingleton; +import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientChunkEvents; import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents; import net.fabricmc.fabric.api.event.lifecycle.v1.ServerTickEvents; import net.fabricmc.fabric.api.event.lifecycle.v1.ServerWorldEvents; diff --git a/fabric/src/main/java/com/seibel/lod/fabric/mixins/MixinWorldRenderer.java b/fabric/src/main/java/com/seibel/lod/fabric/mixins/MixinWorldRenderer.java index a9e0e2451..53b0db64a 100644 --- a/fabric/src/main/java/com/seibel/lod/fabric/mixins/MixinWorldRenderer.java +++ b/fabric/src/main/java/com/seibel/lod/fabric/mixins/MixinWorldRenderer.java @@ -27,6 +27,7 @@ import com.seibel.lod.core.api.internal.ClientApi; import com.seibel.lod.core.objects.math.Mat4f; import net.minecraft.client.renderer.LevelRenderer; import net.minecraft.client.renderer.RenderType; +import org.lwjgl.opengl.GL15; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; diff --git a/forge/src/main/java/com/seibel/lod/forge/ForgeMain.java b/forge/src/main/java/com/seibel/lod/forge/ForgeMain.java index ad4461134..f6ab7c715 100644 --- a/forge/src/main/java/com/seibel/lod/forge/ForgeMain.java +++ b/forge/src/main/java/com/seibel/lod/forge/ForgeMain.java @@ -50,6 +50,7 @@ import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; import net.minecraftforge.fml.loading.FMLLoader; #if PRE_MC_1_17_1 import net.minecraftforge.fml.ExtensionPoint; +import org.apache.logging.log4j.Logger; #elif MC_1_17_1 import net.minecraftforge.fmlclient.ConfigGuiHandler; #else // 1.18+ diff --git a/forge/src/main/java/com/seibel/lod/forge/mixins/MixinWorldRenderer.java b/forge/src/main/java/com/seibel/lod/forge/mixins/MixinWorldRenderer.java index 60bd244e5..f0b159431 100644 --- a/forge/src/main/java/com/seibel/lod/forge/mixins/MixinWorldRenderer.java +++ b/forge/src/main/java/com/seibel/lod/forge/mixins/MixinWorldRenderer.java @@ -27,6 +27,7 @@ import com.seibel.lod.core.api.internal.ClientApi; import com.seibel.lod.core.objects.math.Mat4f; import net.minecraft.client.renderer.LevelRenderer; import net.minecraft.client.renderer.RenderType; +import org.lwjgl.opengl.GL15; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject;