Its no longer weird, for the most part. fabric/forge here we go!

ValkyrienSkies · Feb 2, 2021 · ed264df · ed264df
1 parent c877695
commit ed264df
Show file tree

Hide file tree

Showing 35 changed files with 115 additions and 144 deletions.
diff --git a/.gitignore b/.gitignore
@@ -13,6 +13,9 @@ out
 *.iml
 .idea
 
+# vscode
+.vscode
+
 # gradle
 build
 .gradle

diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "vs-core"]
+	path = vs-core
+	url = https://github.com/ValkyrienSkies/vs-core
diff --git a/build.gradle b/build.gradle
@@ -1,6 +1,6 @@
 plugins {
-    id "architectury-plugin" version "1.3.44"
-    id "forgified-fabric-loom" version "0.5.23" apply false
+    id "architectury-plugin" version "2.0.65"
+    id "forgified-fabric-loom" version "0.6.59" apply false
     id "org.jetbrains.kotlin.jvm" version "1.4.21" apply false
 }
 
@@ -27,4 +27,5 @@ allprojects {
     tasks.withType(JavaCompile) {
         options.encoding = "UTF-8"
     }
-}
+}
+
diff --git a/common/build.gradle b/common/build.gradle
@@ -2,35 +2,21 @@ plugins {
     id "org.jetbrains.kotlin.jvm"
 }
 
-allprojects {
-    repositories {
-        mavenCentral()
-        maven { url 'https://jitpack.io' }
-    }
-}
-
 dependencies {
-    minecraft "com.mojang:minecraft:${rootProject.architect.minecraft}"
+    minecraft "com.mojang:minecraft:${rootProject.minecraft_version}"
     mappings minecraft.officialMojangMappings()
     compileOnly "com.google.code.findbugs:jsr305:3.+"
     // We depend on fabric loader here to use the fabric @Environment annotations
     // Do NOT use other classes from fabric loader
     modCompile "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}"
 
-    // vs-core
-    implementation("com.github.ValkyrienSkies:vs-core:${rootProject.vs_core_version}") {
-        exclude group: 'org.joml'
-    }
+    implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.21")
 
-    // JOML (TODO use dependency from vs-core instead)
-    implementation("org.joml:joml:${rootProject.joml_version}")
-    implementation("org.joml:joml-primitives:${rootProject.joml_version}")
+    // vs-core
+    implementation("org.valkyrienskies.core:vs-core:${rootProject.vs_core_version}")
 
-    // Jackson Binary Dataformat for Object Serialization (TODO use dependency from vs-core instead)
-    implementation("com.fasterxml.jackson.module:jackson-module-kotlin:${rootProject.jacksonVersion}")
-    implementation("com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:${rootProject.jacksonVersion}")
 }
 
