Refactored fabric stuff to be in a fabric folder

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"
     ]
   },