Revert "V2"

.gitignore

@@ -19,7 +19,6 @@ build
 
 # other
 eclipse
-.claude
 # run
 
 # Files from Forge MDK
@@ -36,20 +35,13 @@ run/resources/
 run/saves/
 run/schematics/uploaded
 run/screenshots/
-run/servers.*
-run/mods/
 run/fabricloader.log
 run/options.txt
 run/usercache.json
 run/usernamecache.json
-run/hs_err_pid*.log
-run/imgui.init
 run/emi.json
 run/.mixin.out
 run/gametest
 run/logs
+run/schematics
 run/server
-run/client2
-
-# LLM
-.claude/*

build.gradle

@@ -18,7 +18,7 @@ String gitHash = calculateGitHash() + (hasUnstaged() ? "-modified" : "")
 base {
     archivesName = "createnuclear-${artifact_minecraft_version}"
     group = mod_group_id
-    version = "${mod_version}-forge" + (dev && buildNumber != null ? "-${buildNumber}" : "")
+    version = 'forge' + (dev && buildNumber != null ? "-${buildNumber}" : "")
 }
 
 println "Java: ${System.getProperty 'java.version'}, " +
@@ -29,8 +29,7 @@ println "Java: ${System.getProperty 'java.version'}, " +
 Provider<RegularFile> refmap
 mixin {
     refmap = add(sourceSets.main, "createnuclear.refmap.json")
-    // add sourceSets.main, 'createnuclear.forge.refmap.json'
-    config 'createnuclear.forge.mixins.json'
+    config "createnuclear.forge.mixins.json"
 }
 
 idea {
@@ -41,10 +40,13 @@ idea {
 }
 
 legacyForge {
-    version = "${minecraft_version}-${forge_version}"
+    version = "$minecraft_version-$forge_version"
 
-    accessTransformers {
-        from(file("src/main/resources/META-INF/accesstransformer.cfg"))
+    // TODO - Try turning this on later
+    validateAccessTransformers = false
+
+    if (file("src/main/resources/META-INF/accesstransformer.cfg").exists()) {
+        accessTransformers.from "src/main/resources/META-INF/accesstransformer.cfg"
     }
 
     parchment {
@@ -53,53 +55,36 @@ legacyForge {
     }
 
     mods {
-        "${mod_id}" {
-            sourceSet sourceSets.main
+        createnuclear {
+            sourceSet(sourceSets.main)
         }
     }
 
-    // Default run configurations.
-    // These can be tweaked, removed, or duplicated as needed.
     runs {
         // applies to all the run configs below
         configureEach {
             systemProperty("forge.logging.markers", "REGISTRIES")
             systemProperty("forge.logging.console.level", "info")
-            jvmArguments.addAll("-XX:+IgnoreUnrecognizedVMOptions", "-XX:+AllowEnhancedClassRedefinition")
-            //jvmArgument("-XX:-OmitStackTraceInFastThrow") // uncomment when you get exceptions with null messages etc
-            //jvmArgument("-XX:+UnlockCommercialFeatures") // uncomment for profiling
+            jvmArguments = ["-XX:+IgnoreUnrecognizedVMOptions", "-XX:+AllowEnhancedClassRedefinition"]
+            //jvmArgs("-XX:-OmitStackTraceInFastThrow") // uncomment when you get exceptions with null messages etc
+            //jvmArgs "-XX:+UnlockCommercialFeatures" // uncomment for profiling
 
             systemProperty("mixin.debug.export", "true")
             systemProperty("mixin.debug.verbose", "true")
 
             programArgument("-mixin.config=createnuclear.forge.mixins.json")
-
-            systemProperty("mixin.env.remapRefMap", "true")
-            systemProperty("mixin.env.refMapRemappingFile", "${projectDir}/build/moddev/artifacts/intermediateToNamed.srg")
         }
 
         client {
             client()
-            gameDirectory = project.file('run')
-        }
 
-        client2 {
-            client()
-            gameDirectory = project.file('run/client2')
-            programArguments.addAll('--username', 'Dev2')
+            gameDirectory = project.file("run")
         }
 
         server {
             server()
-        }
 
-        // This run config launches GameTestServer and runs all registered gametests, then exits.
-        // By default, the server will crash when no gametests are provided.
-        // The gametest system is also enabled by default for other run configs under the /test command.
-        gameTestServer {
-            type = "gameTestServer"
-            gameDirectory = project.file('run/gametest')
-            systemProperty('forge.enabledGameTestNamespaces', mod_id)
+            gameDirectory = project.file("run/server")
         }
 
         data {
@@ -118,10 +103,6 @@ legacyForge {
     }
 }
 
-sourceSets.main.resources {
-    srcDir 'src/generated/resources'
-}
-
 repositories {
     maven {
         // location of the maven that hosts JEI files before January 2023
@@ -150,53 +131,59 @@ repositories {
 dependencies {
     /* other minecraft dependencies are here */
     modImplementation("curse.maven:jade-324717:6106101")
