Merge pull request #5 from Type-32/1.18.x-weapon-recipe-impl

Item Model and Recipe Data Gen and More Classes Improvements with New Content i.e. Decomponentalizer and Corresponding recipes
Type-32 · May 24, 2024 · 8b3391a · 8b3391a
2 parents 8d0a6cf + e24db68
commit 8b3391a
Show file tree

Hide file tree

Showing 656 changed files with 10,217 additions and 2,339 deletions.
diff --git a/.gitignore b/.gitignore
@@ -114,7 +114,8 @@ gradle-app.setting
 
 # Common working directory
 run/
-libs
+run-data/
+libs/
 
 # Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
 !gradle-wrapper.jar
diff --git a/README.md b/README.md
@@ -33,15 +33,15 @@ A Create Mod Addon that aims to incorporate automatable recipes using TaC Zero's
 
 ## Features
 - [X] Automatable recipes for Timeless and Classics: Zero's Ammunition (Finished)
-- [ ] Automatable recipes for Timeless and Classics: Zero's Weapons
+- [ ] Automatable recipes for Timeless and Classics: Zero's Weapons (Under Development)
 
 ## Versions
 
 The currently supported versions are:
 
-| Versions | Compatible Fabric Mod Ver. | Compatible Forge Mod Ver. | Dependency              |
-|----------|----------------------------|---------------------------|-------------------------|
-| 1.18.2   | N/A. TBD                   | 0.1.0 -> 0.1.1 Alpha      | tacz-1.0.0-beta-hotifx4 |
+| Versions | Compatible Fabric Mod Ver. | Compatible Forge Mod Ver. | Dependency         |
+|----------|----------------------------|---------------------------|--------------------|
+| 1.18.2   | N/A. TBD                   | 0.1.0 -> 0.1.1-alpha      | tacz-1.0.0-hotifx6 |
 
 ## Translations
 
@@ -76,12 +76,12 @@ The currently supported langauge translations are:
 
 ## 内容
 - [X] TaC: Zero的弹药的自动化配方（已完成）
-- [ ] TaC: Zero的武器的自动化配方
+- [ ] TaC: Zero的武器的自动化配方（正在开发中）
 
 ## 版本
 
 目前支持的版本有：
 
