From 39ef89613881cedeee221b7d07b8d37728666323 Mon Sep 17 00:00:00 2001 From: Ran <43445785+Ran-Mewo@users.noreply.github.com> Date: Mon, 1 May 2023 19:27:52 +0600 Subject: [PATCH] Made forge actually run! Renamed `com.seibel.lod.core` to `com.seibel.lod.coreapi` --- build.gradle | 5 +++-- .../java/com/seibel/lod/common/LodCommonMain.java | 2 +- .../seibel/lod/common/networking/Networking.java | 8 +------- .../lod/common/wrappers/McObjectConverter.java | 2 +- .../lod/common/wrappers/gui/ClassicConfigGUI.java | 2 -- .../lod/common/wrappers/gui/GetConfigScreen.java | 2 +- .../wrappers/gui/updater/ChangelogScreen.java | 15 +-------------- .../wrappers/gui/updater/UpdateModScreen.java | 2 +- .../minecraft/MinecraftClientWrapper.java | 2 +- .../minecraft/MinecraftRenderWrapper.java | 8 +++----- coreSubProjects | 2 +- .../java/com/seibel/lod/fabric/FabricMain.java | 4 ++-- .../fabric/mixins/client/MixinOptionsScreen.java | 2 +- .../wrappers/modAccessor/SodiumAccessor.java | 2 +- forge/build.gradle | 8 ++++++++ .../main/java/com/seibel/lod/forge/ForgeMain.java | 9 ++------- .../forge/mixins/client/MixinLevelRenderer.java | 2 +- .../forge/mixins/client/MixinOptionsScreen.java | 2 +- 18 files changed, 30 insertions(+), 49 deletions(-) diff --git a/build.gradle b/build.gradle index dd72dd960..a9f962648 100644 --- a/build.gradle +++ b/build.gradle @@ -136,8 +136,9 @@ subprojects { p -> compileClasspath.extendsFrom common runtimeClasspath.extendsFrom common developmentForge.extendsFrom common - forgeRuntimeLibrary.extendsFrom common - forgeRuntimeLibrary.extendsFrom coreProjects + compileClasspath.extendsFrom coreProjects + runtimeClasspath.extendsFrom coreProjects + developmentForge.extendsFrom coreProjects if (findProject(":fabricLike") && p != project(":fabricLike")) { // Shadow fabricLike diff --git a/common/src/main/java/com/seibel/lod/common/LodCommonMain.java b/common/src/main/java/com/seibel/lod/common/LodCommonMain.java index eb9cd65de..623fd684f 100644 --- a/common/src/main/java/com/seibel/lod/common/LodCommonMain.java +++ b/common/src/main/java/com/seibel/lod/common/LodCommonMain.java @@ -21,7 +21,7 @@ package com.seibel.lod.common; import com.seibel.lod.common.forge.LodForgeMethodCaller; import com.seibel.lod.common.wrappers.DependencySetup; -import com.seibel.lod.core.ModInfo; +import com.seibel.lod.coreapi.ModInfo; import com.seibel.lod.core.api.internal.SharedApi; import com.seibel.lod.core.config.Config; import com.seibel.lod.core.config.ConfigBase; diff --git a/common/src/main/java/com/seibel/lod/common/networking/Networking.java b/common/src/main/java/com/seibel/lod/common/networking/Networking.java index 51c87b1a4..f1a564c66 100644 --- a/common/src/main/java/com/seibel/lod/common/networking/Networking.java +++ b/common/src/main/java/com/seibel/lod/common/networking/Networking.java @@ -19,23 +19,17 @@ package com.seibel.lod.common.networking; -import com.seibel.lod.core.ModInfo; +import com.seibel.lod.coreapi.ModInfo; //#if MC_1_16_5 //import me.shedaniel.architectury.networking.NetworkManager; //#else //import dev.architectury.networking.NetworkManager; //#endif import io.netty.buffer.Unpooled; -import net.minecraft.client.Minecraft; import net.minecraft.network.FriendlyByteBuf; -import net.minecraft.network.protocol.Packet; -import net.minecraft.network.protocol.game.ClientboundCustomPayloadPacket; -import net.minecraft.network.protocol.game.ServerboundCustomPayloadPacket; import net.minecraft.resources.ResourceLocation; import net.minecraft.server.level.ServerPlayer; -import java.util.Objects; - /** * This class holds most of the networking code for the mod. * @author Ran diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/McObjectConverter.java b/common/src/main/java/com/seibel/lod/common/wrappers/McObjectConverter.java index 9c23ea218..b27f9c283 100644 --- a/common/src/main/java/com/seibel/lod/common/wrappers/McObjectConverter.java +++ b/common/src/main/java/com/seibel/lod/common/wrappers/McObjectConverter.java @@ -27,7 +27,7 @@ import com.mojang.math.Matrix4f; import com.seibel.lod.core.enums.ELodDirection; import com.seibel.lod.core.pos.DhBlockPos; import com.seibel.lod.core.pos.DhChunkPos; -import com.seibel.lod.core.util.math.Mat4f; +import com.seibel.lod.coreapi.util.math.Mat4f; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/gui/ClassicConfigGUI.java b/common/src/main/java/com/seibel/lod/common/wrappers/gui/ClassicConfigGUI.java index c361b6a84..4b3c058e4 100644 --- a/common/src/main/java/com/seibel/lod/common/wrappers/gui/ClassicConfigGUI.java +++ b/common/src/main/java/com/seibel/lod/common/wrappers/gui/ClassicConfigGUI.java @@ -15,8 +15,6 @@ import java.util.regex.Pattern; // Logger (for debug stuff) -import com.seibel.lod.core.ModInfo; -import com.seibel.lod.core.config.file.ConfigFileHandling; import com.seibel.lod.core.config.types.AbstractConfigType; import com.seibel.lod.core.config.types.ConfigCategory; import com.seibel.lod.core.config.types.ConfigEntry; diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/gui/GetConfigScreen.java b/common/src/main/java/com/seibel/lod/common/wrappers/gui/GetConfigScreen.java index 889920c94..80faca27c 100644 --- a/common/src/main/java/com/seibel/lod/common/wrappers/gui/GetConfigScreen.java +++ b/common/src/main/java/com/seibel/lod/common/wrappers/gui/GetConfigScreen.java @@ -1,6 +1,6 @@ package com.seibel.lod.common.wrappers.gui; -import com.seibel.lod.core.ModInfo; +import com.seibel.lod.coreapi.ModInfo; import com.seibel.lod.core.config.ConfigBase; import com.seibel.lod.core.config.gui.ConfigScreen; import com.seibel.lod.core.config.gui.JavaScreenHandlerScreen; diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/gui/updater/ChangelogScreen.java b/common/src/main/java/com/seibel/lod/common/wrappers/gui/updater/ChangelogScreen.java index 31df00cbe..08c116660 100644 --- a/common/src/main/java/com/seibel/lod/common/wrappers/gui/updater/ChangelogScreen.java +++ b/common/src/main/java/com/seibel/lod/common/wrappers/gui/updater/ChangelogScreen.java @@ -1,33 +1,20 @@ package com.seibel.lod.common.wrappers.gui.updater; -import com.google.common.collect.Lists; -import com.mojang.blaze3d.platform.NativeImage; import com.mojang.blaze3d.vertex.PoseStack; -import com.seibel.lod.common.wrappers.gui.ClassicConfigGUI; -import com.seibel.lod.core.ModInfo; -import com.seibel.lod.core.config.Config; -import com.seibel.lod.core.jar.JarUtils; +import com.seibel.lod.coreapi.ModInfo; import com.seibel.lod.core.jar.installer.MarkdownFormatter; import com.seibel.lod.core.jar.installer.ModrinthGetter; -import com.seibel.lod.core.jar.updater.SelfUpdater; import net.minecraft.client.Minecraft; -import net.minecraft.client.StringSplitter; import net.minecraft.client.gui.Font; import net.minecraft.client.gui.GuiComponent; import net.minecraft.client.gui.components.AbstractWidget; import net.minecraft.client.gui.components.Button; import net.minecraft.client.gui.components.ContainerObjectSelectionList; -import net.minecraft.client.gui.components.ImageButton; import net.minecraft.client.gui.components.events.GuiEventListener; import net.minecraft.client.gui.narration.NarratableEntry; import net.minecraft.client.gui.screens.Screen; -import net.minecraft.client.renderer.texture.DynamicTexture; import net.minecraft.network.chat.Component; -import net.minecraft.network.chat.FormattedText; -import net.minecraft.network.chat.Style; import net.minecraft.network.chat.TextComponent; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.util.FormattedCharSequence; import java.util.*; diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/gui/updater/UpdateModScreen.java b/common/src/main/java/com/seibel/lod/common/wrappers/gui/updater/UpdateModScreen.java index b91b2ca6d..80edbc3f5 100644 --- a/common/src/main/java/com/seibel/lod/common/wrappers/gui/updater/UpdateModScreen.java +++ b/common/src/main/java/com/seibel/lod/common/wrappers/gui/updater/UpdateModScreen.java @@ -3,7 +3,7 @@ package com.seibel.lod.common.wrappers.gui.updater; import com.mojang.blaze3d.platform.NativeImage; import com.mojang.blaze3d.vertex.PoseStack; import com.seibel.lod.common.wrappers.gui.TexturedButtonWidget; -import com.seibel.lod.core.ModInfo; +import com.seibel.lod.coreapi.ModInfo; import com.seibel.lod.core.config.Config; import com.seibel.lod.core.jar.JarUtils; import com.seibel.lod.core.jar.installer.ModrinthGetter; diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/minecraft/MinecraftClientWrapper.java b/common/src/main/java/com/seibel/lod/common/wrappers/minecraft/MinecraftClientWrapper.java index 0dfb3befe..dee9b9f72 100644 --- a/common/src/main/java/com/seibel/lod/common/wrappers/minecraft/MinecraftClientWrapper.java +++ b/common/src/main/java/com/seibel/lod/common/wrappers/minecraft/MinecraftClientWrapper.java @@ -26,7 +26,7 @@ import java.util.ArrayList; import com.mojang.blaze3d.platform.NativeImage; import com.seibel.lod.common.wrappers.world.ClientLevelWrapper; import com.seibel.lod.common.wrappers.world.ServerLevelWrapper; -import com.seibel.lod.core.ModInfo; +import com.seibel.lod.coreapi.ModInfo; import com.seibel.lod.core.enums.ELodDirection; import com.seibel.lod.core.logging.DhLoggerBuilder; import com.seibel.lod.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper; 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 63a00d78c..da5e5a6e5 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,13 +34,12 @@ 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; -import com.seibel.lod.core.util.math.Mat4f; -import com.seibel.lod.core.util.math.Vec3d; -import com.seibel.lod.core.util.math.Vec3f; +import com.seibel.lod.coreapi.util.math.Mat4f; +import com.seibel.lod.coreapi.util.math.Vec3d; +import com.seibel.lod.coreapi.util.math.Vec3f; import com.seibel.lod.core.wrapperInterfaces.IWrapperFactory; import com.seibel.lod.core.wrapperInterfaces.minecraft.IMinecraftRenderWrapper; import com.seibel.lod.core.wrapperInterfaces.modAccessor.IBCLibAccessor; @@ -69,7 +68,6 @@ 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; /** diff --git a/coreSubProjects b/coreSubProjects index cf1855464..e9fc666de 160000 --- a/coreSubProjects +++ b/coreSubProjects @@ -1 +1 @@ -Subproject commit cf18554646e32d77ff123e9da3236ff54dbc4257 +Subproject commit e9fc666de53bf0e502456614628780f32512e426 diff --git a/fabric/src/main/java/com/seibel/lod/fabric/FabricMain.java b/fabric/src/main/java/com/seibel/lod/fabric/FabricMain.java index a70f0af2b..ae82c0eea 100644 --- a/fabric/src/main/java/com/seibel/lod/fabric/FabricMain.java +++ b/fabric/src/main/java/com/seibel/lod/fabric/FabricMain.java @@ -22,9 +22,9 @@ package com.seibel.lod.fabric; import com.seibel.lod.api.methods.events.abstractEvents.DhApiAfterDhInitEvent; import com.seibel.lod.api.methods.events.abstractEvents.DhApiBeforeDhInitEvent; import com.seibel.lod.common.LodCommonMain; -import com.seibel.lod.core.ModInfo; +import com.seibel.lod.coreapi.ModInfo; import com.seibel.lod.core.config.Config; -import com.seibel.lod.core.DependencyInjection.ApiEventInjector; +import com.seibel.lod.coreapi.DependencyInjection.ApiEventInjector; import com.seibel.lod.core.dependencyInjection.ModAccessorInjector; import com.seibel.lod.core.dependencyInjection.SingletonInjector; import com.seibel.lod.core.logging.DhLoggerBuilder; diff --git a/fabric/src/main/java/com/seibel/lod/fabric/mixins/client/MixinOptionsScreen.java b/fabric/src/main/java/com/seibel/lod/fabric/mixins/client/MixinOptionsScreen.java index 780dfaeb1..78567c04a 100644 --- a/fabric/src/main/java/com/seibel/lod/fabric/mixins/client/MixinOptionsScreen.java +++ b/fabric/src/main/java/com/seibel/lod/fabric/mixins/client/MixinOptionsScreen.java @@ -21,7 +21,7 @@ package com.seibel.lod.fabric.mixins.client; import com.seibel.lod.common.wrappers.gui.GetConfigScreen; import com.seibel.lod.common.wrappers.gui.TexturedButtonWidget; -import com.seibel.lod.core.ModInfo; +import com.seibel.lod.coreapi.ModInfo; import com.seibel.lod.core.config.Config; import net.minecraft.client.gui.screens.OptionsScreen; import net.minecraft.client.gui.screens.Screen; diff --git a/fabric/src/main/java/com/seibel/lod/fabric/wrappers/modAccessor/SodiumAccessor.java b/fabric/src/main/java/com/seibel/lod/fabric/wrappers/modAccessor/SodiumAccessor.java index 2f083939a..7ffd15403 100644 --- a/fabric/src/main/java/com/seibel/lod/fabric/wrappers/modAccessor/SodiumAccessor.java +++ b/fabric/src/main/java/com/seibel/lod/fabric/wrappers/modAccessor/SodiumAccessor.java @@ -24,7 +24,7 @@ import java.util.stream.Collectors; import com.seibel.lod.core.pos.DhChunkPos; import com.seibel.lod.core.dependencyInjection.SingletonInjector; -import com.seibel.lod.core.util.math.Mat4f; +import com.seibel.lod.coreapi.util.math.Mat4f; import com.seibel.lod.core.wrapperInterfaces.IWrapperFactory; import com.seibel.lod.core.wrapperInterfaces.minecraft.IMinecraftRenderWrapper; import com.seibel.lod.core.wrapperInterfaces.modAccessor.ISodiumAccessor; diff --git a/forge/build.gradle b/forge/build.gradle index 8ce6b1f6c..1e402ddd3 100644 --- a/forge/build.gradle +++ b/forge/build.gradle @@ -1,5 +1,13 @@ +plugins { + id "architectury-plugin" version "3.4-SNAPSHOT" +} + sourceCompatibility = targetCompatibility = JavaVersion.VERSION_17 +architectury { + platformSetupLoomIde() + forge() +} //loom { // forge { diff --git a/forge/src/main/java/com/seibel/lod/forge/ForgeMain.java b/forge/src/main/java/com/seibel/lod/forge/ForgeMain.java index 21793d32a..5b31c92b5 100644 --- a/forge/src/main/java/com/seibel/lod/forge/ForgeMain.java +++ b/forge/src/main/java/com/seibel/lod/forge/ForgeMain.java @@ -26,16 +26,11 @@ import com.seibel.lod.common.forge.LodForgeMethodCaller; import com.seibel.lod.common.wrappers.DependencySetup; import com.seibel.lod.common.wrappers.gui.GetConfigScreen; import com.seibel.lod.common.wrappers.minecraft.MinecraftClientWrapper; -import com.seibel.lod.core.DependencyInjection.ApiEventInjector; -import com.seibel.lod.core.ModInfo; +import com.seibel.lod.coreapi.DependencyInjection.ApiEventInjector; +import com.seibel.lod.coreapi.ModInfo; import com.seibel.lod.core.ReflectionHandler; -import com.seibel.lod.core.config.Config; 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.minecraft.IMinecraftClientWrapper; -import com.seibel.lod.core.wrapperInterfaces.modAccessor.IBCLibAccessor; -import com.seibel.lod.core.wrapperInterfaces.modAccessor.IModChecker; import com.seibel.lod.core.wrapperInterfaces.modAccessor.IOptifineAccessor; import com.seibel.lod.forge.wrappers.ForgeDependencySetup; diff --git a/forge/src/main/java/com/seibel/lod/forge/mixins/client/MixinLevelRenderer.java b/forge/src/main/java/com/seibel/lod/forge/mixins/client/MixinLevelRenderer.java index 8a2b96535..b99a542fc 100644 --- a/forge/src/main/java/com/seibel/lod/forge/mixins/client/MixinLevelRenderer.java +++ b/forge/src/main/java/com/seibel/lod/forge/mixins/client/MixinLevelRenderer.java @@ -25,7 +25,7 @@ import com.seibel.lod.common.wrappers.McObjectConverter; import com.seibel.lod.common.wrappers.world.ClientLevelWrapper; import com.seibel.lod.core.config.Config; import com.seibel.lod.core.api.internal.ClientApi; -import com.seibel.lod.core.util.math.Mat4f; +import com.seibel.lod.coreapi.util.math.Mat4f; import net.minecraft.client.multiplayer.ClientLevel; import net.minecraft.client.renderer.LevelRenderer; import net.minecraft.client.renderer.RenderType; diff --git a/forge/src/main/java/com/seibel/lod/forge/mixins/client/MixinOptionsScreen.java b/forge/src/main/java/com/seibel/lod/forge/mixins/client/MixinOptionsScreen.java index ba5edb6d9..7d2bb276c 100644 --- a/forge/src/main/java/com/seibel/lod/forge/mixins/client/MixinOptionsScreen.java +++ b/forge/src/main/java/com/seibel/lod/forge/mixins/client/MixinOptionsScreen.java @@ -21,7 +21,7 @@ package com.seibel.lod.forge.mixins.client; import com.seibel.lod.common.wrappers.gui.GetConfigScreen; import com.seibel.lod.common.wrappers.gui.TexturedButtonWidget; -import com.seibel.lod.core.ModInfo; +import com.seibel.lod.coreapi.ModInfo; import com.seibel.lod.core.config.Config; import net.minecraft.client.gui.screens.OptionsScreen; import net.minecraft.client.gui.screens.Screen;