diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5c898eb4..097f4724 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -12,9 +12,9 @@ jobs: matrix: # Use these Java versions java: [ - 21, # Current Java LTS + 25, # Current Java LTS ] - runs-on: ubuntu-22.04 + runs-on: ubuntu-slim steps: - name: checkout repository uses: actions/checkout@v4 @@ -30,7 +30,7 @@ jobs: - name: build run: ./gradlew build - name: capture build artifacts - if: ${{ matrix.java == '21' }} # Only upload artifacts built from latest java + if: ${{ matrix.java == '25' }} # Only upload artifacts built from latest java uses: actions/upload-artifact@v4 with: name: Artifacts diff --git a/build.gradle b/build.gradle index 5a8fb92f..89ca53a4 100644 --- a/build.gradle +++ b/build.gradle @@ -11,10 +11,26 @@ base { } repositories { + mavenCentral() + maven { + name = "Fabric" + url = "https://maven.fabricmc.net/" + } maven { name = "TerraformersMC" url = "https://maven.terraformersmc.com/" } + exclusiveContent { + forRepository { + maven { + name = "Modrinth" + url = "https://api.modrinth.com/maven" + } + } + filter { + includeGroup "maven.modrinth" + } + } } fabricApi { @@ -24,14 +40,10 @@ fabricApi { } dependencies { - // To change the versions see the gradle.properties file - minecraft "com.mojang:minecraft:${project.minecraft_version}" - //mappings loom.officialMojangMappings() - implementation "net.fabricmc:fabric-loader:${project.loader_version}" - - // Fabric API. This is technically optional, but you probably want it anyway. - implementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" - implementation("com.terraformersmc:modmenu:${project.modmenu_version}") + minecraft "com.mojang:minecraft:${project.minecraft_version}" + implementation "net.fabricmc:fabric-loader:${project.loader_version}" + implementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" + implementation "maven.modrinth:modmenu:${project.modmenu_version}" } processResources { @@ -43,17 +55,17 @@ processResources { } tasks.withType(JavaCompile).configureEach { - it.options.release = 25 + it.options.encoding = "UTF-8" + it.options.release = 25 } java { - // Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task - // if it is present. - // If you remove this line, sources will not be generated. - withSourcesJar() + withSourcesJar() - sourceCompatibility = JavaVersion.VERSION_25 - targetCompatibility = JavaVersion.VERSION_25 + // This ensures Gradle actually uses JDK 25 for everything + toolchain { + languageVersion = JavaLanguageVersion.of(25) + } } jar { diff --git a/gradlew b/gradlew old mode 100644 new mode 100755 diff --git a/gradlew.bat b/gradlew.bat index db3a6ac2..c4bdd3ab 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -70,11 +70,10 @@ goto fail :execute @rem Setup the command line -set CLASSPATH= @rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* :end @rem End local scope for the variables with windows NT shell diff --git a/src/main/generated/data/houseki/advancement/recipes/bauxite_crushing.json b/src/main/generated/data/houseki/advancement/recipes/bauxite_crushing.json new file mode 100644 index 00000000..ab46aa6c --- /dev/null +++ b/src/main/generated/data/houseki/advancement/recipes/bauxite_crushing.json @@ -0,0 +1,21 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "houseki:bauxite_crushing" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "houseki:bauxite_crushing" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/houseki/advancement/recipes/cobblestone_crushing.json b/src/main/generated/data/houseki/advancement/recipes/cobblestone_crushing.json new file mode 100644 index 00000000..2b7a2ae9 --- /dev/null +++ b/src/main/generated/data/houseki/advancement/recipes/cobblestone_crushing.json @@ -0,0 +1,21 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "houseki:cobblestone_crushing" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "houseki:cobblestone_crushing" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/houseki/advancement/recipes/combat/aluminum_axe.json b/src/main/generated/data/houseki/advancement/recipes/combat/aluminum_axe.json index 3bdc1abb..a6432ab2 100644 --- a/src/main/generated/data/houseki/advancement/recipes/combat/aluminum_axe.json +++ b/src/main/generated/data/houseki/advancement/recipes/combat/aluminum_axe.json @@ -2,6 +2,13 @@ "parent": "minecraft:recipes/root", "criteria": { "has_aluminum": { + "conditions": { + "items": [ + { + "items": "houseki:aluminum" + } + ] + }, "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { diff --git a/src/main/generated/data/houseki/advancement/recipes/combat/aluminum_boots.json b/src/main/generated/data/houseki/advancement/recipes/combat/aluminum_boots.json index c13b6988..e96fa753 100644 --- a/src/main/generated/data/houseki/advancement/recipes/combat/aluminum_boots.json +++ b/src/main/generated/data/houseki/advancement/recipes/combat/aluminum_boots.json @@ -2,6 +2,13 @@ "parent": "minecraft:recipes/root", "criteria": { "has_aluminum": { + "conditions": { + "items": [ + { + "items": "houseki:aluminum" + } + ] + }, "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { diff --git a/src/main/generated/data/houseki/advancement/recipes/combat/aluminum_chestplate.json b/src/main/generated/data/houseki/advancement/recipes/combat/aluminum_chestplate.json index 16877227..cee73ab6 100644 --- a/src/main/generated/data/houseki/advancement/recipes/combat/aluminum_chestplate.json +++ b/src/main/generated/data/houseki/advancement/recipes/combat/aluminum_chestplate.json @@ -2,6 +2,13 @@ "parent": "minecraft:recipes/root", "criteria": { "has_aluminum": { + "conditions": { + "items": [ + { + "items": "houseki:aluminum" + } + ] + }, "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { diff --git a/src/main/generated/data/houseki/advancement/recipes/combat/aluminum_helmet.json b/src/main/generated/data/houseki/advancement/recipes/combat/aluminum_helmet.json index f8091874..e04d6591 100644 --- a/src/main/generated/data/houseki/advancement/recipes/combat/aluminum_helmet.json +++ b/src/main/generated/data/houseki/advancement/recipes/combat/aluminum_helmet.json @@ -2,6 +2,13 @@ "parent": "minecraft:recipes/root", "criteria": { "has_aluminum": { + "conditions": { + "items": [ + { + "items": "houseki:aluminum" + } + ] + }, "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { diff --git a/src/main/generated/data/houseki/advancement/recipes/combat/aluminum_leggings.json b/src/main/generated/data/houseki/advancement/recipes/combat/aluminum_leggings.json index 2194208b..8e61ba34 100644 --- a/src/main/generated/data/houseki/advancement/recipes/combat/aluminum_leggings.json +++ b/src/main/generated/data/houseki/advancement/recipes/combat/aluminum_leggings.json @@ -2,6 +2,13 @@ "parent": "minecraft:recipes/root", "criteria": { "has_aluminum": { + "conditions": { + "items": [ + { + "items": "houseki:aluminum" + } + ] + }, "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { diff --git a/src/main/generated/data/houseki/advancement/recipes/combat/aluminum_sword.json b/src/main/generated/data/houseki/advancement/recipes/combat/aluminum_sword.json index 06b6b605..75c76c4b 100644 --- a/src/main/generated/data/houseki/advancement/recipes/combat/aluminum_sword.json +++ b/src/main/generated/data/houseki/advancement/recipes/combat/aluminum_sword.json @@ -2,6 +2,13 @@ "parent": "minecraft:recipes/root", "criteria": { "has_aluminum": { + "conditions": { + "items": [ + { + "items": "houseki:aluminum" + } + ] + }, "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { diff --git a/src/main/generated/data/houseki/advancement/recipes/combat/cast_steel_axe.json b/src/main/generated/data/houseki/advancement/recipes/combat/cast_steel_axe.json index c0b0a905..ada94f24 100644 --- a/src/main/generated/data/houseki/advancement/recipes/combat/cast_steel_axe.json +++ b/src/main/generated/data/houseki/advancement/recipes/combat/cast_steel_axe.json @@ -2,6 +2,13 @@ "parent": "minecraft:recipes/root", "criteria": { "has_cast_steel": { + "conditions": { + "items": [ + { + "items": "houseki:cast_steel" + } + ] + }, "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { diff --git a/src/main/generated/data/houseki/advancement/recipes/combat/cast_steel_boots.json b/src/main/generated/data/houseki/advancement/recipes/combat/cast_steel_boots.json index 63f4a671..8c45a5e4 100644 --- a/src/main/generated/data/houseki/advancement/recipes/combat/cast_steel_boots.json +++ b/src/main/generated/data/houseki/advancement/recipes/combat/cast_steel_boots.json @@ -2,6 +2,13 @@ "parent": "minecraft:recipes/root", "criteria": { "has_cast_steel": { + "conditions": { + "items": [ + { + "items": "houseki:cast_steel" + } + ] + }, "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { diff --git a/src/main/generated/data/houseki/advancement/recipes/combat/cast_steel_chestplate.json b/src/main/generated/data/houseki/advancement/recipes/combat/cast_steel_chestplate.json index 732b9243..e1c8581a 100644 --- a/src/main/generated/data/houseki/advancement/recipes/combat/cast_steel_chestplate.json +++ b/src/main/generated/data/houseki/advancement/recipes/combat/cast_steel_chestplate.json @@ -2,6 +2,13 @@ "parent": "minecraft:recipes/root", "criteria": { "has_cast_steel": { + "conditions": { + "items": [ + { + "items": "houseki:cast_steel" + } + ] + }, "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { diff --git a/src/main/generated/data/houseki/advancement/recipes/combat/cast_steel_helmet.json b/src/main/generated/data/houseki/advancement/recipes/combat/cast_steel_helmet.json index 909f4372..b8582e94 100644 --- a/src/main/generated/data/houseki/advancement/recipes/combat/cast_steel_helmet.json +++ b/src/main/generated/data/houseki/advancement/recipes/combat/cast_steel_helmet.json @@ -2,6 +2,13 @@ "parent": "minecraft:recipes/root", "criteria": { "has_cast_steel": { + "conditions": { + "items": [ + { + "items": "houseki:cast_steel" + } + ] + }, "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { diff --git a/src/main/generated/data/houseki/advancement/recipes/combat/cast_steel_leggings.json b/src/main/generated/data/houseki/advancement/recipes/combat/cast_steel_leggings.json index 017b7f00..715c9b9c 100644 --- a/src/main/generated/data/houseki/advancement/recipes/combat/cast_steel_leggings.json +++ b/src/main/generated/data/houseki/advancement/recipes/combat/cast_steel_leggings.json @@ -2,6 +2,13 @@ "parent": "minecraft:recipes/root", "criteria": { "has_cast_steel": { + "conditions": { + "items": [ + { + "items": "houseki:cast_steel" + } + ] + }, "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { diff --git a/src/main/generated/data/houseki/advancement/recipes/combat/cast_steel_sword.json b/src/main/generated/data/houseki/advancement/recipes/combat/cast_steel_sword.json index a754d47c..b41a7be2 100644 --- a/src/main/generated/data/houseki/advancement/recipes/combat/cast_steel_sword.json +++ b/src/main/generated/data/houseki/advancement/recipes/combat/cast_steel_sword.json @@ -2,6 +2,13 @@ "parent": "minecraft:recipes/root", "criteria": { "has_cast_steel": { + "conditions": { + "items": [ + { + "items": "houseki:cast_steel" + } + ] + }, "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { diff --git a/src/main/generated/data/houseki/advancement/recipes/combat/jadeite_axe.json b/src/main/generated/data/houseki/advancement/recipes/combat/jadeite_axe.json index f0d9ee36..e11392fc 100644 --- a/src/main/generated/data/houseki/advancement/recipes/combat/jadeite_axe.json +++ b/src/main/generated/data/houseki/advancement/recipes/combat/jadeite_axe.json @@ -2,6 +2,13 @@ "parent": "minecraft:recipes/root", "criteria": { "has_jadeite": { + "conditions": { + "items": [ + { + "items": "houseki:jadeite" + } + ] + }, "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { diff --git a/src/main/generated/data/houseki/advancement/recipes/combat/jadeite_boots.json b/src/main/generated/data/houseki/advancement/recipes/combat/jadeite_boots.json index 558b1017..d4db6d27 100644 --- a/src/main/generated/data/houseki/advancement/recipes/combat/jadeite_boots.json +++ b/src/main/generated/data/houseki/advancement/recipes/combat/jadeite_boots.json @@ -2,6 +2,13 @@ "parent": "minecraft:recipes/root", "criteria": { "has_jadeite": { + "conditions": { + "items": [ + { + "items": "houseki:jadeite" + } + ] + }, "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { diff --git a/src/main/generated/data/houseki/advancement/recipes/combat/jadeite_chestplate.json b/src/main/generated/data/houseki/advancement/recipes/combat/jadeite_chestplate.json index 3d0a0e62..cc3a1289 100644 --- a/src/main/generated/data/houseki/advancement/recipes/combat/jadeite_chestplate.json +++ b/src/main/generated/data/houseki/advancement/recipes/combat/jadeite_chestplate.json @@ -2,6 +2,13 @@ "parent": "minecraft:recipes/root", "criteria": { "has_jadeite": { + "conditions": { + "items": [ + { + "items": "houseki:jadeite" + } + ] + }, "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { diff --git a/src/main/generated/data/houseki/advancement/recipes/combat/jadeite_helmet.json b/src/main/generated/data/houseki/advancement/recipes/combat/jadeite_helmet.json index 941b3d4c..1df2e13d 100644 --- a/src/main/generated/data/houseki/advancement/recipes/combat/jadeite_helmet.json +++ b/src/main/generated/data/houseki/advancement/recipes/combat/jadeite_helmet.json @@ -2,6 +2,13 @@ "parent": "minecraft:recipes/root", "criteria": { "has_jadeite": { + "conditions": { + "items": [ + { + "items": "houseki:jadeite" + } + ] + }, "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { diff --git a/src/main/generated/data/houseki/advancement/recipes/combat/jadeite_leggings.json b/src/main/generated/data/houseki/advancement/recipes/combat/jadeite_leggings.json index 71527b3e..9bdf429c 100644 --- a/src/main/generated/data/houseki/advancement/recipes/combat/jadeite_leggings.json +++ b/src/main/generated/data/houseki/advancement/recipes/combat/jadeite_leggings.json @@ -2,6 +2,13 @@ "parent": "minecraft:recipes/root", "criteria": { "has_jadeite": { + "conditions": { + "items": [ + { + "items": "houseki:jadeite" + } + ] + }, "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { diff --git a/src/main/generated/data/houseki/advancement/recipes/combat/jadeite_sword.json b/src/main/generated/data/houseki/advancement/recipes/combat/jadeite_sword.json index 49fc4127..653eb310 100644 --- a/src/main/generated/data/houseki/advancement/recipes/combat/jadeite_sword.json +++ b/src/main/generated/data/houseki/advancement/recipes/combat/jadeite_sword.json @@ -2,6 +2,13 @@ "parent": "minecraft:recipes/root", "criteria": { "has_jadeite": { + "conditions": { + "items": [ + { + "items": "houseki:jadeite" + } + ] + }, "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { diff --git a/src/main/generated/data/houseki/advancement/recipes/combat/nephrite_axe.json b/src/main/generated/data/houseki/advancement/recipes/combat/nephrite_axe.json index 413a7947..23a72581 100644 --- a/src/main/generated/data/houseki/advancement/recipes/combat/nephrite_axe.json +++ b/src/main/generated/data/houseki/advancement/recipes/combat/nephrite_axe.json @@ -2,6 +2,13 @@ "parent": "minecraft:recipes/root", "criteria": { "has_nephrite": { + "conditions": { + "items": [ + { + "items": "houseki:nephrite" + } + ] + }, "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { diff --git a/src/main/generated/data/houseki/advancement/recipes/combat/nephrite_boots.json b/src/main/generated/data/houseki/advancement/recipes/combat/nephrite_boots.json index 1ca9519b..0954f8e4 100644 --- a/src/main/generated/data/houseki/advancement/recipes/combat/nephrite_boots.json +++ b/src/main/generated/data/houseki/advancement/recipes/combat/nephrite_boots.json @@ -2,6 +2,13 @@ "parent": "minecraft:recipes/root", "criteria": { "has_nephrite": { + "conditions": { + "items": [ + { + "items": "houseki:nephrite" + } + ] + }, "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { diff --git a/src/main/generated/data/houseki/advancement/recipes/combat/nephrite_chestplate.json b/src/main/generated/data/houseki/advancement/recipes/combat/nephrite_chestplate.json index 33ff6c53..74c1821a 100644 --- a/src/main/generated/data/houseki/advancement/recipes/combat/nephrite_chestplate.json +++ b/src/main/generated/data/houseki/advancement/recipes/combat/nephrite_chestplate.json @@ -2,6 +2,13 @@ "parent": "minecraft:recipes/root", "criteria": { "has_nephrite": { + "conditions": { + "items": [ + { + "items": "houseki:nephrite" + } + ] + }, "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { diff --git a/src/main/generated/data/houseki/advancement/recipes/combat/nephrite_helmet.json b/src/main/generated/data/houseki/advancement/recipes/combat/nephrite_helmet.json index ccfa3d28..be90fb88 100644 --- a/src/main/generated/data/houseki/advancement/recipes/combat/nephrite_helmet.json +++ b/src/main/generated/data/houseki/advancement/recipes/combat/nephrite_helmet.json @@ -2,6 +2,13 @@ "parent": "minecraft:recipes/root", "criteria": { "has_nephrite": { + "conditions": { + "items": [ + { + "items": "houseki:nephrite" + } + ] + }, "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { diff --git a/src/main/generated/data/houseki/advancement/recipes/combat/nephrite_leggings.json b/src/main/generated/data/houseki/advancement/recipes/combat/nephrite_leggings.json index 2b3d544b..ab4eb36a 100644 --- a/src/main/generated/data/houseki/advancement/recipes/combat/nephrite_leggings.json +++ b/src/main/generated/data/houseki/advancement/recipes/combat/nephrite_leggings.json @@ -2,6 +2,13 @@ "parent": "minecraft:recipes/root", "criteria": { "has_nephrite": { + "conditions": { + "items": [ + { + "items": "houseki:nephrite" + } + ] + }, "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { diff --git a/src/main/generated/data/houseki/advancement/recipes/combat/nephrite_sword.json b/src/main/generated/data/houseki/advancement/recipes/combat/nephrite_sword.json index a9ebc3a2..6e53337d 100644 --- a/src/main/generated/data/houseki/advancement/recipes/combat/nephrite_sword.json +++ b/src/main/generated/data/houseki/advancement/recipes/combat/nephrite_sword.json @@ -2,6 +2,13 @@ "parent": "minecraft:recipes/root", "criteria": { "has_nephrite": { + "conditions": { + "items": [ + { + "items": "houseki:nephrite" + } + ] + }, "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { diff --git a/src/main/generated/data/houseki/advancement/recipes/combat/pinku_boots_smithing.json b/src/main/generated/data/houseki/advancement/recipes/combat/pinku_boots_smithing.json index 3f71dc3d..894b9eb8 100644 --- a/src/main/generated/data/houseki/advancement/recipes/combat/pinku_boots_smithing.json +++ b/src/main/generated/data/houseki/advancement/recipes/combat/pinku_boots_smithing.json @@ -2,6 +2,13 @@ "parent": "minecraft:recipes/root", "criteria": { "has_pinku": { + "conditions": { + "items": [ + { + "items": "houseki:pinku" + } + ] + }, "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { diff --git a/src/main/generated/data/houseki/advancement/recipes/combat/pinku_chestplate_smithing.json b/src/main/generated/data/houseki/advancement/recipes/combat/pinku_chestplate_smithing.json index e60f3cc5..90ebba5e 100644 --- a/src/main/generated/data/houseki/advancement/recipes/combat/pinku_chestplate_smithing.json +++ b/src/main/generated/data/houseki/advancement/recipes/combat/pinku_chestplate_smithing.json @@ -2,6 +2,13 @@ "parent": "minecraft:recipes/root", "criteria": { "has_pinku": { + "conditions": { + "items": [ + { + "items": "houseki:pinku" + } + ] + }, "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { diff --git a/src/main/generated/data/houseki/advancement/recipes/combat/pinku_helmet_smithing.json b/src/main/generated/data/houseki/advancement/recipes/combat/pinku_helmet_smithing.json index 56d1e703..cfd5a7aa 100644 --- a/src/main/generated/data/houseki/advancement/recipes/combat/pinku_helmet_smithing.json +++ b/src/main/generated/data/houseki/advancement/recipes/combat/pinku_helmet_smithing.json @@ -2,6 +2,13 @@ "parent": "minecraft:recipes/root", "criteria": { "has_pinku": { + "conditions": { + "items": [ + { + "items": "houseki:pinku" + } + ] + }, "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { diff --git a/src/main/generated/data/houseki/advancement/recipes/combat/pinku_leggings_smithing.json b/src/main/generated/data/houseki/advancement/recipes/combat/pinku_leggings_smithing.json index 05c63538..99276e8e 100644 --- a/src/main/generated/data/houseki/advancement/recipes/combat/pinku_leggings_smithing.json +++ b/src/main/generated/data/houseki/advancement/recipes/combat/pinku_leggings_smithing.json @@ -2,6 +2,13 @@ "parent": "minecraft:recipes/root", "criteria": { "has_pinku": { + "conditions": { + "items": [ + { + "items": "houseki:pinku" + } + ] + }, "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { diff --git a/src/main/generated/data/houseki/advancement/recipes/combat/pinku_nautilus_armor_smithing.json b/src/main/generated/data/houseki/advancement/recipes/combat/pinku_nautilus_armor_smithing.json index e3ef59bb..2ec09286 100644 --- a/src/main/generated/data/houseki/advancement/recipes/combat/pinku_nautilus_armor_smithing.json +++ b/src/main/generated/data/houseki/advancement/recipes/combat/pinku_nautilus_armor_smithing.json @@ -2,6 +2,13 @@ "parent": "minecraft:recipes/root", "criteria": { "has_pinku": { + "conditions": { + "items": [ + { + "items": "houseki:pinku" + } + ] + }, "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { diff --git a/src/main/generated/data/houseki/advancement/recipes/combat/pinku_sword_smithing.json b/src/main/generated/data/houseki/advancement/recipes/combat/pinku_sword_smithing.json index e0fec8da..45459867 100644 --- a/src/main/generated/data/houseki/advancement/recipes/combat/pinku_sword_smithing.json +++ b/src/main/generated/data/houseki/advancement/recipes/combat/pinku_sword_smithing.json @@ -2,6 +2,13 @@ "parent": "minecraft:recipes/root", "criteria": { "has_pinku": { + "conditions": { + "items": [ + { + "items": "houseki:pinku" + } + ] + }, "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { diff --git a/src/main/generated/data/houseki/advancement/recipes/combat/platinum_axe.json b/src/main/generated/data/houseki/advancement/recipes/combat/platinum_axe.json index 8b904f5b..468b38c2 100644 --- a/src/main/generated/data/houseki/advancement/recipes/combat/platinum_axe.json +++ b/src/main/generated/data/houseki/advancement/recipes/combat/platinum_axe.json @@ -2,6 +2,13 @@ "parent": "minecraft:recipes/root", "criteria": { "has_platinum": { + "conditions": { + "items": [ + { + "items": "houseki:platinum" + } + ] + }, "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { diff --git a/src/main/generated/data/houseki/advancement/recipes/combat/platinum_boots.json b/src/main/generated/data/houseki/advancement/recipes/combat/platinum_boots.json index cf93a0f3..93b50c20 100644 --- a/src/main/generated/data/houseki/advancement/recipes/combat/platinum_boots.json +++ b/src/main/generated/data/houseki/advancement/recipes/combat/platinum_boots.json @@ -2,6 +2,13 @@ "parent": "minecraft:recipes/root", "criteria": { "has_platinum": { + "conditions": { + "items": [ + { + "items": "houseki:platinum" + } + ] + }, "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { diff --git a/src/main/generated/data/houseki/advancement/recipes/combat/platinum_chestplate.json b/src/main/generated/data/houseki/advancement/recipes/combat/platinum_chestplate.json index 4647965c..7335b71f 100644 --- a/src/main/generated/data/houseki/advancement/recipes/combat/platinum_chestplate.json +++ b/src/main/generated/data/houseki/advancement/recipes/combat/platinum_chestplate.json @@ -2,6 +2,13 @@ "parent": "minecraft:recipes/root", "criteria": { "has_platinum": { + "conditions": { + "items": [ + { + "items": "houseki:platinum" + } + ] + }, "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { diff --git a/src/main/generated/data/houseki/advancement/recipes/combat/platinum_helmet.json b/src/main/generated/data/houseki/advancement/recipes/combat/platinum_helmet.json index df0fe7bf..c408e078 100644 --- a/src/main/generated/data/houseki/advancement/recipes/combat/platinum_helmet.json +++ b/src/main/generated/data/houseki/advancement/recipes/combat/platinum_helmet.json @@ -2,6 +2,13 @@ "parent": "minecraft:recipes/root", "criteria": { "has_platinum": { + "conditions": { + "items": [ + { + "items": "houseki:platinum" + } + ] + }, "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { diff --git a/src/main/generated/data/houseki/advancement/recipes/combat/platinum_leggings.json b/src/main/generated/data/houseki/advancement/recipes/combat/platinum_leggings.json index 89515b59..8385ebe5 100644 --- a/src/main/generated/data/houseki/advancement/recipes/combat/platinum_leggings.json +++ b/src/main/generated/data/houseki/advancement/recipes/combat/platinum_leggings.json @@ -2,6 +2,13 @@ "parent": "minecraft:recipes/root", "criteria": { "has_platinum": { + "conditions": { + "items": [ + { + "items": "houseki:platinum" + } + ] + }, "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { diff --git a/src/main/generated/data/houseki/advancement/recipes/combat/platinum_sword.json b/src/main/generated/data/houseki/advancement/recipes/combat/platinum_sword.json index 5f7f6ebd..78f185ea 100644 --- a/src/main/generated/data/houseki/advancement/recipes/combat/platinum_sword.json +++ b/src/main/generated/data/houseki/advancement/recipes/combat/platinum_sword.json @@ -2,6 +2,13 @@ "parent": "minecraft:recipes/root", "criteria": { "has_platinum": { + "conditions": { + "items": [ + { + "items": "houseki:platinum" + } + ] + }, "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { diff --git a/src/main/generated/data/houseki/advancement/recipes/combat/rainbow_pyrite_axe.json b/src/main/generated/data/houseki/advancement/recipes/combat/rainbow_pyrite_axe.json index 47c32393..4e483e98 100644 --- a/src/main/generated/data/houseki/advancement/recipes/combat/rainbow_pyrite_axe.json +++ b/src/main/generated/data/houseki/advancement/recipes/combat/rainbow_pyrite_axe.json @@ -2,6 +2,13 @@ "parent": "minecraft:recipes/root", "criteria": { "has_rainbow_pyrite": { + "conditions": { + "items": [ + { + "items": "houseki:rainbow_pyrite" + } + ] + }, "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { diff --git a/src/main/generated/data/houseki/advancement/recipes/combat/rainbow_pyrite_boots.json b/src/main/generated/data/houseki/advancement/recipes/combat/rainbow_pyrite_boots.json index 901200ec..8b5030ab 100644 --- a/src/main/generated/data/houseki/advancement/recipes/combat/rainbow_pyrite_boots.json +++ b/src/main/generated/data/houseki/advancement/recipes/combat/rainbow_pyrite_boots.json @@ -2,6 +2,13 @@ "parent": "minecraft:recipes/root", "criteria": { "has_rainbow_pyrite": { + "conditions": { + "items": [ + { + "items": "houseki:rainbow_pyrite" + } + ] + }, "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { diff --git a/src/main/generated/data/houseki/advancement/recipes/combat/rainbow_pyrite_chestplate.json b/src/main/generated/data/houseki/advancement/recipes/combat/rainbow_pyrite_chestplate.json index 6e72cb3e..523b251f 100644 --- a/src/main/generated/data/houseki/advancement/recipes/combat/rainbow_pyrite_chestplate.json +++ b/src/main/generated/data/houseki/advancement/recipes/combat/rainbow_pyrite_chestplate.json @@ -2,6 +2,13 @@ "parent": "minecraft:recipes/root", "criteria": { "has_rainbow_pyrite": { + "conditions": { + "items": [ + { + "items": "houseki:rainbow_pyrite" + } + ] + }, "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { diff --git a/src/main/generated/data/houseki/advancement/recipes/combat/rainbow_pyrite_helmet.json b/src/main/generated/data/houseki/advancement/recipes/combat/rainbow_pyrite_helmet.json index 98132bdc..8112ebf3 100644 --- a/src/main/generated/data/houseki/advancement/recipes/combat/rainbow_pyrite_helmet.json +++ b/src/main/generated/data/houseki/advancement/recipes/combat/rainbow_pyrite_helmet.json @@ -2,6 +2,13 @@ "parent": "minecraft:recipes/root", "criteria": { "has_rainbow_pyrite": { + "conditions": { + "items": [ + { + "items": "houseki:rainbow_pyrite" + } + ] + }, "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { diff --git a/src/main/generated/data/houseki/advancement/recipes/combat/rainbow_pyrite_leggings.json b/src/main/generated/data/houseki/advancement/recipes/combat/rainbow_pyrite_leggings.json index 1641975b..84da60a6 100644 --- a/src/main/generated/data/houseki/advancement/recipes/combat/rainbow_pyrite_leggings.json +++ b/src/main/generated/data/houseki/advancement/recipes/combat/rainbow_pyrite_leggings.json @@ -2,6 +2,13 @@ "parent": "minecraft:recipes/root", "criteria": { "has_rainbow_pyrite": { + "conditions": { + "items": [ + { + "items": "houseki:rainbow_pyrite" + } + ] + }, "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { diff --git a/src/main/generated/data/houseki/advancement/recipes/combat/rainbow_pyrite_sword.json b/src/main/generated/data/houseki/advancement/recipes/combat/rainbow_pyrite_sword.json index 177945ef..d67f2dd9 100644 --- a/src/main/generated/data/houseki/advancement/recipes/combat/rainbow_pyrite_sword.json +++ b/src/main/generated/data/houseki/advancement/recipes/combat/rainbow_pyrite_sword.json @@ -2,6 +2,13 @@ "parent": "minecraft:recipes/root", "criteria": { "has_rainbow_pyrite": { + "conditions": { + "items": [ + { + "items": "houseki:rainbow_pyrite" + } + ] + }, "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { diff --git a/src/main/generated/data/houseki/advancement/recipes/combat/sapphire_axe.json b/src/main/generated/data/houseki/advancement/recipes/combat/sapphire_axe.json index 405c1eca..3da724a8 100644 --- a/src/main/generated/data/houseki/advancement/recipes/combat/sapphire_axe.json +++ b/src/main/generated/data/houseki/advancement/recipes/combat/sapphire_axe.json @@ -2,6 +2,13 @@ "parent": "minecraft:recipes/root", "criteria": { "has_sapphire": { + "conditions": { + "items": [ + { + "items": "houseki:sapphire" + } + ] + }, "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { diff --git a/src/main/generated/data/houseki/advancement/recipes/combat/sapphire_boots.json b/src/main/generated/data/houseki/advancement/recipes/combat/sapphire_boots.json index c61a912c..52079f71 100644 --- a/src/main/generated/data/houseki/advancement/recipes/combat/sapphire_boots.json +++ b/src/main/generated/data/houseki/advancement/recipes/combat/sapphire_boots.json @@ -2,6 +2,13 @@ "parent": "minecraft:recipes/root", "criteria": { "has_sapphire": { + "conditions": { + "items": [ + { + "items": "houseki:sapphire" + } + ] + }, "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { diff --git a/src/main/generated/data/houseki/advancement/recipes/combat/sapphire_chestplate.json b/src/main/generated/data/houseki/advancement/recipes/combat/sapphire_chestplate.json index 94602677..29592a96 100644 --- a/src/main/generated/data/houseki/advancement/recipes/combat/sapphire_chestplate.json +++ b/src/main/generated/data/houseki/advancement/recipes/combat/sapphire_chestplate.json @@ -2,6 +2,13 @@ "parent": "minecraft:recipes/root", "criteria": { "has_sapphire": { + "conditions": { + "items": [ + { + "items": "houseki:sapphire" + } + ] + }, "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { diff --git a/src/main/generated/data/houseki/advancement/recipes/combat/sapphire_helmet.json b/src/main/generated/data/houseki/advancement/recipes/combat/sapphire_helmet.json index 757a7992..16ad3ecc 100644 --- a/src/main/generated/data/houseki/advancement/recipes/combat/sapphire_helmet.json +++ b/src/main/generated/data/houseki/advancement/recipes/combat/sapphire_helmet.json @@ -2,6 +2,13 @@ "parent": "minecraft:recipes/root", "criteria": { "has_sapphire": { + "conditions": { + "items": [ + { + "items": "houseki:sapphire" + } + ] + }, "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { diff --git a/src/main/generated/data/houseki/advancement/recipes/combat/sapphire_leggings.json b/src/main/generated/data/houseki/advancement/recipes/combat/sapphire_leggings.json index d73ae8be..59ee92c7 100644 --- a/src/main/generated/data/houseki/advancement/recipes/combat/sapphire_leggings.json +++ b/src/main/generated/data/houseki/advancement/recipes/combat/sapphire_leggings.json @@ -2,6 +2,13 @@ "parent": "minecraft:recipes/root", "criteria": { "has_sapphire": { + "conditions": { + "items": [ + { + "items": "houseki:sapphire" + } + ] + }, "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { diff --git a/src/main/generated/data/houseki/advancement/recipes/combat/sapphire_sword.json b/src/main/generated/data/houseki/advancement/recipes/combat/sapphire_sword.json index d588ae73..4de8a728 100644 --- a/src/main/generated/data/houseki/advancement/recipes/combat/sapphire_sword.json +++ b/src/main/generated/data/houseki/advancement/recipes/combat/sapphire_sword.json @@ -2,6 +2,13 @@ "parent": "minecraft:recipes/root", "criteria": { "has_sapphire": { + "conditions": { + "items": [ + { + "items": "houseki:sapphire" + } + ] + }, "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { diff --git a/src/main/generated/data/houseki/advancement/recipes/combat/steel_axe.json b/src/main/generated/data/houseki/advancement/recipes/combat/steel_axe.json index 6eb41173..9f811005 100644 --- a/src/main/generated/data/houseki/advancement/recipes/combat/steel_axe.json +++ b/src/main/generated/data/houseki/advancement/recipes/combat/steel_axe.json @@ -2,6 +2,13 @@ "parent": "minecraft:recipes/root", "criteria": { "has_steel": { + "conditions": { + "items": [ + { + "items": "houseki:steel" + } + ] + }, "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { diff --git a/src/main/generated/data/houseki/advancement/recipes/combat/steel_boots.json b/src/main/generated/data/houseki/advancement/recipes/combat/steel_boots.json index c3aec864..3740ac21 100644 --- a/src/main/generated/data/houseki/advancement/recipes/combat/steel_boots.json +++ b/src/main/generated/data/houseki/advancement/recipes/combat/steel_boots.json @@ -2,6 +2,13 @@ "parent": "minecraft:recipes/root", "criteria": { "has_steel": { + "conditions": { + "items": [ + { + "items": "houseki:steel" + } + ] + }, "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { diff --git a/src/main/generated/data/houseki/advancement/recipes/combat/steel_chestplate.json b/src/main/generated/data/houseki/advancement/recipes/combat/steel_chestplate.json index 6128dd96..0c8988dc 100644 --- a/src/main/generated/data/houseki/advancement/recipes/combat/steel_chestplate.json +++ b/src/main/generated/data/houseki/advancement/recipes/combat/steel_chestplate.json @@ -2,6 +2,13 @@ "parent": "minecraft:recipes/root", "criteria": { "has_steel": { + "conditions": { + "items": [ + { + "items": "houseki:steel" + } + ] + }, "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { diff --git a/src/main/generated/data/houseki/advancement/recipes/combat/steel_helmet.json b/src/main/generated/data/houseki/advancement/recipes/combat/steel_helmet.json index e9cb4d80..0f59f674 100644 --- a/src/main/generated/data/houseki/advancement/recipes/combat/steel_helmet.json +++ b/src/main/generated/data/houseki/advancement/recipes/combat/steel_helmet.json @@ -2,6 +2,13 @@ "parent": "minecraft:recipes/root", "criteria": { "has_steel": { + "conditions": { + "items": [ + { + "items": "houseki:steel" + } + ] + }, "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { diff --git a/src/main/generated/data/houseki/advancement/recipes/combat/steel_leggings.json b/src/main/generated/data/houseki/advancement/recipes/combat/steel_leggings.json index 7035b20a..72b6ca3f 100644 --- a/src/main/generated/data/houseki/advancement/recipes/combat/steel_leggings.json +++ b/src/main/generated/data/houseki/advancement/recipes/combat/steel_leggings.json @@ -2,6 +2,13 @@ "parent": "minecraft:recipes/root", "criteria": { "has_steel": { + "conditions": { + "items": [ + { + "items": "houseki:steel" + } + ] + }, "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { diff --git a/src/main/generated/data/houseki/advancement/recipes/combat/steel_sword.json b/src/main/generated/data/houseki/advancement/recipes/combat/steel_sword.json index ec2ae772..766be391 100644 --- a/src/main/generated/data/houseki/advancement/recipes/combat/steel_sword.json +++ b/src/main/generated/data/houseki/advancement/recipes/combat/steel_sword.json @@ -2,6 +2,13 @@ "parent": "minecraft:recipes/root", "criteria": { "has_steel": { + "conditions": { + "items": [ + { + "items": "houseki:steel" + } + ] + }, "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { diff --git a/src/main/generated/data/houseki/advancement/recipes/combat/tungsten_axe.json b/src/main/generated/data/houseki/advancement/recipes/combat/tungsten_axe.json index 02ab7271..9d6a9862 100644 --- a/src/main/generated/data/houseki/advancement/recipes/combat/tungsten_axe.json +++ b/src/main/generated/data/houseki/advancement/recipes/combat/tungsten_axe.json @@ -8,6 +8,13 @@ "trigger": "minecraft:recipe_unlocked" }, "has_tungsten": { + "conditions": { + "items": [ + { + "items": "houseki:tungsten" + } + ] + }, "trigger": "minecraft:inventory_changed" } }, diff --git a/src/main/generated/data/houseki/advancement/recipes/combat/tungsten_boots.json b/src/main/generated/data/houseki/advancement/recipes/combat/tungsten_boots.json index 0e32839f..b992a707 100644 --- a/src/main/generated/data/houseki/advancement/recipes/combat/tungsten_boots.json +++ b/src/main/generated/data/houseki/advancement/recipes/combat/tungsten_boots.json @@ -8,6 +8,13 @@ "trigger": "minecraft:recipe_unlocked" }, "has_tungsten": { + "conditions": { + "items": [ + { + "items": "houseki:tungsten" + } + ] + }, "trigger": "minecraft:inventory_changed" } }, diff --git a/src/main/generated/data/houseki/advancement/recipes/combat/tungsten_chestplate.json b/src/main/generated/data/houseki/advancement/recipes/combat/tungsten_chestplate.json index 93088a8e..57fd8b37 100644 --- a/src/main/generated/data/houseki/advancement/recipes/combat/tungsten_chestplate.json +++ b/src/main/generated/data/houseki/advancement/recipes/combat/tungsten_chestplate.json @@ -8,6 +8,13 @@ "trigger": "minecraft:recipe_unlocked" }, "has_tungsten": { + "conditions": { + "items": [ + { + "items": "houseki:tungsten" + } + ] + }, "trigger": "minecraft:inventory_changed" } }, diff --git a/src/main/generated/data/houseki/advancement/recipes/combat/tungsten_helmet.json b/src/main/generated/data/houseki/advancement/recipes/combat/tungsten_helmet.json index 904e988a..29990a49 100644 --- a/src/main/generated/data/houseki/advancement/recipes/combat/tungsten_helmet.json +++ b/src/main/generated/data/houseki/advancement/recipes/combat/tungsten_helmet.json @@ -8,6 +8,13 @@ "trigger": "minecraft:recipe_unlocked" }, "has_tungsten": { + "conditions": { + "items": [ + { + "items": "houseki:tungsten" + } + ] + }, "trigger": "minecraft:inventory_changed" } }, diff --git a/src/main/generated/data/houseki/advancement/recipes/combat/tungsten_leggings.json b/src/main/generated/data/houseki/advancement/recipes/combat/tungsten_leggings.json index f17594e2..a8f3efc0 100644 --- a/src/main/generated/data/houseki/advancement/recipes/combat/tungsten_leggings.json +++ b/src/main/generated/data/houseki/advancement/recipes/combat/tungsten_leggings.json @@ -8,6 +8,13 @@ "trigger": "minecraft:recipe_unlocked" }, "has_tungsten": { + "conditions": { + "items": [ + { + "items": "houseki:tungsten" + } + ] + }, "trigger": "minecraft:inventory_changed" } }, diff --git a/src/main/generated/data/houseki/advancement/recipes/combat/tungsten_sword.json b/src/main/generated/data/houseki/advancement/recipes/combat/tungsten_sword.json index 7303e42f..9eacd6cf 100644 --- a/src/main/generated/data/houseki/advancement/recipes/combat/tungsten_sword.json +++ b/src/main/generated/data/houseki/advancement/recipes/combat/tungsten_sword.json @@ -8,6 +8,13 @@ "trigger": "minecraft:recipe_unlocked" }, "has_tungsten": { + "conditions": { + "items": [ + { + "items": "houseki:tungsten" + } + ] + }, "trigger": "minecraft:inventory_changed" } }, diff --git a/src/main/generated/data/houseki/advancement/recipes/copper_ingot_crushing.json b/src/main/generated/data/houseki/advancement/recipes/copper_ingot_crushing.json new file mode 100644 index 00000000..31dd0f24 --- /dev/null +++ b/src/main/generated/data/houseki/advancement/recipes/copper_ingot_crushing.json @@ -0,0 +1,21 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "houseki:copper_ingot_crushing" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "houseki:copper_ingot_crushing" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/houseki/advancement/recipes/deepslate_platinum_ore_crushing.json b/src/main/generated/data/houseki/advancement/recipes/deepslate_platinum_ore_crushing.json new file mode 100644 index 00000000..b07b2773 --- /dev/null +++ b/src/main/generated/data/houseki/advancement/recipes/deepslate_platinum_ore_crushing.json @@ -0,0 +1,21 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "houseki:deepslate_platinum_ore_crushing" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "houseki:deepslate_platinum_ore_crushing" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/houseki/advancement/recipes/platinum_ore_crushing.json b/src/main/generated/data/houseki/advancement/recipes/platinum_ore_crushing.json new file mode 100644 index 00000000..c3c1f955 --- /dev/null +++ b/src/main/generated/data/houseki/advancement/recipes/platinum_ore_crushing.json @@ -0,0 +1,21 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "houseki:platinum_ore_crushing" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "houseki:platinum_ore_crushing" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/houseki/advancement/recipes/sandstone_crushing.json b/src/main/generated/data/houseki/advancement/recipes/sandstone_crushing.json new file mode 100644 index 00000000..4fdd1931 --- /dev/null +++ b/src/main/generated/data/houseki/advancement/recipes/sandstone_crushing.json @@ -0,0 +1,21 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "houseki:sandstone_crushing" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "houseki:sandstone_crushing" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/houseki/advancement/recipes/scheelite_crushing.json b/src/main/generated/data/houseki/advancement/recipes/scheelite_crushing.json new file mode 100644 index 00000000..a216a707 --- /dev/null +++ b/src/main/generated/data/houseki/advancement/recipes/scheelite_crushing.json @@ -0,0 +1,21 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "houseki:scheelite_crushing" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "houseki:scheelite_crushing" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/houseki/advancement/recipes/stone_crushing.json b/src/main/generated/data/houseki/advancement/recipes/stone_crushing.json new file mode 100644 index 00000000..9e7b6070 --- /dev/null +++ b/src/main/generated/data/houseki/advancement/recipes/stone_crushing.json @@ -0,0 +1,21 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "houseki:stone_crushing" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "houseki:stone_crushing" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/houseki/advancement/recipes/tools/advanced_diamond_drill_smithing.json b/src/main/generated/data/houseki/advancement/recipes/tools/advanced_diamond_drill_smithing.json index b25e4295..e26f0909 100644 --- a/src/main/generated/data/houseki/advancement/recipes/tools/advanced_diamond_drill_smithing.json +++ b/src/main/generated/data/houseki/advancement/recipes/tools/advanced_diamond_drill_smithing.json @@ -2,6 +2,13 @@ "parent": "minecraft:recipes/root", "criteria": { "has_block_of_cast_steel": { + "conditions": { + "items": [ + { + "items": "houseki:block_of_cast_steel" + } + ] + }, "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { diff --git a/src/main/generated/data/houseki/advancement/recipes/tools/advanced_drill_head_smithing.json b/src/main/generated/data/houseki/advancement/recipes/tools/advanced_drill_head_smithing.json index 92450112..467f9c07 100644 --- a/src/main/generated/data/houseki/advancement/recipes/tools/advanced_drill_head_smithing.json +++ b/src/main/generated/data/houseki/advancement/recipes/tools/advanced_drill_head_smithing.json @@ -2,6 +2,13 @@ "parent": "minecraft:recipes/root", "criteria": { "has_block_of_cast_steel": { + "conditions": { + "items": [ + { + "items": "houseki:block_of_cast_steel" + } + ] + }, "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { diff --git a/src/main/generated/data/houseki/advancement/recipes/tools/advanced_tungsten_drill_smithing.json b/src/main/generated/data/houseki/advancement/recipes/tools/advanced_tungsten_drill_smithing.json index 270a162d..65efec11 100644 --- a/src/main/generated/data/houseki/advancement/recipes/tools/advanced_tungsten_drill_smithing.json +++ b/src/main/generated/data/houseki/advancement/recipes/tools/advanced_tungsten_drill_smithing.json @@ -2,6 +2,13 @@ "parent": "minecraft:recipes/root", "criteria": { "has_block_of_cast_steel": { + "conditions": { + "items": [ + { + "items": "houseki:block_of_cast_steel" + } + ] + }, "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { diff --git a/src/main/generated/data/houseki/advancement/recipes/tools/aluminum_hoe.json b/src/main/generated/data/houseki/advancement/recipes/tools/aluminum_hoe.json index b01f3505..2b709bb2 100644 --- a/src/main/generated/data/houseki/advancement/recipes/tools/aluminum_hoe.json +++ b/src/main/generated/data/houseki/advancement/recipes/tools/aluminum_hoe.json @@ -2,6 +2,13 @@ "parent": "minecraft:recipes/root", "criteria": { "has_aluminum": { + "conditions": { + "items": [ + { + "items": "houseki:aluminum" + } + ] + }, "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { diff --git a/src/main/generated/data/houseki/advancement/recipes/tools/aluminum_pickaxe.json b/src/main/generated/data/houseki/advancement/recipes/tools/aluminum_pickaxe.json index df140f32..df3e0443 100644 --- a/src/main/generated/data/houseki/advancement/recipes/tools/aluminum_pickaxe.json +++ b/src/main/generated/data/houseki/advancement/recipes/tools/aluminum_pickaxe.json @@ -2,6 +2,13 @@ "parent": "minecraft:recipes/root", "criteria": { "has_aluminum": { + "conditions": { + "items": [ + { + "items": "houseki:aluminum" + } + ] + }, "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { diff --git a/src/main/generated/data/houseki/advancement/recipes/tools/aluminum_shovel.json b/src/main/generated/data/houseki/advancement/recipes/tools/aluminum_shovel.json index 1b1a2e35..2b4b1eed 100644 --- a/src/main/generated/data/houseki/advancement/recipes/tools/aluminum_shovel.json +++ b/src/main/generated/data/houseki/advancement/recipes/tools/aluminum_shovel.json @@ -2,6 +2,13 @@ "parent": "minecraft:recipes/root", "criteria": { "has_aluminum": { + "conditions": { + "items": [ + { + "items": "houseki:aluminum" + } + ] + }, "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { diff --git a/src/main/generated/data/houseki/advancement/recipes/tools/cast_steel_hoe.json b/src/main/generated/data/houseki/advancement/recipes/tools/cast_steel_hoe.json index a2997104..3c6a7999 100644 --- a/src/main/generated/data/houseki/advancement/recipes/tools/cast_steel_hoe.json +++ b/src/main/generated/data/houseki/advancement/recipes/tools/cast_steel_hoe.json @@ -2,6 +2,13 @@ "parent": "minecraft:recipes/root", "criteria": { "has_cast_steel": { + "conditions": { + "items": [ + { + "items": "houseki:cast_steel" + } + ] + }, "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { diff --git a/src/main/generated/data/houseki/advancement/recipes/tools/cast_steel_pickaxe.json b/src/main/generated/data/houseki/advancement/recipes/tools/cast_steel_pickaxe.json index 63e8a604..56390f0b 100644 --- a/src/main/generated/data/houseki/advancement/recipes/tools/cast_steel_pickaxe.json +++ b/src/main/generated/data/houseki/advancement/recipes/tools/cast_steel_pickaxe.json @@ -2,6 +2,13 @@ "parent": "minecraft:recipes/root", "criteria": { "has_cast_steel": { + "conditions": { + "items": [ + { + "items": "houseki:cast_steel" + } + ] + }, "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { diff --git a/src/main/generated/data/houseki/advancement/recipes/tools/cast_steel_shovel.json b/src/main/generated/data/houseki/advancement/recipes/tools/cast_steel_shovel.json index ddcc48a9..43c8232f 100644 --- a/src/main/generated/data/houseki/advancement/recipes/tools/cast_steel_shovel.json +++ b/src/main/generated/data/houseki/advancement/recipes/tools/cast_steel_shovel.json @@ -2,6 +2,13 @@ "parent": "minecraft:recipes/root", "criteria": { "has_cast_steel": { + "conditions": { + "items": [ + { + "items": "houseki:cast_steel" + } + ] + }, "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { diff --git a/src/main/generated/data/houseki/advancement/recipes/tools/enhanced_diamond_drill_smithing.json b/src/main/generated/data/houseki/advancement/recipes/tools/enhanced_diamond_drill_smithing.json index be98f15b..9426634c 100644 --- a/src/main/generated/data/houseki/advancement/recipes/tools/enhanced_diamond_drill_smithing.json +++ b/src/main/generated/data/houseki/advancement/recipes/tools/enhanced_diamond_drill_smithing.json @@ -2,6 +2,13 @@ "parent": "minecraft:recipes/root", "criteria": { "has_block_of_cast_steel": { + "conditions": { + "items": [ + { + "items": "houseki:block_of_cast_steel" + } + ] + }, "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { diff --git a/src/main/generated/data/houseki/advancement/recipes/tools/enhanced_drill_head_smithing.json b/src/main/generated/data/houseki/advancement/recipes/tools/enhanced_drill_head_smithing.json index b74eff11..a2535134 100644 --- a/src/main/generated/data/houseki/advancement/recipes/tools/enhanced_drill_head_smithing.json +++ b/src/main/generated/data/houseki/advancement/recipes/tools/enhanced_drill_head_smithing.json @@ -2,6 +2,13 @@ "parent": "minecraft:recipes/root", "criteria": { "has_block_of_cast_steel": { + "conditions": { + "items": [ + { + "items": "houseki:block_of_cast_steel" + } + ] + }, "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { diff --git a/src/main/generated/data/houseki/advancement/recipes/tools/enhanced_tungsten_drill_smithing.json b/src/main/generated/data/houseki/advancement/recipes/tools/enhanced_tungsten_drill_smithing.json index 83a27395..68c25558 100644 --- a/src/main/generated/data/houseki/advancement/recipes/tools/enhanced_tungsten_drill_smithing.json +++ b/src/main/generated/data/houseki/advancement/recipes/tools/enhanced_tungsten_drill_smithing.json @@ -2,6 +2,13 @@ "parent": "minecraft:recipes/root", "criteria": { "has_block_of_cast_steel": { + "conditions": { + "items": [ + { + "items": "houseki:block_of_cast_steel" + } + ] + }, "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { diff --git a/src/main/generated/data/houseki/advancement/recipes/tools/jadeite_hoe.json b/src/main/generated/data/houseki/advancement/recipes/tools/jadeite_hoe.json index 8bd7b556..4b1ab06f 100644 --- a/src/main/generated/data/houseki/advancement/recipes/tools/jadeite_hoe.json +++ b/src/main/generated/data/houseki/advancement/recipes/tools/jadeite_hoe.json @@ -2,6 +2,13 @@ "parent": "minecraft:recipes/root", "criteria": { "has_jadeite": { + "conditions": { + "items": [ + { + "items": "houseki:jadeite" + } + ] + }, "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { diff --git a/src/main/generated/data/houseki/advancement/recipes/tools/jadeite_pickaxe.json b/src/main/generated/data/houseki/advancement/recipes/tools/jadeite_pickaxe.json index 06d11130..63f67ce4 100644 --- a/src/main/generated/data/houseki/advancement/recipes/tools/jadeite_pickaxe.json +++ b/src/main/generated/data/houseki/advancement/recipes/tools/jadeite_pickaxe.json @@ -2,6 +2,13 @@ "parent": "minecraft:recipes/root", "criteria": { "has_jadeite": { + "conditions": { + "items": [ + { + "items": "houseki:jadeite" + } + ] + }, "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { diff --git a/src/main/generated/data/houseki/advancement/recipes/tools/jadeite_shovel.json b/src/main/generated/data/houseki/advancement/recipes/tools/jadeite_shovel.json index d950da2e..a0dbcf0c 100644 --- a/src/main/generated/data/houseki/advancement/recipes/tools/jadeite_shovel.json +++ b/src/main/generated/data/houseki/advancement/recipes/tools/jadeite_shovel.json @@ -2,6 +2,13 @@ "parent": "minecraft:recipes/root", "criteria": { "has_jadeite": { + "conditions": { + "items": [ + { + "items": "houseki:jadeite" + } + ] + }, "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { diff --git a/src/main/generated/data/houseki/advancement/recipes/tools/nephrite_hoe.json b/src/main/generated/data/houseki/advancement/recipes/tools/nephrite_hoe.json index 3d4b4c46..7089ff84 100644 --- a/src/main/generated/data/houseki/advancement/recipes/tools/nephrite_hoe.json +++ b/src/main/generated/data/houseki/advancement/recipes/tools/nephrite_hoe.json @@ -2,6 +2,13 @@ "parent": "minecraft:recipes/root", "criteria": { "has_nephrite": { + "conditions": { + "items": [ + { + "items": "houseki:nephrite" + } + ] + }, "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { diff --git a/src/main/generated/data/houseki/advancement/recipes/tools/nephrite_pickaxe.json b/src/main/generated/data/houseki/advancement/recipes/tools/nephrite_pickaxe.json index 5ee8d572..d564ef00 100644 --- a/src/main/generated/data/houseki/advancement/recipes/tools/nephrite_pickaxe.json +++ b/src/main/generated/data/houseki/advancement/recipes/tools/nephrite_pickaxe.json @@ -2,6 +2,13 @@ "parent": "minecraft:recipes/root", "criteria": { "has_nephrite": { + "conditions": { + "items": [ + { + "items": "houseki:nephrite" + } + ] + }, "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { diff --git a/src/main/generated/data/houseki/advancement/recipes/tools/nephrite_shovel.json b/src/main/generated/data/houseki/advancement/recipes/tools/nephrite_shovel.json index f9f68dfd..dead530d 100644 --- a/src/main/generated/data/houseki/advancement/recipes/tools/nephrite_shovel.json +++ b/src/main/generated/data/houseki/advancement/recipes/tools/nephrite_shovel.json @@ -2,6 +2,13 @@ "parent": "minecraft:recipes/root", "criteria": { "has_nephrite": { + "conditions": { + "items": [ + { + "items": "houseki:nephrite" + } + ] + }, "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { diff --git a/src/main/generated/data/houseki/advancement/recipes/tools/pinku_axe_smithing.json b/src/main/generated/data/houseki/advancement/recipes/tools/pinku_axe_smithing.json index 7ae7d0d6..dfd55828 100644 --- a/src/main/generated/data/houseki/advancement/recipes/tools/pinku_axe_smithing.json +++ b/src/main/generated/data/houseki/advancement/recipes/tools/pinku_axe_smithing.json @@ -2,6 +2,13 @@ "parent": "minecraft:recipes/root", "criteria": { "has_pinku": { + "conditions": { + "items": [ + { + "items": "houseki:pinku" + } + ] + }, "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { diff --git a/src/main/generated/data/houseki/advancement/recipes/tools/pinku_hoe_smithing.json b/src/main/generated/data/houseki/advancement/recipes/tools/pinku_hoe_smithing.json index cae52b26..ecb0c0bd 100644 --- a/src/main/generated/data/houseki/advancement/recipes/tools/pinku_hoe_smithing.json +++ b/src/main/generated/data/houseki/advancement/recipes/tools/pinku_hoe_smithing.json @@ -2,6 +2,13 @@ "parent": "minecraft:recipes/root", "criteria": { "has_pinku": { + "conditions": { + "items": [ + { + "items": "houseki:pinku" + } + ] + }, "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { diff --git a/src/main/generated/data/houseki/advancement/recipes/tools/pinku_pickaxe_smithing.json b/src/main/generated/data/houseki/advancement/recipes/tools/pinku_pickaxe_smithing.json index f9a08045..64276d6c 100644 --- a/src/main/generated/data/houseki/advancement/recipes/tools/pinku_pickaxe_smithing.json +++ b/src/main/generated/data/houseki/advancement/recipes/tools/pinku_pickaxe_smithing.json @@ -2,6 +2,13 @@ "parent": "minecraft:recipes/root", "criteria": { "has_pinku": { + "conditions": { + "items": [ + { + "items": "houseki:pinku" + } + ] + }, "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { diff --git a/src/main/generated/data/houseki/advancement/recipes/tools/pinku_shovel_smithing.json b/src/main/generated/data/houseki/advancement/recipes/tools/pinku_shovel_smithing.json index 17480703..221f8efb 100644 --- a/src/main/generated/data/houseki/advancement/recipes/tools/pinku_shovel_smithing.json +++ b/src/main/generated/data/houseki/advancement/recipes/tools/pinku_shovel_smithing.json @@ -2,6 +2,13 @@ "parent": "minecraft:recipes/root", "criteria": { "has_pinku": { + "conditions": { + "items": [ + { + "items": "houseki:pinku" + } + ] + }, "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { diff --git a/src/main/generated/data/houseki/advancement/recipes/tools/platinum_hoe.json b/src/main/generated/data/houseki/advancement/recipes/tools/platinum_hoe.json index 289da332..d088b531 100644 --- a/src/main/generated/data/houseki/advancement/recipes/tools/platinum_hoe.json +++ b/src/main/generated/data/houseki/advancement/recipes/tools/platinum_hoe.json @@ -2,6 +2,13 @@ "parent": "minecraft:recipes/root", "criteria": { "has_platinum": { + "conditions": { + "items": [ + { + "items": "houseki:platinum" + } + ] + }, "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { diff --git a/src/main/generated/data/houseki/advancement/recipes/tools/platinum_pickaxe.json b/src/main/generated/data/houseki/advancement/recipes/tools/platinum_pickaxe.json index 9ca0c934..89c2b601 100644 --- a/src/main/generated/data/houseki/advancement/recipes/tools/platinum_pickaxe.json +++ b/src/main/generated/data/houseki/advancement/recipes/tools/platinum_pickaxe.json @@ -2,6 +2,13 @@ "parent": "minecraft:recipes/root", "criteria": { "has_platinum": { + "conditions": { + "items": [ + { + "items": "houseki:platinum" + } + ] + }, "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { diff --git a/src/main/generated/data/houseki/advancement/recipes/tools/platinum_shovel.json b/src/main/generated/data/houseki/advancement/recipes/tools/platinum_shovel.json index 241077e5..9cff2e04 100644 --- a/src/main/generated/data/houseki/advancement/recipes/tools/platinum_shovel.json +++ b/src/main/generated/data/houseki/advancement/recipes/tools/platinum_shovel.json @@ -2,6 +2,13 @@ "parent": "minecraft:recipes/root", "criteria": { "has_platinum": { + "conditions": { + "items": [ + { + "items": "houseki:platinum" + } + ] + }, "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { diff --git a/src/main/generated/data/houseki/advancement/recipes/tools/premium_diamond_drill_smithing.json b/src/main/generated/data/houseki/advancement/recipes/tools/premium_diamond_drill_smithing.json index 7aa8a244..3c2cf4d0 100644 --- a/src/main/generated/data/houseki/advancement/recipes/tools/premium_diamond_drill_smithing.json +++ b/src/main/generated/data/houseki/advancement/recipes/tools/premium_diamond_drill_smithing.json @@ -2,6 +2,13 @@ "parent": "minecraft:recipes/root", "criteria": { "has_block_of_cast_steel": { + "conditions": { + "items": [ + { + "items": "houseki:block_of_cast_steel" + } + ] + }, "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { diff --git a/src/main/generated/data/houseki/advancement/recipes/tools/premium_drill_head_smithing.json b/src/main/generated/data/houseki/advancement/recipes/tools/premium_drill_head_smithing.json index 3a4e8e70..b0cec79b 100644 --- a/src/main/generated/data/houseki/advancement/recipes/tools/premium_drill_head_smithing.json +++ b/src/main/generated/data/houseki/advancement/recipes/tools/premium_drill_head_smithing.json @@ -2,6 +2,13 @@ "parent": "minecraft:recipes/root", "criteria": { "has_block_of_cast_steel": { + "conditions": { + "items": [ + { + "items": "houseki:block_of_cast_steel" + } + ] + }, "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { diff --git a/src/main/generated/data/houseki/advancement/recipes/tools/premium_tungsten_drill_smithing.json b/src/main/generated/data/houseki/advancement/recipes/tools/premium_tungsten_drill_smithing.json index 135c7d8a..26c226eb 100644 --- a/src/main/generated/data/houseki/advancement/recipes/tools/premium_tungsten_drill_smithing.json +++ b/src/main/generated/data/houseki/advancement/recipes/tools/premium_tungsten_drill_smithing.json @@ -2,6 +2,13 @@ "parent": "minecraft:recipes/root", "criteria": { "has_block_of_cast_steel": { + "conditions": { + "items": [ + { + "items": "houseki:block_of_cast_steel" + } + ] + }, "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { diff --git a/src/main/generated/data/houseki/advancement/recipes/tools/rainbow_pyrite_hoe.json b/src/main/generated/data/houseki/advancement/recipes/tools/rainbow_pyrite_hoe.json index 8bf2edec..e74c41e2 100644 --- a/src/main/generated/data/houseki/advancement/recipes/tools/rainbow_pyrite_hoe.json +++ b/src/main/generated/data/houseki/advancement/recipes/tools/rainbow_pyrite_hoe.json @@ -2,6 +2,13 @@ "parent": "minecraft:recipes/root", "criteria": { "has_rainbow_pyrite": { + "conditions": { + "items": [ + { + "items": "houseki:rainbow_pyrite" + } + ] + }, "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { diff --git a/src/main/generated/data/houseki/advancement/recipes/tools/rainbow_pyrite_pickaxe.json b/src/main/generated/data/houseki/advancement/recipes/tools/rainbow_pyrite_pickaxe.json index ce631f39..98fa333e 100644 --- a/src/main/generated/data/houseki/advancement/recipes/tools/rainbow_pyrite_pickaxe.json +++ b/src/main/generated/data/houseki/advancement/recipes/tools/rainbow_pyrite_pickaxe.json @@ -2,6 +2,13 @@ "parent": "minecraft:recipes/root", "criteria": { "has_rainbow_pyrite": { + "conditions": { + "items": [ + { + "items": "houseki:rainbow_pyrite" + } + ] + }, "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { diff --git a/src/main/generated/data/houseki/advancement/recipes/tools/rainbow_pyrite_shovel.json b/src/main/generated/data/houseki/advancement/recipes/tools/rainbow_pyrite_shovel.json index 10225e1a..4d00d929 100644 --- a/src/main/generated/data/houseki/advancement/recipes/tools/rainbow_pyrite_shovel.json +++ b/src/main/generated/data/houseki/advancement/recipes/tools/rainbow_pyrite_shovel.json @@ -2,6 +2,13 @@ "parent": "minecraft:recipes/root", "criteria": { "has_rainbow_pyrite": { + "conditions": { + "items": [ + { + "items": "houseki:rainbow_pyrite" + } + ] + }, "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { diff --git a/src/main/generated/data/houseki/advancement/recipes/tools/sapphire_hoe.json b/src/main/generated/data/houseki/advancement/recipes/tools/sapphire_hoe.json index c4f89974..b2b6a6b9 100644 --- a/src/main/generated/data/houseki/advancement/recipes/tools/sapphire_hoe.json +++ b/src/main/generated/data/houseki/advancement/recipes/tools/sapphire_hoe.json @@ -2,6 +2,13 @@ "parent": "minecraft:recipes/root", "criteria": { "has_sapphire": { + "conditions": { + "items": [ + { + "items": "houseki:sapphire" + } + ] + }, "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { diff --git a/src/main/generated/data/houseki/advancement/recipes/tools/sapphire_pickaxe.json b/src/main/generated/data/houseki/advancement/recipes/tools/sapphire_pickaxe.json index 5a2329a0..2bf3c37d 100644 --- a/src/main/generated/data/houseki/advancement/recipes/tools/sapphire_pickaxe.json +++ b/src/main/generated/data/houseki/advancement/recipes/tools/sapphire_pickaxe.json @@ -2,6 +2,13 @@ "parent": "minecraft:recipes/root", "criteria": { "has_sapphire": { + "conditions": { + "items": [ + { + "items": "houseki:sapphire" + } + ] + }, "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { diff --git a/src/main/generated/data/houseki/advancement/recipes/tools/sapphire_shovel.json b/src/main/generated/data/houseki/advancement/recipes/tools/sapphire_shovel.json index 81141b97..ee124912 100644 --- a/src/main/generated/data/houseki/advancement/recipes/tools/sapphire_shovel.json +++ b/src/main/generated/data/houseki/advancement/recipes/tools/sapphire_shovel.json @@ -2,6 +2,13 @@ "parent": "minecraft:recipes/root", "criteria": { "has_sapphire": { + "conditions": { + "items": [ + { + "items": "houseki:sapphire" + } + ] + }, "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { diff --git a/src/main/generated/data/houseki/advancement/recipes/tools/steel_hoe.json b/src/main/generated/data/houseki/advancement/recipes/tools/steel_hoe.json index 1ce74a4b..2e655896 100644 --- a/src/main/generated/data/houseki/advancement/recipes/tools/steel_hoe.json +++ b/src/main/generated/data/houseki/advancement/recipes/tools/steel_hoe.json @@ -2,6 +2,13 @@ "parent": "minecraft:recipes/root", "criteria": { "has_steel": { + "conditions": { + "items": [ + { + "items": "houseki:steel" + } + ] + }, "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { diff --git a/src/main/generated/data/houseki/advancement/recipes/tools/steel_pickaxe.json b/src/main/generated/data/houseki/advancement/recipes/tools/steel_pickaxe.json index d2d1b2cb..a430929f 100644 --- a/src/main/generated/data/houseki/advancement/recipes/tools/steel_pickaxe.json +++ b/src/main/generated/data/houseki/advancement/recipes/tools/steel_pickaxe.json @@ -2,6 +2,13 @@ "parent": "minecraft:recipes/root", "criteria": { "has_steel": { + "conditions": { + "items": [ + { + "items": "houseki:steel" + } + ] + }, "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { diff --git a/src/main/generated/data/houseki/advancement/recipes/tools/steel_shovel.json b/src/main/generated/data/houseki/advancement/recipes/tools/steel_shovel.json index 6cf75d38..a3a1ea44 100644 --- a/src/main/generated/data/houseki/advancement/recipes/tools/steel_shovel.json +++ b/src/main/generated/data/houseki/advancement/recipes/tools/steel_shovel.json @@ -2,6 +2,13 @@ "parent": "minecraft:recipes/root", "criteria": { "has_steel": { + "conditions": { + "items": [ + { + "items": "houseki:steel" + } + ] + }, "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { diff --git a/src/main/generated/data/houseki/advancement/recipes/tools/tungsten_hoe.json b/src/main/generated/data/houseki/advancement/recipes/tools/tungsten_hoe.json index a72b3359..82781c42 100644 --- a/src/main/generated/data/houseki/advancement/recipes/tools/tungsten_hoe.json +++ b/src/main/generated/data/houseki/advancement/recipes/tools/tungsten_hoe.json @@ -8,6 +8,13 @@ "trigger": "minecraft:recipe_unlocked" }, "has_tungsten": { + "conditions": { + "items": [ + { + "items": "houseki:tungsten" + } + ] + }, "trigger": "minecraft:inventory_changed" } }, diff --git a/src/main/generated/data/houseki/advancement/recipes/tools/tungsten_pickaxe.json b/src/main/generated/data/houseki/advancement/recipes/tools/tungsten_pickaxe.json index 9afc83f8..bfee748e 100644 --- a/src/main/generated/data/houseki/advancement/recipes/tools/tungsten_pickaxe.json +++ b/src/main/generated/data/houseki/advancement/recipes/tools/tungsten_pickaxe.json @@ -8,6 +8,13 @@ "trigger": "minecraft:recipe_unlocked" }, "has_tungsten": { + "conditions": { + "items": [ + { + "items": "houseki:tungsten" + } + ] + }, "trigger": "minecraft:inventory_changed" } }, diff --git a/src/main/generated/data/houseki/advancement/recipes/tools/tungsten_shovel.json b/src/main/generated/data/houseki/advancement/recipes/tools/tungsten_shovel.json index c0a372fc..41841966 100644 --- a/src/main/generated/data/houseki/advancement/recipes/tools/tungsten_shovel.json +++ b/src/main/generated/data/houseki/advancement/recipes/tools/tungsten_shovel.json @@ -8,6 +8,13 @@ "trigger": "minecraft:recipe_unlocked" }, "has_tungsten": { + "conditions": { + "items": [ + { + "items": "houseki:tungsten" + } + ] + }, "trigger": "minecraft:inventory_changed" } }, diff --git a/src/main/generated/data/houseki/advancement/recipes/wolframite_crushing.json b/src/main/generated/data/houseki/advancement/recipes/wolframite_crushing.json new file mode 100644 index 00000000..0c979c6b --- /dev/null +++ b/src/main/generated/data/houseki/advancement/recipes/wolframite_crushing.json @@ -0,0 +1,21 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "houseki:wolframite_crushing" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "houseki:wolframite_crushing" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/houseki/recipe/advanced_diamond_drill.json b/src/main/generated/data/houseki/recipe/advanced_diamond_drill.json index c2c08acc..7c6306db 100644 --- a/src/main/generated/data/houseki/recipe/advanced_diamond_drill.json +++ b/src/main/generated/data/houseki/recipe/advanced_diamond_drill.json @@ -6,7 +6,6 @@ "houseki:advanced_drill_head" ], "result": { - "count": 1, "id": "houseki:advanced_diamond_drill" } } \ No newline at end of file diff --git a/src/main/generated/data/houseki/recipe/advanced_tungsten_drill.json b/src/main/generated/data/houseki/recipe/advanced_tungsten_drill.json index 25bb3137..c77522c0 100644 --- a/src/main/generated/data/houseki/recipe/advanced_tungsten_drill.json +++ b/src/main/generated/data/houseki/recipe/advanced_tungsten_drill.json @@ -6,7 +6,6 @@ "houseki:advanced_drill_head" ], "result": { - "count": 1, "id": "houseki:advanced_tungsten_drill" } } \ No newline at end of file diff --git a/src/main/generated/data/houseki/recipe/aluminum_axe.json b/src/main/generated/data/houseki/recipe/aluminum_axe.json index 594fbe71..9b74a30d 100644 --- a/src/main/generated/data/houseki/recipe/aluminum_axe.json +++ b/src/main/generated/data/houseki/recipe/aluminum_axe.json @@ -11,7 +11,6 @@ " S " ], "result": { - "count": 1, "id": "houseki:aluminum_axe" } } \ No newline at end of file diff --git a/src/main/generated/data/houseki/recipe/aluminum_boots.json b/src/main/generated/data/houseki/recipe/aluminum_boots.json index 22584bf7..dbf1cd92 100644 --- a/src/main/generated/data/houseki/recipe/aluminum_boots.json +++ b/src/main/generated/data/houseki/recipe/aluminum_boots.json @@ -5,12 +5,10 @@ "#": "houseki:aluminum" }, "pattern": [ - " ", "# #", "# #" ], "result": { - "count": 1, "id": "houseki:aluminum_boots" } } \ No newline at end of file diff --git a/src/main/generated/data/houseki/recipe/aluminum_chestplate.json b/src/main/generated/data/houseki/recipe/aluminum_chestplate.json index 91b17bc0..3f3b9af4 100644 --- a/src/main/generated/data/houseki/recipe/aluminum_chestplate.json +++ b/src/main/generated/data/houseki/recipe/aluminum_chestplate.json @@ -10,7 +10,6 @@ "###" ], "result": { - "count": 1, "id": "houseki:aluminum_chestplate" } } \ No newline at end of file diff --git a/src/main/generated/data/houseki/recipe/aluminum_glass.json b/src/main/generated/data/houseki/recipe/aluminum_glass.json index 10640718..a5aa2a5a 100644 --- a/src/main/generated/data/houseki/recipe/aluminum_glass.json +++ b/src/main/generated/data/houseki/recipe/aluminum_glass.json @@ -11,7 +11,6 @@ "###" ], "result": { - "count": 1, "id": "houseki:aluminum_glass" } } \ No newline at end of file diff --git a/src/main/generated/data/houseki/recipe/aluminum_helmet.json b/src/main/generated/data/houseki/recipe/aluminum_helmet.json index f8794ad1..4f4f3430 100644 --- a/src/main/generated/data/houseki/recipe/aluminum_helmet.json +++ b/src/main/generated/data/houseki/recipe/aluminum_helmet.json @@ -6,11 +6,9 @@ }, "pattern": [ "###", - "# #", - " " + "# #" ], "result": { - "count": 1, "id": "houseki:aluminum_helmet" } } \ No newline at end of file diff --git a/src/main/generated/data/houseki/recipe/aluminum_hoe.json b/src/main/generated/data/houseki/recipe/aluminum_hoe.json index 10cefe13..864bfe68 100644 --- a/src/main/generated/data/houseki/recipe/aluminum_hoe.json +++ b/src/main/generated/data/houseki/recipe/aluminum_hoe.json @@ -11,7 +11,6 @@ " S " ], "result": { - "count": 1, "id": "houseki:aluminum_hoe" } } \ No newline at end of file diff --git a/src/main/generated/data/houseki/recipe/aluminum_leggings.json b/src/main/generated/data/houseki/recipe/aluminum_leggings.json index 2331ea0f..1a09b5b0 100644 --- a/src/main/generated/data/houseki/recipe/aluminum_leggings.json +++ b/src/main/generated/data/houseki/recipe/aluminum_leggings.json @@ -10,7 +10,6 @@ "# #" ], "result": { - "count": 1, "id": "houseki:aluminum_leggings" } } \ No newline at end of file diff --git a/src/main/generated/data/houseki/recipe/aluminum_pickaxe.json b/src/main/generated/data/houseki/recipe/aluminum_pickaxe.json index 4db6e4a2..99053ef4 100644 --- a/src/main/generated/data/houseki/recipe/aluminum_pickaxe.json +++ b/src/main/generated/data/houseki/recipe/aluminum_pickaxe.json @@ -11,7 +11,6 @@ " S " ], "result": { - "count": 1, "id": "houseki:aluminum_pickaxe" } } \ No newline at end of file diff --git a/src/main/generated/data/houseki/recipe/aluminum_shovel.json b/src/main/generated/data/houseki/recipe/aluminum_shovel.json index d46e78e5..fdbc9638 100644 --- a/src/main/generated/data/houseki/recipe/aluminum_shovel.json +++ b/src/main/generated/data/houseki/recipe/aluminum_shovel.json @@ -11,7 +11,6 @@ " S " ], "result": { - "count": 1, "id": "houseki:aluminum_shovel" } } \ No newline at end of file diff --git a/src/main/generated/data/houseki/recipe/aluminum_sword.json b/src/main/generated/data/houseki/recipe/aluminum_sword.json index 4978625b..f0d5b66f 100644 --- a/src/main/generated/data/houseki/recipe/aluminum_sword.json +++ b/src/main/generated/data/houseki/recipe/aluminum_sword.json @@ -11,7 +11,6 @@ " S " ], "result": { - "count": 1, "id": "houseki:aluminum_sword" } } \ No newline at end of file diff --git a/src/main/generated/data/houseki/recipe/bauxite.json b/src/main/generated/data/houseki/recipe/bauxite.json index d147d130..34767502 100644 --- a/src/main/generated/data/houseki/recipe/bauxite.json +++ b/src/main/generated/data/houseki/recipe/bauxite.json @@ -9,7 +9,6 @@ "##" ], "result": { - "count": 1, "id": "houseki:bauxite" } } \ No newline at end of file diff --git a/src/main/generated/data/houseki/recipe/bauxite_crushing.json b/src/main/generated/data/houseki/recipe/bauxite_crushing.json index 01c565fa..edc7ded0 100644 --- a/src/main/generated/data/houseki/recipe/bauxite_crushing.json +++ b/src/main/generated/data/houseki/recipe/bauxite_crushing.json @@ -1,14 +1,8 @@ { - "type": "houseki:crushing", + "type": "houseki:crusher", "auxiliary_chance": 0.5, - "auxiliary_result": { - "count": 1, - "id": "minecraft:clay" - }, + "auxiliary_result": "minecraft:clay", "crushingTime": 250, "ingredient": "houseki:bauxite", - "result": { - "count": 1, - "id": "houseki:crushed_bauxite" - } + "result": "houseki:crushed_bauxite" } \ No newline at end of file diff --git a/src/main/generated/data/houseki/recipe/block_of_aluminum.json b/src/main/generated/data/houseki/recipe/block_of_aluminum.json index 2a8b72f2..0bbdd685 100644 --- a/src/main/generated/data/houseki/recipe/block_of_aluminum.json +++ b/src/main/generated/data/houseki/recipe/block_of_aluminum.json @@ -10,7 +10,6 @@ "###" ], "result": { - "count": 1, "id": "houseki:block_of_aluminum" } } \ No newline at end of file diff --git a/src/main/generated/data/houseki/recipe/block_of_cast_steel.json b/src/main/generated/data/houseki/recipe/block_of_cast_steel.json index f273d0c1..a5d2d5ef 100644 --- a/src/main/generated/data/houseki/recipe/block_of_cast_steel.json +++ b/src/main/generated/data/houseki/recipe/block_of_cast_steel.json @@ -10,7 +10,6 @@ "###" ], "result": { - "count": 1, "id": "houseki:block_of_cast_steel" } } \ No newline at end of file diff --git a/src/main/generated/data/houseki/recipe/block_of_jadeite.json b/src/main/generated/data/houseki/recipe/block_of_jadeite.json index 0a5ed10e..7b0f6b60 100644 --- a/src/main/generated/data/houseki/recipe/block_of_jadeite.json +++ b/src/main/generated/data/houseki/recipe/block_of_jadeite.json @@ -10,7 +10,6 @@ "###" ], "result": { - "count": 1, "id": "houseki:block_of_jadeite" } } \ No newline at end of file diff --git a/src/main/generated/data/houseki/recipe/block_of_pinku.json b/src/main/generated/data/houseki/recipe/block_of_pinku.json index 49d038cd..fba69bf7 100644 --- a/src/main/generated/data/houseki/recipe/block_of_pinku.json +++ b/src/main/generated/data/houseki/recipe/block_of_pinku.json @@ -10,7 +10,6 @@ "###" ], "result": { - "count": 1, "id": "houseki:block_of_pinku" } } \ No newline at end of file diff --git a/src/main/generated/data/houseki/recipe/block_of_platinum.json b/src/main/generated/data/houseki/recipe/block_of_platinum.json index 273ca9f6..265444c5 100644 --- a/src/main/generated/data/houseki/recipe/block_of_platinum.json +++ b/src/main/generated/data/houseki/recipe/block_of_platinum.json @@ -10,7 +10,6 @@ "###" ], "result": { - "count": 1, "id": "houseki:block_of_platinum" } } \ No newline at end of file diff --git a/src/main/generated/data/houseki/recipe/block_of_rainbow_pyrite.json b/src/main/generated/data/houseki/recipe/block_of_rainbow_pyrite.json index 712bc0bb..8b75057e 100644 --- a/src/main/generated/data/houseki/recipe/block_of_rainbow_pyrite.json +++ b/src/main/generated/data/houseki/recipe/block_of_rainbow_pyrite.json @@ -10,7 +10,6 @@ "###" ], "result": { - "count": 1, "id": "houseki:block_of_rainbow_pyrite" } } \ No newline at end of file diff --git a/src/main/generated/data/houseki/recipe/block_of_sapphire.json b/src/main/generated/data/houseki/recipe/block_of_sapphire.json index 935b6674..f0d2a1c8 100644 --- a/src/main/generated/data/houseki/recipe/block_of_sapphire.json +++ b/src/main/generated/data/houseki/recipe/block_of_sapphire.json @@ -10,7 +10,6 @@ "###" ], "result": { - "count": 1, "id": "houseki:block_of_sapphire" } } \ No newline at end of file diff --git a/src/main/generated/data/houseki/recipe/block_of_steel.json b/src/main/generated/data/houseki/recipe/block_of_steel.json index e20f2777..84ba0664 100644 --- a/src/main/generated/data/houseki/recipe/block_of_steel.json +++ b/src/main/generated/data/houseki/recipe/block_of_steel.json @@ -10,7 +10,6 @@ "###" ], "result": { - "count": 1, "id": "houseki:block_of_steel" } } \ No newline at end of file diff --git a/src/main/generated/data/houseki/recipe/block_of_sulfur.json b/src/main/generated/data/houseki/recipe/block_of_sulfur.json index 5badb7ae..8b275748 100644 --- a/src/main/generated/data/houseki/recipe/block_of_sulfur.json +++ b/src/main/generated/data/houseki/recipe/block_of_sulfur.json @@ -10,7 +10,6 @@ "###" ], "result": { - "count": 1, "id": "houseki:block_of_sulfur" } } \ No newline at end of file diff --git a/src/main/generated/data/houseki/recipe/block_of_tungsten.json b/src/main/generated/data/houseki/recipe/block_of_tungsten.json index 639b58c0..b0c6b468 100644 --- a/src/main/generated/data/houseki/recipe/block_of_tungsten.json +++ b/src/main/generated/data/houseki/recipe/block_of_tungsten.json @@ -10,7 +10,6 @@ "###" ], "result": { - "count": 1, "id": "houseki:block_of_tungsten" } } \ No newline at end of file diff --git a/src/main/generated/data/houseki/recipe/cast_steel_axe.json b/src/main/generated/data/houseki/recipe/cast_steel_axe.json index d1538498..23b72ebd 100644 --- a/src/main/generated/data/houseki/recipe/cast_steel_axe.json +++ b/src/main/generated/data/houseki/recipe/cast_steel_axe.json @@ -11,7 +11,6 @@ " S " ], "result": { - "count": 1, "id": "houseki:cast_steel_axe" } } \ No newline at end of file diff --git a/src/main/generated/data/houseki/recipe/cast_steel_boots.json b/src/main/generated/data/houseki/recipe/cast_steel_boots.json index a93acd9e..0d2ede16 100644 --- a/src/main/generated/data/houseki/recipe/cast_steel_boots.json +++ b/src/main/generated/data/houseki/recipe/cast_steel_boots.json @@ -5,12 +5,10 @@ "#": "houseki:cast_steel" }, "pattern": [ - " ", "# #", "# #" ], "result": { - "count": 1, "id": "houseki:cast_steel_boots" } } \ No newline at end of file diff --git a/src/main/generated/data/houseki/recipe/cast_steel_chestplate.json b/src/main/generated/data/houseki/recipe/cast_steel_chestplate.json index ace4907c..2a99db85 100644 --- a/src/main/generated/data/houseki/recipe/cast_steel_chestplate.json +++ b/src/main/generated/data/houseki/recipe/cast_steel_chestplate.json @@ -10,7 +10,6 @@ "###" ], "result": { - "count": 1, "id": "houseki:cast_steel_chestplate" } } \ No newline at end of file diff --git a/src/main/generated/data/houseki/recipe/cast_steel_helmet.json b/src/main/generated/data/houseki/recipe/cast_steel_helmet.json index 030db6fe..fcafbdee 100644 --- a/src/main/generated/data/houseki/recipe/cast_steel_helmet.json +++ b/src/main/generated/data/houseki/recipe/cast_steel_helmet.json @@ -6,11 +6,9 @@ }, "pattern": [ "###", - "# #", - " " + "# #" ], "result": { - "count": 1, "id": "houseki:cast_steel_helmet" } } \ No newline at end of file diff --git a/src/main/generated/data/houseki/recipe/cast_steel_hoe.json b/src/main/generated/data/houseki/recipe/cast_steel_hoe.json index 12e11ce3..9bdacc5d 100644 --- a/src/main/generated/data/houseki/recipe/cast_steel_hoe.json +++ b/src/main/generated/data/houseki/recipe/cast_steel_hoe.json @@ -11,7 +11,6 @@ " S " ], "result": { - "count": 1, "id": "houseki:cast_steel_hoe" } } \ No newline at end of file diff --git a/src/main/generated/data/houseki/recipe/cast_steel_leggings.json b/src/main/generated/data/houseki/recipe/cast_steel_leggings.json index 1661af40..c50f3d93 100644 --- a/src/main/generated/data/houseki/recipe/cast_steel_leggings.json +++ b/src/main/generated/data/houseki/recipe/cast_steel_leggings.json @@ -10,7 +10,6 @@ "# #" ], "result": { - "count": 1, "id": "houseki:cast_steel_leggings" } } \ No newline at end of file diff --git a/src/main/generated/data/houseki/recipe/cast_steel_pickaxe.json b/src/main/generated/data/houseki/recipe/cast_steel_pickaxe.json index d3085ce3..24db944c 100644 --- a/src/main/generated/data/houseki/recipe/cast_steel_pickaxe.json +++ b/src/main/generated/data/houseki/recipe/cast_steel_pickaxe.json @@ -11,7 +11,6 @@ " S " ], "result": { - "count": 1, "id": "houseki:cast_steel_pickaxe" } } \ No newline at end of file diff --git a/src/main/generated/data/houseki/recipe/cast_steel_shovel.json b/src/main/generated/data/houseki/recipe/cast_steel_shovel.json index 0892a30c..4906fac8 100644 --- a/src/main/generated/data/houseki/recipe/cast_steel_shovel.json +++ b/src/main/generated/data/houseki/recipe/cast_steel_shovel.json @@ -11,7 +11,6 @@ " S " ], "result": { - "count": 1, "id": "houseki:cast_steel_shovel" } } \ No newline at end of file diff --git a/src/main/generated/data/houseki/recipe/cast_steel_sword.json b/src/main/generated/data/houseki/recipe/cast_steel_sword.json index 7c7cc01d..7c9e9fc4 100644 --- a/src/main/generated/data/houseki/recipe/cast_steel_sword.json +++ b/src/main/generated/data/houseki/recipe/cast_steel_sword.json @@ -11,7 +11,6 @@ " S " ], "result": { - "count": 1, "id": "houseki:cast_steel_sword" } } \ No newline at end of file diff --git a/src/main/generated/data/houseki/recipe/chiseled_limestone.json b/src/main/generated/data/houseki/recipe/chiseled_limestone.json index 8e03dfe2..ebdb900f 100644 --- a/src/main/generated/data/houseki/recipe/chiseled_limestone.json +++ b/src/main/generated/data/houseki/recipe/chiseled_limestone.json @@ -9,7 +9,6 @@ "#" ], "result": { - "count": 1, "id": "houseki:chiseled_limestone" } } \ No newline at end of file diff --git a/src/main/generated/data/houseki/recipe/chiseled_limestone_from_limestone_stonecutting.json b/src/main/generated/data/houseki/recipe/chiseled_limestone_from_limestone_stonecutting.json index e06cc287..81b80059 100644 --- a/src/main/generated/data/houseki/recipe/chiseled_limestone_from_limestone_stonecutting.json +++ b/src/main/generated/data/houseki/recipe/chiseled_limestone_from_limestone_stonecutting.json @@ -2,7 +2,6 @@ "type": "minecraft:stonecutting", "ingredient": "houseki:limestone", "result": { - "count": 1, "id": "houseki:chiseled_limestone" } } \ No newline at end of file diff --git a/src/main/generated/data/houseki/recipe/chiseled_slate.json b/src/main/generated/data/houseki/recipe/chiseled_slate.json index 843dad3f..330237b4 100644 --- a/src/main/generated/data/houseki/recipe/chiseled_slate.json +++ b/src/main/generated/data/houseki/recipe/chiseled_slate.json @@ -9,7 +9,6 @@ "#" ], "result": { - "count": 1, "id": "houseki:chiseled_slate" } } \ No newline at end of file diff --git a/src/main/generated/data/houseki/recipe/chiseled_slate_from_slate_stonecutting.json b/src/main/generated/data/houseki/recipe/chiseled_slate_from_slate_stonecutting.json index 5fbf8204..14cf997b 100644 --- a/src/main/generated/data/houseki/recipe/chiseled_slate_from_slate_stonecutting.json +++ b/src/main/generated/data/houseki/recipe/chiseled_slate_from_slate_stonecutting.json @@ -2,7 +2,6 @@ "type": "minecraft:stonecutting", "ingredient": "houseki:slate", "result": { - "count": 1, "id": "houseki:chiseled_slate" } } \ No newline at end of file diff --git a/src/main/generated/data/houseki/recipe/cobblestone_crushing.json b/src/main/generated/data/houseki/recipe/cobblestone_crushing.json index 5f472a1e..47098f47 100644 --- a/src/main/generated/data/houseki/recipe/cobblestone_crushing.json +++ b/src/main/generated/data/houseki/recipe/cobblestone_crushing.json @@ -1,9 +1,6 @@ { - "type": "houseki:crushing", + "type": "houseki:crusher", "crushingTime": 100, "ingredient": "minecraft:cobblestone", - "result": { - "count": 1, - "id": "minecraft:gravel" - } + "result": "minecraft:gravel" } \ No newline at end of file diff --git a/src/main/generated/data/houseki/recipe/copper_ingot_crushing.json b/src/main/generated/data/houseki/recipe/copper_ingot_crushing.json index 31de1cef..2b6d6a7d 100644 --- a/src/main/generated/data/houseki/recipe/copper_ingot_crushing.json +++ b/src/main/generated/data/houseki/recipe/copper_ingot_crushing.json @@ -1,9 +1,6 @@ { - "type": "houseki:crushing", + "type": "houseki:crusher", "crushingTime": 250, "ingredient": "minecraft:copper_ingot", - "result": { - "count": 1, - "id": "houseki:platinum_nugget" - } + "result": "houseki:platinum_nugget" } \ No newline at end of file diff --git a/src/main/generated/data/houseki/recipe/crusher.json b/src/main/generated/data/houseki/recipe/crusher.json index aa951353..9a2919da 100644 --- a/src/main/generated/data/houseki/recipe/crusher.json +++ b/src/main/generated/data/houseki/recipe/crusher.json @@ -11,7 +11,6 @@ "###" ], "result": { - "count": 1, "id": "houseki:crusher" } } \ No newline at end of file diff --git a/src/main/generated/data/houseki/recipe/deepslate_platinum_ore_crushing.json b/src/main/generated/data/houseki/recipe/deepslate_platinum_ore_crushing.json index a48fbb2e..3c6d225f 100644 --- a/src/main/generated/data/houseki/recipe/deepslate_platinum_ore_crushing.json +++ b/src/main/generated/data/houseki/recipe/deepslate_platinum_ore_crushing.json @@ -1,9 +1,6 @@ { - "type": "houseki:crushing", + "type": "houseki:crusher", "crushingTime": 250, "ingredient": "houseki:deepslate_platinum_ore", - "result": { - "count": 1, - "id": "houseki:platinum" - } + "result": "houseki:platinum" } \ No newline at end of file diff --git a/src/main/generated/data/houseki/recipe/diamond_drill_bit.json b/src/main/generated/data/houseki/recipe/diamond_drill_bit.json index 5b8644f8..5a02d62a 100644 --- a/src/main/generated/data/houseki/recipe/diamond_drill_bit.json +++ b/src/main/generated/data/houseki/recipe/diamond_drill_bit.json @@ -5,12 +5,10 @@ "#": "minecraft:diamond_block" }, "pattern": [ - " ", " # ", "###" ], "result": { - "count": 1, "id": "houseki:diamond_drill_bit" } } \ No newline at end of file diff --git a/src/main/generated/data/houseki/recipe/enhanced_diamond_drill.json b/src/main/generated/data/houseki/recipe/enhanced_diamond_drill.json index 844d0d27..ca2df3c6 100644 --- a/src/main/generated/data/houseki/recipe/enhanced_diamond_drill.json +++ b/src/main/generated/data/houseki/recipe/enhanced_diamond_drill.json @@ -6,7 +6,6 @@ "houseki:enhanced_drill_head" ], "result": { - "count": 1, "id": "houseki:enhanced_diamond_drill" } } \ No newline at end of file diff --git a/src/main/generated/data/houseki/recipe/enhanced_tungsten_drill.json b/src/main/generated/data/houseki/recipe/enhanced_tungsten_drill.json index 790c43f3..2383bdbb 100644 --- a/src/main/generated/data/houseki/recipe/enhanced_tungsten_drill.json +++ b/src/main/generated/data/houseki/recipe/enhanced_tungsten_drill.json @@ -6,7 +6,6 @@ "houseki:enhanced_drill_head" ], "result": { - "count": 1, "id": "houseki:enhanced_tungsten_drill" } } \ No newline at end of file diff --git a/src/main/generated/data/houseki/recipe/jadeite_axe.json b/src/main/generated/data/houseki/recipe/jadeite_axe.json index 9768c0a5..01d46249 100644 --- a/src/main/generated/data/houseki/recipe/jadeite_axe.json +++ b/src/main/generated/data/houseki/recipe/jadeite_axe.json @@ -11,7 +11,6 @@ " S " ], "result": { - "count": 1, "id": "houseki:jadeite_axe" } } \ No newline at end of file diff --git a/src/main/generated/data/houseki/recipe/jadeite_boots.json b/src/main/generated/data/houseki/recipe/jadeite_boots.json index 6d5c45c7..ef712c10 100644 --- a/src/main/generated/data/houseki/recipe/jadeite_boots.json +++ b/src/main/generated/data/houseki/recipe/jadeite_boots.json @@ -5,12 +5,10 @@ "#": "houseki:jadeite" }, "pattern": [ - " ", "# #", "# #" ], "result": { - "count": 1, "id": "houseki:jadeite_boots" } } \ No newline at end of file diff --git a/src/main/generated/data/houseki/recipe/jadeite_chestplate.json b/src/main/generated/data/houseki/recipe/jadeite_chestplate.json index d6016e48..8cb796b4 100644 --- a/src/main/generated/data/houseki/recipe/jadeite_chestplate.json +++ b/src/main/generated/data/houseki/recipe/jadeite_chestplate.json @@ -10,7 +10,6 @@ "###" ], "result": { - "count": 1, "id": "houseki:jadeite_chestplate" } } \ No newline at end of file diff --git a/src/main/generated/data/houseki/recipe/jadeite_helmet.json b/src/main/generated/data/houseki/recipe/jadeite_helmet.json index 98382c54..b4b8d5d1 100644 --- a/src/main/generated/data/houseki/recipe/jadeite_helmet.json +++ b/src/main/generated/data/houseki/recipe/jadeite_helmet.json @@ -6,11 +6,9 @@ }, "pattern": [ "###", - "# #", - " " + "# #" ], "result": { - "count": 1, "id": "houseki:jadeite_helmet" } } \ No newline at end of file diff --git a/src/main/generated/data/houseki/recipe/jadeite_hoe.json b/src/main/generated/data/houseki/recipe/jadeite_hoe.json index 9075ce8d..8d8df6c3 100644 --- a/src/main/generated/data/houseki/recipe/jadeite_hoe.json +++ b/src/main/generated/data/houseki/recipe/jadeite_hoe.json @@ -11,7 +11,6 @@ " S " ], "result": { - "count": 1, "id": "houseki:jadeite_hoe" } } \ No newline at end of file diff --git a/src/main/generated/data/houseki/recipe/jadeite_leggings.json b/src/main/generated/data/houseki/recipe/jadeite_leggings.json index bd35abf5..32212b6a 100644 --- a/src/main/generated/data/houseki/recipe/jadeite_leggings.json +++ b/src/main/generated/data/houseki/recipe/jadeite_leggings.json @@ -10,7 +10,6 @@ "# #" ], "result": { - "count": 1, "id": "houseki:jadeite_leggings" } } \ No newline at end of file diff --git a/src/main/generated/data/houseki/recipe/jadeite_pickaxe.json b/src/main/generated/data/houseki/recipe/jadeite_pickaxe.json index cf3fd73d..264cfb6e 100644 --- a/src/main/generated/data/houseki/recipe/jadeite_pickaxe.json +++ b/src/main/generated/data/houseki/recipe/jadeite_pickaxe.json @@ -11,7 +11,6 @@ " S " ], "result": { - "count": 1, "id": "houseki:jadeite_pickaxe" } } \ No newline at end of file diff --git a/src/main/generated/data/houseki/recipe/jadeite_shovel.json b/src/main/generated/data/houseki/recipe/jadeite_shovel.json index ccfa9752..7751567c 100644 --- a/src/main/generated/data/houseki/recipe/jadeite_shovel.json +++ b/src/main/generated/data/houseki/recipe/jadeite_shovel.json @@ -11,7 +11,6 @@ " S " ], "result": { - "count": 1, "id": "houseki:jadeite_shovel" } } \ No newline at end of file diff --git a/src/main/generated/data/houseki/recipe/jadeite_sword.json b/src/main/generated/data/houseki/recipe/jadeite_sword.json index cb6f02fc..f1600245 100644 --- a/src/main/generated/data/houseki/recipe/jadeite_sword.json +++ b/src/main/generated/data/houseki/recipe/jadeite_sword.json @@ -11,7 +11,6 @@ " S " ], "result": { - "count": 1, "id": "houseki:jadeite_sword" } } \ No newline at end of file diff --git a/src/main/generated/data/houseki/recipe/limestone_brick_stairs_from_limestone_stonecutting.json b/src/main/generated/data/houseki/recipe/limestone_brick_stairs_from_limestone_stonecutting.json index 3be66f39..516b4f77 100644 --- a/src/main/generated/data/houseki/recipe/limestone_brick_stairs_from_limestone_stonecutting.json +++ b/src/main/generated/data/houseki/recipe/limestone_brick_stairs_from_limestone_stonecutting.json @@ -2,7 +2,6 @@ "type": "minecraft:stonecutting", "ingredient": "houseki:limestone", "result": { - "count": 1, "id": "houseki:limestone_brick_stairs" } } \ No newline at end of file diff --git a/src/main/generated/data/houseki/recipe/limestone_brick_wall_from_limestone_stonecutting.json b/src/main/generated/data/houseki/recipe/limestone_brick_wall_from_limestone_stonecutting.json index 6ffa6ab7..cd88e793 100644 --- a/src/main/generated/data/houseki/recipe/limestone_brick_wall_from_limestone_stonecutting.json +++ b/src/main/generated/data/houseki/recipe/limestone_brick_wall_from_limestone_stonecutting.json @@ -2,7 +2,6 @@ "type": "minecraft:stonecutting", "ingredient": "houseki:limestone", "result": { - "count": 1, "id": "houseki:limestone_brick_wall" } } \ No newline at end of file diff --git a/src/main/generated/data/houseki/recipe/limestone_bricks.json b/src/main/generated/data/houseki/recipe/limestone_bricks.json index 3b504bb4..10b2740c 100644 --- a/src/main/generated/data/houseki/recipe/limestone_bricks.json +++ b/src/main/generated/data/houseki/recipe/limestone_bricks.json @@ -9,7 +9,6 @@ "##" ], "result": { - "count": 1, "id": "houseki:limestone_bricks" } } \ No newline at end of file diff --git a/src/main/generated/data/houseki/recipe/limestone_bricks_from_limestone_stonecutting.json b/src/main/generated/data/houseki/recipe/limestone_bricks_from_limestone_stonecutting.json index be1f751e..29c82c33 100644 --- a/src/main/generated/data/houseki/recipe/limestone_bricks_from_limestone_stonecutting.json +++ b/src/main/generated/data/houseki/recipe/limestone_bricks_from_limestone_stonecutting.json @@ -2,7 +2,6 @@ "type": "minecraft:stonecutting", "ingredient": "houseki:limestone", "result": { - "count": 1, "id": "houseki:limestone_bricks" } } \ No newline at end of file diff --git a/src/main/generated/data/houseki/recipe/limestone_stairs_from_limestone_stonecutting.json b/src/main/generated/data/houseki/recipe/limestone_stairs_from_limestone_stonecutting.json index c663a1a6..a1f46b9c 100644 --- a/src/main/generated/data/houseki/recipe/limestone_stairs_from_limestone_stonecutting.json +++ b/src/main/generated/data/houseki/recipe/limestone_stairs_from_limestone_stonecutting.json @@ -2,7 +2,6 @@ "type": "minecraft:stonecutting", "ingredient": "houseki:limestone", "result": { - "count": 1, "id": "houseki:limestone_stairs" } } \ No newline at end of file diff --git a/src/main/generated/data/houseki/recipe/limestone_wall_from_limestone_stonecutting.json b/src/main/generated/data/houseki/recipe/limestone_wall_from_limestone_stonecutting.json index 35a04626..ec38a59c 100644 --- a/src/main/generated/data/houseki/recipe/limestone_wall_from_limestone_stonecutting.json +++ b/src/main/generated/data/houseki/recipe/limestone_wall_from_limestone_stonecutting.json @@ -2,7 +2,6 @@ "type": "minecraft:stonecutting", "ingredient": "houseki:limestone", "result": { - "count": 1, "id": "houseki:limestone_wall" } } \ No newline at end of file diff --git a/src/main/generated/data/houseki/recipe/nephrite_axe.json b/src/main/generated/data/houseki/recipe/nephrite_axe.json index 3aed5d69..0fd2bed1 100644 --- a/src/main/generated/data/houseki/recipe/nephrite_axe.json +++ b/src/main/generated/data/houseki/recipe/nephrite_axe.json @@ -11,7 +11,6 @@ " S " ], "result": { - "count": 1, "id": "houseki:nephrite_axe" } } \ No newline at end of file diff --git a/src/main/generated/data/houseki/recipe/nephrite_boots.json b/src/main/generated/data/houseki/recipe/nephrite_boots.json index 2cf624d8..a096ea86 100644 --- a/src/main/generated/data/houseki/recipe/nephrite_boots.json +++ b/src/main/generated/data/houseki/recipe/nephrite_boots.json @@ -5,12 +5,10 @@ "#": "houseki:nephrite" }, "pattern": [ - " ", "# #", "# #" ], "result": { - "count": 1, "id": "houseki:nephrite_boots" } } \ No newline at end of file diff --git a/src/main/generated/data/houseki/recipe/nephrite_chestplate.json b/src/main/generated/data/houseki/recipe/nephrite_chestplate.json index e89b7016..8f870ef6 100644 --- a/src/main/generated/data/houseki/recipe/nephrite_chestplate.json +++ b/src/main/generated/data/houseki/recipe/nephrite_chestplate.json @@ -10,7 +10,6 @@ "###" ], "result": { - "count": 1, "id": "houseki:nephrite_chestplate" } } \ No newline at end of file diff --git a/src/main/generated/data/houseki/recipe/nephrite_helmet.json b/src/main/generated/data/houseki/recipe/nephrite_helmet.json index f2a49157..2d71110e 100644 --- a/src/main/generated/data/houseki/recipe/nephrite_helmet.json +++ b/src/main/generated/data/houseki/recipe/nephrite_helmet.json @@ -6,11 +6,9 @@ }, "pattern": [ "###", - "# #", - " " + "# #" ], "result": { - "count": 1, "id": "houseki:nephrite_helmet" } } \ No newline at end of file diff --git a/src/main/generated/data/houseki/recipe/nephrite_hoe.json b/src/main/generated/data/houseki/recipe/nephrite_hoe.json index eea53799..29736358 100644 --- a/src/main/generated/data/houseki/recipe/nephrite_hoe.json +++ b/src/main/generated/data/houseki/recipe/nephrite_hoe.json @@ -11,7 +11,6 @@ " S " ], "result": { - "count": 1, "id": "houseki:nephrite_hoe" } } \ No newline at end of file diff --git a/src/main/generated/data/houseki/recipe/nephrite_leggings.json b/src/main/generated/data/houseki/recipe/nephrite_leggings.json index 2f88c1fd..f7fcdf81 100644 --- a/src/main/generated/data/houseki/recipe/nephrite_leggings.json +++ b/src/main/generated/data/houseki/recipe/nephrite_leggings.json @@ -10,7 +10,6 @@ "# #" ], "result": { - "count": 1, "id": "houseki:nephrite_leggings" } } \ No newline at end of file diff --git a/src/main/generated/data/houseki/recipe/nephrite_pickaxe.json b/src/main/generated/data/houseki/recipe/nephrite_pickaxe.json index 4c7bd050..8016b327 100644 --- a/src/main/generated/data/houseki/recipe/nephrite_pickaxe.json +++ b/src/main/generated/data/houseki/recipe/nephrite_pickaxe.json @@ -11,7 +11,6 @@ " S " ], "result": { - "count": 1, "id": "houseki:nephrite_pickaxe" } } \ No newline at end of file diff --git a/src/main/generated/data/houseki/recipe/nephrite_shovel.json b/src/main/generated/data/houseki/recipe/nephrite_shovel.json index 9977cb82..dfce7d4f 100644 --- a/src/main/generated/data/houseki/recipe/nephrite_shovel.json +++ b/src/main/generated/data/houseki/recipe/nephrite_shovel.json @@ -11,7 +11,6 @@ " S " ], "result": { - "count": 1, "id": "houseki:nephrite_shovel" } } \ No newline at end of file diff --git a/src/main/generated/data/houseki/recipe/nephrite_sword.json b/src/main/generated/data/houseki/recipe/nephrite_sword.json index c08d77f6..312b4e9c 100644 --- a/src/main/generated/data/houseki/recipe/nephrite_sword.json +++ b/src/main/generated/data/houseki/recipe/nephrite_sword.json @@ -11,7 +11,6 @@ " S " ], "result": { - "count": 1, "id": "houseki:nephrite_sword" } } \ No newline at end of file diff --git a/src/main/generated/data/houseki/recipe/pinku_from_pinku_shards.json b/src/main/generated/data/houseki/recipe/pinku_from_pinku_shards.json index dce1fbd7..952e6041 100644 --- a/src/main/generated/data/houseki/recipe/pinku_from_pinku_shards.json +++ b/src/main/generated/data/houseki/recipe/pinku_from_pinku_shards.json @@ -11,7 +11,6 @@ " # " ], "result": { - "count": 1, "id": "houseki:pinku" } } \ No newline at end of file diff --git a/src/main/generated/data/houseki/recipe/platinum_axe.json b/src/main/generated/data/houseki/recipe/platinum_axe.json index 32d8a2ad..85e90d28 100644 --- a/src/main/generated/data/houseki/recipe/platinum_axe.json +++ b/src/main/generated/data/houseki/recipe/platinum_axe.json @@ -11,7 +11,6 @@ " S " ], "result": { - "count": 1, "id": "houseki:platinum_axe" } } \ No newline at end of file diff --git a/src/main/generated/data/houseki/recipe/platinum_boots.json b/src/main/generated/data/houseki/recipe/platinum_boots.json index 72216e23..19da3943 100644 --- a/src/main/generated/data/houseki/recipe/platinum_boots.json +++ b/src/main/generated/data/houseki/recipe/platinum_boots.json @@ -5,12 +5,10 @@ "#": "houseki:platinum" }, "pattern": [ - " ", "# #", "# #" ], "result": { - "count": 1, "id": "houseki:platinum_boots" } } \ No newline at end of file diff --git a/src/main/generated/data/houseki/recipe/platinum_chestplate.json b/src/main/generated/data/houseki/recipe/platinum_chestplate.json index 960de90c..3fb2be98 100644 --- a/src/main/generated/data/houseki/recipe/platinum_chestplate.json +++ b/src/main/generated/data/houseki/recipe/platinum_chestplate.json @@ -10,7 +10,6 @@ "###" ], "result": { - "count": 1, "id": "houseki:platinum_chestplate" } } \ No newline at end of file diff --git a/src/main/generated/data/houseki/recipe/platinum_from_platinum_nuggets.json b/src/main/generated/data/houseki/recipe/platinum_from_platinum_nuggets.json index fc66942b..f3584302 100644 --- a/src/main/generated/data/houseki/recipe/platinum_from_platinum_nuggets.json +++ b/src/main/generated/data/houseki/recipe/platinum_from_platinum_nuggets.json @@ -10,7 +10,6 @@ "###" ], "result": { - "count": 1, "id": "houseki:platinum" } } \ No newline at end of file diff --git a/src/main/generated/data/houseki/recipe/platinum_helmet.json b/src/main/generated/data/houseki/recipe/platinum_helmet.json index 29a04f97..5719e4e0 100644 --- a/src/main/generated/data/houseki/recipe/platinum_helmet.json +++ b/src/main/generated/data/houseki/recipe/platinum_helmet.json @@ -6,11 +6,9 @@ }, "pattern": [ "###", - "# #", - " " + "# #" ], "result": { - "count": 1, "id": "houseki:platinum_helmet" } } \ No newline at end of file diff --git a/src/main/generated/data/houseki/recipe/platinum_hoe.json b/src/main/generated/data/houseki/recipe/platinum_hoe.json index c425548c..27c16591 100644 --- a/src/main/generated/data/houseki/recipe/platinum_hoe.json +++ b/src/main/generated/data/houseki/recipe/platinum_hoe.json @@ -11,7 +11,6 @@ " S " ], "result": { - "count": 1, "id": "houseki:platinum_hoe" } } \ No newline at end of file diff --git a/src/main/generated/data/houseki/recipe/platinum_leggings.json b/src/main/generated/data/houseki/recipe/platinum_leggings.json index 4d1dd9c6..2b8e04a0 100644 --- a/src/main/generated/data/houseki/recipe/platinum_leggings.json +++ b/src/main/generated/data/houseki/recipe/platinum_leggings.json @@ -10,7 +10,6 @@ "# #" ], "result": { - "count": 1, "id": "houseki:platinum_leggings" } } \ No newline at end of file diff --git a/src/main/generated/data/houseki/recipe/platinum_ore_crushing.json b/src/main/generated/data/houseki/recipe/platinum_ore_crushing.json index 32eacc27..94ccf9e0 100644 --- a/src/main/generated/data/houseki/recipe/platinum_ore_crushing.json +++ b/src/main/generated/data/houseki/recipe/platinum_ore_crushing.json @@ -1,9 +1,6 @@ { - "type": "houseki:crushing", + "type": "houseki:crusher", "crushingTime": 250, "ingredient": "houseki:platinum_ore", - "result": { - "count": 1, - "id": "houseki:platinum" - } + "result": "houseki:platinum" } \ No newline at end of file diff --git a/src/main/generated/data/houseki/recipe/platinum_pickaxe.json b/src/main/generated/data/houseki/recipe/platinum_pickaxe.json index 44f25a03..08f480e1 100644 --- a/src/main/generated/data/houseki/recipe/platinum_pickaxe.json +++ b/src/main/generated/data/houseki/recipe/platinum_pickaxe.json @@ -11,7 +11,6 @@ " S " ], "result": { - "count": 1, "id": "houseki:platinum_pickaxe" } } \ No newline at end of file diff --git a/src/main/generated/data/houseki/recipe/platinum_shovel.json b/src/main/generated/data/houseki/recipe/platinum_shovel.json index eb8265fd..c4219da7 100644 --- a/src/main/generated/data/houseki/recipe/platinum_shovel.json +++ b/src/main/generated/data/houseki/recipe/platinum_shovel.json @@ -11,7 +11,6 @@ " S " ], "result": { - "count": 1, "id": "houseki:platinum_shovel" } } \ No newline at end of file diff --git a/src/main/generated/data/houseki/recipe/platinum_sword.json b/src/main/generated/data/houseki/recipe/platinum_sword.json index be0c4946..67a4ab1d 100644 --- a/src/main/generated/data/houseki/recipe/platinum_sword.json +++ b/src/main/generated/data/houseki/recipe/platinum_sword.json @@ -11,7 +11,6 @@ " S " ], "result": { - "count": 1, "id": "houseki:platinum_sword" } } \ No newline at end of file diff --git a/src/main/generated/data/houseki/recipe/polished_limestone_from_limestone_stonecutting.json b/src/main/generated/data/houseki/recipe/polished_limestone_from_limestone_stonecutting.json index 799f43c2..08b16f26 100644 --- a/src/main/generated/data/houseki/recipe/polished_limestone_from_limestone_stonecutting.json +++ b/src/main/generated/data/houseki/recipe/polished_limestone_from_limestone_stonecutting.json @@ -2,7 +2,6 @@ "type": "minecraft:stonecutting", "ingredient": "houseki:limestone", "result": { - "count": 1, "id": "houseki:polished_limestone" } } \ No newline at end of file diff --git a/src/main/generated/data/houseki/recipe/polished_limestone_stairs_from_limestone_stonecutting.json b/src/main/generated/data/houseki/recipe/polished_limestone_stairs_from_limestone_stonecutting.json index 2407a7d5..b7135fe6 100644 --- a/src/main/generated/data/houseki/recipe/polished_limestone_stairs_from_limestone_stonecutting.json +++ b/src/main/generated/data/houseki/recipe/polished_limestone_stairs_from_limestone_stonecutting.json @@ -2,7 +2,6 @@ "type": "minecraft:stonecutting", "ingredient": "houseki:limestone", "result": { - "count": 1, "id": "houseki:polished_limestone_stairs" } } \ No newline at end of file diff --git a/src/main/generated/data/houseki/recipe/polished_limestone_wall_from_limestone_stonecutting.json b/src/main/generated/data/houseki/recipe/polished_limestone_wall_from_limestone_stonecutting.json index 5c02b288..ee8ac344 100644 --- a/src/main/generated/data/houseki/recipe/polished_limestone_wall_from_limestone_stonecutting.json +++ b/src/main/generated/data/houseki/recipe/polished_limestone_wall_from_limestone_stonecutting.json @@ -2,7 +2,6 @@ "type": "minecraft:stonecutting", "ingredient": "houseki:limestone", "result": { - "count": 1, "id": "houseki:polished_limestone_wall" } } \ No newline at end of file diff --git a/src/main/generated/data/houseki/recipe/polished_slate_from_slate_stonecutting.json b/src/main/generated/data/houseki/recipe/polished_slate_from_slate_stonecutting.json index d622baf0..d9adc1e3 100644 --- a/src/main/generated/data/houseki/recipe/polished_slate_from_slate_stonecutting.json +++ b/src/main/generated/data/houseki/recipe/polished_slate_from_slate_stonecutting.json @@ -2,7 +2,6 @@ "type": "minecraft:stonecutting", "ingredient": "houseki:slate", "result": { - "count": 1, "id": "houseki:polished_slate" } } \ No newline at end of file diff --git a/src/main/generated/data/houseki/recipe/polished_slate_stairs_from_slate_stonecutting.json b/src/main/generated/data/houseki/recipe/polished_slate_stairs_from_slate_stonecutting.json index 28bd7855..aff64d92 100644 --- a/src/main/generated/data/houseki/recipe/polished_slate_stairs_from_slate_stonecutting.json +++ b/src/main/generated/data/houseki/recipe/polished_slate_stairs_from_slate_stonecutting.json @@ -2,7 +2,6 @@ "type": "minecraft:stonecutting", "ingredient": "houseki:slate", "result": { - "count": 1, "id": "houseki:polished_slate_stairs" } } \ No newline at end of file diff --git a/src/main/generated/data/houseki/recipe/polished_slate_wall_from_slate_stonecutting.json b/src/main/generated/data/houseki/recipe/polished_slate_wall_from_slate_stonecutting.json index b029e27e..f28328f2 100644 --- a/src/main/generated/data/houseki/recipe/polished_slate_wall_from_slate_stonecutting.json +++ b/src/main/generated/data/houseki/recipe/polished_slate_wall_from_slate_stonecutting.json @@ -2,7 +2,6 @@ "type": "minecraft:stonecutting", "ingredient": "houseki:slate", "result": { - "count": 1, "id": "houseki:polished_slate_wall" } } \ No newline at end of file diff --git a/src/main/generated/data/houseki/recipe/premium_diamond_drill.json b/src/main/generated/data/houseki/recipe/premium_diamond_drill.json index 9175a5cf..a09dfdd5 100644 --- a/src/main/generated/data/houseki/recipe/premium_diamond_drill.json +++ b/src/main/generated/data/houseki/recipe/premium_diamond_drill.json @@ -6,7 +6,6 @@ "houseki:premium_drill_head" ], "result": { - "count": 1, "id": "houseki:premium_diamond_drill" } } \ No newline at end of file diff --git a/src/main/generated/data/houseki/recipe/premium_tungsten_drill.json b/src/main/generated/data/houseki/recipe/premium_tungsten_drill.json index c8f069a2..5b08f05a 100644 --- a/src/main/generated/data/houseki/recipe/premium_tungsten_drill.json +++ b/src/main/generated/data/houseki/recipe/premium_tungsten_drill.json @@ -6,7 +6,6 @@ "houseki:premium_drill_head" ], "result": { - "count": 1, "id": "houseki:premium_tungsten_drill" } } \ No newline at end of file diff --git a/src/main/generated/data/houseki/recipe/rainbow_pyrite_axe.json b/src/main/generated/data/houseki/recipe/rainbow_pyrite_axe.json index e8023296..a2f37b33 100644 --- a/src/main/generated/data/houseki/recipe/rainbow_pyrite_axe.json +++ b/src/main/generated/data/houseki/recipe/rainbow_pyrite_axe.json @@ -11,7 +11,6 @@ " S " ], "result": { - "count": 1, "id": "houseki:rainbow_pyrite_axe" } } \ No newline at end of file diff --git a/src/main/generated/data/houseki/recipe/rainbow_pyrite_boots.json b/src/main/generated/data/houseki/recipe/rainbow_pyrite_boots.json index 98ac9c59..eaccd309 100644 --- a/src/main/generated/data/houseki/recipe/rainbow_pyrite_boots.json +++ b/src/main/generated/data/houseki/recipe/rainbow_pyrite_boots.json @@ -5,12 +5,10 @@ "#": "houseki:rainbow_pyrite" }, "pattern": [ - " ", "# #", "# #" ], "result": { - "count": 1, "id": "houseki:rainbow_pyrite_boots" } } \ No newline at end of file diff --git a/src/main/generated/data/houseki/recipe/rainbow_pyrite_chestplate.json b/src/main/generated/data/houseki/recipe/rainbow_pyrite_chestplate.json index bd2392e9..b5863e48 100644 --- a/src/main/generated/data/houseki/recipe/rainbow_pyrite_chestplate.json +++ b/src/main/generated/data/houseki/recipe/rainbow_pyrite_chestplate.json @@ -10,7 +10,6 @@ "###" ], "result": { - "count": 1, "id": "houseki:rainbow_pyrite_chestplate" } } \ No newline at end of file diff --git a/src/main/generated/data/houseki/recipe/rainbow_pyrite_helmet.json b/src/main/generated/data/houseki/recipe/rainbow_pyrite_helmet.json index 4cc7b9bb..295af9a8 100644 --- a/src/main/generated/data/houseki/recipe/rainbow_pyrite_helmet.json +++ b/src/main/generated/data/houseki/recipe/rainbow_pyrite_helmet.json @@ -6,11 +6,9 @@ }, "pattern": [ "###", - "# #", - " " + "# #" ], "result": { - "count": 1, "id": "houseki:rainbow_pyrite_helmet" } } \ No newline at end of file diff --git a/src/main/generated/data/houseki/recipe/rainbow_pyrite_hoe.json b/src/main/generated/data/houseki/recipe/rainbow_pyrite_hoe.json index 8f079cfc..55925c07 100644 --- a/src/main/generated/data/houseki/recipe/rainbow_pyrite_hoe.json +++ b/src/main/generated/data/houseki/recipe/rainbow_pyrite_hoe.json @@ -11,7 +11,6 @@ " S " ], "result": { - "count": 1, "id": "houseki:rainbow_pyrite_hoe" } } \ No newline at end of file diff --git a/src/main/generated/data/houseki/recipe/rainbow_pyrite_leggings.json b/src/main/generated/data/houseki/recipe/rainbow_pyrite_leggings.json index ba9a83f2..93a5dbd3 100644 --- a/src/main/generated/data/houseki/recipe/rainbow_pyrite_leggings.json +++ b/src/main/generated/data/houseki/recipe/rainbow_pyrite_leggings.json @@ -10,7 +10,6 @@ "# #" ], "result": { - "count": 1, "id": "houseki:rainbow_pyrite_leggings" } } \ No newline at end of file diff --git a/src/main/generated/data/houseki/recipe/rainbow_pyrite_pickaxe.json b/src/main/generated/data/houseki/recipe/rainbow_pyrite_pickaxe.json index 543cf5cc..8f7d6d5e 100644 --- a/src/main/generated/data/houseki/recipe/rainbow_pyrite_pickaxe.json +++ b/src/main/generated/data/houseki/recipe/rainbow_pyrite_pickaxe.json @@ -11,7 +11,6 @@ " S " ], "result": { - "count": 1, "id": "houseki:rainbow_pyrite_pickaxe" } } \ No newline at end of file diff --git a/src/main/generated/data/houseki/recipe/rainbow_pyrite_shovel.json b/src/main/generated/data/houseki/recipe/rainbow_pyrite_shovel.json index 94a410c0..f8094bfc 100644 --- a/src/main/generated/data/houseki/recipe/rainbow_pyrite_shovel.json +++ b/src/main/generated/data/houseki/recipe/rainbow_pyrite_shovel.json @@ -11,7 +11,6 @@ " S " ], "result": { - "count": 1, "id": "houseki:rainbow_pyrite_shovel" } } \ No newline at end of file diff --git a/src/main/generated/data/houseki/recipe/rainbow_pyrite_sword.json b/src/main/generated/data/houseki/recipe/rainbow_pyrite_sword.json index 45691650..57243c05 100644 --- a/src/main/generated/data/houseki/recipe/rainbow_pyrite_sword.json +++ b/src/main/generated/data/houseki/recipe/rainbow_pyrite_sword.json @@ -11,7 +11,6 @@ " S " ], "result": { - "count": 1, "id": "houseki:rainbow_pyrite_sword" } } \ No newline at end of file diff --git a/src/main/generated/data/houseki/recipe/sandstone_crushing.json b/src/main/generated/data/houseki/recipe/sandstone_crushing.json index b86f3739..43a512a2 100644 --- a/src/main/generated/data/houseki/recipe/sandstone_crushing.json +++ b/src/main/generated/data/houseki/recipe/sandstone_crushing.json @@ -1,14 +1,8 @@ { - "type": "houseki:crushing", + "type": "houseki:crusher", "auxiliary_chance": 0.2, - "auxiliary_result": { - "count": 1, - "id": "minecraft:calcite" - }, + "auxiliary_result": "minecraft:calcite", "crushingTime": 100, "ingredient": "minecraft:sandstone", - "result": { - "count": 1, - "id": "minecraft:sand" - } + "result": "minecraft:sand" } \ No newline at end of file diff --git a/src/main/generated/data/houseki/recipe/sapphire_axe.json b/src/main/generated/data/houseki/recipe/sapphire_axe.json index c945a63d..7e790bfa 100644 --- a/src/main/generated/data/houseki/recipe/sapphire_axe.json +++ b/src/main/generated/data/houseki/recipe/sapphire_axe.json @@ -11,7 +11,6 @@ " S " ], "result": { - "count": 1, "id": "houseki:sapphire_axe" } } \ No newline at end of file diff --git a/src/main/generated/data/houseki/recipe/sapphire_boots.json b/src/main/generated/data/houseki/recipe/sapphire_boots.json index b087034e..dee43658 100644 --- a/src/main/generated/data/houseki/recipe/sapphire_boots.json +++ b/src/main/generated/data/houseki/recipe/sapphire_boots.json @@ -5,12 +5,10 @@ "#": "houseki:sapphire" }, "pattern": [ - " ", "# #", "# #" ], "result": { - "count": 1, "id": "houseki:sapphire_boots" } } \ No newline at end of file diff --git a/src/main/generated/data/houseki/recipe/sapphire_chestplate.json b/src/main/generated/data/houseki/recipe/sapphire_chestplate.json index be2d2ee7..862b6434 100644 --- a/src/main/generated/data/houseki/recipe/sapphire_chestplate.json +++ b/src/main/generated/data/houseki/recipe/sapphire_chestplate.json @@ -10,7 +10,6 @@ "###" ], "result": { - "count": 1, "id": "houseki:sapphire_chestplate" } } \ No newline at end of file diff --git a/src/main/generated/data/houseki/recipe/sapphire_helmet.json b/src/main/generated/data/houseki/recipe/sapphire_helmet.json index a6025793..3ebcd5b7 100644 --- a/src/main/generated/data/houseki/recipe/sapphire_helmet.json +++ b/src/main/generated/data/houseki/recipe/sapphire_helmet.json @@ -6,11 +6,9 @@ }, "pattern": [ "###", - "# #", - " " + "# #" ], "result": { - "count": 1, "id": "houseki:sapphire_helmet" } } \ No newline at end of file diff --git a/src/main/generated/data/houseki/recipe/sapphire_hoe.json b/src/main/generated/data/houseki/recipe/sapphire_hoe.json index 03ae689d..7c2a5fe9 100644 --- a/src/main/generated/data/houseki/recipe/sapphire_hoe.json +++ b/src/main/generated/data/houseki/recipe/sapphire_hoe.json @@ -11,7 +11,6 @@ " S " ], "result": { - "count": 1, "id": "houseki:sapphire_hoe" } } \ No newline at end of file diff --git a/src/main/generated/data/houseki/recipe/sapphire_leggings.json b/src/main/generated/data/houseki/recipe/sapphire_leggings.json index a5ea02d0..45e9ada7 100644 --- a/src/main/generated/data/houseki/recipe/sapphire_leggings.json +++ b/src/main/generated/data/houseki/recipe/sapphire_leggings.json @@ -10,7 +10,6 @@ "# #" ], "result": { - "count": 1, "id": "houseki:sapphire_leggings" } } \ No newline at end of file diff --git a/src/main/generated/data/houseki/recipe/sapphire_pickaxe.json b/src/main/generated/data/houseki/recipe/sapphire_pickaxe.json index 5a7f452f..ba70c2a6 100644 --- a/src/main/generated/data/houseki/recipe/sapphire_pickaxe.json +++ b/src/main/generated/data/houseki/recipe/sapphire_pickaxe.json @@ -11,7 +11,6 @@ " S " ], "result": { - "count": 1, "id": "houseki:sapphire_pickaxe" } } \ No newline at end of file diff --git a/src/main/generated/data/houseki/recipe/sapphire_shovel.json b/src/main/generated/data/houseki/recipe/sapphire_shovel.json index 23ff1eda..ad2269b3 100644 --- a/src/main/generated/data/houseki/recipe/sapphire_shovel.json +++ b/src/main/generated/data/houseki/recipe/sapphire_shovel.json @@ -11,7 +11,6 @@ " S " ], "result": { - "count": 1, "id": "houseki:sapphire_shovel" } } \ No newline at end of file diff --git a/src/main/generated/data/houseki/recipe/sapphire_sword.json b/src/main/generated/data/houseki/recipe/sapphire_sword.json index 74864d6e..cdce6d6f 100644 --- a/src/main/generated/data/houseki/recipe/sapphire_sword.json +++ b/src/main/generated/data/houseki/recipe/sapphire_sword.json @@ -11,7 +11,6 @@ " S " ], "result": { - "count": 1, "id": "houseki:sapphire_sword" } } \ No newline at end of file diff --git a/src/main/generated/data/houseki/recipe/scheelite_crushing.json b/src/main/generated/data/houseki/recipe/scheelite_crushing.json index 3e94f047..e30b4cf4 100644 --- a/src/main/generated/data/houseki/recipe/scheelite_crushing.json +++ b/src/main/generated/data/houseki/recipe/scheelite_crushing.json @@ -1,9 +1,6 @@ { - "type": "houseki:crushing", + "type": "houseki:crusher", "crushingTime": 250, "ingredient": "houseki:scheelite", - "result": { - "count": 1, - "id": "houseki:tungsten" - } + "result": "houseki:tungsten" } \ No newline at end of file diff --git a/src/main/generated/data/houseki/recipe/simple_diamond_drill.json b/src/main/generated/data/houseki/recipe/simple_diamond_drill.json index 600ec233..002199a1 100644 --- a/src/main/generated/data/houseki/recipe/simple_diamond_drill.json +++ b/src/main/generated/data/houseki/recipe/simple_diamond_drill.json @@ -6,7 +6,6 @@ "houseki:simple_drill_head" ], "result": { - "count": 1, "id": "houseki:simple_diamond_drill" } } \ No newline at end of file diff --git a/src/main/generated/data/houseki/recipe/simple_drill_head.json b/src/main/generated/data/houseki/recipe/simple_drill_head.json index 03508412..50ab2999 100644 --- a/src/main/generated/data/houseki/recipe/simple_drill_head.json +++ b/src/main/generated/data/houseki/recipe/simple_drill_head.json @@ -12,7 +12,6 @@ "###" ], "result": { - "count": 1, "id": "houseki:simple_drill_head" } } \ No newline at end of file diff --git a/src/main/generated/data/houseki/recipe/simple_tungsten_drill.json b/src/main/generated/data/houseki/recipe/simple_tungsten_drill.json index 3ede7591..0259ccc8 100644 --- a/src/main/generated/data/houseki/recipe/simple_tungsten_drill.json +++ b/src/main/generated/data/houseki/recipe/simple_tungsten_drill.json @@ -6,7 +6,6 @@ "houseki:simple_drill_head" ], "result": { - "count": 1, "id": "houseki:simple_tungsten_drill" } } \ No newline at end of file diff --git a/src/main/generated/data/houseki/recipe/slate_stairs_from_slate_stonecutting.json b/src/main/generated/data/houseki/recipe/slate_stairs_from_slate_stonecutting.json index 0f8f205a..683281bf 100644 --- a/src/main/generated/data/houseki/recipe/slate_stairs_from_slate_stonecutting.json +++ b/src/main/generated/data/houseki/recipe/slate_stairs_from_slate_stonecutting.json @@ -2,7 +2,6 @@ "type": "minecraft:stonecutting", "ingredient": "houseki:slate", "result": { - "count": 1, "id": "houseki:slate_stairs" } } \ No newline at end of file diff --git a/src/main/generated/data/houseki/recipe/slate_tile_stairs_from_slate_stonecutting.json b/src/main/generated/data/houseki/recipe/slate_tile_stairs_from_slate_stonecutting.json index 0e149546..e11ac0da 100644 --- a/src/main/generated/data/houseki/recipe/slate_tile_stairs_from_slate_stonecutting.json +++ b/src/main/generated/data/houseki/recipe/slate_tile_stairs_from_slate_stonecutting.json @@ -2,7 +2,6 @@ "type": "minecraft:stonecutting", "ingredient": "houseki:slate", "result": { - "count": 1, "id": "houseki:slate_tile_stairs" } } \ No newline at end of file diff --git a/src/main/generated/data/houseki/recipe/slate_tile_wall_from_slate_stonecutting.json b/src/main/generated/data/houseki/recipe/slate_tile_wall_from_slate_stonecutting.json index 84170bf1..1556d617 100644 --- a/src/main/generated/data/houseki/recipe/slate_tile_wall_from_slate_stonecutting.json +++ b/src/main/generated/data/houseki/recipe/slate_tile_wall_from_slate_stonecutting.json @@ -2,7 +2,6 @@ "type": "minecraft:stonecutting", "ingredient": "houseki:slate", "result": { - "count": 1, "id": "houseki:slate_tile_wall" } } \ No newline at end of file diff --git a/src/main/generated/data/houseki/recipe/slate_tiles.json b/src/main/generated/data/houseki/recipe/slate_tiles.json index e4732b9b..ae8b85ca 100644 --- a/src/main/generated/data/houseki/recipe/slate_tiles.json +++ b/src/main/generated/data/houseki/recipe/slate_tiles.json @@ -9,7 +9,6 @@ "##" ], "result": { - "count": 1, "id": "houseki:slate_tiles" } } \ No newline at end of file diff --git a/src/main/generated/data/houseki/recipe/slate_tiles_from_slate_stonecutting.json b/src/main/generated/data/houseki/recipe/slate_tiles_from_slate_stonecutting.json index c213176a..76bee306 100644 --- a/src/main/generated/data/houseki/recipe/slate_tiles_from_slate_stonecutting.json +++ b/src/main/generated/data/houseki/recipe/slate_tiles_from_slate_stonecutting.json @@ -2,7 +2,6 @@ "type": "minecraft:stonecutting", "ingredient": "houseki:slate", "result": { - "count": 1, "id": "houseki:slate_tiles" } } \ No newline at end of file diff --git a/src/main/generated/data/houseki/recipe/slate_wall_from_slate_stonecutting.json b/src/main/generated/data/houseki/recipe/slate_wall_from_slate_stonecutting.json index 4cb92600..67a0bdb6 100644 --- a/src/main/generated/data/houseki/recipe/slate_wall_from_slate_stonecutting.json +++ b/src/main/generated/data/houseki/recipe/slate_wall_from_slate_stonecutting.json @@ -2,7 +2,6 @@ "type": "minecraft:stonecutting", "ingredient": "houseki:slate", "result": { - "count": 1, "id": "houseki:slate_wall" } } \ No newline at end of file diff --git a/src/main/generated/data/houseki/recipe/steel_axe.json b/src/main/generated/data/houseki/recipe/steel_axe.json index 4b72f460..0a9db9f6 100644 --- a/src/main/generated/data/houseki/recipe/steel_axe.json +++ b/src/main/generated/data/houseki/recipe/steel_axe.json @@ -11,7 +11,6 @@ " S " ], "result": { - "count": 1, "id": "houseki:steel_axe" } } \ No newline at end of file diff --git a/src/main/generated/data/houseki/recipe/steel_boots.json b/src/main/generated/data/houseki/recipe/steel_boots.json index 99d95340..016096d8 100644 --- a/src/main/generated/data/houseki/recipe/steel_boots.json +++ b/src/main/generated/data/houseki/recipe/steel_boots.json @@ -5,12 +5,10 @@ "#": "houseki:steel" }, "pattern": [ - " ", "# #", "# #" ], "result": { - "count": 1, "id": "houseki:steel_boots" } } \ No newline at end of file diff --git a/src/main/generated/data/houseki/recipe/steel_chestplate.json b/src/main/generated/data/houseki/recipe/steel_chestplate.json index 7723c918..5ecf429c 100644 --- a/src/main/generated/data/houseki/recipe/steel_chestplate.json +++ b/src/main/generated/data/houseki/recipe/steel_chestplate.json @@ -10,7 +10,6 @@ "###" ], "result": { - "count": 1, "id": "houseki:steel_chestplate" } } \ No newline at end of file diff --git a/src/main/generated/data/houseki/recipe/steel_helmet.json b/src/main/generated/data/houseki/recipe/steel_helmet.json index 2c244afb..60e59433 100644 --- a/src/main/generated/data/houseki/recipe/steel_helmet.json +++ b/src/main/generated/data/houseki/recipe/steel_helmet.json @@ -6,11 +6,9 @@ }, "pattern": [ "###", - "# #", - " " + "# #" ], "result": { - "count": 1, "id": "houseki:steel_helmet" } } \ No newline at end of file diff --git a/src/main/generated/data/houseki/recipe/steel_hoe.json b/src/main/generated/data/houseki/recipe/steel_hoe.json index f0d872ee..d3be2db7 100644 --- a/src/main/generated/data/houseki/recipe/steel_hoe.json +++ b/src/main/generated/data/houseki/recipe/steel_hoe.json @@ -11,7 +11,6 @@ " S " ], "result": { - "count": 1, "id": "houseki:steel_hoe" } } \ No newline at end of file diff --git a/src/main/generated/data/houseki/recipe/steel_leggings.json b/src/main/generated/data/houseki/recipe/steel_leggings.json index 38fc1f13..93cf25a4 100644 --- a/src/main/generated/data/houseki/recipe/steel_leggings.json +++ b/src/main/generated/data/houseki/recipe/steel_leggings.json @@ -10,7 +10,6 @@ "# #" ], "result": { - "count": 1, "id": "houseki:steel_leggings" } } \ No newline at end of file diff --git a/src/main/generated/data/houseki/recipe/steel_pickaxe.json b/src/main/generated/data/houseki/recipe/steel_pickaxe.json index 69a68fe1..610db393 100644 --- a/src/main/generated/data/houseki/recipe/steel_pickaxe.json +++ b/src/main/generated/data/houseki/recipe/steel_pickaxe.json @@ -11,7 +11,6 @@ " S " ], "result": { - "count": 1, "id": "houseki:steel_pickaxe" } } \ No newline at end of file diff --git a/src/main/generated/data/houseki/recipe/steel_shovel.json b/src/main/generated/data/houseki/recipe/steel_shovel.json index 5a42c979..34b195cd 100644 --- a/src/main/generated/data/houseki/recipe/steel_shovel.json +++ b/src/main/generated/data/houseki/recipe/steel_shovel.json @@ -11,7 +11,6 @@ " S " ], "result": { - "count": 1, "id": "houseki:steel_shovel" } } \ No newline at end of file diff --git a/src/main/generated/data/houseki/recipe/steel_sword.json b/src/main/generated/data/houseki/recipe/steel_sword.json index 015efac5..cef376db 100644 --- a/src/main/generated/data/houseki/recipe/steel_sword.json +++ b/src/main/generated/data/houseki/recipe/steel_sword.json @@ -11,7 +11,6 @@ " S " ], "result": { - "count": 1, "id": "houseki:steel_sword" } } \ No newline at end of file diff --git a/src/main/generated/data/houseki/recipe/stone_crushing.json b/src/main/generated/data/houseki/recipe/stone_crushing.json index 8f257f26..497a5fd6 100644 --- a/src/main/generated/data/houseki/recipe/stone_crushing.json +++ b/src/main/generated/data/houseki/recipe/stone_crushing.json @@ -1,9 +1,6 @@ { - "type": "houseki:crushing", + "type": "houseki:crusher", "crushingTime": 100, "ingredient": "minecraft:stone", - "result": { - "count": 1, - "id": "minecraft:gravel" - } + "result": "minecraft:gravel" } \ No newline at end of file diff --git a/src/main/generated/data/houseki/recipe/tnt.json b/src/main/generated/data/houseki/recipe/tnt.json index e1bd62c3..f7543cd6 100644 --- a/src/main/generated/data/houseki/recipe/tnt.json +++ b/src/main/generated/data/houseki/recipe/tnt.json @@ -11,7 +11,6 @@ "X#X" ], "result": { - "count": 1, "id": "minecraft:tnt" } } \ No newline at end of file diff --git a/src/main/generated/data/houseki/recipe/tungsten_axe.json b/src/main/generated/data/houseki/recipe/tungsten_axe.json index 043bc70c..83fb2643 100644 --- a/src/main/generated/data/houseki/recipe/tungsten_axe.json +++ b/src/main/generated/data/houseki/recipe/tungsten_axe.json @@ -11,7 +11,6 @@ " S " ], "result": { - "count": 1, "id": "houseki:tungsten_axe" } } \ No newline at end of file diff --git a/src/main/generated/data/houseki/recipe/tungsten_boots.json b/src/main/generated/data/houseki/recipe/tungsten_boots.json index 70ee95fe..40e2c4d5 100644 --- a/src/main/generated/data/houseki/recipe/tungsten_boots.json +++ b/src/main/generated/data/houseki/recipe/tungsten_boots.json @@ -5,12 +5,10 @@ "#": "houseki:tungsten" }, "pattern": [ - " ", "# #", "# #" ], "result": { - "count": 1, "id": "houseki:tungsten_boots" } } \ No newline at end of file diff --git a/src/main/generated/data/houseki/recipe/tungsten_chestplate.json b/src/main/generated/data/houseki/recipe/tungsten_chestplate.json index 05cdfee3..93ebf139 100644 --- a/src/main/generated/data/houseki/recipe/tungsten_chestplate.json +++ b/src/main/generated/data/houseki/recipe/tungsten_chestplate.json @@ -10,7 +10,6 @@ "###" ], "result": { - "count": 1, "id": "houseki:tungsten_chestplate" } } \ No newline at end of file diff --git a/src/main/generated/data/houseki/recipe/tungsten_drill_bit.json b/src/main/generated/data/houseki/recipe/tungsten_drill_bit.json index 950c30f1..875584ff 100644 --- a/src/main/generated/data/houseki/recipe/tungsten_drill_bit.json +++ b/src/main/generated/data/houseki/recipe/tungsten_drill_bit.json @@ -6,12 +6,10 @@ "X": "houseki:block_of_tungsten" }, "pattern": [ - " ", " # ", "#X#" ], "result": { - "count": 1, "id": "houseki:tungsten_drill_bit" } } \ No newline at end of file diff --git a/src/main/generated/data/houseki/recipe/tungsten_helmet.json b/src/main/generated/data/houseki/recipe/tungsten_helmet.json index 1d7b7e06..53693fa1 100644 --- a/src/main/generated/data/houseki/recipe/tungsten_helmet.json +++ b/src/main/generated/data/houseki/recipe/tungsten_helmet.json @@ -6,11 +6,9 @@ }, "pattern": [ "###", - "# #", - " " + "# #" ], "result": { - "count": 1, "id": "houseki:tungsten_helmet" } } \ No newline at end of file diff --git a/src/main/generated/data/houseki/recipe/tungsten_hoe.json b/src/main/generated/data/houseki/recipe/tungsten_hoe.json index 7c4d7043..e8c3af7d 100644 --- a/src/main/generated/data/houseki/recipe/tungsten_hoe.json +++ b/src/main/generated/data/houseki/recipe/tungsten_hoe.json @@ -11,7 +11,6 @@ " S " ], "result": { - "count": 1, "id": "houseki:tungsten_hoe" } } \ No newline at end of file diff --git a/src/main/generated/data/houseki/recipe/tungsten_leggings.json b/src/main/generated/data/houseki/recipe/tungsten_leggings.json index 88998ad9..0394dc80 100644 --- a/src/main/generated/data/houseki/recipe/tungsten_leggings.json +++ b/src/main/generated/data/houseki/recipe/tungsten_leggings.json @@ -10,7 +10,6 @@ "# #" ], "result": { - "count": 1, "id": "houseki:tungsten_leggings" } } \ No newline at end of file diff --git a/src/main/generated/data/houseki/recipe/tungsten_pickaxe.json b/src/main/generated/data/houseki/recipe/tungsten_pickaxe.json index 0bf22855..ccfa6d56 100644 --- a/src/main/generated/data/houseki/recipe/tungsten_pickaxe.json +++ b/src/main/generated/data/houseki/recipe/tungsten_pickaxe.json @@ -11,7 +11,6 @@ " S " ], "result": { - "count": 1, "id": "houseki:tungsten_pickaxe" } } \ No newline at end of file diff --git a/src/main/generated/data/houseki/recipe/tungsten_shovel.json b/src/main/generated/data/houseki/recipe/tungsten_shovel.json index a441f7bf..b5af9dd8 100644 --- a/src/main/generated/data/houseki/recipe/tungsten_shovel.json +++ b/src/main/generated/data/houseki/recipe/tungsten_shovel.json @@ -11,7 +11,6 @@ " S " ], "result": { - "count": 1, "id": "houseki:tungsten_shovel" } } \ No newline at end of file diff --git a/src/main/generated/data/houseki/recipe/tungsten_sword.json b/src/main/generated/data/houseki/recipe/tungsten_sword.json index de50001c..0a3b6a69 100644 --- a/src/main/generated/data/houseki/recipe/tungsten_sword.json +++ b/src/main/generated/data/houseki/recipe/tungsten_sword.json @@ -11,7 +11,6 @@ " S " ], "result": { - "count": 1, "id": "houseki:tungsten_sword" } } \ No newline at end of file diff --git a/src/main/generated/data/houseki/recipe/wolframite_crushing.json b/src/main/generated/data/houseki/recipe/wolframite_crushing.json index 8c3d2302..966d18c1 100644 --- a/src/main/generated/data/houseki/recipe/wolframite_crushing.json +++ b/src/main/generated/data/houseki/recipe/wolframite_crushing.json @@ -1,14 +1,8 @@ { - "type": "houseki:crushing", + "type": "houseki:crusher", "auxiliary_chance": 0.5, - "auxiliary_result": { - "count": 1, - "id": "minecraft:quartz" - }, + "auxiliary_result": "minecraft:quartz", "crushingTime": 250, "ingredient": "houseki:wolframite", - "result": { - "count": 1, - "id": "houseki:tungsten" - } + "result": "houseki:tungsten" } \ No newline at end of file diff --git a/src/main/generated/data/minecraft/advancement/recipes/recipe.json b/src/main/generated/data/minecraft/advancement/recipes/recipe.json new file mode 100644 index 00000000..a216a707 --- /dev/null +++ b/src/main/generated/data/minecraft/advancement/recipes/recipe.json @@ -0,0 +1,21 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "houseki:scheelite_crushing" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "houseki:scheelite_crushing" + ] + } +} \ No newline at end of file diff --git a/src/main/java/anya/pizza/houseki/block/entity/custom/CrusherBlockEntity.java b/src/main/java/anya/pizza/houseki/block/entity/custom/CrusherBlockEntity.java index bbad7214..7a86e412 100644 --- a/src/main/java/anya/pizza/houseki/block/entity/custom/CrusherBlockEntity.java +++ b/src/main/java/anya/pizza/houseki/block/entity/custom/CrusherBlockEntity.java @@ -5,7 +5,6 @@ import anya.pizza.houseki.block.entity.ModBlockEntities; import anya.pizza.houseki.recipe.CrusherRecipe; import anya.pizza.houseki.recipe.CrusherRecipeInput; -import anya.pizza.houseki.recipe.ModSerializer; import anya.pizza.houseki.recipe.ModTypes; import anya.pizza.houseki.screen.custom.CrusherScreenHandler; import net.fabricmc.fabric.api.menu.v1.ExtendedMenuProvider; @@ -34,7 +33,6 @@ import net.minecraft.world.level.Level; import org.jetbrains.annotations.Nullable; import org.jspecify.annotations.NonNull; -import org.lwjgl.system.windows.INPUT; import java.util.Optional; @@ -112,10 +110,16 @@ public AbstractContainerMenu createMenu(int syncId, @NonNull Inventory playerInv return new CrusherScreenHandler(syncId, playerInventory, this, propertyDelegate); } + /** + * Drops this block entity's inventory at the given position when the block is removed, then + * invokes superclass removal side-effects. + * + * @param pos the position of the block being removed + * @param oldState the previous block state at that position + */ @Override public void preRemoveSideEffects(@NonNull BlockPos pos, @NonNull BlockState oldState) { assert level != null; - Containers.dropContents(level, pos, (this)); if (level != null) { Containers.dropContents(level, pos, this); } @@ -194,13 +198,29 @@ private void updateMaxProgress(Level world) { .orElse(CrusherRecipe.DEFAULT_CRUSHING_TIME); } + /** + * Determines whether the current crusher recipe can be executed given available output space. + * + * Checks that a matching recipe exists and that the recipe's primary output and optional auxiliary + * output can both fit into their respective output slots. + * + * @return true if both the main output and the auxiliary output (if present) can be inserted into their slots, false otherwise. + */ private boolean canCraft() { Optional> recipe = getCurrentRecipe(); if (recipe.isEmpty()) return false; CrusherRecipe crusherRecipe = recipe.get().value(); + + // 1. Get the main output stack + // In 1.21, getResult technically wants the registry provider, but for + // a simple Item-to-Stack conversion, it doesn't strictly need it. ItemStack output = crusherRecipe.getResult(null); - ItemStack auxiliary = crusherRecipe.auxiliaryOutput().orElse(ItemStack.EMPTY); + + // 2. Map the Optional to an Optional + ItemStack auxiliary = crusherRecipe.auxiliaryOutput() + .map(ItemStack::new) // Convert the Item to a Stack if present + .orElse(ItemStack.EMPTY); // Otherwise return the empty stack return canInsertIntoSlot(OUTPUT_SLOT, output) && canInsertIntoSlot(AUXILIARY_OUTPUT_SLOT, auxiliary); } @@ -222,13 +242,11 @@ private boolean canInsertIntoSlot(int slot, ItemStack stack) { } /** - * Apply the currently matched crusher recipe: produce the recipe's main output, optionally produce - * the auxiliary output based on its chance, and consume one input item. + * Apply the currently matched crusher recipe, producing the recipe's outputs and consuming one input item. * - * If no matching recipe is available, the method makes no changes. The main output is always - * inserted (or stacked) into the main output slot; the auxiliary output is inserted only if the - * recipe provides one and its configured chance succeeds. One item is removed from the input slot - * when a recipe is applied. + * If no matching recipe is available, no changes are made. The recipe's main output is inserted into (or stacked + * onto) the main output slot; the auxiliary output is inserted into the auxiliary output slot only if the recipe + * provides one and its configured chance succeeds. One item is removed from the input slot when the recipe is applied. */ private void craftItem() { Optional> recipe = getCurrentRecipe(); @@ -237,11 +255,14 @@ private void craftItem() { CrusherRecipe crusherRecipe = recipe.get().value(); // Handle Main Output - insertOrIncrement(OUTPUT_SLOT, crusherRecipe.getResult(null).copy(), 1.0); + // getResult already returns a new ItemStack(output), so we copy that. + insertOrIncrement(OUTPUT_SLOT, crusherRecipe.getResult(null), 1.0); // Handle Auxiliary Output - crusherRecipe.auxiliaryOutput().ifPresent(stack -> { - insertOrIncrement(AUXILIARY_OUTPUT_SLOT, stack.copy(), crusherRecipe.auxiliaryChance()); + crusherRecipe.auxiliaryOutput().ifPresent(item -> { + // Convert the raw Item into a new ItemStack so we can use .copy() or set counts + ItemStack auxStack = new ItemStack(item); + insertOrIncrement(AUXILIARY_OUTPUT_SLOT, auxStack, crusherRecipe.auxiliaryChance()); }); inventory.get(INPUT_SLOT).shrink(1); @@ -268,13 +289,27 @@ private void insertOrIncrement(int slot, ItemStack result, double chance) { } } + /** + * Look up the crusher recipe that matches the current input stack on the server. + * + * @return An Optional containing the matching RecipeHolder when running on a server and a recipe exists; {@code Optional.empty()} otherwise. + */ private Optional> getCurrentRecipe() { - assert this.getLevel() != null; - return ((ServerLevel) this.getLevel()).recipeAccess() - .getRecipeFor(ModTypes.CRUSHER_TYPE, new CrusherRecipeInput(inventory.getFirst()), this.getLevel()); - + Level level = this.getLevel(); + if (!(level instanceof ServerLevel serverLevel)) { + return Optional.empty(); + } + return serverLevel.recipeAccess() + .getRecipeFor(ModTypes.CRUSHER_TYPE, new CrusherRecipeInput(inventory.getFirst()), level); } + /** + * Get the inventory slot indices that are accessible from the given block face. + * + * @param side the block face from which access is attempted + * @return an array of slot indices accessible from the specified face; if {@link Direction#DOWN} returns + * OUTPUT_SLOT and AUXILIARY_OUTPUT_SLOT, otherwise returns INPUT_SLOT and FUEL_SLOT + */ @Override public int @NonNull [] getSlotsForFace(@NonNull Direction side) { return side == Direction.DOWN ? new int[]{OUTPUT_SLOT, AUXILIARY_OUTPUT_SLOT} : new int[]{INPUT_SLOT, FUEL_SLOT}; diff --git a/src/main/java/anya/pizza/houseki/datagen/ModModelProvider.java b/src/main/java/anya/pizza/houseki/datagen/ModModelProvider.java index bc37360f..c03d2b26 100644 --- a/src/main/java/anya/pizza/houseki/datagen/ModModelProvider.java +++ b/src/main/java/anya/pizza/houseki/datagen/ModModelProvider.java @@ -5,7 +5,6 @@ import anya.pizza.houseki.item.ModItems; import net.fabricmc.fabric.api.client.datagen.v1.provider.FabricModelProvider; import net.fabricmc.fabric.api.datagen.v1.FabricPackOutput; -import net.minecraft.client.data.*; import net.minecraft.client.data.models.BlockModelGenerators; import net.minecraft.client.data.models.ItemModelGenerators; import net.minecraft.client.data.models.model.ModelTemplates; diff --git a/src/main/java/anya/pizza/houseki/datagen/ModRecipeProvider.java b/src/main/java/anya/pizza/houseki/datagen/ModRecipeProvider.java index 1961c131..a5ca2ddf 100644 --- a/src/main/java/anya/pizza/houseki/datagen/ModRecipeProvider.java +++ b/src/main/java/anya/pizza/houseki/datagen/ModRecipeProvider.java @@ -5,7 +5,6 @@ import anya.pizza.houseki.item.ModItems; import net.fabricmc.fabric.api.datagen.v1.FabricPackOutput; import net.fabricmc.fabric.api.datagen.v1.provider.FabricRecipeProvider; -import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.crafting.CookingBookCategory; import net.minecraft.world.level.block.Blocks; import net.minecraft.data.recipes.RecipeOutput; @@ -30,6 +29,17 @@ public ModRecipeProvider(FabricPackOutput output, CompletableFutureThe provider's buildRecipes implementation defines crushing, smelting, blasting, + * stonecutting, crafting, tool/armor, upgrade, and related recipes and emits them to + * the given recipe output with mod-specific resource keys.

