Merge remote-tracking branch 'origin/main'

2023-05-02 22:28:54 +09:30
parent 258a2a8ee7 12698c5d39
commit f6887ee7d5
20 changed files with 32 additions and 51 deletions
@@ -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
@@ -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;
@@ -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
@@ -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;
@@ -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;
@@ -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;
@@ -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.*;

@@ -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;
@@ -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;
@@ -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;


 /**
@@ -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;
@@ -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;
@@ -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;
@@ -5,7 +5,7 @@

  "name": "${mod_name}",
  "description": "${description}",
-  "authors": $authors,
+  "authors": ["authors"],

  "contact": {
    "homepage": "${homepage}",
@@ -1,5 +1,13 @@
+plugins {
+    id "architectury-plugin" version "3.4-SNAPSHOT"
+}
+
 sourceCompatibility = targetCompatibility = JavaVersion.VERSION_17

+architectury {
+    platformSetupLoomIde()
+    forge()
+}

 //loom {
 //    forge {
@@ -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;

@@ -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;
@@ -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;
@@ -9,7 +9,7 @@ issueTrackerURL="${issues}"
 	modId="lod" #//mandatory
 	version= "${version}" #//mandatory, gets the version number from jar populated by the build.gradle script
 	displayName="${mod_name}" #//mandatory
-	authors=$authors
+	authors="authors"
 	#//updateJSONURL="https://change.me.example.invalid/updates.json" # A URL to query for updates for this mod. See the JSON update specification https://mcforge.readthedocs.io/en/latest/gettingstarted/autoupdate/
 	displayURL="${homepage}"
 	description= "${description}" #//mandatory. The description text for the mod