-architect {
+architectury {
     common()
 }
diff --git a/.../client/multiplayer/MixinClientLevel.java → .../client/multiplayer/MixinClientLevel.java b/.../client/multiplayer/MixinClientLevel.java → .../client/multiplayer/MixinClientLevel.java
@@ -1,12 +1,14 @@
-package net.examplemod.mixin.client.multiplayer;
+package org.valkyrienskies.mod.mixin.client.multiplayer;
 
-import net.examplemod.IShipObjectWorldProvider;
+import org.valkyrienskies.mod.IShipObjectWorldProvider;
+import org.valkyrienskies.mod.IShipObjectWorldProvider;
 import net.minecraft.client.multiplayer.ClientLevel;
 import org.jetbrains.annotations.NotNull;
 import org.spongepowered.asm.mixin.Mixin;
 import org.valkyrienskies.core.game.ChunkAllocator;
 import org.valkyrienskies.core.game.QueryableShipData;
 import org.valkyrienskies.core.game.ShipObjectWorld;
+import org.valkyrienskies.mod.IShipObjectWorldProvider;
 
 @Mixin(ClientLevel.class)
 public class MixinClientLevel implements IShipObjectWorldProvider {

diff --git a/...mod/mixin/server/level/MixinChunkMap.java → ...mod/mixin/server/level/MixinChunkMap.java b/...mod/mixin/server/level/MixinChunkMap.java → ...mod/mixin/server/level/MixinChunkMap.java
@@ -1,6 +1,7 @@
-package net.examplemod.mixin.server.level;
+package org.valkyrienskies.mod.mixin.server.level;
 
-import net.examplemod.IShipObjectWorldProvider;
+import org.valkyrienskies.mod.IShipObjectWorldProvider;
+import org.valkyrienskies.mod.IShipObjectWorldProvider;
 import net.minecraft.Util;
 import net.minecraft.core.Registry;
 import net.minecraft.data.worldgen.biome.Biomes;
@@ -18,6 +19,7 @@
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Overwrite;
 import org.spongepowered.asm.mixin.Shadow;
+import org.valkyrienskies.mod.IShipObjectWorldProvider;
 
 import java.io.IOException;
 import java.util.Arrays;

diff --git a/.../mixin/server/level/MixinServerLevel.java → .../mixin/server/level/MixinServerLevel.java b/.../mixin/server/level/MixinServerLevel.java → .../mixin/server/level/MixinServerLevel.java
@@ -1,7 +1,8 @@
-package net.examplemod.mixin.server.level;
+package org.valkyrienskies.mod.mixin.server.level;
 
-import net.examplemod.IShipObjectWorldProvider;
-import net.examplemod.ShipSavedData;
+import org.valkyrienskies.mod.IShipObjectWorldProvider;
+import org.valkyrienskies.mod.IShipObjectWorldProvider;
+import org.valkyrienskies.mod.ShipSavedData;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.level.storage.DimensionDataStorage;
 import org.jetbrains.annotations.NotNull;
@@ -11,6 +12,7 @@
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import org.valkyrienskies.core.game.ShipObjectWorld;
+import org.valkyrienskies.mod.IShipObjectWorldProvider;
 
 @Mixin(ServerLevel.class)
 public abstract class MixinServerLevel implements IShipObjectWorldProvider {

diff --git a/...et/examplemod/IShipObjectWorldProvider.kt → ...rienskies/mod/IShipObjectWorldProvider.kt b/...et/examplemod/IShipObjectWorldProvider.kt → ...rienskies/mod/IShipObjectWorldProvider.kt
@@ -1,4 +1,4 @@
-package net.examplemod
+package org.valkyrienskies.mod
 
 import org.valkyrienskies.core.game.ShipObjectWorld
 

diff --git a/...n/kotlin/net/examplemod/JOMLConversion.kt → .../org/valkyrienskies/mod/JOMLConversion.kt b/...n/kotlin/net/examplemod/JOMLConversion.kt → .../org/valkyrienskies/mod/JOMLConversion.kt
@@ -1,4 +1,4 @@
-package net.examplemod
+package org.valkyrienskies.mod
 
 import net.minecraft.core.BlockPos
 import org.joml.Vector3i

diff --git a/...in/kotlin/net/examplemod/ShipSavedData.kt → ...n/org/valkyrienskies/mod/ShipSavedData.kt b/...in/kotlin/net/examplemod/ShipSavedData.kt → ...n/org/valkyrienskies/mod/ShipSavedData.kt
@@ -1,4 +1,4 @@
-package net.examplemod
+package org.valkyrienskies.mod
 
 import net.minecraft.nbt.CompoundTag
 import net.minecraft.world.level.saveddata.SavedData

diff --git a/...ain/kotlin/net/examplemod/VSNetworking.kt → ...in/org/valkyrienskies/mod/VSNetworking.kt b/...ain/kotlin/net/examplemod/VSNetworking.kt → ...in/org/valkyrienskies/mod/VSNetworking.kt
@@ -1,8 +1,8 @@
-package net.examplemod
+package org.valkyrienskies.mod
 
 import io.netty.buffer.ByteBuf
-import net.examplemod.networking.impl.VSPacketShipDataClientHandler
-import net.examplemod.networking.impl.VSPacketShipDataList
+import org.valkyrienskies.mod.networking.impl.VSPacketShipDataClientHandler
+import org.valkyrienskies.mod.networking.impl.VSPacketShipDataList
 import net.minecraft.server.level.ServerPlayer
 import org.valkyrienskies.core.networking.IVSPacket
 import org.valkyrienskies.core.networking.IVSPacketToClientSender

diff --git a/.../main/kotlin/net/examplemod/ExampleMod.kt → ...g/valkyrienskies/mod/ValkyrienSkiesMod.kt b/.../main/kotlin/net/examplemod/ExampleMod.kt → ...g/valkyrienskies/mod/ValkyrienSkiesMod.kt
@@ -1,15 +1,16 @@
-package net.examplemod
+package org.valkyrienskies.mod
 
-import net.examplemod.item.ShipCreatorItem
+import org.valkyrienskies.mod.item.ShipCreatorItem
 import net.minecraft.core.Registry
 import net.minecraft.resources.ResourceLocation
 import net.minecraft.world.item.CreativeModeTab
 import net.minecraft.world.item.Item
+import net.minecraft.world.item.Item.Properties
 
-object ExampleMod {
-    const val MOD_ID = "examplemod"
+object ValkyrienSkiesMod {
+    const val MOD_ID = "valkyrienskies"
 
-    private val SHIP_CREATOR_ITEM: Item = ShipCreatorItem(Item.Properties().tab(CreativeModeTab.TAB_MISC))
+    private val SHIP_CREATOR_ITEM: Item = ShipCreatorItem(Properties().tab(CreativeModeTab.TAB_MISC))
 
     fun init() {
         println("Hello from init")

diff --git a/...in/net/examplemod/item/ShipCreatorItem.kt → ...alkyrienskies/mod/item/ShipCreatorItem.kt b/...in/net/examplemod/item/ShipCreatorItem.kt → ...alkyrienskies/mod/item/ShipCreatorItem.kt
@@ -1,9 +1,9 @@
-package net.examplemod.item
+package org.valkyrienskies.mod.item
 
-import net.examplemod.IShipObjectWorldProvider
-import net.examplemod.JOMLConversion
-import net.examplemod.VSNetworking
-import net.examplemod.networking.impl.VSPacketShipDataList
+import org.valkyrienskies.mod.IShipObjectWorldProvider
+import org.valkyrienskies.mod.JOMLConversion
+import org.valkyrienskies.mod.VSNetworking
+import org.valkyrienskies.mod.networking.impl.VSPacketShipDataList
 import net.minecraft.server.level.ServerPlayer
 import net.minecraft.world.InteractionResult
 import net.minecraft.world.item.Item

diff --git a/...ing/impl/VSPacketShipDataClientHandler.kt → ...ing/impl/VSPacketShipDataClientHandler.kt b/...ing/impl/VSPacketShipDataClientHandler.kt → ...ing/impl/VSPacketShipDataClientHandler.kt
@@ -1,4 +1,4 @@
-package net.examplemod.networking.impl
+package org.valkyrienskies.mod.networking.impl
 
 import org.valkyrienskies.core.networking.IVSPacket
 import org.valkyrienskies.core.networking.IVSPacketClientHandler

diff --git a/...d/networking/impl/VSPacketShipDataList.kt → ...d/networking/impl/VSPacketShipDataList.kt b/...d/networking/impl/VSPacketShipDataList.kt → ...d/networking/impl/VSPacketShipDataList.kt
@@ -1,4 +1,4 @@
-package net.examplemod.networking.impl
+package org.valkyrienskies.mod.networking.impl
 
 import io.netty.buffer.ByteBuf
 import net.minecraft.network.FriendlyByteBuf

diff --git a/common/src/main/resources/fabric.mod.json b/common/src/main/resources/fabric.mod.json
@@ -1,6 +1,6 @@
 {
   "_comment": "This file is here to make fabric loader load this on the Knot classloader.",
   "schemaVersion": 1,
-  "id": "modid-common",
+  "id": "valkyrienskies-common",
   "version": "0.0.1"
 }
diff --git a/...n/resources/examplemod-common.mixins.json → ...sources/valkyrienskies-common.mixins.json b/...n/resources/examplemod-common.mixins.json → ...sources/valkyrienskies-common.mixins.json
@@ -1,8 +1,8 @@
 {
   "required": true,
-  "package": "net.examplemod.mixin",
+  "package": "org.valkyrienskies.mod.mixin",
   "compatibilityLevel": "JAVA_8",
-  "refmap": "examplemod-common-refmap.json",
+  "refmap": "valkyrienskies-common-refmap.json",
   "mixins": [
     "server.level.MixinServerLevel",
     "server.level.MixinChunkMap"

diff --git a/fabric/build.gradle b/fabric/build.gradle
@@ -12,25 +12,18 @@ architectury {
     platformSetupLoomIde()
 }
 
-allprojects {
-    repositories {
-        mavenCentral()
-        maven { url 'https://jitpack.io' }
-    }
-}
-
 dependencies {
-    minecraft("com.mojang:minecraft:${rootProject.architect.minecraft}")
+    minecraft("com.mojang:minecraft:${rootProject.minecraft_version}")
     mappings(minecraft.officialMojangMappings())
     modCompile("net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}")
 
     compileOnly(project(path: ":common")) {
         transitive = false
     }
-    runtimeOnly(project(path: ":common", configuration: "transformedRuntime")) {
+    runtimeOnly(project(path: ":common", configuration: "transformDevelopmentFabric")) {
         transitive = false
     }
-    shadow(project(path: ":common", configuration: "transformed")) {
+    shadow(project(path: ":common", configuration: "transformProductionFabric")) {
         transitive = false
     }
 
@@ -41,17 +34,7 @@ dependencies {
     modImplementation("net.fabricmc.fabric-api:fabric-api:${rootProject.fabric_api_version}")
 
     // vs-core
-    implementation("com.github.ValkyrienSkies:vs-core:${rootProject.vs_core_version}") {
-        exclude group: 'org.joml'
-    }
-
-    // JOML (TODO use dependency from vs-core instead)
-    implementation("org.joml:joml:${rootProject.joml_version}")
-    implementation("org.joml:joml-primitives:${rootProject.joml_version}")
-
-    // Jackson Binary Dataformat for Object Serialization (TODO use dependency from vs-core instead)
-    implementation("com.fasterxml.jackson.module:jackson-module-kotlin:${rootProject.jacksonVersion}")
-    implementation("com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:${rootProject.jacksonVersion}")
+    implementation("org.valkyrienskies.core:vs-core:${rootProject.vs_core_version}")
 }
 
 processResources {

diff --git a/...emod/fabric/mixin/ExampleFabricMixin.java → .../mod/fabric/mixin/ExampleFabricMixin.java b/...emod/fabric/mixin/ExampleFabricMixin.java → .../mod/fabric/mixin/ExampleFabricMixin.java
@@ -1,4 +1,4 @@
-package net.examplemod.fabric.mixin;
+package org.valkyrienskies.mod.fabric.mixin;
 
 import net.minecraft.client.gui.screens.TitleScreen;
 import org.apache.logging.log4j.Logger;

diff --git a/fabric/src/main/kotlin/net/examplemod/fabric/ExampleModFabric.kt b/fabric/src/main/kotlin/net/examplemod/fabric/ExampleModFabric.kt
diff --git a/...emod/fabric/VSClientPlayChannelHandler.kt → .../mod/fabric/VSClientPlayChannelHandler.kt b/...emod/fabric/VSClientPlayChannelHandler.kt → .../mod/fabric/VSClientPlayChannelHandler.kt
@@ -1,6 +1,6 @@
-package net.examplemod.fabric
+package org.valkyrienskies.mod.fabric
 
-import net.examplemod.VSNetworking
+import org.valkyrienskies.mod.VSNetworking
 import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking
 import net.fabricmc.fabric.api.networking.v1.PacketSender
 import net.minecraft.client.Minecraft

diff --git a/...t/examplemod/fabric/VSFabricNetworking.kt → ...ienskies/mod/fabric/VSFabricNetworking.kt b/...t/examplemod/fabric/VSFabricNetworking.kt → ...ienskies/mod/fabric/VSFabricNetworking.kt
@@ -1,15 +1,15 @@
-package net.examplemod.fabric
+package org.valkyrienskies.mod.fabric
 
-import net.examplemod.ExampleMod
-import net.examplemod.VSNetworking
+import org.valkyrienskies.mod.ValkyrienSkiesMod
+import org.valkyrienskies.mod.VSNetworking
 import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking
 import net.minecraft.resources.ResourceLocation
 
 /**
  * Registers VS with the Fabric networking API.
  */
 object VSFabricNetworking {
-    internal val VS_PACKET_ID = ResourceLocation(ExampleMod.MOD_ID, "vs_packet")
+    internal val VS_PACKET_ID = ResourceLocation(ValkyrienSkiesMod.MOD_ID, "vs_packet")
 
     internal fun registerFabricNetworking() {
         registerClientPacketHandlers()

diff --git a/...ric/VSFabricServerToClientPacketSender.kt → ...ric/VSFabricServerToClientPacketSender.kt b/...ric/VSFabricServerToClientPacketSender.kt → ...ric/VSFabricServerToClientPacketSender.kt
@@ -1,6 +1,6 @@
-package net.examplemod.fabric
+package org.valkyrienskies.mod.fabric
 
-import net.examplemod.VSNetworking
+import org.valkyrienskies.mod.VSNetworking
 import net.fabricmc.fabric.api.networking.v1.PacketByteBufs
 import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking
 import net.minecraft.server.level.ServerPlayer

diff --git a/fabric/src/main/kotlin/org/valkyrienskies/mod/fabric/ValkyrienSkiesModFabric.kt b/fabric/src/main/kotlin/org/valkyrienskies/mod/fabric/ValkyrienSkiesModFabric.kt
@@ -0,0 +1,11 @@
+package org.valkyrienskies.mod.fabric
+
+import org.valkyrienskies.mod.ValkyrienSkiesMod
+import net.fabricmc.api.ModInitializer
+
+class ValkyrienSkiesModFabric : ModInitializer {
+	override fun onInitialize() {
+		ValkyrienSkiesMod.init()
+		VSFabricNetworking.registerFabricNetworking()
+	}
+}
diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json
@@ -1,6 +1,6 @@
 {
   "schemaVersion": 1,
-  "id": "examplemod",
+  "id": "valkyrienskies",
   "version": "${version}",
   "name": "Example Mod",
   "description": "This is an example description! Tell everyone what your mod is about!",
@@ -16,12 +16,12 @@
   "environment": "*",
   "entrypoints": {
     "main": [
-      "net.examplemod.fabric.ExampleModFabric"
+      "org.valkyrienskies.mod.fabric.ValkyrienSkiesModFabric"
     ]
   },
   "mixins": [
-    "examplemod-common.mixins.json",
-    "examplemod-fabric.mixins.json"
+    "valkyrienskies-common.mixins.json",
+    "valkyrienskies-fabric.mixins.json"
   ],
   "depends": {
     "fabricloader": ">=0.7.4",

diff --git a/...n/resources/examplemod-fabric.mixins.json → ...sources/valkyrienskies-fabric.mixins.json b/...n/resources/examplemod-fabric.mixins.json → ...sources/valkyrienskies-fabric.mixins.json
@@ -1,8 +1,8 @@
 {
   "required": true,
-  "package": "net.examplemod.fabric.mixin",
+  "package": "org.valkyrienskies.mod.fabric.mixin",
   "compatibilityLevel": "JAVA_8",
-  "refmap": "examplemod-fabric-refmap.json",
+  "refmap": "valkyrienskies-fabric-refmap.json",
   "mixins": [
   ],
   "client":[
-Original file line number
+Diff line change
@@ Expand Up / @@ -13,6 +13,9 @@ out @@
     *.iml
     .idea
+    # vscode
+    .vscode
     # gradle
     build
     .gradle
@@ Expand Down @@