Fix recipes

nanite · Jul 20, 2024 · 3b686d4 · 3b686d4
1 parent f00d382
commit 3b686d4
Show file tree

Hide file tree

Showing 24 changed files with 298 additions and 73 deletions.
diff --git a/.gitignore b/.gitignore
@@ -16,4 +16,5 @@ classes/
 .metadata
 .vscode
 .settings
-*.launch
+*.launch
+common/src/main/resources/data-old/
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 All notable changes to this project will be documented in this file.
 
+## [21.0.3]
+
+- Fix crafting recipes
+
 ## [21.0.2]
 
 - Bump fabric/neo versions

diff --git a/common/build.gradle b/common/build.gradle
@@ -14,6 +14,8 @@ dependencies {
     modApi "dev.architectury:architectury:${rootProject.architectury_version}"
 }
 
+sourceSets.main.resources.srcDir 'src/generated/resources'
+
 publishing {
     publications {
         mavenCommon(MavenPublication) {

diff --git a/common/src/generated/resources/.cache/6a0f5e15c385463c018bca1039790989fecb37f3 b/common/src/generated/resources/.cache/6a0f5e15c385463c018bca1039790989fecb37f3
@@ -0,0 +1,9 @@
+// 1.21	2024-07-19T22:01:11.0724781	Player Plates/Recipes
+baf165ff80186858a57e3b52b61d506ebd5ccc33 data\playerplates\recipe\mossy_plate.json
+d0d85638d0c9b157d9ea306fe075ca70df31c657 data\playerplates\recipe\obsidian_plate.json
+3b84335c98350eecee33f9a6ef8dabdbfb87bfd5 data\playerplates\advancement\recipes\redstone\invisible_obsidian_plate.json
+b6af46165b7a0b913b33a650dceaabcefa5aedcf data\playerplates\recipe\invisible_mossy_plate.json
+9f484b9a5716e4ab027862b21a801f2f3ef2bd6c data\playerplates\recipe\invisible_obsidian_plate.json
+9b61191d38b0b17e674d6e4525d016454bb4308c data\playerplates\advancement\recipes\redstone\invisible_mossy_plate.json
+d1a5b52d2b7430d4d672267433c2ffc9a97689b1 data\playerplates\advancement\recipes\redstone\obsidian_plate.json
+f420201bf436da372edaec15a9f10acdd7af72d8 data\playerplates\advancement\recipes\redstone\mossy_plate.json
diff --git a/...rated/resources/data/playerplates/advancement/recipes/redstone/invisible_mossy_plate.json b/...rated/resources/data/playerplates/advancement/recipes/redstone/invisible_mossy_plate.json
@@ -0,0 +1,32 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_mossycobble": {
+      "conditions": {
+        "items": [
+          {
+            "items": "minecraft:mossy_cobblestone"
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "playerplates:invisible_mossy_plate"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_the_recipe",
+      "has_mossycobble"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "playerplates:invisible_mossy_plate"
+    ]
+  }
+}
diff --git a/...ed/resources/data/playerplates/advancement/recipes/redstone/invisible_obsidian_plate.json b/...ed/resources/data/playerplates/advancement/recipes/redstone/invisible_obsidian_plate.json
@@ -0,0 +1,32 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_obsidian": {
+      "conditions": {
+        "items": [
+          {
+            "items": "minecraft:obsidian"
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "playerplates:invisible_obsidian_plate"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_the_recipe",
+      "has_obsidian"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "playerplates:invisible_obsidian_plate"
+    ]
+  }
+}
diff --git a/...n/src/generated/resources/data/playerplates/advancement/recipes/redstone/mossy_plate.json b/...n/src/generated/resources/data/playerplates/advancement/recipes/redstone/mossy_plate.json
@@ -0,0 +1,32 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_mossycobble": {
+      "conditions": {
+        "items": [
+          {
+            "items": "minecraft:mossy_cobblestone"
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "playerplates:mossy_plate"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_the_recipe",
+      "has_mossycobble"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "playerplates:mossy_plate"
+    ]
+  }
+}
diff --git a/...rc/generated/resources/data/playerplates/advancement/recipes/redstone/obsidian_plate.json b/...rc/generated/resources/data/playerplates/advancement/recipes/redstone/obsidian_plate.json
@@ -0,0 +1,32 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_obsidian": {
+      "conditions": {
+        "items": [
+          {
+            "items": "minecraft:obsidian"
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "playerplates:obsidian_plate"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_the_recipe",
+      "has_obsidian"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "playerplates:obsidian_plate"
+    ]
+  }
+}
diff --git a/common/src/generated/resources/data/playerplates/recipe/invisible_mossy_plate.json b/common/src/generated/resources/data/playerplates/recipe/invisible_mossy_plate.json
@@ -0,0 +1,19 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "category": "redstone",
+  "key": {
+    "G": {
+      "item": "minecraft:glass_pane"
+    },
+    "M": {
+      "item": "minecraft:mossy_cobblestone"
+    }
+  },
+  "pattern": [
+    "GM"
+  ],
+  "result": {
+    "count": 1,
+    "id": "playerplates:invisible_mossy_plate"
+  }
+}
diff --git a/common/src/generated/resources/data/playerplates/recipe/invisible_obsidian_plate.json b/common/src/generated/resources/data/playerplates/recipe/invisible_obsidian_plate.json
@@ -0,0 +1,19 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "category": "redstone",
+  "key": {
+    "G": {
+      "item": "minecraft:glass_pane"
+    },
+    "O": {
+      "item": "minecraft:obsidian"
+    }
+  },
+  "pattern": [
+    "GO"
+  ],
+  "result": {
+    "count": 1,
+    "id": "playerplates:invisible_obsidian_plate"
+  }
+}
diff --git a/common/src/generated/resources/data/playerplates/recipe/mossy_plate.json b/common/src/generated/resources/data/playerplates/recipe/mossy_plate.json
@@ -0,0 +1,16 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "category": "redstone",
+  "key": {
+    "M": {
+      "item": "minecraft:mossy_cobblestone"
+    }
+  },
+  "pattern": [
+    "MM"
+  ],
+  "result": {
+    "count": 1,
+    "id": "playerplates:mossy_plate"
+  }
+}
diff --git a/common/src/generated/resources/data/playerplates/recipe/obsidian_plate.json b/common/src/generated/resources/data/playerplates/recipe/obsidian_plate.json
@@ -0,0 +1,16 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "category": "redstone",
+  "key": {
+    "O": {
+      "item": "minecraft:obsidian"
+    }
+  },
+  "pattern": [
+    "OO"
+  ],
+  "result": {
+    "count": 1,
+    "id": "playerplates:obsidian_plate"
+  }
+}
diff --git a/...necraft/tags/blocks/mineable/pickaxe.json → ...inecraft/tags/block/mineable/pickaxe.json b/...necraft/tags/blocks/mineable/pickaxe.json → ...inecraft/tags/block/mineable/pickaxe.json
diff --git a/...craft/tags/blocks/needs_diamond_tool.json → ...ecraft/tags/block/needs_diamond_tool.json b/...craft/tags/blocks/needs_diamond_tool.json → ...ecraft/tags/block/needs_diamond_tool.json
diff --git a/...necraft/tags/blocks/needs_stone_tool.json → ...inecraft/tags/block/needs_stone_tool.json b/...necraft/tags/blocks/needs_stone_tool.json → ...inecraft/tags/block/needs_stone_tool.json
diff --git a/common/src/main/resources/data/playerplates/recipes/invisible_mossy_plate.json b/common/src/main/resources/data/playerplates/recipes/invisible_mossy_plate.json
diff --git a/common/src/main/resources/data/playerplates/recipes/invisible_obsidian_plate.json b/common/src/main/resources/data/playerplates/recipes/invisible_obsidian_plate.json
diff --git a/common/src/main/resources/data/playerplates/recipes/mossy_plate.json b/common/src/main/resources/data/playerplates/recipes/mossy_plate.json
diff --git a/common/src/main/resources/data/playerplates/recipes/obsidian_plate.json b/common/src/main/resources/data/playerplates/recipes/obsidian_plate.json
diff --git a/fabric/build.gradle b/fabric/build.gradle
@@ -9,6 +9,22 @@ architectury {
 
 loom {
     accessWidenerPath = project(":common").loom.accessWidenerPath
+
+    runs{
+        data {
+            inherit client
+            setConfigName("Fabric Data")
+            ideConfigGenerated(true)
+
+            vmArg("-Dfabric-api.datagen")
+            vmArg("-Dfabric-api.datagen.output-dir=${project(":common").file("src/generated/resources")}")
+            vmArg("-Dfabric-api.datagen.modid=playerplates")
+
+            runDir "build/datagen"
+
+        }
+    }
+
 }
 
 configurations {

diff --git a/fabric/src/main/java/dev/wuffs/fabric/DataGens.java b/fabric/src/main/java/dev/wuffs/fabric/DataGens.java
@@ -0,0 +1,13 @@
+package dev.wuffs.fabric;
+
+import net.fabricmc.fabric.api.datagen.v1.DataGeneratorEntrypoint;
+import net.fabricmc.fabric.api.datagen.v1.FabricDataGenerator;
+
+public class DataGens implements DataGeneratorEntrypoint {
+    @Override
+    public void onInitializeDataGenerator(FabricDataGenerator fabricDataGenerator) {
+        FabricDataGenerator.Pack pack = fabricDataGenerator.createPack();
+        pack.addProvider(RecipeGenerator::new);
+
+    }
+}