From cc3a3c451c7dbce2040fe22f9d8145c3403eb4b9 Mon Sep 17 00:00:00 2001 From: coolGi Date: Sun, 12 Feb 2023 18:55:00 +1030 Subject: [PATCH] Refactored fabric stuff to be in a fabric folder --- .../seibel/lod/{ => fabric}/FabricClientMain.java | 2 +- .../seibel/lod/{ => fabric}/FabricClientProxy.java | 4 ++-- .../lod/{ => fabric}/FabricDedicatedServerMain.java | 2 +- .../java/com/seibel/lod/{ => fabric}/FabricMain.java | 12 ++++++------ .../seibel/lod/{ => fabric}/FabricServerProxy.java | 2 +- .../lod/{ => fabric}/mixins/FabricMixinPlugin.java | 2 +- .../{ => fabric}/mixins/client/MixinClientLevel.java | 2 +- .../mixins/client/MixinClientPacketListener.java | 2 +- .../mixins/client/MixinDebugScreenOverlay.java | 2 +- .../{ => fabric}/mixins/client/MixinFogRenderer.java | 2 +- .../mixins/client/MixinGameRenderer.java | 2 +- .../mixins/client/MixinLevelRenderer.java | 2 +- .../lod/fabric}/mixins/client/MixinLightmap.java | 2 +- .../{ => fabric}/mixins/client/MixinMinecraft.java | 2 +- .../mixins/client/MixinOptionsScreen.java | 2 +- .../{ => fabric}/mixins/events/MixinBlockUpdate.java | 2 +- .../{ => fabric}/mixins/events/MixinServerLevel.java | 2 +- .../mixins/mods/sodium/MixinSodiumChunkRenderer.java | 4 ++-- .../mixins/server/MixinChunkGenerator.java | 2 +- .../{ => fabric}/mixins/server/MixinChunkMap.java | 2 +- .../mixins/server/MixinUtilBackgroundThread.java | 4 ++-- .../mixins/server/unsafe/MixinThreadingDetector.java | 2 +- .../{ => fabric}/wrappers/FabricDependencySetup.java | 4 ++-- .../wrappers/config/ModMenuIntegration.java | 2 +- .../wrappers/modAccessor/BCLibAccessor.java | 2 +- .../wrappers/modAccessor/ModChecker.java | 2 +- .../wrappers/modAccessor/OptifineAccessor.java | 2 +- .../wrappers/modAccessor/SodiumAccessor.java | 2 +- .../wrappers/modAccessor/StarlightAccessor.java | 2 +- .../src/main/resources/DistantHorizons.mixins.json | 4 ++-- fabric/src/main/resources/fabric.mod.json | 6 +++--- .../lod/{ => fabric}/mixins/ForgeMixinPlugin.java | 0 .../mixins/client/MixinDebugScreenOverlay.java | 0 .../{ => fabric}/mixins/client/MixinFogRenderer.java | 0 .../mixins/client/MixinGameRenderer.java | 0 .../mixins/client/MixinLevelRenderer.java | 0 .../lod/fabric}/mixins/client/MixinLightmap.java | 0 .../{ => fabric}/mixins/client/MixinMinecraft.java | 0 .../mixins/client/MixinOptionsScreen.java | 0 .../mixins/server/MixinChunkGenerator.java | 0 .../mixins/server/MixinTFChunkGenerator.java | 0 .../mixins/server/MixinUtilBackgroundThread.java | 0 .../mixins/server/unsafe/MixinThreadingDetector.java | 0 .../{ => fabric}/wrappers/ForgeDependencySetup.java | 0 .../wrappers/modAccessor/ModChecker.java | 0 .../wrappers/modAccessor/OptifineAccessor.java | 0 46 files changed, 43 insertions(+), 43 deletions(-) rename fabric/src/main/java/com/seibel/lod/{ => fabric}/FabricClientMain.java (96%) rename fabric/src/main/java/com/seibel/lod/{ => fabric}/FabricClientProxy.java (98%) rename fabric/src/main/java/com/seibel/lod/{ => fabric}/FabricDedicatedServerMain.java (97%) rename fabric/src/main/java/com/seibel/lod/{ => fabric}/FabricMain.java (90%) rename fabric/src/main/java/com/seibel/lod/{ => fabric}/FabricServerProxy.java (99%) rename fabric/src/main/java/com/seibel/lod/{ => fabric}/mixins/FabricMixinPlugin.java (98%) rename fabric/src/main/java/com/seibel/lod/{ => fabric}/mixins/client/MixinClientLevel.java (98%) rename fabric/src/main/java/com/seibel/lod/{ => fabric}/mixins/client/MixinClientPacketListener.java (97%) rename {forge/src/main/java/com/seibel/lod => fabric/src/main/java/com/seibel/lod/fabric}/mixins/client/MixinDebugScreenOverlay.java (93%) rename fabric/src/main/java/com/seibel/lod/{ => fabric}/mixins/client/MixinFogRenderer.java (98%) rename fabric/src/main/java/com/seibel/lod/{ => fabric}/mixins/client/MixinGameRenderer.java (97%) rename fabric/src/main/java/com/seibel/lod/{ => fabric}/mixins/client/MixinLevelRenderer.java (99%) rename {forge/src/main/java/com/seibel/lod => fabric/src/main/java/com/seibel/lod/fabric}/mixins/client/MixinLightmap.java (95%) rename fabric/src/main/java/com/seibel/lod/{ => fabric}/mixins/client/MixinMinecraft.java (97%) rename fabric/src/main/java/com/seibel/lod/{ => fabric}/mixins/client/MixinOptionsScreen.java (98%) rename fabric/src/main/java/com/seibel/lod/{ => fabric}/mixins/events/MixinBlockUpdate.java (97%) rename fabric/src/main/java/com/seibel/lod/{ => fabric}/mixins/events/MixinServerLevel.java (97%) rename fabric/src/main/java/com/seibel/lod/{ => fabric}/mixins/mods/sodium/MixinSodiumChunkRenderer.java (94%) rename fabric/src/main/java/com/seibel/lod/{ => fabric}/mixins/server/MixinChunkGenerator.java (98%) rename fabric/src/main/java/com/seibel/lod/{ => fabric}/mixins/server/MixinChunkMap.java (96%) rename fabric/src/main/java/com/seibel/lod/{ => fabric}/mixins/server/MixinUtilBackgroundThread.java (96%) rename fabric/src/main/java/com/seibel/lod/{ => fabric}/mixins/server/unsafe/MixinThreadingDetector.java (97%) rename fabric/src/main/java/com/seibel/lod/{ => fabric}/wrappers/FabricDependencySetup.java (93%) rename fabric/src/main/java/com/seibel/lod/{ => fabric}/wrappers/config/ModMenuIntegration.java (96%) rename fabric/src/main/java/com/seibel/lod/{ => fabric}/wrappers/modAccessor/BCLibAccessor.java (93%) rename fabric/src/main/java/com/seibel/lod/{ => fabric}/wrappers/modAccessor/ModChecker.java (95%) rename fabric/src/main/java/com/seibel/lod/{ => fabric}/wrappers/modAccessor/OptifineAccessor.java (96%) rename fabric/src/main/java/com/seibel/lod/{ => fabric}/wrappers/modAccessor/SodiumAccessor.java (98%) rename fabric/src/main/java/com/seibel/lod/{ => fabric}/wrappers/modAccessor/StarlightAccessor.java (95%) rename forge/src/main/java/com/seibel/lod/{ => fabric}/mixins/ForgeMixinPlugin.java (100%) rename {fabric/src/main/java/com/seibel/lod => forge/src/main/java/com/seibel/lod/fabric}/mixins/client/MixinDebugScreenOverlay.java (100%) rename forge/src/main/java/com/seibel/lod/{ => fabric}/mixins/client/MixinFogRenderer.java (100%) rename forge/src/main/java/com/seibel/lod/{ => fabric}/mixins/client/MixinGameRenderer.java (100%) rename forge/src/main/java/com/seibel/lod/{ => fabric}/mixins/client/MixinLevelRenderer.java (100%) rename {fabric/src/main/java/com/seibel/lod => forge/src/main/java/com/seibel/lod/fabric}/mixins/client/MixinLightmap.java (100%) rename forge/src/main/java/com/seibel/lod/{ => fabric}/mixins/client/MixinMinecraft.java (100%) rename forge/src/main/java/com/seibel/lod/{ => fabric}/mixins/client/MixinOptionsScreen.java (100%) rename forge/src/main/java/com/seibel/lod/{ => fabric}/mixins/server/MixinChunkGenerator.java (100%) rename forge/src/main/java/com/seibel/lod/{ => fabric}/mixins/server/MixinTFChunkGenerator.java (100%) rename forge/src/main/java/com/seibel/lod/{ => fabric}/mixins/server/MixinUtilBackgroundThread.java (100%) rename forge/src/main/java/com/seibel/lod/{ => fabric}/mixins/server/unsafe/MixinThreadingDetector.java (100%) rename forge/src/main/java/com/seibel/lod/{ => fabric}/wrappers/ForgeDependencySetup.java (100%) rename forge/src/main/java/com/seibel/lod/{ => fabric}/wrappers/modAccessor/ModChecker.java (100%) rename forge/src/main/java/com/seibel/lod/{ => fabric}/wrappers/modAccessor/OptifineAccessor.java (100%) diff --git a/fabric/src/main/java/com/seibel/lod/FabricClientMain.java b/fabric/src/main/java/com/seibel/lod/fabric/FabricClientMain.java similarity index 96% rename from fabric/src/main/java/com/seibel/lod/FabricClientMain.java rename to fabric/src/main/java/com/seibel/lod/fabric/FabricClientMain.java index 96078e586..bb16c7a17 100644 --- a/fabric/src/main/java/com/seibel/lod/FabricClientMain.java +++ b/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; diff --git a/fabric/src/main/java/com/seibel/lod/FabricClientProxy.java b/fabric/src/main/java/com/seibel/lod/fabric/FabricClientProxy.java similarity index 98% rename from fabric/src/main/java/com/seibel/lod/FabricClientProxy.java rename to fabric/src/main/java/com/seibel/lod/fabric/FabricClientProxy.java index fee1708ca..7e1a111bd 100644 --- a/fabric/src/main/java/com/seibel/lod/FabricClientProxy.java +++ b/fabric/src/main/java/com/seibel/lod/fabric/FabricClientProxy.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -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; diff --git a/fabric/src/main/java/com/seibel/lod/FabricDedicatedServerMain.java b/fabric/src/main/java/com/seibel/lod/fabric/FabricDedicatedServerMain.java similarity index 97% rename from fabric/src/main/java/com/seibel/lod/FabricDedicatedServerMain.java rename to fabric/src/main/java/com/seibel/lod/fabric/FabricDedicatedServerMain.java index de18f80e4..1bbc05b5f 100644 --- a/fabric/src/main/java/com/seibel/lod/FabricDedicatedServerMain.java +++ b/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; diff --git a/fabric/src/main/java/com/seibel/lod/FabricMain.java b/fabric/src/main/java/com/seibel/lod/fabric/FabricMain.java similarity index 90% rename from fabric/src/main/java/com/seibel/lod/FabricMain.java rename to fabric/src/main/java/com/seibel/lod/fabric/FabricMain.java index f7a00ed6d..a70f0af2b 100644 --- a/fabric/src/main/java/com/seibel/lod/FabricMain.java +++ b/fabric/src/main/java/com/seibel/lod/fabric/FabricMain.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -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; diff --git a/fabric/src/main/java/com/seibel/lod/FabricServerProxy.java b/fabric/src/main/java/com/seibel/lod/fabric/FabricServerProxy.java similarity index 99% rename from fabric/src/main/java/com/seibel/lod/FabricServerProxy.java rename to fabric/src/main/java/com/seibel/lod/fabric/FabricServerProxy.java index 3012cb5e9..ab6b2e08a 100644 --- a/fabric/src/main/java/com/seibel/lod/FabricServerProxy.java +++ b/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; diff --git a/fabric/src/main/java/com/seibel/lod/mixins/FabricMixinPlugin.java b/fabric/src/main/java/com/seibel/lod/fabric/mixins/FabricMixinPlugin.java similarity index 98% rename from fabric/src/main/java/com/seibel/lod/mixins/FabricMixinPlugin.java rename to fabric/src/main/java/com/seibel/lod/fabric/mixins/FabricMixinPlugin.java index 0309130dc..e280383cb 100644 --- a/fabric/src/main/java/com/seibel/lod/mixins/FabricMixinPlugin.java +++ b/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; diff --git a/fabric/src/main/java/com/seibel/lod/mixins/client/MixinClientLevel.java b/fabric/src/main/java/com/seibel/lod/fabric/mixins/client/MixinClientLevel.java similarity index 98% rename from fabric/src/main/java/com/seibel/lod/mixins/client/MixinClientLevel.java rename to fabric/src/main/java/com/seibel/lod/fabric/mixins/client/MixinClientLevel.java index 1dcd189d4..2f7a9acf4 100644 --- a/fabric/src/main/java/com/seibel/lod/mixins/client/MixinClientLevel.java +++ b/fabric/src/main/java/com/seibel/lod/fabric/mixins/client/MixinClientLevel.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -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; diff --git a/fabric/src/main/java/com/seibel/lod/mixins/client/MixinClientPacketListener.java b/fabric/src/main/java/com/seibel/lod/fabric/mixins/client/MixinClientPacketListener.java similarity index 97% rename from fabric/src/main/java/com/seibel/lod/mixins/client/MixinClientPacketListener.java rename to fabric/src/main/java/com/seibel/lod/fabric/mixins/client/MixinClientPacketListener.java index d4de0305f..d745d27bc 100644 --- a/fabric/src/main/java/com/seibel/lod/mixins/client/MixinClientPacketListener.java +++ b/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; diff --git a/forge/src/main/java/com/seibel/lod/mixins/client/MixinDebugScreenOverlay.java b/fabric/src/main/java/com/seibel/lod/fabric/mixins/client/MixinDebugScreenOverlay.java similarity index 93% rename from forge/src/main/java/com/seibel/lod/mixins/client/MixinDebugScreenOverlay.java rename to fabric/src/main/java/com/seibel/lod/fabric/mixins/client/MixinDebugScreenOverlay.java index 8843f916f..3e97b5215 100644 --- a/forge/src/main/java/com/seibel/lod/mixins/client/MixinDebugScreenOverlay.java +++ b/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; diff --git a/fabric/src/main/java/com/seibel/lod/mixins/client/MixinFogRenderer.java b/fabric/src/main/java/com/seibel/lod/fabric/mixins/client/MixinFogRenderer.java similarity index 98% rename from fabric/src/main/java/com/seibel/lod/mixins/client/MixinFogRenderer.java rename to fabric/src/main/java/com/seibel/lod/fabric/mixins/client/MixinFogRenderer.java index fa91bdeef..cbf1e14b9 100644 --- a/fabric/src/main/java/com/seibel/lod/mixins/client/MixinFogRenderer.java +++ b/fabric/src/main/java/com/seibel/lod/fabric/mixins/client/MixinFogRenderer.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -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; diff --git a/fabric/src/main/java/com/seibel/lod/mixins/client/MixinGameRenderer.java b/fabric/src/main/java/com/seibel/lod/fabric/mixins/client/MixinGameRenderer.java similarity index 97% rename from fabric/src/main/java/com/seibel/lod/mixins/client/MixinGameRenderer.java rename to fabric/src/main/java/com/seibel/lod/fabric/mixins/client/MixinGameRenderer.java index d209143e2..ca204659c 100644 --- a/fabric/src/main/java/com/seibel/lod/mixins/client/MixinGameRenderer.java +++ b/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; diff --git a/fabric/src/main/java/com/seibel/lod/mixins/client/MixinLevelRenderer.java b/fabric/src/main/java/com/seibel/lod/fabric/mixins/client/MixinLevelRenderer.java similarity index 99% rename from fabric/src/main/java/com/seibel/lod/mixins/client/MixinLevelRenderer.java rename to fabric/src/main/java/com/seibel/lod/fabric/mixins/client/MixinLevelRenderer.java index a1d09931d..ce1dfa66a 100644 --- a/fabric/src/main/java/com/seibel/lod/mixins/client/MixinLevelRenderer.java +++ b/fabric/src/main/java/com/seibel/lod/fabric/mixins/client/MixinLevelRenderer.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package com.seibel.lod.mixins.client; +package com.seibel.lod.fabric.mixins.client; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.math.Matrix4f; diff --git a/forge/src/main/java/com/seibel/lod/mixins/client/MixinLightmap.java b/fabric/src/main/java/com/seibel/lod/fabric/mixins/client/MixinLightmap.java similarity index 95% rename from forge/src/main/java/com/seibel/lod/mixins/client/MixinLightmap.java rename to fabric/src/main/java/com/seibel/lod/fabric/mixins/client/MixinLightmap.java index 0b56a5745..fc909c5ed 100644 --- a/forge/src/main/java/com/seibel/lod/mixins/client/MixinLightmap.java +++ b/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; diff --git a/fabric/src/main/java/com/seibel/lod/mixins/client/MixinMinecraft.java b/fabric/src/main/java/com/seibel/lod/fabric/mixins/client/MixinMinecraft.java similarity index 97% rename from fabric/src/main/java/com/seibel/lod/mixins/client/MixinMinecraft.java rename to fabric/src/main/java/com/seibel/lod/fabric/mixins/client/MixinMinecraft.java index 6741eec00..7c72be43e 100644 --- a/fabric/src/main/java/com/seibel/lod/mixins/client/MixinMinecraft.java +++ b/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; diff --git a/fabric/src/main/java/com/seibel/lod/mixins/client/MixinOptionsScreen.java b/fabric/src/main/java/com/seibel/lod/fabric/mixins/client/MixinOptionsScreen.java similarity index 98% rename from fabric/src/main/java/com/seibel/lod/mixins/client/MixinOptionsScreen.java rename to fabric/src/main/java/com/seibel/lod/fabric/mixins/client/MixinOptionsScreen.java index 2d57ed31f..780dfaeb1 100644 --- a/fabric/src/main/java/com/seibel/lod/mixins/client/MixinOptionsScreen.java +++ b/fabric/src/main/java/com/seibel/lod/fabric/mixins/client/MixinOptionsScreen.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -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; diff --git a/fabric/src/main/java/com/seibel/lod/mixins/events/MixinBlockUpdate.java b/fabric/src/main/java/com/seibel/lod/fabric/mixins/events/MixinBlockUpdate.java similarity index 97% rename from fabric/src/main/java/com/seibel/lod/mixins/events/MixinBlockUpdate.java rename to fabric/src/main/java/com/seibel/lod/fabric/mixins/events/MixinBlockUpdate.java index 14d4ba3f8..0aa6a3452 100644 --- a/fabric/src/main/java/com/seibel/lod/mixins/events/MixinBlockUpdate.java +++ b/fabric/src/main/java/com/seibel/lod/fabric/mixins/events/MixinBlockUpdate.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -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; diff --git a/fabric/src/main/java/com/seibel/lod/mixins/events/MixinServerLevel.java b/fabric/src/main/java/com/seibel/lod/fabric/mixins/events/MixinServerLevel.java similarity index 97% rename from fabric/src/main/java/com/seibel/lod/mixins/events/MixinServerLevel.java rename to fabric/src/main/java/com/seibel/lod/fabric/mixins/events/MixinServerLevel.java index 388570ab0..678163a79 100644 --- a/fabric/src/main/java/com/seibel/lod/mixins/events/MixinServerLevel.java +++ b/fabric/src/main/java/com/seibel/lod/fabric/mixins/events/MixinServerLevel.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -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; diff --git a/fabric/src/main/java/com/seibel/lod/mixins/mods/sodium/MixinSodiumChunkRenderer.java b/fabric/src/main/java/com/seibel/lod/fabric/mixins/mods/sodium/MixinSodiumChunkRenderer.java similarity index 94% rename from fabric/src/main/java/com/seibel/lod/mixins/mods/sodium/MixinSodiumChunkRenderer.java rename to fabric/src/main/java/com/seibel/lod/fabric/mixins/mods/sodium/MixinSodiumChunkRenderer.java index 627ef8665..27ae4d231 100644 --- a/fabric/src/main/java/com/seibel/lod/mixins/mods/sodium/MixinSodiumChunkRenderer.java +++ b/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; diff --git a/fabric/src/main/java/com/seibel/lod/mixins/server/MixinChunkGenerator.java b/fabric/src/main/java/com/seibel/lod/fabric/mixins/server/MixinChunkGenerator.java similarity index 98% rename from fabric/src/main/java/com/seibel/lod/mixins/server/MixinChunkGenerator.java rename to fabric/src/main/java/com/seibel/lod/fabric/mixins/server/MixinChunkGenerator.java index 5bfd3c5b7..4fae15c45 100644 --- a/fabric/src/main/java/com/seibel/lod/mixins/server/MixinChunkGenerator.java +++ b/fabric/src/main/java/com/seibel/lod/fabric/mixins/server/MixinChunkGenerator.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -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; diff --git a/fabric/src/main/java/com/seibel/lod/mixins/server/MixinChunkMap.java b/fabric/src/main/java/com/seibel/lod/fabric/mixins/server/MixinChunkMap.java similarity index 96% rename from fabric/src/main/java/com/seibel/lod/mixins/server/MixinChunkMap.java rename to fabric/src/main/java/com/seibel/lod/fabric/mixins/server/MixinChunkMap.java index 44aa27360..a43432d55 100644 --- a/fabric/src/main/java/com/seibel/lod/mixins/server/MixinChunkMap.java +++ b/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; diff --git a/fabric/src/main/java/com/seibel/lod/mixins/server/MixinUtilBackgroundThread.java b/fabric/src/main/java/com/seibel/lod/fabric/mixins/server/MixinUtilBackgroundThread.java similarity index 96% rename from fabric/src/main/java/com/seibel/lod/mixins/server/MixinUtilBackgroundThread.java rename to fabric/src/main/java/com/seibel/lod/fabric/mixins/server/MixinUtilBackgroundThread.java index 66ea5de84..464ac14e6 100644 --- a/fabric/src/main/java/com/seibel/lod/mixins/server/MixinUtilBackgroundThread.java +++ b/fabric/src/main/java/com/seibel/lod/fabric/mixins/server/MixinUtilBackgroundThread.java @@ -17,12 +17,12 @@ * along with this program. If not, see . */ -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; diff --git a/fabric/src/main/java/com/seibel/lod/mixins/server/unsafe/MixinThreadingDetector.java b/fabric/src/main/java/com/seibel/lod/fabric/mixins/server/unsafe/MixinThreadingDetector.java similarity index 97% rename from fabric/src/main/java/com/seibel/lod/mixins/server/unsafe/MixinThreadingDetector.java rename to fabric/src/main/java/com/seibel/lod/fabric/mixins/server/unsafe/MixinThreadingDetector.java index ea2f5a9df..8496c6b50 100644 --- a/fabric/src/main/java/com/seibel/lod/mixins/server/unsafe/MixinThreadingDetector.java +++ b/fabric/src/main/java/com/seibel/lod/fabric/mixins/server/unsafe/MixinThreadingDetector.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package com.seibel.lod.mixins.server.unsafe; +package com.seibel.lod.fabric.mixins.server.unsafe; import org.spongepowered.asm.mixin.Mixin; diff --git a/fabric/src/main/java/com/seibel/lod/wrappers/FabricDependencySetup.java b/fabric/src/main/java/com/seibel/lod/fabric/wrappers/FabricDependencySetup.java similarity index 93% rename from fabric/src/main/java/com/seibel/lod/wrappers/FabricDependencySetup.java rename to fabric/src/main/java/com/seibel/lod/fabric/wrappers/FabricDependencySetup.java index f46acae49..c009de011 100644 --- a/fabric/src/main/java/com/seibel/lod/wrappers/FabricDependencySetup.java +++ b/fabric/src/main/java/com/seibel/lod/fabric/wrappers/FabricDependencySetup.java @@ -17,11 +17,11 @@ * along with this program. If not, see . */ -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 diff --git a/fabric/src/main/java/com/seibel/lod/wrappers/config/ModMenuIntegration.java b/fabric/src/main/java/com/seibel/lod/fabric/wrappers/config/ModMenuIntegration.java similarity index 96% rename from fabric/src/main/java/com/seibel/lod/wrappers/config/ModMenuIntegration.java rename to fabric/src/main/java/com/seibel/lod/fabric/wrappers/config/ModMenuIntegration.java index c051e62d3..bac629bc1 100644 --- a/fabric/src/main/java/com/seibel/lod/wrappers/config/ModMenuIntegration.java +++ b/fabric/src/main/java/com/seibel/lod/fabric/wrappers/config/ModMenuIntegration.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -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; diff --git a/fabric/src/main/java/com/seibel/lod/wrappers/modAccessor/BCLibAccessor.java b/fabric/src/main/java/com/seibel/lod/fabric/wrappers/modAccessor/BCLibAccessor.java similarity index 93% rename from fabric/src/main/java/com/seibel/lod/wrappers/modAccessor/BCLibAccessor.java rename to fabric/src/main/java/com/seibel/lod/fabric/wrappers/modAccessor/BCLibAccessor.java index 4a378bf5e..c4c043956 100644 --- a/fabric/src/main/java/com/seibel/lod/wrappers/modAccessor/BCLibAccessor.java +++ b/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; diff --git a/fabric/src/main/java/com/seibel/lod/wrappers/modAccessor/ModChecker.java b/fabric/src/main/java/com/seibel/lod/fabric/wrappers/modAccessor/ModChecker.java similarity index 95% rename from fabric/src/main/java/com/seibel/lod/wrappers/modAccessor/ModChecker.java rename to fabric/src/main/java/com/seibel/lod/fabric/wrappers/modAccessor/ModChecker.java index ead19fddd..17759e027 100644 --- a/fabric/src/main/java/com/seibel/lod/wrappers/modAccessor/ModChecker.java +++ b/fabric/src/main/java/com/seibel/lod/fabric/wrappers/modAccessor/ModChecker.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -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; diff --git a/fabric/src/main/java/com/seibel/lod/wrappers/modAccessor/OptifineAccessor.java b/fabric/src/main/java/com/seibel/lod/fabric/wrappers/modAccessor/OptifineAccessor.java similarity index 96% rename from fabric/src/main/java/com/seibel/lod/wrappers/modAccessor/OptifineAccessor.java rename to fabric/src/main/java/com/seibel/lod/fabric/wrappers/modAccessor/OptifineAccessor.java index 3d295e77d..0d2c838fb 100644 --- a/fabric/src/main/java/com/seibel/lod/wrappers/modAccessor/OptifineAccessor.java +++ b/fabric/src/main/java/com/seibel/lod/fabric/wrappers/modAccessor/OptifineAccessor.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package com.seibel.lod.wrappers.modAccessor; +package com.seibel.lod.fabric.wrappers.modAccessor; import java.util.HashSet; diff --git a/fabric/src/main/java/com/seibel/lod/wrappers/modAccessor/SodiumAccessor.java b/fabric/src/main/java/com/seibel/lod/fabric/wrappers/modAccessor/SodiumAccessor.java similarity index 98% rename from fabric/src/main/java/com/seibel/lod/wrappers/modAccessor/SodiumAccessor.java rename to fabric/src/main/java/com/seibel/lod/fabric/wrappers/modAccessor/SodiumAccessor.java index 7081f480d..2f083939a 100644 --- a/fabric/src/main/java/com/seibel/lod/wrappers/modAccessor/SodiumAccessor.java +++ b/fabric/src/main/java/com/seibel/lod/fabric/wrappers/modAccessor/SodiumAccessor.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package com.seibel.lod.wrappers.modAccessor; +package com.seibel.lod.fabric.wrappers.modAccessor; import java.util.HashSet; import java.util.stream.Collectors; diff --git a/fabric/src/main/java/com/seibel/lod/wrappers/modAccessor/StarlightAccessor.java b/fabric/src/main/java/com/seibel/lod/fabric/wrappers/modAccessor/StarlightAccessor.java similarity index 95% rename from fabric/src/main/java/com/seibel/lod/wrappers/modAccessor/StarlightAccessor.java rename to fabric/src/main/java/com/seibel/lod/fabric/wrappers/modAccessor/StarlightAccessor.java index 2293e87f3..727a558ae 100644 --- a/fabric/src/main/java/com/seibel/lod/wrappers/modAccessor/StarlightAccessor.java +++ b/fabric/src/main/java/com/seibel/lod/fabric/wrappers/modAccessor/StarlightAccessor.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package com.seibel.lod.wrappers.modAccessor; +package com.seibel.lod.fabric.wrappers.modAccessor; import com.seibel.lod.core.wrapperInterfaces.modAccessor.IStarlightAccessor; diff --git a/fabric/src/main/resources/DistantHorizons.mixins.json b/fabric/src/main/resources/DistantHorizons.mixins.json index 5763e424e..23233091c 100644 --- a/fabric/src/main/resources/DistantHorizons.mixins.json +++ b/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" } diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json index b63bf5f28..84ae1a058 100644 --- a/fabric/src/main/resources/fabric.mod.json +++ b/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" ] }, diff --git a/forge/src/main/java/com/seibel/lod/mixins/ForgeMixinPlugin.java b/forge/src/main/java/com/seibel/lod/fabric/mixins/ForgeMixinPlugin.java similarity index 100% rename from forge/src/main/java/com/seibel/lod/mixins/ForgeMixinPlugin.java rename to forge/src/main/java/com/seibel/lod/fabric/mixins/ForgeMixinPlugin.java diff --git a/fabric/src/main/java/com/seibel/lod/mixins/client/MixinDebugScreenOverlay.java b/forge/src/main/java/com/seibel/lod/fabric/mixins/client/MixinDebugScreenOverlay.java similarity index 100% rename from fabric/src/main/java/com/seibel/lod/mixins/client/MixinDebugScreenOverlay.java rename to forge/src/main/java/com/seibel/lod/fabric/mixins/client/MixinDebugScreenOverlay.java diff --git a/forge/src/main/java/com/seibel/lod/mixins/client/MixinFogRenderer.java b/forge/src/main/java/com/seibel/lod/fabric/mixins/client/MixinFogRenderer.java similarity index 100% rename from forge/src/main/java/com/seibel/lod/mixins/client/MixinFogRenderer.java rename to forge/src/main/java/com/seibel/lod/fabric/mixins/client/MixinFogRenderer.java diff --git a/forge/src/main/java/com/seibel/lod/mixins/client/MixinGameRenderer.java b/forge/src/main/java/com/seibel/lod/fabric/mixins/client/MixinGameRenderer.java similarity index 100% rename from forge/src/main/java/com/seibel/lod/mixins/client/MixinGameRenderer.java rename to forge/src/main/java/com/seibel/lod/fabric/mixins/client/MixinGameRenderer.java diff --git a/forge/src/main/java/com/seibel/lod/mixins/client/MixinLevelRenderer.java b/forge/src/main/java/com/seibel/lod/fabric/mixins/client/MixinLevelRenderer.java similarity index 100% rename from forge/src/main/java/com/seibel/lod/mixins/client/MixinLevelRenderer.java rename to forge/src/main/java/com/seibel/lod/fabric/mixins/client/MixinLevelRenderer.java diff --git a/fabric/src/main/java/com/seibel/lod/mixins/client/MixinLightmap.java b/forge/src/main/java/com/seibel/lod/fabric/mixins/client/MixinLightmap.java similarity index 100% rename from fabric/src/main/java/com/seibel/lod/mixins/client/MixinLightmap.java rename to forge/src/main/java/com/seibel/lod/fabric/mixins/client/MixinLightmap.java diff --git a/forge/src/main/java/com/seibel/lod/mixins/client/MixinMinecraft.java b/forge/src/main/java/com/seibel/lod/fabric/mixins/client/MixinMinecraft.java similarity index 100% rename from forge/src/main/java/com/seibel/lod/mixins/client/MixinMinecraft.java rename to forge/src/main/java/com/seibel/lod/fabric/mixins/client/MixinMinecraft.java diff --git a/forge/src/main/java/com/seibel/lod/mixins/client/MixinOptionsScreen.java b/forge/src/main/java/com/seibel/lod/fabric/mixins/client/MixinOptionsScreen.java similarity index 100% rename from forge/src/main/java/com/seibel/lod/mixins/client/MixinOptionsScreen.java rename to forge/src/main/java/com/seibel/lod/fabric/mixins/client/MixinOptionsScreen.java diff --git a/forge/src/main/java/com/seibel/lod/mixins/server/MixinChunkGenerator.java b/forge/src/main/java/com/seibel/lod/fabric/mixins/server/MixinChunkGenerator.java similarity index 100% rename from forge/src/main/java/com/seibel/lod/mixins/server/MixinChunkGenerator.java rename to forge/src/main/java/com/seibel/lod/fabric/mixins/server/MixinChunkGenerator.java diff --git a/forge/src/main/java/com/seibel/lod/mixins/server/MixinTFChunkGenerator.java b/forge/src/main/java/com/seibel/lod/fabric/mixins/server/MixinTFChunkGenerator.java similarity index 100% rename from forge/src/main/java/com/seibel/lod/mixins/server/MixinTFChunkGenerator.java rename to forge/src/main/java/com/seibel/lod/fabric/mixins/server/MixinTFChunkGenerator.java diff --git a/forge/src/main/java/com/seibel/lod/mixins/server/MixinUtilBackgroundThread.java b/forge/src/main/java/com/seibel/lod/fabric/mixins/server/MixinUtilBackgroundThread.java similarity index 100% rename from forge/src/main/java/com/seibel/lod/mixins/server/MixinUtilBackgroundThread.java rename to forge/src/main/java/com/seibel/lod/fabric/mixins/server/MixinUtilBackgroundThread.java diff --git a/forge/src/main/java/com/seibel/lod/mixins/server/unsafe/MixinThreadingDetector.java b/forge/src/main/java/com/seibel/lod/fabric/mixins/server/unsafe/MixinThreadingDetector.java similarity index 100% rename from forge/src/main/java/com/seibel/lod/mixins/server/unsafe/MixinThreadingDetector.java rename to forge/src/main/java/com/seibel/lod/fabric/mixins/server/unsafe/MixinThreadingDetector.java diff --git a/forge/src/main/java/com/seibel/lod/wrappers/ForgeDependencySetup.java b/forge/src/main/java/com/seibel/lod/fabric/wrappers/ForgeDependencySetup.java similarity index 100% rename from forge/src/main/java/com/seibel/lod/wrappers/ForgeDependencySetup.java rename to forge/src/main/java/com/seibel/lod/fabric/wrappers/ForgeDependencySetup.java diff --git a/forge/src/main/java/com/seibel/lod/wrappers/modAccessor/ModChecker.java b/forge/src/main/java/com/seibel/lod/fabric/wrappers/modAccessor/ModChecker.java similarity index 100% rename from forge/src/main/java/com/seibel/lod/wrappers/modAccessor/ModChecker.java rename to forge/src/main/java/com/seibel/lod/fabric/wrappers/modAccessor/ModChecker.java diff --git a/forge/src/main/java/com/seibel/lod/wrappers/modAccessor/OptifineAccessor.java b/forge/src/main/java/com/seibel/lod/fabric/wrappers/modAccessor/OptifineAccessor.java similarity index 100% rename from forge/src/main/java/com/seibel/lod/wrappers/modAccessor/OptifineAccessor.java rename to forge/src/main/java/com/seibel/lod/fabric/wrappers/modAccessor/OptifineAccessor.java