-| 版本     | 兼容 Fabric 的模组版本 | 兼容 Forge 的模组版本       | 前置模组                    |
-|--------|-----------------|----------------------|-------------------------|
-| 1.18.2 | 暂无，待定           | 0.1.0 -> 0.1.1 Alpha | tacz-1.0.0-beta-hotifx4 |
+| 版本     | 兼容 Fabric 的模组版本 | 兼容 Forge 的模组版本       | 前置模组               |
+|--------|-----------------|----------------------|--------------------|
+| 1.18.2 | 暂无，待定           | 0.1.0 -> 0.1.1-alpha | tacz-1.0.0-hotifx6 |
diff --git a/build.gradle b/build.gradle
@@ -31,6 +31,8 @@ minecraft {
             property 'forge.logging.markers', 'REGISTRIES'
 
             property 'forge.logging.console.level', 'debug'
+            property 'mixin.env.remapRefMap', 'true'
+            property 'mixin.env.refMapRemappingFile', "${projectDir}/build/createSrgToMcp/output.srg"
 
             mods {
                 "${mod_id}" {
@@ -48,16 +50,22 @@ minecraft {
 
         server {
             property 'forge.enabledGameTestNamespaces', mod_id
+            property 'mixin.env.remapRefMap', 'true'
+            property 'mixin.env.refMapRemappingFile', "${projectDir}/build/createSrgToMcp/output.srg"
             args '--nogui'
         }
 
         gameTestServer {
             property 'forge.enabledGameTestNamespaces', mod_id
+            property 'mixin.env.remapRefMap', 'true'
+            property 'mixin.env.refMapRemappingFile', "${projectDir}/build/createSrgToMcp/output.srg"
         }
 
         data {
             // example of overriding the workingDirectory set in configureEach above
             workingDirectory project.file('run-data')
+            property 'mixin.env.remapRefMap', 'true'
+            property 'mixin.env.refMapRemappingFile', "${projectDir}/build/createSrgToMcp/output.srg"
 
             // Specify the modid for data generation, where to output the resulting resource, and where to look for existing resources.
             args '--mod', mod_id, '--all', '--output', file('src/generated/resources/'), '--existing', file('src/main/resources/')
@@ -80,6 +88,21 @@ repositories {
         name = 'tterrag maven'
         url = 'https://maven.tterrag.com/'
     }
+    maven {
+        // location of the maven that hosts JEI files before January 2023
+        name = "Progwml6's maven"
+        url = "https://dvs1.progwml6.com/files/maven/"
+    }
+    maven {
+        // location of the maven that hosts JEI files since January 2023
+        name = "Jared's maven"
+        url = "https://maven.blamejared.com/"
+    }
+    maven {
+        // location of a maven mirror for JEI files, as a fallback
+        name = "ModMaven"
+        url = "https://modmaven.dev"
+    }
     mavenLocal()
 }
 
@@ -89,15 +112,16 @@ dependencies {
     implementation fg.deobf("com.simibubi.create:create-${create_minecraft_version}:${create_version}:slim") { transitive = false }
     implementation fg.deobf("com.jozufozu.flywheel:flywheel-forge-${flywheel_minecraft_version}:${flywheel_version}")
     implementation fg.deobf("com.tterrag.registrate:Registrate:${registrate_version}")
+//    implementation files(new String("libs/tacz-1.0.0-hotfix6-1.18.2.jar"))
 
     // [MC<minecraft_version>,MC<next_minecraft_version>)
     jarJar(group: 'com.tterrag.registrate', name: 'Registrate', version: "[MC1.18.2,MC1.19)")
 
     // Example mod dependency with JEI - using fg.deobf() ensures the dependency is remapped to your development mappings
     // The JEI API is declared for compile time use, while the full JEI artifact is used at runtime
-    // compileOnly fg.deobf("mezz.jei:jei-${mc_version}-common-api:${jei_version}")
-    // compileOnly fg.deobf("mezz.jei:jei-${mc_version}-forge-api:${jei_version}")
-    // runtimeOnly fg.deobf("mezz.jei:jei-${mc_version}-forge:${jei_version}")
+     compileOnly fg.deobf("mezz.jei:jei-${minecraft_version}-common-api:${jei_version}")
+     compileOnly fg.deobf("mezz.jei:jei-${minecraft_version}-forge-api:${jei_version}")
+     runtimeOnly fg.deobf("mezz.jei:jei-${minecraft_version}-forge:${jei_version}")
 
     // Example mod dependency using a mod jar from ./libs with a flat dir repository
     // This maps to ./libs/coolmod-${mc_version}-${coolmod_version}.jar

diff --git a/gradle.properties b/gradle.properties
@@ -42,7 +42,7 @@ mod_name=Precise Manufacturing
 # The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default.
 mod_license=MIT
 # The mod version. See https://semver.org/
-mod_version=1.18.2-0.1.1-alpha_f84f9069
+mod_version=1.18.2-0.2.0-alpha_nightly
 # 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
@@ -56,4 +56,6 @@ create_minecraft_version = 1.18.2
 flywheel_minecraft_version = 1.18.2
 create_version = 0.5.1.f-332
 flywheel_version = 0.6.10-105
-registrate_version = MC1.18.2-1.1.3
+registrate_version = MC1.18.2-1.1.3
+
+jei_version=10.2.1.1006
diff --git a/run-data/logs/2024-05-11-2.log.gz b/run-data/logs/2024-05-11-2.log.gz
diff --git a/run-data/logs/2024-05-11-3.log.gz b/run-data/logs/2024-05-11-3.log.gz
diff --git a/run-data/logs/2024-05-11-4.log.gz b/run-data/logs/2024-05-11-4.log.gz
diff --git a/run-data/logs/2024-05-11-5.log.gz b/run-data/logs/2024-05-11-5.log.gz
diff --git a/run-data/logs/2024-05-11-6.log.gz b/run-data/logs/2024-05-11-6.log.gz
diff --git a/run-data/logs/2024-05-11-7.log.gz b/run-data/logs/2024-05-11-7.log.gz
diff --git a/run-data/logs/2024-05-11-8.log.gz b/run-data/logs/2024-05-11-8.log.gz
diff --git a/run-data/logs/2024-05-17-2.log.gz b/run-data/logs/2024-05-17-2.log.gz
diff --git a/run-data/logs/2024-05-17-3.log.gz b/run-data/logs/2024-05-17-3.log.gz
diff --git a/run-data/logs/2024-05-17-4.log.gz b/run-data/logs/2024-05-17-4.log.gz
diff --git a/run-data/logs/2024-05-17-5.log.gz b/run-data/logs/2024-05-17-5.log.gz
diff --git a/run-data/logs/2024-05-17-6.log.gz b/run-data/logs/2024-05-17-6.log.gz
diff --git a/run-data/logs/2024-05-17-7.log.gz b/run-data/logs/2024-05-17-7.log.gz
diff --git a/run-data/logs/debug-1.log.gz b/run-data/logs/debug-1.log.gz
diff --git a/run-data/logs/debug-2.log.gz b/run-data/logs/debug-2.log.gz
diff --git a/run-data/logs/debug-3.log.gz b/run-data/logs/debug-3.log.gz
diff --git a/run-data/logs/debug-4.log.gz b/run-data/logs/debug-4.log.gz
diff --git a/run-data/logs/debug-5.log.gz b/run-data/logs/debug-5.log.gz