From bc5861ea95eb8addf426c90beaca2b7ba86c40e0 Mon Sep 17 00:00:00 2001 From: coolGi Date: Sun, 12 Feb 2023 18:59:27 +1030 Subject: [PATCH] Refactored forge stuff to be in a forge folder --- .../lod/{ => forge}/ForgeClientProxy.java | 2 +- .../com/seibel/lod/{ => forge}/ForgeMain.java | 6 ++--- .../lod/{ => forge}/ForgeServerProxy.java | 2 +- .../mixins/ForgeMixinPlugin.java | 2 +- .../client/MixinDebugScreenOverlay.java | 2 +- .../mixins/client/MixinFogRenderer.java | 2 +- .../mixins/client/MixinGameRenderer.java | 2 +- .../mixins/client/MixinLevelRenderer.java | 2 +- .../mixins/client/MixinLightmap.java | 2 +- .../mixins/client/MixinMinecraft.java | 2 +- .../mixins/client/MixinOptionsScreen.java | 2 +- .../mixins/server/MixinChunkGenerator.java | 2 +- .../mixins/server/MixinTFChunkGenerator.java | 2 +- .../server/MixinUtilBackgroundThread.java | 2 +- .../server/unsafe/MixinThreadingDetector.java | 2 +- .../modAccessor/ModChecker.java | 2 +- .../modAccessor/OptifineAccessor.java | 2 +- .../wrappers/ForgeDependencySetup.java | 4 ++-- .../resources/DistantHorizons.mixins.json | 22 +++++++++---------- 19 files changed, 32 insertions(+), 32 deletions(-) rename forge/src/main/java/com/seibel/lod/{ => forge}/ForgeClientProxy.java (99%) rename forge/src/main/java/com/seibel/lod/{ => forge}/ForgeMain.java (97%) rename forge/src/main/java/com/seibel/lod/{ => forge}/ForgeServerProxy.java (99%) rename forge/src/main/java/com/seibel/lod/{fabric => forge}/mixins/ForgeMixinPlugin.java (97%) rename forge/src/main/java/com/seibel/lod/{fabric => forge}/mixins/client/MixinDebugScreenOverlay.java (93%) rename forge/src/main/java/com/seibel/lod/{fabric => forge}/mixins/client/MixinFogRenderer.java (98%) rename forge/src/main/java/com/seibel/lod/{fabric => forge}/mixins/client/MixinGameRenderer.java (97%) rename forge/src/main/java/com/seibel/lod/{fabric => forge}/mixins/client/MixinLevelRenderer.java (99%) rename forge/src/main/java/com/seibel/lod/{fabric => forge}/mixins/client/MixinLightmap.java (95%) rename forge/src/main/java/com/seibel/lod/{fabric => forge}/mixins/client/MixinMinecraft.java (97%) rename forge/src/main/java/com/seibel/lod/{fabric => forge}/mixins/client/MixinOptionsScreen.java (98%) rename forge/src/main/java/com/seibel/lod/{fabric => forge}/mixins/server/MixinChunkGenerator.java (98%) rename forge/src/main/java/com/seibel/lod/{fabric => forge}/mixins/server/MixinTFChunkGenerator.java (97%) rename forge/src/main/java/com/seibel/lod/{fabric => forge}/mixins/server/MixinUtilBackgroundThread.java (98%) rename forge/src/main/java/com/seibel/lod/{fabric => forge}/mixins/server/unsafe/MixinThreadingDetector.java (97%) rename forge/src/main/java/com/seibel/lod/{fabric/wrappers => forge}/modAccessor/ModChecker.java (96%) rename forge/src/main/java/com/seibel/lod/{fabric/wrappers => forge}/modAccessor/OptifineAccessor.java (96%) rename forge/src/main/java/com/seibel/lod/{fabric => forge}/wrappers/ForgeDependencySetup.java (93%) diff --git a/forge/src/main/java/com/seibel/lod/ForgeClientProxy.java b/forge/src/main/java/com/seibel/lod/forge/ForgeClientProxy.java similarity index 99% rename from forge/src/main/java/com/seibel/lod/ForgeClientProxy.java rename to forge/src/main/java/com/seibel/lod/forge/ForgeClientProxy.java index daddca7b6..5843b5e36 100644 --- a/forge/src/main/java/com/seibel/lod/ForgeClientProxy.java +++ b/forge/src/main/java/com/seibel/lod/forge/ForgeClientProxy.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -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; diff --git a/forge/src/main/java/com/seibel/lod/ForgeMain.java b/forge/src/main/java/com/seibel/lod/forge/ForgeMain.java similarity index 97% rename from forge/src/main/java/com/seibel/lod/ForgeMain.java rename to forge/src/main/java/com/seibel/lod/forge/ForgeMain.java index 983967405..bb3815b41 100644 --- a/forge/src/main/java/com/seibel/lod/ForgeMain.java +++ b/forge/src/main/java/com/seibel/lod/forge/ForgeMain.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -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; diff --git a/forge/src/main/java/com/seibel/lod/ForgeServerProxy.java b/forge/src/main/java/com/seibel/lod/forge/ForgeServerProxy.java similarity index 99% rename from forge/src/main/java/com/seibel/lod/ForgeServerProxy.java rename to forge/src/main/java/com/seibel/lod/forge/ForgeServerProxy.java index 0cb02b88f..4f05aa047 100644 --- a/forge/src/main/java/com/seibel/lod/ForgeServerProxy.java +++ b/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; diff --git a/forge/src/main/java/com/seibel/lod/fabric/mixins/ForgeMixinPlugin.java b/forge/src/main/java/com/seibel/lod/forge/mixins/ForgeMixinPlugin.java similarity index 97% rename from forge/src/main/java/com/seibel/lod/fabric/mixins/ForgeMixinPlugin.java rename to forge/src/main/java/com/seibel/lod/forge/mixins/ForgeMixinPlugin.java index 7316789fa..06388b939 100644 --- a/forge/src/main/java/com/seibel/lod/fabric/mixins/ForgeMixinPlugin.java +++ b/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; diff --git a/forge/src/main/java/com/seibel/lod/fabric/mixins/client/MixinDebugScreenOverlay.java b/forge/src/main/java/com/seibel/lod/forge/mixins/client/MixinDebugScreenOverlay.java similarity index 93% rename from forge/src/main/java/com/seibel/lod/fabric/mixins/client/MixinDebugScreenOverlay.java rename to forge/src/main/java/com/seibel/lod/forge/mixins/client/MixinDebugScreenOverlay.java index 8843f916f..28fd7658b 100644 --- a/forge/src/main/java/com/seibel/lod/fabric/mixins/client/MixinDebugScreenOverlay.java +++ b/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; diff --git a/forge/src/main/java/com/seibel/lod/fabric/mixins/client/MixinFogRenderer.java b/forge/src/main/java/com/seibel/lod/forge/mixins/client/MixinFogRenderer.java similarity index 98% rename from forge/src/main/java/com/seibel/lod/fabric/mixins/client/MixinFogRenderer.java rename to forge/src/main/java/com/seibel/lod/forge/mixins/client/MixinFogRenderer.java index 6b52582f2..fb7647618 100644 --- a/forge/src/main/java/com/seibel/lod/fabric/mixins/client/MixinFogRenderer.java +++ b/forge/src/main/java/com/seibel/lod/forge/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.forge.mixins.client; import com.seibel.lod.core.config.Config; import org.spongepowered.asm.mixin.Mixin; diff --git a/forge/src/main/java/com/seibel/lod/fabric/mixins/client/MixinGameRenderer.java b/forge/src/main/java/com/seibel/lod/forge/mixins/client/MixinGameRenderer.java similarity index 97% rename from forge/src/main/java/com/seibel/lod/fabric/mixins/client/MixinGameRenderer.java rename to forge/src/main/java/com/seibel/lod/forge/mixins/client/MixinGameRenderer.java index 8681ac4ea..2fecf88c4 100644 --- a/forge/src/main/java/com/seibel/lod/fabric/mixins/client/MixinGameRenderer.java +++ b/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; diff --git a/forge/src/main/java/com/seibel/lod/fabric/mixins/client/MixinLevelRenderer.java b/forge/src/main/java/com/seibel/lod/forge/mixins/client/MixinLevelRenderer.java similarity index 99% rename from forge/src/main/java/com/seibel/lod/fabric/mixins/client/MixinLevelRenderer.java rename to forge/src/main/java/com/seibel/lod/forge/mixins/client/MixinLevelRenderer.java index 9feec8638..8a2b96535 100644 --- a/forge/src/main/java/com/seibel/lod/fabric/mixins/client/MixinLevelRenderer.java +++ b/forge/src/main/java/com/seibel/lod/forge/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.forge.mixins.client; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.math.Matrix4f; diff --git a/forge/src/main/java/com/seibel/lod/fabric/mixins/client/MixinLightmap.java b/forge/src/main/java/com/seibel/lod/forge/mixins/client/MixinLightmap.java similarity index 95% rename from forge/src/main/java/com/seibel/lod/fabric/mixins/client/MixinLightmap.java rename to forge/src/main/java/com/seibel/lod/forge/mixins/client/MixinLightmap.java index 0b56a5745..ba6963ad6 100644 --- a/forge/src/main/java/com/seibel/lod/fabric/mixins/client/MixinLightmap.java +++ b/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; diff --git a/forge/src/main/java/com/seibel/lod/fabric/mixins/client/MixinMinecraft.java b/forge/src/main/java/com/seibel/lod/forge/mixins/client/MixinMinecraft.java similarity index 97% rename from forge/src/main/java/com/seibel/lod/fabric/mixins/client/MixinMinecraft.java rename to forge/src/main/java/com/seibel/lod/forge/mixins/client/MixinMinecraft.java index 1cf4923ab..733383d5c 100644 --- a/forge/src/main/java/com/seibel/lod/fabric/mixins/client/MixinMinecraft.java +++ b/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; diff --git a/forge/src/main/java/com/seibel/lod/fabric/mixins/client/MixinOptionsScreen.java b/forge/src/main/java/com/seibel/lod/forge/mixins/client/MixinOptionsScreen.java similarity index 98% rename from forge/src/main/java/com/seibel/lod/fabric/mixins/client/MixinOptionsScreen.java rename to forge/src/main/java/com/seibel/lod/forge/mixins/client/MixinOptionsScreen.java index 25a02797c..ba5edb6d9 100644 --- a/forge/src/main/java/com/seibel/lod/fabric/mixins/client/MixinOptionsScreen.java +++ b/forge/src/main/java/com/seibel/lod/forge/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.forge.mixins.client; import com.seibel.lod.common.wrappers.gui.GetConfigScreen; import com.seibel.lod.common.wrappers.gui.TexturedButtonWidget; diff --git a/forge/src/main/java/com/seibel/lod/fabric/mixins/server/MixinChunkGenerator.java b/forge/src/main/java/com/seibel/lod/forge/mixins/server/MixinChunkGenerator.java similarity index 98% rename from forge/src/main/java/com/seibel/lod/fabric/mixins/server/MixinChunkGenerator.java rename to forge/src/main/java/com/seibel/lod/forge/mixins/server/MixinChunkGenerator.java index 6e6d87817..0697f7ddd 100644 --- a/forge/src/main/java/com/seibel/lod/fabric/mixins/server/MixinChunkGenerator.java +++ b/forge/src/main/java/com/seibel/lod/forge/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.forge.mixins.server; import org.spongepowered.asm.mixin.Mixin; import net.minecraft.world.level.chunk.ChunkGenerator; diff --git a/forge/src/main/java/com/seibel/lod/fabric/mixins/server/MixinTFChunkGenerator.java b/forge/src/main/java/com/seibel/lod/forge/mixins/server/MixinTFChunkGenerator.java similarity index 97% rename from forge/src/main/java/com/seibel/lod/fabric/mixins/server/MixinTFChunkGenerator.java rename to forge/src/main/java/com/seibel/lod/forge/mixins/server/MixinTFChunkGenerator.java index d074f6179..225df7129 100644 --- a/forge/src/main/java/com/seibel/lod/fabric/mixins/server/MixinTFChunkGenerator.java +++ b/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; diff --git a/forge/src/main/java/com/seibel/lod/fabric/mixins/server/MixinUtilBackgroundThread.java b/forge/src/main/java/com/seibel/lod/forge/mixins/server/MixinUtilBackgroundThread.java similarity index 98% rename from forge/src/main/java/com/seibel/lod/fabric/mixins/server/MixinUtilBackgroundThread.java rename to forge/src/main/java/com/seibel/lod/forge/mixins/server/MixinUtilBackgroundThread.java index 035b23e55..405d8c8db 100644 --- a/forge/src/main/java/com/seibel/lod/fabric/mixins/server/MixinUtilBackgroundThread.java +++ b/forge/src/main/java/com/seibel/lod/forge/mixins/server/MixinUtilBackgroundThread.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package com.seibel.lod.mixins.server; +package com.seibel.lod.forge.mixins.server; import java.util.concurrent.ExecutorService; import java.util.function.Supplier; diff --git a/forge/src/main/java/com/seibel/lod/fabric/mixins/server/unsafe/MixinThreadingDetector.java b/forge/src/main/java/com/seibel/lod/forge/mixins/server/unsafe/MixinThreadingDetector.java similarity index 97% rename from forge/src/main/java/com/seibel/lod/fabric/mixins/server/unsafe/MixinThreadingDetector.java rename to forge/src/main/java/com/seibel/lod/forge/mixins/server/unsafe/MixinThreadingDetector.java index aecc6dd1d..2e9090546 100644 --- a/forge/src/main/java/com/seibel/lod/fabric/mixins/server/unsafe/MixinThreadingDetector.java +++ b/forge/src/main/java/com/seibel/lod/forge/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.forge.mixins.server.unsafe; import org.spongepowered.asm.mixin.Mixin; #if POST_MC_1_18_1 diff --git a/forge/src/main/java/com/seibel/lod/fabric/wrappers/modAccessor/ModChecker.java b/forge/src/main/java/com/seibel/lod/forge/modAccessor/ModChecker.java similarity index 96% rename from forge/src/main/java/com/seibel/lod/fabric/wrappers/modAccessor/ModChecker.java rename to forge/src/main/java/com/seibel/lod/forge/modAccessor/ModChecker.java index 676cd378f..0d8c9794b 100644 --- a/forge/src/main/java/com/seibel/lod/fabric/wrappers/modAccessor/ModChecker.java +++ b/forge/src/main/java/com/seibel/lod/forge/modAccessor/ModChecker.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -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; diff --git a/forge/src/main/java/com/seibel/lod/fabric/wrappers/modAccessor/OptifineAccessor.java b/forge/src/main/java/com/seibel/lod/forge/modAccessor/OptifineAccessor.java similarity index 96% rename from forge/src/main/java/com/seibel/lod/fabric/wrappers/modAccessor/OptifineAccessor.java rename to forge/src/main/java/com/seibel/lod/forge/modAccessor/OptifineAccessor.java index 588d7aecd..447e3d0ce 100644 --- a/forge/src/main/java/com/seibel/lod/fabric/wrappers/modAccessor/OptifineAccessor.java +++ b/forge/src/main/java/com/seibel/lod/forge/modAccessor/OptifineAccessor.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package com.seibel.lod.wrappers.modAccessor; +package com.seibel.lod.forge.modAccessor; import java.util.HashSet; diff --git a/forge/src/main/java/com/seibel/lod/fabric/wrappers/ForgeDependencySetup.java b/forge/src/main/java/com/seibel/lod/forge/wrappers/ForgeDependencySetup.java similarity index 93% rename from forge/src/main/java/com/seibel/lod/fabric/wrappers/ForgeDependencySetup.java rename to forge/src/main/java/com/seibel/lod/forge/wrappers/ForgeDependencySetup.java index e61500cb3..3eaacb9fd 100644 --- a/forge/src/main/java/com/seibel/lod/fabric/wrappers/ForgeDependencySetup.java +++ b/forge/src/main/java/com/seibel/lod/forge/wrappers/ForgeDependencySetup.java @@ -17,11 +17,11 @@ * along with this program. If not, see . */ -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 diff --git a/forge/src/main/resources/DistantHorizons.mixins.json b/forge/src/main/resources/DistantHorizons.mixins.json index d7127709d..ea64d31cb 100644 --- a/forge/src/main/resources/DistantHorizons.mixins.json +++ b/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" }