+ * + * @param wrapperLookup a registry lookup provider used when constructing recipes + * @param recipeExporter the recipe output to which generated recipes will be saved + * @return a RecipeProvider configured to generate the Houseki mod's recipes + */ @Override protected RecipeProvider createRecipeProvider(HolderLookup.Provider wrapperLookup, RecipeOutput recipeExporter) { return new RecipeProvider(wrapperLookup, recipeExporter) { @@ -50,32 +60,66 @@ public void buildRecipes() { List CAST_STEEL_SMELTABLES = List.of(ModItems.STEEL); //Crushing recipes with auxiliary output - CrusherRecipeBuilder.create(Ingredient.of(ModBlocks.BAUXITE), new ItemStack(ModItems.CRUSHED_BAUXITE), 250).chance(0.5) - .auxiliary(new ItemStack(Items.CLAY)).save(output, String.valueOf(Identifier.fromNamespaceAndPath("houseki", "bauxite_crushing"))); - - CrusherRecipeBuilder.create(Ingredient.of(Items.SANDSTONE), new ItemStack(Items.SAND), 100).chance(0.2) - .auxiliary(new ItemStack(Items.CALCITE)).save(output, String.valueOf(Identifier.fromNamespaceAndPath("houseki", "sandstone_crushing"))); - - CrusherRecipeBuilder.create(Ingredient.of(ModItems.WOLFRAMITE), new ItemStack(ModItems.TUNGSTEN), 250).chance(0.5) - .auxiliary(new ItemStack(Items.QUARTZ)).save(output, String.valueOf(Identifier.fromNamespaceAndPath("houseki", "wolframite_crushing"))); - - // Crushing recipes WITHOUT an auxiliary output (it will default to Optional.empty()) - CrusherRecipeBuilder.create(Ingredient.of(Items.COBBLESTONE), new ItemStack(Items.GRAVEL), 100) - .save(output, String.valueOf(Identifier.fromNamespaceAndPath("houseki", "cobblestone_crushing"))); - - CrusherRecipeBuilder.create(Ingredient.of(Items.STONE), new ItemStack(Items.GRAVEL), 100) - .save(output, String.valueOf(Identifier.fromNamespaceAndPath("houseki", "stone_crushing"))); - - CrusherRecipeBuilder.create(Ingredient.of(ModBlocks.PLATINUM_ORE), new ItemStack(ModItems.PLATINUM), 250) - .save(output, String.valueOf(Identifier.fromNamespaceAndPath("houseki", "platinum_ore_crushing"))); - CrusherRecipeBuilder.create(Ingredient.of(ModBlocks.DEEPSLATE_PLATINUM_ORE), new ItemStack(ModItems.PLATINUM), 250) - .save(output, String.valueOf(Identifier.fromNamespaceAndPath("houseki", "deepslate_platinum_ore_crushing"))); - - CrusherRecipeBuilder.create(Ingredient.of(Items.COPPER_INGOT), new ItemStack(ModItems.PLATINUM_NUGGET), 250) - .save(output, String.valueOf(Identifier.fromNamespaceAndPath("houseki", "copper_ingot_crushing"))); - - CrusherRecipeBuilder.create(Ingredient.of(ModItems.SCHEELITE), new ItemStack(ModItems.TUNGSTEN), 250) - .save(output, String.valueOf(Identifier.fromNamespaceAndPath("houseki", "scheelite_crushing"))); + CrusherRecipeBuilder.create(Ingredient.of(ModBlocks.BAUXITE), ModItems.CRUSHED_BAUXITE, 250) + .chance(0.5) + .auxiliary(Items.CLAY) + .save( + output, + ResourceKey.create(Registries.RECIPE, Identifier.fromNamespaceAndPath("houseki", "bauxite_crushing")) + ); + + CrusherRecipeBuilder.create(Ingredient.of(Items.SANDSTONE), Items.SAND, 100) + .chance(0.2) + .auxiliary(Items.CALCITE) + .save( + output, + ResourceKey.create(Registries.RECIPE, Identifier.fromNamespaceAndPath("houseki", "sandstone_crushing")) + ); + + CrusherRecipeBuilder.create(Ingredient.of(ModItems.WOLFRAMITE), ModItems.TUNGSTEN, 250) + .chance(0.5) + .auxiliary(Items.QUARTZ) + .save( + output, + ResourceKey.create(Registries.RECIPE, Identifier.fromNamespaceAndPath("houseki", "wolframite_crushing")) + ); + + // Crushing recipes WITHOUT an auxiliary output + CrusherRecipeBuilder.create(Ingredient.of(Items.COBBLESTONE), Items.GRAVEL, 100) + .save( + output, + ResourceKey.create(Registries.RECIPE, Identifier.fromNamespaceAndPath("houseki", "cobblestone_crushing")) + ); + + CrusherRecipeBuilder.create(Ingredient.of(Items.STONE), Items.GRAVEL, 100) + .save( + output, + ResourceKey.create(Registries.RECIPE, Identifier.fromNamespaceAndPath("houseki", "stone_crushing")) + ); + + CrusherRecipeBuilder.create(Ingredient.of(ModBlocks.PLATINUM_ORE), ModItems.PLATINUM, 250) + .save( + output, + ResourceKey.create(Registries.RECIPE, Identifier.fromNamespaceAndPath("houseki", "platinum_ore_crushing")) + ); + + CrusherRecipeBuilder.create(Ingredient.of(ModBlocks.DEEPSLATE_PLATINUM_ORE), ModItems.PLATINUM, 250) + .save( + output, + ResourceKey.create(Registries.RECIPE, Identifier.fromNamespaceAndPath("houseki", "deepslate_platinum_ore_crushing")) + ); + + CrusherRecipeBuilder.create(Ingredient.of(Items.COPPER_INGOT), ModItems.PLATINUM_NUGGET, 250) + .save( + output, + ResourceKey.create(Registries.RECIPE, Identifier.fromNamespaceAndPath("houseki", "copper_ingot_crushing")) + ); + + CrusherRecipeBuilder.create(Ingredient.of(ModItems.SCHEELITE), ModItems.TUNGSTEN, 250) + .save( + output, + ResourceKey.create(Registries.RECIPE, Identifier.fromNamespaceAndPath("houseki", "scheelite_crushing")) + ); //Smithing Upgrades offerPinkuUpgradeRecipe(output, Items.NETHERITE_HELMET, RecipeCategory.COMBAT, ModItems.PINKU_HELMET); @@ -436,4 +480,4 @@ public void buildRecipes() { public @NonNull String getName() { return "Houseki Recipes"; } -} +} \ No newline at end of file diff --git a/src/main/java/anya/pizza/houseki/datagen/recipebuilder/CrusherRecipeBuilder.java b/src/main/java/anya/pizza/houseki/datagen/recipebuilder/CrusherRecipeBuilder.java index 553f1e5e..0b772697 100644 --- a/src/main/java/anya/pizza/houseki/datagen/recipebuilder/CrusherRecipeBuilder.java +++ b/src/main/java/anya/pizza/houseki/datagen/recipebuilder/CrusherRecipeBuilder.java @@ -5,15 +5,15 @@ import net.minecraft.advancements.Criterion; import net.minecraft.advancements.AdvancementRequirements; import net.minecraft.advancements.criterion.RecipeUnlockedTrigger; +import net.minecraft.core.registries.Registries; import net.minecraft.data.recipes.RecipeBuilder; import net.minecraft.data.recipes.RecipeOutput; import net.minecraft.world.item.Item; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.item.Items; import net.minecraft.world.item.crafting.Ingredient; import net.minecraft.world.item.crafting.Recipe; -import net.minecraft.resources.ResourceKey; import net.minecraft.world.level.ItemLike; +import net.minecraft.resources.Identifier; +import net.minecraft.resources.ResourceKey; import org.jspecify.annotations.NonNull; import org.jspecify.annotations.Nullable; @@ -21,48 +21,144 @@ public class CrusherRecipeBuilder implements RecipeBuilder { private final Ingredient input; - private final ItemStack output; + private final ItemLike output; private final int crushingTime; - private Optional auxiliaryOutput = Optional.empty(); + private Optional auxiliaryOutput = Optional.empty(); private double auxiliaryChance = 1; private final Map> criteria = new LinkedHashMap<>(); @Nullable public String group; - public CrusherRecipeBuilder(Ingredient input, ItemStack output, int crushingTime) { + /** + * Creates a new CrusherRecipeBuilder for building a crusher recipe. + * + * @param input the ingredient(s) consumed by the recipe + * @param output the resulting item produced by the recipe + * @param crushingTime the crushing duration in ticks + */ + public CrusherRecipeBuilder(Ingredient input, ItemLike output, int crushingTime) { this.input = input; this.output = output; this.crushingTime = crushingTime; } - public static CrusherRecipeBuilder create(Ingredient input, ItemStack output, int crushingTime) { + /** + * Create a builder for a crusher recipe. + * + * @param input the ingredient consumed by the recipe + * @param output the item produced by the recipe + * @param crushingTime the crushing duration for the recipe + * @return a CrusherRecipeBuilder configured with the provided input, output, and crushing time + */ + public static CrusherRecipeBuilder create(Ingredient input, ItemLike output, int crushingTime) { return new CrusherRecipeBuilder(input, output, crushingTime); } - public CrusherRecipeBuilder auxiliary(ItemStack stack) { + /** + * Sets an optional auxiliary output item for the crusher recipe. + * + * @param stack the auxiliary output item to produce in addition to the primary output + * @return this builder instance + */ + public CrusherRecipeBuilder auxiliary(ItemLike stack) { this.auxiliaryOutput = Optional.of(stack); return this; } + /** + * Set the probability that the auxiliary output is produced. + * + * @param chance the probability (0.0 to 1.0) that the auxiliary output is produced + * @return the current CrusherRecipeBuilder instance + */ public CrusherRecipeBuilder chance(double chance) { this.auxiliaryChance = chance; return this; } + /** + * Builds an advancement that unlocks the given recipe and exports the constructed + * CrusherRecipe together with that advancement. + * + * The advancement will include a `"has_the_recipe"` criterion for the provided + * recipe key, any additional criteria configured on this builder, and will reward + * the recipe. The built advancement is placed under the `"recipes/"` advancement + * path when exported. + * + * @param exporter target consumer that accepts the recipe and its advancement + * @param recipeKey resource key identifying the recipe to export + */ public void save(RecipeOutput exporter, ResourceKey> recipeKey) { + // 1. Build the advancement + // We use recipeKey.getValue() to get the Identifier (e.g., "modid:item_crushing") + Advancement.Builder advancement = exporter.advancement() + .addCriterion("has_the_recipe", RecipeUnlockedTrigger.unlocked(recipeKey)) + .rewards(net.minecraft.advancements.AdvancementRewards.Builder.recipe(recipeKey)) + .requirements(AdvancementRequirements.Strategy.OR); + + this.criteria.forEach(advancement::addCriterion); + + // 2. Create the recipe record + CrusherRecipe recipe = new CrusherRecipe( + this.input, + this.output.asItem(), + this.crushingTime, + this.auxiliaryOutput.map(ItemLike::asItem), + this.auxiliaryChance + ); + + // 3. Export + exporter.accept( + recipeKey, + recipe, + advancement.build(recipeKey.identifier().withPrefix("recipes/")) + ); + } + + /** + * Builds a CrusherRecipe and its unlocking advancement, then registers them with the provided exporter under the "recipes/..." advancement path. + * + * The method parses the given recipeId into an Identifier and ResourceKey, adds a "has_the_recipe" criterion and any configured criteria to the advancement, + * sets the recipe as the advancement reward, constructs a CrusherRecipe using this builder's input, output, crushing time, optional auxiliary output, and auxiliary chance, + * and finally passes the recipe, its resource key, and the built advancement (placed under "recipes/") to the exporter. + * + * @param exporter the RecipeOutput consumer that receives the recipe ResourceKey, the built CrusherRecipe, and its corresponding Advancement + * @param recipeId the string identifier for the recipe (parsed into an Identifier and used to derive the advancement path) + */ + public void save(RecipeOutput exporter, String recipeId) { + // 1. Convert the String ID into an Identifier and a ResourceKey + Identifier id = Identifier.parse(recipeId); + ResourceKey> recipeKey = ResourceKey.create(Registries.RECIPE, id); + + // 2. Build the Advancement Advancement.Builder advancement = exporter.advancement() .addCriterion("has_the_recipe", RecipeUnlockedTrigger.unlocked(recipeKey)) .rewards(net.minecraft.advancements.AdvancementRewards.Builder.recipe(recipeKey)) .requirements(AdvancementRequirements.Strategy.OR); + this.criteria.forEach(advancement::addCriterion); - // Create an instance of your recipe record - CrusherRecipe recipe = new CrusherRecipe(input, output, crushingTime, auxiliaryOutput, auxiliaryChance); + // 3. Create the Recipe Instance + CrusherRecipe recipe = new CrusherRecipe( + this.input, + this.output.asItem(), + this.crushingTime, + this.auxiliaryOutput.map(ItemLike::asItem), + this.auxiliaryChance + ); - // Export it using the built-in exporter - exporter.accept(recipeKey, recipe, null); + // 4. Export with the prefixed advancement path + // Using id.withPrefix ensures the advancement file is correctly placed in "advancements/recipes/..." + exporter.accept(recipeKey, recipe, advancement.build(id.withPrefix("recipes/"))); } + /** + * Adds an advancement criterion that will be required to unlock the resulting recipe. + * + * @param name a unique identifier for the criterion within the recipe's advancement + * @param criterion the criterion describing the unlocking condition + * @return this builder instance for method chaining + */ @Override public @NonNull RecipeBuilder unlockedBy(@NonNull String name, @NonNull Criterion criterion) { this.criteria.put(name, criterion); @@ -75,12 +171,22 @@ public void save(RecipeOutput exporter, ResourceKey> recipeKey) { return this; } + /** + * Indicates this builder does not supply a default recipe identifier. + * + * @return {@code null} to indicate no default {@code ResourceKey>} is provided. + */ @Override public @Nullable ResourceKey> defaultId() { return null; } + /** + * Gets the Item representation of the configured recipe output. + * + * @return the Item corresponding to the builder's output + */ public Item getResult() { - return output.getItem(); + return output.asItem(); } } \ No newline at end of file diff --git a/src/main/java/anya/pizza/houseki/recipe/CrusherRecipe.java b/src/main/java/anya/pizza/houseki/recipe/CrusherRecipe.java index 23fe6a8d..9411b69e 100644 --- a/src/main/java/anya/pizza/houseki/recipe/CrusherRecipe.java +++ b/src/main/java/anya/pizza/houseki/recipe/CrusherRecipe.java @@ -3,14 +3,24 @@ import com.mojang.serialization.Codec; import com.mojang.serialization.codecs.RecordCodecBuilder; import net.minecraft.core.HolderLookup; +import net.minecraft.core.registries.BuiltInRegistries; +import net.minecraft.core.registries.Registries; +import net.minecraft.network.RegistryFriendlyByteBuf; import net.minecraft.network.codec.ByteBufCodecs; import net.minecraft.network.codec.StreamCodec; +import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.crafting.*; import net.minecraft.world.level.Level; import java.util.Optional; -public record CrusherRecipe(Ingredient inputItem, ItemStack output, int crushingTime, Optional auxiliaryOutput, double auxiliaryChance) implements Recipe { +public record CrusherRecipe( + Ingredient inputItem, + Item output, + int crushingTime, + Optional auxiliaryOutput, + double auxiliaryChance +) implements Recipe { public static final int DEFAULT_CRUSHING_TIME = 200; public static final double DEFAULT_AUXILIARY_CHANCE = 1.0; //1 = 100% @@ -25,24 +35,43 @@ public String toString() { } } + /** + * Create an ItemStack containing the recipe's primary output. + * + * @param registries the registry provider (not used by this implementation) + * @return an ItemStack containing one unit of the recipe's output + */ public ItemStack getResult(HolderLookup.Provider registries) { - return output; + return new ItemStack(this.output); } - //public CrusherRecipe(Ingredient inputItem, ItemStack output, int crushingTime) { - // this(inputItem, output, crushingTime, Optional.empty(), DEFAULT_AUXILIARY_CHANCE); - //} - + /** + * Determines whether this recipe matches the provided crusher input. + * + * @param input the crusher input whose first slot will be tested against the recipe's ingredient + * @param level the current level/world context + * @return true if the recipe's input ingredient matches the item in the first slot of {@code input}, false otherwise + */ @Override public boolean matches(CrusherRecipeInput input, Level level) { return this.inputItem.test(input.getItem(0)); } + /** + * Create an ItemStack representing this recipe's primary output. + * + * @return an ItemStack containing the recipe's output item with a count of 1 + */ @Override public ItemStack assemble(CrusherRecipeInput input) { - return this.output.copy(); + return new ItemStack(this.output); } + /** + * Indicates whether using this recipe triggers a player notification. + * + * @return true if a notification should be shown when the recipe is used, false otherwise. + */ @Override public boolean showNotification() { return true; @@ -59,27 +88,36 @@ public PlacementInfo placementInfo() { return PlacementInfo.create(this.inputItem); } + /** + * Specifies the recipe book category for this recipe. + * + * @return the RecipeBookCategory under which this recipe appears (RecipeBookCategories.CRAFTING_MISC) + */ @Override public RecipeBookCategory recipeBookCategory() { // Use a standard category or your own return RecipeBookCategories.CRAFTING_MISC; } - public static RecipeSerializer SERIALIZER = new RecipeSerializer<>( + public static final RecipeSerializer SERIALIZER = new RecipeSerializer<>( RecordCodecBuilder.mapCodec(inst -> inst.group( - Ingredient.CODEC.fieldOf("ingredient").forGetter(CrusherRecipe::inputItem), - ItemStack.CODEC.fieldOf("result").forGetter(CrusherRecipe::output), - Codec.INT.optionalFieldOf("crushingTime", DEFAULT_CRUSHING_TIME).forGetter(CrusherRecipe::crushingTime), - ItemStack.CODEC.optionalFieldOf("auxiliary_result").forGetter(CrusherRecipe::auxiliaryOutput), - Codec.DOUBLE.optionalFieldOf("auxiliary_chance", DEFAULT_AUXILIARY_CHANCE).forGetter(CrusherRecipe::auxiliaryChance) + Ingredient.CODEC.fieldOf("ingredient").forGetter(CrusherRecipe::inputItem), + // Use the standard Item registry codec here + BuiltInRegistries.ITEM.byNameCodec().fieldOf("result").forGetter(CrusherRecipe::output), + Codec.INT.optionalFieldOf("crushingTime", DEFAULT_CRUSHING_TIME).forGetter(CrusherRecipe::crushingTime), + // Use the same item codec for the optional auxiliary result + BuiltInRegistries.ITEM.byNameCodec().optionalFieldOf("auxiliary_result").forGetter(CrusherRecipe::auxiliaryOutput), + Codec.DOUBLE.optionalFieldOf("auxiliary_chance", DEFAULT_AUXILIARY_CHANCE).forGetter(CrusherRecipe::auxiliaryChance) ).apply(inst, CrusherRecipe::new)), + StreamCodec.composite( - Ingredient.CONTENTS_STREAM_CODEC, CrusherRecipe::inputItem, - ItemStack.STREAM_CODEC, CrusherRecipe::output, - ByteBufCodecs.VAR_INT, CrusherRecipe::crushingTime, - ByteBufCodecs.optional(ItemStack.STREAM_CODEC), CrusherRecipe::auxiliaryOutput, - ByteBufCodecs.DOUBLE, CrusherRecipe::auxiliaryChance, - CrusherRecipe::new + Ingredient.CONTENTS_STREAM_CODEC, CrusherRecipe::inputItem, + // Use Item reference for network + ByteBufCodecs.registry(Registries.ITEM), CrusherRecipe::output, + ByteBufCodecs.VAR_INT.cast(), CrusherRecipe::crushingTime, + ByteBufCodecs.optional(ByteBufCodecs.registry(Registries.ITEM)), CrusherRecipe::auxiliaryOutput, + ByteBufCodecs.DOUBLE.cast(), CrusherRecipe::auxiliaryChance, + CrusherRecipe::new ) ); @@ -88,35 +126,13 @@ public RecipeSerializer> getSerializer() { return SERIALIZER; } + /** + * Identifies the recipe type for crusher recipes. + * + * @return the RecipeType instance that identifies crusher recipes + */ @Override public RecipeType> getType() { return ModTypes.CRUSHER_TYPE; } - - /*public static class Serializer implements RecipeSerializer { - public static final Serializer INSTANCE = new Serializer(); - - private static final MapCodec CODEC = RecordCodecBuilder.mapCodec(inst -> inst.group( - Ingredient.CODEC.fieldOf("ingredient").forGetter(CrusherRecipe::inputItem), - ItemStack.CODEC.fieldOf("result").forGetter(CrusherRecipe::output), - Codec.INT.optionalFieldOf("crushing_time", 200).forGetter(CrusherRecipe::crushingTime), - ItemStack.CODEC.optionalFieldOf("auxiliary_result").forGetter(CrusherRecipe::auxiliaryOutput), - Codec.DOUBLE.optionalFieldOf("auxiliary_chance", 1.0).forGetter(CrusherRecipe::auxiliaryChance) - ).apply(inst, CrusherRecipe::new)); - - private static final StreamCodec STREAM_CODEC = StreamCodec.composite( - Ingredient.CONTENTS_STREAM_CODEC, CrusherRecipe::inputItem, - ItemStack.STREAM_CODEC, CrusherRecipe::output, - ByteBufCodecs.VAR_INT, CrusherRecipe::crushingTime, - ByteBufCodecs.optional(ItemStack.STREAM_CODEC), CrusherRecipe::auxiliaryOutput, - ByteBufCodecs.DOUBLE, CrusherRecipe::auxiliaryChance, - CrusherRecipe::new - ); - - @Override - public MapCodec codec() { return CODEC; } - - @Override - public StreamCodec streamCodec() { return STREAM_CODEC; } - }*/ } \ No newline at end of file diff --git a/src/main/java/anya/pizza/houseki/util/ModGenRecipes.java b/src/main/java/anya/pizza/houseki/util/ModGenRecipes.java index daf781ba..dc2c603c 100644 --- a/src/main/java/anya/pizza/houseki/util/ModGenRecipes.java +++ b/src/main/java/anya/pizza/houseki/util/ModGenRecipes.java @@ -3,12 +3,10 @@ import anya.pizza.houseki.block.ModBlocks; import anya.pizza.houseki.item.ModItems; import net.minecraft.advancements.criterion.InventoryChangeTrigger; -import net.minecraft.advancements.criterion.ItemPredicate; import net.minecraft.data.recipes.RecipeOutput; import net.minecraft.data.recipes.ShapedRecipeBuilder; import net.minecraft.data.recipes.SmithingTransformRecipeBuilder; import net.minecraft.world.item.Item; -import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.ItemLike; import net.minecraft.world.item.Items; import net.minecraft.world.item.crafting.Ingredient; diff --git a/src/main/java/anya/pizza/houseki/util/ModLootTableModifiers.java b/src/main/java/anya/pizza/houseki/util/ModLootTableModifiers.java index c560caa4..73a8815c 100644 --- a/src/main/java/anya/pizza/houseki/util/ModLootTableModifiers.java +++ b/src/main/java/anya/pizza/houseki/util/ModLootTableModifiers.java @@ -7,7 +7,6 @@ import net.minecraft.world.level.storage.loot.LootPool; import net.minecraft.world.level.storage.loot.predicates.LootItemRandomChanceCondition; import net.minecraft.world.level.storage.loot.entries.LootItem; -import net.minecraft.world.level.storage.loot.functions.EnchantWithLevelsFunction; import net.minecraft.world.level.storage.loot.functions.SetItemCountFunction; import net.minecraft.world.level.storage.loot.functions.SetItemDamageFunction; import net.minecraft.world.level.storage.loot.providers.number.ConstantValue; diff --git a/src/main/java/anya/pizza/houseki/world/ModPlacedFeatures.java b/src/main/java/anya/pizza/houseki/world/ModPlacedFeatures.java index a9c0c494..c239f0f4 100644 --- a/src/main/java/anya/pizza/houseki/world/ModPlacedFeatures.java +++ b/src/main/java/anya/pizza/houseki/world/ModPlacedFeatures.java @@ -8,8 +8,6 @@ import net.minecraft.resources.Identifier; import net.minecraft.world.level.levelgen.VerticalAnchor; import net.minecraft.world.level.levelgen.feature.ConfiguredFeature; -import net.minecraft.world.level.levelgen.feature.Feature; -import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration; import net.minecraft.world.level.levelgen.placement.PlacedFeature; import net.minecraft.world.level.levelgen.placement.HeightRangePlacement; import net.minecraft.world.level.levelgen.placement.PlacementModifier;