From 35d45057bab40ae6a8e0edca4fedfcef3168ab68 Mon Sep 17 00:00:00 2001 From: James Seibel Date: Tue, 31 Jan 2023 07:54:36 -0600 Subject: [PATCH 1/9] Add 2 potential fixes for the optifine render resolution bug --- .../wrappers/minecraft/MinecraftRenderWrapper.java | 14 ++++++++++++++ coreSubProjects | 2 +- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/minecraft/MinecraftRenderWrapper.java b/common/src/main/java/com/seibel/lod/common/wrappers/minecraft/MinecraftRenderWrapper.java index 6923a65b4..63a00d78c 100644 --- a/common/src/main/java/com/seibel/lod/common/wrappers/minecraft/MinecraftRenderWrapper.java +++ b/common/src/main/java/com/seibel/lod/common/wrappers/minecraft/MinecraftRenderWrapper.java @@ -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) { diff --git a/coreSubProjects b/coreSubProjects index 226fa9056..7f5a53382 160000 --- a/coreSubProjects +++ b/coreSubProjects @@ -1 +1 @@ -Subproject commit 226fa90561e432da193445b1f35849cce5f7e27f +Subproject commit 7f5a533827e94d56c9042fb27d4f5b588152b9a3 From 52b222de50b9462a03ed66809b1211f55a55d84a Mon Sep 17 00:00:00 2001 From: James Seibel Date: Fri, 3 Feb 2023 07:55:30 -0600 Subject: [PATCH 2/9] Add issue templates (Thanks AquaticLava!) --- .gitlab/issue_templates/Bug.md | 34 +++++++++++++++++++ .gitlab/issue_templates/FeatureRequest.md | 8 +++++ .gitlab/issue_templates/ImprovementRequest.md | 7 ++++ 3 files changed, 49 insertions(+) create mode 100644 .gitlab/issue_templates/Bug.md create mode 100644 .gitlab/issue_templates/FeatureRequest.md create mode 100644 .gitlab/issue_templates/ImprovementRequest.md diff --git a/.gitlab/issue_templates/Bug.md b/.gitlab/issue_templates/Bug.md new file mode 100644 index 000000000..ba41e17e5 --- /dev/null +++ b/.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 \ No newline at end of file diff --git a/.gitlab/issue_templates/FeatureRequest.md b/.gitlab/issue_templates/FeatureRequest.md new file mode 100644 index 000000000..d6bc332fd --- /dev/null +++ b/.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 \ No newline at end of file diff --git a/.gitlab/issue_templates/ImprovementRequest.md b/.gitlab/issue_templates/ImprovementRequest.md new file mode 100644 index 000000000..a86de83aa --- /dev/null +++ b/.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 \ No newline at end of file From 17b7a6eb89b7459d5eb1f86d20f4813ee871a748 Mon Sep 17 00:00:00 2001 From: James Seibel Date: Sat, 4 Feb 2023 14:38:47 -0600 Subject: [PATCH 3/9] add a default issue template --- .gitlab/issue_templates/Default.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .gitlab/issue_templates/Default.md diff --git a/.gitlab/issue_templates/Default.md b/.gitlab/issue_templates/Default.md new file mode 100644 index 000000000..2b81e67d3 --- /dev/null +++ b/.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. From 06922458f1e5b48bc351260cb45d254f6ef77721 Mon Sep 17 00:00:00 2001 From: James Seibel Date: Sat, 4 Feb 2023 14:42:16 -0600 Subject: [PATCH 4/9] fix issue template automatic labels --- .gitlab/issue_templates/Bug.md | 2 +- .gitlab/issue_templates/Default.md | 2 +- .gitlab/issue_templates/FeatureRequest.md | 2 +- .gitlab/issue_templates/ImprovementRequest.md | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab/issue_templates/Bug.md b/.gitlab/issue_templates/Bug.md index ba41e17e5..07730c0ae 100644 --- a/.gitlab/issue_templates/Bug.md +++ b/.gitlab/issue_templates/Bug.md @@ -31,4 +31,4 @@ * Steps to reproduce the bug: -/labels ~Bug ~Not-reviewed \ No newline at end of file +/labels ~Bug ~"Not-Reviewed" \ No newline at end of file diff --git a/.gitlab/issue_templates/Default.md b/.gitlab/issue_templates/Default.md index 2b81e67d3..f03909953 100644 --- a/.gitlab/issue_templates/Default.md +++ b/.gitlab/issue_templates/Default.md @@ -1,3 +1,3 @@ +Before creating an issue, please select the appropriate template from the dropdown above. -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. diff --git a/.gitlab/issue_templates/FeatureRequest.md b/.gitlab/issue_templates/FeatureRequest.md index d6bc332fd..118f46eae 100644 --- a/.gitlab/issue_templates/FeatureRequest.md +++ b/.gitlab/issue_templates/FeatureRequest.md @@ -5,4 +5,4 @@ 2. Describe why this feature should be added: -/labels ~Feature ~Not-reviewed \ No newline at end of file +/labels ~Feature ~"Not-Reviewed" \ No newline at end of file diff --git a/.gitlab/issue_templates/ImprovementRequest.md b/.gitlab/issue_templates/ImprovementRequest.md index a86de83aa..c2c6d9aae 100644 --- a/.gitlab/issue_templates/ImprovementRequest.md +++ b/.gitlab/issue_templates/ImprovementRequest.md @@ -4,4 +4,4 @@ -/labels ~improvement ~Not-reviewed \ No newline at end of file +/labels ~improvement ~"Not-Reviewed" \ No newline at end of file From 56603e8076d4242a6612349768511277f2feee34 Mon Sep 17 00:00:00 2001 From: coolGi Date: Tue, 7 Feb 2023 19:34:18 +1030 Subject: [PATCH 5/9] Updated core --- coreSubProjects | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coreSubProjects b/coreSubProjects index 7f5a53382..3efeea898 160000 --- a/coreSubProjects +++ b/coreSubProjects @@ -1 +1 @@ -Subproject commit 7f5a533827e94d56c9042fb27d4f5b588152b9a3 +Subproject commit 3efeea89879acb1082dc2db0184187356df8bdf5 From dcc143c9f877f4c5539443be904526da2da30eb9 Mon Sep 17 00:00:00 2001 From: coolGi Date: Sun, 12 Feb 2023 12:20:33 +1030 Subject: [PATCH 6/9] Disabled Forgix --- build.gradle | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/build.gradle b/build.gradle index c3eb4f95c..f677f44cf 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ plugins { id 'com.github.johnrengelman.shadow' version '7.0.0' apply false // Plugin to create merged jars - id "io.github.pacifistmc.forgix" version "1.2.6" +// id "io.github.pacifistmc.forgix" version "1.2.6" // Provides mc libraries to core id 'org.spongepowered.gradle.vanilla' version '0.2.1-SNAPSHOT' apply false @@ -121,21 +121,21 @@ makeAccessWidener() rootProject.versionStr = rootProject.mod_version + "-" + rootProject.minecraft_version // + "-" + new Date().format("yyyy_MM_dd_HH_mm") // Merged jar settings -forgix { - group = "com.seibel.lod" - mergedJarName = "DistantHorizons-${rootProject.versionStr}.jar" - - forge { - jarLocation = "build/libs/DistantHorizons-${rootProject.versionStr}.jar" - } - - fabric { - jarLocation = "build/libs/DistantHorizons-${rootProject.versionStr}.jar" - } - - removeDuplicate "com.seibel.lod.api" - removeDuplicate "com.seibel.lod.core" -} +//forgix { +// group = "com.seibel.lod" +// mergedJarName = "DistantHorizons-${rootProject.versionStr}.jar" +// +// forge { +// jarLocation = "build/libs/DistantHorizons-${rootProject.versionStr}.jar" +// } +// +// fabric { +// jarLocation = "build/libs/DistantHorizons-${rootProject.versionStr}.jar" +// } +// +// removeDuplicate "com.seibel.lod.api" +// removeDuplicate "com.seibel.lod.core" +//} architectury { minecraft = rootProject.minecraft_version @@ -286,10 +286,10 @@ subprojects { p -> // } // Run mergeJars when running build - if (p != project(":api") && p != project(":api")) { - build.finalizedBy(mergeJars) - assemble.finalizedBy(mergeJars) - } +// if (p != project(":api") && p != project(":api")) { +// build.finalizedBy(mergeJars) +// assemble.finalizedBy(mergeJars) +// } } allprojects { p -> From f0956c0cdb19046d083b4fbc5ae1e0d455b71782 Mon Sep 17 00:00:00 2001 From: coolGi Date: Sun, 12 Feb 2023 13:03:25 +1030 Subject: [PATCH 7/9] Fixed fabric build --- coreSubProjects | 2 +- fabric/build.gradle | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/coreSubProjects b/coreSubProjects index 3efeea898..5ec91475a 160000 --- a/coreSubProjects +++ b/coreSubProjects @@ -1 +1 @@ -Subproject commit 3efeea89879acb1082dc2db0184187356df8bdf5 +Subproject commit 5ec91475a4f0301d06bcb99fadf7f21e252d99ac diff --git a/fabric/build.gradle b/fabric/build.gradle index 6d90651aa..22cfcc4b0 100644 --- a/fabric/build.gradle +++ b/fabric/build.gradle @@ -95,12 +95,16 @@ dependencies { common(project(path: ":common", configuration: "namedElements")) { transitive false } shadowCommon(project(path: ":common", configuration: "transformProductionFabric")) { transitive false } +// shadowMe files(project(":common").file("build/libs/DistantHorizons-${rootProject.mod_version}-transformProductionFabric.jar")) + shadowMe files(project(":core").file("build/libs/DistantHorizons-${rootProject.mod_version}.jar")) + shadowMe files(project(":api").file("build/libs/DistantHorizons-API-${rootProject.mod_version}.jar")) } shadowJar { exclude "architectury.common.json" configurations = [project.configurations.shadowCommon, project.configurations.shadowMe, project.configurations.customModule] + relocate 'com.seibel.lod.common', 'fabric.com.seibel.lod.common' // Compression relocate 'org.tukaani', 'distanthorizons.libraries.tukaani' From cc3a3c451c7dbce2040fe22f9d8145c3403eb4b9 Mon Sep 17 00:00:00 2001 From: coolGi Date: Sun, 12 Feb 2023 18:55:00 +1030 Subject: [PATCH 8/9] 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 From bc5861ea95eb8addf426c90beaca2b7ba86c40e0 Mon Sep 17 00:00:00 2001 From: coolGi Date: Sun, 12 Feb 2023 18:59:27 +1030 Subject: [PATCH 9/9] 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" }