Merge remote-tracking branch 'origin/main' into new_buildsystem

# Conflicts:
#	build.gradle
#	fabric/build.gradle

.gitlab/issue_templates/Bug.md

@@ -0,0 +1,34 @@
+## Please complete before submitting:
+
+1. [ ] Check the FAQ to see if your issue has already been reported and has a solution:
+    [Problems-and-solutions](https://gitlab.com/jeseibel/minecraft-lod-mod/-/wikis/2-frequently-asked-questions/2-problems-and-solutions/Problems-and-Solutions)
+
+2. [ ] Make sure you are not using any mods on the incompatible list:
+    [Mod support FAQ](https://gitlab.com/jeseibel/minecraft-lod-mod/-/wikis/2-frequently-asked-questions/4-mod-support/Mod-Support)
+
+3. [ ] Check the existing issues to verify that your bug hasn't already been submitted: 
+    [Issues](https://gitlab.com/jeseibel/minecraft-lod-mod/-/issues/)
+
+4. [ ] Upload Minecraft's crash report and/or log.
+
+   Minecraft crash reports are located in: `.minecraft/crash-reports`
+
+   Minecraft logs are located in: `.minecraft/logs`
+
+5. [ ] Upload your Distant Horizons Config.
+
+     The config is found in: `.minecraft/configs/DistantHorizons.toml`
+
+ 6. [ ] Fill out the information below:
+
+================================================================
+
+ * minecraft version:
+ * Distant Horizons version:
+ * Mod loader:
+ * List of installed mods (list the smallest number of mods that you can use to re-create the bug):
+ * Describe the bug:
+ * Steps to reproduce the bug:
+
+
+/labels ~Bug ~"Not-Reviewed"

.gitlab/issue_templates/Default.md

@@ -0,0 +1,3 @@
+Before creating an issue, please select the appropriate template from the dropdown above.
+
+The template will walk you through submitting a bug, feature, or improvement request.

.gitlab/issue_templates/FeatureRequest.md

@@ -0,0 +1,8 @@
+- [ ] Check the existing [feature requests](https://gitlab.com/jeseibel/minecraft-lod-mod/-/issues/?sort=updated_desc&state=opened&label_name%5B%5D=Feature) to verify that your feature hasn't already been suggested.
+
+ 1. Describe the feature:
+
+ 2. Describe why this feature should be added:
+
+
+/labels ~Feature ~"Not-Reviewed"

.gitlab/issue_templates/ImprovementRequest.md

@@ -0,0 +1,7 @@
+ 1. Check the existing [improvement requests](https://gitlab.com/jeseibel/minecraft-lod-mod/-/issues/?sort=updated_desc&state=opened&label_name%5B%5D=Improvement) to verify that your improvement hasn't already been suggested.
+
+ 2. Describe the improvement:
+
+
+
+/labels ~improvement ~"Not-Reviewed"

common/src/main/java/com/seibel/lod/common/wrappers/minecraft/MinecraftRenderWrapper.java

@@ -34,6 +34,7 @@ import com.seibel.lod.common.wrappers.misc.LightMapWrapper;
 import com.seibel.lod.core.dependencyInjection.ModAccessorInjector;
 
 import com.seibel.lod.core.logging.DhLoggerBuilder;
+import com.seibel.lod.core.render.glObject.GLProxy;
 import com.seibel.lod.core.wrapperInterfaces.misc.ILightMapWrapper;
 
 import com.mojang.math.Vector3f;
@@ -68,6 +69,7 @@ import net.minecraft.world.level.material.FogType;
 import net.minecraft.world.phys.AABB;
 import net.minecraft.world.phys.Vec3;
 import org.apache.logging.log4j.Logger;
+import org.lwjgl.glfw.GLFW;
 
 
 /**
@@ -193,6 +195,18 @@ public class MinecraftRenderWrapper implements IMinecraftRenderWrapper
 	@Override
 	public int getScreenWidth()
 	{
+		// alternate ways of getting the window's resolution,
+		// using one of these methods may fix the optifine render resolution bug
+		// TODO: test these once we can run with Optifine again
+//		int[] heightArray = new int[1];
+//		int[] widthArray = new int[1];
+//		
+//		long window = GLProxy.getInstance().minecraftGlContext;
+//		GLFW.glfwGetWindowSize(window, widthArray, heightArray); // option 1
+//		GLFW.glfwGetFramebufferSize(window, widthArray, heightArray); // option 2
+		
+		
+		
 		int width = MC.getWindow().getWidth();
 		if (OPTIFINE_ACCESSOR != null)
 		{

fabric/src/main/java/com/seibel/lod/fabric/FabricClientMain.java

@@ -1,4 +1,4 @@
-package com.seibel.lod;
+package com.seibel.lod.fabric;
 
 import com.seibel.lod.common.wrappers.DependencySetup;
 import net.fabricmc.api.ClientModInitializer;

fabric/src/main/java/com/seibel/lod/fabric/FabricClientProxy.java

@@ -17,7 +17,7 @@
  *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.seibel.lod;
+package com.seibel.lod.fabric;
 
 import com.seibel.lod.common.wrappers.McObjectConverter;
 import com.seibel.lod.common.wrappers.world.ClientLevelWrapper;
@@ -29,7 +29,7 @@ import com.seibel.lod.common.wrappers.chunk.ChunkWrapper;
 import com.seibel.lod.core.dependencyInjection.ModAccessorInjector;
 import com.seibel.lod.core.logging.DhLoggerBuilder;
 import com.seibel.lod.core.wrapperInterfaces.modAccessor.ISodiumAccessor;
-import com.seibel.lod.wrappers.modAccessor.SodiumAccessor;
+import com.seibel.lod.fabric.wrappers.modAccessor.SodiumAccessor;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientChunkEvents;

fabric/src/main/java/com/seibel/lod/fabric/FabricDedicatedServerMain.java

@@ -1,4 +1,4 @@
-package com.seibel.lod;
+package com.seibel.lod.fabric;
 
 import com.seibel.lod.common.wrappers.DependencySetup;
 import com.seibel.lod.common.wrappers.minecraft.MinecraftDedicatedServerWrapper;

fabric/src/main/java/com/seibel/lod/fabric/FabricMain.java

@@ -17,7 +17,7 @@
  *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.seibel.lod;
+package com.seibel.lod.fabric;
 
 import com.seibel.lod.api.methods.events.abstractEvents.DhApiAfterDhInitEvent;
 import com.seibel.lod.api.methods.events.abstractEvents.DhApiBeforeDhInitEvent;
@@ -29,11 +29,11 @@ import com.seibel.lod.core.dependencyInjection.ModAccessorInjector;
 import com.seibel.lod.core.dependencyInjection.SingletonInjector;
 import com.seibel.lod.core.logging.DhLoggerBuilder;
 import com.seibel.lod.core.wrapperInterfaces.modAccessor.*;
-import com.seibel.lod.wrappers.modAccessor.BCLibAccessor;
-import com.seibel.lod.wrappers.modAccessor.OptifineAccessor;
-import com.seibel.lod.wrappers.modAccessor.SodiumAccessor;
-import com.seibel.lod.wrappers.modAccessor.StarlightAccessor;
-import com.seibel.lod.wrappers.FabricDependencySetup;
+import com.seibel.lod.fabric.wrappers.modAccessor.BCLibAccessor;
+import com.seibel.lod.fabric.wrappers.modAccessor.OptifineAccessor;
+import com.seibel.lod.fabric.wrappers.modAccessor.SodiumAccessor;
+import com.seibel.lod.fabric.wrappers.modAccessor.StarlightAccessor;
+import com.seibel.lod.fabric.wrappers.FabricDependencySetup;
 
 import org.apache.logging.log4j.Logger;
 

fabric/src/main/java/com/seibel/lod/fabric/FabricServerProxy.java

@@ -1,4 +1,4 @@
-package com.seibel.lod;
+package com.seibel.lod.fabric;
 
 import com.seibel.lod.common.networking.Networking;
 import com.seibel.lod.common.wrappers.chunk.ChunkWrapper;

fabric/src/main/java/com/seibel/lod/fabric/mixins/FabricMixinPlugin.java

@@ -1,4 +1,4 @@
-package com.seibel.lod.mixins;
+package com.seibel.lod.fabric.mixins;
 
 import com.seibel.lod.core.dependencyInjection.ModAccessorInjector;
 import com.seibel.lod.core.wrapperInterfaces.modAccessor.ISodiumAccessor;

fabric/src/main/java/com/seibel/lod/fabric/mixins/client/MixinClientLevel.java

@@ -17,7 +17,7 @@
  *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
  
-package com.seibel.lod.mixins.client;
+package com.seibel.lod.fabric.mixins.client;
 
 import com.seibel.lod.common.wrappers.chunk.ChunkWrapper;
 import com.seibel.lod.common.wrappers.world.ClientLevelWrapper;

fabric/src/main/java/com/seibel/lod/fabric/mixins/client/MixinClientPacketListener.java

@@ -1,4 +1,4 @@
-package com.seibel.lod.mixins.client;
+package com.seibel.lod.fabric.mixins.client;
 
 import com.seibel.lod.common.wrappers.world.ClientLevelWrapper;
 import com.seibel.lod.core.api.internal.ClientApi;

fabric/src/main/java/com/seibel/lod/fabric/mixins/client/MixinDebugScreenOverlay.java

@@ -1,4 +1,4 @@
-package com.seibel.lod.mixins.client;
+package com.seibel.lod.fabric.mixins.client;
 
 import com.seibel.lod.core.logging.f3.F3Screen;
 import net.minecraft.client.gui.components.DebugScreenOverlay;

fabric/src/main/java/com/seibel/lod/fabric/mixins/client/MixinFogRenderer.java

@@ -17,7 +17,7 @@
  *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
  
-package com.seibel.lod.mixins.client;
+package com.seibel.lod.fabric.mixins.client;
 
 import com.seibel.lod.core.config.Config;
 import org.spongepowered.asm.mixin.Mixin;

fabric/src/main/java/com/seibel/lod/fabric/mixins/client/MixinGameRenderer.java

@@ -1,4 +1,4 @@
-package com.seibel.lod.mixins.client;
+package com.seibel.lod.fabric.mixins.client;
 
 import com.seibel.lod.core.api.internal.ClientApi;
 import net.minecraft.client.renderer.GameRenderer;

fabric/src/main/java/com/seibel/lod/fabric/mixins/client/MixinLevelRenderer.java

@@ -17,7 +17,7 @@
  *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.seibel.lod.mixins.client;
+package com.seibel.lod.fabric.mixins.client;
 
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.math.Matrix4f;

fabric/src/main/java/com/seibel/lod/fabric/mixins/client/MixinLightmap.java

@@ -1,4 +1,4 @@
-package com.seibel.lod.mixins.client;
+package com.seibel.lod.fabric.mixins.client;
 
 
 import com.mojang.blaze3d.platform.NativeImage;

fabric/src/main/java/com/seibel/lod/fabric/mixins/client/MixinMinecraft.java

@@ -1,4 +1,4 @@
-package com.seibel.lod.mixins.client;
+package com.seibel.lod.fabric.mixins.client;
 
 import com.seibel.lod.common.wrappers.gui.updater.UpdateModScreen;
 import com.seibel.lod.core.config.Config;

fabric/src/main/java/com/seibel/lod/fabric/mixins/client/MixinOptionsScreen.java

@@ -17,7 +17,7 @@
  *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.seibel.lod.mixins.client;
+package com.seibel.lod.fabric.mixins.client;
 
 import com.seibel.lod.common.wrappers.gui.GetConfigScreen;
 import com.seibel.lod.common.wrappers.gui.TexturedButtonWidget;

fabric/src/main/java/com/seibel/lod/fabric/mixins/events/MixinBlockUpdate.java

@@ -17,7 +17,7 @@
  *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
  
-package com.seibel.lod.mixins.events;
+package com.seibel.lod.fabric.mixins.events;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.network.protocol.game.ClientboundBlockUpdatePacket;

fabric/src/main/java/com/seibel/lod/fabric/mixins/events/MixinServerLevel.java

@@ -17,7 +17,7 @@
  *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
  
-package com.seibel.lod.mixins.events;
+package com.seibel.lod.fabric.mixins.events;
 
 import net.minecraft.server.level.ServerLevel;
 import org.spongepowered.asm.mixin.Mixin;

fabric/src/main/java/com/seibel/lod/fabric/mixins/mods/sodium/MixinSodiumChunkRenderer.java

@@ -1,9 +1,9 @@
-package com.seibel.lod.mixins.mods.sodium;
+package com.seibel.lod.fabric.mixins.mods.sodium;
 
 import com.seibel.lod.core.api.internal.ClientApi;
 import com.seibel.lod.core.dependencyInjection.ModAccessorInjector;
 import com.seibel.lod.core.wrapperInterfaces.modAccessor.ISodiumAccessor;
-import com.seibel.lod.wrappers.modAccessor.SodiumAccessor;
+import com.seibel.lod.fabric.wrappers.modAccessor.SodiumAccessor;
 import me.jellysquid.mods.sodium.client.gl.device.CommandList;
 import me.jellysquid.mods.sodium.client.render.chunk.ChunkCameraContext;
 import me.jellysquid.mods.sodium.client.render.chunk.ChunkRenderList;

fabric/src/main/java/com/seibel/lod/fabric/mixins/server/MixinChunkGenerator.java

@@ -17,7 +17,7 @@
  *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
  
-package com.seibel.lod.mixins.server;
+package com.seibel.lod.fabric.mixins.server;
 
 import org.spongepowered.asm.mixin.Mixin;
 import net.minecraft.world.level.chunk.ChunkGenerator;

fabric/src/main/java/com/seibel/lod/fabric/mixins/server/MixinChunkMap.java

@@ -1,4 +1,4 @@
-package com.seibel.lod.mixins.server;
+package com.seibel.lod.fabric.mixins.server;
 
 import com.seibel.lod.common.wrappers.chunk.ChunkWrapper;
 import com.seibel.lod.common.wrappers.world.ServerLevelWrapper;

fabric/src/main/java/com/seibel/lod/fabric/mixins/server/MixinUtilBackgroundThread.java

@@ -17,12 +17,12 @@
  *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
  
-package com.seibel.lod.mixins.server;
+package com.seibel.lod.fabric.mixins.server;
 
 import java.util.concurrent.ExecutorService;
 import java.util.function.Supplier;
 
-import com.seibel.lod.FabricServerProxy;
+import com.seibel.lod.fabric.FabricServerProxy;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;

fabric/src/main/java/com/seibel/lod/fabric/mixins/server/unsafe/MixinThreadingDetector.java

@@ -17,7 +17,7 @@
  *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
  
-package com.seibel.lod.mixins.server.unsafe;
+package com.seibel.lod.fabric.mixins.server.unsafe;
 
 import org.spongepowered.asm.mixin.Mixin;
 

fabric/src/main/java/com/seibel/lod/fabric/wrappers/FabricDependencySetup.java

@@ -17,11 +17,11 @@
  *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
  
-package com.seibel.lod.wrappers;
+package com.seibel.lod.fabric.wrappers;
 
 import com.seibel.lod.core.dependencyInjection.SingletonInjector;
 import com.seibel.lod.core.wrapperInterfaces.modAccessor.IModChecker;
-import com.seibel.lod.wrappers.modAccessor.ModChecker;
+import com.seibel.lod.fabric.wrappers.modAccessor.ModChecker;
 
 /**
  * Binds all necessary dependencies, so we

fabric/src/main/java/com/seibel/lod/fabric/wrappers/config/ModMenuIntegration.java

@@ -17,7 +17,7 @@
  *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
  
-package com.seibel.lod.wrappers.config;
+package com.seibel.lod.fabric.wrappers.config;
 
 import com.seibel.lod.common.wrappers.gui.GetConfigScreen;
 import com.terraformersmc.modmenu.api.ConfigScreenFactory;

fabric/src/main/java/com/seibel/lod/fabric/wrappers/modAccessor/BCLibAccessor.java

@@ -1,4 +1,4 @@
-package com.seibel.lod.wrappers.modAccessor;
+package com.seibel.lod.fabric.wrappers.modAccessor;
 
 import com.seibel.lod.core.wrapperInterfaces.modAccessor.IBCLibAccessor;
 import ru.bclib.config.ClientConfig;

fabric/src/main/java/com/seibel/lod/fabric/wrappers/modAccessor/ModChecker.java

@@ -17,7 +17,7 @@
  *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
  
-package com.seibel.lod.wrappers.modAccessor;
+package com.seibel.lod.fabric.wrappers.modAccessor;
 
 import com.seibel.lod.core.wrapperInterfaces.modAccessor.IModChecker;
 import net.fabricmc.loader.api.FabricLoader;

fabric/src/main/java/com/seibel/lod/fabric/wrappers/modAccessor/OptifineAccessor.java

@@ -17,7 +17,7 @@
  *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
  
-package com.seibel.lod.wrappers.modAccessor;
+package com.seibel.lod.fabric.wrappers.modAccessor;
 
 import java.util.HashSet;
 

fabric/src/main/java/com/seibel/lod/fabric/wrappers/modAccessor/SodiumAccessor.java

@@ -17,7 +17,7 @@
  *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
  
-package com.seibel.lod.wrappers.modAccessor;
+package com.seibel.lod.fabric.wrappers.modAccessor;
 
 import java.util.HashSet;
 import java.util.stream.Collectors;

fabric/src/main/java/com/seibel/lod/fabric/wrappers/modAccessor/StarlightAccessor.java

@@ -17,7 +17,7 @@
  *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
  
-package com.seibel.lod.wrappers.modAccessor;
+package com.seibel.lod.fabric.wrappers.modAccessor;
 
 import com.seibel.lod.core.wrapperInterfaces.modAccessor.IStarlightAccessor;
 

fabric/src/main/resources/DistantHorizons.mixins.json

@@ -1,7 +1,7 @@
 {
   "required": true,
   "minVersion": "0.8",
-  "package": "com.seibel.lod.mixins",
+  "package": "com.seibel.lod.fabric.mixins",
   "mixins": [
     "server.unsafe.MixinThreadingDetector",
     "server.MixinChunkGenerator",
@@ -23,5 +23,5 @@
   "injectors": {
     "defaultRequire": 1
   },
-  "plugin": "com.seibel.lod.mixins.FabricMixinPlugin"
+  "plugin": "com.seibel.lod.fabric.mixins.FabricMixinPlugin"
 }

fabric/src/main/resources/fabric.mod.json

@@ -19,14 +19,14 @@
   "environment": "*",
   "entrypoints": {
     "client": [
-      "com.seibel.lod.FabricClientMain"
+      "com.seibel.lod.fabric.FabricClientMain"
     ],
     "server": [
-      "com.seibel.lod.FabricDedicatedServerMain"
+      "com.seibel.lod.fabric.FabricDedicatedServerMain"
     ],
 
     "modmenu": [
-      "com.seibel.lod.wrappers.config.ModMenuIntegration"
+      "com.seibel.lod.fabric.wrappers.config.ModMenuIntegration"
     ]
   },
 

forge/src/main/java/com/seibel/lod/forge/ForgeClientProxy.java

@@ -17,7 +17,7 @@
  *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.seibel.lod;
+package com.seibel.lod.forge;
 
 import com.seibel.lod.common.wrappers.world.ClientLevelWrapper;
 import com.seibel.lod.core.api.internal.ClientApi;

forge/src/main/java/com/seibel/lod/forge/ForgeMain.java

@@ -17,7 +17,7 @@
  *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.seibel.lod;
+package com.seibel.lod.forge;
 
 import com.seibel.lod.api.methods.events.abstractEvents.DhApiAfterDhInitEvent;
 import com.seibel.lod.api.methods.events.abstractEvents.DhApiBeforeDhInitEvent;
@@ -33,9 +33,9 @@ import com.seibel.lod.core.dependencyInjection.ModAccessorInjector;
 import com.seibel.lod.core.dependencyInjection.SingletonInjector;
 import com.seibel.lod.core.logging.DhLoggerBuilder;
 import com.seibel.lod.core.wrapperInterfaces.modAccessor.IOptifineAccessor;
-import com.seibel.lod.wrappers.ForgeDependencySetup;
+import com.seibel.lod.forge.wrappers.ForgeDependencySetup;
 
-import com.seibel.lod.wrappers.modAccessor.OptifineAccessor;
+import com.seibel.lod.forge.modAccessor.OptifineAccessor;
 
 import net.minecraft.client.renderer.block.model.BakedQuad;
 import net.minecraft.core.Direction;

forge/src/main/java/com/seibel/lod/forge/ForgeServerProxy.java

@@ -1,4 +1,4 @@
-package com.seibel.lod;
+package com.seibel.lod.forge;
 
 import com.seibel.lod.common.networking.Networking;
 import com.seibel.lod.common.wrappers.chunk.ChunkWrapper;

forge/src/main/java/com/seibel/lod/forge/mixins/ForgeMixinPlugin.java

@@ -1,4 +1,4 @@
-package com.seibel.lod.mixins;
+package com.seibel.lod.forge.mixins;
 
 import net.minecraftforge.fml.ModList;
 import org.objectweb.asm.tree.ClassNode;

forge/src/main/java/com/seibel/lod/forge/mixins/client/MixinDebugScreenOverlay.java

@@ -1,4 +1,4 @@
-package com.seibel.lod.mixins.client;
+package com.seibel.lod.forge.mixins.client;
 
 import com.seibel.lod.core.logging.f3.F3Screen;
 import net.minecraft.client.gui.components.DebugScreenOverlay;

forge/src/main/java/com/seibel/lod/forge/mixins/client/MixinFogRenderer.java

@@ -17,7 +17,7 @@
  *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.seibel.lod.mixins.client;
+package com.seibel.lod.forge.mixins.client;
 
 import com.seibel.lod.core.config.Config;
 import org.spongepowered.asm.mixin.Mixin;

forge/src/main/java/com/seibel/lod/forge/mixins/client/MixinGameRenderer.java

@@ -1,4 +1,4 @@
-package com.seibel.lod.mixins.client;
+package com.seibel.lod.forge.mixins.client;
 
 import com.seibel.lod.core.api.internal.ClientApi;
 import net.minecraft.client.renderer.GameRenderer;

forge/src/main/java/com/seibel/lod/forge/mixins/client/MixinLevelRenderer.java

@@ -17,7 +17,7 @@
  *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.seibel.lod.mixins.client;
+package com.seibel.lod.forge.mixins.client;
 
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.math.Matrix4f;

forge/src/main/java/com/seibel/lod/forge/mixins/client/MixinLightmap.java

@@ -1,4 +1,4 @@
-package com.seibel.lod.mixins.client;
+package com.seibel.lod.forge.mixins.client;
 
 
 import com.mojang.blaze3d.platform.NativeImage;

forge/src/main/java/com/seibel/lod/forge/mixins/client/MixinMinecraft.java

@@ -1,4 +1,4 @@
-package com.seibel.lod.mixins.client;
+package com.seibel.lod.forge.mixins.client;
 
 import com.seibel.lod.common.wrappers.gui.updater.UpdateModScreen;
 import com.seibel.lod.core.config.Config;

forge/src/main/java/com/seibel/lod/forge/mixins/client/MixinOptionsScreen.java

@@ -17,7 +17,7 @@
  *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
  
-package com.seibel.lod.mixins.client;
+package com.seibel.lod.forge.mixins.client;
 
 import com.seibel.lod.common.wrappers.gui.GetConfigScreen;
 import com.seibel.lod.common.wrappers.gui.TexturedButtonWidget;

forge/src/main/java/com/seibel/lod/forge/mixins/server/MixinChunkGenerator.java

@@ -17,7 +17,7 @@
  *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
  
-package com.seibel.lod.mixins.server;
+package com.seibel.lod.forge.mixins.server;
 
 import org.spongepowered.asm.mixin.Mixin;
 import net.minecraft.world.level.chunk.ChunkGenerator;

forge/src/main/java/com/seibel/lod/forge/mixins/server/MixinTFChunkGenerator.java

@@ -1,4 +1,4 @@
-package com.seibel.lod.mixins.server;
+package com.seibel.lod.forge.mixins.server;
 
 import net.minecraft.world.level.chunk.ChunkGenerator;
 import org.spongepowered.asm.mixin.Mixin;

forge/src/main/java/com/seibel/lod/forge/mixins/server/MixinUtilBackgroundThread.java

@@ -17,7 +17,7 @@
  *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
  
-package com.seibel.lod.mixins.server;
+package com.seibel.lod.forge.mixins.server;
 
 import java.util.concurrent.ExecutorService;
 import java.util.function.Supplier;

forge/src/main/java/com/seibel/lod/forge/mixins/server/unsafe/MixinThreadingDetector.java

@@ -17,7 +17,7 @@
  *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
  
-package com.seibel.lod.mixins.server.unsafe;
+package com.seibel.lod.forge.mixins.server.unsafe;
 import org.spongepowered.asm.mixin.Mixin;
 #if POST_MC_1_18_1
 

forge/src/main/java/com/seibel/lod/forge/modAccessor/ModChecker.java

@@ -17,7 +17,7 @@
  *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
  
-package com.seibel.lod.wrappers.modAccessor;
+package com.seibel.lod.forge.modAccessor;
 
 import com.seibel.lod.core.wrapperInterfaces.modAccessor.IModChecker;
 import net.minecraftforge.fml.ModList;

forge/src/main/java/com/seibel/lod/forge/modAccessor/OptifineAccessor.java

@@ -17,7 +17,7 @@
  *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
  
-package com.seibel.lod.wrappers.modAccessor;
+package com.seibel.lod.forge.modAccessor;
 
 import java.util.HashSet;
 

forge/src/main/java/com/seibel/lod/forge/wrappers/ForgeDependencySetup.java

@@ -17,11 +17,11 @@
  *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
  
-package com.seibel.lod.wrappers;
+package com.seibel.lod.forge.wrappers;
 
 import com.seibel.lod.core.dependencyInjection.SingletonInjector;
 import com.seibel.lod.core.wrapperInterfaces.modAccessor.IModChecker;
-import com.seibel.lod.wrappers.modAccessor.ModChecker;
+import com.seibel.lod.forge.modAccessor.ModChecker;
 
 /**
  * Binds all necessary dependencies so we

forge/src/main/resources/DistantHorizons.mixins.json

@@ -1,21 +1,21 @@
 {
 	"required": true,
 	"minVersion": "0.8",
-	"package": "com.seibel.lod.mixins",
+	"package": "com.seibel.lod.forge.mixins",
 	"mixins": [
-		"server.unsafe.MixinThreadingDetector",
-		"server.MixinUtilBackgroundThread",
-		"server.MixinChunkGenerator",
+      "com.seibel.lod.forge.mixins.server.unsafe.MixinThreadingDetector",
+      "com.seibel.lod.forge.mixins.server.MixinUtilBackgroundThread",
+      "com.seibel.lod.forge.mixins.server.MixinChunkGenerator",
 		"server.MixinTFChunkGenerator"
 	],
 	"client": [
-		"client.MixinDebugScreenOverlay",
-		"client.MixinFogRenderer",
-		"client.MixinGameRenderer",
-		"client.MixinLevelRenderer",
-		"client.MixinLightmap",
-		"client.MixinOptionsScreen"
+      "com.seibel.lod.forge.mixins.client.MixinDebugScreenOverlay",
+      "com.seibel.lod.forge.mixins.client.MixinFogRenderer",
+      "com.seibel.lod.forge.mixins.client.MixinGameRenderer",
+      "com.seibel.lod.forge.mixins.client.MixinLevelRenderer",
+      "com.seibel.lod.forge.mixins.client.MixinLightmap",
+      "com.seibel.lod.forge.mixins.client.MixinOptionsScreen"
 	],
 	"server": [],
-	"plugin": "com.seibel.lod.mixins.ForgeMixinPlugin"
+	"plugin": "com.seibel.lod.forge.mixins.ForgeMixinPlugin"
 }