Fix broken recipes, update CN lang file, add more blocks

build.gradle

@@ -1,7 +1,7 @@
 plugins {
     id 'idea'
     id 'maven-publish'
-    id 'net.minecraftforge.gradle' version '[6.0,6.2)'
+    id 'net.neoforged.gradle' version '[6.0.18,6.2)'
     id 'org.spongepowered.mixin' version '0.7-SNAPSHOT'
 }
 
@@ -16,22 +16,45 @@ minecraft {
     // parchment  YYYY.MM.DD-MCVersion  Open community-sourced parameter names and javadocs layered on top of official
     //
     // You must be aware of the Mojang license when using the 'official' or 'parchment' mappings.
-    // See more information here: https://github.com/MinecraftForge/MCPConfig/blob/master/Mojang.md
+    // See more information here: https://github.com/NeoForged/NeoForm/blob/main/Mojang.md
     //
     // Parchment is an unofficial project maintained by ParchmentMC, separate from MinecraftForge
-    // Additional setup is needed to use their mappings: https://github.com/ParchmentMC/Parchment/wiki/Getting-Started
+    // Additional setup is needed to use their mappings: https://parchmentmc.org/docs/getting-started
     //
     // Use non-default mappings at your own risk. They may not always work.
     // Simply re-run your setup task after changing the mappings to update your workspace.
-    mappings channel: 'official', version: minecraft_version
+    mappings channel: mapping_channel, version: mapping_version
 
-    // accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg') // Currently, this location cannot be changed from the default.
+    // When true, this property will have all Eclipse/IntelliJ IDEA run configurations run the "prepareX" task for the given run configuration before launching the game.
+    // In most cases, it is not necessary to enable.
+    // enableEclipsePrepareRuns = true
+    // enableIdeaPrepareRuns = true
+
+    // This property allows configuring Gradle's ProcessResources task(s) to run on IDE output locations before launching the game.
+    // It is REQUIRED to be set to true for this template to function.
+    // See https://docs.gradle.org/current/dsl/org.gradle.language.jvm.tasks.ProcessResources.html
+    copyIdeResources = true
+
+    // When true, this property will add the folder name of all declared run configurations to generated IDE run configurations.
+    // The folder name can be set on a run configuration using the "folderName" property.
+    // By default, the folder name of a run configuration is the name of the Gradle project containing it.
+    // generateRunFolders = true
+
+    // This property enables access transformers for use in development.
+    // They will be applied to the Minecraft artifact.
+    // The access transformer file can be anywhere in the project.
+    // However, it must be at "META-INF/accesstransformer.cfg" in the final mod jar to be loaded by Forge.
+    // This default location is a best practice to automatically put the file in the right place in the final jar.
+    // See https://docs.neoforged.net/docs/1.20.x/advanced/accesstransformers/ for more information.
+
+    // accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg')
 
     // Default run configurations.
     // These can be tweaked, removed, or duplicated as needed.
     runs {
-        client {
-            workingDirectory project.file('run')
+        // applies to all the run configs below
+        configureEach {
+            workingDirectory project.file("run/${it.name}")
 
             // Recommended logging data for a userdev environment
             // The markers can be added/remove as needed separated by commas.
@@ -45,58 +68,35 @@ minecraft {
             // Please read: https://stackoverflow.com/questions/2031163/when-to-use-the-different-log-levels
             property 'forge.logging.console.level', 'debug'
 
-            // Comma-separated list of namespaces to load gametests from. Empty = all namespaces.
-            property 'forge.enabledGameTestNamespaces', mod_id
-
             mods {
                 "${mod_id}" {
                     source sourceSets.main
                 }
             }
         }
 
-        server {
-            workingDirectory project.file('run')
-
-            property 'forge.logging.markers', 'REGISTRIES'
-
-            property 'forge.logging.console.level', 'debug'
-
+        client {
+            // Comma-separated list of namespaces to load gametests from. Empty = all namespaces.
             property 'forge.enabledGameTestNamespaces', mod_id
+        }
 
-            mods {
-                "${mod_id}" {
-                    source sourceSets.main
-                }
-            }
+        server {
+            property 'forge.enabledGameTestNamespaces', mod_id
+            args '--nogui'
         }
 
         // 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 {
-            workingDirectory project.file('run')
-
-            property 'forge.logging.markers', 'REGISTRIES'
-
-            property 'forge.logging.console.level', 'debug'
-
             property 'forge.enabledGameTestNamespaces', mod_id
-
-            mods {
-                "${mod_id}" {
-                    source sourceSets.main
-                }
-            }
         }
 
         data {
-            workingDirectory project.file('run')
-
-            property 'forge.logging.markers', 'REGISTRIES'
-
-            property 'forge.logging.console.level', 'debug'
+            // example of overriding the workingDirectory set in configureEach above, uncomment if you want to use it
+            // workingDirectory project.file('run-data')
 
+            // Specify the modid for data generation, where to output the resulting resource, and where to look for existing resources.
             // 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/'),
                 '--existing-mod', 'alltheores',
@@ -107,12 +107,6 @@ minecraft {
                 '--existing-mod', 'powah',
                 '--existing-mod', 'productivebees',
                 '--existing-mod', 'supplementaries'
-
-            mods {
-                "${mod_id}" {
-                    source sourceSets.main
-                }
-            }
         }
     }
 }
@@ -158,7 +152,7 @@ dependencies {
     // Specify the version of Minecraft to use. If this is any group other than 'net.minecraft', it is assumed
     // that the dep is a ForgeGradle 'patcher' dependency, and its patches will be applied.
     // The userdev artifact is a special name and will get all sorts of transformations applied to it.
-    minecraft "net.minecraftforge:forge:${minecraft_version}-${forge_version}"
+    minecraft "net.neoforged:forge:${minecraft_version}-${neo_version}"
 
     // compile against the JEI API but do not include it at runtime
     compileOnly(fg.deobf("mezz.jei:jei-${minecraft_version}-common-api:${jei_version}"))
@@ -178,6 +172,9 @@ dependencies {
     runtimeOnly fg.deobf("curse.maven:cloth-config-348521:4573055") // required by powah
     runtimeOnly fg.deobf("curse.maven:architectury-api-419699:4581905") // required by powah
     runtimeOnly fg.deobf("curse.maven:ender-io-64578:4637542")
+    runtimeOnly fg.deobf("curse.maven:botania-225643:4900327")
+    runtimeOnly fg.deobf("curse.maven:curios-309927:4913335") // required by botania
+    runtimeOnly fg.deobf("curse.maven:patchouli-306770:4892162") // required by botania
 
 
     // Examples using mod jars from ./libs

gradle.properties

@@ -5,8 +5,10 @@ org.gradle.daemon=false
 
 group=com.pdiddy973.allthecompressed
 mod_id=allthecompressed
-version=3.0.1
+version=3.0.2
 
+mapping_channel=official
+mapping_version=1.20.1
 minecraft_version=1.20.1
-forge_version=47.1.0
+neo_version=47.1.79
 jei_version=15.0.0.12

settings.gradle

@@ -2,6 +2,10 @@ pluginManagement {
     repositories {
         gradlePluginPortal()
         maven { url = 'https://repo.spongepowered.org/maven' }
+        maven {
+            name = 'NeoForged'
+            url = 'https://maven.neoforged.net/releases'
+        }
     }
     resolutionStrategy {
         eachPlugin {

src/generated/resources/assets/allthecompressed/blockstates/blaze_block_1x.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "allthecompressed:block/blaze_block_1x"
+    }
+  }
+}

src/generated/resources/assets/allthecompressed/blockstates/blaze_block_2x.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "allthecompressed:block/blaze_block_2x"
+    }
+  }
+}

src/generated/resources/assets/allthecompressed/blockstates/blaze_block_3x.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "allthecompressed:block/blaze_block_3x"
+    }
+  }
+}

