Corrected Directory Locations, Corrected Gradle Errors, Corrected Version Number, Added Necessary Files

- Moved `resources` directories into their appropriate locations in both the `fabric` and `neoforge` modules
- Corrected Gradle errors that prevented modules from loading
- Partially removed unnecessary Gradle calls
- Corrected version number to 10.0.0
- Added `McdwNeoForge` and `neoforge.mods.toml` files to continue to build out NeoForge module
- Moved fzzyhmstrs from the `contributors` designation to the `authors` designation, where applicable. Added fzzyhmstrs to `authors` designation where not applicable
- Added yuripo to `contributors` designation as an artist
- Updated Fzzy Config from `0.5.9+1.21` -> `0.6.9+1.21`

Author: chronosacaria

.gitignore

@@ -121,3 +121,4 @@ run/
 /script.js
 /src/ReferenceClasses/*.java
 /common/src/main/generated/.cache/
+/common/src/ReferenceClasses/

common/build.gradle

@@ -1,34 +1,3 @@
-architectury {
-    common(rootProject.enabled_platforms.split(","))
-}
-
-
-dependencies {
-    // We depend on fabric loader here to use the fabric @Environment annotations and get the mixin dependencies
-    // Do NOT use other classes from fabric loader
-    modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}"
-
-    //modCompileOnly "dev.emi:emi-xplat-intermediary:${rootProject.emi_version}+${rootProject.minecraft_version}"
-    modCompileOnly "me.fzzyhmstrs:fzzy_config:${rootProject.fzzyConfigVersion}"
-}
-
-publishing {
-    publications {
-        mavenCommon(MavenPublication) {
-            artifactId = rootProject.archives_base_name
-            from components.java
-        }
-    }
-
-    // See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing.
-    repositories {
-        // Add repositories to publish to here.
-    }
-}
-
-
-
-/*
 plugins {
     id "com.github.johnrengelman.shadow" version "7.1.2"
 }
@@ -121,4 +90,3 @@ publishing {
 fabricApi {
     configureDataGeneration()
 }
-*/

fabric/src/main/java/dev/timefall/mcdw/McdwFabric.java

@@ -15,9 +15,9 @@ public class McdwFabric implements ModInitializer {
 
     @Override
     public void onInitialize() {
+        McdwCommon.initialize();
         ConfigEnchantmentEnabledCondition.register();
         ConfigItemEnabledCondition.register();
-        McdwCommon.initialize();
         DefaultAttributeRegistryFabric.registerAttributes();
         McdwFabricEvents.registerEvents();
         LootRegistryFabric.register();

fabric/src/resources/fabric.mod.json fabric/src/main/resources/fabric.mod.jsonfabric/src/resources/fabric.mod.json renamed to fabric/src/main/resources/fabric.mod.json

@@ -6,20 +6,21 @@
   "description": "Add the weapons (and some tools) from Minecraft Dungeons to Minecraft Java",
   "authors": [
     "Chronosacaria",
-    "Kluzzio"
+    "Kluzzio",
+    "fzzyhmstrs"
   ],
   "contributors": [
     "Daedelus (Code)",
     "DaFuqs (Code)",
     "el0c (Code)",
     "Fourmisain (Code)",
-    "fzzyhmstrs (Code)",
     "Krutyi-4el (Code)",
     "LordDeatHunter (Code)",
     "pizzaspren (Code)",
     "Kai1907 (Art)",
     "SeaOfPixels (Art)",
     "RDKRACZ (Art)",
+    "yuripo (Art)",
     "Astro Monse (Translation, ru)",
     "Binaris00 (Translation, es)",
     "gyular (Translation, ko)",
@@ -44,7 +45,7 @@
       "dev.timefall.mcdw.client.McdwClient"
     ],
     "main": [
-      "dev.timefall.mcdw.Mcdw"
+      "dev.timefall.mcdw.McdwFabric"
     ]
   },
   "accessWidener": "mcdw.accesswidener",

gradle.properties

@@ -4,17 +4,17 @@ minecraft_version=1.21
 enabled_platforms=fabric,neoforge
 
 archives_base_name=mcdw
-mod_version=1.4.0
+mod_version=10.0.0
 maven_group=dev.timefall
 
-fabric_loader_version=0.16.2
 fabric_api_version=0.102.0+1.21
+fabric_loader_version=0.16.2
 
 neoforge_version=21.0.167
 
 yarn_mappings=9
 
-fzzyConfigVersion=0.5.9+1.21
+fzzyConfigVersion=0.6.9+1.21
 
 
 

neoforge/src/main/java/dev/timefall/mcdw/McdwNeoForge.java

@@ -0,0 +1,29 @@
+/*
+ * Timefall Development License 1.2
+ * Copyright (c) 2025. Chronosacaria, Kluzzio, Timefall Development. All Rights Reserved.
+ *
+ * This software's content is licensed under the Timefall Development License 1.2. You can find this license information here: https://github.com/Timefall-Development/Timefall-Development-Licence/blob/main/TimefallDevelopmentLicense1.2.txt
+ */
+
+package dev.timefall.mcdw;
+
+import net.neoforged.bus.api.IEventBus;
+import net.neoforged.fml.common.Mod;
+
+@Mod(ModConstants.MOD_ID)
+public class McdwNeoForge {
+    public McdwNeoForge(IEventBus modEventBus) {
+        McdwCommon.initialize();
+
+        /*
+         * Game Event Bus Events
+         */
+
+
+        /*
+         * Mod Event Bus Events
+         */
+
+        McdwCommon.LOGGER.info("Initializing MCDW on NeoForge!");
+    }
+}

neoforge/src/main/resources/META-INF/neoforge.mods.toml

@@ -0,0 +1,38 @@
+modLoader = "javafml"
+loaderVersion = "[1,)"
+issueTrackerURL = "https://www.github.com/chronosacaria/MCDungeonsWeapons/issues"
+license = "Timefall Development License 1.2"
+
+[[mods]]
+modId = "mcdw"
+version = "${version}"
+displayName = "MC Dungeons Weapons"
+authors = "Chronosacaria, Kluzzio, fzzyhmstrs, yuripo (Art), SeaOfPixels (Art), SattesKrokodil (Art), Patreons (Support)"
+description = '''
+Add the weapons (and some tools) from Minecraft Dungeons to Minecraft Java
+'''
+logoFile = "assets/mcdw/icon.png"
+
+[[dependencies.mcdw]]
+modId = "neoforge"
+type = "REQUIRED"
+versionRange = "[21.0.0-beta,)"
+ordering = "NONE"
+side = "BOTH"
+
+[[dependencies.mcdw]]
+modId = "minecraft"
+type = "REQUIRED"
+versionRange = "[1.21,)"
+ordering = "NONE"
+side = "BOTH"
+
+[[dependencies.mcdw]]
+modId = "fzzy_config"
+type = "REQUIRED"
+versionRange = "[0.6.0,)"
+ordering = "NONE"
+side = "BOTH"
+
+[[mixins]]
+config="mcdw.mixins.json"