-
+    
     // compile against the JEI API but do not include it at runtime
     modCompileOnly("mezz.jei:jei-${minecraft_version}-common-api:${jei_version}")
     modCompileOnly("mezz.jei:jei-${minecraft_version}-forge-api:${jei_version}")
-
+    
     // at runtime, use the full JEI jar for Forge
-
-    //Alex's cave
-    modCompileOnly("curse.maven:alexs-caves-924854:5848216")
-    modCompileOnly("curse.maven:citadel-331936:6002521")
-
-    modImplementation("com.simibubi.create:create-${minecraft_version}:${create_version}:slim") { transitive = false }
-    modImplementation("net.createmod.ponder:Ponder-Forge-${minecraft_version}:${ponder_version}")
-    modCompileOnly("dev.engine-room.flywheel:flywheel-forge-api-${minecraft_version}:${flywheel_version}")
-    modRuntimeOnly("dev.engine-room.flywheel:flywheel-forge-${minecraft_version}:${flywheel_version}")
-    modImplementation("com.tterrag.registrate:Registrate:${registrate_version}")
-
     switch (recipe_viewer.toLowerCase(Locale.ROOT)) {
         case 'jei': modRuntimeOnly("mezz.jei:jei-${minecraft_version}-forge:${jei_version}"); break
         case "disabled": break
         default: println("Unknown recipe viewer specified: $recipe_viewer. Must be JEI or disabled.")
     }
 
+    modImplementation("com.simibubi.create:create-${minecraft_version}:${create_version}:slim") { transitive = false }
+    modImplementation("net.createmod.ponder:Ponder-Forge-${minecraft_version}:${ponder_version}")
+    modCompileOnly("dev.engine-room.flywheel:flywheel-forge-api-${minecraft_version}:${flywheel_version}")
+    modRuntimeOnly("dev.engine-room.flywheel:flywheel-forge-${minecraft_version}:${flywheel_version}")
+    modImplementation("com.tterrag.registrate:Registrate:${registrate_version}")
+
     implementation("io.github.llamalad7:mixinextras-forge:${mixin_extras_version}")
     compileOnly(annotationProcessor("io.github.llamalad7:mixinextras-common:${mixin_extras_version}"))
 
-    annotationProcessor "org.spongepowered:mixin:${mixin_version}:processor"
-
-    /** Tests **/
-    testImplementation platform('org.junit:junit-bom:5.10.2')
-    testImplementation 'org.junit.jupiter:junit-jupiter'
+    // https://discord.com/channels/313125603924639766/725850371834118214/910619168821354497
+    // Prevent Mixin annotation processor from getting into IntelliJ's annotation processor settings
+    // This allows 'Settings > Build, Execution, and Deployment > Build Tools > Gradle > Build and run using' set to IntelliJ to work correctly
+    if (!Boolean.getBoolean("idea.sync.active")) {
+        annotationProcessor "org.spongepowered:mixin:${mixin_version}:processor"
+    }
 }
 