src/generated/resources/assets/allthecompressed/blockstates/blaze_block_4x.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "allthecompressed:block/blaze_block_4x"
+    }
+  }
+}

src/generated/resources/assets/allthecompressed/blockstates/blaze_block_5x.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "allthecompressed:block/blaze_block_5x"
+    }
+  }
+}

src/generated/resources/assets/allthecompressed/blockstates/blaze_block_6x.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "allthecompressed:block/blaze_block_6x"
+    }
+  }
+}

src/generated/resources/assets/allthecompressed/blockstates/blaze_block_7x.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "allthecompressed:block/blaze_block_7x"
+    }
+  }
+}

src/generated/resources/assets/allthecompressed/blockstates/blaze_block_8x.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "allthecompressed:block/blaze_block_8x"
+    }
+  }
+}

src/generated/resources/assets/allthecompressed/blockstates/blaze_block_9x.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "allthecompressed:block/blaze_block_9x"
+    }
+  }
+}

src/generated/resources/assets/allthecompressed/blockstates/calcite_1x.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "allthecompressed:block/calcite_1x"
+    }
+  }
+}

src/generated/resources/assets/allthecompressed/blockstates/calcite_2x.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "allthecompressed:block/calcite_2x"
+    }
+  }
+}

src/generated/resources/assets/allthecompressed/blockstates/calcite_3x.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "allthecompressed:block/calcite_3x"
+    }
+  }
+}

src/generated/resources/assets/allthecompressed/blockstates/calcite_4x.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "allthecompressed:block/calcite_4x"
+    }
+  }
+}

src/generated/resources/assets/allthecompressed/blockstates/calcite_5x.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "allthecompressed:block/calcite_5x"
+    }
+  }
+}

src/generated/resources/assets/allthecompressed/blockstates/calcite_6x.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "allthecompressed:block/calcite_6x"
+    }
+  }
+}

src/generated/resources/assets/allthecompressed/blockstates/calcite_7x.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "allthecompressed:block/calcite_7x"
+    }
+  }
+}

src/generated/resources/assets/allthecompressed/blockstates/calcite_8x.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "allthecompressed:block/calcite_8x"
+    }
+  }
+}

src/generated/resources/assets/allthecompressed/blockstates/calcite_9x.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "allthecompressed:block/calcite_9x"
+    }
+  }
+}

src/generated/resources/assets/allthecompressed/blockstates/mangrove_log_1x.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "allthecompressed:block/mangrove_log_1x"
+    }
+  }
+}

src/generated/resources/assets/allthecompressed/blockstates/mangrove_log_2x.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "allthecompressed:block/mangrove_log_2x"
+    }
+  }
+}

src/generated/resources/assets/allthecompressed/blockstates/mangrove_log_3x.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "allthecompressed:block/mangrove_log_3x"
+    }
+  }
+}

src/generated/resources/assets/allthecompressed/blockstates/mangrove_log_4x.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "allthecompressed:block/mangrove_log_4x"
+    }
+  }
+}

src/generated/resources/assets/allthecompressed/blockstates/mangrove_log_5x.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "allthecompressed:block/mangrove_log_5x"
+    }
+  }
+}