-test {
-    useJUnitPlatform()
+sourceSets.main {
+    resources {
+        srcDir("src/generated/resources")
+        exclude(".cache/")
+    }
+
+    blossom.javaSources {
+        property("version", mod_version)
+        property("gitCommit", gitHash.toString())
+    }
 }
 
 processResources {
     var replaceProperties = [
-        minecraft_version_range: minecraft_version_range,
-        forge_version_range: forge_version_range,
+        minecraft_version: minecraft_version, minecraft_version_range: minecraft_version_range,
+        forge_version: forge_version, forge_version_range: forge_version_range,
         loader_version_range: loader_version_range,
         mod_id: mod_id, mod_name: mod_name, mod_license: mod_license, mod_version: mod_version,
         mod_authors: mod_authors, mod_description: mod_description,
-        create_version_range: create_version_range
+        create_version_range: create_version_range, ponder_version: ponder_version
     ]
-    inputs.properties replaceProperties
+
+    // Replaces FML's magic file.jarVersion string with the correct version at build time.
+    replaceProperties.put("file", [jarVersion: project.version])
 
     filesMatching(["META-INF/mods.toml"]) {
         expand(replaceProperties)
@@ -333,6 +320,3 @@ boolean hasUnstaged() {
         return false
     }
 }
-
-
-

gradle.properties

@@ -65,15 +65,15 @@ mod_id=createnuclear
 # The human-readable display name for the mod.
 mod_name=Create Nuclear
 # The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default.
-mod_license=MIT
+mod_license=All Rights Reserved
 # The mod version. See https://semver.org/
-mod_version=2.0.0
+mod_version=1.3.1
 # The group ID for the mod. It is only important when publishing as an artifact to a Maven repository.
 # This should match the base package used for the mod sources.
 # See https://maven.apache.org/guides/mini/guide-naming-conventions.html
 mod_group_id=net.nuclearteam.createnuclear
-# The authors of the mod. This is a simple text string used for display purposes in the mod list.
-mod_authors=Create Nuclear Team
-# The description of the mod. This is a simple multiline text string used for display purposes in the mod list.
-mod_description=Create nuclear is a mod that adds a whole nuclear system to the Create mod. An optimized reactor produces over eight million SU.
-mixin_config = 'createnuclear.forge.mixins.json'
+# The authors of the mod. This is a simple text string that is used for display purposes in the mod list.
+mod_authors=Create Nuclear
+# The description of the mod. This is a simple multiline text string that is used for display purposes in the mod list.
+mod_description=Create nuclear is a mod that adds a whole nuclear system to the create mod. An optimized reactor produces over two millions SU.
+mixin_config = 'createnuclear.forge.mixins.json'

src/generated/resources/.cache/15812fa7bc190aa8f0a8644088c7ff563925e506

@@ -1,24 +1,17 @@
-// 1.20.1	2026-08-21T19:32:31.337439	CreateNuclear's Processing Recipes
-bccfe326d6c91bd2df207a38225fbca413e1013f data/createnuclear/recipes/compacting/thorium_fluid_to_thorium_ingot.json
+// 1.20.1	2025-11-11T13:56:47.9570936	CreateNuclear's Processing Recipes
 c711d032a04e1a9350ad9bc4d9c4d74f54689862 data/createnuclear/recipes/compacting/uranium_fluid_to_yellowcake.json
 33becbc558bd2fbe277be096b292c0093f84e44c data/createnuclear/recipes/crushing/coal.json
 2a8b609dba5bad88511d9c9a80cf6fb582b18c36 data/createnuclear/recipes/crushing/fix/crushed_raw_uranium.json
 57154e35ebb09170bb39f5b3a72ecd49182697f2 data/createnuclear/recipes/crushing/granite.json
-682ceb2386fe56cd47e46d7ebb3d8185ac78515b data/createnuclear/recipes/crushing/nitrate.json
 4feb59d85e86e34ed565c18b6a4df120fe050bc7 data/createnuclear/recipes/crushing/raw_copper.json
-c0e1f33d8e91a3133e5acf6e4d3eb5ea5cd23471 data/createnuclear/recipes/crushing/raw_thorium.json
-169c09c5947ddf8bdc8727af3c71368880b0c128 data/createnuclear/recipes/crushing/raw_thorium_block.json
+cf17713133d3e05e99164e2ea6649de3aef017fd data/createnuclear/recipes/crushing/raw_uranium_block.json
 26d2787e831b9986ed6f90f8ea803d5fdc544bf5 data/createnuclear/recipes/crushing/raw_zinc.json
-87d2e1022c9eeb986bdc23b068fe7cf473ee42f1 data/createnuclear/recipes/deploying/reactor_fluid_input_from_fluid_pipe_and_reactor_casing.json
-04c671106607c2c93c0706f690cd876fb072dd56 data/createnuclear/recipes/deploying/reactor_output_from_shaft_and_reactor_casing.json
-58a34e84d942cb4250969388f78282270215c227 data/createnuclear/recipes/deploying/reactor_rod_input_from_hopper_and_reactor_casing.json
 e42be7d17c5e057e62c4b1176cbf43319a157f51 data/createnuclear/recipes/enriched/enriched_yellowcake.json
 74555eb2cce0827f99dc5c4ff91362bdaecad725 data/createnuclear/recipes/enriched/enriching_campfire.json
 d0a30a8942f3e81d11afa21a93037916601c38cb data/createnuclear/recipes/item_application/reactor_casing_from_steel_and_brass_casing.json
-a9d114da800657c53caabcb1369137ede6746362 data/createnuclear/recipes/mixing/liquid_nitrogen.json
+f2d3a2dbcb9135e31261cc8408f11cd07038a826 data/createnuclear/recipes/item_application/reactor_input_from_hopper_and_reactor_casing.json
+91c07d7804d0960aaa17a6258f00f1731ca458f5 data/createnuclear/recipes/item_application/reactor_output_from_shaft_and_reactor_casing.json
 7fc7695cd03577131096e9695170193044f8bc1a data/createnuclear/recipes/mixing/steel.json
-4bc858c73385e4309ef250b163cc696244a64767 data/createnuclear/recipes/mixing/thorium_fluid.json
 23e57de458330d04dfebff8070b44b3b1b2718eb data/createnuclear/recipes/mixing/uranium_fluid.json
-8e4e330293a702522ed424488055fe4d8d68c22d data/createnuclear/recipes/pressing/graphene.json
-f6f427d92e7680c47bc8d25f3d023ae6ce465615 data/createnuclear/recipes/snow_powder/cooled_nitrogen_concentrate.json
+ee4d2bf63449ba88826be263cf98e4bba2927ced data/createnuclear/recipes/pressing/graphene.json
 0756d627739cbbc2653aa3fbde9945ec11f2eace data/createnuclear/recipes/splashing/crushed_raw_lead.json