diff --git a/.gitignore b/.gitignore index c6038dfd..c9f766f8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ build/ +src/generated/resources/.cache/ gradle/ run/ libs/ @@ -8,14 +9,11 @@ libs/ *.jar *.class *~ -.*.swp .classpath gradlew -build.number gradlew.bat +build.number bin/ .gradle/ -/bin/ -.project .idea/ -src/generated/resources/.cache/cache +.project diff --git a/README.md b/README.md index 62291f6c..4e0bdaa2 100644 --- a/README.md +++ b/README.md @@ -10,6 +10,11 @@ Forge mods. I hope I did a good job with it. TO DO ----- +* Add language entries for brick slabs. +* Investigate doors, they aren't behaving correctly for metal doors. +* [1.17.1] add missing raw metal textures. +* [1.17.1] add datagen recipes for raw_metal_blocks & smelting/blasting raw_metal. +* [1.17.1] add datagen storage block tags for raw_metal blocks. * update/move wiki * Decide if we really need more detailed configs than that. * Add shears for all metals. diff --git a/build.gradle b/build.gradle index ab262faf..6d7350dd 100644 --- a/build.gradle +++ b/build.gradle @@ -4,7 +4,7 @@ buildscript { mavenCentral() } dependencies { - classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '4.1.+', changing: true + classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.1.+', changing: true } } apply plugin: 'net.minecraftforge.gradle' @@ -21,25 +21,16 @@ def getVersionAppendage() { return "DEV-" + proc.text.trim() } -version = "${version_minecraft}-${version_mod}." + getVersionAppendage() +version = "${version_minecraft}-${version_mod}." + getVersionAppendage() + '-final' group = 'mod.alexndr.netherrocks' archivesBaseName = 'netherrocks' -java.toolchain.languageVersion = JavaLanguageVersion.of(8) // Mojang ships Java 8 to end users, so your mod should target Java 8. +java.toolchain.languageVersion = JavaLanguageVersion.of(16) println('Java: ' + System.getProperty('java.version') + ' JVM: ' + System.getProperty('java.vm.version') + '(' + System.getProperty('java.vendor') + ') Arch: ' + System.getProperty('os.arch')) minecraft { // The mappings can be changed at any time, and must be in the following format. - // Channel: Version: - // snapshot YYYYMMDD Snapshot are built nightly. - // stable # Stables are built at the discretion of the MCP team. - // official MCVersion Official field/method names from Mojang mapping files - // - // You must be aware of the Mojang license when using the 'official' mappings. - // See more information here: https://github.com/MinecraftForge/MCPConfig/blob/master/Mojang.md - // - // Use non-default mappings at your own risk. they may not always work. // Simply re-run your setup task after changing the mappings to update your workspace. // mappings channel: 'snapshot', version: "${version_snapshot}" mappings channel: 'official', version: "${version_minecraft}" @@ -146,17 +137,20 @@ repositories { // Include resources generated by data generators. sourceSets.main.resources { srcDir 'src/generated/resources' } +// sourceSets.main.java { +// exclude 'mod/alexndr/netherrocks/client/jei/**' +// } + dependencies { // Specify the version of Minecraft to use, If this is any group other then 'net.minecraft' it is assumed // that the dep is a ForgeGradle 'patcher' dependency. And it's patches will be applied. // The userdev artifact is a special name and will get all sorts of transformations applied to it. minecraft "net.minecraftforge:forge:${version_forge}" - compile fg.deobf("simplecore-api:SimpleCoreLib:${simplecorelib_version}") + implementation fg.deobf("simplecore-api:SimpleCoreLib:${simplecorelib_version}") // compile against the JEI API but do not include it at runtime compileOnly fg.deobf("mezz.jei:jei-${version_mcjei}:${jei_version}:api") // at runtime, use the full JEI jar runtimeOnly fg.deobf("mezz.jei:jei-${version_mcjei}:${jei_version}") - } // Example for how to get properties into the manifest for reading by the runtime.. diff --git a/gradle.properties b/gradle.properties index e6161464..a68dc53f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,15 +2,15 @@ # This is required to provide enough memory for the Minecraft decompilation process. org.gradle.jvmargs=-Xmx3G org.gradle.daemon=false -org.gradle.java.home=/usr/lib/jvm/java-1.8.0-openjdk-amd64 +org.gradle.java.home=/usr/lib/jvm/adoptopenjdk-16-hotspot-amd64 # general -version_minecraft = 1.16.5 -#version_snapshot = 20201028-1.16.3 -version_forge = 1.16.5-36.2.2 +version_minecraft = 1.17.1 +version_forge = 1.17.1-37.1.1 # Simple Ores: Netherrocks -version_mod = 2.3.6 -simplecorelib_version = 1.16.5-2.0.8.22 -version_mcjei = 1.16.5 -jei_version = 7.6.4.90 +version_mod = 3.0.0 +simplecorelib_version = 1.17.1-3.0.5.3-final +simpleores_version = 1.17.1-3.0.1.6-final +version_mcjei = 1.17.1 +jei_version = 8.3.0.45 diff --git a/scripts/generate_jsons.sh b/scripts/generate_jsons.sh new file mode 100755 index 00000000..3c2b7b89 --- /dev/null +++ b/scripts/generate_jsons.sh @@ -0,0 +1,57 @@ +#!/bin/bash + +# scripts are from mod_utils project on my GitHub. + +ID='netherrocks' +NAME='Netherrocks' +TOPDIR=`pwd` +PROJNAME=`basename $TOPDIR` +if [ $PROJNAME != $NAME ]; then + echo "Running in wrong directory!" + exit 1 +fi + +# blockstates +TARGETDIR=${TOPDIR}/src/main/resources/assets/${ID}/blockstates +if [ ! -d $TARGETDIR ]; then + mkdir -p $TARGETDIR +fi +cd $TARGETDIR + +# make simple blockstates +gen_blockstate_jsons.py --type=simple raw_fyrite_block +gen_blockstate_jsons.py --type=simple raw_illumenite_block +gen_blockstate_jsons.py --type=simple raw_argonite_block +gen_blockstate_jsons.py --type=simple raw_malachite_block +gen_blockstate_jsons.py --type=slab argonite_brick_slab +gen_blockstate_jsons.py --type=slab ashstone_brick_slab +gen_blockstate_jsons.py --type=slab dragonstone_brick_slab +gen_blockstate_jsons.py --type=slab fyrite_brick_slab +gen_blockstate_jsons.py --type=slab illumenite_brick_slab +gen_blockstate_jsons.py --type=slab malachite_brick_slab + +# models +TARGETDIR=${TOPDIR}/src/main/resources/assets/${ID}/models +if [ ! -d $TARGETDIR ]; then + mkdir -p $TARGETDIR +fi +cd $TARGETDIR + +# block models +gen_model_jsons.py --type=block raw_fyrite_block +gen_model_jsons.py --type=block raw_illumenite_block +gen_model_jsons.py --type=block raw_argonite_block +gen_model_jsons.py --type=block raw_malachite_block +gen_model_jsons.py --type=slab argonite_brick_slab +gen_model_jsons.py --type=slab ashstone_brick_slab +gen_model_jsons.py --type=slab dragonstone_brick_slab +gen_model_jsons.py --type=slab fyrite_brick_slab +gen_model_jsons.py --type=slab illumenite_brick_slab +gen_model_jsons.py --type=slab malachite_brick_slab + +#inventory items +gen_model_jsons.py --type=inventory --item_only raw_fyrite +gen_model_jsons.py --type=inventory --item_only raw_illumenite +gen_model_jsons.py --type=inventory --item_only raw_argonite +gen_model_jsons.py --type=inventory --item_only raw_malachite + diff --git a/src/main/resources/data/forge/tags/items/storage_blocks.json b/src/generated/resources/data/forge/tags/blocks/storage_blocks.json similarity index 53% rename from src/main/resources/data/forge/tags/items/storage_blocks.json rename to src/generated/resources/data/forge/tags/blocks/storage_blocks.json index b8d8212e..4f7198e7 100644 --- a/src/main/resources/data/forge/tags/items/storage_blocks.json +++ b/src/generated/resources/data/forge/tags/blocks/storage_blocks.json @@ -2,10 +2,14 @@ "replace": false, "values": [ "#forge:storage_blocks/malachite", + "#forge:storage_blocks/fyrite", + "#forge:storage_blocks/argonite", "#forge:storage_blocks/ashstone", "#forge:storage_blocks/dragonstone", - "#forge:storage_blocks/argonite", "#forge:storage_blocks/illumenite", - "#forge:storage_blocks/fyrite" + "#forge:storage_blocks/raw_malachite", + "#forge:storage_blocks/raw_fyrite", + "#forge:storage_blocks/raw_argonite", + "#forge:storage_blocks/raw_illumenite" ] -} +} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/blocks/storage_blocks/argonite.json b/src/generated/resources/data/forge/tags/blocks/storage_blocks/argonite.json similarity index 100% rename from src/main/resources/data/forge/tags/blocks/storage_blocks/argonite.json rename to src/generated/resources/data/forge/tags/blocks/storage_blocks/argonite.json diff --git a/src/main/resources/data/forge/tags/blocks/storage_blocks/ashstone.json b/src/generated/resources/data/forge/tags/blocks/storage_blocks/ashstone.json similarity index 100% rename from src/main/resources/data/forge/tags/blocks/storage_blocks/ashstone.json rename to src/generated/resources/data/forge/tags/blocks/storage_blocks/ashstone.json diff --git a/src/main/resources/data/forge/tags/blocks/storage_blocks/dragonstone.json b/src/generated/resources/data/forge/tags/blocks/storage_blocks/dragonstone.json similarity index 100% rename from src/main/resources/data/forge/tags/blocks/storage_blocks/dragonstone.json rename to src/generated/resources/data/forge/tags/blocks/storage_blocks/dragonstone.json diff --git a/src/main/resources/data/forge/tags/blocks/storage_blocks/fyrite.json b/src/generated/resources/data/forge/tags/blocks/storage_blocks/fyrite.json similarity index 100% rename from src/main/resources/data/forge/tags/blocks/storage_blocks/fyrite.json rename to src/generated/resources/data/forge/tags/blocks/storage_blocks/fyrite.json diff --git a/src/main/resources/data/forge/tags/blocks/storage_blocks/illumenite.json b/src/generated/resources/data/forge/tags/blocks/storage_blocks/illumenite.json similarity index 100% rename from src/main/resources/data/forge/tags/blocks/storage_blocks/illumenite.json rename to src/generated/resources/data/forge/tags/blocks/storage_blocks/illumenite.json diff --git a/src/main/resources/data/forge/tags/blocks/storage_blocks/malachite.json b/src/generated/resources/data/forge/tags/blocks/storage_blocks/malachite.json similarity index 100% rename from src/main/resources/data/forge/tags/blocks/storage_blocks/malachite.json rename to src/generated/resources/data/forge/tags/blocks/storage_blocks/malachite.json diff --git a/src/main/resources/data/forge/tags/items/storage_blocks/ashstone.json b/src/generated/resources/data/forge/tags/blocks/storage_blocks/raw_argonite.json similarity index 52% rename from src/main/resources/data/forge/tags/items/storage_blocks/ashstone.json rename to src/generated/resources/data/forge/tags/blocks/storage_blocks/raw_argonite.json index 3cee27f9..d1186866 100644 --- a/src/main/resources/data/forge/tags/items/storage_blocks/ashstone.json +++ b/src/generated/resources/data/forge/tags/blocks/storage_blocks/raw_argonite.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "netherrocks:ashstone_block" + "netherrocks:raw_argonite_block" ] } \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/items/storage_blocks/argonite.json b/src/generated/resources/data/forge/tags/blocks/storage_blocks/raw_fyrite.json similarity index 53% rename from src/main/resources/data/forge/tags/items/storage_blocks/argonite.json rename to src/generated/resources/data/forge/tags/blocks/storage_blocks/raw_fyrite.json index 32b06610..132029cf 100644 --- a/src/main/resources/data/forge/tags/items/storage_blocks/argonite.json +++ b/src/generated/resources/data/forge/tags/blocks/storage_blocks/raw_fyrite.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "netherrocks:argonite_block" + "netherrocks:raw_fyrite_block" ] } \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/items/storage_blocks/fyrite.json b/src/generated/resources/data/forge/tags/blocks/storage_blocks/raw_illumenite.json similarity index 51% rename from src/main/resources/data/forge/tags/items/storage_blocks/fyrite.json rename to src/generated/resources/data/forge/tags/blocks/storage_blocks/raw_illumenite.json index 9b6f9914..9d1477ac 100644 --- a/src/main/resources/data/forge/tags/items/storage_blocks/fyrite.json +++ b/src/generated/resources/data/forge/tags/blocks/storage_blocks/raw_illumenite.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "netherrocks:fyrite_block" + "netherrocks:raw_illumenite_block" ] } \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/items/storage_blocks/dragonstone.json b/src/generated/resources/data/forge/tags/blocks/storage_blocks/raw_malachite.json similarity index 51% rename from src/main/resources/data/forge/tags/items/storage_blocks/dragonstone.json rename to src/generated/resources/data/forge/tags/blocks/storage_blocks/raw_malachite.json index 5902ff1b..33b13b67 100644 --- a/src/main/resources/data/forge/tags/items/storage_blocks/dragonstone.json +++ b/src/generated/resources/data/forge/tags/blocks/storage_blocks/raw_malachite.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "netherrocks:dragonstone_block" + "netherrocks:raw_malachite_block" ] } \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/blocks/beacon_base_blocks.json b/src/generated/resources/data/minecraft/tags/blocks/beacon_base_blocks.json new file mode 100644 index 00000000..a1ef691f --- /dev/null +++ b/src/generated/resources/data/minecraft/tags/blocks/beacon_base_blocks.json @@ -0,0 +1,9 @@ +{ + "replace": false, + "values": [ + "netherrocks:argonite_block", + "netherrocks:fyrite_block", + "netherrocks:illumenite_block", + "netherrocks:malachite_block" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/blocks/doors.json b/src/generated/resources/data/minecraft/tags/blocks/doors.json new file mode 100644 index 00000000..9a780219 --- /dev/null +++ b/src/generated/resources/data/minecraft/tags/blocks/doors.json @@ -0,0 +1,11 @@ +{ + "replace": false, + "values": [ + "netherrocks:argonite_door", + "netherrocks:ashstone_door", + "netherrocks:dragonstone_door", + "netherrocks:fyrite_door", + "netherrocks:illumenite_door", + "netherrocks:malachite_door" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json b/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json new file mode 100644 index 00000000..15a78ba9 --- /dev/null +++ b/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json @@ -0,0 +1,54 @@ +{ + "replace": false, + "values": [ + "netherrocks:argonite_block", + "netherrocks:argonite_ore", + "netherrocks:argonite_bars", + "netherrocks:argonite_brick_slab", + "netherrocks:argonite_brick_stairs", + "netherrocks:argonite_bricks", + "netherrocks:argonite_door", + "netherrocks:ashstone_block", + "netherrocks:ashstone_ore", + "netherrocks:ashstone_bars", + "netherrocks:ashstone_brick_slab", + "netherrocks:ashstone_brick_stairs", + "netherrocks:ashstone_bricks", + "netherrocks:ashstone_door", + "netherrocks:dragonstone_ore", + "netherrocks:dragonstone_block", + "netherrocks:dragonstone_bars", + "netherrocks:dragonstone_brick_slab", + "netherrocks:dragonstone_brick_stairs", + "netherrocks:dragonstone_bricks", + "netherrocks:dragonstone_door", + "netherrocks:fyrite_block", + "netherrocks:fyrite_ore", + "netherrocks:fyrite_bars", + "netherrocks:fyrite_brick_slab", + "netherrocks:fyrite_brick_stairs", + "netherrocks:fyrite_bricks", + "netherrocks:fyrite_door", + "netherrocks:illumenite_block", + "netherrocks:illumenite_ore", + "netherrocks:illumenite_bars", + "netherrocks:illumenite_brick_slab", + "netherrocks:illumenite_brick_stairs", + "netherrocks:illumenite_bricks", + "netherrocks:illumenite_door", + "netherrocks:malachite_block", + "netherrocks:malachite_ore", + "netherrocks:malachite_bars", + "netherrocks:malachite_brick_slab", + "netherrocks:malachite_brick_stairs", + "netherrocks:malachite_bricks", + "netherrocks:malachite_door", + "netherrocks:raw_argonite_block", + "netherrocks:raw_fyrite_block", + "netherrocks:raw_illumenite_block", + "netherrocks:raw_malachite_block", + "netherrocks:nether_blast_furnace", + "netherrocks:nether_furnace", + "netherrocks:nether_smoker" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/blocks/needs_diamond_tool.json b/src/generated/resources/data/minecraft/tags/blocks/needs_diamond_tool.json new file mode 100644 index 00000000..e2a0dd50 --- /dev/null +++ b/src/generated/resources/data/minecraft/tags/blocks/needs_diamond_tool.json @@ -0,0 +1,27 @@ +{ + "replace": false, + "values": [ + "netherrocks:argonite_block", + "netherrocks:argonite_ore", + "netherrocks:argonite_bars", + "netherrocks:argonite_brick_slab", + "netherrocks:argonite_brick_stairs", + "netherrocks:argonite_bricks", + "netherrocks:argonite_door", + "netherrocks:ashstone_block", + "netherrocks:ashstone_ore", + "netherrocks:ashstone_bars", + "netherrocks:ashstone_brick_slab", + "netherrocks:ashstone_brick_stairs", + "netherrocks:ashstone_bricks", + "netherrocks:ashstone_door", + "netherrocks:dragonstone_block", + "netherrocks:dragonstone_ore", + "netherrocks:dragonstone_bars", + "netherrocks:dragonstone_brick_slab", + "netherrocks:dragonstone_brick_stairs", + "netherrocks:dragonstone_bricks", + "netherrocks:dragonstone_door", + "netherrocks:raw_argonite_block" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/blocks/needs_iron_tool.json b/src/generated/resources/data/minecraft/tags/blocks/needs_iron_tool.json new file mode 100644 index 00000000..84057069 --- /dev/null +++ b/src/generated/resources/data/minecraft/tags/blocks/needs_iron_tool.json @@ -0,0 +1,29 @@ +{ + "replace": false, + "values": [ + "netherrocks:fyrite_block", + "netherrocks:fyrite_ore", + "netherrocks:fyrite_bars", + "netherrocks:fyrite_brick_slab", + "netherrocks:fyrite_brick_stairs", + "netherrocks:fyrite_bricks", + "netherrocks:fyrite_door", + "netherrocks:illumenite_block", + "netherrocks:illumenite_ore", + "netherrocks:illumenite_bars", + "netherrocks:illumenite_brick_slab", + "netherrocks:illumenite_brick_stairs", + "netherrocks:illumenite_bricks", + "netherrocks:illumenite_door", + "netherrocks:malachite_block", + "netherrocks:malachite_ore", + "netherrocks:malachite_bars", + "netherrocks:malachite_brick_slab", + "netherrocks:malachite_brick_stairs", + "netherrocks:malachite_bricks", + "netherrocks:malachite_door", + "netherrocks:raw_fyrite_block", + "netherrocks:raw_illumenite_block", + "netherrocks:raw_malachite_block" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/blocks/slabs.json b/src/generated/resources/data/minecraft/tags/blocks/slabs.json new file mode 100644 index 00000000..c63a807a --- /dev/null +++ b/src/generated/resources/data/minecraft/tags/blocks/slabs.json @@ -0,0 +1,11 @@ +{ + "replace": false, + "values": [ + "netherrocks:argonite_brick_slab", + "netherrocks:ashstone_brick_slab", + "netherrocks:dragonstone_brick_slab", + "netherrocks:fyrite_brick_slab", + "netherrocks:illumenite_brick_slab", + "netherrocks:malachite_brick_slab" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/blocks/stairs.json b/src/generated/resources/data/minecraft/tags/blocks/stairs.json new file mode 100644 index 00000000..efad8668 --- /dev/null +++ b/src/generated/resources/data/minecraft/tags/blocks/stairs.json @@ -0,0 +1,11 @@ +{ + "replace": false, + "values": [ + "netherrocks:argonite_brick_stairs", + "netherrocks:ashstone_brick_stairs", + "netherrocks:dragonstone_brick_stairs", + "netherrocks:fyrite_brick_stairs", + "netherrocks:illumenite_brick_stairs", + "netherrocks:malachite_brick_stairs" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/items/doors.json b/src/generated/resources/data/minecraft/tags/items/doors.json new file mode 100644 index 00000000..9a780219 --- /dev/null +++ b/src/generated/resources/data/minecraft/tags/items/doors.json @@ -0,0 +1,11 @@ +{ + "replace": false, + "values": [ + "netherrocks:argonite_door", + "netherrocks:ashstone_door", + "netherrocks:dragonstone_door", + "netherrocks:fyrite_door", + "netherrocks:illumenite_door", + "netherrocks:malachite_door" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/items/slabs.json b/src/generated/resources/data/minecraft/tags/items/slabs.json new file mode 100644 index 00000000..c63a807a --- /dev/null +++ b/src/generated/resources/data/minecraft/tags/items/slabs.json @@ -0,0 +1,11 @@ +{ + "replace": false, + "values": [ + "netherrocks:argonite_brick_slab", + "netherrocks:ashstone_brick_slab", + "netherrocks:dragonstone_brick_slab", + "netherrocks:fyrite_brick_slab", + "netherrocks:illumenite_brick_slab", + "netherrocks:malachite_brick_slab" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/items/stairs.json b/src/generated/resources/data/minecraft/tags/items/stairs.json new file mode 100644 index 00000000..efad8668 --- /dev/null +++ b/src/generated/resources/data/minecraft/tags/items/stairs.json @@ -0,0 +1,11 @@ +{ + "replace": false, + "values": [ + "netherrocks:argonite_brick_stairs", + "netherrocks:ashstone_brick_stairs", + "netherrocks:dragonstone_brick_stairs", + "netherrocks:fyrite_brick_stairs", + "netherrocks:illumenite_brick_stairs", + "netherrocks:malachite_brick_stairs" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/argonite_bars.json b/src/generated/resources/data/netherrocks/advancements/argonite_bars.json new file mode 100644 index 00000000..0ca9ed9e --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/argonite_bars.json @@ -0,0 +1,39 @@ +{ + "advancements": [ + { + "conditions": [ + { + "flag": "aesthetics_enabled", + "type": "netherrocks:flag" + } + ], + "advancement": { + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:argonite_bars" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:argonite_ingot" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_item" + ] + ] + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/argonite_brick_slab.json b/src/generated/resources/data/netherrocks/advancements/argonite_brick_slab.json new file mode 100644 index 00000000..aefd0bf8 --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/argonite_brick_slab.json @@ -0,0 +1,39 @@ +{ + "advancements": [ + { + "conditions": [ + { + "flag": "aesthetics_enabled", + "type": "netherrocks:flag" + } + ], + "advancement": { + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:argonite_brick_slab" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:argonite_ingot" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_item" + ] + ] + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/argonite_brick_stairs.json b/src/generated/resources/data/netherrocks/advancements/argonite_brick_stairs.json new file mode 100644 index 00000000..56204be5 --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/argonite_brick_stairs.json @@ -0,0 +1,39 @@ +{ + "advancements": [ + { + "conditions": [ + { + "flag": "aesthetics_enabled", + "type": "netherrocks:flag" + } + ], + "advancement": { + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:argonite_brick_stairs" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:argonite_ingot" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_item" + ] + ] + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/argonite_bricks.json b/src/generated/resources/data/netherrocks/advancements/argonite_bricks.json new file mode 100644 index 00000000..0113e3c5 --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/argonite_bricks.json @@ -0,0 +1,39 @@ +{ + "advancements": [ + { + "conditions": [ + { + "flag": "aesthetics_enabled", + "type": "netherrocks:flag" + } + ], + "advancement": { + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:argonite_bricks" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:argonite_ingot" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_item" + ] + ] + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/argonite_door.json b/src/generated/resources/data/netherrocks/advancements/argonite_door.json new file mode 100644 index 00000000..31a5cc29 --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/argonite_door.json @@ -0,0 +1,39 @@ +{ + "advancements": [ + { + "conditions": [ + { + "flag": "aesthetics_enabled", + "type": "netherrocks:flag" + } + ], + "advancement": { + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:argonite_door" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:argonite_ingot" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_item" + ] + ] + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/ashstone_bars.json b/src/generated/resources/data/netherrocks/advancements/ashstone_bars.json new file mode 100644 index 00000000..e5164368 --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/ashstone_bars.json @@ -0,0 +1,39 @@ +{ + "advancements": [ + { + "conditions": [ + { + "flag": "aesthetics_enabled", + "type": "netherrocks:flag" + } + ], + "advancement": { + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:ashstone_bars" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:ashstone_gem" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_item" + ] + ] + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/ashstone_brick_slab.json b/src/generated/resources/data/netherrocks/advancements/ashstone_brick_slab.json new file mode 100644 index 00000000..56be1a08 --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/ashstone_brick_slab.json @@ -0,0 +1,39 @@ +{ + "advancements": [ + { + "conditions": [ + { + "flag": "aesthetics_enabled", + "type": "netherrocks:flag" + } + ], + "advancement": { + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:ashstone_brick_slab" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:ashstone_gem" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_item" + ] + ] + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/ashstone_brick_stairs.json b/src/generated/resources/data/netherrocks/advancements/ashstone_brick_stairs.json new file mode 100644 index 00000000..5e27ccde --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/ashstone_brick_stairs.json @@ -0,0 +1,39 @@ +{ + "advancements": [ + { + "conditions": [ + { + "flag": "aesthetics_enabled", + "type": "netherrocks:flag" + } + ], + "advancement": { + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:ashstone_brick_stairs" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:ashstone_gem" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_item" + ] + ] + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/ashstone_bricks.json b/src/generated/resources/data/netherrocks/advancements/ashstone_bricks.json new file mode 100644 index 00000000..79e49581 --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/ashstone_bricks.json @@ -0,0 +1,39 @@ +{ + "advancements": [ + { + "conditions": [ + { + "flag": "aesthetics_enabled", + "type": "netherrocks:flag" + } + ], + "advancement": { + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:ashstone_bricks" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:ashstone_gem" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_item" + ] + ] + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/ashstone_door.json b/src/generated/resources/data/netherrocks/advancements/ashstone_door.json new file mode 100644 index 00000000..71e7cb19 --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/ashstone_door.json @@ -0,0 +1,39 @@ +{ + "advancements": [ + { + "conditions": [ + { + "flag": "aesthetics_enabled", + "type": "netherrocks:flag" + } + ], + "advancement": { + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:ashstone_door" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:ashstone_gem" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_item" + ] + ] + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/dragonstone_bars.json b/src/generated/resources/data/netherrocks/advancements/dragonstone_bars.json new file mode 100644 index 00000000..d2d8296c --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/dragonstone_bars.json @@ -0,0 +1,39 @@ +{ + "advancements": [ + { + "conditions": [ + { + "flag": "aesthetics_enabled", + "type": "netherrocks:flag" + } + ], + "advancement": { + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:dragonstone_bars" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:dragonstone_gem" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_item" + ] + ] + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/dragonstone_brick_slab.json b/src/generated/resources/data/netherrocks/advancements/dragonstone_brick_slab.json new file mode 100644 index 00000000..9700e8bc --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/dragonstone_brick_slab.json @@ -0,0 +1,39 @@ +{ + "advancements": [ + { + "conditions": [ + { + "flag": "aesthetics_enabled", + "type": "netherrocks:flag" + } + ], + "advancement": { + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:dragonstone_brick_slab" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:dragonstone_gem" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_item" + ] + ] + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/dragonstone_brick_stairs.json b/src/generated/resources/data/netherrocks/advancements/dragonstone_brick_stairs.json new file mode 100644 index 00000000..5f315894 --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/dragonstone_brick_stairs.json @@ -0,0 +1,39 @@ +{ + "advancements": [ + { + "conditions": [ + { + "flag": "aesthetics_enabled", + "type": "netherrocks:flag" + } + ], + "advancement": { + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:dragonstone_brick_stairs" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:dragonstone_gem" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_item" + ] + ] + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/dragonstone_bricks.json b/src/generated/resources/data/netherrocks/advancements/dragonstone_bricks.json new file mode 100644 index 00000000..5bb5ae45 --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/dragonstone_bricks.json @@ -0,0 +1,39 @@ +{ + "advancements": [ + { + "conditions": [ + { + "flag": "aesthetics_enabled", + "type": "netherrocks:flag" + } + ], + "advancement": { + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:dragonstone_bricks" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:dragonstone_gem" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_item" + ] + ] + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/dragonstone_door.json b/src/generated/resources/data/netherrocks/advancements/dragonstone_door.json new file mode 100644 index 00000000..bbc9c804 --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/dragonstone_door.json @@ -0,0 +1,39 @@ +{ + "advancements": [ + { + "conditions": [ + { + "flag": "aesthetics_enabled", + "type": "netherrocks:flag" + } + ], + "advancement": { + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:dragonstone_door" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:dragonstone_gem" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_item" + ] + ] + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/fyrite_bars.json b/src/generated/resources/data/netherrocks/advancements/fyrite_bars.json new file mode 100644 index 00000000..67d05919 --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/fyrite_bars.json @@ -0,0 +1,39 @@ +{ + "advancements": [ + { + "conditions": [ + { + "flag": "aesthetics_enabled", + "type": "netherrocks:flag" + } + ], + "advancement": { + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:fyrite_bars" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:fyrite_ingot" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_item" + ] + ] + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/fyrite_brick_slab.json b/src/generated/resources/data/netherrocks/advancements/fyrite_brick_slab.json new file mode 100644 index 00000000..7d1cfc14 --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/fyrite_brick_slab.json @@ -0,0 +1,39 @@ +{ + "advancements": [ + { + "conditions": [ + { + "flag": "aesthetics_enabled", + "type": "netherrocks:flag" + } + ], + "advancement": { + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:fyrite_brick_slab" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:fyrite_ingot" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_item" + ] + ] + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/fyrite_brick_stairs.json b/src/generated/resources/data/netherrocks/advancements/fyrite_brick_stairs.json new file mode 100644 index 00000000..984b5fc3 --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/fyrite_brick_stairs.json @@ -0,0 +1,39 @@ +{ + "advancements": [ + { + "conditions": [ + { + "flag": "aesthetics_enabled", + "type": "netherrocks:flag" + } + ], + "advancement": { + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:fyrite_brick_stairs" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:fyrite_ingot" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_item" + ] + ] + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/fyrite_bricks.json b/src/generated/resources/data/netherrocks/advancements/fyrite_bricks.json new file mode 100644 index 00000000..709f450e --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/fyrite_bricks.json @@ -0,0 +1,39 @@ +{ + "advancements": [ + { + "conditions": [ + { + "flag": "aesthetics_enabled", + "type": "netherrocks:flag" + } + ], + "advancement": { + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:fyrite_bricks" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:fyrite_ingot" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_item" + ] + ] + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/fyrite_door.json b/src/generated/resources/data/netherrocks/advancements/fyrite_door.json new file mode 100644 index 00000000..f76b26dd --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/fyrite_door.json @@ -0,0 +1,39 @@ +{ + "advancements": [ + { + "conditions": [ + { + "flag": "aesthetics_enabled", + "type": "netherrocks:flag" + } + ], + "advancement": { + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:fyrite_door" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:fyrite_ingot" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_item" + ] + ] + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/illumenite_bars.json b/src/generated/resources/data/netherrocks/advancements/illumenite_bars.json new file mode 100644 index 00000000..d131db9b --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/illumenite_bars.json @@ -0,0 +1,39 @@ +{ + "advancements": [ + { + "conditions": [ + { + "flag": "aesthetics_enabled", + "type": "netherrocks:flag" + } + ], + "advancement": { + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:illumenite_bars" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:illumenite_ingot" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_item" + ] + ] + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/illumenite_brick_slab.json b/src/generated/resources/data/netherrocks/advancements/illumenite_brick_slab.json new file mode 100644 index 00000000..6580dbd4 --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/illumenite_brick_slab.json @@ -0,0 +1,39 @@ +{ + "advancements": [ + { + "conditions": [ + { + "flag": "aesthetics_enabled", + "type": "netherrocks:flag" + } + ], + "advancement": { + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:illumenite_brick_slab" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:illumenite_ingot" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_item" + ] + ] + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/illumenite_brick_stairs.json b/src/generated/resources/data/netherrocks/advancements/illumenite_brick_stairs.json new file mode 100644 index 00000000..01332fbf --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/illumenite_brick_stairs.json @@ -0,0 +1,39 @@ +{ + "advancements": [ + { + "conditions": [ + { + "flag": "aesthetics_enabled", + "type": "netherrocks:flag" + } + ], + "advancement": { + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:illumenite_brick_stairs" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:illumenite_ingot" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_item" + ] + ] + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/illumenite_bricks.json b/src/generated/resources/data/netherrocks/advancements/illumenite_bricks.json new file mode 100644 index 00000000..e68450ad --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/illumenite_bricks.json @@ -0,0 +1,39 @@ +{ + "advancements": [ + { + "conditions": [ + { + "flag": "aesthetics_enabled", + "type": "netherrocks:flag" + } + ], + "advancement": { + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:illumenite_bricks" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:illumenite_ingot" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_item" + ] + ] + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/illumenite_door.json b/src/generated/resources/data/netherrocks/advancements/illumenite_door.json new file mode 100644 index 00000000..cd28167b --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/illumenite_door.json @@ -0,0 +1,39 @@ +{ + "advancements": [ + { + "conditions": [ + { + "flag": "aesthetics_enabled", + "type": "netherrocks:flag" + } + ], + "advancement": { + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:illumenite_door" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:illumenite_ingot" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_item" + ] + ] + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/malachite_bars.json b/src/generated/resources/data/netherrocks/advancements/malachite_bars.json new file mode 100644 index 00000000..0153f944 --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/malachite_bars.json @@ -0,0 +1,39 @@ +{ + "advancements": [ + { + "conditions": [ + { + "flag": "aesthetics_enabled", + "type": "netherrocks:flag" + } + ], + "advancement": { + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:malachite_bars" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:malachite_ingot" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_item" + ] + ] + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/malachite_brick_slab.json b/src/generated/resources/data/netherrocks/advancements/malachite_brick_slab.json new file mode 100644 index 00000000..4219ae47 --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/malachite_brick_slab.json @@ -0,0 +1,39 @@ +{ + "advancements": [ + { + "conditions": [ + { + "flag": "aesthetics_enabled", + "type": "netherrocks:flag" + } + ], + "advancement": { + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:malachite_brick_slab" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:malachite_ingot" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_item" + ] + ] + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/malachite_brick_stairs.json b/src/generated/resources/data/netherrocks/advancements/malachite_brick_stairs.json new file mode 100644 index 00000000..35f9794f --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/malachite_brick_stairs.json @@ -0,0 +1,39 @@ +{ + "advancements": [ + { + "conditions": [ + { + "flag": "aesthetics_enabled", + "type": "netherrocks:flag" + } + ], + "advancement": { + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:malachite_brick_stairs" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:malachite_ingot" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_item" + ] + ] + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/malachite_bricks.json b/src/generated/resources/data/netherrocks/advancements/malachite_bricks.json new file mode 100644 index 00000000..8ebdbe0e --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/malachite_bricks.json @@ -0,0 +1,39 @@ +{ + "advancements": [ + { + "conditions": [ + { + "flag": "aesthetics_enabled", + "type": "netherrocks:flag" + } + ], + "advancement": { + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:malachite_bricks" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:malachite_ingot" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_item" + ] + ] + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/malachite_door.json b/src/generated/resources/data/netherrocks/advancements/malachite_door.json new file mode 100644 index 00000000..ed6920b3 --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/malachite_door.json @@ -0,0 +1,39 @@ +{ + "advancements": [ + { + "conditions": [ + { + "flag": "aesthetics_enabled", + "type": "netherrocks:flag" + } + ], + "advancement": { + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:malachite_door" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:malachite_ingot" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_item" + ] + ] + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/argonite_axe.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/argonite_axe.json new file mode 100644 index 00000000..dddbb1a7 --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/argonite_axe.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:argonite_axe" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:argonite_ingot" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:argonite_axe" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/argonite_block.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/argonite_block.json new file mode 100644 index 00000000..5e0c4901 --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/argonite_block.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:argonite_block" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:argonite_ingot" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:argonite_block" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/argonite_hoe.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/argonite_hoe.json new file mode 100644 index 00000000..e2da4539 --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/argonite_hoe.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:argonite_hoe" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:argonite_ingot" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:argonite_hoe" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/argonite_ingot.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/argonite_ingot.json new file mode 100644 index 00000000..95b22558 --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/argonite_ingot.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:argonite_ingot" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:argonite_ingot" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:argonite_ingot" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/argonite_ingot_from_blasting.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/argonite_ingot_from_blasting.json new file mode 100644 index 00000000..7763b231 --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/argonite_ingot_from_blasting.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:argonite_ingot_from_blasting" + ] + }, + "criteria": { + "argonite_ingot_from_blasting": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:raw_argonite" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:argonite_ingot_from_blasting" + } + } + }, + "requirements": [ + [ + "argonite_ingot_from_blasting", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/argonite_ingot_from_blasting_from_chunks.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/argonite_ingot_from_blasting_from_chunks.json index b8650f2f..0157b0df 100644 --- a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/argonite_ingot_from_blasting_from_chunks.json +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/argonite_ingot_from_blasting_from_chunks.json @@ -11,7 +11,9 @@ "conditions": { "items": [ { - "item": "netherrocks:crushed_argonite_ore" + "items": [ + "netherrocks:crushed_argonite_ore" + ] } ] } diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/argonite_ingot_from_blasting_from_dust.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/argonite_ingot_from_blasting_from_dust.json index 7808d68a..50ce5b1b 100644 --- a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/argonite_ingot_from_blasting_from_dust.json +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/argonite_ingot_from_blasting_from_dust.json @@ -11,7 +11,9 @@ "conditions": { "items": [ { - "item": "netherrocks:argonite_dust" + "items": [ + "netherrocks:argonite_dust" + ] } ] } diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/argonite_ingot_from_blasting_from_ore.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/argonite_ingot_from_blasting_from_ore.json new file mode 100644 index 00000000..0770024d --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/argonite_ingot_from_blasting_from_ore.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:argonite_ingot_from_blasting_from_ore" + ] + }, + "criteria": { + "argonite_ingot_from_blasting_from_ore": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:argonite_ore" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:argonite_ingot_from_blasting_from_ore" + } + } + }, + "requirements": [ + [ + "argonite_ingot_from_blasting_from_ore", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/argonite_ingot_from_nuggets.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/argonite_ingot_from_nuggets.json new file mode 100644 index 00000000..37134c81 --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/argonite_ingot_from_nuggets.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:argonite_ingot_from_nuggets" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:argonite_ingot" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:argonite_ingot_from_nuggets" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/argonite_ingot_from_smelting.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/argonite_ingot_from_smelting.json new file mode 100644 index 00000000..943995d2 --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/argonite_ingot_from_smelting.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:argonite_ingot_from_smelting" + ] + }, + "criteria": { + "argonite_ingot_from_smelting": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:raw_argonite" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:argonite_ingot_from_smelting" + } + } + }, + "requirements": [ + [ + "argonite_ingot_from_smelting", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/argonite_ingot_from_smelting_from_chunks.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/argonite_ingot_from_smelting_from_chunks.json index b63e0cd3..92036729 100644 --- a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/argonite_ingot_from_smelting_from_chunks.json +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/argonite_ingot_from_smelting_from_chunks.json @@ -11,7 +11,9 @@ "conditions": { "items": [ { - "item": "netherrocks:crushed_argonite_ore" + "items": [ + "netherrocks:crushed_argonite_ore" + ] } ] } diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/argonite_ingot_from_smelting_from_dust.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/argonite_ingot_from_smelting_from_dust.json index 78fb24dd..8e8ca8af 100644 --- a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/argonite_ingot_from_smelting_from_dust.json +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/argonite_ingot_from_smelting_from_dust.json @@ -11,7 +11,9 @@ "conditions": { "items": [ { - "item": "netherrocks:argonite_dust" + "items": [ + "netherrocks:argonite_dust" + ] } ] } diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/argonite_ingot_from_smelting_from_ore.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/argonite_ingot_from_smelting_from_ore.json new file mode 100644 index 00000000..07cbd0e2 --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/argonite_ingot_from_smelting_from_ore.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:argonite_ingot_from_smelting_from_ore" + ] + }, + "criteria": { + "argonite_ingot_from_smelting_from_ore": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:argonite_ore" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:argonite_ingot_from_smelting_from_ore" + } + } + }, + "requirements": [ + [ + "argonite_ingot_from_smelting_from_ore", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/argonite_nugget.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/argonite_nugget.json new file mode 100644 index 00000000..db9dcca9 --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/argonite_nugget.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:argonite_nugget" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:argonite_ingot" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:argonite_nugget" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/argonite_nugget_from_blasting.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/argonite_nugget_from_blasting.json new file mode 100644 index 00000000..5b3e535f --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/argonite_nugget_from_blasting.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:argonite_nugget_from_blasting" + ] + }, + "criteria": { + "argonite_nugget_from_blasting": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:argonite_axe" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:argonite_nugget_from_blasting" + } + } + }, + "requirements": [ + [ + "argonite_nugget_from_blasting", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/argonite_nugget_from_smelting.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/argonite_nugget_from_smelting.json new file mode 100644 index 00000000..45ab11ed --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/argonite_nugget_from_smelting.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:argonite_nugget_from_smelting" + ] + }, + "criteria": { + "argonite_nugget_from_smelting": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:argonite_axe" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:argonite_nugget_from_smelting" + } + } + }, + "requirements": [ + [ + "argonite_nugget_from_smelting", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/argonite_pickaxe.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/argonite_pickaxe.json new file mode 100644 index 00000000..22f25fb6 --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/argonite_pickaxe.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:argonite_pickaxe" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:argonite_ingot" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:argonite_pickaxe" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/argonite_shovel.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/argonite_shovel.json new file mode 100644 index 00000000..837b8f1c --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/argonite_shovel.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:argonite_shovel" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:argonite_ingot" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:argonite_shovel" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/argonite_sword.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/argonite_sword.json new file mode 100644 index 00000000..eace2315 --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/argonite_sword.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:argonite_sword" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:argonite_ingot" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:argonite_sword" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/ashstone_axe.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/ashstone_axe.json new file mode 100644 index 00000000..5ef57185 --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/ashstone_axe.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:ashstone_axe" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:ashstone_gem" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:ashstone_axe" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/ashstone_block.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/ashstone_block.json new file mode 100644 index 00000000..68af14cc --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/ashstone_block.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:ashstone_block" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:ashstone_gem" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:ashstone_block" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/ashstone_gem.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/ashstone_gem.json new file mode 100644 index 00000000..fa4d337f --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/ashstone_gem.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:ashstone_gem" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:ashstone_gem" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:ashstone_gem" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/ashstone_gem_from_blasting_from_ore.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/ashstone_gem_from_blasting_from_ore.json new file mode 100644 index 00000000..3e86229d --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/ashstone_gem_from_blasting_from_ore.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:ashstone_gem_from_blasting_from_ore" + ] + }, + "criteria": { + "ashstone_gem_from_blasting_from_ore": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:ashstone_ore" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:ashstone_gem_from_blasting_from_ore" + } + } + }, + "requirements": [ + [ + "ashstone_gem_from_blasting_from_ore", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/ashstone_gem_from_smelting_from_ore.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/ashstone_gem_from_smelting_from_ore.json new file mode 100644 index 00000000..c5038442 --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/ashstone_gem_from_smelting_from_ore.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:ashstone_gem_from_smelting_from_ore" + ] + }, + "criteria": { + "ashstone_gem_from_smelting_from_ore": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:ashstone_ore" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:ashstone_gem_from_smelting_from_ore" + } + } + }, + "requirements": [ + [ + "ashstone_gem_from_smelting_from_ore", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/ashstone_hoe.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/ashstone_hoe.json new file mode 100644 index 00000000..42c35fa9 --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/ashstone_hoe.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:ashstone_hoe" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:ashstone_gem" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:ashstone_hoe" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/ashstone_pickaxe.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/ashstone_pickaxe.json new file mode 100644 index 00000000..b7e842d2 --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/ashstone_pickaxe.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:ashstone_pickaxe" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:ashstone_gem" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:ashstone_pickaxe" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/ashstone_shovel.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/ashstone_shovel.json new file mode 100644 index 00000000..d8d55a33 --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/ashstone_shovel.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:ashstone_shovel" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:ashstone_gem" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:ashstone_shovel" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/ashstone_sword.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/ashstone_sword.json new file mode 100644 index 00000000..a6c29dcf --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/ashstone_sword.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:ashstone_sword" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:ashstone_gem" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:ashstone_sword" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/dragonstone_axe.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/dragonstone_axe.json new file mode 100644 index 00000000..764692ce --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/dragonstone_axe.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:dragonstone_axe" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:dragonstone_gem" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:dragonstone_axe" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/dragonstone_block.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/dragonstone_block.json new file mode 100644 index 00000000..259d2c3f --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/dragonstone_block.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:dragonstone_block" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:dragonstone_gem" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:dragonstone_block" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/dragonstone_boots.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/dragonstone_boots.json new file mode 100644 index 00000000..1d0c14d0 --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/dragonstone_boots.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:dragonstone_boots" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:dragonstone_gem" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:dragonstone_boots" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/dragonstone_chestplate.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/dragonstone_chestplate.json new file mode 100644 index 00000000..b4d9d4da --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/dragonstone_chestplate.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:dragonstone_chestplate" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:dragonstone_gem" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:dragonstone_chestplate" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/dragonstone_gem.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/dragonstone_gem.json new file mode 100644 index 00000000..54ee8c94 --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/dragonstone_gem.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:dragonstone_gem" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:dragonstone_gem" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:dragonstone_gem" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/dragonstone_gem_from_blasting_from_ore.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/dragonstone_gem_from_blasting_from_ore.json new file mode 100644 index 00000000..2207697c --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/dragonstone_gem_from_blasting_from_ore.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:dragonstone_gem_from_blasting_from_ore" + ] + }, + "criteria": { + "dragonstone_gem_from_blasting_from_ore": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:dragonstone_ore" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:dragonstone_gem_from_blasting_from_ore" + } + } + }, + "requirements": [ + [ + "dragonstone_gem_from_blasting_from_ore", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/dragonstone_gem_from_smelting_from_ore.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/dragonstone_gem_from_smelting_from_ore.json new file mode 100644 index 00000000..1ba52d3c --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/dragonstone_gem_from_smelting_from_ore.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:dragonstone_gem_from_smelting_from_ore" + ] + }, + "criteria": { + "dragonstone_gem_from_smelting_from_ore": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:dragonstone_ore" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:dragonstone_gem_from_smelting_from_ore" + } + } + }, + "requirements": [ + [ + "dragonstone_gem_from_smelting_from_ore", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/dragonstone_helmet.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/dragonstone_helmet.json new file mode 100644 index 00000000..26de5ce0 --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/dragonstone_helmet.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:dragonstone_helmet" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:dragonstone_gem" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:dragonstone_helmet" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/dragonstone_hoe.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/dragonstone_hoe.json new file mode 100644 index 00000000..7eaf3030 --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/dragonstone_hoe.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:dragonstone_hoe" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:dragonstone_gem" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:dragonstone_hoe" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/dragonstone_leggings.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/dragonstone_leggings.json new file mode 100644 index 00000000..600049c8 --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/dragonstone_leggings.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:dragonstone_leggings" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:dragonstone_gem" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:dragonstone_leggings" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/dragonstone_pickaxe.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/dragonstone_pickaxe.json new file mode 100644 index 00000000..dd0534d5 --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/dragonstone_pickaxe.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:dragonstone_pickaxe" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:dragonstone_gem" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:dragonstone_pickaxe" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/dragonstone_shovel.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/dragonstone_shovel.json new file mode 100644 index 00000000..5b6c58f2 --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/dragonstone_shovel.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:dragonstone_shovel" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:dragonstone_gem" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:dragonstone_shovel" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/dragonstone_sword.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/dragonstone_sword.json new file mode 100644 index 00000000..20645b80 --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/dragonstone_sword.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:dragonstone_sword" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:dragonstone_gem" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:dragonstone_sword" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/fyrite_axe.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/fyrite_axe.json new file mode 100644 index 00000000..c33788fb --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/fyrite_axe.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:fyrite_axe" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:fyrite_ingot" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:fyrite_axe" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/fyrite_block.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/fyrite_block.json new file mode 100644 index 00000000..01fa4f34 --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/fyrite_block.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:fyrite_block" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:fyrite_ingot" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:fyrite_block" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/fyrite_boots.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/fyrite_boots.json new file mode 100644 index 00000000..7b6eaed8 --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/fyrite_boots.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:fyrite_boots" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:fyrite_ingot" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:fyrite_boots" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/fyrite_chestplate.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/fyrite_chestplate.json new file mode 100644 index 00000000..456ededd --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/fyrite_chestplate.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:fyrite_chestplate" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:fyrite_ingot" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:fyrite_chestplate" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/fyrite_helmet.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/fyrite_helmet.json new file mode 100644 index 00000000..3c50cca4 --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/fyrite_helmet.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:fyrite_helmet" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:fyrite_ingot" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:fyrite_helmet" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/fyrite_ingot.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/fyrite_ingot.json new file mode 100644 index 00000000..a2c2874d --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/fyrite_ingot.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:fyrite_ingot" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:fyrite_ingot" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:fyrite_ingot" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/fyrite_ingot_from_blasting.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/fyrite_ingot_from_blasting.json new file mode 100644 index 00000000..1fe19083 --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/fyrite_ingot_from_blasting.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:fyrite_ingot_from_blasting" + ] + }, + "criteria": { + "fyrite_ingot_from_blasting": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:raw_fyrite" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:fyrite_ingot_from_blasting" + } + } + }, + "requirements": [ + [ + "fyrite_ingot_from_blasting", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/fyrite_ingot_from_blasting_from_chunks.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/fyrite_ingot_from_blasting_from_chunks.json index f25e3687..638e1bd4 100644 --- a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/fyrite_ingot_from_blasting_from_chunks.json +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/fyrite_ingot_from_blasting_from_chunks.json @@ -11,7 +11,9 @@ "conditions": { "items": [ { - "item": "netherrocks:crushed_fyrite_ore" + "items": [ + "netherrocks:crushed_fyrite_ore" + ] } ] } diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/fyrite_ingot_from_blasting_from_dust.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/fyrite_ingot_from_blasting_from_dust.json index 1c8a2949..89220131 100644 --- a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/fyrite_ingot_from_blasting_from_dust.json +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/fyrite_ingot_from_blasting_from_dust.json @@ -11,7 +11,9 @@ "conditions": { "items": [ { - "item": "netherrocks:fyrite_dust" + "items": [ + "netherrocks:fyrite_dust" + ] } ] } diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/fyrite_ingot_from_blasting_from_ore.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/fyrite_ingot_from_blasting_from_ore.json new file mode 100644 index 00000000..bcefa15e --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/fyrite_ingot_from_blasting_from_ore.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:fyrite_ingot_from_blasting_from_ore" + ] + }, + "criteria": { + "fyrite_ingot_from_blasting_from_ore": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:fyrite_ore" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:fyrite_ingot_from_blasting_from_ore" + } + } + }, + "requirements": [ + [ + "fyrite_ingot_from_blasting_from_ore", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/fyrite_ingot_from_nuggets.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/fyrite_ingot_from_nuggets.json new file mode 100644 index 00000000..6b019413 --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/fyrite_ingot_from_nuggets.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:fyrite_ingot_from_nuggets" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:fyrite_ingot" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:fyrite_ingot_from_nuggets" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/fyrite_ingot_from_smelting.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/fyrite_ingot_from_smelting.json new file mode 100644 index 00000000..78a0b602 --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/fyrite_ingot_from_smelting.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:fyrite_ingot_from_smelting" + ] + }, + "criteria": { + "fyrite_ingot_from_smelting": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:raw_fyrite" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:fyrite_ingot_from_smelting" + } + } + }, + "requirements": [ + [ + "fyrite_ingot_from_smelting", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/fyrite_ingot_from_smelting_from_chunks.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/fyrite_ingot_from_smelting_from_chunks.json index aaa71704..0285cb04 100644 --- a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/fyrite_ingot_from_smelting_from_chunks.json +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/fyrite_ingot_from_smelting_from_chunks.json @@ -11,7 +11,9 @@ "conditions": { "items": [ { - "item": "netherrocks:crushed_fyrite_ore" + "items": [ + "netherrocks:crushed_fyrite_ore" + ] } ] } diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/fyrite_ingot_from_smelting_from_dust.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/fyrite_ingot_from_smelting_from_dust.json index a55e986a..ecf7fcce 100644 --- a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/fyrite_ingot_from_smelting_from_dust.json +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/fyrite_ingot_from_smelting_from_dust.json @@ -11,7 +11,9 @@ "conditions": { "items": [ { - "item": "netherrocks:fyrite_dust" + "items": [ + "netherrocks:fyrite_dust" + ] } ] } diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/fyrite_ingot_from_smelting_from_ore.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/fyrite_ingot_from_smelting_from_ore.json new file mode 100644 index 00000000..403c1a2a --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/fyrite_ingot_from_smelting_from_ore.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:fyrite_ingot_from_smelting_from_ore" + ] + }, + "criteria": { + "fyrite_ingot_from_smelting_from_ore": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:fyrite_ore" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:fyrite_ingot_from_smelting_from_ore" + } + } + }, + "requirements": [ + [ + "fyrite_ingot_from_smelting_from_ore", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/fyrite_leggings.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/fyrite_leggings.json new file mode 100644 index 00000000..8d93c89d --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/fyrite_leggings.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:fyrite_leggings" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:fyrite_ingot" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:fyrite_leggings" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/fyrite_nugget.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/fyrite_nugget.json new file mode 100644 index 00000000..c9781f46 --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/fyrite_nugget.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:fyrite_nugget" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:fyrite_ingot" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:fyrite_nugget" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/fyrite_nugget_from_blasting.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/fyrite_nugget_from_blasting.json new file mode 100644 index 00000000..969b8e9f --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/fyrite_nugget_from_blasting.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:fyrite_nugget_from_blasting" + ] + }, + "criteria": { + "fyrite_nugget_from_blasting": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:fyrite_axe" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:fyrite_nugget_from_blasting" + } + } + }, + "requirements": [ + [ + "fyrite_nugget_from_blasting", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/fyrite_nugget_from_smelting.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/fyrite_nugget_from_smelting.json new file mode 100644 index 00000000..0a7d95cd --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/fyrite_nugget_from_smelting.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:fyrite_nugget_from_smelting" + ] + }, + "criteria": { + "fyrite_nugget_from_smelting": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:fyrite_axe" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:fyrite_nugget_from_smelting" + } + } + }, + "requirements": [ + [ + "fyrite_nugget_from_smelting", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/fyrite_pickaxe.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/fyrite_pickaxe.json new file mode 100644 index 00000000..16542a2f --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/fyrite_pickaxe.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:fyrite_pickaxe" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:fyrite_ingot" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:fyrite_pickaxe" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/fyrite_shovel.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/fyrite_shovel.json new file mode 100644 index 00000000..4b968841 --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/fyrite_shovel.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:fyrite_shovel" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:fyrite_ingot" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:fyrite_shovel" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/fyrite_sword.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/fyrite_sword.json new file mode 100644 index 00000000..a51f93f1 --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/fyrite_sword.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:fyrite_sword" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:fyrite_ingot" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:fyrite_sword" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/illumenite_block.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/illumenite_block.json new file mode 100644 index 00000000..98c66629 --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/illumenite_block.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:illumenite_block" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:illumenite_ingot" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:illumenite_block" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/illumenite_boots.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/illumenite_boots.json new file mode 100644 index 00000000..aa5ffb7f --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/illumenite_boots.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:illumenite_boots" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:illumenite_ingot" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:illumenite_boots" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/illumenite_chestplate.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/illumenite_chestplate.json new file mode 100644 index 00000000..af58c35e --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/illumenite_chestplate.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:illumenite_chestplate" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:illumenite_ingot" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:illumenite_chestplate" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/illumenite_helmet.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/illumenite_helmet.json new file mode 100644 index 00000000..bb34cc9d --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/illumenite_helmet.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:illumenite_helmet" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:illumenite_ingot" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:illumenite_helmet" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/illumenite_ingot.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/illumenite_ingot.json new file mode 100644 index 00000000..b5005cd9 --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/illumenite_ingot.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:illumenite_ingot" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:illumenite_ingot" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:illumenite_ingot" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/illumenite_ingot_from_blasting.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/illumenite_ingot_from_blasting.json new file mode 100644 index 00000000..ebe2bb13 --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/illumenite_ingot_from_blasting.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:illumenite_ingot_from_blasting" + ] + }, + "criteria": { + "illumenite_ingot_from_blasting": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:raw_illumenite" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:illumenite_ingot_from_blasting" + } + } + }, + "requirements": [ + [ + "illumenite_ingot_from_blasting", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/illumenite_ingot_from_blasting_from_chunks.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/illumenite_ingot_from_blasting_from_chunks.json index 1cffb8bc..db6b6382 100644 --- a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/illumenite_ingot_from_blasting_from_chunks.json +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/illumenite_ingot_from_blasting_from_chunks.json @@ -11,7 +11,9 @@ "conditions": { "items": [ { - "item": "netherrocks:crushed_illumenite_ore" + "items": [ + "netherrocks:crushed_illumenite_ore" + ] } ] } diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/illumenite_ingot_from_blasting_from_dust.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/illumenite_ingot_from_blasting_from_dust.json index 5cbb8cce..a640af84 100644 --- a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/illumenite_ingot_from_blasting_from_dust.json +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/illumenite_ingot_from_blasting_from_dust.json @@ -11,7 +11,9 @@ "conditions": { "items": [ { - "item": "netherrocks:illumenite_dust" + "items": [ + "netherrocks:illumenite_dust" + ] } ] } diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/illumenite_ingot_from_blasting_from_ore.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/illumenite_ingot_from_blasting_from_ore.json new file mode 100644 index 00000000..efee6ddc --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/illumenite_ingot_from_blasting_from_ore.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:illumenite_ingot_from_blasting_from_ore" + ] + }, + "criteria": { + "illumenite_ingot_from_blasting_from_ore": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:illumenite_ore" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:illumenite_ingot_from_blasting_from_ore" + } + } + }, + "requirements": [ + [ + "illumenite_ingot_from_blasting_from_ore", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/illumenite_ingot_from_nuggets.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/illumenite_ingot_from_nuggets.json new file mode 100644 index 00000000..e8b1193e --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/illumenite_ingot_from_nuggets.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:illumenite_ingot_from_nuggets" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:illumenite_ingot" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:illumenite_ingot_from_nuggets" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/illumenite_ingot_from_smelting.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/illumenite_ingot_from_smelting.json new file mode 100644 index 00000000..8a71ee53 --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/illumenite_ingot_from_smelting.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:illumenite_ingot_from_smelting" + ] + }, + "criteria": { + "illumenite_ingot_from_smelting": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:raw_illumenite" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:illumenite_ingot_from_smelting" + } + } + }, + "requirements": [ + [ + "illumenite_ingot_from_smelting", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/illumenite_ingot_from_smelting_from_chunks.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/illumenite_ingot_from_smelting_from_chunks.json index 7933bd11..f3bad686 100644 --- a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/illumenite_ingot_from_smelting_from_chunks.json +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/illumenite_ingot_from_smelting_from_chunks.json @@ -11,7 +11,9 @@ "conditions": { "items": [ { - "item": "netherrocks:crushed_illumenite_ore" + "items": [ + "netherrocks:crushed_illumenite_ore" + ] } ] } diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/illumenite_ingot_from_smelting_from_dust.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/illumenite_ingot_from_smelting_from_dust.json index baf10059..8ee54578 100644 --- a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/illumenite_ingot_from_smelting_from_dust.json +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/illumenite_ingot_from_smelting_from_dust.json @@ -11,7 +11,9 @@ "conditions": { "items": [ { - "item": "netherrocks:illumenite_dust" + "items": [ + "netherrocks:illumenite_dust" + ] } ] } diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/illumenite_ingot_from_smelting_from_ore.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/illumenite_ingot_from_smelting_from_ore.json new file mode 100644 index 00000000..15352fa6 --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/illumenite_ingot_from_smelting_from_ore.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:illumenite_ingot_from_smelting_from_ore" + ] + }, + "criteria": { + "illumenite_ingot_from_smelting_from_ore": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:illumenite_ore" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:illumenite_ingot_from_smelting_from_ore" + } + } + }, + "requirements": [ + [ + "illumenite_ingot_from_smelting_from_ore", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/illumenite_leggings.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/illumenite_leggings.json new file mode 100644 index 00000000..b26a8670 --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/illumenite_leggings.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:illumenite_leggings" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:illumenite_ingot" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:illumenite_leggings" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/illumenite_nugget.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/illumenite_nugget.json new file mode 100644 index 00000000..9d3abd65 --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/illumenite_nugget.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:illumenite_nugget" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:illumenite_ingot" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:illumenite_nugget" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/illumenite_nugget_from_blasting.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/illumenite_nugget_from_blasting.json new file mode 100644 index 00000000..b1773aab --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/illumenite_nugget_from_blasting.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:illumenite_nugget_from_blasting" + ] + }, + "criteria": { + "illumenite_nugget_from_blasting": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:illumenite_sword" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:illumenite_nugget_from_blasting" + } + } + }, + "requirements": [ + [ + "illumenite_nugget_from_blasting", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/illumenite_nugget_from_smelting.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/illumenite_nugget_from_smelting.json new file mode 100644 index 00000000..e00ff969 --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/illumenite_nugget_from_smelting.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:illumenite_nugget_from_smelting" + ] + }, + "criteria": { + "illumenite_nugget_from_smelting": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:illumenite_sword" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:illumenite_nugget_from_smelting" + } + } + }, + "requirements": [ + [ + "illumenite_nugget_from_smelting", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/illumenite_sword.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/illumenite_sword.json new file mode 100644 index 00000000..8bcccdf0 --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/illumenite_sword.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:illumenite_sword" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:illumenite_ingot" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:illumenite_sword" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_axe.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_axe.json new file mode 100644 index 00000000..4f0f46c2 --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_axe.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:malachite_axe" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:malachite_ingot" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:malachite_axe" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_block.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_block.json new file mode 100644 index 00000000..e5359380 --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_block.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:malachite_block" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:malachite_ingot" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:malachite_block" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_boots.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_boots.json new file mode 100644 index 00000000..ea289fb7 --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_boots.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:malachite_boots" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:malachite_ingot" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:malachite_boots" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_chestplate.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_chestplate.json new file mode 100644 index 00000000..0e8e7d94 --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_chestplate.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:malachite_chestplate" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:malachite_ingot" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:malachite_chestplate" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_helmet.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_helmet.json new file mode 100644 index 00000000..a8f7618a --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_helmet.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:malachite_helmet" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:malachite_ingot" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:malachite_helmet" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_hoe.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_hoe.json new file mode 100644 index 00000000..bdaaf6d6 --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_hoe.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:malachite_hoe" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:malachite_ingot" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:malachite_hoe" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_ingot.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_ingot.json new file mode 100644 index 00000000..19392ab8 --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_ingot.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:malachite_ingot" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:malachite_ingot" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:malachite_ingot" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_ingot_from_blasting.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_ingot_from_blasting.json new file mode 100644 index 00000000..2d84465c --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_ingot_from_blasting.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:malachite_ingot_from_blasting" + ] + }, + "criteria": { + "malachite_ingot_from_blasting": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:raw_malachite" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:malachite_ingot_from_blasting" + } + } + }, + "requirements": [ + [ + "malachite_ingot_from_blasting", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_ingot_from_blasting_from_chunks.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_ingot_from_blasting_from_chunks.json index f158de2d..ed2e678e 100644 --- a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_ingot_from_blasting_from_chunks.json +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_ingot_from_blasting_from_chunks.json @@ -11,7 +11,9 @@ "conditions": { "items": [ { - "item": "netherrocks:crushed_malachite_ore" + "items": [ + "netherrocks:crushed_malachite_ore" + ] } ] } diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_ingot_from_blasting_from_dust.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_ingot_from_blasting_from_dust.json index 7351b70f..ab65133c 100644 --- a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_ingot_from_blasting_from_dust.json +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_ingot_from_blasting_from_dust.json @@ -11,7 +11,9 @@ "conditions": { "items": [ { - "item": "netherrocks:malachite_dust" + "items": [ + "netherrocks:malachite_dust" + ] } ] } diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_ingot_from_blasting_from_ore.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_ingot_from_blasting_from_ore.json new file mode 100644 index 00000000..8161e00f --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_ingot_from_blasting_from_ore.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:malachite_ingot_from_blasting_from_ore" + ] + }, + "criteria": { + "malachite_ingot_from_blasting_from_ore": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:malachite_ore" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:malachite_ingot_from_blasting_from_ore" + } + } + }, + "requirements": [ + [ + "malachite_ingot_from_blasting_from_ore", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_ingot_from_nuggets.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_ingot_from_nuggets.json new file mode 100644 index 00000000..0799bb15 --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_ingot_from_nuggets.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:malachite_ingot_from_nuggets" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:malachite_ingot" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:malachite_ingot_from_nuggets" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_ingot_from_smelting.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_ingot_from_smelting.json new file mode 100644 index 00000000..0b72f8ff --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_ingot_from_smelting.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:malachite_ingot_from_smelting" + ] + }, + "criteria": { + "malachite_ingot_from_smelting": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:raw_malachite" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:malachite_ingot_from_smelting" + } + } + }, + "requirements": [ + [ + "malachite_ingot_from_smelting", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_ingot_from_smelting_from_chunks.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_ingot_from_smelting_from_chunks.json index 10344e42..d6dacb9f 100644 --- a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_ingot_from_smelting_from_chunks.json +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_ingot_from_smelting_from_chunks.json @@ -11,7 +11,9 @@ "conditions": { "items": [ { - "item": "netherrocks:crushed_malachite_ore" + "items": [ + "netherrocks:crushed_malachite_ore" + ] } ] } diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_ingot_from_smelting_from_dust.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_ingot_from_smelting_from_dust.json index 24a111a4..78e32b83 100644 --- a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_ingot_from_smelting_from_dust.json +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_ingot_from_smelting_from_dust.json @@ -11,7 +11,9 @@ "conditions": { "items": [ { - "item": "netherrocks:malachite_dust" + "items": [ + "netherrocks:malachite_dust" + ] } ] } diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_ingot_from_smelting_from_ore.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_ingot_from_smelting_from_ore.json new file mode 100644 index 00000000..ee435238 --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_ingot_from_smelting_from_ore.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:malachite_ingot_from_smelting_from_ore" + ] + }, + "criteria": { + "malachite_ingot_from_smelting_from_ore": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:malachite_ore" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:malachite_ingot_from_smelting_from_ore" + } + } + }, + "requirements": [ + [ + "malachite_ingot_from_smelting_from_ore", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_leggings.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_leggings.json new file mode 100644 index 00000000..251f5cdd --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_leggings.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:malachite_leggings" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:malachite_ingot" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:malachite_leggings" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_nugget.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_nugget.json new file mode 100644 index 00000000..ad1d7ef5 --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_nugget.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:malachite_nugget" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:malachite_ingot" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:malachite_nugget" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_nugget_from_blasting.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_nugget_from_blasting.json new file mode 100644 index 00000000..2fd24296 --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_nugget_from_blasting.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:malachite_nugget_from_blasting" + ] + }, + "criteria": { + "malachite_nugget_from_blasting": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:malachite_axe" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:malachite_nugget_from_blasting" + } + } + }, + "requirements": [ + [ + "malachite_nugget_from_blasting", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_nugget_from_smelting.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_nugget_from_smelting.json new file mode 100644 index 00000000..072ae334 --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_nugget_from_smelting.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:malachite_nugget_from_smelting" + ] + }, + "criteria": { + "malachite_nugget_from_smelting": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:malachite_axe" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:malachite_nugget_from_smelting" + } + } + }, + "requirements": [ + [ + "malachite_nugget_from_smelting", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_pickaxe.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_pickaxe.json new file mode 100644 index 00000000..13708368 --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_pickaxe.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:malachite_pickaxe" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:malachite_ingot" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:malachite_pickaxe" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_shovel.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_shovel.json new file mode 100644 index 00000000..cfbe7d3e --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_shovel.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:malachite_shovel" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:malachite_ingot" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:malachite_shovel" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_sword.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_sword.json new file mode 100644 index 00000000..a5901ea5 --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/malachite_sword.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:malachite_sword" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:malachite_ingot" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:malachite_sword" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/nether_blast_furnace.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/nether_blast_furnace.json new file mode 100644 index 00000000..d5689b29 --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/nether_blast_furnace.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:nether_blast_furnace" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:nether_furnace" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:nether_blast_furnace" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/nether_furnace.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/nether_furnace.json new file mode 100644 index 00000000..238b7b4f --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/nether_furnace.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:nether_furnace" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:netherrack" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:nether_furnace" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/nether_smoker.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/nether_smoker.json new file mode 100644 index 00000000..c801e817 --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/nether_smoker.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:nether_smoker" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:nether_furnace" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:nether_smoker" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/raw_argonite.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/raw_argonite.json new file mode 100644 index 00000000..7085ae15 --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/raw_argonite.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:raw_argonite" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:raw_argonite" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:raw_argonite" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/raw_argonite_block.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/raw_argonite_block.json new file mode 100644 index 00000000..68053d76 --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/raw_argonite_block.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:raw_argonite_block" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:raw_argonite" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:raw_argonite_block" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/raw_fyrite.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/raw_fyrite.json new file mode 100644 index 00000000..48e72648 --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/raw_fyrite.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:raw_fyrite" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:raw_fyrite" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:raw_fyrite" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/raw_fyrite_block.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/raw_fyrite_block.json new file mode 100644 index 00000000..ff89fe4c --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/raw_fyrite_block.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:raw_fyrite_block" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:raw_fyrite" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:raw_fyrite_block" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/raw_illumenite.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/raw_illumenite.json new file mode 100644 index 00000000..ff2233f8 --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/raw_illumenite.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:raw_illumenite" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:raw_illumenite" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:raw_illumenite" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/raw_illumenite_block.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/raw_illumenite_block.json new file mode 100644 index 00000000..756df658 --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/raw_illumenite_block.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:raw_illumenite_block" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:raw_illumenite" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:raw_illumenite_block" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/raw_malachite.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/raw_malachite.json new file mode 100644 index 00000000..84d5888c --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/raw_malachite.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:raw_malachite" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:raw_malachite" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:raw_malachite" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/raw_malachite_block.json b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/raw_malachite_block.json new file mode 100644 index 00000000..e271584a --- /dev/null +++ b/src/generated/resources/data/netherrocks/advancements/recipes/netherrocks/raw_malachite_block.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "netherrocks:raw_malachite_block" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "netherrocks:raw_malachite" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "netherrocks:raw_malachite_block" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/loot_tables/blocks/argonite_bars.json b/src/generated/resources/data/netherrocks/loot_tables/blocks/argonite_bars.json new file mode 100644 index 00000000..5503bf73 --- /dev/null +++ b/src/generated/resources/data/netherrocks/loot_tables/blocks/argonite_bars.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "netherrocks:argonite_bars" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/loot_tables/blocks/argonite_block.json b/src/generated/resources/data/netherrocks/loot_tables/blocks/argonite_block.json index 016f15df..1db95a35 100644 --- a/src/generated/resources/data/netherrocks/loot_tables/blocks/argonite_block.json +++ b/src/generated/resources/data/netherrocks/loot_tables/blocks/argonite_block.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/src/generated/resources/data/netherrocks/loot_tables/blocks/argonite_brick_slab.json b/src/generated/resources/data/netherrocks/loot_tables/blocks/argonite_brick_slab.json new file mode 100644 index 00000000..dcfc942b --- /dev/null +++ b/src/generated/resources/data/netherrocks/loot_tables/blocks/argonite_brick_slab.json @@ -0,0 +1,34 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "functions": [ + { + "function": "minecraft:set_count", + "conditions": [ + { + "condition": "minecraft:block_state_property", + "block": "netherrocks:argonite_brick_slab", + "properties": { + "type": "double" + } + } + ], + "count": 2.0, + "add": false + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "netherrocks:argonite_brick_slab" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/loot_tables/blocks/argonite_brick_stairs.json b/src/generated/resources/data/netherrocks/loot_tables/blocks/argonite_brick_stairs.json new file mode 100644 index 00000000..b015c240 --- /dev/null +++ b/src/generated/resources/data/netherrocks/loot_tables/blocks/argonite_brick_stairs.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "netherrocks:argonite_brick_stairs" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/loot_tables/blocks/argonite_bricks.json b/src/generated/resources/data/netherrocks/loot_tables/blocks/argonite_bricks.json new file mode 100644 index 00000000..c1da30bc --- /dev/null +++ b/src/generated/resources/data/netherrocks/loot_tables/blocks/argonite_bricks.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "netherrocks:argonite_bricks" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/loot_tables/blocks/argonite_door.json b/src/generated/resources/data/netherrocks/loot_tables/blocks/argonite_door.json new file mode 100644 index 00000000..a790225b --- /dev/null +++ b/src/generated/resources/data/netherrocks/loot_tables/blocks/argonite_door.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "netherrocks:argonite_door" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/loot_tables/blocks/argonite_ore.json b/src/generated/resources/data/netherrocks/loot_tables/blocks/argonite_ore.json index 53569bfa..46ffa2b1 100644 --- a/src/generated/resources/data/netherrocks/loot_tables/blocks/argonite_ore.json +++ b/src/generated/resources/data/netherrocks/loot_tables/blocks/argonite_ore.json @@ -2,16 +2,46 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { - "type": "minecraft:item", - "name": "netherrocks:argonite_ore" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" + "type": "minecraft:alternatives", + "children": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + ], + "name": "netherrocks:argonite_ore" + }, + { + "type": "minecraft:item", + "functions": [ + { + "function": "minecraft:apply_bonus", + "enchantment": "minecraft:fortune", + "formula": "minecraft:ore_drops" + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "netherrocks:raw_argonite" + } + ] } ] } diff --git a/src/generated/resources/data/netherrocks/loot_tables/blocks/ashstone_bars.json b/src/generated/resources/data/netherrocks/loot_tables/blocks/ashstone_bars.json new file mode 100644 index 00000000..4ddd3700 --- /dev/null +++ b/src/generated/resources/data/netherrocks/loot_tables/blocks/ashstone_bars.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "netherrocks:ashstone_bars" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/loot_tables/blocks/ashstone_block.json b/src/generated/resources/data/netherrocks/loot_tables/blocks/ashstone_block.json index f6837f98..1679cff7 100644 --- a/src/generated/resources/data/netherrocks/loot_tables/blocks/ashstone_block.json +++ b/src/generated/resources/data/netherrocks/loot_tables/blocks/ashstone_block.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/src/generated/resources/data/netherrocks/loot_tables/blocks/ashstone_brick_slab.json b/src/generated/resources/data/netherrocks/loot_tables/blocks/ashstone_brick_slab.json new file mode 100644 index 00000000..4be87d44 --- /dev/null +++ b/src/generated/resources/data/netherrocks/loot_tables/blocks/ashstone_brick_slab.json @@ -0,0 +1,34 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "functions": [ + { + "function": "minecraft:set_count", + "conditions": [ + { + "condition": "minecraft:block_state_property", + "block": "netherrocks:ashstone_brick_slab", + "properties": { + "type": "double" + } + } + ], + "count": 2.0, + "add": false + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "netherrocks:ashstone_brick_slab" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/loot_tables/blocks/ashstone_brick_stairs.json b/src/generated/resources/data/netherrocks/loot_tables/blocks/ashstone_brick_stairs.json new file mode 100644 index 00000000..5bfa55da --- /dev/null +++ b/src/generated/resources/data/netherrocks/loot_tables/blocks/ashstone_brick_stairs.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "netherrocks:ashstone_brick_stairs" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/loot_tables/blocks/ashstone_bricks.json b/src/generated/resources/data/netherrocks/loot_tables/blocks/ashstone_bricks.json new file mode 100644 index 00000000..7659bb83 --- /dev/null +++ b/src/generated/resources/data/netherrocks/loot_tables/blocks/ashstone_bricks.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "netherrocks:ashstone_bricks" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/loot_tables/blocks/ashstone_door.json b/src/generated/resources/data/netherrocks/loot_tables/blocks/ashstone_door.json new file mode 100644 index 00000000..839b7483 --- /dev/null +++ b/src/generated/resources/data/netherrocks/loot_tables/blocks/ashstone_door.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "netherrocks:ashstone_door" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/loot_tables/blocks/ashstone_ore.json b/src/generated/resources/data/netherrocks/loot_tables/blocks/ashstone_ore.json index da72ac6b..e32617b6 100644 --- a/src/generated/resources/data/netherrocks/loot_tables/blocks/ashstone_ore.json +++ b/src/generated/resources/data/netherrocks/loot_tables/blocks/ashstone_ore.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:alternatives", diff --git a/src/generated/resources/data/netherrocks/loot_tables/blocks/dragonstone_bars.json b/src/generated/resources/data/netherrocks/loot_tables/blocks/dragonstone_bars.json new file mode 100644 index 00000000..599267a8 --- /dev/null +++ b/src/generated/resources/data/netherrocks/loot_tables/blocks/dragonstone_bars.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "netherrocks:dragonstone_bars" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/loot_tables/blocks/dragonstone_block.json b/src/generated/resources/data/netherrocks/loot_tables/blocks/dragonstone_block.json index 0d4bf4c3..7644ee38 100644 --- a/src/generated/resources/data/netherrocks/loot_tables/blocks/dragonstone_block.json +++ b/src/generated/resources/data/netherrocks/loot_tables/blocks/dragonstone_block.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/src/generated/resources/data/netherrocks/loot_tables/blocks/dragonstone_brick_slab.json b/src/generated/resources/data/netherrocks/loot_tables/blocks/dragonstone_brick_slab.json new file mode 100644 index 00000000..fce5e6a2 --- /dev/null +++ b/src/generated/resources/data/netherrocks/loot_tables/blocks/dragonstone_brick_slab.json @@ -0,0 +1,34 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "functions": [ + { + "function": "minecraft:set_count", + "conditions": [ + { + "condition": "minecraft:block_state_property", + "block": "netherrocks:dragonstone_brick_slab", + "properties": { + "type": "double" + } + } + ], + "count": 2.0, + "add": false + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "netherrocks:dragonstone_brick_slab" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/loot_tables/blocks/dragonstone_brick_stairs.json b/src/generated/resources/data/netherrocks/loot_tables/blocks/dragonstone_brick_stairs.json new file mode 100644 index 00000000..a5a1274b --- /dev/null +++ b/src/generated/resources/data/netherrocks/loot_tables/blocks/dragonstone_brick_stairs.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "netherrocks:dragonstone_brick_stairs" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/loot_tables/blocks/dragonstone_bricks.json b/src/generated/resources/data/netherrocks/loot_tables/blocks/dragonstone_bricks.json new file mode 100644 index 00000000..6368e26e --- /dev/null +++ b/src/generated/resources/data/netherrocks/loot_tables/blocks/dragonstone_bricks.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "netherrocks:dragonstone_bricks" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/loot_tables/blocks/dragonstone_door.json b/src/generated/resources/data/netherrocks/loot_tables/blocks/dragonstone_door.json new file mode 100644 index 00000000..926d8138 --- /dev/null +++ b/src/generated/resources/data/netherrocks/loot_tables/blocks/dragonstone_door.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "netherrocks:dragonstone_door" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/loot_tables/blocks/dragonstone_ore.json b/src/generated/resources/data/netherrocks/loot_tables/blocks/dragonstone_ore.json index c397c85a..fd24dd35 100644 --- a/src/generated/resources/data/netherrocks/loot_tables/blocks/dragonstone_ore.json +++ b/src/generated/resources/data/netherrocks/loot_tables/blocks/dragonstone_ore.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:alternatives", diff --git a/src/generated/resources/data/netherrocks/loot_tables/blocks/fyrite_bars.json b/src/generated/resources/data/netherrocks/loot_tables/blocks/fyrite_bars.json new file mode 100644 index 00000000..8cf10f4e --- /dev/null +++ b/src/generated/resources/data/netherrocks/loot_tables/blocks/fyrite_bars.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "netherrocks:fyrite_bars" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/loot_tables/blocks/fyrite_block.json b/src/generated/resources/data/netherrocks/loot_tables/blocks/fyrite_block.json index 3d400108..cca77084 100644 --- a/src/generated/resources/data/netherrocks/loot_tables/blocks/fyrite_block.json +++ b/src/generated/resources/data/netherrocks/loot_tables/blocks/fyrite_block.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/src/generated/resources/data/netherrocks/loot_tables/blocks/fyrite_brick_slab.json b/src/generated/resources/data/netherrocks/loot_tables/blocks/fyrite_brick_slab.json new file mode 100644 index 00000000..26e44817 --- /dev/null +++ b/src/generated/resources/data/netherrocks/loot_tables/blocks/fyrite_brick_slab.json @@ -0,0 +1,34 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "functions": [ + { + "function": "minecraft:set_count", + "conditions": [ + { + "condition": "minecraft:block_state_property", + "block": "netherrocks:fyrite_brick_slab", + "properties": { + "type": "double" + } + } + ], + "count": 2.0, + "add": false + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "netherrocks:fyrite_brick_slab" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/loot_tables/blocks/fyrite_brick_stairs.json b/src/generated/resources/data/netherrocks/loot_tables/blocks/fyrite_brick_stairs.json new file mode 100644 index 00000000..16fe0ad2 --- /dev/null +++ b/src/generated/resources/data/netherrocks/loot_tables/blocks/fyrite_brick_stairs.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "netherrocks:fyrite_brick_stairs" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/loot_tables/blocks/fyrite_bricks.json b/src/generated/resources/data/netherrocks/loot_tables/blocks/fyrite_bricks.json new file mode 100644 index 00000000..ee231bfe --- /dev/null +++ b/src/generated/resources/data/netherrocks/loot_tables/blocks/fyrite_bricks.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "netherrocks:fyrite_bricks" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/loot_tables/blocks/fyrite_door.json b/src/generated/resources/data/netherrocks/loot_tables/blocks/fyrite_door.json new file mode 100644 index 00000000..80cd4c50 --- /dev/null +++ b/src/generated/resources/data/netherrocks/loot_tables/blocks/fyrite_door.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "netherrocks:fyrite_door" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/loot_tables/blocks/fyrite_ore.json b/src/generated/resources/data/netherrocks/loot_tables/blocks/fyrite_ore.json index 14133eb3..169863d1 100644 --- a/src/generated/resources/data/netherrocks/loot_tables/blocks/fyrite_ore.json +++ b/src/generated/resources/data/netherrocks/loot_tables/blocks/fyrite_ore.json @@ -2,16 +2,46 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { - "type": "minecraft:item", - "name": "netherrocks:fyrite_ore" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" + "type": "minecraft:alternatives", + "children": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + ], + "name": "netherrocks:fyrite_ore" + }, + { + "type": "minecraft:item", + "functions": [ + { + "function": "minecraft:apply_bonus", + "enchantment": "minecraft:fortune", + "formula": "minecraft:ore_drops" + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "netherrocks:raw_fyrite" + } + ] } ] } diff --git a/src/generated/resources/data/netherrocks/loot_tables/blocks/illumenite_bars.json b/src/generated/resources/data/netherrocks/loot_tables/blocks/illumenite_bars.json new file mode 100644 index 00000000..d6776c59 --- /dev/null +++ b/src/generated/resources/data/netherrocks/loot_tables/blocks/illumenite_bars.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "netherrocks:illumenite_bars" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/loot_tables/blocks/illumenite_block.json b/src/generated/resources/data/netherrocks/loot_tables/blocks/illumenite_block.json index 67c1ace8..7bb391a3 100644 --- a/src/generated/resources/data/netherrocks/loot_tables/blocks/illumenite_block.json +++ b/src/generated/resources/data/netherrocks/loot_tables/blocks/illumenite_block.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/src/generated/resources/data/netherrocks/loot_tables/blocks/illumenite_brick_slab.json b/src/generated/resources/data/netherrocks/loot_tables/blocks/illumenite_brick_slab.json new file mode 100644 index 00000000..4a194521 --- /dev/null +++ b/src/generated/resources/data/netherrocks/loot_tables/blocks/illumenite_brick_slab.json @@ -0,0 +1,34 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "functions": [ + { + "function": "minecraft:set_count", + "conditions": [ + { + "condition": "minecraft:block_state_property", + "block": "netherrocks:illumenite_brick_slab", + "properties": { + "type": "double" + } + } + ], + "count": 2.0, + "add": false + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "netherrocks:illumenite_brick_slab" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/loot_tables/blocks/illumenite_brick_stairs.json b/src/generated/resources/data/netherrocks/loot_tables/blocks/illumenite_brick_stairs.json new file mode 100644 index 00000000..d10d50f6 --- /dev/null +++ b/src/generated/resources/data/netherrocks/loot_tables/blocks/illumenite_brick_stairs.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "netherrocks:illumenite_brick_stairs" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/loot_tables/blocks/illumenite_bricks.json b/src/generated/resources/data/netherrocks/loot_tables/blocks/illumenite_bricks.json new file mode 100644 index 00000000..23b60a5f --- /dev/null +++ b/src/generated/resources/data/netherrocks/loot_tables/blocks/illumenite_bricks.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "netherrocks:illumenite_bricks" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/loot_tables/blocks/illumenite_door.json b/src/generated/resources/data/netherrocks/loot_tables/blocks/illumenite_door.json new file mode 100644 index 00000000..4749d7e1 --- /dev/null +++ b/src/generated/resources/data/netherrocks/loot_tables/blocks/illumenite_door.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "netherrocks:illumenite_door" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/loot_tables/blocks/illumenite_ore.json b/src/generated/resources/data/netherrocks/loot_tables/blocks/illumenite_ore.json index b2ab6e93..cbb26fb1 100644 --- a/src/generated/resources/data/netherrocks/loot_tables/blocks/illumenite_ore.json +++ b/src/generated/resources/data/netherrocks/loot_tables/blocks/illumenite_ore.json @@ -2,16 +2,46 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { - "type": "minecraft:item", - "name": "netherrocks:illumenite_ore" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" + "type": "minecraft:alternatives", + "children": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + ], + "name": "netherrocks:illumenite_ore" + }, + { + "type": "minecraft:item", + "functions": [ + { + "function": "minecraft:apply_bonus", + "enchantment": "minecraft:fortune", + "formula": "minecraft:ore_drops" + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "netherrocks:raw_illumenite" + } + ] } ] } diff --git a/src/generated/resources/data/netherrocks/loot_tables/blocks/malachite_bars.json b/src/generated/resources/data/netherrocks/loot_tables/blocks/malachite_bars.json new file mode 100644 index 00000000..2e486212 --- /dev/null +++ b/src/generated/resources/data/netherrocks/loot_tables/blocks/malachite_bars.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "netherrocks:malachite_bars" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/loot_tables/blocks/malachite_block.json b/src/generated/resources/data/netherrocks/loot_tables/blocks/malachite_block.json index d0e7c4da..4adbd6e4 100644 --- a/src/generated/resources/data/netherrocks/loot_tables/blocks/malachite_block.json +++ b/src/generated/resources/data/netherrocks/loot_tables/blocks/malachite_block.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/src/generated/resources/data/netherrocks/loot_tables/blocks/malachite_brick_slab.json b/src/generated/resources/data/netherrocks/loot_tables/blocks/malachite_brick_slab.json new file mode 100644 index 00000000..f675163c --- /dev/null +++ b/src/generated/resources/data/netherrocks/loot_tables/blocks/malachite_brick_slab.json @@ -0,0 +1,34 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "functions": [ + { + "function": "minecraft:set_count", + "conditions": [ + { + "condition": "minecraft:block_state_property", + "block": "netherrocks:malachite_brick_slab", + "properties": { + "type": "double" + } + } + ], + "count": 2.0, + "add": false + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "netherrocks:malachite_brick_slab" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/loot_tables/blocks/malachite_brick_stairs.json b/src/generated/resources/data/netherrocks/loot_tables/blocks/malachite_brick_stairs.json new file mode 100644 index 00000000..71e57e1b --- /dev/null +++ b/src/generated/resources/data/netherrocks/loot_tables/blocks/malachite_brick_stairs.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "netherrocks:malachite_brick_stairs" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/loot_tables/blocks/malachite_bricks.json b/src/generated/resources/data/netherrocks/loot_tables/blocks/malachite_bricks.json new file mode 100644 index 00000000..a92144c7 --- /dev/null +++ b/src/generated/resources/data/netherrocks/loot_tables/blocks/malachite_bricks.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "netherrocks:malachite_bricks" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/loot_tables/blocks/malachite_door.json b/src/generated/resources/data/netherrocks/loot_tables/blocks/malachite_door.json new file mode 100644 index 00000000..a79fbecb --- /dev/null +++ b/src/generated/resources/data/netherrocks/loot_tables/blocks/malachite_door.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "netherrocks:malachite_door" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/loot_tables/blocks/malachite_ore.json b/src/generated/resources/data/netherrocks/loot_tables/blocks/malachite_ore.json index c8f4dfa0..d3fc0e45 100644 --- a/src/generated/resources/data/netherrocks/loot_tables/blocks/malachite_ore.json +++ b/src/generated/resources/data/netherrocks/loot_tables/blocks/malachite_ore.json @@ -2,16 +2,46 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { - "type": "minecraft:item", - "name": "netherrocks:malachite_ore" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" + "type": "minecraft:alternatives", + "children": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + ], + "name": "netherrocks:malachite_ore" + }, + { + "type": "minecraft:item", + "functions": [ + { + "function": "minecraft:apply_bonus", + "enchantment": "minecraft:fortune", + "formula": "minecraft:ore_drops" + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "netherrocks:raw_malachite" + } + ] } ] } diff --git a/src/generated/resources/data/netherrocks/loot_tables/blocks/nether_blast_furnace.json b/src/generated/resources/data/netherrocks/loot_tables/blocks/nether_blast_furnace.json index cb62d622..674953cd 100644 --- a/src/generated/resources/data/netherrocks/loot_tables/blocks/nether_blast_furnace.json +++ b/src/generated/resources/data/netherrocks/loot_tables/blocks/nether_blast_furnace.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/src/generated/resources/data/netherrocks/loot_tables/blocks/nether_furnace.json b/src/generated/resources/data/netherrocks/loot_tables/blocks/nether_furnace.json index 9b72711f..fb47b518 100644 --- a/src/generated/resources/data/netherrocks/loot_tables/blocks/nether_furnace.json +++ b/src/generated/resources/data/netherrocks/loot_tables/blocks/nether_furnace.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/src/generated/resources/data/netherrocks/loot_tables/blocks/nether_smoker.json b/src/generated/resources/data/netherrocks/loot_tables/blocks/nether_smoker.json index 042c894c..54678960 100644 --- a/src/generated/resources/data/netherrocks/loot_tables/blocks/nether_smoker.json +++ b/src/generated/resources/data/netherrocks/loot_tables/blocks/nether_smoker.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/src/generated/resources/data/netherrocks/loot_tables/blocks/raw_argonite_block.json b/src/generated/resources/data/netherrocks/loot_tables/blocks/raw_argonite_block.json new file mode 100644 index 00000000..9bf0a0d0 --- /dev/null +++ b/src/generated/resources/data/netherrocks/loot_tables/blocks/raw_argonite_block.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "netherrocks:raw_argonite_block" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/loot_tables/blocks/raw_fyrite_block.json b/src/generated/resources/data/netherrocks/loot_tables/blocks/raw_fyrite_block.json new file mode 100644 index 00000000..d36254eb --- /dev/null +++ b/src/generated/resources/data/netherrocks/loot_tables/blocks/raw_fyrite_block.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "netherrocks:raw_fyrite_block" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/loot_tables/blocks/raw_illumenite_block.json b/src/generated/resources/data/netherrocks/loot_tables/blocks/raw_illumenite_block.json new file mode 100644 index 00000000..56b1a71b --- /dev/null +++ b/src/generated/resources/data/netherrocks/loot_tables/blocks/raw_illumenite_block.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "netherrocks:raw_illumenite_block" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/loot_tables/blocks/raw_malachite_block.json b/src/generated/resources/data/netherrocks/loot_tables/blocks/raw_malachite_block.json new file mode 100644 index 00000000..cc13a2a9 --- /dev/null +++ b/src/generated/resources/data/netherrocks/loot_tables/blocks/raw_malachite_block.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "netherrocks:raw_malachite_block" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/loot_tables/inject/bastion.json b/src/generated/resources/data/netherrocks/loot_tables/inject/bastion.json index 0188221c..e8c7b569 100644 --- a/src/generated/resources/data/netherrocks/loot_tables/inject/bastion.json +++ b/src/generated/resources/data/netherrocks/loot_tables/inject/bastion.json @@ -4,10 +4,11 @@ { "name": "main", "rolls": { + "type": "minecraft:uniform", "min": 1.0, - "max": 2.0, - "type": "minecraft:uniform" + "max": 2.0 }, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", @@ -184,10 +185,11 @@ { "function": "minecraft:set_count", "count": { + "type": "minecraft:uniform", "min": 2.0, - "max": 4.0, - "type": "minecraft:uniform" - } + "max": 4.0 + }, + "add": false } ], "name": "netherrocks:malachite_ingot" @@ -199,10 +201,11 @@ { "function": "minecraft:set_count", "count": { + "type": "minecraft:uniform", "min": 1.0, - "max": 3.0, - "type": "minecraft:uniform" - } + "max": 3.0 + }, + "add": false } ], "name": "netherrocks:argonite_ingot" @@ -214,10 +217,11 @@ { "function": "minecraft:set_count", "count": { + "type": "minecraft:uniform", "min": 1.0, - "max": 2.0, - "type": "minecraft:uniform" - } + "max": 2.0 + }, + "add": false } ], "name": "netherrocks:fyrite_ingot" @@ -228,10 +232,11 @@ { "function": "minecraft:set_count", "count": { + "type": "minecraft:uniform", "min": 1.0, - "max": 2.0, - "type": "minecraft:uniform" - } + "max": 2.0 + }, + "add": false } ], "name": "netherrocks:illumenite_ingot" @@ -242,10 +247,11 @@ { "function": "minecraft:set_count", "count": { + "type": "minecraft:uniform", "min": 1.0, - "max": 2.0, - "type": "minecraft:uniform" - } + "max": 2.0 + }, + "add": false } ], "name": "netherrocks:ashstone_gem" @@ -255,7 +261,12 @@ "functions": [ { "function": "minecraft:set_count", - "count": 1.0 + "count": { + "type": "minecraft:uniform", + "min": 1.0, + "max": 1.0 + }, + "add": false } ], "name": "netherrocks:dragonstone_gem" diff --git a/src/generated/resources/data/netherrocks/loot_tables/inject/desert_pyramid.json b/src/generated/resources/data/netherrocks/loot_tables/inject/desert_pyramid.json index 3a8c6306..b9e55e8a 100644 --- a/src/generated/resources/data/netherrocks/loot_tables/inject/desert_pyramid.json +++ b/src/generated/resources/data/netherrocks/loot_tables/inject/desert_pyramid.json @@ -3,7 +3,12 @@ "pools": [ { "name": "main", - "rolls": 1.0, + "rolls": { + "type": "minecraft:uniform", + "min": 1.0, + "max": 1.0 + }, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", @@ -12,10 +17,11 @@ { "function": "minecraft:set_count", "count": { + "type": "minecraft:uniform", "min": 1.0, - "max": 2.0, - "type": "minecraft:uniform" - } + "max": 2.0 + }, + "add": false } ], "name": "netherrocks:fyrite_ingot" @@ -27,10 +33,11 @@ { "function": "minecraft:set_count", "count": { + "type": "minecraft:uniform", "min": 1.0, - "max": 2.0, - "type": "minecraft:uniform" - } + "max": 2.0 + }, + "add": false } ], "name": "netherrocks:illumenite_ingot" @@ -40,7 +47,12 @@ "functions": [ { "function": "minecraft:set_count", - "count": 1.0 + "count": { + "type": "minecraft:uniform", + "min": 1.0, + "max": 1.0 + }, + "add": false } ], "name": "netherrocks:dragonstone_gem" diff --git a/src/generated/resources/data/netherrocks/loot_tables/inject/jungle_temple.json b/src/generated/resources/data/netherrocks/loot_tables/inject/jungle_temple.json index d164afb7..d63011e4 100644 --- a/src/generated/resources/data/netherrocks/loot_tables/inject/jungle_temple.json +++ b/src/generated/resources/data/netherrocks/loot_tables/inject/jungle_temple.json @@ -3,7 +3,12 @@ "pools": [ { "name": "main", - "rolls": 1.0, + "rolls": { + "type": "minecraft:uniform", + "min": 1.0, + "max": 1.0 + }, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", @@ -12,10 +17,11 @@ { "function": "minecraft:set_count", "count": { + "type": "minecraft:uniform", "min": 2.0, - "max": 4.0, - "type": "minecraft:uniform" - } + "max": 4.0 + }, + "add": false } ], "name": "netherrocks:malachite_ingot" @@ -26,10 +32,11 @@ { "function": "minecraft:set_count", "count": { + "type": "minecraft:uniform", "min": 1.0, - "max": 2.0, - "type": "minecraft:uniform" - } + "max": 2.0 + }, + "add": false } ], "name": "netherrocks:ashstone_gem" diff --git a/src/generated/resources/data/netherrocks/loot_tables/inject/ruined_portal.json b/src/generated/resources/data/netherrocks/loot_tables/inject/ruined_portal.json index d81b8c0f..79b52b5f 100644 --- a/src/generated/resources/data/netherrocks/loot_tables/inject/ruined_portal.json +++ b/src/generated/resources/data/netherrocks/loot_tables/inject/ruined_portal.json @@ -3,7 +3,12 @@ "pools": [ { "name": "main", - "rolls": 1.0, + "rolls": { + "type": "minecraft:uniform", + "min": 1.0, + "max": 1.0 + }, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", @@ -12,10 +17,11 @@ { "function": "minecraft:set_count", "count": { + "type": "minecraft:uniform", "min": 2.0, - "max": 4.0, - "type": "minecraft:uniform" - } + "max": 4.0 + }, + "add": false } ], "name": "netherrocks:malachite_ingot" @@ -27,10 +33,11 @@ { "function": "minecraft:set_count", "count": { + "type": "minecraft:uniform", "min": 1.0, - "max": 3.0, - "type": "minecraft:uniform" - } + "max": 3.0 + }, + "add": false } ], "name": "netherrocks:argonite_ingot" @@ -42,10 +49,11 @@ { "function": "minecraft:set_count", "count": { + "type": "minecraft:uniform", "min": 1.0, - "max": 2.0, - "type": "minecraft:uniform" - } + "max": 2.0 + }, + "add": false } ], "name": "netherrocks:fyrite_ingot" @@ -57,10 +65,11 @@ { "function": "minecraft:set_count", "count": { + "type": "minecraft:uniform", "min": 1.0, - "max": 2.0, - "type": "minecraft:uniform" - } + "max": 2.0 + }, + "add": false } ], "name": "netherrocks:illumenite_ingot" @@ -71,10 +80,11 @@ { "function": "minecraft:set_count", "count": { + "type": "minecraft:uniform", "min": 1.0, - "max": 2.0, - "type": "minecraft:uniform" - } + "max": 2.0 + }, + "add": false } ], "name": "netherrocks:ashstone_gem" @@ -84,7 +94,12 @@ "functions": [ { "function": "minecraft:set_count", - "count": 1.0 + "count": { + "type": "minecraft:uniform", + "min": 1.0, + "max": 1.0 + }, + "add": false } ], "name": "netherrocks:dragonstone_gem" diff --git a/src/generated/resources/data/netherrocks/loot_tables/inject/stronghold.json b/src/generated/resources/data/netherrocks/loot_tables/inject/stronghold.json index 1624a0d2..060ecb31 100644 --- a/src/generated/resources/data/netherrocks/loot_tables/inject/stronghold.json +++ b/src/generated/resources/data/netherrocks/loot_tables/inject/stronghold.json @@ -3,7 +3,12 @@ "pools": [ { "name": "main", - "rolls": 1.0, + "rolls": { + "type": "minecraft:uniform", + "min": 1.0, + "max": 1.0 + }, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", @@ -40,10 +45,11 @@ { "function": "minecraft:set_count", "count": { + "type": "minecraft:uniform", "min": 2.0, - "max": 4.0, - "type": "minecraft:uniform" - } + "max": 4.0 + }, + "add": false } ], "name": "netherrocks:malachite_ingot" @@ -55,10 +61,11 @@ { "function": "minecraft:set_count", "count": { + "type": "minecraft:uniform", "min": 1.0, - "max": 3.0, - "type": "minecraft:uniform" - } + "max": 3.0 + }, + "add": false } ], "name": "netherrocks:argonite_ingot" @@ -70,10 +77,11 @@ { "function": "minecraft:set_count", "count": { + "type": "minecraft:uniform", "min": 1.0, - "max": 2.0, - "type": "minecraft:uniform" - } + "max": 2.0 + }, + "add": false } ], "name": "netherrocks:fyrite_ingot" @@ -84,10 +92,11 @@ { "function": "minecraft:set_count", "count": { + "type": "minecraft:uniform", "min": 1.0, - "max": 2.0, - "type": "minecraft:uniform" - } + "max": 2.0 + }, + "add": false } ], "name": "netherrocks:illumenite_ingot" diff --git a/src/generated/resources/data/netherrocks/recipes/argonite_axe.json b/src/generated/resources/data/netherrocks/recipes/argonite_axe.json new file mode 100644 index 00000000..8489f48a --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/argonite_axe.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "SS ", + "ST ", + " T " + ], + "key": { + "S": { + "item": "netherrocks:argonite_ingot" + }, + "T": { + "tag": "forge:rods/wooden" + } + }, + "result": { + "item": "netherrocks:argonite_axe" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/argonite_bars.json b/src/generated/resources/data/netherrocks/recipes/argonite_bars.json new file mode 100644 index 00000000..786e4cf6 --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/argonite_bars.json @@ -0,0 +1,29 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "flag": "aesthetics_enabled", + "type": "netherrocks:flag" + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "SSS", + "SSS" + ], + "key": { + "S": { + "item": "netherrocks:argonite_ingot" + } + }, + "result": { + "item": "netherrocks:argonite_bars", + "count": 16 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/argonite_block.json b/src/generated/resources/data/netherrocks/recipes/argonite_block.json new file mode 100644 index 00000000..3a4ae70a --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/argonite_block.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "SSS", + "SSS", + "SSS" + ], + "key": { + "S": { + "item": "netherrocks:argonite_ingot" + } + }, + "result": { + "item": "netherrocks:argonite_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/argonite_brick_slab.json b/src/generated/resources/data/netherrocks/recipes/argonite_brick_slab.json new file mode 100644 index 00000000..bb2d7a68 --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/argonite_brick_slab.json @@ -0,0 +1,30 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "flag": "aesthetics_enabled", + "type": "netherrocks:flag" + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " ", + " ", + "SSS" + ], + "key": { + "S": { + "item": "netherrocks:argonite_bricks" + } + }, + "result": { + "item": "netherrocks:argonite_brick_slab", + "count": 6 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/argonite_brick_slab_stonecutting.json b/src/generated/resources/data/netherrocks/recipes/argonite_brick_slab_stonecutting.json new file mode 100644 index 00000000..d34fc0bd --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/argonite_brick_slab_stonecutting.json @@ -0,0 +1,21 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "flag": "aesthetics_enabled", + "type": "netherrocks:flag" + } + ], + "recipe": { + "type": "minecraft:stonecutting", + "ingredient": { + "item": "netherrocks:argonite_bricks" + }, + "result": "netherrocks:argonite_brick_slab", + "count": 2 + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/argonite_brick_stairs.json b/src/generated/resources/data/netherrocks/recipes/argonite_brick_stairs.json new file mode 100644 index 00000000..3fd76409 --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/argonite_brick_stairs.json @@ -0,0 +1,30 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "flag": "aesthetics_enabled", + "type": "netherrocks:flag" + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "S ", + "SS ", + "SSS" + ], + "key": { + "S": { + "item": "netherrocks:argonite_bricks" + } + }, + "result": { + "item": "netherrocks:argonite_brick_stairs", + "count": 4 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/argonite_brick_stairs_stonecutting.json b/src/generated/resources/data/netherrocks/recipes/argonite_brick_stairs_stonecutting.json new file mode 100644 index 00000000..a6fd2064 --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/argonite_brick_stairs_stonecutting.json @@ -0,0 +1,21 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "flag": "aesthetics_enabled", + "type": "netherrocks:flag" + } + ], + "recipe": { + "type": "minecraft:stonecutting", + "ingredient": { + "item": "netherrocks:argonite_bricks" + }, + "result": "netherrocks:argonite_brick_stairs", + "count": 1 + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/argonite_bricks.json b/src/generated/resources/data/netherrocks/recipes/argonite_bricks.json new file mode 100644 index 00000000..2126b6bc --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/argonite_bricks.json @@ -0,0 +1,28 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "flag": "aesthetics_enabled", + "type": "netherrocks:flag" + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "SS", + "SS" + ], + "key": { + "S": { + "item": "netherrocks:argonite_ingot" + } + }, + "result": { + "item": "netherrocks:argonite_bricks" + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/argonite_door.json b/src/generated/resources/data/netherrocks/recipes/argonite_door.json new file mode 100644 index 00000000..a9e01243 --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/argonite_door.json @@ -0,0 +1,30 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "flag": "aesthetics_enabled", + "type": "netherrocks:flag" + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " SS", + " SS", + " SS" + ], + "key": { + "S": { + "item": "netherrocks:argonite_ingot" + } + }, + "result": { + "item": "netherrocks:argonite_door", + "count": 3 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/argonite_hoe.json b/src/generated/resources/data/netherrocks/recipes/argonite_hoe.json new file mode 100644 index 00000000..1025a2cc --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/argonite_hoe.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "SS ", + " T ", + " T " + ], + "key": { + "S": { + "item": "netherrocks:argonite_ingot" + }, + "T": { + "tag": "forge:rods/wooden" + } + }, + "result": { + "item": "netherrocks:argonite_hoe" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/argonite_ingot.json b/src/generated/resources/data/netherrocks/recipes/argonite_ingot.json new file mode 100644 index 00000000..c36de52c --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/argonite_ingot.json @@ -0,0 +1,12 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "netherrocks:argonite_block" + } + ], + "result": { + "item": "netherrocks:argonite_ingot", + "count": 9 + } +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/argonite_ingot_from_blasting.json b/src/generated/resources/data/netherrocks/recipes/argonite_ingot_from_blasting.json new file mode 100644 index 00000000..e9b9fc10 --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/argonite_ingot_from_blasting.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:blasting", + "ingredient": { + "item": "netherrocks:raw_argonite" + }, + "result": "netherrocks:argonite_ingot", + "experience": 0.7, + "cookingtime": 100 +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/argonite_ingot_from_blasting_from_ore.json b/src/generated/resources/data/netherrocks/recipes/argonite_ingot_from_blasting_from_ore.json new file mode 100644 index 00000000..a3108d4b --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/argonite_ingot_from_blasting_from_ore.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:blasting", + "ingredient": { + "item": "netherrocks:argonite_ore" + }, + "result": "netherrocks:argonite_ingot", + "experience": 0.7, + "cookingtime": 100 +} \ No newline at end of file diff --git a/src/main/resources/data/netherrocks/recipes/argonite_ingot_from_nuggets.json b/src/generated/resources/data/netherrocks/recipes/argonite_ingot_from_nuggets.json similarity index 72% rename from src/main/resources/data/netherrocks/recipes/argonite_ingot_from_nuggets.json rename to src/generated/resources/data/netherrocks/recipes/argonite_ingot_from_nuggets.json index 512ba53c..218b880d 100644 --- a/src/main/resources/data/netherrocks/recipes/argonite_ingot_from_nuggets.json +++ b/src/generated/resources/data/netherrocks/recipes/argonite_ingot_from_nuggets.json @@ -1,13 +1,12 @@ { "type": "minecraft:crafting_shaped", - "group": "argonite_ingot", "pattern": [ - "###", - "###", - "###" + "SSS", + "SSS", + "SSS" ], "key": { - "#": { + "S": { "item": "netherrocks:argonite_nugget" } }, diff --git a/src/generated/resources/data/netherrocks/recipes/argonite_ingot_from_smelting.json b/src/generated/resources/data/netherrocks/recipes/argonite_ingot_from_smelting.json new file mode 100644 index 00000000..aeffb687 --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/argonite_ingot_from_smelting.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:smelting", + "ingredient": { + "item": "netherrocks:raw_argonite" + }, + "result": "netherrocks:argonite_ingot", + "experience": 0.7, + "cookingtime": 200 +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/argonite_ingot_from_smelting_from_ore.json b/src/generated/resources/data/netherrocks/recipes/argonite_ingot_from_smelting_from_ore.json new file mode 100644 index 00000000..329b8a6b --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/argonite_ingot_from_smelting_from_ore.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:smelting", + "ingredient": { + "item": "netherrocks:argonite_ore" + }, + "result": "netherrocks:argonite_ingot", + "experience": 0.7, + "cookingtime": 200 +} \ No newline at end of file diff --git a/src/main/resources/data/netherrocks/recipes/argonite_nugget.json b/src/generated/resources/data/netherrocks/recipes/argonite_nugget.json similarity index 100% rename from src/main/resources/data/netherrocks/recipes/argonite_nugget.json rename to src/generated/resources/data/netherrocks/recipes/argonite_nugget.json diff --git a/src/main/resources/data/netherrocks/recipes/argonite_nugget_from_blasting.json b/src/generated/resources/data/netherrocks/recipes/argonite_nugget_from_blasting.json similarity index 100% rename from src/main/resources/data/netherrocks/recipes/argonite_nugget_from_blasting.json rename to src/generated/resources/data/netherrocks/recipes/argonite_nugget_from_blasting.json index a565123f..fb7a636f 100644 --- a/src/main/resources/data/netherrocks/recipes/argonite_nugget_from_blasting.json +++ b/src/generated/resources/data/netherrocks/recipes/argonite_nugget_from_blasting.json @@ -2,16 +2,16 @@ "type": "minecraft:blasting", "ingredient": [ { - "item": "netherrocks:argonite_pickaxe" + "item": "netherrocks:argonite_axe" }, { - "item": "netherrocks:argonite_shovel" + "item": "netherrocks:argonite_hoe" }, { - "item": "netherrocks:argonite_axe" + "item": "netherrocks:argonite_pickaxe" }, { - "item": "netherrocks:argonite_hoe" + "item": "netherrocks:argonite_shovel" }, { "item": "netherrocks:argonite_sword" diff --git a/src/main/resources/data/netherrocks/recipes/argonite_nugget_from_smelting.json b/src/generated/resources/data/netherrocks/recipes/argonite_nugget_from_smelting.json similarity index 100% rename from src/main/resources/data/netherrocks/recipes/argonite_nugget_from_smelting.json rename to src/generated/resources/data/netherrocks/recipes/argonite_nugget_from_smelting.json index 19dd825c..fd2c272e 100644 --- a/src/main/resources/data/netherrocks/recipes/argonite_nugget_from_smelting.json +++ b/src/generated/resources/data/netherrocks/recipes/argonite_nugget_from_smelting.json @@ -2,16 +2,16 @@ "type": "minecraft:smelting", "ingredient": [ { - "item": "netherrocks:argonite_pickaxe" + "item": "netherrocks:argonite_axe" }, { - "item": "netherrocks:argonite_shovel" + "item": "netherrocks:argonite_hoe" }, { - "item": "netherrocks:argonite_axe" + "item": "netherrocks:argonite_pickaxe" }, { - "item": "netherrocks:argonite_hoe" + "item": "netherrocks:argonite_shovel" }, { "item": "netherrocks:argonite_sword" diff --git a/src/generated/resources/data/netherrocks/recipes/argonite_pickaxe.json b/src/generated/resources/data/netherrocks/recipes/argonite_pickaxe.json new file mode 100644 index 00000000..d6cd8560 --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/argonite_pickaxe.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "SSS", + " T ", + " T " + ], + "key": { + "S": { + "item": "netherrocks:argonite_ingot" + }, + "T": { + "tag": "forge:rods/wooden" + } + }, + "result": { + "item": "netherrocks:argonite_pickaxe" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/argonite_shovel.json b/src/generated/resources/data/netherrocks/recipes/argonite_shovel.json new file mode 100644 index 00000000..e21c6220 --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/argonite_shovel.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + " S ", + " T ", + " T " + ], + "key": { + "S": { + "item": "netherrocks:argonite_ingot" + }, + "T": { + "tag": "forge:rods/wooden" + } + }, + "result": { + "item": "netherrocks:argonite_shovel" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/argonite_sword.json b/src/generated/resources/data/netherrocks/recipes/argonite_sword.json new file mode 100644 index 00000000..6e370ede --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/argonite_sword.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + " S ", + " S ", + " T " + ], + "key": { + "S": { + "item": "netherrocks:argonite_ingot" + }, + "T": { + "tag": "forge:rods/wooden" + } + }, + "result": { + "item": "netherrocks:argonite_sword" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/ashstone_axe.json b/src/generated/resources/data/netherrocks/recipes/ashstone_axe.json new file mode 100644 index 00000000..c1b5cdb8 --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/ashstone_axe.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "SS ", + "ST ", + " T " + ], + "key": { + "S": { + "item": "netherrocks:ashstone_gem" + }, + "T": { + "tag": "forge:rods/wooden" + } + }, + "result": { + "item": "netherrocks:ashstone_axe" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/ashstone_bars.json b/src/generated/resources/data/netherrocks/recipes/ashstone_bars.json new file mode 100644 index 00000000..2530f36c --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/ashstone_bars.json @@ -0,0 +1,29 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "flag": "aesthetics_enabled", + "type": "netherrocks:flag" + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "SSS", + "SSS" + ], + "key": { + "S": { + "item": "netherrocks:ashstone_gem" + } + }, + "result": { + "item": "netherrocks:ashstone_bars", + "count": 16 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/ashstone_block.json b/src/generated/resources/data/netherrocks/recipes/ashstone_block.json new file mode 100644 index 00000000..d646bb62 --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/ashstone_block.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "SSS", + "SSS", + "SSS" + ], + "key": { + "S": { + "item": "netherrocks:ashstone_gem" + } + }, + "result": { + "item": "netherrocks:ashstone_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/ashstone_brick_slab.json b/src/generated/resources/data/netherrocks/recipes/ashstone_brick_slab.json new file mode 100644 index 00000000..2f3f847f --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/ashstone_brick_slab.json @@ -0,0 +1,30 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "flag": "aesthetics_enabled", + "type": "netherrocks:flag" + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " ", + " ", + "SSS" + ], + "key": { + "S": { + "item": "netherrocks:ashstone_bricks" + } + }, + "result": { + "item": "netherrocks:ashstone_brick_slab", + "count": 6 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/ashstone_brick_slab_stonecutting.json b/src/generated/resources/data/netherrocks/recipes/ashstone_brick_slab_stonecutting.json new file mode 100644 index 00000000..f05ab768 --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/ashstone_brick_slab_stonecutting.json @@ -0,0 +1,21 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "flag": "aesthetics_enabled", + "type": "netherrocks:flag" + } + ], + "recipe": { + "type": "minecraft:stonecutting", + "ingredient": { + "item": "netherrocks:ashstone_bricks" + }, + "result": "netherrocks:ashstone_brick_slab", + "count": 2 + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/ashstone_brick_stairs.json b/src/generated/resources/data/netherrocks/recipes/ashstone_brick_stairs.json new file mode 100644 index 00000000..c2ef11d0 --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/ashstone_brick_stairs.json @@ -0,0 +1,30 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "flag": "aesthetics_enabled", + "type": "netherrocks:flag" + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "S ", + "SS ", + "SSS" + ], + "key": { + "S": { + "item": "netherrocks:ashstone_bricks" + } + }, + "result": { + "item": "netherrocks:ashstone_brick_stairs", + "count": 4 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/ashstone_brick_stairs_stonecutting.json b/src/generated/resources/data/netherrocks/recipes/ashstone_brick_stairs_stonecutting.json new file mode 100644 index 00000000..bebd2c47 --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/ashstone_brick_stairs_stonecutting.json @@ -0,0 +1,21 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "flag": "aesthetics_enabled", + "type": "netherrocks:flag" + } + ], + "recipe": { + "type": "minecraft:stonecutting", + "ingredient": { + "item": "netherrocks:ashstone_bricks" + }, + "result": "netherrocks:ashstone_brick_stairs", + "count": 1 + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/ashstone_bricks.json b/src/generated/resources/data/netherrocks/recipes/ashstone_bricks.json new file mode 100644 index 00000000..de2f37f0 --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/ashstone_bricks.json @@ -0,0 +1,28 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "flag": "aesthetics_enabled", + "type": "netherrocks:flag" + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "SS", + "SS" + ], + "key": { + "S": { + "item": "netherrocks:ashstone_gem" + } + }, + "result": { + "item": "netherrocks:ashstone_bricks" + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/ashstone_door.json b/src/generated/resources/data/netherrocks/recipes/ashstone_door.json new file mode 100644 index 00000000..cc150e92 --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/ashstone_door.json @@ -0,0 +1,30 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "flag": "aesthetics_enabled", + "type": "netherrocks:flag" + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " SS", + " SS", + " SS" + ], + "key": { + "S": { + "item": "netherrocks:ashstone_gem" + } + }, + "result": { + "item": "netherrocks:ashstone_door", + "count": 3 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/ashstone_gem.json b/src/generated/resources/data/netherrocks/recipes/ashstone_gem.json new file mode 100644 index 00000000..396798be --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/ashstone_gem.json @@ -0,0 +1,12 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "netherrocks:ashstone_block" + } + ], + "result": { + "item": "netherrocks:ashstone_gem", + "count": 9 + } +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/ashstone_gem_from_blasting_from_ore.json b/src/generated/resources/data/netherrocks/recipes/ashstone_gem_from_blasting_from_ore.json new file mode 100644 index 00000000..0b839386 --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/ashstone_gem_from_blasting_from_ore.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:blasting", + "ingredient": { + "item": "netherrocks:ashstone_ore" + }, + "result": "netherrocks:ashstone_gem", + "experience": 0.8, + "cookingtime": 100 +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/ashstone_gem_from_smelting_from_ore.json b/src/generated/resources/data/netherrocks/recipes/ashstone_gem_from_smelting_from_ore.json new file mode 100644 index 00000000..97138a6a --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/ashstone_gem_from_smelting_from_ore.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:smelting", + "ingredient": { + "item": "netherrocks:ashstone_ore" + }, + "result": "netherrocks:ashstone_gem", + "experience": 0.8, + "cookingtime": 200 +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/ashstone_hoe.json b/src/generated/resources/data/netherrocks/recipes/ashstone_hoe.json new file mode 100644 index 00000000..cec9b17f --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/ashstone_hoe.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "SS ", + " T ", + " T " + ], + "key": { + "S": { + "item": "netherrocks:ashstone_gem" + }, + "T": { + "tag": "forge:rods/wooden" + } + }, + "result": { + "item": "netherrocks:ashstone_hoe" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/ashstone_pickaxe.json b/src/generated/resources/data/netherrocks/recipes/ashstone_pickaxe.json new file mode 100644 index 00000000..42d7431b --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/ashstone_pickaxe.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "SSS", + " T ", + " T " + ], + "key": { + "S": { + "item": "netherrocks:ashstone_gem" + }, + "T": { + "tag": "forge:rods/wooden" + } + }, + "result": { + "item": "netherrocks:ashstone_pickaxe" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/ashstone_shovel.json b/src/generated/resources/data/netherrocks/recipes/ashstone_shovel.json new file mode 100644 index 00000000..e9b8b94c --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/ashstone_shovel.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + " S ", + " T ", + " T " + ], + "key": { + "S": { + "item": "netherrocks:ashstone_gem" + }, + "T": { + "tag": "forge:rods/wooden" + } + }, + "result": { + "item": "netherrocks:ashstone_shovel" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/ashstone_sword.json b/src/generated/resources/data/netherrocks/recipes/ashstone_sword.json new file mode 100644 index 00000000..49c3ae0d --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/ashstone_sword.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + " S ", + " S ", + " T " + ], + "key": { + "S": { + "item": "netherrocks:ashstone_gem" + }, + "T": { + "tag": "forge:rods/wooden" + } + }, + "result": { + "item": "netherrocks:ashstone_sword" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/dragonstone_axe.json b/src/generated/resources/data/netherrocks/recipes/dragonstone_axe.json new file mode 100644 index 00000000..bddd252f --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/dragonstone_axe.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "SS ", + "ST ", + " T " + ], + "key": { + "S": { + "item": "netherrocks:dragonstone_gem" + }, + "T": { + "tag": "forge:rods/wooden" + } + }, + "result": { + "item": "netherrocks:dragonstone_axe" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/dragonstone_bars.json b/src/generated/resources/data/netherrocks/recipes/dragonstone_bars.json new file mode 100644 index 00000000..111e6efc --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/dragonstone_bars.json @@ -0,0 +1,29 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "flag": "aesthetics_enabled", + "type": "netherrocks:flag" + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "SSS", + "SSS" + ], + "key": { + "S": { + "item": "netherrocks:dragonstone_gem" + } + }, + "result": { + "item": "netherrocks:dragonstone_bars", + "count": 16 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/dragonstone_block.json b/src/generated/resources/data/netherrocks/recipes/dragonstone_block.json new file mode 100644 index 00000000..6e82c8b3 --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/dragonstone_block.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "SSS", + "SSS", + "SSS" + ], + "key": { + "S": { + "item": "netherrocks:dragonstone_gem" + } + }, + "result": { + "item": "netherrocks:dragonstone_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/dragonstone_boots.json b/src/generated/resources/data/netherrocks/recipes/dragonstone_boots.json new file mode 100644 index 00000000..23f62fd0 --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/dragonstone_boots.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + " ", + "S S", + "S S" + ], + "key": { + "S": { + "item": "netherrocks:dragonstone_gem" + } + }, + "result": { + "item": "netherrocks:dragonstone_boots" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/dragonstone_brick_slab.json b/src/generated/resources/data/netherrocks/recipes/dragonstone_brick_slab.json new file mode 100644 index 00000000..201f3219 --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/dragonstone_brick_slab.json @@ -0,0 +1,30 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "flag": "aesthetics_enabled", + "type": "netherrocks:flag" + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " ", + " ", + "SSS" + ], + "key": { + "S": { + "item": "netherrocks:dragonstone_bricks" + } + }, + "result": { + "item": "netherrocks:dragonstone_brick_slab", + "count": 6 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/dragonstone_brick_slab_stonecutting.json b/src/generated/resources/data/netherrocks/recipes/dragonstone_brick_slab_stonecutting.json new file mode 100644 index 00000000..a4f59fba --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/dragonstone_brick_slab_stonecutting.json @@ -0,0 +1,21 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "flag": "aesthetics_enabled", + "type": "netherrocks:flag" + } + ], + "recipe": { + "type": "minecraft:stonecutting", + "ingredient": { + "item": "netherrocks:dragonstone_bricks" + }, + "result": "netherrocks:dragonstone_brick_slab", + "count": 2 + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/dragonstone_brick_stairs.json b/src/generated/resources/data/netherrocks/recipes/dragonstone_brick_stairs.json new file mode 100644 index 00000000..fc6006e2 --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/dragonstone_brick_stairs.json @@ -0,0 +1,30 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "flag": "aesthetics_enabled", + "type": "netherrocks:flag" + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "S ", + "SS ", + "SSS" + ], + "key": { + "S": { + "item": "netherrocks:dragonstone_bricks" + } + }, + "result": { + "item": "netherrocks:dragonstone_brick_stairs", + "count": 4 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/dragonstone_brick_stairs_stonecutting.json b/src/generated/resources/data/netherrocks/recipes/dragonstone_brick_stairs_stonecutting.json new file mode 100644 index 00000000..19abf44c --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/dragonstone_brick_stairs_stonecutting.json @@ -0,0 +1,21 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "flag": "aesthetics_enabled", + "type": "netherrocks:flag" + } + ], + "recipe": { + "type": "minecraft:stonecutting", + "ingredient": { + "item": "netherrocks:dragonstone_bricks" + }, + "result": "netherrocks:dragonstone_brick_stairs", + "count": 1 + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/dragonstone_bricks.json b/src/generated/resources/data/netherrocks/recipes/dragonstone_bricks.json new file mode 100644 index 00000000..507817b8 --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/dragonstone_bricks.json @@ -0,0 +1,28 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "flag": "aesthetics_enabled", + "type": "netherrocks:flag" + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "SS", + "SS" + ], + "key": { + "S": { + "item": "netherrocks:dragonstone_gem" + } + }, + "result": { + "item": "netherrocks:dragonstone_bricks" + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/dragonstone_chestplate.json b/src/generated/resources/data/netherrocks/recipes/dragonstone_chestplate.json new file mode 100644 index 00000000..20bd7aeb --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/dragonstone_chestplate.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "S S", + "SSS", + "SSS" + ], + "key": { + "S": { + "item": "netherrocks:dragonstone_gem" + } + }, + "result": { + "item": "netherrocks:dragonstone_chestplate" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/dragonstone_door.json b/src/generated/resources/data/netherrocks/recipes/dragonstone_door.json new file mode 100644 index 00000000..bff6eb1f --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/dragonstone_door.json @@ -0,0 +1,30 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "flag": "aesthetics_enabled", + "type": "netherrocks:flag" + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " SS", + " SS", + " SS" + ], + "key": { + "S": { + "item": "netherrocks:dragonstone_gem" + } + }, + "result": { + "item": "netherrocks:dragonstone_door", + "count": 3 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/dragonstone_gem.json b/src/generated/resources/data/netherrocks/recipes/dragonstone_gem.json new file mode 100644 index 00000000..2d30765c --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/dragonstone_gem.json @@ -0,0 +1,12 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "netherrocks:dragonstone_block" + } + ], + "result": { + "item": "netherrocks:dragonstone_gem", + "count": 9 + } +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/dragonstone_gem_from_blasting_from_ore.json b/src/generated/resources/data/netherrocks/recipes/dragonstone_gem_from_blasting_from_ore.json new file mode 100644 index 00000000..12d52de9 --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/dragonstone_gem_from_blasting_from_ore.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:blasting", + "ingredient": { + "item": "netherrocks:dragonstone_ore" + }, + "result": "netherrocks:dragonstone_gem", + "experience": 0.8, + "cookingtime": 100 +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/dragonstone_gem_from_smelting_from_ore.json b/src/generated/resources/data/netherrocks/recipes/dragonstone_gem_from_smelting_from_ore.json new file mode 100644 index 00000000..50a34b52 --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/dragonstone_gem_from_smelting_from_ore.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:smelting", + "ingredient": { + "item": "netherrocks:dragonstone_ore" + }, + "result": "netherrocks:dragonstone_gem", + "experience": 0.8, + "cookingtime": 200 +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/dragonstone_helmet.json b/src/generated/resources/data/netherrocks/recipes/dragonstone_helmet.json new file mode 100644 index 00000000..28a37412 --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/dragonstone_helmet.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "SSS", + "S S", + " " + ], + "key": { + "S": { + "item": "netherrocks:dragonstone_gem" + } + }, + "result": { + "item": "netherrocks:dragonstone_helmet" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/dragonstone_hoe.json b/src/generated/resources/data/netherrocks/recipes/dragonstone_hoe.json new file mode 100644 index 00000000..c2be97ac --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/dragonstone_hoe.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "SS ", + " T ", + " T " + ], + "key": { + "S": { + "item": "netherrocks:dragonstone_gem" + }, + "T": { + "tag": "forge:rods/wooden" + } + }, + "result": { + "item": "netherrocks:dragonstone_hoe" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/dragonstone_leggings.json b/src/generated/resources/data/netherrocks/recipes/dragonstone_leggings.json new file mode 100644 index 00000000..72dd041d --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/dragonstone_leggings.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "SSS", + "S S", + "S S" + ], + "key": { + "S": { + "item": "netherrocks:dragonstone_gem" + } + }, + "result": { + "item": "netherrocks:dragonstone_leggings" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/dragonstone_pickaxe.json b/src/generated/resources/data/netherrocks/recipes/dragonstone_pickaxe.json new file mode 100644 index 00000000..8ccedee7 --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/dragonstone_pickaxe.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "SSS", + " T ", + " T " + ], + "key": { + "S": { + "item": "netherrocks:dragonstone_gem" + }, + "T": { + "tag": "forge:rods/wooden" + } + }, + "result": { + "item": "netherrocks:dragonstone_pickaxe" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/dragonstone_shovel.json b/src/generated/resources/data/netherrocks/recipes/dragonstone_shovel.json new file mode 100644 index 00000000..5e1e5aa5 --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/dragonstone_shovel.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + " S ", + " T ", + " T " + ], + "key": { + "S": { + "item": "netherrocks:dragonstone_gem" + }, + "T": { + "tag": "forge:rods/wooden" + } + }, + "result": { + "item": "netherrocks:dragonstone_shovel" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/dragonstone_sword.json b/src/generated/resources/data/netherrocks/recipes/dragonstone_sword.json new file mode 100644 index 00000000..9f185734 --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/dragonstone_sword.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + " S ", + " S ", + " T " + ], + "key": { + "S": { + "item": "netherrocks:dragonstone_gem" + }, + "T": { + "tag": "forge:rods/wooden" + } + }, + "result": { + "item": "netherrocks:dragonstone_sword" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/fyrite_axe.json b/src/generated/resources/data/netherrocks/recipes/fyrite_axe.json new file mode 100644 index 00000000..65de4970 --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/fyrite_axe.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "SS ", + "ST ", + " T " + ], + "key": { + "S": { + "item": "netherrocks:fyrite_ingot" + }, + "T": { + "tag": "forge:rods/wooden" + } + }, + "result": { + "item": "netherrocks:fyrite_axe" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/fyrite_bars.json b/src/generated/resources/data/netherrocks/recipes/fyrite_bars.json new file mode 100644 index 00000000..b1abb10b --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/fyrite_bars.json @@ -0,0 +1,29 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "flag": "aesthetics_enabled", + "type": "netherrocks:flag" + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "SSS", + "SSS" + ], + "key": { + "S": { + "item": "netherrocks:fyrite_ingot" + } + }, + "result": { + "item": "netherrocks:fyrite_bars", + "count": 16 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/fyrite_block.json b/src/generated/resources/data/netherrocks/recipes/fyrite_block.json new file mode 100644 index 00000000..e08cede9 --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/fyrite_block.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "SSS", + "SSS", + "SSS" + ], + "key": { + "S": { + "item": "netherrocks:fyrite_ingot" + } + }, + "result": { + "item": "netherrocks:fyrite_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/fyrite_boots.json b/src/generated/resources/data/netherrocks/recipes/fyrite_boots.json new file mode 100644 index 00000000..14347bfa --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/fyrite_boots.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + " ", + "S S", + "S S" + ], + "key": { + "S": { + "item": "netherrocks:fyrite_ingot" + } + }, + "result": { + "item": "netherrocks:fyrite_boots" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/fyrite_brick_slab.json b/src/generated/resources/data/netherrocks/recipes/fyrite_brick_slab.json new file mode 100644 index 00000000..efb8e285 --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/fyrite_brick_slab.json @@ -0,0 +1,30 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "flag": "aesthetics_enabled", + "type": "netherrocks:flag" + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " ", + " ", + "SSS" + ], + "key": { + "S": { + "item": "netherrocks:fyrite_bricks" + } + }, + "result": { + "item": "netherrocks:fyrite_brick_slab", + "count": 6 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/fyrite_brick_slab_stonecutting.json b/src/generated/resources/data/netherrocks/recipes/fyrite_brick_slab_stonecutting.json new file mode 100644 index 00000000..32fd748c --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/fyrite_brick_slab_stonecutting.json @@ -0,0 +1,21 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "flag": "aesthetics_enabled", + "type": "netherrocks:flag" + } + ], + "recipe": { + "type": "minecraft:stonecutting", + "ingredient": { + "item": "netherrocks:fyrite_bricks" + }, + "result": "netherrocks:fyrite_brick_slab", + "count": 2 + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/fyrite_brick_stairs.json b/src/generated/resources/data/netherrocks/recipes/fyrite_brick_stairs.json new file mode 100644 index 00000000..a45e3e13 --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/fyrite_brick_stairs.json @@ -0,0 +1,30 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "flag": "aesthetics_enabled", + "type": "netherrocks:flag" + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "S ", + "SS ", + "SSS" + ], + "key": { + "S": { + "item": "netherrocks:fyrite_bricks" + } + }, + "result": { + "item": "netherrocks:fyrite_brick_stairs", + "count": 4 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/fyrite_brick_stairs_stonecutting.json b/src/generated/resources/data/netherrocks/recipes/fyrite_brick_stairs_stonecutting.json new file mode 100644 index 00000000..762a55a0 --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/fyrite_brick_stairs_stonecutting.json @@ -0,0 +1,21 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "flag": "aesthetics_enabled", + "type": "netherrocks:flag" + } + ], + "recipe": { + "type": "minecraft:stonecutting", + "ingredient": { + "item": "netherrocks:fyrite_bricks" + }, + "result": "netherrocks:fyrite_brick_stairs", + "count": 1 + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/fyrite_bricks.json b/src/generated/resources/data/netherrocks/recipes/fyrite_bricks.json new file mode 100644 index 00000000..e00600b6 --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/fyrite_bricks.json @@ -0,0 +1,28 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "flag": "aesthetics_enabled", + "type": "netherrocks:flag" + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "SS", + "SS" + ], + "key": { + "S": { + "item": "netherrocks:fyrite_ingot" + } + }, + "result": { + "item": "netherrocks:fyrite_bricks" + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/fyrite_chestplate.json b/src/generated/resources/data/netherrocks/recipes/fyrite_chestplate.json new file mode 100644 index 00000000..2c958e2e --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/fyrite_chestplate.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "S S", + "SSS", + "SSS" + ], + "key": { + "S": { + "item": "netherrocks:fyrite_ingot" + } + }, + "result": { + "item": "netherrocks:fyrite_chestplate" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/fyrite_door.json b/src/generated/resources/data/netherrocks/recipes/fyrite_door.json new file mode 100644 index 00000000..6083e519 --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/fyrite_door.json @@ -0,0 +1,30 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "flag": "aesthetics_enabled", + "type": "netherrocks:flag" + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " SS", + " SS", + " SS" + ], + "key": { + "S": { + "item": "netherrocks:fyrite_ingot" + } + }, + "result": { + "item": "netherrocks:fyrite_door", + "count": 3 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/fyrite_helmet.json b/src/generated/resources/data/netherrocks/recipes/fyrite_helmet.json new file mode 100644 index 00000000..0b91d4bc --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/fyrite_helmet.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "SSS", + "S S", + " " + ], + "key": { + "S": { + "item": "netherrocks:fyrite_ingot" + } + }, + "result": { + "item": "netherrocks:fyrite_helmet" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/fyrite_ingot.json b/src/generated/resources/data/netherrocks/recipes/fyrite_ingot.json new file mode 100644 index 00000000..7f1c5775 --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/fyrite_ingot.json @@ -0,0 +1,12 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "netherrocks:fyrite_block" + } + ], + "result": { + "item": "netherrocks:fyrite_ingot", + "count": 9 + } +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/fyrite_ingot_from_blasting.json b/src/generated/resources/data/netherrocks/recipes/fyrite_ingot_from_blasting.json new file mode 100644 index 00000000..90eb2c49 --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/fyrite_ingot_from_blasting.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:blasting", + "ingredient": { + "item": "netherrocks:raw_fyrite" + }, + "result": "netherrocks:fyrite_ingot", + "experience": 0.8, + "cookingtime": 100 +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/fyrite_ingot_from_blasting_from_ore.json b/src/generated/resources/data/netherrocks/recipes/fyrite_ingot_from_blasting_from_ore.json new file mode 100644 index 00000000..c807f0b2 --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/fyrite_ingot_from_blasting_from_ore.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:blasting", + "ingredient": { + "item": "netherrocks:fyrite_ore" + }, + "result": "netherrocks:fyrite_ingot", + "experience": 0.8, + "cookingtime": 100 +} \ No newline at end of file diff --git a/src/main/resources/data/netherrocks/recipes/fyrite_ingot_from_nuggets.json b/src/generated/resources/data/netherrocks/recipes/fyrite_ingot_from_nuggets.json similarity index 72% rename from src/main/resources/data/netherrocks/recipes/fyrite_ingot_from_nuggets.json rename to src/generated/resources/data/netherrocks/recipes/fyrite_ingot_from_nuggets.json index 79759ae3..c9c5d98b 100644 --- a/src/main/resources/data/netherrocks/recipes/fyrite_ingot_from_nuggets.json +++ b/src/generated/resources/data/netherrocks/recipes/fyrite_ingot_from_nuggets.json @@ -1,13 +1,12 @@ { "type": "minecraft:crafting_shaped", - "group": "fyrite_ingot", "pattern": [ - "###", - "###", - "###" + "SSS", + "SSS", + "SSS" ], "key": { - "#": { + "S": { "item": "netherrocks:fyrite_nugget" } }, diff --git a/src/generated/resources/data/netherrocks/recipes/fyrite_ingot_from_smelting.json b/src/generated/resources/data/netherrocks/recipes/fyrite_ingot_from_smelting.json new file mode 100644 index 00000000..950dfdaa --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/fyrite_ingot_from_smelting.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:smelting", + "ingredient": { + "item": "netherrocks:raw_fyrite" + }, + "result": "netherrocks:fyrite_ingot", + "experience": 0.8, + "cookingtime": 200 +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/fyrite_ingot_from_smelting_from_ore.json b/src/generated/resources/data/netherrocks/recipes/fyrite_ingot_from_smelting_from_ore.json new file mode 100644 index 00000000..671690c1 --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/fyrite_ingot_from_smelting_from_ore.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:smelting", + "ingredient": { + "item": "netherrocks:fyrite_ore" + }, + "result": "netherrocks:fyrite_ingot", + "experience": 0.8, + "cookingtime": 200 +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/fyrite_leggings.json b/src/generated/resources/data/netherrocks/recipes/fyrite_leggings.json new file mode 100644 index 00000000..32925573 --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/fyrite_leggings.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "SSS", + "S S", + "S S" + ], + "key": { + "S": { + "item": "netherrocks:fyrite_ingot" + } + }, + "result": { + "item": "netherrocks:fyrite_leggings" + } +} \ No newline at end of file diff --git a/src/main/resources/data/netherrocks/recipes/fyrite_nugget.json b/src/generated/resources/data/netherrocks/recipes/fyrite_nugget.json similarity index 100% rename from src/main/resources/data/netherrocks/recipes/fyrite_nugget.json rename to src/generated/resources/data/netherrocks/recipes/fyrite_nugget.json diff --git a/src/main/resources/data/netherrocks/recipes/fyrite_nugget_from_blasting.json b/src/generated/resources/data/netherrocks/recipes/fyrite_nugget_from_blasting.json similarity index 100% rename from src/main/resources/data/netherrocks/recipes/fyrite_nugget_from_blasting.json rename to src/generated/resources/data/netherrocks/recipes/fyrite_nugget_from_blasting.json index 0929179c..4b5118c2 100644 --- a/src/main/resources/data/netherrocks/recipes/fyrite_nugget_from_blasting.json +++ b/src/generated/resources/data/netherrocks/recipes/fyrite_nugget_from_blasting.json @@ -5,25 +5,25 @@ "item": "netherrocks:fyrite_axe" }, { - "item": "netherrocks:fyrite_boots" + "item": "netherrocks:fyrite_pickaxe" }, { - "item": "netherrocks:fyrite_chestplate" + "item": "netherrocks:fyrite_shovel" }, { - "item": "netherrocks:fyrite_helmet" + "item": "netherrocks:fyrite_boots" }, { - "item": "netherrocks:fyrite_leggings" + "item": "netherrocks:fyrite_sword" }, { - "item": "netherrocks:fyrite_pickaxe" + "item": "netherrocks:fyrite_chestplate" }, { - "item": "netherrocks:fyrite_shovel" + "item": "netherrocks:fyrite_helmet" }, { - "item": "netherrocks:fyrite_sword" + "item": "netherrocks:fyrite_leggings" } ], "result": "netherrocks:fyrite_nugget", diff --git a/src/main/resources/data/netherrocks/recipes/fyrite_nugget_from_smelting.json b/src/generated/resources/data/netherrocks/recipes/fyrite_nugget_from_smelting.json similarity index 100% rename from src/main/resources/data/netherrocks/recipes/fyrite_nugget_from_smelting.json rename to src/generated/resources/data/netherrocks/recipes/fyrite_nugget_from_smelting.json index 5016453d..037c415a 100644 --- a/src/main/resources/data/netherrocks/recipes/fyrite_nugget_from_smelting.json +++ b/src/generated/resources/data/netherrocks/recipes/fyrite_nugget_from_smelting.json @@ -5,25 +5,25 @@ "item": "netherrocks:fyrite_axe" }, { - "item": "netherrocks:fyrite_boots" + "item": "netherrocks:fyrite_pickaxe" }, { - "item": "netherrocks:fyrite_chestplate" + "item": "netherrocks:fyrite_shovel" }, { - "item": "netherrocks:fyrite_helmet" + "item": "netherrocks:fyrite_boots" }, { - "item": "netherrocks:fyrite_leggings" + "item": "netherrocks:fyrite_sword" }, { - "item": "netherrocks:fyrite_pickaxe" + "item": "netherrocks:fyrite_chestplate" }, { - "item": "netherrocks:fyrite_shovel" + "item": "netherrocks:fyrite_helmet" }, { - "item": "netherrocks:fyrite_sword" + "item": "netherrocks:fyrite_leggings" } ], "result": "netherrocks:fyrite_nugget", diff --git a/src/generated/resources/data/netherrocks/recipes/fyrite_pickaxe.json b/src/generated/resources/data/netherrocks/recipes/fyrite_pickaxe.json new file mode 100644 index 00000000..8bb77fb2 --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/fyrite_pickaxe.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "SSS", + " T ", + " T " + ], + "key": { + "S": { + "item": "netherrocks:fyrite_ingot" + }, + "T": { + "tag": "forge:rods/wooden" + } + }, + "result": { + "item": "netherrocks:fyrite_pickaxe" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/fyrite_shovel.json b/src/generated/resources/data/netherrocks/recipes/fyrite_shovel.json new file mode 100644 index 00000000..5d08fcca --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/fyrite_shovel.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + " S ", + " T ", + " T " + ], + "key": { + "S": { + "item": "netherrocks:fyrite_ingot" + }, + "T": { + "tag": "forge:rods/wooden" + } + }, + "result": { + "item": "netherrocks:fyrite_shovel" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/fyrite_sword.json b/src/generated/resources/data/netherrocks/recipes/fyrite_sword.json new file mode 100644 index 00000000..574555ff --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/fyrite_sword.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + " S ", + " S ", + " T " + ], + "key": { + "S": { + "item": "netherrocks:fyrite_ingot" + }, + "T": { + "tag": "forge:rods/wooden" + } + }, + "result": { + "item": "netherrocks:fyrite_sword" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/illumenite_bars.json b/src/generated/resources/data/netherrocks/recipes/illumenite_bars.json new file mode 100644 index 00000000..702f3934 --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/illumenite_bars.json @@ -0,0 +1,29 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "flag": "aesthetics_enabled", + "type": "netherrocks:flag" + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "SSS", + "SSS" + ], + "key": { + "S": { + "item": "netherrocks:illumenite_ingot" + } + }, + "result": { + "item": "netherrocks:illumenite_bars", + "count": 16 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/illumenite_block.json b/src/generated/resources/data/netherrocks/recipes/illumenite_block.json new file mode 100644 index 00000000..22c9e6ac --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/illumenite_block.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "SSS", + "SSS", + "SSS" + ], + "key": { + "S": { + "item": "netherrocks:illumenite_ingot" + } + }, + "result": { + "item": "netherrocks:illumenite_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/illumenite_boots.json b/src/generated/resources/data/netherrocks/recipes/illumenite_boots.json new file mode 100644 index 00000000..b453ef68 --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/illumenite_boots.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + " ", + "S S", + "S S" + ], + "key": { + "S": { + "item": "netherrocks:illumenite_ingot" + } + }, + "result": { + "item": "netherrocks:illumenite_boots" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/illumenite_brick_slab.json b/src/generated/resources/data/netherrocks/recipes/illumenite_brick_slab.json new file mode 100644 index 00000000..6f9c9b4d --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/illumenite_brick_slab.json @@ -0,0 +1,30 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "flag": "aesthetics_enabled", + "type": "netherrocks:flag" + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " ", + " ", + "SSS" + ], + "key": { + "S": { + "item": "netherrocks:illumenite_bricks" + } + }, + "result": { + "item": "netherrocks:illumenite_brick_slab", + "count": 6 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/illumenite_brick_slab_stonecutting.json b/src/generated/resources/data/netherrocks/recipes/illumenite_brick_slab_stonecutting.json new file mode 100644 index 00000000..31de90de --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/illumenite_brick_slab_stonecutting.json @@ -0,0 +1,21 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "flag": "aesthetics_enabled", + "type": "netherrocks:flag" + } + ], + "recipe": { + "type": "minecraft:stonecutting", + "ingredient": { + "item": "netherrocks:illumenite_bricks" + }, + "result": "netherrocks:illumenite_brick_slab", + "count": 2 + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/illumenite_brick_stairs.json b/src/generated/resources/data/netherrocks/recipes/illumenite_brick_stairs.json new file mode 100644 index 00000000..fa0ad5fb --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/illumenite_brick_stairs.json @@ -0,0 +1,30 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "flag": "aesthetics_enabled", + "type": "netherrocks:flag" + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "S ", + "SS ", + "SSS" + ], + "key": { + "S": { + "item": "netherrocks:illumenite_bricks" + } + }, + "result": { + "item": "netherrocks:illumenite_brick_stairs", + "count": 4 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/illumenite_brick_stairs_stonecutting.json b/src/generated/resources/data/netherrocks/recipes/illumenite_brick_stairs_stonecutting.json new file mode 100644 index 00000000..b4dea724 --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/illumenite_brick_stairs_stonecutting.json @@ -0,0 +1,21 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "flag": "aesthetics_enabled", + "type": "netherrocks:flag" + } + ], + "recipe": { + "type": "minecraft:stonecutting", + "ingredient": { + "item": "netherrocks:illumenite_bricks" + }, + "result": "netherrocks:illumenite_brick_stairs", + "count": 1 + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/illumenite_bricks.json b/src/generated/resources/data/netherrocks/recipes/illumenite_bricks.json new file mode 100644 index 00000000..422b972f --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/illumenite_bricks.json @@ -0,0 +1,28 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "flag": "aesthetics_enabled", + "type": "netherrocks:flag" + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "SS", + "SS" + ], + "key": { + "S": { + "item": "netherrocks:illumenite_ingot" + } + }, + "result": { + "item": "netherrocks:illumenite_bricks" + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/illumenite_chestplate.json b/src/generated/resources/data/netherrocks/recipes/illumenite_chestplate.json new file mode 100644 index 00000000..ced77b4b --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/illumenite_chestplate.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "S S", + "SSS", + "SSS" + ], + "key": { + "S": { + "item": "netherrocks:illumenite_ingot" + } + }, + "result": { + "item": "netherrocks:illumenite_chestplate" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/illumenite_door.json b/src/generated/resources/data/netherrocks/recipes/illumenite_door.json new file mode 100644 index 00000000..8a32eaf0 --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/illumenite_door.json @@ -0,0 +1,30 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "flag": "aesthetics_enabled", + "type": "netherrocks:flag" + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " SS", + " SS", + " SS" + ], + "key": { + "S": { + "item": "netherrocks:illumenite_ingot" + } + }, + "result": { + "item": "netherrocks:illumenite_door", + "count": 3 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/illumenite_helmet.json b/src/generated/resources/data/netherrocks/recipes/illumenite_helmet.json new file mode 100644 index 00000000..4592bfac --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/illumenite_helmet.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "SSS", + "S S", + " " + ], + "key": { + "S": { + "item": "netherrocks:illumenite_ingot" + } + }, + "result": { + "item": "netherrocks:illumenite_helmet" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/illumenite_ingot.json b/src/generated/resources/data/netherrocks/recipes/illumenite_ingot.json new file mode 100644 index 00000000..f5a43293 --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/illumenite_ingot.json @@ -0,0 +1,12 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "netherrocks:illumenite_block" + } + ], + "result": { + "item": "netherrocks:illumenite_ingot", + "count": 9 + } +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/illumenite_ingot_from_blasting.json b/src/generated/resources/data/netherrocks/recipes/illumenite_ingot_from_blasting.json new file mode 100644 index 00000000..1d9ec3cb --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/illumenite_ingot_from_blasting.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:blasting", + "ingredient": { + "item": "netherrocks:raw_illumenite" + }, + "result": "netherrocks:illumenite_ingot", + "experience": 0.8, + "cookingtime": 100 +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/illumenite_ingot_from_blasting_from_ore.json b/src/generated/resources/data/netherrocks/recipes/illumenite_ingot_from_blasting_from_ore.json new file mode 100644 index 00000000..758b5de2 --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/illumenite_ingot_from_blasting_from_ore.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:blasting", + "ingredient": { + "item": "netherrocks:illumenite_ore" + }, + "result": "netherrocks:illumenite_ingot", + "experience": 0.8, + "cookingtime": 100 +} \ No newline at end of file diff --git a/src/main/resources/data/netherrocks/recipes/illumenite_ingot_from_nuggets.json b/src/generated/resources/data/netherrocks/recipes/illumenite_ingot_from_nuggets.json similarity index 72% rename from src/main/resources/data/netherrocks/recipes/illumenite_ingot_from_nuggets.json rename to src/generated/resources/data/netherrocks/recipes/illumenite_ingot_from_nuggets.json index ceab67bd..1ba0d20d 100644 --- a/src/main/resources/data/netherrocks/recipes/illumenite_ingot_from_nuggets.json +++ b/src/generated/resources/data/netherrocks/recipes/illumenite_ingot_from_nuggets.json @@ -1,13 +1,12 @@ { "type": "minecraft:crafting_shaped", - "group": "illumenite_ingot", "pattern": [ - "###", - "###", - "###" + "SSS", + "SSS", + "SSS" ], "key": { - "#": { + "S": { "item": "netherrocks:illumenite_nugget" } }, diff --git a/src/generated/resources/data/netherrocks/recipes/illumenite_ingot_from_smelting.json b/src/generated/resources/data/netherrocks/recipes/illumenite_ingot_from_smelting.json new file mode 100644 index 00000000..2c4d3768 --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/illumenite_ingot_from_smelting.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:smelting", + "ingredient": { + "item": "netherrocks:raw_illumenite" + }, + "result": "netherrocks:illumenite_ingot", + "experience": 0.8, + "cookingtime": 200 +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/illumenite_ingot_from_smelting_from_ore.json b/src/generated/resources/data/netherrocks/recipes/illumenite_ingot_from_smelting_from_ore.json new file mode 100644 index 00000000..db0534c9 --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/illumenite_ingot_from_smelting_from_ore.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:smelting", + "ingredient": { + "item": "netherrocks:illumenite_ore" + }, + "result": "netherrocks:illumenite_ingot", + "experience": 0.8, + "cookingtime": 200 +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/illumenite_leggings.json b/src/generated/resources/data/netherrocks/recipes/illumenite_leggings.json new file mode 100644 index 00000000..239170ba --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/illumenite_leggings.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "SSS", + "S S", + "S S" + ], + "key": { + "S": { + "item": "netherrocks:illumenite_ingot" + } + }, + "result": { + "item": "netherrocks:illumenite_leggings" + } +} \ No newline at end of file diff --git a/src/main/resources/data/netherrocks/recipes/illumenite_nugget.json b/src/generated/resources/data/netherrocks/recipes/illumenite_nugget.json similarity index 100% rename from src/main/resources/data/netherrocks/recipes/illumenite_nugget.json rename to src/generated/resources/data/netherrocks/recipes/illumenite_nugget.json diff --git a/src/main/resources/data/netherrocks/recipes/illumenite_nugget_from_blasting.json b/src/generated/resources/data/netherrocks/recipes/illumenite_nugget_from_blasting.json similarity index 100% rename from src/main/resources/data/netherrocks/recipes/illumenite_nugget_from_blasting.json rename to src/generated/resources/data/netherrocks/recipes/illumenite_nugget_from_blasting.json index e6f46722..7904182a 100644 --- a/src/main/resources/data/netherrocks/recipes/illumenite_nugget_from_blasting.json +++ b/src/generated/resources/data/netherrocks/recipes/illumenite_nugget_from_blasting.json @@ -4,6 +4,9 @@ { "item": "netherrocks:illumenite_boots" }, + { + "item": "netherrocks:illumenite_sword" + }, { "item": "netherrocks:illumenite_chestplate" }, @@ -12,9 +15,6 @@ }, { "item": "netherrocks:illumenite_leggings" - }, - { - "item": "netherrocks:illumenite_sword" } ], "result": "netherrocks:illumenite_nugget", diff --git a/src/main/resources/data/netherrocks/recipes/illumenite_nugget_from_smelting.json b/src/generated/resources/data/netherrocks/recipes/illumenite_nugget_from_smelting.json similarity index 100% rename from src/main/resources/data/netherrocks/recipes/illumenite_nugget_from_smelting.json rename to src/generated/resources/data/netherrocks/recipes/illumenite_nugget_from_smelting.json index fc8eb3a5..f1100273 100644 --- a/src/main/resources/data/netherrocks/recipes/illumenite_nugget_from_smelting.json +++ b/src/generated/resources/data/netherrocks/recipes/illumenite_nugget_from_smelting.json @@ -4,6 +4,9 @@ { "item": "netherrocks:illumenite_boots" }, + { + "item": "netherrocks:illumenite_sword" + }, { "item": "netherrocks:illumenite_chestplate" }, @@ -12,9 +15,6 @@ }, { "item": "netherrocks:illumenite_leggings" - }, - { - "item": "netherrocks:illumenite_sword" } ], "result": "netherrocks:illumenite_nugget", diff --git a/src/generated/resources/data/netherrocks/recipes/illumenite_sword.json b/src/generated/resources/data/netherrocks/recipes/illumenite_sword.json new file mode 100644 index 00000000..81e875fa --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/illumenite_sword.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + " S ", + " S ", + " T " + ], + "key": { + "S": { + "item": "netherrocks:illumenite_ingot" + }, + "T": { + "tag": "forge:rods/wooden" + } + }, + "result": { + "item": "netherrocks:illumenite_sword" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/malachite_axe.json b/src/generated/resources/data/netherrocks/recipes/malachite_axe.json new file mode 100644 index 00000000..acdbf116 --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/malachite_axe.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "SS ", + "ST ", + " T " + ], + "key": { + "S": { + "item": "netherrocks:malachite_ingot" + }, + "T": { + "tag": "forge:rods/wooden" + } + }, + "result": { + "item": "netherrocks:malachite_axe" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/malachite_bars.json b/src/generated/resources/data/netherrocks/recipes/malachite_bars.json new file mode 100644 index 00000000..994f7fd2 --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/malachite_bars.json @@ -0,0 +1,29 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "flag": "aesthetics_enabled", + "type": "netherrocks:flag" + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "SSS", + "SSS" + ], + "key": { + "S": { + "item": "netherrocks:malachite_ingot" + } + }, + "result": { + "item": "netherrocks:malachite_bars", + "count": 16 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/malachite_block.json b/src/generated/resources/data/netherrocks/recipes/malachite_block.json new file mode 100644 index 00000000..869e0fa3 --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/malachite_block.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "SSS", + "SSS", + "SSS" + ], + "key": { + "S": { + "item": "netherrocks:malachite_ingot" + } + }, + "result": { + "item": "netherrocks:malachite_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/malachite_boots.json b/src/generated/resources/data/netherrocks/recipes/malachite_boots.json new file mode 100644 index 00000000..2394fc25 --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/malachite_boots.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + " ", + "S S", + "S S" + ], + "key": { + "S": { + "item": "netherrocks:malachite_ingot" + } + }, + "result": { + "item": "netherrocks:malachite_boots" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/malachite_brick_slab.json b/src/generated/resources/data/netherrocks/recipes/malachite_brick_slab.json new file mode 100644 index 00000000..49cc7b7b --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/malachite_brick_slab.json @@ -0,0 +1,30 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "flag": "aesthetics_enabled", + "type": "netherrocks:flag" + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " ", + " ", + "SSS" + ], + "key": { + "S": { + "item": "netherrocks:malachite_bricks" + } + }, + "result": { + "item": "netherrocks:malachite_brick_slab", + "count": 6 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/malachite_brick_slab_stonecutting.json b/src/generated/resources/data/netherrocks/recipes/malachite_brick_slab_stonecutting.json new file mode 100644 index 00000000..4c56de8e --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/malachite_brick_slab_stonecutting.json @@ -0,0 +1,21 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "flag": "aesthetics_enabled", + "type": "netherrocks:flag" + } + ], + "recipe": { + "type": "minecraft:stonecutting", + "ingredient": { + "item": "netherrocks:malachite_bricks" + }, + "result": "netherrocks:malachite_brick_slab", + "count": 2 + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/malachite_brick_stairs.json b/src/generated/resources/data/netherrocks/recipes/malachite_brick_stairs.json new file mode 100644 index 00000000..08d0848d --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/malachite_brick_stairs.json @@ -0,0 +1,30 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "flag": "aesthetics_enabled", + "type": "netherrocks:flag" + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "S ", + "SS ", + "SSS" + ], + "key": { + "S": { + "item": "netherrocks:malachite_bricks" + } + }, + "result": { + "item": "netherrocks:malachite_brick_stairs", + "count": 4 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/malachite_brick_stairs_stonecutting.json b/src/generated/resources/data/netherrocks/recipes/malachite_brick_stairs_stonecutting.json new file mode 100644 index 00000000..07231c20 --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/malachite_brick_stairs_stonecutting.json @@ -0,0 +1,21 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "flag": "aesthetics_enabled", + "type": "netherrocks:flag" + } + ], + "recipe": { + "type": "minecraft:stonecutting", + "ingredient": { + "item": "netherrocks:malachite_bricks" + }, + "result": "netherrocks:malachite_brick_stairs", + "count": 1 + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/malachite_bricks.json b/src/generated/resources/data/netherrocks/recipes/malachite_bricks.json new file mode 100644 index 00000000..35123d6a --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/malachite_bricks.json @@ -0,0 +1,28 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "flag": "aesthetics_enabled", + "type": "netherrocks:flag" + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "SS", + "SS" + ], + "key": { + "S": { + "item": "netherrocks:malachite_ingot" + } + }, + "result": { + "item": "netherrocks:malachite_bricks" + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/malachite_chestplate.json b/src/generated/resources/data/netherrocks/recipes/malachite_chestplate.json new file mode 100644 index 00000000..04f36f33 --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/malachite_chestplate.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "S S", + "SSS", + "SSS" + ], + "key": { + "S": { + "item": "netherrocks:malachite_ingot" + } + }, + "result": { + "item": "netherrocks:malachite_chestplate" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/malachite_door.json b/src/generated/resources/data/netherrocks/recipes/malachite_door.json new file mode 100644 index 00000000..e53aedd7 --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/malachite_door.json @@ -0,0 +1,30 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "flag": "aesthetics_enabled", + "type": "netherrocks:flag" + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " SS", + " SS", + " SS" + ], + "key": { + "S": { + "item": "netherrocks:malachite_ingot" + } + }, + "result": { + "item": "netherrocks:malachite_door", + "count": 3 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/malachite_helmet.json b/src/generated/resources/data/netherrocks/recipes/malachite_helmet.json new file mode 100644 index 00000000..8ee34ef7 --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/malachite_helmet.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "SSS", + "S S", + " " + ], + "key": { + "S": { + "item": "netherrocks:malachite_ingot" + } + }, + "result": { + "item": "netherrocks:malachite_helmet" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/malachite_hoe.json b/src/generated/resources/data/netherrocks/recipes/malachite_hoe.json new file mode 100644 index 00000000..890222dd --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/malachite_hoe.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "SS ", + " T ", + " T " + ], + "key": { + "S": { + "item": "netherrocks:malachite_ingot" + }, + "T": { + "tag": "forge:rods/wooden" + } + }, + "result": { + "item": "netherrocks:malachite_hoe" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/malachite_ingot.json b/src/generated/resources/data/netherrocks/recipes/malachite_ingot.json new file mode 100644 index 00000000..eaa866a0 --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/malachite_ingot.json @@ -0,0 +1,12 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "netherrocks:malachite_block" + } + ], + "result": { + "item": "netherrocks:malachite_ingot", + "count": 9 + } +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/malachite_ingot_from_blasting.json b/src/generated/resources/data/netherrocks/recipes/malachite_ingot_from_blasting.json new file mode 100644 index 00000000..f0b0c425 --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/malachite_ingot_from_blasting.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:blasting", + "ingredient": { + "item": "netherrocks:raw_malachite" + }, + "result": "netherrocks:malachite_ingot", + "experience": 0.5, + "cookingtime": 100 +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/malachite_ingot_from_blasting_from_ore.json b/src/generated/resources/data/netherrocks/recipes/malachite_ingot_from_blasting_from_ore.json new file mode 100644 index 00000000..75c6193a --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/malachite_ingot_from_blasting_from_ore.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:blasting", + "ingredient": { + "item": "netherrocks:malachite_ore" + }, + "result": "netherrocks:malachite_ingot", + "experience": 0.5, + "cookingtime": 100 +} \ No newline at end of file diff --git a/src/main/resources/data/netherrocks/recipes/malachite_ingot_from_nuggets.json b/src/generated/resources/data/netherrocks/recipes/malachite_ingot_from_nuggets.json similarity index 72% rename from src/main/resources/data/netherrocks/recipes/malachite_ingot_from_nuggets.json rename to src/generated/resources/data/netherrocks/recipes/malachite_ingot_from_nuggets.json index bb3bc598..fd7fb7e7 100644 --- a/src/main/resources/data/netherrocks/recipes/malachite_ingot_from_nuggets.json +++ b/src/generated/resources/data/netherrocks/recipes/malachite_ingot_from_nuggets.json @@ -1,13 +1,12 @@ { "type": "minecraft:crafting_shaped", - "group": "malachite_ingot", "pattern": [ - "###", - "###", - "###" + "SSS", + "SSS", + "SSS" ], "key": { - "#": { + "S": { "item": "netherrocks:malachite_nugget" } }, diff --git a/src/generated/resources/data/netherrocks/recipes/malachite_ingot_from_smelting.json b/src/generated/resources/data/netherrocks/recipes/malachite_ingot_from_smelting.json new file mode 100644 index 00000000..1c8f1115 --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/malachite_ingot_from_smelting.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:smelting", + "ingredient": { + "item": "netherrocks:raw_malachite" + }, + "result": "netherrocks:malachite_ingot", + "experience": 0.5, + "cookingtime": 200 +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/malachite_ingot_from_smelting_from_ore.json b/src/generated/resources/data/netherrocks/recipes/malachite_ingot_from_smelting_from_ore.json new file mode 100644 index 00000000..df4d2eb3 --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/malachite_ingot_from_smelting_from_ore.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:smelting", + "ingredient": { + "item": "netherrocks:malachite_ore" + }, + "result": "netherrocks:malachite_ingot", + "experience": 0.5, + "cookingtime": 200 +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/malachite_leggings.json b/src/generated/resources/data/netherrocks/recipes/malachite_leggings.json new file mode 100644 index 00000000..761ea819 --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/malachite_leggings.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "SSS", + "S S", + "S S" + ], + "key": { + "S": { + "item": "netherrocks:malachite_ingot" + } + }, + "result": { + "item": "netherrocks:malachite_leggings" + } +} \ No newline at end of file diff --git a/src/main/resources/data/netherrocks/recipes/malachite_nugget.json b/src/generated/resources/data/netherrocks/recipes/malachite_nugget.json similarity index 100% rename from src/main/resources/data/netherrocks/recipes/malachite_nugget.json rename to src/generated/resources/data/netherrocks/recipes/malachite_nugget.json diff --git a/src/main/resources/data/netherrocks/recipes/malachite_nugget_from_blasting.json b/src/generated/resources/data/netherrocks/recipes/malachite_nugget_from_blasting.json similarity index 100% rename from src/main/resources/data/netherrocks/recipes/malachite_nugget_from_blasting.json rename to src/generated/resources/data/netherrocks/recipes/malachite_nugget_from_blasting.json index b87a2b26..05e90482 100644 --- a/src/main/resources/data/netherrocks/recipes/malachite_nugget_from_blasting.json +++ b/src/generated/resources/data/netherrocks/recipes/malachite_nugget_from_blasting.json @@ -5,28 +5,28 @@ "item": "netherrocks:malachite_axe" }, { - "item": "netherrocks:malachite_boots" + "item": "netherrocks:malachite_pickaxe" }, { - "item": "netherrocks:malachite_chestplate" + "item": "netherrocks:malachite_shovel" }, { - "item": "netherrocks:malachite_helmet" + "item": "netherrocks:malachite_boots" }, { - "item": "netherrocks:malachite_hoe" + "item": "netherrocks:malachite_sword" }, { - "item": "netherrocks:malachite_leggings" + "item": "netherrocks:malachite_chestplate" }, { - "item": "netherrocks:malachite_pickaxe" + "item": "netherrocks:malachite_helmet" }, { - "item": "netherrocks:malachite_shovel" + "item": "netherrocks:malachite_leggings" }, { - "item": "netherrocks:malachite_sword" + "item": "netherrocks:malachite_hoe" } ], "result": "netherrocks:malachite_nugget", diff --git a/src/main/resources/data/netherrocks/recipes/malachite_nugget_from_smelting.json b/src/generated/resources/data/netherrocks/recipes/malachite_nugget_from_smelting.json similarity index 100% rename from src/main/resources/data/netherrocks/recipes/malachite_nugget_from_smelting.json rename to src/generated/resources/data/netherrocks/recipes/malachite_nugget_from_smelting.json index 52f2d02a..14852b27 100644 --- a/src/main/resources/data/netherrocks/recipes/malachite_nugget_from_smelting.json +++ b/src/generated/resources/data/netherrocks/recipes/malachite_nugget_from_smelting.json @@ -5,28 +5,28 @@ "item": "netherrocks:malachite_axe" }, { - "item": "netherrocks:malachite_boots" + "item": "netherrocks:malachite_pickaxe" }, { - "item": "netherrocks:malachite_chestplate" + "item": "netherrocks:malachite_shovel" }, { - "item": "netherrocks:malachite_helmet" + "item": "netherrocks:malachite_boots" }, { - "item": "netherrocks:malachite_hoe" + "item": "netherrocks:malachite_sword" }, { - "item": "netherrocks:malachite_leggings" + "item": "netherrocks:malachite_chestplate" }, { - "item": "netherrocks:malachite_pickaxe" + "item": "netherrocks:malachite_helmet" }, { - "item": "netherrocks:malachite_shovel" + "item": "netherrocks:malachite_leggings" }, { - "item": "netherrocks:malachite_sword" + "item": "netherrocks:malachite_hoe" } ], "result": "netherrocks:malachite_nugget", diff --git a/src/generated/resources/data/netherrocks/recipes/malachite_pickaxe.json b/src/generated/resources/data/netherrocks/recipes/malachite_pickaxe.json new file mode 100644 index 00000000..0cb7488e --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/malachite_pickaxe.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "SSS", + " T ", + " T " + ], + "key": { + "S": { + "item": "netherrocks:malachite_ingot" + }, + "T": { + "tag": "forge:rods/wooden" + } + }, + "result": { + "item": "netherrocks:malachite_pickaxe" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/malachite_shovel.json b/src/generated/resources/data/netherrocks/recipes/malachite_shovel.json new file mode 100644 index 00000000..6725d01f --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/malachite_shovel.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + " S ", + " T ", + " T " + ], + "key": { + "S": { + "item": "netherrocks:malachite_ingot" + }, + "T": { + "tag": "forge:rods/wooden" + } + }, + "result": { + "item": "netherrocks:malachite_shovel" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/malachite_sword.json b/src/generated/resources/data/netherrocks/recipes/malachite_sword.json new file mode 100644 index 00000000..9b3f678a --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/malachite_sword.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + " S ", + " S ", + " T " + ], + "key": { + "S": { + "item": "netherrocks:malachite_ingot" + }, + "T": { + "tag": "forge:rods/wooden" + } + }, + "result": { + "item": "netherrocks:malachite_sword" + } +} \ No newline at end of file diff --git a/src/main/resources/data/netherrocks/recipes/nether_blast_furnace.json b/src/generated/resources/data/netherrocks/recipes/nether_blast_furnace.json similarity index 89% rename from src/main/resources/data/netherrocks/recipes/nether_blast_furnace.json rename to src/generated/resources/data/netherrocks/recipes/nether_blast_furnace.json index c0a23a2d..f2aad261 100644 --- a/src/main/resources/data/netherrocks/recipes/nether_blast_furnace.json +++ b/src/generated/resources/data/netherrocks/recipes/nether_blast_furnace.json @@ -9,11 +9,11 @@ "#": { "item": "minecraft:nether_brick" }, + "I": { + "item": "minecraft:iron_ingot" + }, "X": { "item": "netherrocks:nether_furnace" - }, - "I": { - "tag" : "forge:ingots/iron" } }, "result": { diff --git a/src/generated/resources/data/netherrocks/recipes/nether_furnace.json b/src/generated/resources/data/netherrocks/recipes/nether_furnace.json new file mode 100644 index 00000000..cd8f63ce --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/nether_furnace.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "SSS", + "SYS", + "SSS" + ], + "key": { + "S": { + "item": "minecraft:netherrack" + }, + "Y": { + "item": "minecraft:flint_and_steel" + } + }, + "result": { + "item": "netherrocks:nether_furnace" + } +} \ No newline at end of file diff --git a/src/main/resources/data/netherrocks/recipes/nether_smoker.json b/src/generated/resources/data/netherrocks/recipes/nether_smoker.json similarity index 100% rename from src/main/resources/data/netherrocks/recipes/nether_smoker.json rename to src/generated/resources/data/netherrocks/recipes/nether_smoker.json diff --git a/src/generated/resources/data/netherrocks/recipes/raw_argonite.json b/src/generated/resources/data/netherrocks/recipes/raw_argonite.json new file mode 100644 index 00000000..ad5c6a93 --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/raw_argonite.json @@ -0,0 +1,12 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "netherrocks:raw_argonite_block" + } + ], + "result": { + "item": "netherrocks:raw_argonite", + "count": 9 + } +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/raw_argonite_block.json b/src/generated/resources/data/netherrocks/recipes/raw_argonite_block.json new file mode 100644 index 00000000..d9dcb8ec --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/raw_argonite_block.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "SSS", + "SSS", + "SSS" + ], + "key": { + "S": { + "item": "netherrocks:raw_argonite" + } + }, + "result": { + "item": "netherrocks:raw_argonite_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/raw_fyrite.json b/src/generated/resources/data/netherrocks/recipes/raw_fyrite.json new file mode 100644 index 00000000..fc67a8e1 --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/raw_fyrite.json @@ -0,0 +1,12 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "netherrocks:raw_fyrite_block" + } + ], + "result": { + "item": "netherrocks:raw_fyrite", + "count": 9 + } +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/raw_fyrite_block.json b/src/generated/resources/data/netherrocks/recipes/raw_fyrite_block.json new file mode 100644 index 00000000..18b9c005 --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/raw_fyrite_block.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "SSS", + "SSS", + "SSS" + ], + "key": { + "S": { + "item": "netherrocks:raw_fyrite" + } + }, + "result": { + "item": "netherrocks:raw_fyrite_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/raw_illumenite.json b/src/generated/resources/data/netherrocks/recipes/raw_illumenite.json new file mode 100644 index 00000000..bfe025bc --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/raw_illumenite.json @@ -0,0 +1,12 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "netherrocks:raw_illumenite_block" + } + ], + "result": { + "item": "netherrocks:raw_illumenite", + "count": 9 + } +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/raw_illumenite_block.json b/src/generated/resources/data/netherrocks/recipes/raw_illumenite_block.json new file mode 100644 index 00000000..7ba73ee7 --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/raw_illumenite_block.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "SSS", + "SSS", + "SSS" + ], + "key": { + "S": { + "item": "netherrocks:raw_illumenite" + } + }, + "result": { + "item": "netherrocks:raw_illumenite_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/raw_malachite.json b/src/generated/resources/data/netherrocks/recipes/raw_malachite.json new file mode 100644 index 00000000..beecf50f --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/raw_malachite.json @@ -0,0 +1,12 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "netherrocks:raw_malachite_block" + } + ], + "result": { + "item": "netherrocks:raw_malachite", + "count": 9 + } +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/recipes/raw_malachite_block.json b/src/generated/resources/data/netherrocks/recipes/raw_malachite_block.json new file mode 100644 index 00000000..a677f704 --- /dev/null +++ b/src/generated/resources/data/netherrocks/recipes/raw_malachite_block.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "SSS", + "SSS", + "SSS" + ], + "key": { + "S": { + "item": "netherrocks:raw_malachite" + } + }, + "result": { + "item": "netherrocks:raw_malachite_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/netherrocks/tags/items/auto_smelt_tools.json b/src/generated/resources/data/netherrocks/tags/items/auto_smelt_tools.json new file mode 100644 index 00000000..841ecebc --- /dev/null +++ b/src/generated/resources/data/netherrocks/tags/items/auto_smelt_tools.json @@ -0,0 +1,8 @@ +{ + "replace": false, + "values": [ + "netherrocks:fyrite_axe", + "netherrocks:fyrite_pickaxe", + "netherrocks:fyrite_shovel" + ] +} \ No newline at end of file diff --git a/src/main/java/mod/alexndr/netherrocks/ForgeEventSubscriber.java b/src/main/java/mod/alexndr/netherrocks/ForgeEventSubscriber.java index 6f600256..4ce1bd70 100644 --- a/src/main/java/mod/alexndr/netherrocks/ForgeEventSubscriber.java +++ b/src/main/java/mod/alexndr/netherrocks/ForgeEventSubscriber.java @@ -9,9 +9,9 @@ import mod.alexndr.netherrocks.helpers.NetherrocksInjectionLookup; import mod.alexndr.simplecorelib.helpers.ArmorUtils; import mod.alexndr.simplecorelib.helpers.LootUtils; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.util.DamageSource; -import net.minecraft.world.biome.Biome; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.damagesource.DamageSource; +import net.minecraft.world.level.biome.Biome; import net.minecraftforge.event.LootTableLoadEvent; import net.minecraftforge.event.entity.living.LivingAttackEvent; import net.minecraftforge.event.world.BiomeLoadingEvent; @@ -33,9 +33,9 @@ public final class ForgeEventSubscriber public static void onLivingAttackEvent(LivingAttackEvent event) { // first, is it a player? - if (event.getEntityLiving() instanceof PlayerEntity) + if (event.getEntityLiving() instanceof Player) { - PlayerEntity player = (PlayerEntity) event.getEntityLiving(); + Player player = (Player) event.getEntityLiving(); LOGGER.debug("caught LivingAttackEvent"); // fall damage and are they wearing full illumenite armor? @@ -64,7 +64,7 @@ else if (event.getSource().isFire() @SubscribeEvent(priority=EventPriority.HIGH) public static void onBiomeLoading(BiomeLoadingEvent evt) { - if (evt.getCategory() == Biome.Category.NETHER) + if (evt.getCategory() == Biome.BiomeCategory.NETHER) { OreGeneration.generateNetherOres(evt); } diff --git a/src/main/java/mod/alexndr/netherrocks/ModEventSubscriber.java b/src/main/java/mod/alexndr/netherrocks/ModEventSubscriber.java index fe91622a..d840876a 100644 --- a/src/main/java/mod/alexndr/netherrocks/ModEventSubscriber.java +++ b/src/main/java/mod/alexndr/netherrocks/ModEventSubscriber.java @@ -13,18 +13,19 @@ import mod.alexndr.netherrocks.init.ModBlocks; import mod.alexndr.netherrocks.init.ModTabGroups; import mod.alexndr.simplecorelib.config.FlagCondition; -import net.minecraft.item.BlockItem; -import net.minecraft.item.Item; -import net.minecraft.item.crafting.IRecipeSerializer; -import net.minecraft.util.ResourceLocation; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.item.BlockItem; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.crafting.RecipeSerializer; import net.minecraftforge.common.crafting.CraftingHelper; import net.minecraftforge.common.loot.GlobalLootModifierSerializer; import net.minecraftforge.event.RegistryEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; -import net.minecraftforge.fml.RegistryObject; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.config.ModConfig; +import net.minecraftforge.fml.event.config.ModConfigEvent; import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent; +import net.minecraftforge.fmllegacy.RegistryObject; import net.minecraftforge.registries.IForgeRegistry; @Mod.EventBusSubscriber(modid = Netherrocks.MODID, bus = Mod.EventBusSubscriber.Bus.MOD) @@ -73,7 +74,7 @@ public static void onRegisterItems(final RegistryEvent.Register event) } // end onRegisterItems() @SubscribeEvent - public static void onModConfigEvent(final ModConfig.ModConfigEvent event) + public static void onModConfigEvent(final ModConfigEvent event) { final ModConfig config = event.getConfig(); @@ -94,7 +95,7 @@ public static void onRegisterModifierSerializers( @SubscribeEvent public static void onRegisterRecipeSerializers( - @Nonnull final RegistryEvent.Register> event) + @Nonnull final RegistryEvent.Register> event) { CraftingHelper.register(new FlagCondition.Serializer(NetherrocksConfig.INSTANCE, new ResourceLocation(Netherrocks.MODID, "flag"))); diff --git a/src/main/java/mod/alexndr/netherrocks/Netherrocks.java b/src/main/java/mod/alexndr/netherrocks/Netherrocks.java index 0efd5b89..5217f8cf 100644 --- a/src/main/java/mod/alexndr/netherrocks/Netherrocks.java +++ b/src/main/java/mod/alexndr/netherrocks/Netherrocks.java @@ -4,11 +4,12 @@ import org.apache.logging.log4j.Logger; import mod.alexndr.netherrocks.config.ConfigHolder; -import mod.alexndr.netherrocks.generation.OreGeneration; import mod.alexndr.netherrocks.init.ModBlocks; import mod.alexndr.netherrocks.init.ModContainers; +import mod.alexndr.netherrocks.init.ModFeatures; import mod.alexndr.netherrocks.init.ModItems; import mod.alexndr.netherrocks.init.ModTiles; +import net.minecraft.resources.ResourceLocation; import net.minecraftforge.eventbus.api.IEventBus; import net.minecraftforge.fml.ModLoadingContext; import net.minecraftforge.fml.common.Mod; @@ -21,6 +22,8 @@ public class Netherrocks { // modid public static final String MODID = "netherrocks"; + + public static final ResourceLocation SIMPLE_TEXTURE_ATLAS = new ResourceLocation(MODID, "textures/atlas/gui.png"); // Directly reference a log4j logger. public static final Logger LOGGER = LogManager.getLogger(); @@ -36,7 +39,7 @@ public Netherrocks() ModItems.ITEMS.register(modEventBus); ModContainers.CONTAINER_TYPES.register(modEventBus); ModTiles.TILE_ENTITY_TYPES.register(modEventBus); - OreGeneration.FEATURES.register(modEventBus); + ModFeatures.FEATURES.register(modEventBus); // Register Configs modLoadingContext.registerConfig(ModConfig.Type.COMMON, ConfigHolder.SERVER_SPEC); diff --git a/src/main/java/mod/alexndr/netherrocks/api/content/AbstractNetherBlastFurnaceBlock.java b/src/main/java/mod/alexndr/netherrocks/api/content/AbstractNetherBlastFurnaceBlock.java index 0c45d6cc..3beb0d4b 100644 --- a/src/main/java/mod/alexndr/netherrocks/api/content/AbstractNetherBlastFurnaceBlock.java +++ b/src/main/java/mod/alexndr/netherrocks/api/content/AbstractNetherBlastFurnaceBlock.java @@ -2,16 +2,17 @@ import java.util.Random; -import net.minecraft.block.BlockState; -import net.minecraft.particles.ParticleTypes; -import net.minecraft.state.properties.BlockStateProperties; -import net.minecraft.util.Direction; -import net.minecraft.util.SoundCategory; -import net.minecraft.util.SoundEvents; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; +import mod.alexndr.simplecorelib.content.VeryAbstractFurnaceBlock; +import net.minecraft.core.BlockPos; +import net.minecraft.core.Direction; +import net.minecraft.core.particles.ParticleTypes; +import net.minecraft.sounds.SoundEvents; +import net.minecraft.sounds.SoundSource; +import net.minecraft.world.level.Level; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.level.block.state.properties.BlockStateProperties; -public abstract class AbstractNetherBlastFurnaceBlock extends AbstractNetherFurnaceBlock +public abstract class AbstractNetherBlastFurnaceBlock extends VeryAbstractFurnaceBlock { public AbstractNetherBlastFurnaceBlock(Properties builder) @@ -20,14 +21,14 @@ public AbstractNetherBlastFurnaceBlock(Properties builder) } @Override - public void animateTick(BlockState stateIn, World worldIn, BlockPos pos, Random rand) + public void animateTick(BlockState stateIn, Level worldIn, BlockPos pos, Random rand) { if (stateIn.getValue(BlockStateProperties.LIT)) { double d0 = (double)pos.getX() + 0.5D; double d1 = (double)pos.getY(); double d2 = (double)pos.getZ() + 0.5D; if (rand.nextDouble() < 0.1D) { - worldIn.playLocalSound(d0, d1, d2, SoundEvents.BLASTFURNACE_FIRE_CRACKLE, SoundCategory.BLOCKS, 1.0F, 1.0F, false); + worldIn.playLocalSound(d0, d1, d2, SoundEvents.BLASTFURNACE_FIRE_CRACKLE, SoundSource.BLOCKS, 1.0F, 1.0F, false); } Direction direction = stateIn.getValue(FACING); diff --git a/src/main/java/mod/alexndr/netherrocks/api/content/AbstractNetherFurnaceBlock.java b/src/main/java/mod/alexndr/netherrocks/api/content/AbstractNetherFurnaceBlock.java deleted file mode 100644 index 7759152c..00000000 --- a/src/main/java/mod/alexndr/netherrocks/api/content/AbstractNetherFurnaceBlock.java +++ /dev/null @@ -1,12 +0,0 @@ -package mod.alexndr.netherrocks.api.content; - -import mod.alexndr.simplecorelib.content.VeryAbstractFurnaceBlock; - -public abstract class AbstractNetherFurnaceBlock extends VeryAbstractFurnaceBlock -{ - public AbstractNetherFurnaceBlock(Properties builder) - { - super(builder); - } - -} // end class \ No newline at end of file diff --git a/src/main/java/mod/alexndr/netherrocks/api/content/AbstractNetherFurnaceContainer.java b/src/main/java/mod/alexndr/netherrocks/api/content/AbstractNetherFurnaceContainer.java deleted file mode 100644 index 68e2dbb1..00000000 --- a/src/main/java/mod/alexndr/netherrocks/api/content/AbstractNetherFurnaceContainer.java +++ /dev/null @@ -1,34 +0,0 @@ -package mod.alexndr.netherrocks.api.content; - -import mod.alexndr.simplecorelib.content.VeryAbstractFurnaceContainer; -import mod.alexndr.simplecorelib.content.VeryAbstractFurnaceTileEntity; -import net.minecraft.client.network.play.ClientPlayNetHandler; -import net.minecraft.entity.player.PlayerInventory; -import net.minecraft.entity.player.ServerPlayerEntity; -import net.minecraft.inventory.container.Container; -import net.minecraft.inventory.container.ContainerType; -import net.minecraft.network.play.server.SWindowPropertyPacket; -import net.minecraft.util.IntReferenceHolder; -import net.minecraftforge.fml.RegistryObject; - -/** - * Smelt time is synced with - * Server: Each tick {@link #detectAndSendChanges()} is called ({@link ServerPlayerEntity#tick()}) - * Server: The (tracked) value of the tile's energy is updated ({@link #updateProgressBar(int, int)}) - * Server: If the value is different from the value last sent to the client ({@link IntReferenceHolder#isDirty()}), - * it is synced to the client ({@link ServerPlayerEntity#sendWindowProperty(Container, int, int)}) - * Client: The sync packet is received ({@link ClientPlayNetHandler#handleWindowProperty(SWindowPropertyPacket)}) - * and the tracked value of is updated ({@link Container#updateProgressBar(int, int)}) - * Client: The tile's data is set to the new value - * - * @author Sinhika, notes by Cadiboo - */ -public abstract class AbstractNetherFurnaceContainer extends VeryAbstractFurnaceContainer -{ - - public AbstractNetherFurnaceContainer(ContainerType containerType, int id, PlayerInventory playerInventory, - VeryAbstractFurnaceTileEntity tileEntity, RegistryObject arg4) - { - super(containerType, id, playerInventory, tileEntity, arg4); - } -} \ No newline at end of file diff --git a/src/main/java/mod/alexndr/netherrocks/api/content/AbstractNetherFurnaceTileEntity.java b/src/main/java/mod/alexndr/netherrocks/api/content/AbstractNetherFurnaceTileEntity.java index 2c28432d..d64364c6 100644 --- a/src/main/java/mod/alexndr/netherrocks/api/content/AbstractNetherFurnaceTileEntity.java +++ b/src/main/java/mod/alexndr/netherrocks/api/content/AbstractNetherFurnaceTileEntity.java @@ -13,23 +13,25 @@ import mod.alexndr.netherrocks.init.ModItems; import mod.alexndr.netherrocks.init.ModTags; import mod.alexndr.simplecorelib.content.VeryAbstractFurnaceTileEntity; -import net.minecraft.block.Blocks; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.item.Items; -import net.minecraft.item.crafting.AbstractCookingRecipe; -import net.minecraft.item.crafting.IRecipeType; -import net.minecraft.tags.ITag; -import net.minecraft.tileentity.TileEntityType; -import net.minecraft.util.IItemProvider; +import net.minecraft.core.BlockPos; +import net.minecraft.tags.Tag; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.Items; +import net.minecraft.world.item.crafting.AbstractCookingRecipe; +import net.minecraft.world.item.crafting.RecipeType; +import net.minecraft.world.level.ItemLike; +import net.minecraft.world.level.block.Blocks; +import net.minecraft.world.level.block.entity.BlockEntityType; +import net.minecraft.world.level.block.state.BlockState; public abstract class AbstractNetherFurnaceTileEntity extends VeryAbstractFurnaceTileEntity { - public AbstractNetherFurnaceTileEntity(TileEntityType tileEntityTypeIn, - IRecipeType recipeTypeIn) + public AbstractNetherFurnaceTileEntity(BlockEntityType tileEntityTypeIn, BlockPos blockpos, BlockState blockstate, + RecipeType recipeTypeIn) { - super(tileEntityTypeIn, recipeTypeIn); + super(tileEntityTypeIn, blockpos, blockstate, recipeTypeIn); } @Override @@ -57,6 +59,10 @@ public static List getValidFuels() validFuels.add(ModItems.fyrite_ingot.get()); validFuels.add(ModItems.fyrite_nugget.get()); validFuels.add(ModItems.fyrite_dust.get()); + validFuels.add(ModBlocks.fyrite_bricks.get().asItem()); + validFuels.add(ModBlocks.fyrite_brick_stairs.get().asItem()); + validFuels.add(ModBlocks.fyrite_brick_slab.get().asItem()); + validFuels.add(ModBlocks.fyrite_door.get().asItem()); validFuels.add(Items.BLAZE_ROD); validFuels.add(Items.BLAZE_POWDER); for (Item item : ModTags.getnetherFurnaceFuels().getValues()) @@ -72,6 +78,10 @@ public static Map loadBurnTimes() Map map = Maps.newLinkedHashMap(); addItemBurnTime(map, Blocks.NETHERRACK, netherrackBurnTime); addItemBurnTime(map, ModBlocks.fyrite_block.get(), fyriteBurnTime * 10); + addItemBurnTime(map, ModBlocks.fyrite_bricks.get(), fyriteBurnTime * 10); + addItemBurnTime(map, ModBlocks.fyrite_brick_stairs.get(), fyriteBurnTime * 10); + addItemBurnTime(map, ModBlocks.fyrite_brick_slab.get(), fyriteBurnTime * 5); + addItemBurnTime(map, ModBlocks.fyrite_door.get(), fyriteBurnTime * 5); addItemBurnTime(map, ModItems.fyrite_ingot.get(), fyriteBurnTime); addItemBurnTime(map, ModItems.fyrite_nugget.get(), fyriteBurnTime/9); addItemBurnTime(map, ModItems.fyrite_dust.get(), fyriteBurnTime/2); @@ -82,12 +92,12 @@ public static Map loadBurnTimes() } // end getBurnTimes() protected static void addItemBurnTime(Map map, - IItemProvider itemProvider, int burnTimeIn) + ItemLike itemProvider, int burnTimeIn) { map.put(itemProvider.asItem(), burnTimeIn); } - protected static void addItemTagBurnTime(Map map, ITag iTag, int burnTimeIn) + protected static void addItemTagBurnTime(Map map, Tag iTag, int burnTimeIn) { for(Item item : iTag.getValues()) { map.put(item, burnTimeIn); @@ -100,7 +110,7 @@ protected static void addItemTagBurnTime(Map map, ITag iTag * @param recipeType - ignored * @return burn time in ticks. */ - protected static int getBurnTime(ItemStack stack, @Nullable IRecipeType recipeType) + public static int getBurnTime(ItemStack stack, @Nullable RecipeType recipeType) { if (AbstractNetherFurnaceTileEntity.burnTimes.isEmpty()) { AbstractNetherFurnaceTileEntity.burnTimes = AbstractNetherFurnaceTileEntity.loadBurnTimes(); diff --git a/src/main/java/mod/alexndr/netherrocks/api/content/AbstractNetherSmokerBlock.java b/src/main/java/mod/alexndr/netherrocks/api/content/AbstractNetherSmokerBlock.java index 847b6c09..74137718 100644 --- a/src/main/java/mod/alexndr/netherrocks/api/content/AbstractNetherSmokerBlock.java +++ b/src/main/java/mod/alexndr/netherrocks/api/content/AbstractNetherSmokerBlock.java @@ -2,17 +2,19 @@ import java.util.Random; -import net.minecraft.block.BlockState; -import net.minecraft.particles.ParticleTypes; -import net.minecraft.state.properties.BlockStateProperties; -import net.minecraft.util.SoundCategory; -import net.minecraft.util.SoundEvents; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; +import mod.alexndr.simplecorelib.content.VeryAbstractFurnaceBlock; +import net.minecraft.core.BlockPos; +import net.minecraft.core.particles.ParticleTypes; +import net.minecraft.sounds.SoundEvents; +import net.minecraft.sounds.SoundSource; +import net.minecraft.world.level.Level; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.level.block.state.properties.BlockStateProperties; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -public abstract class AbstractNetherSmokerBlock extends AbstractNetherFurnaceBlock + +public abstract class AbstractNetherSmokerBlock extends VeryAbstractFurnaceBlock { public AbstractNetherSmokerBlock(Properties builder) @@ -22,14 +24,14 @@ public AbstractNetherSmokerBlock(Properties builder) @Override @OnlyIn(Dist.CLIENT) - public void animateTick(BlockState stateIn, World worldIn, BlockPos pos, Random rand) + public void animateTick(BlockState stateIn, Level worldIn, BlockPos pos, Random rand) { if (stateIn.getValue(BlockStateProperties.LIT)) { double d0 = (double)pos.getX() + 0.5D; double d1 = (double)pos.getY(); double d2 = (double)pos.getZ() + 0.5D; if (rand.nextDouble() < 0.1D) { - worldIn.playLocalSound(d0, d1, d2, SoundEvents.SMOKER_SMOKE, SoundCategory.BLOCKS, 1.0F, 1.0F, false); + worldIn.playLocalSound(d0, d1, d2, SoundEvents.SMOKER_SMOKE, SoundSource.BLOCKS, 1.0F, 1.0F, false); } worldIn.addParticle(ParticleTypes.SMOKE, d0, d1 + 1.1D, d2, 0.0D, 0.0D, 0.0D); diff --git a/src/main/java/mod/alexndr/netherrocks/client/ClientModEventSubscriber.java b/src/main/java/mod/alexndr/netherrocks/client/ClientModEventSubscriber.java index ec49bcd6..687b13da 100644 --- a/src/main/java/mod/alexndr/netherrocks/client/ClientModEventSubscriber.java +++ b/src/main/java/mod/alexndr/netherrocks/client/ClientModEventSubscriber.java @@ -7,10 +7,19 @@ import mod.alexndr.netherrocks.client.gui.NetherBlastFurnaceScreen; import mod.alexndr.netherrocks.client.gui.NetherFurnaceScreen; import mod.alexndr.netherrocks.client.gui.NetherSmokerScreen; +import mod.alexndr.netherrocks.init.ModBlocks; import mod.alexndr.netherrocks.init.ModContainers; -import net.minecraft.client.gui.ScreenManager; +import mod.alexndr.simplecorelib.SimpleCoreLib; +import mod.alexndr.simplecorelib.client.gui.SimpleSpriteUploader; +import mod.alexndr.simplecorelib.client.gui.Textures; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.screens.MenuScreens; +import net.minecraft.client.renderer.ItemBlockRenderTypes; +import net.minecraft.client.renderer.RenderType; import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.client.event.RegisterClientReloadListenersEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; +import net.minecraftforge.fml.ModList; import net.minecraftforge.fml.common.Mod.EventBusSubscriber; import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent; @@ -23,7 +32,9 @@ public class ClientModEventSubscriber { private static final Logger LOGGER = LogManager.getLogger(Netherrocks.MODID + " Client Mod Event Subscriber"); - + public static Textures textures; + + //public static Textures textures; /** * We need to register our renderers on the client because rendering code does not exist on the server * and trying to use it on a dedicated server will crash the game. @@ -38,11 +49,54 @@ public static void onFMLClientSetupEvent(final FMLClientSetupEvent event) // Register ContainerType Screens // ScreenManager.registerFactory is not safe to call during parallel mod loading so we queue it to run later event.enqueueWork(() -> { - ScreenManager.register(ModContainers.NETHER_FURNACE.get(), NetherFurnaceScreen::new); - ScreenManager.register(ModContainers.NETHER_BLAST_FURNACE.get(), NetherBlastFurnaceScreen::new); - ScreenManager.register(ModContainers.NETHER_SMOKER.get(), NetherSmokerScreen::new); + MenuScreens.register(ModContainers.NETHER_FURNACE.get(), NetherFurnaceScreen::new); + MenuScreens.register(ModContainers.NETHER_BLAST_FURNACE.get(), NetherBlastFurnaceScreen::new); + MenuScreens.register(ModContainers.NETHER_SMOKER.get(), NetherSmokerScreen::new); LOGGER.debug("Registered ContainerType Screens"); }); + + // doors with see-through windows. + ItemBlockRenderTypes.setRenderLayer(ModBlocks.argonite_door.get(), (layer) -> layer + == RenderType.cutout()); + ItemBlockRenderTypes.setRenderLayer(ModBlocks.ashstone_door.get(), (layer) -> layer + == RenderType.cutout()); + ItemBlockRenderTypes.setRenderLayer(ModBlocks.dragonstone_door.get(), (layer) -> layer + == RenderType.cutout()); + ItemBlockRenderTypes.setRenderLayer(ModBlocks.fyrite_door.get(), (layer) -> layer + == RenderType.cutout()); + ItemBlockRenderTypes.setRenderLayer(ModBlocks.illumenite_door.get(), (layer) -> layer + == RenderType.cutout()); + ItemBlockRenderTypes.setRenderLayer(ModBlocks.malachite_door.get(), (layer) -> layer + == RenderType.cutout()); + + // bars, which are see-through between the bars, obviously. + ItemBlockRenderTypes.setRenderLayer(ModBlocks.argonite_bars.get(), (layer) -> layer + == RenderType.cutout()); + ItemBlockRenderTypes.setRenderLayer(ModBlocks.ashstone_bars.get(), (layer) -> layer + == RenderType.cutout()); + ItemBlockRenderTypes.setRenderLayer(ModBlocks.dragonstone_bars.get(), (layer) -> layer + == RenderType.cutout()); + ItemBlockRenderTypes.setRenderLayer(ModBlocks.fyrite_bars.get(), (layer) -> layer + == RenderType.cutout()); + ItemBlockRenderTypes.setRenderLayer(ModBlocks.illumenite_bars.get(), (layer) -> layer + == RenderType.cutout()); + ItemBlockRenderTypes.setRenderLayer(ModBlocks.malachite_bars.get(), (layer) -> layer + == RenderType.cutout()); + + } // end onFMLClientSetupEvent() + + @SubscribeEvent + public static void onRegisterClientReloadListenersEvent(final RegisterClientReloadListenersEvent event) + { + if (ModList.get().isLoaded("jei")) + { + // add things to texture atlas. + Minecraft minecraft = Minecraft.getInstance(); + SimpleSpriteUploader spriteUploader = new SimpleSpriteUploader(minecraft.textureManager, SimpleCoreLib.SIMPLE_TEXTURE_ATLAS); + textures = new Textures(spriteUploader); + event.registerReloadListener(spriteUploader); + } + } // end onRegisterClientReloadListenersEvent - } // end () + } // end class diff --git a/src/main/java/mod/alexndr/netherrocks/client/gui/NetherBlastFurnaceScreen.java b/src/main/java/mod/alexndr/netherrocks/client/gui/NetherBlastFurnaceScreen.java index 62ae0436..029ad145 100644 --- a/src/main/java/mod/alexndr/netherrocks/client/gui/NetherBlastFurnaceScreen.java +++ b/src/main/java/mod/alexndr/netherrocks/client/gui/NetherBlastFurnaceScreen.java @@ -3,9 +3,9 @@ import mod.alexndr.netherrocks.Netherrocks; import mod.alexndr.netherrocks.content.NetherBlastFurnaceContainer; import mod.alexndr.simplecorelib.client.gui.VeryAbstractFurnaceScreen; -import net.minecraft.entity.player.PlayerInventory; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.text.ITextComponent; +import net.minecraft.world.entity.player.Inventory; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.network.chat.Component; public class NetherBlastFurnaceScreen extends VeryAbstractFurnaceScreen { @@ -13,7 +13,7 @@ public class NetherBlastFurnaceScreen extends VeryAbstractFurnaceScreen { @@ -13,7 +13,7 @@ public class NetherFurnaceScreen extends VeryAbstractFurnaceScreen { @@ -13,7 +13,7 @@ public class NetherSmokerScreen extends VeryAbstractFurnaceScreen +{ + public static final ResourceLocation UID = new ResourceLocation(Netherrocks.MODID, "nether_furnace_fuel"); + + private final IDrawableStatic background; + private final IDrawableStatic flameTransparentBackground; + private final Component localizedName; + + + public NetherFuelCategory(IGuiHelper guiHelper) + { + super(guiHelper); + + // width of the recipe depends on the text, which is different in each language + Minecraft minecraft = Minecraft.getInstance(); + Font fontRenderer = minecraft.font; + AlternateFuelRecipe.init(100); // because nether furnaces burn 2x as fast as normal. + + Component smeltCountText = AlternateFuelRecipe.createSmeltCountText(100000); + int stringWidth = fontRenderer.width(smeltCountText.getString()); + + background = guiHelper.drawableBuilder(VeryAbstractFurnaceVariantCategory.RECIPE_GUI_VANILLA, 0, 134, 18, 34) + .addPadding(0, 0, 0, stringWidth + 20) + .build(); + + flameTransparentBackground = ClientModEventSubscriber.textures.getFlameIcon(); + localizedName = new TranslatableComponent("gui.jei.category.fuel"); + } // end ctor + + + @Override + public ResourceLocation getUid() + { + return UID; + } + + + @Override + public Class getRecipeClass() + { + return AlternateFuelRecipe.class; + } + + + @Override + public Component getTitle() + { + return localizedName; + } + + + @Override + public IDrawable getBackground() + { + return background; + } + + + @Override + public IDrawable getIcon() + { + return flameTransparentBackground; + } + + + @Override + public void setIngredients(AlternateFuelRecipe recipe, IIngredients ingredients) + { + ingredients.setInputs(VanillaTypes.ITEM, recipe.getInputs()); + } + + + @Override + public void setRecipe(IRecipeLayout recipeLayout, AlternateFuelRecipe recipe, IIngredients ingredients) + { + IGuiItemStackGroup guiItemStacks = recipeLayout.getItemStacks(); + + guiItemStacks.init(fuelSlot, true, 0, 16); + guiItemStacks.set(ingredients); + } + + @Override + public void draw(AlternateFuelRecipe recipe, PoseStack poseStack, double mouseX, double mouseY) { + IDrawableAnimated flame = recipe.getFlame(); + flame.draw(poseStack, 1, 0); + Minecraft minecraft = Minecraft.getInstance(); + Component smeltCountText = recipe.getSmeltCountText(); + minecraft.font.draw(poseStack, smeltCountText, 24, 13, 0xFF808080); + } + +} // end class diff --git a/src/main/java/mod/alexndr/netherrocks/client/jei/NetherFuelRecipeMaker.java b/src/main/java/mod/alexndr/netherrocks/client/jei/NetherFuelRecipeMaker.java new file mode 100644 index 00000000..f2fc0eaa --- /dev/null +++ b/src/main/java/mod/alexndr/netherrocks/client/jei/NetherFuelRecipeMaker.java @@ -0,0 +1,52 @@ +package mod.alexndr.netherrocks.client.jei; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.List; + +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +import mezz.jei.api.constants.VanillaTypes; +import mezz.jei.api.helpers.IGuiHelper; +import mezz.jei.api.helpers.IJeiHelpers; +import mezz.jei.api.runtime.IIngredientManager; +import mod.alexndr.netherrocks.api.content.AbstractNetherFurnaceTileEntity; +import mod.alexndr.simplecorelib.client.jei.AlternateFuelRecipe; +import net.minecraft.world.item.ItemStack; + +public final class NetherFuelRecipeMaker +{ + private static final Logger LOGGER = LogManager.getLogger(); + + private NetherFuelRecipeMaker() {} + + public static List getFuelRecipes(IIngredientManager ingredientManager, IJeiHelpers helpers) + { + IGuiHelper guiHelper = helpers.getGuiHelper(); + Collection allItemStacks = ingredientManager.getAllIngredients(VanillaTypes.ITEM); + List fuelRecipes = new ArrayList<>(); + for (ItemStack stack : allItemStacks) { + int burnTime = getBurnTime(stack); + if (burnTime > 0) { + fuelRecipes.add(new AlternateFuelRecipe(guiHelper, Collections.singleton(stack), burnTime)); + } + } + return fuelRecipes; + } // end getFuelRecipes() + + private static int getBurnTime(ItemStack itemStack) + { + try { + return AbstractNetherFurnaceTileEntity.getBurnTime(itemStack, null); + } + catch (RuntimeException | LinkageError e) + { + String itemStackInfo = itemStack.toString(); + LOGGER.error("Failed to check if item is fuel {}.", itemStackInfo, e); + return 0; + } + } // end getBurnTime + +} // end class diff --git a/src/main/java/mod/alexndr/netherrocks/config/ConfigHelper.java b/src/main/java/mod/alexndr/netherrocks/config/ConfigHelper.java index 2105347c..11087ae7 100644 --- a/src/main/java/mod/alexndr/netherrocks/config/ConfigHelper.java +++ b/src/main/java/mod/alexndr/netherrocks/config/ConfigHelper.java @@ -1,7 +1,7 @@ package mod.alexndr.netherrocks.config; import mod.alexndr.simplecorelib.config.ModOreConfig; -import net.minecraft.world.gen.placement.TopSolidRangeConfig; +import net.minecraft.world.level.levelgen.VerticalAnchor; import net.minecraftforge.fml.config.ModConfig; /** @@ -20,46 +20,43 @@ public static void bakeServer(final ModConfig config) NetherrocksConfig.addModLootToChests = ConfigHolder.SERVER.serverAddModLootToChests.get(); NetherrocksConfig.enableArgoniteOre = ConfigHolder.SERVER.serverEnableArgoniteOre.get(); - NetherrocksConfig.argonite_cfg = new ModOreConfig( - new TopSolidRangeConfig(ConfigHolder.SERVER.serverArgoniteBottomHeight.get(), - 0, ConfigHolder.SERVER.serverArgoniteMaxHeight.get()), - ConfigHolder.SERVER.serverArgoniteVeinSize.get(), - ConfigHolder.SERVER.serverArgoniteVeinCount.get()); + NetherrocksConfig.argonite_cfg = new ModOreConfig(ModOreConfig.FULL_RANGE, + ConfigHolder.SERVER.serverArgoniteVeinSize.get(), ConfigHolder.SERVER.serverArgoniteVeinCount.get(), + VerticalAnchor.absolute(ConfigHolder.SERVER.serverArgoniteBottomHeight.get()), + VerticalAnchor.absolute(ConfigHolder.SERVER.serverArgoniteMaxHeight.get())); + NetherrocksConfig.enableAshstoneOre = ConfigHolder.SERVER.serverEnableAshstoneOre.get(); - NetherrocksConfig.ashstone_cfg = new ModOreConfig( - new TopSolidRangeConfig(ConfigHolder.SERVER.serverAshstoneBottomHeight.get(), - 0, ConfigHolder.SERVER.serverAshstoneMaxHeight.get()), - ConfigHolder.SERVER.serverAshstoneVeinSize.get(), - ConfigHolder.SERVER.serverAshstoneVeinCount.get()); - + NetherrocksConfig.ashstone_cfg = new ModOreConfig(ModOreConfig.FULL_RANGE, + ConfigHolder.SERVER.serverAshstoneVeinSize.get(), ConfigHolder.SERVER.serverAshstoneVeinCount.get(), + VerticalAnchor.absolute(ConfigHolder.SERVER.serverAshstoneBottomHeight.get()), + VerticalAnchor.absolute(ConfigHolder.SERVER.serverAshstoneMaxHeight.get())); + NetherrocksConfig.enableDragonstoneOre = ConfigHolder.SERVER.serverEnableDragonstoneOre.get(); - NetherrocksConfig.dragonstone_cfg = new ModOreConfig( - new TopSolidRangeConfig(ConfigHolder.SERVER.serverDragonstoneBottomHeight.get(), - 0, ConfigHolder.SERVER.serverDragonstoneMaxHeight.get()), - ConfigHolder.SERVER.serverDragonstoneVeinSize.get(), - ConfigHolder.SERVER.serverDragonstoneVeinCount.get()); + NetherrocksConfig.dragonstone_cfg = new ModOreConfig(ModOreConfig.FULL_RANGE, + ConfigHolder.SERVER.serverDragonstoneVeinSize.get(), ConfigHolder.SERVER.serverDragonstoneVeinCount.get(), + VerticalAnchor.absolute(ConfigHolder.SERVER.serverDragonstoneBottomHeight.get()), + VerticalAnchor.absolute(ConfigHolder.SERVER.serverDragonstoneMaxHeight.get())); NetherrocksConfig.enableFyriteOre = ConfigHolder.SERVER.serverEnableFyriteOre.get(); - NetherrocksConfig.fyrite_cfg = new ModOreConfig( - new TopSolidRangeConfig(ConfigHolder.SERVER.serverFyriteBottomHeight.get(), - 0, ConfigHolder.SERVER.serverFyriteMaxHeight.get() ), - ConfigHolder.SERVER.serverFyriteVeinSize.get(), - ConfigHolder.SERVER.serverFyriteVeinCount.get()); + NetherrocksConfig.fyrite_cfg = new ModOreConfig(ModOreConfig.FULL_RANGE, + ConfigHolder.SERVER.serverFyriteVeinSize.get(), ConfigHolder.SERVER.serverFyriteVeinCount.get(), + VerticalAnchor.absolute(ConfigHolder.SERVER.serverFyriteBottomHeight.get()), + VerticalAnchor.absolute(ConfigHolder.SERVER.serverFyriteMaxHeight.get())); NetherrocksConfig.enableIllumeniteOre = ConfigHolder.SERVER.serverEnableIllumeniteOre.get(); - NetherrocksConfig.illumenite_cfg = new ModOreConfig( - new TopSolidRangeConfig(ConfigHolder.SERVER.serverIllumeniteBottomHeight.get(), - 0, ConfigHolder.SERVER.serverIllumeniteMaxHeight.get()), - ConfigHolder.SERVER.serverIllumeniteVeinSize.get(), - ConfigHolder.SERVER.serverIllumeniteVeinCount.get()); + NetherrocksConfig.illumenite_cfg = new ModOreConfig(ModOreConfig.FULL_RANGE, + ConfigHolder.SERVER.serverIllumeniteVeinSize.get(), ConfigHolder.SERVER.serverIllumeniteVeinCount.get(), + VerticalAnchor.absolute(ConfigHolder.SERVER.serverIllumeniteBottomHeight.get()), + VerticalAnchor.absolute(ConfigHolder.SERVER.serverIllumeniteMaxHeight.get())); NetherrocksConfig.enableMalachiteOre = ConfigHolder.SERVER.serverEnableMalachiteOre.get(); - NetherrocksConfig.malachite_cfg = new ModOreConfig( - new TopSolidRangeConfig(ConfigHolder.SERVER.serverMalachiteBottomHeight.get(), - 0, ConfigHolder.SERVER.serverMalachiteMaxHeight.get()), - ConfigHolder.SERVER.serverMalachiteVeinSize.get(), - ConfigHolder.SERVER.serverMalachiteVeinCount.get()); + NetherrocksConfig.malachite_cfg = new ModOreConfig(ModOreConfig.FULL_RANGE, + ConfigHolder.SERVER.serverMalachiteVeinSize.get(),ConfigHolder.SERVER.serverMalachiteVeinCount.get(), + VerticalAnchor.absolute(ConfigHolder.SERVER.serverMalachiteBottomHeight.get()), + VerticalAnchor.absolute(ConfigHolder.SERVER.serverMalachiteMaxHeight.get())); + + NetherrocksConfig.INSTANCE.putFlag("aesthetics_enabled", ConfigHolder.SERVER.serverEnableAesthetics.get()); } // end bakeServer() @SuppressWarnings("unused") diff --git a/src/main/java/mod/alexndr/netherrocks/config/ServerConfig.java b/src/main/java/mod/alexndr/netherrocks/config/ServerConfig.java index 652a3223..2ef1ddcf 100644 --- a/src/main/java/mod/alexndr/netherrocks/config/ServerConfig.java +++ b/src/main/java/mod/alexndr/netherrocks/config/ServerConfig.java @@ -50,13 +50,17 @@ final class ServerConfig final ForgeConfigSpec.IntValue serverMalachiteMaxHeight; final ForgeConfigSpec.BooleanValue serverAddModLootToChests; - + final ForgeConfigSpec.BooleanValue serverEnableAesthetics; + ServerConfig(final ForgeConfigSpec.Builder builder) { builder.push("General"); serverAddModLootToChests = builder.comment("Add Netherrocks items to chest loot?") .translation(Netherrocks.MODID + ".config.serverAddModLootToChests") .define("AddModLootToChests", true); + serverEnableAesthetics = builder.comment("Enable Netherrocks aesthetic blocks?") + .translation(Netherrocks.MODID + "config.EnableAesthetics") + .define("EnableAestheticsBlocks", true); builder.pop(); builder.push("OreGeneration"); @@ -95,11 +99,11 @@ final class ServerConfig .translation(Netherrocks.MODID + ".config.serverArgoniteVeinCount") .defineInRange("ArgoniteVeinCount", 10, 1, Integer.MAX_VALUE); serverArgoniteBottomHeight = builder - .comment("Argonite ore minimum height") + .comment("Argonite ore minimum height (currently ignored)") .translation(Netherrocks.MODID + ".config.serverArgoniteBottomHeight") - .defineInRange("ArgoniteBottomHeight", 0, 1, 128); + .defineInRange("ArgoniteBottomHeight", 1, 1, 128); serverArgoniteMaxHeight = builder - .comment("Argonite ore maximum height") + .comment("Argonite ore maximum height (currently ignored)") .translation(Netherrocks.MODID + ".config.serverArgoniteMaxHeight") .defineInRange("ArgoniteMaxHeight", 128, 1, 128); builder.pop(); @@ -114,11 +118,11 @@ final class ServerConfig .translation(Netherrocks.MODID + ".config.serverAshstoneVeinCount") .defineInRange("AshstoneVeinCount", 10, 1, Integer.MAX_VALUE); serverAshstoneBottomHeight = builder - .comment("Ashstone ore minimum height") + .comment("Ashstone ore minimum height (currently ignored)") .translation(Netherrocks.MODID + ".config.serverAshstoneBottomHeight") - .defineInRange("AshstoneBottomHeight", 0, 1, 127); + .defineInRange("AshstoneBottomHeight", 1, 1, 127); serverAshstoneMaxHeight = builder - .comment("Ashstone ore maximum height") + .comment("Ashstone ore maximum height (currently ignored)") .translation(Netherrocks.MODID + ".config.serverAshstoneMaxHeight") .defineInRange("AshstoneMaxHeight", 128, 1, 128); builder.pop(); @@ -133,11 +137,11 @@ final class ServerConfig .translation(Netherrocks.MODID + ".config.serverDragonstoneVeinCount") .defineInRange("DragonstoneVeinCount", 7, 1, Integer.MAX_VALUE); serverDragonstoneBottomHeight = builder - .comment("Dragonstone ore minimum height") + .comment("Dragonstone ore minimum height (currently ignored)") .translation(Netherrocks.MODID + ".config.serverDragonstoneBottomHeight") - .defineInRange("DragonstoneBottomHeight", 0, 1, 127); + .defineInRange("DragonstoneBottomHeight", 1, 1, 127); serverDragonstoneMaxHeight = builder - .comment("Dragonstone ore maximum height") + .comment("Dragonstone ore maximum height (currently ignored)") .translation(Netherrocks.MODID + ".config.serverDragonstoneMaxHeight") .defineInRange("DragonstoneMaxHeight", 128, 1, 128); builder.pop(); @@ -152,11 +156,11 @@ final class ServerConfig .translation(Netherrocks.MODID + ".config.serverFyriteVeinCount") .defineInRange("FyriteVeinCount", 10, 1, Integer.MAX_VALUE); serverFyriteBottomHeight = builder - .comment("Fyrite ore minimum height") + .comment("Fyrite ore minimum height (currently ignored)") .translation(Netherrocks.MODID + ".config.serverFyriteBottomHeight") - .defineInRange("FyriteBottomHeight", 0, 1, 127); + .defineInRange("FyriteBottomHeight", 1, 1, 127); serverFyriteMaxHeight = builder - .comment("Fyrite ore maximum height") + .comment("Fyrite ore maximum height (currently ignored)") .translation(Netherrocks.MODID + ".config.serverFyriteMaxHeight") .defineInRange("FyriteMaxHeight", 128, 1, 128); builder.pop(); @@ -171,11 +175,11 @@ final class ServerConfig .translation(Netherrocks.MODID + ".config.serverIllumeniteVeinCount") .defineInRange("IllumeniteVeinCount", 5, 1, Integer.MAX_VALUE); serverIllumeniteBottomHeight = builder - .comment("Illumenite ore minimum height") + .comment("Illumenite ore minimum height (currently ignored)") .translation(Netherrocks.MODID + ".config.serverIllumeniteBottomHeight") - .defineInRange("IllumeniteBottomHeight", 0, 1, 127); + .defineInRange("IllumeniteBottomHeight", 1, 1, 127); serverIllumeniteMaxHeight = builder - .comment("Illumenite ore maximum height") + .comment("Illumenite ore maximum height (currently ignored)") .translation(Netherrocks.MODID + ".config.serverIllumeniteMaxHeight") .defineInRange("IllumeniteMaxHeight", 128, 1, 128); builder.pop(); @@ -190,11 +194,11 @@ final class ServerConfig .translation(Netherrocks.MODID + ".config.serverMalachiteVeinCount") .defineInRange("MalachiteVeinCount", 10, 1, Integer.MAX_VALUE); serverMalachiteBottomHeight = builder - .comment("Malachite ore minimum height") + .comment("Malachite ore minimum height (currently ignored)") .translation(Netherrocks.MODID + ".config.serverMalachiteBottomHeight") - .defineInRange("MalachiteBottomHeight", 0, 0, 127); + .defineInRange("MalachiteBottomHeight", 1, 1, 127); serverMalachiteMaxHeight = builder - .comment("Malachite ore maximum height") + .comment("Malachite ore maximum height (currently ignored)") .translation(Netherrocks.MODID + ".config.serverMalachiteMaxHeight") .defineInRange("MalachiteMaxHeight", 128, 1, 128); builder.pop(); diff --git a/src/main/java/mod/alexndr/netherrocks/content/FyriteArmorItem.java b/src/main/java/mod/alexndr/netherrocks/content/FyriteArmorItem.java index fe760793..db7e5049 100644 --- a/src/main/java/mod/alexndr/netherrocks/content/FyriteArmorItem.java +++ b/src/main/java/mod/alexndr/netherrocks/content/FyriteArmorItem.java @@ -4,29 +4,29 @@ import javax.annotation.Nullable; -import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.inventory.EquipmentSlotType; -import net.minecraft.item.ArmorItem; -import net.minecraft.item.IArmorMaterial; -import net.minecraft.item.ItemStack; -import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.TranslationTextComponent; -import net.minecraft.world.World; +import net.minecraft.network.chat.Component; +import net.minecraft.network.chat.TranslatableComponent; +import net.minecraft.world.entity.EquipmentSlot; +import net.minecraft.world.item.ArmorItem; +import net.minecraft.world.item.ArmorMaterial; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.TooltipFlag; +import net.minecraft.world.level.Level; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; public class FyriteArmorItem extends ArmorItem { - public FyriteArmorItem(IArmorMaterial materialIn, EquipmentSlotType slot, Properties builder) + public FyriteArmorItem(ArmorMaterial materialIn, EquipmentSlot slot, Properties builder) { super(materialIn, slot, builder); } @Override @OnlyIn(Dist.CLIENT) - public void appendHoverText(ItemStack stack, @Nullable World worldIn, List tooltip, ITooltipFlag flagIn) + public void appendHoverText(ItemStack stack, @Nullable Level worldIn, List tooltip, TooltipFlag flagIn) { super.appendHoverText(stack, worldIn, tooltip, flagIn); - tooltip.add(new TranslationTextComponent("netherrocks.fyrite_armor.info")); + tooltip.add(new TranslatableComponent("netherrocks.fyrite_armor.info")); } } // end class FyriteArmorItem diff --git a/src/main/java/mod/alexndr/netherrocks/content/FyriteAxeItem.java b/src/main/java/mod/alexndr/netherrocks/content/FyriteAxeItem.java index 1880f2a6..19b68fb0 100644 --- a/src/main/java/mod/alexndr/netherrocks/content/FyriteAxeItem.java +++ b/src/main/java/mod/alexndr/netherrocks/content/FyriteAxeItem.java @@ -1,28 +1,28 @@ package mod.alexndr.netherrocks.content; import mod.alexndr.netherrocks.helpers.FyriteHandler; -import net.minecraft.block.BlockState; -import net.minecraft.entity.LivingEntity; -import net.minecraft.item.AxeItem; -import net.minecraft.item.IItemTier; -import net.minecraft.item.ItemStack; -import net.minecraft.item.ItemUseContext; -import net.minecraft.util.ActionResultType; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; +import net.minecraft.core.BlockPos; +import net.minecraft.world.InteractionResult; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.item.AxeItem; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.Tier; +import net.minecraft.world.item.context.UseOnContext; +import net.minecraft.world.level.Level; +import net.minecraft.world.level.block.state.BlockState; public class FyriteAxeItem extends AxeItem { - public FyriteAxeItem(IItemTier tier, float attackDamageIn, float attackSpeedIn, Properties builder) + public FyriteAxeItem(Tier tier, float attackDamageIn, float attackSpeedIn, Properties builder) { super(tier, attackDamageIn, attackSpeedIn, builder); } @Override - public ActionResultType useOn(ItemUseContext context) + public InteractionResult useOn(UseOnContext context) { - ActionResultType result = super.useOn(context); + InteractionResult result = super.useOn(context); FyriteHandler.INSTANCE.onItemUse(context); return result; } @@ -35,7 +35,7 @@ public boolean hurtEnemy(ItemStack stack, LivingEntity target, LivingEntity atta } @Override - public boolean mineBlock(ItemStack stack, World worldIn, BlockState state, BlockPos pos, + public boolean mineBlock(ItemStack stack, Level worldIn, BlockState state, BlockPos pos, LivingEntity entityLiving) { FyriteHandler.INSTANCE.afterBlockSmelt(worldIn, pos, true); diff --git a/src/main/java/mod/alexndr/netherrocks/content/FyritePickaxeIteam.java b/src/main/java/mod/alexndr/netherrocks/content/FyritePickaxeIteam.java index 6650c068..759e21a3 100644 --- a/src/main/java/mod/alexndr/netherrocks/content/FyritePickaxeIteam.java +++ b/src/main/java/mod/alexndr/netherrocks/content/FyritePickaxeIteam.java @@ -1,26 +1,26 @@ package mod.alexndr.netherrocks.content; import mod.alexndr.netherrocks.helpers.FyriteHandler; -import net.minecraft.block.BlockState; -import net.minecraft.entity.LivingEntity; -import net.minecraft.item.IItemTier; -import net.minecraft.item.ItemStack; -import net.minecraft.item.ItemUseContext; -import net.minecraft.item.PickaxeItem; -import net.minecraft.util.ActionResultType; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; +import net.minecraft.core.BlockPos; +import net.minecraft.world.InteractionResult; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.PickaxeItem; +import net.minecraft.world.item.Tier; +import net.minecraft.world.item.context.UseOnContext; +import net.minecraft.world.level.Level; +import net.minecraft.world.level.block.state.BlockState; public class FyritePickaxeIteam extends PickaxeItem { - public FyritePickaxeIteam(IItemTier tier, int attackDamageIn, float attackSpeedIn, Properties builder) + public FyritePickaxeIteam(Tier tier, int attackDamageIn, float attackSpeedIn, Properties builder) { super(tier, attackDamageIn, attackSpeedIn, builder); } @Override - public boolean mineBlock(ItemStack stack, World worldIn, BlockState state, BlockPos pos, + public boolean mineBlock(ItemStack stack, Level worldIn, BlockState state, BlockPos pos, LivingEntity entityLiving) { FyriteHandler.INSTANCE.afterBlockSmelt(worldIn, pos, true); @@ -28,9 +28,9 @@ public boolean mineBlock(ItemStack stack, World worldIn, BlockState state, Block } @Override - public ActionResultType useOn(ItemUseContext context) + public InteractionResult useOn(UseOnContext context) { - ActionResultType result = super.useOn(context); + InteractionResult result = super.useOn(context); FyriteHandler.INSTANCE.onItemUse(context); return result; } diff --git a/src/main/java/mod/alexndr/netherrocks/content/FyriteShovelItem.java b/src/main/java/mod/alexndr/netherrocks/content/FyriteShovelItem.java index d650955f..148bace5 100644 --- a/src/main/java/mod/alexndr/netherrocks/content/FyriteShovelItem.java +++ b/src/main/java/mod/alexndr/netherrocks/content/FyriteShovelItem.java @@ -1,20 +1,20 @@ package mod.alexndr.netherrocks.content; import mod.alexndr.netherrocks.helpers.FyriteHandler; -import net.minecraft.block.BlockState; -import net.minecraft.entity.LivingEntity; -import net.minecraft.item.IItemTier; -import net.minecraft.item.ItemStack; -import net.minecraft.item.ItemUseContext; -import net.minecraft.item.ShovelItem; -import net.minecraft.util.ActionResultType; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; +import net.minecraft.core.BlockPos; +import net.minecraft.world.InteractionResult; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.ShovelItem; +import net.minecraft.world.item.Tier; +import net.minecraft.world.item.context.UseOnContext; +import net.minecraft.world.level.Level; +import net.minecraft.world.level.block.state.BlockState; public class FyriteShovelItem extends ShovelItem { - public FyriteShovelItem(IItemTier tier, float attackDamageIn, float attackSpeedIn, Properties builder) + public FyriteShovelItem(Tier tier, float attackDamageIn, float attackSpeedIn, Properties builder) { super(tier, attackDamageIn, attackSpeedIn, builder); } @@ -22,15 +22,15 @@ public FyriteShovelItem(IItemTier tier, float attackDamageIn, float attackSpeedI // for shovels, do the FyriteHandler() thing AFTER the normal thing, or paths // won't get created. (Paths require air above grass_block, not fire). @Override - public ActionResultType useOn(ItemUseContext context) + public InteractionResult useOn(UseOnContext context) { - ActionResultType result = super.useOn(context); + InteractionResult result = super.useOn(context); FyriteHandler.INSTANCE.onItemUse(context); return result; } @Override - public boolean mineBlock(ItemStack stack, World worldIn, BlockState state, BlockPos pos, + public boolean mineBlock(ItemStack stack, Level worldIn, BlockState state, BlockPos pos, LivingEntity entityLiving) { FyriteHandler.INSTANCE.afterBlockSmelt(worldIn, pos, true); diff --git a/src/main/java/mod/alexndr/netherrocks/content/FyriteSwordItem.java b/src/main/java/mod/alexndr/netherrocks/content/FyriteSwordItem.java index afc6570c..13c1dde0 100644 --- a/src/main/java/mod/alexndr/netherrocks/content/FyriteSwordItem.java +++ b/src/main/java/mod/alexndr/netherrocks/content/FyriteSwordItem.java @@ -1,17 +1,17 @@ package mod.alexndr.netherrocks.content; import mod.alexndr.netherrocks.helpers.FyriteHandler; -import net.minecraft.entity.LivingEntity; -import net.minecraft.item.IItemTier; -import net.minecraft.item.ItemStack; -import net.minecraft.item.ItemUseContext; -import net.minecraft.item.SwordItem; -import net.minecraft.util.ActionResultType; +import net.minecraft.world.InteractionResult; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.SwordItem; +import net.minecraft.world.item.Tier; +import net.minecraft.world.item.context.UseOnContext; public class FyriteSwordItem extends SwordItem { - public FyriteSwordItem(IItemTier tier, int attackDamageIn, float attackSpeedIn, Properties builder) + public FyriteSwordItem(Tier tier, int attackDamageIn, float attackSpeedIn, Properties builder) { super(tier, attackDamageIn, attackSpeedIn, builder); } @@ -24,9 +24,9 @@ public boolean hurtEnemy(ItemStack stack, LivingEntity target, LivingEntity atta } @Override - public ActionResultType useOn(ItemUseContext context) + public InteractionResult useOn(UseOnContext context) { - ActionResultType result = super.useOn(context); + InteractionResult result = super.useOn(context); FyriteHandler.INSTANCE.onItemUse(context); return result; } // end onItemUse() diff --git a/src/main/java/mod/alexndr/netherrocks/content/IllumeniteArmorItem.java b/src/main/java/mod/alexndr/netherrocks/content/IllumeniteArmorItem.java index 4675e109..44c83deb 100644 --- a/src/main/java/mod/alexndr/netherrocks/content/IllumeniteArmorItem.java +++ b/src/main/java/mod/alexndr/netherrocks/content/IllumeniteArmorItem.java @@ -4,29 +4,29 @@ import javax.annotation.Nullable; -import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.inventory.EquipmentSlotType; -import net.minecraft.item.ArmorItem; -import net.minecraft.item.IArmorMaterial; -import net.minecraft.item.ItemStack; -import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.TranslationTextComponent; -import net.minecraft.world.World; +import net.minecraft.network.chat.Component; +import net.minecraft.network.chat.TranslatableComponent; +import net.minecraft.world.entity.EquipmentSlot; +import net.minecraft.world.item.ArmorItem; +import net.minecraft.world.item.ArmorMaterial; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.TooltipFlag; +import net.minecraft.world.level.Level; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; public class IllumeniteArmorItem extends ArmorItem { - public IllumeniteArmorItem(IArmorMaterial materialIn, EquipmentSlotType slot, Properties builder) + public IllumeniteArmorItem(ArmorMaterial materialIn, EquipmentSlot slot, Properties builder) { super(materialIn, slot, builder); } @Override @OnlyIn(Dist.CLIENT) - public void appendHoverText(ItemStack stack, @Nullable World worldIn, List tooltip, ITooltipFlag flagIn) + public void appendHoverText(ItemStack stack, @Nullable Level worldIn, List tooltip, TooltipFlag flagIn) { super.appendHoverText(stack, worldIn, tooltip, flagIn); - tooltip.add(new TranslationTextComponent("netherrocks.illumenite_armor.info")); + tooltip.add(new TranslatableComponent("netherrocks.illumenite_armor.info")); } } // end class IllumeniteArmorItem diff --git a/src/main/java/mod/alexndr/netherrocks/content/IllumeniteSwordItem.java b/src/main/java/mod/alexndr/netherrocks/content/IllumeniteSwordItem.java index fecd4ed0..1ad4ec16 100644 --- a/src/main/java/mod/alexndr/netherrocks/content/IllumeniteSwordItem.java +++ b/src/main/java/mod/alexndr/netherrocks/content/IllumeniteSwordItem.java @@ -1,15 +1,15 @@ package mod.alexndr.netherrocks.content; import mod.alexndr.netherrocks.helpers.IllumeniteHandler; -import net.minecraft.entity.LivingEntity; -import net.minecraft.item.IItemTier; -import net.minecraft.item.ItemStack; -import net.minecraft.item.SwordItem; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.SwordItem; +import net.minecraft.world.item.Tier; public class IllumeniteSwordItem extends SwordItem { - public IllumeniteSwordItem(IItemTier tier, int attackDamageIn, float attackSpeedIn, Properties builder) + public IllumeniteSwordItem(Tier tier, int attackDamageIn, float attackSpeedIn, Properties builder) { super(tier, attackDamageIn, attackSpeedIn, builder); } diff --git a/src/main/java/mod/alexndr/netherrocks/content/MalachiteArmorItem.java b/src/main/java/mod/alexndr/netherrocks/content/MalachiteArmorItem.java index d1f16eee..1835b648 100644 --- a/src/main/java/mod/alexndr/netherrocks/content/MalachiteArmorItem.java +++ b/src/main/java/mod/alexndr/netherrocks/content/MalachiteArmorItem.java @@ -5,17 +5,17 @@ import javax.annotation.Nullable; import mod.alexndr.simplecorelib.helpers.ArmorUtils; -import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.inventory.EquipmentSlotType; -import net.minecraft.item.ArmorItem; -import net.minecraft.item.IArmorMaterial; -import net.minecraft.item.ItemStack; -import net.minecraft.potion.EffectInstance; -import net.minecraft.potion.Effects; -import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.TranslationTextComponent; -import net.minecraft.world.World; +import net.minecraft.network.chat.Component; +import net.minecraft.network.chat.TranslatableComponent; +import net.minecraft.world.effect.MobEffectInstance; +import net.minecraft.world.effect.MobEffects; +import net.minecraft.world.entity.EquipmentSlot; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.ArmorItem; +import net.minecraft.world.item.ArmorMaterial; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.TooltipFlag; +import net.minecraft.world.level.Level; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; @@ -24,19 +24,19 @@ public class MalachiteArmorItem extends ArmorItem protected final int jumpBoostFactor = 1; - public MalachiteArmorItem(IArmorMaterial materialIn, EquipmentSlotType slot, Properties builder) + public MalachiteArmorItem(ArmorMaterial materialIn, EquipmentSlot slot, Properties builder) { super(materialIn, slot, builder); } @Override - public void onArmorTick(ItemStack stack, World world, PlayerEntity player) + public void onArmorTick(ItemStack stack, Level world, Player player) { // must be wearing full set and not sneaking if (ArmorUtils.isPlayerWearingFullSet(player, NetherrocksArmorMaterial.MALACHITE) && ! player.isShiftKeyDown()) { - player.addEffect(new EffectInstance(Effects.JUMP, 2, jumpBoostFactor, false, false)); + player.addEffect(new MobEffectInstance(MobEffects.JUMP, 2, jumpBoostFactor, false, false)); //new PotionEffect(MobEffects.JUMP_BOOST, 2, jumpBoostFactor)); } super.onArmorTick(stack, world, player); @@ -44,9 +44,9 @@ public void onArmorTick(ItemStack stack, World world, PlayerEntity player) @Override @OnlyIn(Dist.CLIENT) - public void appendHoverText(ItemStack stack, @Nullable World worldIn, List tooltip, ITooltipFlag flagIn) + public void appendHoverText(ItemStack stack, @Nullable Level worldIn, List tooltip, TooltipFlag flagIn) { super.appendHoverText(stack, worldIn, tooltip, flagIn); - tooltip.add(new TranslationTextComponent("netherrocks.malachite_armor.info")); + tooltip.add(new TranslatableComponent("netherrocks.malachite_armor.info")); } } // end class MalachiteArmorItem diff --git a/src/main/java/mod/alexndr/netherrocks/content/MalachiteAxeItem.java b/src/main/java/mod/alexndr/netherrocks/content/MalachiteAxeItem.java index 27931e65..a434efee 100644 --- a/src/main/java/mod/alexndr/netherrocks/content/MalachiteAxeItem.java +++ b/src/main/java/mod/alexndr/netherrocks/content/MalachiteAxeItem.java @@ -1,15 +1,15 @@ package mod.alexndr.netherrocks.content; import mod.alexndr.netherrocks.helpers.MalachiteHandler; -import net.minecraft.entity.LivingEntity; -import net.minecraft.item.AxeItem; -import net.minecraft.item.IItemTier; -import net.minecraft.item.ItemStack; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.item.AxeItem; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.Tier; public class MalachiteAxeItem extends AxeItem { - public MalachiteAxeItem(IItemTier tier, float attackDamageIn, float attackSpeedIn, Properties builder) + public MalachiteAxeItem(Tier tier, float attackDamageIn, float attackSpeedIn, Properties builder) { super(tier, attackDamageIn, attackSpeedIn, builder); } diff --git a/src/main/java/mod/alexndr/netherrocks/content/MalachiteSwordItem.java b/src/main/java/mod/alexndr/netherrocks/content/MalachiteSwordItem.java index b095522c..2e437854 100644 --- a/src/main/java/mod/alexndr/netherrocks/content/MalachiteSwordItem.java +++ b/src/main/java/mod/alexndr/netherrocks/content/MalachiteSwordItem.java @@ -1,15 +1,15 @@ package mod.alexndr.netherrocks.content; import mod.alexndr.netherrocks.helpers.MalachiteHandler; -import net.minecraft.entity.LivingEntity; -import net.minecraft.item.IItemTier; -import net.minecraft.item.ItemStack; -import net.minecraft.item.SwordItem; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.SwordItem; +import net.minecraft.world.item.Tier; public class MalachiteSwordItem extends SwordItem { - public MalachiteSwordItem(IItemTier tier, int attackDamageIn, float attackSpeedIn, Properties builderIn) + public MalachiteSwordItem(Tier tier, int attackDamageIn, float attackSpeedIn, Properties builderIn) { super(tier, attackDamageIn, attackSpeedIn, builderIn); } diff --git a/src/main/java/mod/alexndr/netherrocks/content/NetherBlastFurnaceBlock.java b/src/main/java/mod/alexndr/netherrocks/content/NetherBlastFurnaceBlock.java index 5c4fa9b1..8551d0a9 100644 --- a/src/main/java/mod/alexndr/netherrocks/content/NetherBlastFurnaceBlock.java +++ b/src/main/java/mod/alexndr/netherrocks/content/NetherBlastFurnaceBlock.java @@ -2,19 +2,16 @@ import mod.alexndr.netherrocks.api.content.AbstractNetherBlastFurnaceBlock; import mod.alexndr.netherrocks.init.ModTiles; -import net.minecraft.block.BlockState; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.entity.player.ServerPlayerEntity; -import net.minecraft.inventory.InventoryHelper; +import net.minecraft.core.BlockPos; import net.minecraft.stats.Stats; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ActionResultType; -import net.minecraft.util.Hand; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.BlockRayTraceResult; -import net.minecraft.world.IBlockReader; -import net.minecraft.world.World; -import net.minecraftforge.fml.network.NetworkHooks; +import net.minecraft.world.Containers; +import net.minecraft.world.MenuProvider; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.level.Level; +import net.minecraft.world.level.block.entity.BlockEntity; +import net.minecraft.world.level.block.entity.BlockEntityTicker; +import net.minecraft.world.level.block.entity.BlockEntityType; +import net.minecraft.world.level.block.state.BlockState; import net.minecraftforge.items.ItemStackHandler; public class NetherBlastFurnaceBlock extends AbstractNetherBlastFurnaceBlock @@ -25,24 +22,18 @@ public NetherBlastFurnaceBlock(Properties builder) super(builder); } + @SuppressWarnings("deprecation") @Override - public TileEntity createTileEntity(BlockState state, IBlockReader world) - { - return ModTiles.NETHER_BLAST_FURNACE.get().create(); - } - - @SuppressWarnings("deprecation") - @Override - public void onRemove(BlockState oldState, World worldIn, BlockPos pos, BlockState newState, boolean isMoving) + public void onRemove(BlockState oldState, Level worldIn, BlockPos pos, BlockState newState, boolean isMoving) { if (oldState.getBlock() != newState.getBlock()) { - TileEntity tileEntity = worldIn.getBlockEntity(pos); + BlockEntity tileEntity = worldIn.getBlockEntity(pos); if (tileEntity instanceof NetherBlastFurnaceTileEntity) { final ItemStackHandler inventory = ((NetherBlastFurnaceTileEntity) tileEntity).inventory; for (int slot = 0; slot < inventory.getSlots(); ++slot) - InventoryHelper.dropItemStack(worldIn, pos.getX(), pos.getY(), pos.getZ(), + Containers.dropItemStack(worldIn, pos.getX(), pos.getY(), pos.getZ(), inventory.getStackInSlot(slot)); } } @@ -50,19 +41,28 @@ public void onRemove(BlockState oldState, World worldIn, BlockPos pos, BlockStat super.onRemove(oldState, worldIn, pos, newState, isMoving); } // end onRemove - @Override - public ActionResultType use(BlockState state, World worldIn, BlockPos pos, PlayerEntity player, - Hand handIn, BlockRayTraceResult hit) - { - if (!worldIn.isClientSide) { - final TileEntity tileEntity = worldIn.getBlockEntity(pos); - if (tileEntity instanceof NetherBlastFurnaceTileEntity) - { - NetworkHooks.openGui((ServerPlayerEntity) player, (NetherBlastFurnaceTileEntity) tileEntity, pos); - player.awardStat(Stats.INTERACT_WITH_BLAST_FURNACE); - } - } - return ActionResultType.SUCCESS; - } + @Override + public BlockEntityTicker getTicker(Level level, BlockState bstate, BlockEntityType entityType) + { + return createFurnaceTicker(level, entityType, ModTiles.NETHER_BLAST_FURNACE.get()); + } + + + @Override + public BlockEntity newBlockEntity(BlockPos bpos, BlockState bstate) { + return new NetherBlastFurnaceTileEntity(bpos, bstate); + } + + + @Override + protected void openContainer(Level level, BlockPos bpos, Player player) + { + BlockEntity blockentity = level.getBlockEntity(bpos); + if (blockentity instanceof NetherBlastFurnaceTileEntity) + { + player.openMenu((MenuProvider) blockentity); + player.awardStat(Stats.INTERACT_WITH_FURNACE); + } + } } // end class diff --git a/src/main/java/mod/alexndr/netherrocks/content/NetherBlastFurnaceContainer.java b/src/main/java/mod/alexndr/netherrocks/content/NetherBlastFurnaceContainer.java index 1b7f84ff..ee0d8104 100644 --- a/src/main/java/mod/alexndr/netherrocks/content/NetherBlastFurnaceContainer.java +++ b/src/main/java/mod/alexndr/netherrocks/content/NetherBlastFurnaceContainer.java @@ -1,42 +1,27 @@ package mod.alexndr.netherrocks.content; -import java.util.Objects; - -import mod.alexndr.netherrocks.api.content.AbstractNetherFurnaceContainer; -import mod.alexndr.netherrocks.init.ModBlocks; import mod.alexndr.netherrocks.init.ModContainers; -import net.minecraft.entity.player.PlayerInventory; -import net.minecraft.inventory.container.ContainerType; -import net.minecraft.network.PacketBuffer; -import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.fml.network.IContainerFactory; +import mod.alexndr.simplecorelib.content.VeryAbstractFurnaceMenu; +import net.minecraft.network.FriendlyByteBuf; +import net.minecraft.world.entity.player.Inventory; +import net.minecraft.world.item.crafting.RecipeType; +import net.minecraftforge.fmllegacy.network.IContainerFactory; -public class NetherBlastFurnaceContainer extends AbstractNetherFurnaceContainer +public class NetherBlastFurnaceContainer extends VeryAbstractFurnaceMenu { /** * Logical-client-side constructor, called from {@link ContainerType#create(IContainerFactory)} * Calls the logical-server-side constructor with the TileEntity at the pos in the PacketBuffer */ - public NetherBlastFurnaceContainer(final int windowId, final PlayerInventory playerInventory, final PacketBuffer data) + public NetherBlastFurnaceContainer(final int windowId, final Inventory playerInventory, final FriendlyByteBuf data) { - this(windowId, playerInventory, getTileEntity(playerInventory, data)); + super(ModContainers.NETHER_BLAST_FURNACE.get(), RecipeType.BLASTING, windowId, playerInventory); } - public NetherBlastFurnaceContainer(int id, PlayerInventory playerInventory, - NetherBlastFurnaceTileEntity tileEntity) + public NetherBlastFurnaceContainer(final int windowId, final Inventory playerInventory, final NetherBlastFurnaceTileEntity tileEntity) { - super(ModContainers.NETHER_BLAST_FURNACE.get(), id, playerInventory, tileEntity, - ModBlocks.nether_blast_furnace); + super(ModContainers.NETHER_BLAST_FURNACE.get(), RecipeType.BLASTING, windowId, playerInventory, tileEntity.inventory, + tileEntity.dataAccess, tileEntity); } - private static NetherBlastFurnaceTileEntity getTileEntity(final PlayerInventory playerInventory, final PacketBuffer data) - { - Objects.requireNonNull(playerInventory, "playerInventory cannot be null!"); - Objects.requireNonNull(data, "data cannot be null!"); - final TileEntity tileAtPos = playerInventory.player.level.getBlockEntity(data.readBlockPos()); - if (tileAtPos instanceof NetherBlastFurnaceTileEntity) - return (NetherBlastFurnaceTileEntity) tileAtPos; - throw new IllegalStateException("Tile entity is not correct! " + tileAtPos); - } - } // end class diff --git a/src/main/java/mod/alexndr/netherrocks/content/NetherBlastFurnaceTileEntity.java b/src/main/java/mod/alexndr/netherrocks/content/NetherBlastFurnaceTileEntity.java index ba912242..db4ecf73 100644 --- a/src/main/java/mod/alexndr/netherrocks/content/NetherBlastFurnaceTileEntity.java +++ b/src/main/java/mod/alexndr/netherrocks/content/NetherBlastFurnaceTileEntity.java @@ -3,20 +3,21 @@ import mod.alexndr.netherrocks.api.content.AbstractNetherFurnaceTileEntity; import mod.alexndr.netherrocks.init.ModBlocks; import mod.alexndr.netherrocks.init.ModTiles; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.entity.player.PlayerInventory; -import net.minecraft.inventory.container.Container; -import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.IRecipeType; -import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.TranslationTextComponent; +import net.minecraft.core.BlockPos; +import net.minecraft.network.chat.Component; +import net.minecraft.network.chat.TranslatableComponent; +import net.minecraft.world.entity.player.Inventory; +import net.minecraft.world.inventory.AbstractContainerMenu; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.crafting.RecipeType; +import net.minecraft.world.level.block.state.BlockState; public class NetherBlastFurnaceTileEntity extends AbstractNetherFurnaceTileEntity { - public NetherBlastFurnaceTileEntity() + public NetherBlastFurnaceTileEntity(BlockPos blockpos, BlockState blockstate) { - super(ModTiles.NETHER_BLAST_FURNACE.get(), IRecipeType.BLASTING); + super(ModTiles.NETHER_BLAST_FURNACE.get(), blockpos, blockstate, RecipeType.BLASTING); } @Override @@ -26,15 +27,16 @@ protected int getBurnDuration(ItemStack fuelstack) } @Override - public ITextComponent getDisplayName() + public Component getDefaultName() { - return new TranslationTextComponent(ModBlocks.nether_blast_furnace.get().getDescriptionId()); + return new TranslatableComponent(ModBlocks.nether_blast_furnace.get().getDescriptionId()); } @Override - public Container createMenu(int windowId, PlayerInventory inventory, PlayerEntity player) + public AbstractContainerMenu createMenu(int windowId, Inventory inventory) { return new NetherBlastFurnaceContainer(windowId, inventory, this); } + } // end class diff --git a/src/main/java/mod/alexndr/netherrocks/content/NetherFurnaceBlock.java b/src/main/java/mod/alexndr/netherrocks/content/NetherFurnaceBlock.java index 295462fe..f4f999b2 100644 --- a/src/main/java/mod/alexndr/netherrocks/content/NetherFurnaceBlock.java +++ b/src/main/java/mod/alexndr/netherrocks/content/NetherFurnaceBlock.java @@ -1,25 +1,20 @@ package mod.alexndr.netherrocks.content; -import javax.annotation.Nullable; - -import mod.alexndr.netherrocks.api.content.AbstractNetherFurnaceBlock; import mod.alexndr.netherrocks.init.ModTiles; -import net.minecraft.block.BlockState; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.entity.player.ServerPlayerEntity; -import net.minecraft.inventory.InventoryHelper; +import mod.alexndr.simplecorelib.content.VeryAbstractFurnaceBlock; +import net.minecraft.core.BlockPos; import net.minecraft.stats.Stats; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ActionResultType; -import net.minecraft.util.Hand; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.BlockRayTraceResult; -import net.minecraft.world.IBlockReader; -import net.minecraft.world.World; -import net.minecraftforge.fml.network.NetworkHooks; +import net.minecraft.world.Containers; +import net.minecraft.world.MenuProvider; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.level.Level; +import net.minecraft.world.level.block.entity.BlockEntity; +import net.minecraft.world.level.block.entity.BlockEntityTicker; +import net.minecraft.world.level.block.entity.BlockEntityType; +import net.minecraft.world.level.block.state.BlockState; import net.minecraftforge.items.ItemStackHandler; -public class NetherFurnaceBlock extends AbstractNetherFurnaceBlock +public class NetherFurnaceBlock extends VeryAbstractFurnaceBlock { public NetherFurnaceBlock(final Properties builder) @@ -28,13 +23,6 @@ public NetherFurnaceBlock(final Properties builder) } // end ctor - @Nullable - @Override - public TileEntity createTileEntity(final BlockState state, final IBlockReader world) { - // Always use TileEntityType#create to allow registry overrides to work. - return ModTiles.NETHER_FURNACE.get().create(); - } - /** * Called on the logical server when a BlockState with a TileEntity is replaced by another BlockState. * We use this method to drop all the items from our tile entity's inventory and update comparators near our block. @@ -43,16 +31,16 @@ public TileEntity createTileEntity(final BlockState state, final IBlockReader wo * Implementing/overriding is fine. */ @Override - public void onRemove(BlockState oldState, World worldIn, BlockPos pos, BlockState newState, boolean isMoving) + public void onRemove(BlockState oldState, Level worldIn, BlockPos pos, BlockState newState, boolean isMoving) { if (oldState.getBlock() != newState.getBlock()) { - TileEntity tileEntity = worldIn.getBlockEntity(pos); + BlockEntity tileEntity = worldIn.getBlockEntity(pos); if (tileEntity instanceof NetherFurnaceTileEntity) { final ItemStackHandler inventory = ((NetherFurnaceTileEntity) tileEntity).inventory; for (int slot = 0; slot < inventory.getSlots(); ++slot) - InventoryHelper.dropItemStack(worldIn, pos.getX(), pos.getY(), pos.getZ(), + Containers.dropItemStack(worldIn, pos.getX(), pos.getY(), pos.getZ(), inventory.getStackInSlot(slot)); } } @@ -60,26 +48,28 @@ public void onRemove(BlockState oldState, World worldIn, BlockPos pos, BlockStat super.onRemove(oldState, worldIn, pos, newState, isMoving); } - /** - * Called when a player right clicks our block. - * We use this method to open our gui. - * - * @deprecated Call via {@link BlockState#onBlockActivated(World, PlayerEntity, Hand, BlockRayTraceResult)} whenever possible. - * Implementing/overriding is fine. - */ - @Override - public ActionResultType use(final BlockState state, final World worldIn, final BlockPos pos, final PlayerEntity player, final Hand handIn, final BlockRayTraceResult hit) - { - if (!worldIn.isClientSide) { - final TileEntity tileEntity = worldIn.getBlockEntity(pos); - if (tileEntity instanceof NetherFurnaceTileEntity) - { - NetworkHooks.openGui((ServerPlayerEntity) player, (NetherFurnaceTileEntity) tileEntity, pos); - player.awardStat(Stats.INTERACT_WITH_FURNACE); - } - } - return ActionResultType.SUCCESS; - } + @Override + public BlockEntityTicker getTicker(Level level, BlockState bstate, BlockEntityType entityType) + { + return createFurnaceTicker(level, entityType, ModTiles.NETHER_FURNACE.get()); + } + + + @Override + public BlockEntity newBlockEntity(BlockPos bpos, BlockState bstate) { + return new NetherFurnaceTileEntity(bpos, bstate); + } + + @Override + protected void openContainer(Level level, BlockPos bpos, Player player) + { + BlockEntity blockentity = level.getBlockEntity(bpos); + if (blockentity instanceof NetherFurnaceTileEntity) + { + player.openMenu((MenuProvider) blockentity); + player.awardStat(Stats.INTERACT_WITH_FURNACE); + } + } } // end class NetherFurnaceBlock diff --git a/src/main/java/mod/alexndr/netherrocks/content/NetherFurnaceContainer.java b/src/main/java/mod/alexndr/netherrocks/content/NetherFurnaceContainer.java index c665a41a..1a07c542 100644 --- a/src/main/java/mod/alexndr/netherrocks/content/NetherFurnaceContainer.java +++ b/src/main/java/mod/alexndr/netherrocks/content/NetherFurnaceContainer.java @@ -1,45 +1,34 @@ package mod.alexndr.netherrocks.content; -import java.util.Objects; - -import mod.alexndr.netherrocks.api.content.AbstractNetherFurnaceContainer; -import mod.alexndr.netherrocks.init.ModBlocks; import mod.alexndr.netherrocks.init.ModContainers; -import net.minecraft.entity.player.PlayerInventory; -import net.minecraft.inventory.container.ContainerType; -import net.minecraft.network.PacketBuffer; -import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.fml.network.IContainerFactory; +import mod.alexndr.simplecorelib.content.VeryAbstractFurnaceMenu; +import net.minecraft.network.FriendlyByteBuf; +import net.minecraft.world.entity.player.Inventory; +import net.minecraft.world.item.crafting.RecipeType; +import net.minecraftforge.fmllegacy.network.IContainerFactory; -public class NetherFurnaceContainer extends AbstractNetherFurnaceContainer +public class NetherFurnaceContainer extends VeryAbstractFurnaceMenu { /** * Logical-client-side constructor, called from {@link ContainerType#create(IContainerFactory)} * Calls the logical-server-side constructor with the TileEntity at the pos in the PacketBuffer */ - public NetherFurnaceContainer(final int windowId, final PlayerInventory playerInventory, final PacketBuffer data) + public NetherFurnaceContainer(final int windowId, final Inventory playerInventory, final FriendlyByteBuf data) { - this(windowId, playerInventory, getTileEntity(playerInventory, data)); + super(ModContainers.NETHER_FURNACE.get(), RecipeType.SMELTING, windowId, playerInventory); } /** * Constructor called logical-server-side from {@link NetherFurnaceTileEntity#createMenu} * and logical-client-side from {@link #NetherFurnaceContainer(int, PlayerInventory, PacketBuffer)} */ - public NetherFurnaceContainer(final int windowId, final PlayerInventory playerInventory, final NetherFurnaceTileEntity tileEntity) + public NetherFurnaceContainer(final int windowId, final Inventory playerInventory, final NetherFurnaceTileEntity tileEntity) { - super(ModContainers.NETHER_FURNACE.get(), windowId, playerInventory, tileEntity, ModBlocks.nether_furnace); + super(ModContainers.NETHER_FURNACE.get(), RecipeType.SMELTING, windowId, playerInventory, tileEntity.inventory, + tileEntity.dataAccess, tileEntity); } // end server-side ctor - private static NetherFurnaceTileEntity getTileEntity(final PlayerInventory playerInventory, final PacketBuffer data) { - Objects.requireNonNull(playerInventory, "playerInventory cannot be null!"); - Objects.requireNonNull(data, "data cannot be null!"); - final TileEntity tileAtPos = playerInventory.player.level.getBlockEntity(data.readBlockPos()); - if (tileAtPos instanceof NetherFurnaceTileEntity) - return (NetherFurnaceTileEntity) tileAtPos; - throw new IllegalStateException("Tile entity is not correct! " + tileAtPos); - } } // end class NetherFurnaceContainer diff --git a/src/main/java/mod/alexndr/netherrocks/content/NetherFurnaceTileEntity.java b/src/main/java/mod/alexndr/netherrocks/content/NetherFurnaceTileEntity.java index abe05a85..6fbf749a 100644 --- a/src/main/java/mod/alexndr/netherrocks/content/NetherFurnaceTileEntity.java +++ b/src/main/java/mod/alexndr/netherrocks/content/NetherFurnaceTileEntity.java @@ -5,25 +5,26 @@ import mod.alexndr.netherrocks.api.content.AbstractNetherFurnaceTileEntity; import mod.alexndr.netherrocks.init.ModBlocks; import mod.alexndr.netherrocks.init.ModTiles; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.entity.player.PlayerInventory; -import net.minecraft.inventory.container.Container; -import net.minecraft.item.crafting.IRecipeType; -import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.TranslationTextComponent; -import net.minecraftforge.fml.network.NetworkHooks; +import net.minecraft.core.BlockPos; +import net.minecraft.network.chat.Component; +import net.minecraft.network.chat.TranslatableComponent; +import net.minecraft.world.entity.player.Inventory; +import net.minecraft.world.inventory.AbstractContainerMenu; +import net.minecraft.world.item.crafting.RecipeType; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraftforge.fmllegacy.network.NetworkHooks; public class NetherFurnaceTileEntity extends AbstractNetherFurnaceTileEntity { - public NetherFurnaceTileEntity() + public NetherFurnaceTileEntity(BlockPos blockpos, BlockState blockstate) { - super(ModTiles.NETHER_FURNACE.get(), IRecipeType.SMELTING); + super(ModTiles.NETHER_FURNACE.get(),blockpos, blockstate, RecipeType.SMELTING); } @Nonnull @Override - public ITextComponent getDisplayName() { - return new TranslationTextComponent(ModBlocks.nether_furnace.get().getDescriptionId()); + public Component getDefaultName() { + return new TranslatableComponent(ModBlocks.nether_furnace.get().getDescriptionId()); } /** @@ -34,7 +35,7 @@ public ITextComponent getDisplayName() { */ @Nonnull @Override - public Container createMenu(final int windowId, final PlayerInventory inventory, final PlayerEntity player) + public AbstractContainerMenu createMenu(final int windowId, final Inventory inventory) { return new NetherFurnaceContainer(windowId, inventory, this); } diff --git a/src/main/java/mod/alexndr/netherrocks/content/NetherSmokerBlock.java b/src/main/java/mod/alexndr/netherrocks/content/NetherSmokerBlock.java index f367fd6e..77c65ec3 100644 --- a/src/main/java/mod/alexndr/netherrocks/content/NetherSmokerBlock.java +++ b/src/main/java/mod/alexndr/netherrocks/content/NetherSmokerBlock.java @@ -2,19 +2,16 @@ import mod.alexndr.netherrocks.api.content.AbstractNetherSmokerBlock; import mod.alexndr.netherrocks.init.ModTiles; -import net.minecraft.block.BlockState; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.entity.player.ServerPlayerEntity; -import net.minecraft.inventory.InventoryHelper; +import net.minecraft.core.BlockPos; import net.minecraft.stats.Stats; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ActionResultType; -import net.minecraft.util.Hand; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.BlockRayTraceResult; -import net.minecraft.world.IBlockReader; -import net.minecraft.world.World; -import net.minecraftforge.fml.network.NetworkHooks; +import net.minecraft.world.Containers; +import net.minecraft.world.MenuProvider; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.level.Level; +import net.minecraft.world.level.block.entity.BlockEntity; +import net.minecraft.world.level.block.entity.BlockEntityTicker; +import net.minecraft.world.level.block.entity.BlockEntityType; +import net.minecraft.world.level.block.state.BlockState; import net.minecraftforge.items.ItemStackHandler; public class NetherSmokerBlock extends AbstractNetherSmokerBlock @@ -25,24 +22,18 @@ public NetherSmokerBlock(Properties builder) super(builder); } - @Override - public TileEntity createTileEntity(BlockState state, IBlockReader world) - { - return ModTiles.NETHER_SMOKER.get().create(); - } - @SuppressWarnings("deprecation") @Override - public void onRemove(BlockState oldState, World worldIn, BlockPos pos, BlockState newState, boolean isMoving) + public void onRemove(BlockState oldState, Level worldIn, BlockPos pos, BlockState newState, boolean isMoving) { if (oldState.getBlock() != newState.getBlock()) { - TileEntity tileEntity = worldIn.getBlockEntity(pos); + BlockEntity tileEntity = worldIn.getBlockEntity(pos); if (tileEntity instanceof NetherSmokerTileEntity) { final ItemStackHandler inventory = ((NetherSmokerTileEntity) tileEntity).inventory; for (int slot = 0; slot < inventory.getSlots(); ++slot) - InventoryHelper.dropItemStack(worldIn, pos.getX(), pos.getY(), pos.getZ(), + Containers.dropItemStack(worldIn, pos.getX(), pos.getY(), pos.getZ(), inventory.getStackInSlot(slot)); } } @@ -50,20 +41,29 @@ public void onRemove(BlockState oldState, World worldIn, BlockPos pos, BlockStat super.onRemove(oldState, worldIn, pos, newState, isMoving); } - @Override - public ActionResultType use(BlockState state, World worldIn, BlockPos pos, PlayerEntity player, - Hand handIn, BlockRayTraceResult hit) - { - if (!worldIn.isClientSide) { - final TileEntity tileEntity = worldIn.getBlockEntity(pos); - if (tileEntity instanceof NetherSmokerTileEntity) - { - NetworkHooks.openGui((ServerPlayerEntity) player, (NetherSmokerTileEntity) tileEntity, pos); - player.awardStat(Stats.INTERACT_WITH_SMOKER); - } - } - return ActionResultType.SUCCESS; - } + @Override + public BlockEntityTicker getTicker(Level level, BlockState bstate, BlockEntityType entityType) + { + return createFurnaceTicker(level, entityType, ModTiles.NETHER_SMOKER.get()); + } + + + @Override + public BlockEntity newBlockEntity(BlockPos bpos, BlockState bstate) { + return new NetherSmokerTileEntity(bpos, bstate); + } + + + @Override + protected void openContainer(Level level, BlockPos bpos, Player player) + { + BlockEntity blockentity = level.getBlockEntity(bpos); + if (blockentity instanceof NetherSmokerTileEntity) + { + player.openMenu((MenuProvider) blockentity); + player.awardStat(Stats.INTERACT_WITH_FURNACE); + } + } } // end-class diff --git a/src/main/java/mod/alexndr/netherrocks/content/NetherSmokerContainer.java b/src/main/java/mod/alexndr/netherrocks/content/NetherSmokerContainer.java index ef839842..b84d3dc1 100644 --- a/src/main/java/mod/alexndr/netherrocks/content/NetherSmokerContainer.java +++ b/src/main/java/mod/alexndr/netherrocks/content/NetherSmokerContainer.java @@ -1,41 +1,27 @@ package mod.alexndr.netherrocks.content; -import java.util.Objects; - -import mod.alexndr.netherrocks.api.content.AbstractNetherFurnaceContainer; -import mod.alexndr.netherrocks.init.ModBlocks; import mod.alexndr.netherrocks.init.ModContainers; -import net.minecraft.entity.player.PlayerInventory; -import net.minecraft.inventory.container.ContainerType; -import net.minecraft.network.PacketBuffer; -import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.fml.network.IContainerFactory; +import mod.alexndr.simplecorelib.content.VeryAbstractFurnaceMenu; +import net.minecraft.network.FriendlyByteBuf; +import net.minecraft.world.entity.player.Inventory; +import net.minecraft.world.item.crafting.RecipeType; +import net.minecraftforge.fmllegacy.network.IContainerFactory; -public class NetherSmokerContainer extends AbstractNetherFurnaceContainer +public class NetherSmokerContainer extends VeryAbstractFurnaceMenu { /** * Logical-client-side constructor, called from {@link ContainerType#create(IContainerFactory)} * Calls the logical-server-side constructor with the TileEntity at the pos in the PacketBuffer */ - public NetherSmokerContainer(final int windowId, final PlayerInventory playerInventory, final PacketBuffer data) + public NetherSmokerContainer(final int windowId, final Inventory playerInventory, final FriendlyByteBuf data) { - this(windowId, playerInventory, getTileEntity(playerInventory, data)); + super(ModContainers.NETHER_SMOKER.get(), RecipeType.SMOKING, windowId, playerInventory); } - public NetherSmokerContainer(int id, PlayerInventory playerInventory, - NetherSmokerTileEntity tileEntity) + public NetherSmokerContainer(int id, Inventory playerInventory, NetherSmokerTileEntity tileEntity) { - super(ModContainers.NETHER_SMOKER.get(), id, playerInventory, tileEntity, ModBlocks.nether_smoker); + super(ModContainers.NETHER_SMOKER.get(), RecipeType.SMOKING, id, playerInventory, + tileEntity.inventory, tileEntity.dataAccess, tileEntity); } - private static NetherSmokerTileEntity getTileEntity(final PlayerInventory playerInventory, final PacketBuffer data) - { - Objects.requireNonNull(playerInventory, "playerInventory cannot be null!"); - Objects.requireNonNull(data, "data cannot be null!"); - final TileEntity tileAtPos = playerInventory.player.level.getBlockEntity(data.readBlockPos()); - if (tileAtPos instanceof NetherSmokerTileEntity) - return (NetherSmokerTileEntity) tileAtPos; - throw new IllegalStateException("Tile entity is not correct! " + tileAtPos); - } - -} // end class + } // end class diff --git a/src/main/java/mod/alexndr/netherrocks/content/NetherSmokerTileEntity.java b/src/main/java/mod/alexndr/netherrocks/content/NetherSmokerTileEntity.java index c639faaf..507573dc 100644 --- a/src/main/java/mod/alexndr/netherrocks/content/NetherSmokerTileEntity.java +++ b/src/main/java/mod/alexndr/netherrocks/content/NetherSmokerTileEntity.java @@ -3,20 +3,21 @@ import mod.alexndr.netherrocks.api.content.AbstractNetherFurnaceTileEntity; import mod.alexndr.netherrocks.init.ModBlocks; import mod.alexndr.netherrocks.init.ModTiles; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.entity.player.PlayerInventory; -import net.minecraft.inventory.container.Container; -import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.IRecipeType; -import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.TranslationTextComponent; +import net.minecraft.core.BlockPos; +import net.minecraft.network.chat.Component; +import net.minecraft.network.chat.TranslatableComponent; +import net.minecraft.world.entity.player.Inventory; +import net.minecraft.world.inventory.AbstractContainerMenu; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.crafting.RecipeType; +import net.minecraft.world.level.block.state.BlockState; public class NetherSmokerTileEntity extends AbstractNetherFurnaceTileEntity { - public NetherSmokerTileEntity() + public NetherSmokerTileEntity(BlockPos blockpos, BlockState blockstate) { - super(ModTiles.NETHER_SMOKER.get(), IRecipeType.SMOKING); + super(ModTiles.NETHER_SMOKER.get(), blockpos, blockstate, RecipeType.SMOKING); } @@ -28,13 +29,13 @@ protected int getBurnDuration(ItemStack fuelstack) @Override - public ITextComponent getDisplayName() + public Component getDefaultName() { - return new TranslationTextComponent(ModBlocks.nether_smoker.get().getDescriptionId()); + return new TranslatableComponent(ModBlocks.nether_smoker.get().getDescriptionId()); } @Override - public Container createMenu(int windowId, PlayerInventory inventory, PlayerEntity player) + public AbstractContainerMenu createMenu(int windowId, Inventory inventory) { return new NetherSmokerContainer(windowId, inventory, this); } diff --git a/src/main/java/mod/alexndr/netherrocks/content/NetherrocksArmorMaterial.java b/src/main/java/mod/alexndr/netherrocks/content/NetherrocksArmorMaterial.java index 0852ed60..58598fd2 100644 --- a/src/main/java/mod/alexndr/netherrocks/content/NetherrocksArmorMaterial.java +++ b/src/main/java/mod/alexndr/netherrocks/content/NetherrocksArmorMaterial.java @@ -1,18 +1,18 @@ package mod.alexndr.netherrocks.content; +import java.util.function.Supplier; + import mod.alexndr.netherrocks.init.ModItems; -import net.minecraft.inventory.EquipmentSlotType; -import net.minecraft.item.IArmorMaterial; -import net.minecraft.item.crafting.Ingredient; -import net.minecraft.util.LazyValue; -import net.minecraft.util.SoundEvent; -import net.minecraft.util.SoundEvents; +import net.minecraft.sounds.SoundEvent; +import net.minecraft.sounds.SoundEvents; +import net.minecraft.world.entity.EquipmentSlot; +import net.minecraft.world.item.ArmorMaterial; +import net.minecraft.world.item.crafting.Ingredient; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; +import net.minecraftforge.common.util.Lazy; -import java.util.function.Supplier; - -public enum NetherrocksArmorMaterial implements IArmorMaterial +public enum NetherrocksArmorMaterial implements ArmorMaterial { FYRITE ("netherrocks:fyrite", 5, new int [] {3,4,5,3}, 7, SoundEvents.ARMOR_EQUIP_CHAIN , 0.0F, 0.0F, @@ -34,7 +34,7 @@ public enum NetherrocksArmorMaterial implements IArmorMaterial private final int enchantability; private final SoundEvent soundEvent; private final float toughness; - private final LazyValue repairMaterial; + private final Lazy repairMaterial; private final float knockbackResistance; private NetherrocksArmorMaterial(String nameIn, int maxDamageIn, int[] drAmtArray, @@ -49,16 +49,16 @@ private NetherrocksArmorMaterial(String nameIn, int maxDamageIn, int[] drAmtArra soundEvent = soundIn; toughness = toughnessIn; knockbackResistance = knockResistanceIn; - repairMaterial = new LazyValue<>(repairMatIn); + repairMaterial = Lazy.of(repairMatIn); } // end ctor() @Override - public int getDurabilityForSlot(EquipmentSlotType slotIn) { + public int getDurabilityForSlot(EquipmentSlot slotIn) { return MAX_DAMAGE_ARRAY[slotIn.getIndex()] * this.maxDamageFactor; } @Override - public int getDefenseForSlot(EquipmentSlotType slotIn) { + public int getDefenseForSlot(EquipmentSlot slotIn) { return this.damageReductionAmountArray[slotIn.getIndex()]; } diff --git a/src/main/java/mod/alexndr/netherrocks/content/NetherrocksItemTier.java b/src/main/java/mod/alexndr/netherrocks/content/NetherrocksItemTier.java deleted file mode 100644 index de20ab47..00000000 --- a/src/main/java/mod/alexndr/netherrocks/content/NetherrocksItemTier.java +++ /dev/null @@ -1,72 +0,0 @@ -package mod.alexndr.netherrocks.content; - -import mod.alexndr.netherrocks.init.ModItems; -import net.minecraft.item.IItemTier; -import net.minecraft.item.crafting.Ingredient; -import net.minecraft.util.LazyValue; - -import java.util.function.Supplier; - -public enum NetherrocksItemTier implements IItemTier -{ - ARGONITE(4, 1300, 8.0F, 3.0F, 18, - ()->{ return Ingredient.of(ModItems.argonite_ingot.get());}), - ASHSTONE(3, 900, 16.0F, 2.0F, 7, - ()->{ return Ingredient.of(ModItems.ashstone_gem.get());}), - DRAGONSTONE(4, 4000, 10.0F, 8.0F, 27, - ()->{ return Ingredient.of(ModItems.dragonstone_gem.get());}), - FYRITE(3, 150, 8.0F, 4.0F, 7, - ()->{ return Ingredient.of(ModItems.fyrite_ingot.get());}), - ILLUMENITE(3, 700, 8.0F, 4.0F, 15, - ()->{ return Ingredient.of(ModItems.illumenite_ingot.get());}), - MALACHITE(3, 700, 9.0F, 3.0F, 39, - ()->{ return Ingredient.of(ModItems.malachite_ingot.get());}); - - private final int harvestLevel; - private final int maxUses; - private final float efficiency; - private final float attackDamage; - private final int enchantability; - private final LazyValue repairMaterial; - - private NetherrocksItemTier(int harvestLevelIn, int maxUsesIn, float efficiencyIn, float attackDamageIn, int enchantabilityIn, - Supplier repairMaterialIn) - { - this.harvestLevel = harvestLevelIn; - this.maxUses = maxUsesIn; - this.efficiency = efficiencyIn; - this.attackDamage = attackDamageIn; - this.enchantability = enchantabilityIn; - this.repairMaterial = new LazyValue<>(repairMaterialIn); - } - - @Override - public int getUses() { - return this.maxUses; - } - - @Override - public float getSpeed() { - return this.efficiency; - } - - @Override - public float getAttackDamageBonus() { - return this.attackDamage; - } - - @Override - public int getLevel() { - return this.harvestLevel; - } - - @Override - public int getEnchantmentValue() { - return this.enchantability; - } - - @Override - public Ingredient getRepairIngredient() { - return this.repairMaterial.get(); - } -} // end class SimpleOresItemTier diff --git a/src/main/java/mod/alexndr/netherrocks/content/NetherrocksItemTiers.java b/src/main/java/mod/alexndr/netherrocks/content/NetherrocksItemTiers.java new file mode 100644 index 00000000..e2c3195a --- /dev/null +++ b/src/main/java/mod/alexndr/netherrocks/content/NetherrocksItemTiers.java @@ -0,0 +1,62 @@ +package mod.alexndr.netherrocks.content; + +import java.util.List; + +import mod.alexndr.netherrocks.Netherrocks; +import mod.alexndr.netherrocks.init.ModItems; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.tags.BlockTags; +import net.minecraft.tags.Tag; +import net.minecraft.world.item.Tier; +import net.minecraft.world.item.Tiers; +import net.minecraft.world.item.crafting.Ingredient; +import net.minecraft.world.level.block.Block; +import net.minecraftforge.common.ForgeTier; +import net.minecraftforge.common.TierSortingRegistry; + +public final class NetherrocksItemTiers +{ + public static final Tag.Named ARGONITE_TAG = + BlockTags.createOptional(new ResourceLocation(Netherrocks.MODID, "needs_argonite_tool")); + public static final Tag.Named ASHSTONE_TAG = + BlockTags.createOptional(new ResourceLocation(Netherrocks.MODID, "needs_ashstone_tool")); + public static final Tag.Named DRAGONSTONE_TAG = + BlockTags.createOptional(new ResourceLocation(Netherrocks.MODID, "needs_dragonstone_tool")); + public static final Tag.Named FYRITE_TAG = + BlockTags.createOptional(new ResourceLocation(Netherrocks.MODID, "needs_fyrite_tool")); + public static final Tag.Named ILLUMENITE_TAG = + BlockTags.createOptional(new ResourceLocation(Netherrocks.MODID, "needs_illumenite_tool")); + public static final Tag.Named MALACHITE_TAG = + BlockTags.createOptional(new ResourceLocation(Netherrocks.MODID, "needs_malachite_tool")); + + public static final Tier ARGONITE = TierSortingRegistry.registerTier( + new ForgeTier(Tiers.NETHERITE.getLevel(), 1300, 8.0F, 3.0F, 18, ARGONITE_TAG, + ()->Ingredient.of(ModItems.argonite_ingot.get())), new ResourceLocation(Netherrocks.MODID, "argonite"), + List.of(Tiers.NETHERITE), List.of()); + + public static final Tier ASHSTONE = TierSortingRegistry.registerTier( + new ForgeTier(Tiers.DIAMOND.getLevel(), 900, 16.0F, 2.0F, 7, ASHSTONE_TAG, + ()->Ingredient.of(ModItems.ashstone_gem.get())), new ResourceLocation(Netherrocks.MODID, "ashstone"), + List.of(Tiers.DIAMOND), List.of(Tiers.NETHERITE)); + + public static final Tier DRAGONSTONE = TierSortingRegistry.registerTier( + new ForgeTier(Tiers.NETHERITE.getLevel(), 4000, 10.0F, 8.0F, 27, DRAGONSTONE_TAG, + ()->Ingredient.of(ModItems.dragonstone_gem.get())), new ResourceLocation(Netherrocks.MODID, "dragonstone"), + List.of(Tiers.NETHERITE, ARGONITE), List.of()); + + public static final Tier FYRITE = TierSortingRegistry.registerTier( + new ForgeTier(Tiers.DIAMOND.getLevel(), 150, 8.0F, 4.0F, 7, FYRITE_TAG, + ()->Ingredient.of(ModItems.fyrite_ingot.get())), new ResourceLocation(Netherrocks.MODID, "fyrite"), + List.of(Tiers.DIAMOND), List.of(ASHSTONE, Tiers.NETHERITE)); + + public static final Tier ILLUMENITE = TierSortingRegistry.registerTier( + new ForgeTier(Tiers.DIAMOND.getLevel(), 700, 8.0F, 4.0F, 15, ILLUMENITE_TAG, + ()->Ingredient.of(ModItems.illumenite_ingot.get())), new ResourceLocation(Netherrocks.MODID, "illumenite"), + List.of(Tiers.DIAMOND, FYRITE), List.of(ASHSTONE, Tiers.NETHERITE)); + + public static final Tier MALACHITE = TierSortingRegistry.registerTier( + new ForgeTier(Tiers.DIAMOND.getLevel(), 700, 9.0F, 3.0F, 39, MALACHITE_TAG, + ()->Ingredient.of(ModItems.malachite_ingot.get())), new ResourceLocation(Netherrocks.MODID, "malachite"), + List.of(Tiers.DIAMOND, FYRITE), List.of(ASHSTONE, Tiers.NETHERITE)); + +} // end class diff --git a/src/main/java/mod/alexndr/netherrocks/datagen/ModBlockTags.java b/src/main/java/mod/alexndr/netherrocks/datagen/ModBlockTags.java index ddf821d4..6c4575d7 100644 --- a/src/main/java/mod/alexndr/netherrocks/datagen/ModBlockTags.java +++ b/src/main/java/mod/alexndr/netherrocks/datagen/ModBlockTags.java @@ -1,11 +1,15 @@ package mod.alexndr.netherrocks.datagen; +import java.util.List; + import mod.alexndr.netherrocks.Netherrocks; -import net.minecraft.data.BlockTagsProvider; +import mod.alexndr.netherrocks.init.ModBlocks; +import mod.alexndr.simplecorelib.datagen.MiningBlockTags; +import mod.alexndr.simplecorelib.helpers.TagUtils; import net.minecraft.data.DataGenerator; import net.minecraftforge.common.data.ExistingFileHelper; -public class ModBlockTags extends BlockTagsProvider +public class ModBlockTags extends MiningBlockTags { public ModBlockTags(DataGenerator generatorIn, ExistingFileHelper existingFileHelper) @@ -16,8 +20,132 @@ public ModBlockTags(DataGenerator generatorIn, ExistingFileHelper existingFileHe @Override protected void addTags() { - // do nothing; super() generates all the vanilla blocktags, and we don't want that. +// registerOreTags(); + registerStorageBlockTags(); + registerMiningTags(); + registerBeaconTags(); + registerDoorsSlabsAndStairs(); + } + + private void registerDoorsSlabsAndStairs() + { + this.tag(TagUtils.modBlockTag("minecraft", "doors")) + .add(ModBlocks.argonite_door.get()) + .add(ModBlocks.ashstone_door.get()) + .add(ModBlocks.dragonstone_door.get()) + .add(ModBlocks.fyrite_door.get()) + .add(ModBlocks.illumenite_door.get()) + .add(ModBlocks.malachite_door.get()); + this.tag(TagUtils.modBlockTag("minecraft","stairs")) + .add(ModBlocks.argonite_brick_stairs.get()) + .add(ModBlocks.ashstone_brick_stairs.get()) + .add(ModBlocks.dragonstone_brick_stairs.get()) + .add(ModBlocks.fyrite_brick_stairs.get()) + .add(ModBlocks.illumenite_brick_stairs.get()) + .add(ModBlocks.malachite_brick_stairs.get()); + this.tag(TagUtils.modBlockTag("minecraft","slabs")) + .add(ModBlocks.argonite_brick_slab.get()) + .add(ModBlocks.ashstone_brick_slab.get()) + .add(ModBlocks.dragonstone_brick_slab.get()) + .add(ModBlocks.fyrite_brick_slab.get()) + .add(ModBlocks.illumenite_brick_slab.get()) + .add(ModBlocks.malachite_brick_slab.get()); } + + private void registerStorageBlockTags() + { + this.tag(TagUtils.forgeBlockTag("storage_blocks")) + .addTag(TagUtils.forgeBlockTag("storage_blocks/malachite")) + .addTag(TagUtils.forgeBlockTag("storage_blocks/fyrite")) + .addTag(TagUtils.forgeBlockTag("storage_blocks/argonite")) + .addTag(TagUtils.forgeBlockTag("storage_blocks/ashstone")) + .addTag(TagUtils.forgeBlockTag("storage_blocks/dragonstone")) + .addTag(TagUtils.forgeBlockTag("storage_blocks/illumenite")) + .addTag(TagUtils.forgeBlockTag("storage_blocks/raw_malachite")) + .addTag(TagUtils.forgeBlockTag("storage_blocks/raw_fyrite")) + .addTag(TagUtils.forgeBlockTag("storage_blocks/raw_argonite")) + .addTag(TagUtils.forgeBlockTag("storage_blocks/raw_illumenite")); + + this.tag(TagUtils.forgeBlockTag("storage_blocks/raw_argonite")) + .add(ModBlocks.raw_argonite_block.get()); + this.tag(TagUtils.forgeBlockTag("storage_blocks/raw_fyrite")) + .add(ModBlocks.raw_fyrite_block.get()); + this.tag(TagUtils.forgeBlockTag("storage_blocks/raw_malachite")) + .add(ModBlocks.raw_malachite_block.get()); + this.tag(TagUtils.forgeBlockTag("storage_blocks/raw_illumenite")) + .add(ModBlocks.raw_illumenite_block.get()); + + this.tag(TagUtils.forgeBlockTag("storage_blocks/argonite")) + .add(ModBlocks.argonite_block.get()); + this.tag(TagUtils.forgeBlockTag("storage_blocks/fyrite")) + .add(ModBlocks.fyrite_block.get()); + this.tag(TagUtils.forgeBlockTag("storage_blocks/malachite")) + .add(ModBlocks.malachite_block.get()); + this.tag(TagUtils.forgeBlockTag("storage_blocks/illumenite")) + .add(ModBlocks.illumenite_block.get()); + this.tag(TagUtils.forgeBlockTag("storage_blocks/ashstone")) + .add(ModBlocks.ashstone_block.get()); + this.tag(TagUtils.forgeBlockTag("storage_blocks/dragonstone")) + .add(ModBlocks.dragonstone_block.get()); + } // end registerStorageBlockTags() + + private void registerMiningTags() + { + // do nothing; super() generates all the vanilla blocktags, and we don't want that. + registerMineableTags( List.of(ModBlocks.argonite_block.get(), ModBlocks.argonite_ore.get(), + ModBlocks.argonite_bars.get(), ModBlocks.argonite_brick_slab.get(), ModBlocks.argonite_brick_stairs.get(), + ModBlocks.argonite_bricks.get(), ModBlocks.argonite_door.get(), + ModBlocks.ashstone_block.get(), ModBlocks.ashstone_ore.get(), + ModBlocks.ashstone_bars.get(), ModBlocks.ashstone_brick_slab.get(), ModBlocks.ashstone_brick_stairs.get(), + ModBlocks.ashstone_bricks.get(), ModBlocks.ashstone_door.get(), + ModBlocks.dragonstone_ore.get(), ModBlocks.dragonstone_block.get(), + ModBlocks.dragonstone_bars.get(), ModBlocks.dragonstone_brick_slab.get(), ModBlocks.dragonstone_brick_stairs.get(), + ModBlocks.dragonstone_bricks.get(), ModBlocks.dragonstone_door.get(), + ModBlocks.fyrite_block.get(), ModBlocks.fyrite_ore.get(), + ModBlocks.fyrite_bars.get(), ModBlocks.fyrite_brick_slab.get(), ModBlocks.fyrite_brick_stairs.get(), + ModBlocks.fyrite_bricks.get(), ModBlocks.fyrite_door.get(), + ModBlocks.illumenite_block.get(), ModBlocks.illumenite_ore.get(), + ModBlocks.illumenite_bars.get(), ModBlocks.illumenite_brick_slab.get(), ModBlocks.illumenite_brick_stairs.get(), + ModBlocks.illumenite_bricks.get(), ModBlocks.illumenite_door.get(), + ModBlocks.malachite_block.get(), ModBlocks.malachite_ore.get(), + ModBlocks.malachite_bars.get(), ModBlocks.malachite_brick_slab.get(), ModBlocks.malachite_brick_stairs.get(), + ModBlocks.malachite_bricks.get(), ModBlocks.malachite_door.get(), + ModBlocks.raw_argonite_block.get(), ModBlocks.raw_fyrite_block.get(), ModBlocks.raw_illumenite_block.get(), + ModBlocks.raw_malachite_block.get(), + ModBlocks.nether_blast_furnace.get(), ModBlocks.nether_furnace.get(), ModBlocks.nether_smoker.get()), + List.of(), // 1 + List.of(ModBlocks.fyrite_block.get(), ModBlocks.fyrite_ore.get(), ModBlocks.fyrite_bars.get(), + ModBlocks.fyrite_brick_slab.get(), ModBlocks.fyrite_brick_stairs.get(), + ModBlocks.fyrite_bricks.get(), ModBlocks.fyrite_door.get(), + ModBlocks.illumenite_block.get(), ModBlocks.illumenite_ore.get(), ModBlocks.illumenite_bars.get(), + ModBlocks.illumenite_brick_slab.get(), ModBlocks.illumenite_brick_stairs.get(), + ModBlocks.illumenite_bricks.get(), ModBlocks.illumenite_door.get(), + ModBlocks.malachite_block.get(), ModBlocks.malachite_ore.get(), ModBlocks.malachite_bars.get(), + ModBlocks.malachite_brick_slab.get(), ModBlocks.malachite_brick_stairs.get(), + ModBlocks.malachite_bricks.get(), ModBlocks.malachite_door.get(), + ModBlocks.raw_fyrite_block.get(), ModBlocks.raw_illumenite_block.get(), + ModBlocks.raw_malachite_block.get()), // 2 + List.of(ModBlocks.argonite_block.get(), ModBlocks.argonite_ore.get(), ModBlocks.argonite_bars.get(), + ModBlocks.argonite_brick_slab.get(), ModBlocks.argonite_brick_stairs.get(), + ModBlocks.argonite_bricks.get(), ModBlocks.argonite_door.get(), + ModBlocks.ashstone_block.get(), ModBlocks.ashstone_ore.get(), ModBlocks.ashstone_bars.get(), + ModBlocks.ashstone_brick_slab.get(), ModBlocks.ashstone_brick_stairs.get(), + ModBlocks.ashstone_bricks.get(), ModBlocks.ashstone_door.get(), + ModBlocks.dragonstone_block.get(), ModBlocks.dragonstone_ore.get(), ModBlocks.dragonstone_bars.get(), + ModBlocks.dragonstone_brick_slab.get(), ModBlocks.dragonstone_brick_stairs.get(), + ModBlocks.dragonstone_bricks.get(), ModBlocks.dragonstone_door.get(), + ModBlocks.raw_argonite_block.get()), // 3 + List.of()); // 4 + } + + private void registerBeaconTags() + { + this.tag(TagUtils.modBlockTag("minecraft", "beacon_base_blocks")) + .add(ModBlocks.argonite_block.get()) + .add(ModBlocks.fyrite_block.get()) + .add(ModBlocks.illumenite_block.get()) + .add(ModBlocks.malachite_block.get()); + } } // end class diff --git a/src/main/java/mod/alexndr/netherrocks/datagen/ModItemTags.java b/src/main/java/mod/alexndr/netherrocks/datagen/ModItemTags.java index 03b07bfe..8f82fa3f 100644 --- a/src/main/java/mod/alexndr/netherrocks/datagen/ModItemTags.java +++ b/src/main/java/mod/alexndr/netherrocks/datagen/ModItemTags.java @@ -1,10 +1,11 @@ package mod.alexndr.netherrocks.datagen; import mod.alexndr.netherrocks.Netherrocks; +import mod.alexndr.netherrocks.init.ModBlocks; import mod.alexndr.netherrocks.init.ModItems; import mod.alexndr.simplecorelib.helpers.TagUtils; import net.minecraft.data.DataGenerator; -import net.minecraft.data.ItemTagsProvider; +import net.minecraft.data.tags.ItemTagsProvider; import net.minecraftforge.common.data.ExistingFileHelper; public class ModItemTags extends ItemTagsProvider @@ -21,8 +22,43 @@ protected void addTags() { registerDustTags(); registerOreChunkTags(); + registerToolTags(); + registerDoorsSlabsAndStairs(); } + private void registerDoorsSlabsAndStairs() + { + this.tag(TagUtils.modTag("minecraft", "doors")) + .add(ModBlocks.argonite_door.get().asItem()) + .add(ModBlocks.ashstone_door.get().asItem()) + .add(ModBlocks.dragonstone_door.get().asItem()) + .add(ModBlocks.fyrite_door.get().asItem()) + .add(ModBlocks.illumenite_door.get().asItem()) + .add(ModBlocks.malachite_door.get().asItem()); + this.tag(TagUtils.modTag("minecraft","stairs")) + .add(ModBlocks.argonite_brick_stairs.get().asItem()) + .add(ModBlocks.ashstone_brick_stairs.get().asItem()) + .add(ModBlocks.dragonstone_brick_stairs.get().asItem()) + .add(ModBlocks.fyrite_brick_stairs.get().asItem()) + .add(ModBlocks.illumenite_brick_stairs.get().asItem()) + .add(ModBlocks.malachite_brick_stairs.get().asItem()); + this.tag(TagUtils.modTag("minecraft","slabs")) + .add(ModBlocks.argonite_brick_slab.get().asItem()) + .add(ModBlocks.ashstone_brick_slab.get().asItem()) + .add(ModBlocks.dragonstone_brick_slab.get().asItem()) + .add(ModBlocks.fyrite_brick_slab.get().asItem()) + .add(ModBlocks.illumenite_brick_slab.get().asItem()) + .add(ModBlocks.malachite_brick_slab.get().asItem()); + } + + private void registerToolTags() + { + this.tag(TagUtils.modTag(Netherrocks.MODID, "auto_smelt_tools")) + .add(ModItems.fyrite_axe.get()) + .add(ModItems.fyrite_pickaxe.get()) + .add(ModItems.fyrite_shovel.get()); + } + private void registerDustTags() { this.tag(TagUtils.forgeTag("dusts")) diff --git a/src/main/java/mod/alexndr/netherrocks/datagen/NetherrocksDataGenerator.java b/src/main/java/mod/alexndr/netherrocks/datagen/NetherrocksDataGenerator.java index 17f24d0e..fa098ec4 100644 --- a/src/main/java/mod/alexndr/netherrocks/datagen/NetherrocksDataGenerator.java +++ b/src/main/java/mod/alexndr/netherrocks/datagen/NetherrocksDataGenerator.java @@ -2,11 +2,11 @@ import static net.minecraftforge.fml.common.Mod.EventBusSubscriber.Bus.MOD; +import mod.alexndr.netherrocks.Netherrocks; import net.minecraft.data.DataGenerator; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod.EventBusSubscriber; -import net.minecraftforge.fml.event.lifecycle.GatherDataEvent; -import mod.alexndr.netherrocks.Netherrocks; +import net.minecraftforge.forge.event.lifecycle.GatherDataEvent; /** * bundles up the GatherDataEvent handler and all the necessary data providers for @@ -26,6 +26,7 @@ public static void gatherData(GatherDataEvent event) DataGenerator gen = event.getGenerator(); if (event.includeServer()) { + gen.addProvider(new Recipes(gen)); gen.addProvider(new SilentsRecipes(gen)); gen.addProvider(new ModBlockTags(gen, event.getExistingFileHelper())); gen.addProvider(new ModItemTags(gen, event.getExistingFileHelper())); diff --git a/src/main/java/mod/alexndr/netherrocks/datagen/NetherrocksLootInjectorProvider.java b/src/main/java/mod/alexndr/netherrocks/datagen/NetherrocksLootInjectorProvider.java index 75b7549a..5a5a3d29 100644 --- a/src/main/java/mod/alexndr/netherrocks/datagen/NetherrocksLootInjectorProvider.java +++ b/src/main/java/mod/alexndr/netherrocks/datagen/NetherrocksLootInjectorProvider.java @@ -11,13 +11,13 @@ import mod.alexndr.netherrocks.init.ModItems; import mod.alexndr.simplecorelib.datagen.LootTableInjectorProvider; import net.minecraft.data.DataGenerator; -import net.minecraft.loot.ItemLootEntry; -import net.minecraft.loot.LootParameterSet; -import net.minecraft.loot.LootPool; -import net.minecraft.loot.LootTable.Builder; -import net.minecraft.loot.RandomValueRange; -import net.minecraft.loot.functions.SetCount; -import net.minecraft.util.ResourceLocation; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.level.storage.loot.LootPool; +import net.minecraft.world.level.storage.loot.LootTable.Builder; +import net.minecraft.world.level.storage.loot.entries.LootItem; +import net.minecraft.world.level.storage.loot.functions.SetItemCountFunction; +import net.minecraft.world.level.storage.loot.parameters.LootContextParamSet; +import net.minecraft.world.level.storage.loot.providers.number.UniformGenerator; public class NetherrocksLootInjectorProvider extends LootTableInjectorProvider { @@ -28,112 +28,112 @@ public NetherrocksLootInjectorProvider(DataGenerator dataGeneratorIn) } @Override - protected List>>, LootParameterSet>> getTables() + protected List>>, LootContextParamSet>> getTables() { tables.clear(); // desert pyramid LootPool.Builder foo = createChestPool(1, 1, 0.25F) - .add(ItemLootEntry.lootTableItem(ModItems.fyrite_ingot.get()).setWeight(10) - .apply(SetCount.setCount(RandomValueRange.between(1, 2)))) - .add(ItemLootEntry.lootTableItem(ModItems.illumenite_ingot.get()).setWeight(5) - .apply(SetCount.setCount(RandomValueRange.between(1, 2)))) - .add(ItemLootEntry.lootTableItem(ModItems.dragonstone_gem.get()).setWeight(1) - .apply(SetCount.setCount(RandomValueRange.between(1, 1)))); + .add(LootItem.lootTableItem(ModItems.fyrite_ingot.get()).setWeight(10) + .apply(SetItemCountFunction.setCount(UniformGenerator.between(1, 2)))) + .add(LootItem.lootTableItem(ModItems.illumenite_ingot.get()).setWeight(5) + .apply(SetItemCountFunction.setCount(UniformGenerator.between(1, 2)))) + .add(LootItem.lootTableItem(ModItems.dragonstone_gem.get()).setWeight(1) + .apply(SetItemCountFunction.setCount(UniformGenerator.between(1, 1)))); addInjectionTable(Netherrocks.MODID, "desert_pyramid", foo); // ruined_portal foo = createChestPool(1, 1, 0.50F) - .add(ItemLootEntry.lootTableItem(ModItems.malachite_ingot.get()).setWeight(10) - .apply(SetCount.setCount(RandomValueRange.between(2, 4)))) - .add(ItemLootEntry.lootTableItem(ModItems.argonite_ingot.get()).setWeight(8) - .apply(SetCount.setCount(RandomValueRange.between(1, 3)))) - .add(ItemLootEntry.lootTableItem(ModItems.fyrite_ingot.get()).setWeight(10) - .apply(SetCount.setCount(RandomValueRange.between(1, 2)))) - .add(ItemLootEntry.lootTableItem(ModItems.illumenite_ingot.get()).setWeight(5) - .apply(SetCount.setCount(RandomValueRange.between(1, 2)))) - .add(ItemLootEntry.lootTableItem(ModItems.ashstone_gem.get()).setWeight(1) - .apply(SetCount.setCount(RandomValueRange.between(1, 2)))) - .add(ItemLootEntry.lootTableItem(ModItems.dragonstone_gem.get()).setWeight(1) - .apply(SetCount.setCount(RandomValueRange.between(1, 1)))); + .add(LootItem.lootTableItem(ModItems.malachite_ingot.get()).setWeight(10) + .apply(SetItemCountFunction.setCount(UniformGenerator.between(2, 4)))) + .add(LootItem.lootTableItem(ModItems.argonite_ingot.get()).setWeight(8) + .apply(SetItemCountFunction.setCount(UniformGenerator.between(1, 3)))) + .add(LootItem.lootTableItem(ModItems.fyrite_ingot.get()).setWeight(10) + .apply(SetItemCountFunction.setCount(UniformGenerator.between(1, 2)))) + .add(LootItem.lootTableItem(ModItems.illumenite_ingot.get()).setWeight(5) + .apply(SetItemCountFunction.setCount(UniformGenerator.between(1, 2)))) + .add(LootItem.lootTableItem(ModItems.ashstone_gem.get()).setWeight(1) + .apply(SetItemCountFunction.setCount(UniformGenerator.between(1, 2)))) + .add(LootItem.lootTableItem(ModItems.dragonstone_gem.get()).setWeight(1) + .apply(SetItemCountFunction.setCount(UniformGenerator.between(1, 1)))); addInjectionTable(Netherrocks.MODID, "ruined_portal", foo); // bastion foo = createChestPool(1, 2, 0.75F) - .add(ItemLootEntry.lootTableItem(ModItems.malachite_helmet.get()).setWeight(3)) - .add(ItemLootEntry.lootTableItem(ModItems.malachite_chestplate.get()).setWeight(3)) - .add(ItemLootEntry.lootTableItem(ModItems.malachite_leggings.get()).setWeight(3)) - .add(ItemLootEntry.lootTableItem(ModItems.malachite_boots.get()).setWeight(3)) - .add(ItemLootEntry.lootTableItem(ModItems.malachite_sword.get()).setWeight(3)) - .add(ItemLootEntry.lootTableItem(ModItems.malachite_axe.get()).setWeight(3)) - .add(ItemLootEntry.lootTableItem(ModItems.malachite_pickaxe.get()).setWeight(3)) - .add(ItemLootEntry.lootTableItem(ModItems.malachite_shovel.get()).setWeight(3)) - .add(ItemLootEntry.lootTableItem(ModItems.argonite_sword.get()).setWeight(2)) - .add(ItemLootEntry.lootTableItem(ModItems.argonite_axe.get()).setWeight(2)) - .add(ItemLootEntry.lootTableItem(ModItems.argonite_pickaxe.get()).setWeight(2)) - .add(ItemLootEntry.lootTableItem(ModItems.argonite_shovel.get()).setWeight(2)) - .add(ItemLootEntry.lootTableItem(ModItems.ashstone_sword.get()).setWeight(1)) - .add(ItemLootEntry.lootTableItem(ModItems.ashstone_axe.get()).setWeight(1)) - .add(ItemLootEntry.lootTableItem(ModItems.ashstone_pickaxe.get()).setWeight(1)) - .add(ItemLootEntry.lootTableItem(ModItems.ashstone_shovel.get()).setWeight(1)) - .add(ItemLootEntry.lootTableItem(ModItems.fyrite_helmet.get()).setWeight(2)) - .add(ItemLootEntry.lootTableItem(ModItems.fyrite_chestplate.get()).setWeight(2)) - .add(ItemLootEntry.lootTableItem(ModItems.fyrite_leggings.get()).setWeight(2)) - .add(ItemLootEntry.lootTableItem(ModItems.fyrite_boots.get()).setWeight(2)) - .add(ItemLootEntry.lootTableItem(ModItems.fyrite_sword.get()).setWeight(2)) - .add(ItemLootEntry.lootTableItem(ModItems.fyrite_pickaxe.get()).setWeight(2)) - .add(ItemLootEntry.lootTableItem(ModItems.fyrite_shovel.get()).setWeight(2)) - .add(ItemLootEntry.lootTableItem(ModItems.illumenite_helmet.get()).setWeight(2)) - .add(ItemLootEntry.lootTableItem(ModItems.illumenite_chestplate.get()).setWeight(2)) - .add(ItemLootEntry.lootTableItem(ModItems.illumenite_leggings.get()).setWeight(2)) - .add(ItemLootEntry.lootTableItem(ModItems.illumenite_boots.get()).setWeight(2)) - .add(ItemLootEntry.lootTableItem(ModItems.illumenite_sword.get()).setWeight(2)) - .add(ItemLootEntry.lootTableItem(ModItems.dragonstone_helmet.get()).setWeight(1)) - .add(ItemLootEntry.lootTableItem(ModItems.dragonstone_chestplate.get()).setWeight(1)) - .add(ItemLootEntry.lootTableItem(ModItems.dragonstone_leggings.get()).setWeight(1)) - .add(ItemLootEntry.lootTableItem(ModItems.dragonstone_boots.get()).setWeight(1)) - .add(ItemLootEntry.lootTableItem(ModItems.dragonstone_sword.get()).setWeight(1)) - .add(ItemLootEntry.lootTableItem(ModItems.dragonstone_axe.get()).setWeight(1)) - .add(ItemLootEntry.lootTableItem(ModItems.dragonstone_pickaxe.get()).setWeight(1)) - .add(ItemLootEntry.lootTableItem(ModItems.dragonstone_shovel.get()).setWeight(1)) - .add(ItemLootEntry.lootTableItem(ModItems.malachite_ingot.get()).setWeight(2) - .apply(SetCount.setCount(RandomValueRange.between(2, 4)))) - .add(ItemLootEntry.lootTableItem(ModItems.argonite_ingot.get()).setWeight(2) - .apply(SetCount.setCount(RandomValueRange.between(1, 3)))) - .add(ItemLootEntry.lootTableItem(ModItems.fyrite_ingot.get()).setWeight(2) - .apply(SetCount.setCount(RandomValueRange.between(1, 2)))) - .add(ItemLootEntry.lootTableItem(ModItems.illumenite_ingot.get()).setWeight(1) - .apply(SetCount.setCount(RandomValueRange.between(1, 2)))) - .add(ItemLootEntry.lootTableItem(ModItems.ashstone_gem.get()).setWeight(1) - .apply(SetCount.setCount(RandomValueRange.between(1, 2)))) - .add(ItemLootEntry.lootTableItem(ModItems.dragonstone_gem.get()).setWeight(1) - .apply(SetCount.setCount(RandomValueRange.between(1, 1)))); + .add(LootItem.lootTableItem(ModItems.malachite_helmet.get()).setWeight(3)) + .add(LootItem.lootTableItem(ModItems.malachite_chestplate.get()).setWeight(3)) + .add(LootItem.lootTableItem(ModItems.malachite_leggings.get()).setWeight(3)) + .add(LootItem.lootTableItem(ModItems.malachite_boots.get()).setWeight(3)) + .add(LootItem.lootTableItem(ModItems.malachite_sword.get()).setWeight(3)) + .add(LootItem.lootTableItem(ModItems.malachite_axe.get()).setWeight(3)) + .add(LootItem.lootTableItem(ModItems.malachite_pickaxe.get()).setWeight(3)) + .add(LootItem.lootTableItem(ModItems.malachite_shovel.get()).setWeight(3)) + .add(LootItem.lootTableItem(ModItems.argonite_sword.get()).setWeight(2)) + .add(LootItem.lootTableItem(ModItems.argonite_axe.get()).setWeight(2)) + .add(LootItem.lootTableItem(ModItems.argonite_pickaxe.get()).setWeight(2)) + .add(LootItem.lootTableItem(ModItems.argonite_shovel.get()).setWeight(2)) + .add(LootItem.lootTableItem(ModItems.ashstone_sword.get()).setWeight(1)) + .add(LootItem.lootTableItem(ModItems.ashstone_axe.get()).setWeight(1)) + .add(LootItem.lootTableItem(ModItems.ashstone_pickaxe.get()).setWeight(1)) + .add(LootItem.lootTableItem(ModItems.ashstone_shovel.get()).setWeight(1)) + .add(LootItem.lootTableItem(ModItems.fyrite_helmet.get()).setWeight(2)) + .add(LootItem.lootTableItem(ModItems.fyrite_chestplate.get()).setWeight(2)) + .add(LootItem.lootTableItem(ModItems.fyrite_leggings.get()).setWeight(2)) + .add(LootItem.lootTableItem(ModItems.fyrite_boots.get()).setWeight(2)) + .add(LootItem.lootTableItem(ModItems.fyrite_sword.get()).setWeight(2)) + .add(LootItem.lootTableItem(ModItems.fyrite_pickaxe.get()).setWeight(2)) + .add(LootItem.lootTableItem(ModItems.fyrite_shovel.get()).setWeight(2)) + .add(LootItem.lootTableItem(ModItems.illumenite_helmet.get()).setWeight(2)) + .add(LootItem.lootTableItem(ModItems.illumenite_chestplate.get()).setWeight(2)) + .add(LootItem.lootTableItem(ModItems.illumenite_leggings.get()).setWeight(2)) + .add(LootItem.lootTableItem(ModItems.illumenite_boots.get()).setWeight(2)) + .add(LootItem.lootTableItem(ModItems.illumenite_sword.get()).setWeight(2)) + .add(LootItem.lootTableItem(ModItems.dragonstone_helmet.get()).setWeight(1)) + .add(LootItem.lootTableItem(ModItems.dragonstone_chestplate.get()).setWeight(1)) + .add(LootItem.lootTableItem(ModItems.dragonstone_leggings.get()).setWeight(1)) + .add(LootItem.lootTableItem(ModItems.dragonstone_boots.get()).setWeight(1)) + .add(LootItem.lootTableItem(ModItems.dragonstone_sword.get()).setWeight(1)) + .add(LootItem.lootTableItem(ModItems.dragonstone_axe.get()).setWeight(1)) + .add(LootItem.lootTableItem(ModItems.dragonstone_pickaxe.get()).setWeight(1)) + .add(LootItem.lootTableItem(ModItems.dragonstone_shovel.get()).setWeight(1)) + .add(LootItem.lootTableItem(ModItems.malachite_ingot.get()).setWeight(2) + .apply(SetItemCountFunction.setCount(UniformGenerator.between(2, 4)))) + .add(LootItem.lootTableItem(ModItems.argonite_ingot.get()).setWeight(2) + .apply(SetItemCountFunction.setCount(UniformGenerator.between(1, 3)))) + .add(LootItem.lootTableItem(ModItems.fyrite_ingot.get()).setWeight(2) + .apply(SetItemCountFunction.setCount(UniformGenerator.between(1, 2)))) + .add(LootItem.lootTableItem(ModItems.illumenite_ingot.get()).setWeight(1) + .apply(SetItemCountFunction.setCount(UniformGenerator.between(1, 2)))) + .add(LootItem.lootTableItem(ModItems.ashstone_gem.get()).setWeight(1) + .apply(SetItemCountFunction.setCount(UniformGenerator.between(1, 2)))) + .add(LootItem.lootTableItem(ModItems.dragonstone_gem.get()).setWeight(1) + .apply(SetItemCountFunction.setCount(UniformGenerator.between(1, 1)))); addInjectionTable(Netherrocks.MODID, "bastion", foo); // jungle_temple foo = createChestPool(1, 1, 0.25F) - .add(ItemLootEntry.lootTableItem(ModItems.malachite_ingot.get()).setWeight(10) - .apply(SetCount.setCount(RandomValueRange.between(2, 4)))) - .add(ItemLootEntry.lootTableItem(ModItems.ashstone_gem.get()).setWeight(1) - .apply(SetCount.setCount(RandomValueRange.between(1, 2)))); + .add(LootItem.lootTableItem(ModItems.malachite_ingot.get()).setWeight(10) + .apply(SetItemCountFunction.setCount(UniformGenerator.between(2, 4)))) + .add(LootItem.lootTableItem(ModItems.ashstone_gem.get()).setWeight(1) + .apply(SetItemCountFunction.setCount(UniformGenerator.between(1, 2)))); addInjectionTable(Netherrocks.MODID, "jungle_temple", foo); // stronghold foo = createChestPool(1, 1, 0.25F) - .add(ItemLootEntry.lootTableItem(ModItems.malachite_helmet.get()).setWeight(1)) - .add(ItemLootEntry.lootTableItem(ModItems.malachite_chestplate.get()).setWeight(1)) - .add(ItemLootEntry.lootTableItem(ModItems.malachite_leggings.get()).setWeight(1)) - .add(ItemLootEntry.lootTableItem(ModItems.malachite_boots.get()).setWeight(1)) - .add(ItemLootEntry.lootTableItem(ModItems.malachite_sword.get()).setWeight(1)) - .add(ItemLootEntry.lootTableItem(ModItems.malachite_axe.get()).setWeight(1)) - .add(ItemLootEntry.lootTableItem(ModItems.malachite_pickaxe.get()).setWeight(1)) - .add(ItemLootEntry.lootTableItem(ModItems.malachite_ingot.get()).setWeight(10) - .apply(SetCount.setCount(RandomValueRange.between(2, 4)))) - .add(ItemLootEntry.lootTableItem(ModItems.argonite_ingot.get()).setWeight(3) - .apply(SetCount.setCount(RandomValueRange.between(1, 3)))) - .add(ItemLootEntry.lootTableItem(ModItems.fyrite_ingot.get()).setWeight(5) - .apply(SetCount.setCount(RandomValueRange.between(1, 2)))) - .add(ItemLootEntry.lootTableItem(ModItems.illumenite_ingot.get()).setWeight(1) - .apply(SetCount.setCount(RandomValueRange.between(1, 2)))); + .add(LootItem.lootTableItem(ModItems.malachite_helmet.get()).setWeight(1)) + .add(LootItem.lootTableItem(ModItems.malachite_chestplate.get()).setWeight(1)) + .add(LootItem.lootTableItem(ModItems.malachite_leggings.get()).setWeight(1)) + .add(LootItem.lootTableItem(ModItems.malachite_boots.get()).setWeight(1)) + .add(LootItem.lootTableItem(ModItems.malachite_sword.get()).setWeight(1)) + .add(LootItem.lootTableItem(ModItems.malachite_axe.get()).setWeight(1)) + .add(LootItem.lootTableItem(ModItems.malachite_pickaxe.get()).setWeight(1)) + .add(LootItem.lootTableItem(ModItems.malachite_ingot.get()).setWeight(10) + .apply(SetItemCountFunction.setCount(UniformGenerator.between(2, 4)))) + .add(LootItem.lootTableItem(ModItems.argonite_ingot.get()).setWeight(3) + .apply(SetItemCountFunction.setCount(UniformGenerator.between(1, 3)))) + .add(LootItem.lootTableItem(ModItems.fyrite_ingot.get()).setWeight(5) + .apply(SetItemCountFunction.setCount(UniformGenerator.between(1, 2)))) + .add(LootItem.lootTableItem(ModItems.illumenite_ingot.get()).setWeight(1) + .apply(SetItemCountFunction.setCount(UniformGenerator.between(1, 2)))); addInjectionTable(Netherrocks.MODID, "stronghold", foo); return tables; diff --git a/src/main/java/mod/alexndr/netherrocks/datagen/NetherrocksLootTableProvider.java b/src/main/java/mod/alexndr/netherrocks/datagen/NetherrocksLootTableProvider.java index aad1be0a..57d26426 100644 --- a/src/main/java/mod/alexndr/netherrocks/datagen/NetherrocksLootTableProvider.java +++ b/src/main/java/mod/alexndr/netherrocks/datagen/NetherrocksLootTableProvider.java @@ -11,9 +11,9 @@ import mod.alexndr.netherrocks.init.ModItems; import mod.alexndr.simplecorelib.datagen.BlockLootTableProvider; import net.minecraft.data.DataGenerator; -import net.minecraft.loot.LootParameterSet; -import net.minecraft.loot.LootTable.Builder; -import net.minecraft.util.ResourceLocation; +import net.minecraft.world.level.storage.loot.parameters.LootContextParamSet; +import net.minecraft.world.level.storage.loot.LootTable.Builder; +import net.minecraft.resources.ResourceLocation; public class NetherrocksLootTableProvider extends BlockLootTableProvider { @@ -25,21 +25,61 @@ public NetherrocksLootTableProvider(DataGenerator dataGeneratorIn) } @Override - protected List>>, LootParameterSet>> getTables() + protected List>>, LootContextParamSet>> getTables() { tables.clear(); standardDropTable(ModBlocks.argonite_block.get()); - standardDropTable(ModBlocks.argonite_ore.get()); + standardDropTable(ModBlocks.raw_argonite_block.get()); + standardDropTable(ModBlocks.argonite_bricks.get()); + standardDropTable(ModBlocks.argonite_brick_stairs.get()); + slabDropTable(ModBlocks.argonite_brick_slab.get()); + standardDropTable(ModBlocks.argonite_bars.get()); + standardDropTable(ModBlocks.argonite_door.get()); + specialDropTable(ModBlocks.argonite_ore.get(), ModItems.raw_argonite.get()); + standardDropTable(ModBlocks.ashstone_block.get()); + standardDropTable(ModBlocks.ashstone_bricks.get()); + standardDropTable(ModBlocks.ashstone_brick_stairs.get()); + slabDropTable(ModBlocks.ashstone_brick_slab.get()); + standardDropTable(ModBlocks.ashstone_bars.get()); + standardDropTable(ModBlocks.ashstone_door.get()); specialDropTable(ModBlocks.ashstone_ore.get(), ModItems.ashstone_gem.get()); + standardDropTable(ModBlocks.dragonstone_block.get()); + standardDropTable(ModBlocks.dragonstone_bricks.get()); + standardDropTable(ModBlocks.dragonstone_brick_stairs.get()); + slabDropTable(ModBlocks.dragonstone_brick_slab.get()); + standardDropTable(ModBlocks.dragonstone_bars.get()); + standardDropTable(ModBlocks.dragonstone_door.get()); specialDropTable(ModBlocks.dragonstone_ore.get(), ModItems.dragonstone_gem.get()); + standardDropTable(ModBlocks.fyrite_block.get()); - standardDropTable(ModBlocks.fyrite_ore.get()); + standardDropTable(ModBlocks.raw_fyrite_block.get()); + standardDropTable(ModBlocks.fyrite_bricks.get()); + standardDropTable(ModBlocks.fyrite_brick_stairs.get()); + slabDropTable(ModBlocks.fyrite_brick_slab.get()); + standardDropTable(ModBlocks.fyrite_bars.get()); + standardDropTable(ModBlocks.fyrite_door.get()); + specialDropTable(ModBlocks.fyrite_ore.get(), ModItems.raw_fyrite.get()); + standardDropTable(ModBlocks.illumenite_block.get()); - standardDropTable(ModBlocks.illumenite_ore.get()); + standardDropTable(ModBlocks.raw_illumenite_block.get()); + standardDropTable(ModBlocks.illumenite_bricks.get()); + standardDropTable(ModBlocks.illumenite_brick_stairs.get()); + slabDropTable(ModBlocks.illumenite_brick_slab.get()); + standardDropTable(ModBlocks.illumenite_bars.get()); + standardDropTable(ModBlocks.illumenite_door.get()); + specialDropTable(ModBlocks.illumenite_ore.get(), ModItems.raw_illumenite.get()); + standardDropTable(ModBlocks.malachite_block.get()); - standardDropTable(ModBlocks.malachite_ore.get()); + standardDropTable(ModBlocks.raw_malachite_block.get()); + standardDropTable(ModBlocks.malachite_bricks.get()); + standardDropTable(ModBlocks.malachite_brick_stairs.get()); + slabDropTable(ModBlocks.malachite_brick_slab.get()); + standardDropTable(ModBlocks.malachite_bars.get()); + standardDropTable(ModBlocks.malachite_door.get()); + specialDropTable(ModBlocks.malachite_ore.get(), ModItems.raw_malachite.get()); + copyNameDropTable(ModBlocks.nether_blast_furnace.get(), ModBlocks.nether_blast_furnace.get().asItem()); copyNameDropTable(ModBlocks.nether_furnace.get(), diff --git a/src/main/java/mod/alexndr/netherrocks/datagen/Recipes.java b/src/main/java/mod/alexndr/netherrocks/datagen/Recipes.java new file mode 100644 index 00000000..0a0f71ab --- /dev/null +++ b/src/main/java/mod/alexndr/netherrocks/datagen/Recipes.java @@ -0,0 +1,207 @@ +package mod.alexndr.netherrocks.datagen; + +import java.util.function.Consumer; + +import mod.alexndr.netherrocks.Netherrocks; +import mod.alexndr.netherrocks.config.NetherrocksConfig; +import mod.alexndr.netherrocks.init.ModBlocks; +import mod.alexndr.netherrocks.init.ModItems; +import mod.alexndr.simplecorelib.datagen.ISimpleConditionBuilder; +import mod.alexndr.simplecorelib.datagen.RecipeSetBuilder; +import net.minecraft.data.DataGenerator; +import net.minecraft.data.recipes.FinishedRecipe; +import net.minecraft.data.recipes.RecipeProvider; +import net.minecraft.data.recipes.ShapedRecipeBuilder; +import net.minecraft.tags.ItemTags; +import net.minecraft.world.item.Items; +import net.minecraft.world.item.crafting.Ingredient; +import net.minecraft.world.level.block.Blocks; +import net.minecraftforge.common.crafting.conditions.ICondition; +import net.minecraftforge.common.crafting.conditions.IConditionBuilder; + +public class Recipes extends RecipeProvider implements IConditionBuilder, ISimpleConditionBuilder +{ + private RecipeSetBuilder setbuilder; + + public Recipes(DataGenerator generatorIn) + { + super(generatorIn); + setbuilder = new RecipeSetBuilder(Netherrocks.MODID); + } + + protected void buildCraftingRecipes(Consumer consumer) + { + registerStorageRecipes(consumer); + registerMiscRecipes(consumer); + registerToolRecipes(consumer); + registerArmorRecipes(consumer); + registerFurnaceRecipes(consumer); + registerAestheticRecipes(consumer); + } // end registerRecipes() + + + protected void registerMiscRecipes(Consumer consumer) + { + // nether furnace recipes + ShapedRecipeBuilder.shaped(ModBlocks.nether_furnace.get()) + .define('S', Blocks.NETHERRACK) + .define('Y', Items.FLINT_AND_STEEL) + .pattern("SSS") + .pattern("SYS") + .pattern("SSS") + .unlockedBy("has_item", has(Blocks.NETHERRACK)) + .save(consumer); + + ShapedRecipeBuilder.shaped(ModBlocks.nether_smoker.get()) + .define('#', ItemTags.LOGS) + .define('X', ModBlocks.nether_furnace.get()) + .pattern(" # ") + .pattern("#X#") + .pattern(" # ") + .unlockedBy("has_item", has(ModBlocks.nether_furnace.get())) + .save(consumer); + + ShapedRecipeBuilder.shaped(ModBlocks.nether_blast_furnace.get()) + .define('#', Items.NETHER_BRICK) + .define('I', Items.IRON_INGOT) + .define('X', ModBlocks.nether_furnace.get()) + .pattern("III") + .pattern("IXI") + .pattern("###") + .unlockedBy("has_item", has(ModBlocks.nether_furnace.get())) + .save(consumer); + + } // end registerMiscRecipes + + + protected void registerToolRecipes(Consumer consumer) + { + setbuilder.buildSimpleToolSet(consumer, Ingredient.of(ModItems.argonite_ingot.get()), + "argonite", has(ModItems.argonite_ingot.get()), null, false); + setbuilder.buildSimpleToolSet(consumer, Ingredient.of(ModItems.ashstone_gem.get()), + "ashstone", has(ModItems.ashstone_gem.get()), null, false); + setbuilder.buildSimpleToolSet(consumer, Ingredient.of(ModItems.dragonstone_gem.get()), + "dragonstone", has(ModItems.dragonstone_gem.get()), null, false); + setbuilder.buildSimpleToolSet(consumer, Ingredient.of(ModItems.illumenite_ingot.get()), + "illumenite", has(ModItems.illumenite_ingot.get()), null, false); + setbuilder.buildSimpleToolSet(consumer, Ingredient.of(ModItems.fyrite_ingot.get()), + "fyrite", has(ModItems.fyrite_ingot.get()), null, false); + setbuilder.buildSimpleToolSet(consumer, Ingredient.of(ModItems.malachite_ingot.get()), + "malachite", has(ModItems.malachite_ingot.get()), null, false); + } // end registerToolRecipes() + + protected void registerArmorRecipes(Consumer consumer) + { + setbuilder.buildSimpleArmorSet(consumer, Ingredient.of(ModItems.dragonstone_gem.get()), + "dragonstone", has(ModItems.dragonstone_gem.get()), null); + setbuilder.buildSimpleArmorSet(consumer, Ingredient.of(ModItems.fyrite_ingot.get()), "fyrite", + has(ModItems.fyrite_ingot.get()), null); + setbuilder.buildSimpleArmorSet(consumer, Ingredient.of(ModItems.illumenite_ingot.get()), "illumenite", + has(ModItems.illumenite_ingot.get()), null); + setbuilder.buildSimpleArmorSet(consumer, Ingredient.of(ModItems.malachite_ingot.get()), "malachite", + has(ModItems.malachite_ingot.get()), null); + } // end registerArmorRecipes() + + + protected void registerAestheticRecipes(Consumer consumer) + { + setbuilder.buildSimpleAestheticBlocks(consumer, Ingredient.of(ModItems.argonite_ingot.get()), "argonite", + has(ModItems.argonite_ingot.get()), flag("aesthetics_enabled")); + setbuilder.buildSimpleAestheticBlocks(consumer, Ingredient.of(ModItems.ashstone_gem.get()), "ashstone", + has(ModItems.ashstone_gem.get()), flag("aesthetics_enabled")); + setbuilder.buildSimpleAestheticBlocks(consumer, Ingredient.of(ModItems.dragonstone_gem.get()), "dragonstone", + has(ModItems.dragonstone_gem.get()), flag("aesthetics_enabled")); + setbuilder.buildSimpleAestheticBlocks(consumer, Ingredient.of(ModItems.fyrite_ingot.get()), "fyrite", + has(ModItems.fyrite_ingot.get()), flag("aesthetics_enabled")); + setbuilder.buildSimpleAestheticBlocks(consumer, Ingredient.of(ModItems.illumenite_ingot.get()), "illumenite", + has(ModItems.illumenite_ingot.get()), flag("aesthetics_enabled")); + setbuilder.buildSimpleAestheticBlocks(consumer, Ingredient.of(ModItems.malachite_ingot.get()), "malachite", + has(ModItems.malachite_ingot.get()), flag("aesthetics_enabled")); + } // end registerAestheticRecipes() + + + protected void registerStorageRecipes(Consumer consumer) + { + setbuilder.buildSimpleStorageRecipes(consumer, ModItems.raw_fyrite.get(), + ModBlocks.raw_fyrite_block.get(), null, has(ModItems.raw_fyrite.get())); + setbuilder.buildSimpleStorageRecipes(consumer, ModItems.raw_illumenite.get(), + ModBlocks.raw_illumenite_block.get(), null, has(ModItems.raw_illumenite.get())); + setbuilder.buildSimpleStorageRecipes(consumer, ModItems.raw_argonite.get(), + ModBlocks.raw_argonite_block.get(), null, has(ModItems.raw_argonite.get())); + setbuilder.buildSimpleStorageRecipes(consumer, ModItems.raw_malachite.get(), + ModBlocks.raw_malachite_block.get(), null, has(ModItems.raw_malachite.get())); + + setbuilder.buildSimpleStorageRecipes(consumer, ModItems.argonite_ingot.get(), + ModBlocks.argonite_block.get().asItem(), ModItems.argonite_nugget.get(), + has(ModItems.argonite_ingot.get())); + setbuilder.buildSimpleStorageRecipes(consumer, ModItems.fyrite_ingot.get(), + ModBlocks.fyrite_block.get().asItem(), ModItems.fyrite_nugget.get(), + has(ModItems.fyrite_ingot.get())); + setbuilder.buildSimpleStorageRecipes(consumer, ModItems.illumenite_ingot.get(), + ModBlocks.illumenite_block.get().asItem(), ModItems.illumenite_nugget.get(), + has(ModItems.illumenite_ingot.get())); + setbuilder.buildSimpleStorageRecipes(consumer, ModItems.malachite_ingot.get(), + ModBlocks.malachite_block.get().asItem(), ModItems.malachite_nugget.get(), + has(ModItems.malachite_ingot.get())); + setbuilder.buildSimpleStorageRecipes(consumer, ModItems.ashstone_gem.get(), + ModBlocks.ashstone_block.get().asItem(), null, + has(ModItems.ashstone_gem.get())); + setbuilder.buildSimpleStorageRecipes(consumer, ModItems.dragonstone_gem.get(), + ModBlocks.dragonstone_block.get().asItem(), null, + has(ModItems.dragonstone_gem.get())); + } // end registerStorageRecipes() + + + protected void registerFurnaceRecipes(Consumer consumer) + { + setbuilder.buildOre2IngotRecipes(consumer, Ingredient.of(ModItems.raw_fyrite.get()), ModItems.fyrite_ingot.get(), + has(ModItems.raw_fyrite.get()), 0.8F, 200); + setbuilder.buildOre2IngotRecipes(consumer, Ingredient.of(ModItems.raw_illumenite.get()), ModItems.illumenite_ingot.get(), + has(ModItems.raw_illumenite.get()), 0.8F, 200); + setbuilder.buildOre2IngotRecipes(consumer, Ingredient.of(ModItems.raw_argonite.get()), ModItems.argonite_ingot.get(), + has(ModItems.raw_argonite.get()), 0.7F, 200); + setbuilder.buildOre2IngotRecipes(consumer, Ingredient.of(ModItems.raw_malachite.get()), ModItems.malachite_ingot.get(), + has(ModItems.raw_malachite.get()), 0.5F, 200); + + setbuilder.buildOre2IngotRecipes(consumer, Ingredient.of(ModBlocks.ashstone_ore.get()), ModItems.ashstone_gem.get(), + has(ModBlocks.ashstone_ore.get()), 0.8F, 200, "_from_ore"); + setbuilder.buildOre2IngotRecipes(consumer, Ingredient.of(ModBlocks.dragonstone_ore.get()), ModItems.dragonstone_gem.get(), + has(ModBlocks.dragonstone_ore.get()), 0.8F, 200, "_from_ore"); + setbuilder.buildOre2IngotRecipes(consumer, Ingredient.of(ModBlocks.fyrite_ore.get()), ModItems.fyrite_ingot.get(), + has(ModBlocks.fyrite_ore.get()), 0.8F, 200, "_from_ore"); + setbuilder.buildOre2IngotRecipes(consumer, Ingredient.of(ModBlocks.illumenite_ore.get()), ModItems.illumenite_ingot.get(), + has(ModBlocks.illumenite_ore.get()), 0.8F, 200, "_from_ore"); + setbuilder.buildOre2IngotRecipes(consumer, Ingredient.of(ModBlocks.argonite_ore.get()), ModItems.argonite_ingot.get(), + has(ModBlocks.argonite_ore.get()), 0.7F, 200, "_from_ore"); + setbuilder.buildOre2IngotRecipes(consumer, Ingredient.of(ModBlocks.malachite_ore.get()), ModItems.malachite_ingot.get(), + has(ModBlocks.malachite_ore.get()), 0.5F, 200, "_from_ore"); + + // vanilla recycling + setbuilder.buildVanillaRecyclingRecipes(consumer, Ingredient.of(ModItems.argonite_axe.get(), + ModItems.argonite_hoe.get(), ModItems.argonite_pickaxe.get(), ModItems.argonite_shovel.get(), + ModItems.argonite_sword.get()), ModItems.argonite_nugget.get(), + has(ModItems.argonite_axe.get()), 0.3F, 200); + setbuilder.buildVanillaRecyclingRecipes(consumer, Ingredient.of(ModItems.fyrite_axe.get(), + ModItems.fyrite_pickaxe.get(), ModItems.fyrite_shovel.get(), ModItems.fyrite_boots.get(), + ModItems.fyrite_sword.get(), ModItems.fyrite_chestplate.get(), ModItems.fyrite_helmet.get(), + ModItems.fyrite_leggings.get()), + ModItems.fyrite_nugget.get(), has(ModItems.fyrite_axe.get()), 0.3F, 200); + setbuilder.buildVanillaRecyclingRecipes(consumer, Ingredient.of(ModItems.illumenite_boots.get(), + ModItems.illumenite_sword.get(), ModItems.illumenite_chestplate.get(), ModItems.illumenite_helmet.get(), + ModItems.illumenite_leggings.get()), + ModItems.illumenite_nugget.get(), has(ModItems.illumenite_sword.get()), 0.3F, 200); + setbuilder.buildVanillaRecyclingRecipes(consumer, Ingredient.of(ModItems.malachite_axe.get(), + ModItems.malachite_pickaxe.get(), ModItems.malachite_shovel.get(), ModItems.malachite_boots.get(), + ModItems.malachite_sword.get(), ModItems.malachite_chestplate.get(), ModItems.malachite_helmet.get(), + ModItems.malachite_leggings.get(), ModItems.malachite_hoe.get()), + ModItems.malachite_nugget.get(), has(ModItems.malachite_axe.get()), 0.3F, 200); + + } // end registerFurnaceRecipes() + + @Override + public ICondition flag(String arg0) + { + return impl_flag(Netherrocks.MODID, NetherrocksConfig.INSTANCE, arg0); + } + +} // end class diff --git a/src/main/java/mod/alexndr/netherrocks/datagen/SilentsRecipes.java b/src/main/java/mod/alexndr/netherrocks/datagen/SilentsRecipes.java index 605b8bfe..5f1936ec 100644 --- a/src/main/java/mod/alexndr/netherrocks/datagen/SilentsRecipes.java +++ b/src/main/java/mod/alexndr/netherrocks/datagen/SilentsRecipes.java @@ -8,9 +8,9 @@ import mod.alexndr.simplecorelib.datagen.ISimpleConditionBuilder; import mod.alexndr.simplecorelib.datagen.RecipeSetBuilder; import net.minecraft.data.DataGenerator; -import net.minecraft.data.IFinishedRecipe; -import net.minecraft.data.RecipeProvider; -import net.minecraft.item.crafting.Ingredient; +import net.minecraft.data.recipes.FinishedRecipe; +import net.minecraft.data.recipes.RecipeProvider; +import net.minecraft.world.item.crafting.Ingredient; import net.minecraftforge.common.crafting.conditions.ICondition; import net.minecraftforge.common.crafting.conditions.IConditionBuilder; @@ -25,12 +25,12 @@ public SilentsRecipes(DataGenerator generatorIn) } @Override - protected void buildShapelessRecipes(Consumer consumer) + protected void buildCraftingRecipes(Consumer consumer) { registerFurnaceRecipes(consumer); } // end registerRecipes() - private void registerFurnaceRecipes(Consumer consumer) + private void registerFurnaceRecipes(Consumer consumer) { setbuilder.buildOre2IngotRecipes(consumer, Ingredient.of(ModItems.argonite_dust.get().asItem()), ModItems.argonite_ingot.get(), diff --git a/src/main/java/mod/alexndr/netherrocks/generation/IllumeniteBlobFeature.java b/src/main/java/mod/alexndr/netherrocks/generation/IllumeniteBlobFeature.java index 4a22377c..e2c670a9 100644 --- a/src/main/java/mod/alexndr/netherrocks/generation/IllumeniteBlobFeature.java +++ b/src/main/java/mod/alexndr/netherrocks/generation/IllumeniteBlobFeature.java @@ -5,21 +5,21 @@ import com.mojang.serialization.Codec; import mod.alexndr.netherrocks.init.ModBlocks; -import net.minecraft.block.Block; -import net.minecraft.block.BlockState; -import net.minecraft.block.Blocks; -import net.minecraft.util.Direction; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.ISeedReader; -import net.minecraft.world.gen.ChunkGenerator; -import net.minecraft.world.gen.feature.Feature; -import net.minecraft.world.gen.feature.NoFeatureConfig; +import net.minecraft.core.BlockPos; +import net.minecraft.core.Direction; +import net.minecraft.world.level.WorldGenLevel; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.Blocks; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.level.levelgen.feature.Feature; +import net.minecraft.world.level.levelgen.feature.FeaturePlaceContext; +import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration; -public class IllumeniteBlobFeature extends Feature +public class IllumeniteBlobFeature extends Feature { - public IllumeniteBlobFeature(Codec p_i231956_1_) + public IllumeniteBlobFeature(Codec codec) { - super(p_i231956_1_); + super(codec); } /** @@ -33,9 +33,12 @@ public IllumeniteBlobFeature(Codec p_i231956_1_) * @return */ @Override - public boolean place(ISeedReader worldIn, - ChunkGenerator generator, Random rand, BlockPos pos, NoFeatureConfig config) + public boolean place(FeaturePlaceContext context) { + WorldGenLevel worldIn = context.level(); + BlockPos pos = context.origin(); + Random rand = context.random(); + if (!worldIn.isEmptyBlock(pos)) { return false; } @@ -53,14 +56,14 @@ public boolean place(ISeedReader worldIn, { BlockPos blockpos = pos.offset(rand.nextInt(8) - rand.nextInt(8), -rand.nextInt(12), rand.nextInt(8) - rand.nextInt(8)); BlockState bstate = worldIn.getBlockState(blockpos); - if (bstate.getBlock().isAir(bstate, worldIn, blockpos)) + if (bstate.isAir()) { int j = 0; for(Direction direction : Direction.values()) { - Block thatblock = worldIn.getBlockState(blockpos.relative(direction)).getBlock(); - if (thatblock == Blocks.GLOWSTONE || thatblock == ModBlocks.illumenite_ore.get()) + BlockState thatblock = worldIn.getBlockState(blockpos.relative(direction)); + if (thatblock.is(Blocks.GLOWSTONE) || thatblock.is(ModBlocks.illumenite_ore.get())) { ++j; } diff --git a/src/main/java/mod/alexndr/netherrocks/generation/OreGeneration.java b/src/main/java/mod/alexndr/netherrocks/generation/OreGeneration.java index 54540e2f..54c6c59a 100644 --- a/src/main/java/mod/alexndr/netherrocks/generation/OreGeneration.java +++ b/src/main/java/mod/alexndr/netherrocks/generation/OreGeneration.java @@ -1,114 +1,127 @@ package mod.alexndr.netherrocks.generation; +import com.google.common.collect.ImmutableList; + import mod.alexndr.netherrocks.Netherrocks; import mod.alexndr.netherrocks.config.NetherrocksConfig; import mod.alexndr.netherrocks.init.ModBlocks; +import mod.alexndr.netherrocks.init.ModFeatures; import mod.alexndr.simplecorelib.world.OreGenUtils; -import net.minecraft.world.gen.GenerationStage.Decoration; -import net.minecraft.world.gen.feature.ConfiguredFeature; -import net.minecraft.world.gen.feature.Feature; -import net.minecraft.world.gen.feature.FeatureSpreadConfig; -import net.minecraft.world.gen.feature.IFeatureConfig; -import net.minecraft.world.gen.feature.NoFeatureConfig; -import net.minecraft.world.gen.placement.Placement; +import net.minecraft.data.worldgen.Features; +import net.minecraft.util.valueproviders.BiasedToBottomInt; +import net.minecraft.world.level.block.Blocks; +import net.minecraft.world.level.levelgen.GenerationStep.Decoration; +import net.minecraft.world.level.levelgen.feature.ConfiguredFeature; +import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration; +import net.minecraft.world.level.levelgen.feature.configurations.OreConfiguration; +import net.minecraft.world.level.levelgen.structure.templatesystem.BlockMatchTest; +import net.minecraft.world.level.levelgen.structure.templatesystem.RuleTest; import net.minecraftforge.event.world.BiomeLoadingEvent; -import net.minecraftforge.fml.RegistryObject; -import net.minecraftforge.registries.DeferredRegister; -import net.minecraftforge.registries.ForgeRegistries; /** * Ore generation master-class for Netherrocks. */ public class OreGeneration { + public static final RuleTest MAGMAROCK_TEST = new BlockMatchTest(Blocks.MAGMA_BLOCK); + public static final RuleTest GLOWSTONE_TEST = new BlockMatchTest(Blocks.GLOWSTONE); + public static final RuleTest BLACKSTONE_TEST = new BlockMatchTest(Blocks.BLACKSTONE); + + public static final ImmutableList ORE_FYRITE_TARGET_LIST = ImmutableList.of( + OreConfiguration.target(MAGMAROCK_TEST, ModBlocks.fyrite_ore.get().defaultBlockState())); + + public static final ImmutableList ORE_DRAGONSTONE_TARGET_LIST = ImmutableList.of( + OreConfiguration.target(BLACKSTONE_TEST, ModBlocks.dragonstone_ore.get().defaultBlockState()), + OreConfiguration.target(OreConfiguration.Predicates.NETHERRACK, ModBlocks.dragonstone_ore.get().defaultBlockState())); + public static ConfiguredFeature ORE_ARGONITE; public static ConfiguredFeature ORE_ASHSTONE; public static ConfiguredFeature ORE_DRAGONSTONE; public static ConfiguredFeature ORE_FYRITE; + public static ConfiguredFeature ORE_FYRITE_ROCK; public static ConfiguredFeature ORE_ILLUMENITE; public static ConfiguredFeature ORE_ILLUMENITE_EXTRA; public static ConfiguredFeature ORE_MALACHITE; - public static final DeferredRegister> FEATURES = - DeferredRegister.create(ForgeRegistries.FEATURES, Netherrocks.MODID); - - public static final RegistryObject> ILLUMENITE_FEATURE = - FEATURES.register("illumenite_blob", - () -> new IllumeniteBlobFeature(NoFeatureConfig.CODEC)); - - /** - * generate nether ores. - */ - public static void generateNetherOres(BiomeLoadingEvent evt) - { - if (NetherrocksConfig.enableArgoniteOre) - evt.getGeneration().addFeature(Decoration.UNDERGROUND_DECORATION, OreGeneration.ORE_ARGONITE); - if (NetherrocksConfig.enableAshstoneOre) - evt.getGeneration().addFeature(Decoration.UNDERGROUND_DECORATION, OreGeneration.ORE_ASHSTONE); - if (NetherrocksConfig.enableDragonstoneOre) - evt.getGeneration().addFeature(Decoration.UNDERGROUND_DECORATION, OreGeneration.ORE_DRAGONSTONE); - if (NetherrocksConfig.enableFyriteOre) - evt.getGeneration().addFeature(Decoration.UNDERGROUND_DECORATION, OreGeneration.ORE_FYRITE); - if (NetherrocksConfig.enableMalachiteOre) - evt.getGeneration().addFeature(Decoration.UNDERGROUND_DECORATION, OreGeneration.ORE_MALACHITE); - - if (NetherrocksConfig.enableIllumeniteOre) - { - evt.getGeneration().addFeature(Decoration.UNDERGROUND_DECORATION, OreGeneration.ORE_ILLUMENITE); - evt.getGeneration().addFeature(Decoration.UNDERGROUND_DECORATION, OreGeneration.ORE_ILLUMENITE_EXTRA); - } - } // end generateNetherOres() - - /** + /** * initialize nether Features. * * @param evt */ - public static void initNetherFeatures() + @SuppressWarnings("deprecation") + public static void initNetherFeatures() { if (NetherrocksConfig.enableArgoniteOre) { - ORE_ARGONITE = OreGenUtils.buildNetherOreFeature(Feature.ORE, ModBlocks.argonite_ore.get().defaultBlockState(), + ORE_ARGONITE = OreGenUtils.buildNetherRockFeature(ModBlocks.argonite_ore.get().defaultBlockState(), NetherrocksConfig.argonite_cfg); OreGenUtils.registerFeature(Netherrocks.MODID, "argonite_vein", ORE_ARGONITE); } if (NetherrocksConfig.enableAshstoneOre) { - ORE_ASHSTONE = OreGenUtils.buildNetherOreFeature(Feature.ORE, ModBlocks.ashstone_ore.get().defaultBlockState(), + ORE_ASHSTONE = OreGenUtils.buildNetherRockFeature(ModBlocks.ashstone_ore.get().defaultBlockState(), NetherrocksConfig.ashstone_cfg); OreGenUtils.registerFeature(Netherrocks.MODID, "ashstone_vein", ORE_ASHSTONE); } if (NetherrocksConfig.enableDragonstoneOre) { - ORE_DRAGONSTONE = OreGenUtils.buildNetherOreFeature(Feature.ORE, ModBlocks.dragonstone_ore.get().defaultBlockState(), - NetherrocksConfig.dragonstone_cfg); + ORE_DRAGONSTONE = OreGenUtils.buildTargettedOreFeature(ORE_DRAGONSTONE_TARGET_LIST, NetherrocksConfig.dragonstone_cfg); OreGenUtils.registerFeature(Netherrocks.MODID, "dragonstone_vein", ORE_DRAGONSTONE); } if (NetherrocksConfig.enableFyriteOre) { - ORE_FYRITE = OreGenUtils.buildNetherOreFeature(Feature.ORE, ModBlocks.fyrite_ore.get().defaultBlockState(), + ORE_FYRITE = OreGenUtils.buildNetherOreFeature(ModBlocks.fyrite_ore.get().defaultBlockState(), NetherrocksConfig.fyrite_cfg); + ORE_FYRITE_ROCK = OreGenUtils.buildTargettedOreFeature(ORE_FYRITE_TARGET_LIST, NetherrocksConfig.fyrite_cfg); OreGenUtils.registerFeature(Netherrocks.MODID, "fyrite_vein", ORE_FYRITE); + OreGenUtils.registerFeature(Netherrocks.MODID, "fyrite_in_magma", ORE_FYRITE_ROCK); } // Illumenite ore is a special snowflake that generates in glowstone blobs, so it has // to mimic glowstone generation. A side-effect is that more glowstone generates as well. if (NetherrocksConfig.enableIllumeniteOre) { - ORE_ILLUMENITE = ILLUMENITE_FEATURE.get().configured(IFeatureConfig.NONE) - .range(NetherrocksConfig.illumenite_cfg.getCfg().maximum).squared() - .count(NetherrocksConfig.illumenite_cfg.getVein_count()); - ORE_ILLUMENITE_EXTRA = ILLUMENITE_FEATURE.get().configured(IFeatureConfig.NONE) - .decorated(Placement.GLOWSTONE.configured(new FeatureSpreadConfig(10))); + ORE_ILLUMENITE = ModFeatures.ILLUMENITE_FEATURE.get().configured(FeatureConfiguration.NONE) + .range(Features.Decorators.FULL_RANGE).squared().count(NetherrocksConfig.illumenite_cfg.getVein_count()); + + ORE_ILLUMENITE_EXTRA = ModFeatures.ILLUMENITE_FEATURE.get().configured(FeatureConfiguration.NONE) + .range(Features.Decorators.RANGE_4_4).squared().count(BiasedToBottomInt.of(0, 9)); + OreGenUtils.registerFeature(Netherrocks.MODID, "illumenite_cluster", ORE_ILLUMENITE); OreGenUtils.registerFeature(Netherrocks.MODID, "illumenite_cluster_extra", ORE_ILLUMENITE_EXTRA); } if (NetherrocksConfig.enableMalachiteOre) { - ORE_MALACHITE = OreGenUtils.buildNetherOreFeature(Feature.ORE, ModBlocks.malachite_ore.get().defaultBlockState(), + ORE_MALACHITE = OreGenUtils.buildNetherRockFeature(ModBlocks.malachite_ore.get().defaultBlockState(), NetherrocksConfig.malachite_cfg); OreGenUtils.registerFeature(Netherrocks.MODID, "malachite_vein", ORE_MALACHITE); } } // end-initNetherFeatures() + + /** + * generate nether ores. + */ + public static void generateNetherOres(BiomeLoadingEvent evt) + { + if (NetherrocksConfig.enableArgoniteOre) + evt.getGeneration().addFeature(Decoration.UNDERGROUND_DECORATION, OreGeneration.ORE_ARGONITE); + if (NetherrocksConfig.enableAshstoneOre) + evt.getGeneration().addFeature(Decoration.UNDERGROUND_DECORATION, OreGeneration.ORE_ASHSTONE); + if (NetherrocksConfig.enableDragonstoneOre) + evt.getGeneration().addFeature(Decoration.UNDERGROUND_DECORATION, OreGeneration.ORE_DRAGONSTONE); + if (NetherrocksConfig.enableFyriteOre) { + evt.getGeneration().addFeature(Decoration.UNDERGROUND_DECORATION, OreGeneration.ORE_FYRITE); + evt.getGeneration().addFeature(Decoration.UNDERGROUND_DECORATION, OreGeneration.ORE_FYRITE_ROCK); + } + if (NetherrocksConfig.enableMalachiteOre) + evt.getGeneration().addFeature(Decoration.UNDERGROUND_DECORATION, OreGeneration.ORE_MALACHITE); + + if (NetherrocksConfig.enableIllumeniteOre) + { + evt.getGeneration().addFeature(Decoration.UNDERGROUND_DECORATION, OreGeneration.ORE_ILLUMENITE); + evt.getGeneration().addFeature(Decoration.UNDERGROUND_DECORATION, OreGeneration.ORE_ILLUMENITE_EXTRA); + } + } // end generateNetherOres() + } // end class OreGeneration diff --git a/src/main/java/mod/alexndr/netherrocks/helpers/FyriteHandler.java b/src/main/java/mod/alexndr/netherrocks/helpers/FyriteHandler.java index 76550a01..5ca1135a 100644 --- a/src/main/java/mod/alexndr/netherrocks/helpers/FyriteHandler.java +++ b/src/main/java/mod/alexndr/netherrocks/helpers/FyriteHandler.java @@ -4,17 +4,25 @@ import mod.alexndr.netherrocks.Netherrocks; import mod.alexndr.simplecorelib.helpers.IWeaponEffectHelper; -import net.minecraft.block.Blocks; -import net.minecraft.entity.LivingEntity; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.ItemStack; -import net.minecraft.item.ItemUseContext; -import net.minecraft.particles.ParticleTypes; -import net.minecraft.util.ActionResultType; -import net.minecraft.util.SoundEvents; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import net.minecraftforge.common.extensions.IForgeBlockState; +import net.minecraft.advancements.CriteriaTriggers; +import net.minecraft.core.BlockPos; +import net.minecraft.core.particles.ParticleTypes; +import net.minecraft.server.level.ServerPlayer; +import net.minecraft.sounds.SoundEvents; +import net.minecraft.sounds.SoundSource; +import net.minecraft.world.InteractionResult; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.context.UseOnContext; +import net.minecraft.world.level.Level; +import net.minecraft.world.level.block.BaseFireBlock; +import net.minecraft.world.level.block.CampfireBlock; +import net.minecraft.world.level.block.CandleBlock; +import net.minecraft.world.level.block.CandleCakeBlock; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.level.block.state.properties.BlockStateProperties; +import net.minecraft.world.level.gameevent.GameEvent; public class FyriteHandler implements IWeaponEffectHelper { @@ -39,7 +47,7 @@ public boolean hitEntity(ItemStack stack, LivingEntity target, LivingEntity atta * @param pos * @param was_effective */ - public void afterBlockSmelt(World world, BlockPos pos, boolean was_effective) + public void afterBlockSmelt(Level world, BlockPos pos, boolean was_effective) { Netherrocks.LOGGER.info("tried to after-smelt"); if (was_effective && world.isClientSide()) @@ -55,52 +63,53 @@ public void afterBlockSmelt(World world, BlockPos pos, boolean was_effective) } // end-if } - public ActionResultType onItemUse(ItemUseContext context) + public InteractionResult onItemUse(UseOnContext context) { - BlockPos adjacentPos = context.getClickedPos(); BlockPos pos = context.getClickedPos(); ItemStack stack = context.getItemInHand(); - PlayerEntity playerIn = context.getPlayer(); - World worldIn = context.getLevel(); - + Player playerIn = context.getPlayer(); + Level worldIn = context.getLevel(); + BlockState blockstate = worldIn.getBlockState(pos); + if (stack.isEmpty()) { - return ActionResultType.PASS; + return InteractionResult.FAIL; } - switch (context.getClickedFace()) - { - case DOWN: - adjacentPos = pos.below(); - break; - case UP: - adjacentPos = pos.above(); - break; - case NORTH: - adjacentPos = pos.north(); - break; - case SOUTH: - adjacentPos = pos.south(); - break; - case EAST: - adjacentPos = pos.east(); - break; - case WEST: - adjacentPos = pos.west(); - break; - } // end switch + BlockPos adjacentPos = pos.relative(context.getClickedFace()); + if (!playerIn.mayUseItemAt(adjacentPos, context.getClickedFace(), stack)) { - return ActionResultType.PASS; + return InteractionResult.FAIL; } - IForgeBlockState targetBlock = worldIn.getBlockState(adjacentPos); - if (targetBlock.getBlockState().getBlock().isAir(targetBlock.getBlockState(), worldIn, adjacentPos)) + if (!CampfireBlock.canLight(blockstate) && !CandleBlock.canLight(blockstate) && !CandleCakeBlock.canLight(blockstate)) { - if (worldIn.isClientSide) { - playerIn.playSound(SoundEvents.FIRE_AMBIENT, 1.0F, 1.0F); + if (BaseFireBlock.canBePlacedAt(worldIn, adjacentPos, context.getHorizontalDirection())) + { + worldIn.playSound(playerIn, adjacentPos, SoundEvents.FIRE_AMBIENT, SoundSource.BLOCKS, 1.0F, 1.0F); + BlockState blockstate1 = BaseFireBlock.getState(worldIn, adjacentPos); + worldIn.setBlock(adjacentPos, blockstate1, 11); + worldIn.gameEvent(playerIn, GameEvent.BLOCK_PLACE, pos); + ItemStack itemstack = context.getItemInHand(); + if (playerIn instanceof ServerPlayer) + { + CriteriaTriggers.PLACED_BLOCK.trigger((ServerPlayer) playerIn, adjacentPos, itemstack); + itemstack.hurtAndBreak(1, playerIn, (foo) -> { foo.broadcastBreakEvent(context.getHand());} ); + } // end-if ServerPlayer + + return InteractionResult.sidedSuccess(worldIn.isClientSide()); + } // end if can place fire + else { + return InteractionResult.FAIL; + } + } // end-if not campfire, candle, etc. + else { + worldIn.playSound(playerIn, pos, SoundEvents.FLINTANDSTEEL_USE, SoundSource.BLOCKS, 1.0F, worldIn.getRandom().nextFloat() * 0.4F + 0.8F); + worldIn.setBlock(pos, blockstate.setValue(BlockStateProperties.LIT, Boolean.valueOf(true)), 11); + worldIn.gameEvent(playerIn, GameEvent.BLOCK_PLACE, pos); + if (playerIn != null) { + context.getItemInHand().hurtAndBreak(1, playerIn, (foo) -> {foo.broadcastBreakEvent(context.getHand());} ); } - worldIn.setBlockAndUpdate(adjacentPos, Blocks.FIRE.defaultBlockState()); - stack.hurt(1, worldIn.random, null); - } - return ActionResultType.PASS; + return InteractionResult.sidedSuccess(worldIn.isClientSide()); + } } // end onItemUse() } // end class FyriteHandler diff --git a/src/main/java/mod/alexndr/netherrocks/helpers/IllumeniteHandler.java b/src/main/java/mod/alexndr/netherrocks/helpers/IllumeniteHandler.java index 6e8136c6..6cebd380 100644 --- a/src/main/java/mod/alexndr/netherrocks/helpers/IllumeniteHandler.java +++ b/src/main/java/mod/alexndr/netherrocks/helpers/IllumeniteHandler.java @@ -2,10 +2,10 @@ import mod.alexndr.netherrocks.config.NetherrocksConfig; import mod.alexndr.simplecorelib.helpers.IWeaponEffectHelper; -import net.minecraft.entity.LivingEntity; -import net.minecraft.item.ItemStack; -import net.minecraft.potion.EffectInstance; -import net.minecraft.potion.Effects; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.effect.MobEffectInstance; +import net.minecraft.world.effect.MobEffects; public class IllumeniteHandler implements IWeaponEffectHelper { @@ -24,9 +24,9 @@ private IllumeniteHandler() {} @Override public boolean hitEntity(ItemStack stack, LivingEntity target, LivingEntity attacker) { - attacker.addEffect(new EffectInstance(Effects.NIGHT_VISION, NetherrocksConfig.illumeniteNVTime)); - target.addEffect(new EffectInstance(Effects.BLINDNESS, NetherrocksConfig.illumeniteBlindnessTime)); - target.addEffect(new EffectInstance(Effects.MOVEMENT_SLOWDOWN, + attacker.addEffect(new MobEffectInstance(MobEffects.NIGHT_VISION, NetherrocksConfig.illumeniteNVTime)); + target.addEffect(new MobEffectInstance(MobEffects.BLINDNESS, NetherrocksConfig.illumeniteBlindnessTime)); + target.addEffect(new MobEffectInstance(MobEffects.MOVEMENT_SLOWDOWN, NetherrocksConfig.illumeniteSlowTime, NetherrocksConfig.illumeniteSlowLevel)); return true; diff --git a/src/main/java/mod/alexndr/netherrocks/helpers/MalachiteHandler.java b/src/main/java/mod/alexndr/netherrocks/helpers/MalachiteHandler.java index 2b85552b..f9b13e53 100644 --- a/src/main/java/mod/alexndr/netherrocks/helpers/MalachiteHandler.java +++ b/src/main/java/mod/alexndr/netherrocks/helpers/MalachiteHandler.java @@ -2,10 +2,10 @@ import mod.alexndr.netherrocks.init.ModItems; import mod.alexndr.simplecorelib.helpers.IWeaponEffectHelper; -import net.minecraft.entity.LivingEntity; -import net.minecraft.item.ItemStack; -import net.minecraft.potion.EffectInstance; -import net.minecraft.potion.Effects; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.effect.MobEffectInstance; +import net.minecraft.world.effect.MobEffects; public class MalachiteHandler implements IWeaponEffectHelper { @@ -19,7 +19,7 @@ public boolean hitEntity(ItemStack stack, LivingEntity target, LivingEntity atta if (stack.getItem() == ModItems.malachite_axe.get() || stack.getItem() == ModItems.malachite_sword.get()) { - target.addEffect(new EffectInstance(Effects.POISON, 50)); + target.addEffect(new MobEffectInstance(MobEffects.POISON, 50)); } return false; } diff --git a/src/main/java/mod/alexndr/netherrocks/helpers/NetherrocksLootModifiers.java b/src/main/java/mod/alexndr/netherrocks/helpers/NetherrocksLootModifiers.java index 1fd4da77..132eefd7 100644 --- a/src/main/java/mod/alexndr/netherrocks/helpers/NetherrocksLootModifiers.java +++ b/src/main/java/mod/alexndr/netherrocks/helpers/NetherrocksLootModifiers.java @@ -7,13 +7,13 @@ import com.google.gson.JsonObject; -import net.minecraft.inventory.Inventory; -import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.FurnaceRecipe; -import net.minecraft.item.crafting.IRecipeType; -import net.minecraft.loot.LootContext; -import net.minecraft.loot.conditions.ILootCondition; -import net.minecraft.util.ResourceLocation; +import net.minecraft.world.SimpleContainer; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.crafting.SmeltingRecipe; +import net.minecraft.world.item.crafting.RecipeType; +import net.minecraft.world.level.storage.loot.LootContext; +import net.minecraft.world.level.storage.loot.predicates.LootItemCondition; +import net.minecraft.resources.ResourceLocation; import net.minecraftforge.common.loot.GlobalLootModifierSerializer; import net.minecraftforge.common.loot.LootModifier; import net.minecraftforge.items.ItemHandlerHelper; @@ -24,7 +24,7 @@ public class NetherrocksLootModifiers public static class AutoSmeltLootModifier extends LootModifier { - protected AutoSmeltLootModifier(ILootCondition[] conditionsIn) + protected AutoSmeltLootModifier(LootItemCondition[] conditionsIn) { super(conditionsIn); } @@ -41,8 +41,8 @@ protected List doApply(List generatedLoot, LootContext con protected static ItemStack smelt(ItemStack stack, LootContext context) { return context.getLevel().getRecipeManager() - .getRecipeFor(IRecipeType.SMELTING, new Inventory(stack),context.getLevel()) - .map(FurnaceRecipe::getResultItem) + .getRecipeFor(RecipeType.SMELTING, new SimpleContainer(stack),context.getLevel()) + .map(SmeltingRecipe::getResultItem) .filter(itemStack -> !itemStack.isEmpty()) .map(itemStack -> ItemHandlerHelper.copyStackWithSize(itemStack, stack.getCount() * itemStack.getCount())) .orElse(stack); @@ -53,7 +53,7 @@ public static class Serializer extends GlobalLootModifierSerializer argonite_ore = BLOCKS.register("argonite_ore", () -> new OreBlock(Block.Properties.of(Material.STONE) - .strength( 5.0F, 30.0F) - .harvestTool(ToolType.PICKAXE).harvestLevel(3).requiresCorrectToolForDrops())); + .strength( 5.0F, 30.0F).requiresCorrectToolForDrops())); public static final RegistryObject ashstone_ore = BLOCKS.register("ashstone_ore", () -> new OreBlock(Block.Properties.of(Material.STONE) - .strength( 5.0F, 30.0F) - .harvestTool(ToolType.PICKAXE).harvestLevel(3).requiresCorrectToolForDrops())); + .strength( 5.0F, 30.0F).requiresCorrectToolForDrops())); public static final RegistryObject dragonstone_ore = BLOCKS.register("dragonstone_ore", () -> new OreBlock(Block.Properties.of(Material.STONE) - .strength( 5.0F, 30.0F) - .harvestTool(ToolType.PICKAXE).harvestLevel(3).requiresCorrectToolForDrops())); + .strength( 5.0F, 30.0F).requiresCorrectToolForDrops())); public static final RegistryObject fyrite_ore = BLOCKS.register("fyrite_ore", () -> new OreBlock(Block.Properties.of(Material.STONE) - .strength( 3.0F, 30.0F) - .harvestTool(ToolType.PICKAXE).harvestLevel(2).requiresCorrectToolForDrops())); + .strength( 3.0F, 30.0F).requiresCorrectToolForDrops())); public static final RegistryObject illumenite_ore = BLOCKS.register("illumenite_ore", () -> new OreBlock(Block.Properties.of(Material.STONE) - .strength( 1.0F, 30.0F) - .harvestTool(ToolType.PICKAXE).harvestLevel(2).requiresCorrectToolForDrops() + .strength( 1.0F, 30.0F).requiresCorrectToolForDrops() .lightLevel(LightUtils.setFixedLight(15)))); public static final RegistryObject malachite_ore = BLOCKS.register("malachite_ore", () -> new OreBlock(Block.Properties.of(Material.STONE) - .strength( 3.0F, 30.0F) - .harvestTool(ToolType.PICKAXE).harvestLevel(2).requiresCorrectToolForDrops())); + .strength( 3.0F, 30.0F).requiresCorrectToolForDrops())); // Metal Blocks public static final RegistryObject ashstone_block = BLOCKS.register("ashstone_block", () -> new Block(Block.Properties.of(Material.STONE) - .strength(7.0F, 72.0F) - .harvestTool(ToolType.PICKAXE).harvestLevel(1).requiresCorrectToolForDrops())); + .strength(7.0F, 1200.0F).requiresCorrectToolForDrops())); public static final RegistryObject dragonstone_block = BLOCKS.register("dragonstone_block", () -> new Block(Block.Properties.of(Material.STONE, MaterialColor.NETHER) - .strength(10.0F, 72.0F) - .harvestTool(ToolType.PICKAXE).harvestLevel(1).requiresCorrectToolForDrops())); + .strength(10.0F, 1200.0F).requiresCorrectToolForDrops())); public static final RegistryObject argonite_block = BLOCKS.register("argonite_block", () -> new Block(Block.Properties.of(Material.METAL, MaterialColor.COLOR_BLUE) - .strength(7.0F, 72.0F).sound(SoundType.METAL) - .harvestTool(ToolType.PICKAXE).harvestLevel(1).requiresCorrectToolForDrops())); + .strength(7.0F, 72.0F).sound(SoundType.METAL).requiresCorrectToolForDrops())); + public static final RegistryObject raw_argonite_block = BLOCKS.register("raw_argonite_block", + () -> new Block(Block.Properties.of(Material.METAL, MaterialColor.COLOR_BLUE) + .strength(7.0F, 72.0F).sound(SoundType.METAL).requiresCorrectToolForDrops())); public static final RegistryObject fyrite_block = BLOCKS.register("fyrite_block", () -> new Block(Block.Properties.of(Material.METAL, MaterialColor.FIRE) - .strength(7.0F, 72.0F).sound(SoundType.METAL) - .harvestTool(ToolType.PICKAXE).harvestLevel(1).requiresCorrectToolForDrops())); + .strength(7.0F, 72.0F).sound(SoundType.METAL).requiresCorrectToolForDrops())); + public static final RegistryObject raw_fyrite_block = BLOCKS.register("raw_fyrite_block", + () -> new Block(Block.Properties.of(Material.METAL, MaterialColor.FIRE) + .strength(7.0F, 72.0F).sound(SoundType.METAL).requiresCorrectToolForDrops())); public static final RegistryObject illumenite_block = BLOCKS.register("illumenite_block", () -> new Block(Block.Properties.of(Material.GLASS, MaterialColor.COLOR_YELLOW) - .strength(7.0F, 72.0F).sound(SoundType.GLASS) - .harvestTool(ToolType.PICKAXE).harvestLevel(1).requiresCorrectToolForDrops() + .strength(7.0F, 72.0F).sound(SoundType.GLASS).requiresCorrectToolForDrops() + .lightLevel(LightUtils.setFixedLight(15)))); + public static final RegistryObject raw_illumenite_block = BLOCKS.register("raw_illumenite_block", + () -> new Block(Block.Properties.of(Material.GLASS, MaterialColor.COLOR_YELLOW) + .strength(7.0F, 72.0F).sound(SoundType.GLASS).requiresCorrectToolForDrops() .lightLevel(LightUtils.setFixedLight(15)))); public static final RegistryObject malachite_block = BLOCKS.register("malachite_block", () -> new Block(Block.Properties.of(Material.METAL, MaterialColor.EMERALD) - .strength(7.0F, 72.0F).sound(SoundType.METAL) - .harvestTool(ToolType.PICKAXE).harvestLevel(1).requiresCorrectToolForDrops())); + .strength(7.0F, 72.0F).sound(SoundType.METAL).requiresCorrectToolForDrops())); + public static final RegistryObject raw_malachite_block = BLOCKS.register("raw_malachite_block", + () -> new Block(Block.Properties.of(Material.METAL, MaterialColor.EMERALD) + .strength(7.0F, 72.0F).sound(SoundType.METAL).requiresCorrectToolForDrops())); // Furnace - public static final RegistryObject nether_furnace = BLOCKS.register("nether_furnace", + public static final RegistryObject nether_furnace = BLOCKS.register("nether_furnace", () -> new NetherFurnaceBlock(Block.Properties.of(Material.STONE) .strength(3.5F, 12.0F) - .lightLevel(LightUtils.setSwitchedLight(BlockStateProperties.LIT, 13)) - .harvestTool(ToolType.PICKAXE).requiresCorrectToolForDrops())); - public static final RegistryObject nether_smoker = BLOCKS.register("nether_smoker", + .lightLevel(LightUtils.setSwitchedLight(BlockStateProperties.LIT, 13)).requiresCorrectToolForDrops())); + public static final RegistryObject nether_smoker = BLOCKS.register("nether_smoker", () -> new NetherSmokerBlock(Block.Properties.of(Material.STONE) .strength(3.5F, 12.0F) - .lightLevel(LightUtils.setSwitchedLight(BlockStateProperties.LIT, 13)) - .harvestTool(ToolType.PICKAXE).requiresCorrectToolForDrops())); - public static final RegistryObject nether_blast_furnace = BLOCKS.register("nether_blast_furnace", + .lightLevel(LightUtils.setSwitchedLight(BlockStateProperties.LIT, 13)).requiresCorrectToolForDrops())); + public static final RegistryObject nether_blast_furnace = BLOCKS.register("nether_blast_furnace", () -> new NetherBlastFurnaceBlock(Block.Properties.of(Material.STONE) .strength(3.5F, 12.0F) - .lightLevel(LightUtils.setSwitchedLight(BlockStateProperties.LIT, 13)) - .harvestTool(ToolType.PICKAXE).requiresCorrectToolForDrops())); + .lightLevel(LightUtils.setSwitchedLight(BlockStateProperties.LIT, 13)).requiresCorrectToolForDrops())); + // AESTHETICS STUFF + // Blocks - bricks - Netherrocks + public static RegistryObject argonite_bricks = BLOCKS.register("argonite_bricks", + () -> new Block(Block.Properties.copy(argonite_block.get()))); + public static RegistryObject ashstone_bricks = BLOCKS.register("ashstone_bricks", + () -> new Block(Block.Properties.copy(ashstone_block.get()))); + public static RegistryObject dragonstone_bricks = BLOCKS.register("dragonstone_bricks", + () -> new Block(Block.Properties.copy(dragonstone_block.get()))); + public static RegistryObject fyrite_bricks = BLOCKS.register("fyrite_bricks", + () -> new Block(Block.Properties.copy(fyrite_block.get()))); + public static RegistryObject illumenite_bricks = BLOCKS.register("illumenite_bricks", + () -> new Block(Block.Properties.copy(illumenite_block.get()) + .lightLevel(LightUtils.setFixedLight(15)))); + public static RegistryObject malachite_bricks = BLOCKS.register("malachite_bricks", + () -> new Block(Block.Properties.copy(malachite_block.get()))); + + // Blocks - slabs - netherrocks + public static RegistryObject argonite_brick_slab = BLOCKS.register("argonite_brick_slab", + () -> new SlabBlock(SlabBlock.Properties.copy(argonite_block.get()))); + public static RegistryObject ashstone_brick_slab = BLOCKS.register("ashstone_brick_slab", + () -> new SlabBlock(SlabBlock.Properties.copy(ashstone_block.get()))); + public static RegistryObject dragonstone_brick_slab = BLOCKS.register("dragonstone_brick_slab", + () -> new SlabBlock(SlabBlock.Properties.copy(dragonstone_block.get()))); + public static RegistryObject fyrite_brick_slab = BLOCKS.register("fyrite_brick_slab", + () -> new SlabBlock(SlabBlock.Properties.copy(fyrite_block.get()))); + public static RegistryObject illumenite_brick_slab = BLOCKS.register("illumenite_brick_slab", + () -> new SlabBlock(SlabBlock.Properties.copy(illumenite_block.get()) + .lightLevel(LightUtils.setFixedLight(15)))); + public static RegistryObject malachite_brick_slab = BLOCKS.register("malachite_brick_slab", + () -> new SlabBlock(SlabBlock.Properties.copy(malachite_block.get()))); + + // Blocks - stairs - netherrocks + public static RegistryObject argonite_brick_stairs = BLOCKS.register("argonite_brick_stairs", + () -> new StairBlock( () -> argonite_bricks.get().defaultBlockState(), + Block.Properties.copy(argonite_bricks.get()))); + public static RegistryObject ashstone_brick_stairs = BLOCKS.register("ashstone_brick_stairs", + () -> new StairBlock( () -> ashstone_bricks.get().defaultBlockState(), + Block.Properties.copy(ashstone_bricks.get()))); + public static RegistryObject dragonstone_brick_stairs = BLOCKS.register("dragonstone_brick_stairs", + () -> new StairBlock( () -> dragonstone_bricks.get().defaultBlockState(), + Block.Properties.copy(dragonstone_bricks.get()))); + public static RegistryObject fyrite_brick_stairs = BLOCKS.register("fyrite_brick_stairs", + () -> new StairBlock( () -> fyrite_bricks.get().defaultBlockState(), + Block.Properties.copy(fyrite_bricks.get()))); + public static RegistryObject illumenite_brick_stairs = BLOCKS.register("illumenite_brick_stairs", + () -> new StairBlock( () -> illumenite_bricks.get().defaultBlockState(), + Block.Properties.copy(illumenite_bricks.get()))); + public static RegistryObject malachite_brick_stairs = BLOCKS.register("malachite_brick_stairs", + () -> new StairBlock( () -> malachite_bricks.get().defaultBlockState(), + Block.Properties.copy(malachite_bricks.get()))); + + // Blocks - doors - netherrocks + public static RegistryObject argonite_door = BLOCKS.register("argonite_door", + () -> new DoorBlock(Block.Properties.copy(argonite_bricks.get()).noOcclusion())); + public static RegistryObject ashstone_door = BLOCKS.register("ashstone_door", + () -> new DoorBlock(Block.Properties.copy(ashstone_bricks.get()).noOcclusion())); + public static RegistryObject dragonstone_door = BLOCKS.register("dragonstone_door", + () -> new DoorBlock(Block.Properties.copy(dragonstone_bricks.get()).noOcclusion())); + public static RegistryObject fyrite_door = BLOCKS.register("fyrite_door", + () -> new DoorBlock(Block.Properties.copy(fyrite_bricks.get()).noOcclusion())); + public static RegistryObject illumenite_door = BLOCKS.register("illumenite_door", + () -> new DoorBlock(Block.Properties.copy(illumenite_bricks.get()).noOcclusion())); + public static RegistryObject malachite_door = BLOCKS.register("malachite_door", + () -> new DoorBlock(Block.Properties.copy(malachite_bricks.get()).noOcclusion())); + + // Blocks - bars - netherrocks + public static RegistryObject argonite_bars = BLOCKS.register("argonite_bars", + () -> new IronBarsBlock(Block.Properties.of(Material.METAL, MaterialColor.NONE) + .strength(7.0F).requiresCorrectToolForDrops().sound(SoundType.METAL).noOcclusion())); + public static RegistryObject ashstone_bars = BLOCKS.register("ashstone_bars", + () -> new IronBarsBlock(Block.Properties.of(Material.STONE, MaterialColor.NONE) + .strength(7.0F).requiresCorrectToolForDrops().sound(SoundType.STONE).noOcclusion())); + public static RegistryObject dragonstone_bars = BLOCKS.register("dragonstone_bars", + () -> new IronBarsBlock(Block.Properties.of(Material.STONE, MaterialColor.NONE) + .strength(10.0F).requiresCorrectToolForDrops().sound(SoundType.STONE).noOcclusion())); + public static RegistryObject fyrite_bars = BLOCKS.register("fyrite_bars", + () -> new IronBarsBlock(Block.Properties.of(Material.METAL, MaterialColor.NONE) + .strength(7.0F).requiresCorrectToolForDrops().sound(SoundType.METAL).noOcclusion())); + public static RegistryObject illumenite_bars = BLOCKS.register("illumenite_bars", + () -> new IronBarsBlock(Block.Properties.of(Material.METAL, MaterialColor.NONE) + .strength(7.0F).requiresCorrectToolForDrops().sound(SoundType.METAL).noOcclusion() + .lightLevel(LightUtils.setFixedLight(14)))); + public static RegistryObject malachite_bars = BLOCKS.register("malachite_bars", + () -> new IronBarsBlock(Block.Properties.of(Material.METAL, MaterialColor.NONE) + .strength(7.0F).requiresCorrectToolForDrops().sound(SoundType.METAL).noOcclusion())); + + } // end class ModBlocks diff --git a/src/main/java/mod/alexndr/netherrocks/init/ModContainers.java b/src/main/java/mod/alexndr/netherrocks/init/ModContainers.java index ed969fa0..574c9571 100644 --- a/src/main/java/mod/alexndr/netherrocks/init/ModContainers.java +++ b/src/main/java/mod/alexndr/netherrocks/init/ModContainers.java @@ -4,9 +4,9 @@ import mod.alexndr.netherrocks.content.NetherBlastFurnaceContainer; import mod.alexndr.netherrocks.content.NetherFurnaceContainer; import mod.alexndr.netherrocks.content.NetherSmokerContainer; -import net.minecraft.inventory.container.ContainerType; +import net.minecraft.world.inventory.MenuType; import net.minecraftforge.common.extensions.IForgeContainerType; -import net.minecraftforge.fml.RegistryObject; +import net.minecraftforge.fmllegacy.RegistryObject; import net.minecraftforge.registries.DeferredRegister; import net.minecraftforge.registries.ForgeRegistries; @@ -23,18 +23,18 @@ */ public final class ModContainers { - public static final DeferredRegister> CONTAINER_TYPES = + public static final DeferredRegister> CONTAINER_TYPES = DeferredRegister.create(ForgeRegistries.CONTAINERS, Netherrocks.MODID); - public static RegistryObject> NETHER_FURNACE = + public static RegistryObject> NETHER_FURNACE = CONTAINER_TYPES.register("nether_furnace", () -> IForgeContainerType.create(NetherFurnaceContainer::new)); - public static RegistryObject> NETHER_SMOKER = + public static RegistryObject> NETHER_SMOKER = CONTAINER_TYPES.register("nether_smoker", () -> IForgeContainerType.create(NetherSmokerContainer::new)); - public static RegistryObject> NETHER_BLAST_FURNACE = + public static RegistryObject> NETHER_BLAST_FURNACE = CONTAINER_TYPES.register("nether_blast_furnace", () -> IForgeContainerType.create(NetherBlastFurnaceContainer::new)); diff --git a/src/main/java/mod/alexndr/netherrocks/init/ModFeatures.java b/src/main/java/mod/alexndr/netherrocks/init/ModFeatures.java new file mode 100644 index 00000000..dae64578 --- /dev/null +++ b/src/main/java/mod/alexndr/netherrocks/init/ModFeatures.java @@ -0,0 +1,20 @@ +package mod.alexndr.netherrocks.init; + +import mod.alexndr.netherrocks.Netherrocks; +import mod.alexndr.netherrocks.generation.IllumeniteBlobFeature; +import net.minecraft.world.level.levelgen.feature.Feature; +import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration; +import net.minecraftforge.fmllegacy.RegistryObject; +import net.minecraftforge.registries.DeferredRegister; +import net.minecraftforge.registries.ForgeRegistries; + +public final class ModFeatures +{ + public static final DeferredRegister> FEATURES = + DeferredRegister.create(ForgeRegistries.FEATURES, Netherrocks.MODID); + + public static final RegistryObject> ILLUMENITE_FEATURE = + FEATURES.register("illumenite_blob", () -> new IllumeniteBlobFeature(NoneFeatureConfiguration.CODEC)); + + +} // end class diff --git a/src/main/java/mod/alexndr/netherrocks/init/ModItems.java b/src/main/java/mod/alexndr/netherrocks/init/ModItems.java index 4109b46f..a0afd9e8 100644 --- a/src/main/java/mod/alexndr/netherrocks/init/ModItems.java +++ b/src/main/java/mod/alexndr/netherrocks/init/ModItems.java @@ -12,16 +12,16 @@ import mod.alexndr.netherrocks.content.MalachiteAxeItem; import mod.alexndr.netherrocks.content.MalachiteSwordItem; import mod.alexndr.netherrocks.content.NetherrocksArmorMaterial; -import mod.alexndr.netherrocks.content.NetherrocksItemTier; -import net.minecraft.inventory.EquipmentSlotType; -import net.minecraft.item.ArmorItem; -import net.minecraft.item.AxeItem; -import net.minecraft.item.HoeItem; -import net.minecraft.item.Item; -import net.minecraft.item.PickaxeItem; -import net.minecraft.item.ShovelItem; -import net.minecraft.item.SwordItem; -import net.minecraftforge.fml.RegistryObject; +import mod.alexndr.netherrocks.content.NetherrocksItemTiers; +import net.minecraft.world.entity.EquipmentSlot; +import net.minecraft.world.item.ArmorItem; +import net.minecraft.world.item.AxeItem; +import net.minecraft.world.item.HoeItem; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.PickaxeItem; +import net.minecraft.world.item.ShovelItem; +import net.minecraft.world.item.SwordItem; +import net.minecraftforge.fmllegacy.RegistryObject; import net.minecraftforge.registries.DeferredRegister; import net.minecraftforge.registries.ForgeRegistries; @@ -50,6 +50,8 @@ public final class ModItems () -> new Item(new Item.Properties().tab(ModTabGroups.MOD_ITEM_GROUP))); public static final RegistryObject crushed_argonite_ore = ITEMS.register("crushed_argonite_ore", () -> new Item(new Item.Properties().tab(ModTabGroups.MOD_ITEM_GROUP))); + public static final RegistryObject raw_argonite = ITEMS.register("raw_argonite", + () -> new Item(new Item.Properties().tab(ModTabGroups.MOD_ITEM_GROUP))); public static final RegistryObject dragonstone_gem = ITEMS.register("dragonstone_gem", () -> new Item(new Item.Properties().tab(ModTabGroups.MOD_ITEM_GROUP))); @@ -64,6 +66,8 @@ public final class ModItems () -> new Item(new Item.Properties().tab(ModTabGroups.MOD_ITEM_GROUP))); public static final RegistryObject crushed_fyrite_ore = ITEMS.register("crushed_fyrite_ore", () -> new Item(new Item.Properties().tab(ModTabGroups.MOD_ITEM_GROUP))); + public static final RegistryObject raw_fyrite = ITEMS.register("raw_fyrite", + () -> new Item(new Item.Properties().tab(ModTabGroups.MOD_ITEM_GROUP))); public static final RegistryObject illumenite_ingot = ITEMS.register("illumenite_ingot", () -> new Item(new Item.Properties().tab(ModTabGroups.MOD_ITEM_GROUP))); @@ -73,6 +77,8 @@ public final class ModItems () -> new Item(new Item.Properties().tab(ModTabGroups.MOD_ITEM_GROUP))); public static final RegistryObject crushed_illumenite_ore = ITEMS.register("crushed_illumenite_ore", () -> new Item(new Item.Properties().tab(ModTabGroups.MOD_ITEM_GROUP))); + public static final RegistryObject raw_illumenite = ITEMS.register("raw_illumenite", + () -> new Item(new Item.Properties().tab(ModTabGroups.MOD_ITEM_GROUP))); public static final RegistryObject malachite_ingot = ITEMS.register("malachite_ingot", () -> new Item(new Item.Properties().tab(ModTabGroups.MOD_ITEM_GROUP))); @@ -82,149 +88,151 @@ public final class ModItems () -> new Item(new Item.Properties().tab(ModTabGroups.MOD_ITEM_GROUP))); public static final RegistryObject crushed_malachite_ore = ITEMS.register("crushed_malachite_ore", () -> new Item(new Item.Properties().tab(ModTabGroups.MOD_ITEM_GROUP))); + public static final RegistryObject raw_malachite = ITEMS.register("raw_malachite", + () -> new Item(new Item.Properties().tab(ModTabGroups.MOD_ITEM_GROUP))); // TOOLS & WEAPONS // swords public static final RegistryObject argonite_sword = ITEMS.register("argonite_sword", - () -> new SwordItem(NetherrocksItemTier.ARGONITE, 3, -2.4F, + () -> new SwordItem(NetherrocksItemTiers.ARGONITE, 3, -2.4F, new Item.Properties().tab(ModTabGroups.MOD_ITEM_GROUP))); public static final RegistryObject fyrite_sword = ITEMS.register("fyrite_sword", - () -> new FyriteSwordItem(NetherrocksItemTier.FYRITE, 3, -2.4F, + () -> new FyriteSwordItem(NetherrocksItemTiers.FYRITE, 3, -2.4F, new Item.Properties().tab(ModTabGroups.MOD_ITEM_GROUP))); public static final RegistryObject illumenite_sword = ITEMS.register("illumenite_sword", - () -> new IllumeniteSwordItem(NetherrocksItemTier.ILLUMENITE, 3, -2.4F, + () -> new IllumeniteSwordItem(NetherrocksItemTiers.ILLUMENITE, 3, -2.4F, new Item.Properties().tab(ModTabGroups.MOD_ITEM_GROUP))); public static final RegistryObject malachite_sword = ITEMS.register("malachite_sword", - () -> new MalachiteSwordItem(NetherrocksItemTier.MALACHITE, 3, -2.4F, + () -> new MalachiteSwordItem(NetherrocksItemTiers.MALACHITE, 3, -2.4F, new Item.Properties().tab(ModTabGroups.MOD_ITEM_GROUP))); public static final RegistryObject ashstone_sword = ITEMS.register("ashstone_sword", - () -> new SwordItem(NetherrocksItemTier.ASHSTONE, 3, -2.4F, + () -> new SwordItem(NetherrocksItemTiers.ASHSTONE, 3, -2.4F, new Item.Properties().tab(ModTabGroups.MOD_ITEM_GROUP))); public static final RegistryObject dragonstone_sword = ITEMS.register("dragonstone_sword", - () -> new SwordItem(NetherrocksItemTier.DRAGONSTONE, 3, -2.4F, + () -> new SwordItem(NetherrocksItemTiers.DRAGONSTONE, 3, -2.4F, new Item.Properties().tab(ModTabGroups.MOD_ITEM_GROUP))); // pickaxes public static final RegistryObject argonite_pickaxe = ITEMS.register("argonite_pickaxe", - () -> new PickaxeItem(NetherrocksItemTier.ARGONITE, 1, -2.8F, + () -> new PickaxeItem(NetherrocksItemTiers.ARGONITE, 1, -2.8F, new Item.Properties().tab(ModTabGroups.MOD_ITEM_GROUP))); public static final RegistryObject fyrite_pickaxe = ITEMS.register("fyrite_pickaxe", - () -> new FyritePickaxeIteam(NetherrocksItemTier.FYRITE, 1, -2.8F, + () -> new FyritePickaxeIteam(NetherrocksItemTiers.FYRITE, 1, -2.8F, new Item.Properties().tab(ModTabGroups.MOD_ITEM_GROUP))); public static final RegistryObject malachite_pickaxe = ITEMS.register("malachite_pickaxe", - () -> new PickaxeItem(NetherrocksItemTier.MALACHITE, 1, -2.8F, + () -> new PickaxeItem(NetherrocksItemTiers.MALACHITE, 1, -2.8F, new Item.Properties().tab(ModTabGroups.MOD_ITEM_GROUP))); public static final RegistryObject ashstone_pickaxe = ITEMS.register("ashstone_pickaxe", - () -> new PickaxeItem(NetherrocksItemTier.ASHSTONE, 1, -2.8F, + () -> new PickaxeItem(NetherrocksItemTiers.ASHSTONE, 1, -2.8F, new Item.Properties().tab(ModTabGroups.MOD_ITEM_GROUP))); public static final RegistryObject dragonstone_pickaxe = ITEMS.register("dragonstone_pickaxe", - () -> new PickaxeItem(NetherrocksItemTier.DRAGONSTONE, 1, -2.8F, + () -> new PickaxeItem(NetherrocksItemTiers.DRAGONSTONE, 1, -2.8F, new Item.Properties().tab(ModTabGroups.MOD_ITEM_GROUP))); // axes public static final RegistryObject argonite_axe = ITEMS.register("argonite_axe", - () -> new AxeItem(NetherrocksItemTier.ARGONITE, 7.0F, -3.1F, + () -> new AxeItem(NetherrocksItemTiers.ARGONITE, 5.0F, -3.1F, new Item.Properties().tab(ModTabGroups.MOD_ITEM_GROUP))); public static final RegistryObject fyrite_axe = ITEMS.register("fyrite_axe", - () -> new FyriteAxeItem(NetherrocksItemTier.FYRITE, 7.0F, -3.1F, + () -> new FyriteAxeItem(NetherrocksItemTiers.FYRITE, 5.0F, -3.1F, new Item.Properties().tab(ModTabGroups.MOD_ITEM_GROUP))); public static final RegistryObject malachite_axe = ITEMS.register("malachite_axe", - () -> new MalachiteAxeItem(NetherrocksItemTier.MALACHITE, 7.0F, -3.1F, + () -> new MalachiteAxeItem(NetherrocksItemTiers.MALACHITE, 5.0F, -3.1F, new Item.Properties().tab(ModTabGroups.MOD_ITEM_GROUP))); public static final RegistryObject ashstone_axe = ITEMS.register("ashstone_axe", - () -> new AxeItem(NetherrocksItemTier.ASHSTONE, 7.0F, -3.1F, + () -> new AxeItem(NetherrocksItemTiers.ASHSTONE, 6.0F, -3.1F, new Item.Properties().tab(ModTabGroups.MOD_ITEM_GROUP))); public static final RegistryObject dragonstone_axe = ITEMS.register("dragonstone_axe", - () -> new AxeItem(NetherrocksItemTier.DRAGONSTONE, 7.0F, -3.1F, + () -> new AxeItem(NetherrocksItemTiers.DRAGONSTONE, 1.0F, -3.0F, new Item.Properties().tab(ModTabGroups.MOD_ITEM_GROUP))); // shovels public static final RegistryObject argonite_shovel = ITEMS.register("argonite_shovel", - () -> new ShovelItem(NetherrocksItemTier.ARGONITE, 1.5F, -3.0F, + () -> new ShovelItem(NetherrocksItemTiers.ARGONITE, 1.5F, -3.0F, new Item.Properties().tab(ModTabGroups.MOD_ITEM_GROUP))); public static final RegistryObject fyrite_shovel = ITEMS.register("fyrite_shovel", - () -> new FyriteShovelItem(NetherrocksItemTier.FYRITE, 1.5F, -3.0F, + () -> new FyriteShovelItem(NetherrocksItemTiers.FYRITE, 1.5F, -3.0F, new Item.Properties().tab(ModTabGroups.MOD_ITEM_GROUP))); public static final RegistryObject malachite_shovel = ITEMS.register("malachite_shovel", - () -> new ShovelItem(NetherrocksItemTier.MALACHITE, 1.5F, -3.0F, + () -> new ShovelItem(NetherrocksItemTiers.MALACHITE, 1.5F, -3.0F, new Item.Properties().tab(ModTabGroups.MOD_ITEM_GROUP))); public static final RegistryObject ashstone_shovel = ITEMS.register("ashstone_shovel", - () -> new ShovelItem(NetherrocksItemTier.ASHSTONE, 1.5F, -3.0F, + () -> new ShovelItem(NetherrocksItemTiers.ASHSTONE, 1.5F, -3.0F, new Item.Properties().tab(ModTabGroups.MOD_ITEM_GROUP))); public static final RegistryObject dragonstone_shovel = ITEMS.register("dragonstone_shovel", - () -> new ShovelItem(NetherrocksItemTier.DRAGONSTONE, 1.5F, -3.0F, + () -> new ShovelItem(NetherrocksItemTiers.DRAGONSTONE, 1.5F, -3.0F, new Item.Properties().tab(ModTabGroups.MOD_ITEM_GROUP))); // hoes public static final RegistryObject argonite_hoe = ITEMS.register("argonite_hoe", - () -> new HoeItem(NetherrocksItemTier.ARGONITE, -1, -2.0F, + () -> new HoeItem(NetherrocksItemTiers.ARGONITE, -1, -2.0F, new Item.Properties().tab(ModTabGroups.MOD_ITEM_GROUP))); public static final RegistryObject malachite_hoe = ITEMS.register("malachite_hoe", - () -> new HoeItem(NetherrocksItemTier.MALACHITE, -1, -2.0F, + () -> new HoeItem(NetherrocksItemTiers.MALACHITE, -1, -2.0F, new Item.Properties().tab(ModTabGroups.MOD_ITEM_GROUP))); public static final RegistryObject ashstone_hoe = ITEMS.register("ashstone_hoe", - () -> new HoeItem(NetherrocksItemTier.ASHSTONE, -1, -2.0F, + () -> new HoeItem(NetherrocksItemTiers.ASHSTONE, -1, -2.0F, new Item.Properties().tab(ModTabGroups.MOD_ITEM_GROUP))); public static final RegistryObject dragonstone_hoe = ITEMS.register("dragonstone_hoe", - () -> new HoeItem(NetherrocksItemTier.DRAGONSTONE, -1, -2.0F, + () -> new HoeItem(NetherrocksItemTiers.DRAGONSTONE, -1, -2.0F, new Item.Properties().tab(ModTabGroups.MOD_ITEM_GROUP))); // ARMOR // dragonstone public static final RegistryObject dragonstone_helmet = ITEMS.register("dragonstone_helmet", - () -> new ArmorItem(NetherrocksArmorMaterial.DRAGONSTONE, EquipmentSlotType.HEAD, + () -> new ArmorItem(NetherrocksArmorMaterial.DRAGONSTONE, EquipmentSlot.HEAD, new Item.Properties().tab(ModTabGroups.MOD_ITEM_GROUP))); public static final RegistryObject dragonstone_leggings = ITEMS.register("dragonstone_leggings", - () -> new ArmorItem(NetherrocksArmorMaterial.DRAGONSTONE, EquipmentSlotType.LEGS, + () -> new ArmorItem(NetherrocksArmorMaterial.DRAGONSTONE, EquipmentSlot.LEGS, new Item.Properties().tab(ModTabGroups.MOD_ITEM_GROUP))); public static final RegistryObject dragonstone_chestplate = ITEMS.register("dragonstone_chestplate", - () -> new ArmorItem(NetherrocksArmorMaterial.DRAGONSTONE, EquipmentSlotType.CHEST, + () -> new ArmorItem(NetherrocksArmorMaterial.DRAGONSTONE, EquipmentSlot.CHEST, new Item.Properties().tab(ModTabGroups.MOD_ITEM_GROUP))); public static final RegistryObject dragonstone_boots = ITEMS.register("dragonstone_boots", - () -> new ArmorItem(NetherrocksArmorMaterial.DRAGONSTONE, EquipmentSlotType.FEET, + () -> new ArmorItem(NetherrocksArmorMaterial.DRAGONSTONE, EquipmentSlot.FEET, new Item.Properties().tab(ModTabGroups.MOD_ITEM_GROUP))); // fyrite public static final RegistryObject fyrite_helmet = ITEMS.register("fyrite_helmet", - () -> new FyriteArmorItem(NetherrocksArmorMaterial.FYRITE, EquipmentSlotType.HEAD, + () -> new FyriteArmorItem(NetherrocksArmorMaterial.FYRITE, EquipmentSlot.HEAD, new Item.Properties().tab(ModTabGroups.MOD_ITEM_GROUP))); public static final RegistryObject fyrite_leggings = ITEMS.register("fyrite_leggings", - () -> new FyriteArmorItem(NetherrocksArmorMaterial.FYRITE, EquipmentSlotType.LEGS, + () -> new FyriteArmorItem(NetherrocksArmorMaterial.FYRITE, EquipmentSlot.LEGS, new Item.Properties().tab(ModTabGroups.MOD_ITEM_GROUP))); public static final RegistryObject fyrite_chestplate = ITEMS.register("fyrite_chestplate", - () -> new FyriteArmorItem(NetherrocksArmorMaterial.FYRITE, EquipmentSlotType.CHEST, + () -> new FyriteArmorItem(NetherrocksArmorMaterial.FYRITE, EquipmentSlot.CHEST, new Item.Properties().tab(ModTabGroups.MOD_ITEM_GROUP))); public static final RegistryObject fyrite_boots = ITEMS.register("fyrite_boots", - () -> new FyriteArmorItem(NetherrocksArmorMaterial.FYRITE, EquipmentSlotType.FEET, + () -> new FyriteArmorItem(NetherrocksArmorMaterial.FYRITE, EquipmentSlot.FEET, new Item.Properties().tab(ModTabGroups.MOD_ITEM_GROUP))); // illumenite public static final RegistryObject illumenite_helmet = ITEMS.register("illumenite_helmet", - () -> new IllumeniteArmorItem(NetherrocksArmorMaterial.ILLUMENITE, EquipmentSlotType.HEAD, + () -> new IllumeniteArmorItem(NetherrocksArmorMaterial.ILLUMENITE, EquipmentSlot.HEAD, new Item.Properties().tab(ModTabGroups.MOD_ITEM_GROUP))); public static final RegistryObject illumenite_leggings = ITEMS.register("illumenite_leggings", - () -> new IllumeniteArmorItem(NetherrocksArmorMaterial.ILLUMENITE, EquipmentSlotType.LEGS, + () -> new IllumeniteArmorItem(NetherrocksArmorMaterial.ILLUMENITE, EquipmentSlot.LEGS, new Item.Properties().tab(ModTabGroups.MOD_ITEM_GROUP))); public static final RegistryObject illumenite_chestplate = ITEMS.register("illumenite_chestplate", - () -> new IllumeniteArmorItem(NetherrocksArmorMaterial.ILLUMENITE, EquipmentSlotType.CHEST, + () -> new IllumeniteArmorItem(NetherrocksArmorMaterial.ILLUMENITE, EquipmentSlot.CHEST, new Item.Properties().tab(ModTabGroups.MOD_ITEM_GROUP))); public static final RegistryObject illumenite_boots = ITEMS.register("illumenite_boots", - () -> new IllumeniteArmorItem(NetherrocksArmorMaterial.ILLUMENITE, EquipmentSlotType.FEET, + () -> new IllumeniteArmorItem(NetherrocksArmorMaterial.ILLUMENITE, EquipmentSlot.FEET, new Item.Properties().tab(ModTabGroups.MOD_ITEM_GROUP))); // malachite public static final RegistryObject malachite_helmet = ITEMS.register("malachite_helmet", - () -> new MalachiteArmorItem(NetherrocksArmorMaterial.MALACHITE, EquipmentSlotType.HEAD, + () -> new MalachiteArmorItem(NetherrocksArmorMaterial.MALACHITE, EquipmentSlot.HEAD, new Item.Properties().tab(ModTabGroups.MOD_ITEM_GROUP))); public static final RegistryObject malachite_leggings = ITEMS.register("malachite_leggings", - () -> new MalachiteArmorItem(NetherrocksArmorMaterial.MALACHITE, EquipmentSlotType.LEGS, + () -> new MalachiteArmorItem(NetherrocksArmorMaterial.MALACHITE, EquipmentSlot.LEGS, new Item.Properties().tab(ModTabGroups.MOD_ITEM_GROUP))); public static final RegistryObject malachite_chestplate = ITEMS.register("malachite_chestplate", - () -> new MalachiteArmorItem(NetherrocksArmorMaterial.MALACHITE, EquipmentSlotType.CHEST, + () -> new MalachiteArmorItem(NetherrocksArmorMaterial.MALACHITE, EquipmentSlot.CHEST, new Item.Properties().tab(ModTabGroups.MOD_ITEM_GROUP))); public static final RegistryObject malachite_boots = ITEMS.register("malachite_boots", - () -> new MalachiteArmorItem(NetherrocksArmorMaterial.MALACHITE, EquipmentSlotType.FEET, + () -> new MalachiteArmorItem(NetherrocksArmorMaterial.MALACHITE, EquipmentSlot.FEET, new Item.Properties().tab(ModTabGroups.MOD_ITEM_GROUP))); } // end class ModItems diff --git a/src/main/java/mod/alexndr/netherrocks/init/ModTabGroups.java b/src/main/java/mod/alexndr/netherrocks/init/ModTabGroups.java index f237857a..197497ff 100644 --- a/src/main/java/mod/alexndr/netherrocks/init/ModTabGroups.java +++ b/src/main/java/mod/alexndr/netherrocks/init/ModTabGroups.java @@ -1,8 +1,8 @@ package mod.alexndr.netherrocks.init; import mod.alexndr.netherrocks.Netherrocks; -import net.minecraft.item.ItemGroup; -import net.minecraft.item.ItemStack; +import net.minecraft.world.item.CreativeModeTab; +import net.minecraft.world.item.ItemStack; import javax.annotation.Nonnull; import java.util.function.Supplier; @@ -10,10 +10,10 @@ public final class ModTabGroups { - public static final ItemGroup MOD_ITEM_GROUP = + public static final CreativeModeTab MOD_ITEM_GROUP = new ModTabGroup(Netherrocks.MODID, () -> new ItemStack(ModItems.fyrite_pickaxe.get())); - public static final class ModTabGroup extends ItemGroup + public static final class ModTabGroup extends CreativeModeTab { @Nonnull diff --git a/src/main/java/mod/alexndr/netherrocks/init/ModTags.java b/src/main/java/mod/alexndr/netherrocks/init/ModTags.java index ddf6eec5..be2981bc 100644 --- a/src/main/java/mod/alexndr/netherrocks/init/ModTags.java +++ b/src/main/java/mod/alexndr/netherrocks/init/ModTags.java @@ -1,10 +1,10 @@ package mod.alexndr.netherrocks.init; import mod.alexndr.netherrocks.Netherrocks; -import net.minecraft.item.Item; -import net.minecraft.tags.ITag; +import net.minecraft.world.item.Item; +import net.minecraft.tags.Tag; import net.minecraft.tags.ItemTags; -import net.minecraft.util.ResourceLocation; +import net.minecraft.resources.ResourceLocation; /** * Holds tag collections this mod needs to keep track of. @@ -14,7 +14,7 @@ public class ModTags private static ResourceLocation tagNetherFurnaceFuels = new ResourceLocation(Netherrocks.MODID, "nether_furnace_fuels"); - public static ITag getnetherFurnaceFuels() + public static Tag getnetherFurnaceFuels() { return ItemTags.getAllTags().getTag(tagNetherFurnaceFuels); } diff --git a/src/main/java/mod/alexndr/netherrocks/init/ModTiles.java b/src/main/java/mod/alexndr/netherrocks/init/ModTiles.java index 2d0588b6..29ed683c 100644 --- a/src/main/java/mod/alexndr/netherrocks/init/ModTiles.java +++ b/src/main/java/mod/alexndr/netherrocks/init/ModTiles.java @@ -4,8 +4,8 @@ import mod.alexndr.netherrocks.content.NetherBlastFurnaceTileEntity; import mod.alexndr.netherrocks.content.NetherFurnaceTileEntity; import mod.alexndr.netherrocks.content.NetherSmokerTileEntity; -import net.minecraft.tileentity.TileEntityType; -import net.minecraftforge.fml.RegistryObject; +import net.minecraft.world.level.block.entity.BlockEntityType; +import net.minecraftforge.fmllegacy.RegistryObject; import net.minecraftforge.registries.DeferredRegister; import net.minecraftforge.registries.ForgeRegistries; @@ -22,23 +22,23 @@ */ public final class ModTiles { - public static final DeferredRegister> TILE_ENTITY_TYPES = - DeferredRegister.create(ForgeRegistries.TILE_ENTITIES, Netherrocks.MODID); + public static final DeferredRegister> TILE_ENTITY_TYPES = + DeferredRegister.create(ForgeRegistries.BLOCK_ENTITIES, Netherrocks.MODID); // tile entity type // We don't have a datafixer for our TileEntities, so we pass null into build. - public static RegistryObject> NETHER_FURNACE = + public static RegistryObject> NETHER_FURNACE = TILE_ENTITY_TYPES.register("nether_furnace", - () -> TileEntityType.Builder.of(NetherFurnaceTileEntity::new, + () -> BlockEntityType.Builder.of(NetherFurnaceTileEntity::new, ModBlocks.nether_furnace.get()).build(null)); - public static RegistryObject> NETHER_SMOKER = + public static RegistryObject> NETHER_SMOKER = TILE_ENTITY_TYPES.register("nether_smoker", - () -> TileEntityType.Builder.of(NetherSmokerTileEntity::new, + () -> BlockEntityType.Builder.of(NetherSmokerTileEntity::new, ModBlocks.nether_smoker.get()).build(null)); - public static RegistryObject> NETHER_BLAST_FURNACE = + public static RegistryObject> NETHER_BLAST_FURNACE = TILE_ENTITY_TYPES.register("nether_blast_furnace", - () -> TileEntityType.Builder.of(NetherBlastFurnaceTileEntity::new, + () -> BlockEntityType.Builder.of(NetherBlastFurnaceTileEntity::new, ModBlocks.nether_blast_furnace.get()).build(null)); } // end class ModTiles diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index 4d567991..c41568a8 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/mods.toml @@ -3,7 +3,7 @@ modLoader="javafml" #mandatory # A version range to match for said mod loader - for regular FML @Mod it will be the forge version -loaderVersion="[36,)" #mandatory +loaderVersion="[37,)" #mandatory issueTrackerURL="https://github.com/Sinhika/Netherrocks/issues" license="LGPL 3.0" logoFile="netherrocks.png" @@ -25,34 +25,34 @@ Additional Credits: AzazEL3095 (Spanish translation) [[dependencies.netherrocks]] #optional modId="forge" mandatory=true - versionRange="[36.1.0,)" + versionRange="[37.0.46,)" ordering="NONE" side="BOTH" [[dependencies.netherrocks]] modId="minecraft" mandatory=true - versionRange="[1.16.5,1.17)" + versionRange="[1.17.1,1.18)" ordering="NONE" side="BOTH" [[dependencies.netherrocks]] modId="simplecorelib" mandatory=true - versionRange="[1.16.5-2.0.8.22,1.16.5-2.0.9.0)" + versionRange="[1.17.1-3.0.4.0,1.17.1-3.1.0.0)" ordering="NONE" side="BOTH" -[[dependencies.netherrocks]] - modId="silents_mechanisms" - mandatory=false - versionRange="[0.8.9,)" - ordering="BEFORE" - side="BOTH" - -[[dependencies.netherrocks]] - modId="silentgear" - mandatory=false - versionRange="[2.5.2,)" - ordering="BEFORE" - side="BOTH" +# [[dependencies.netherrocks]] +# modId="silents_mechanisms" +# mandatory=false +# versionRange="[0.8.9,)" +# ordering="BEFORE" +# side="BOTH" +# +# [[dependencies.netherrocks]] +# modId="silentgear" +# mandatory=false +# versionRange="[2.5.2,)" +# ordering="BEFORE" +# side="BOTH" diff --git a/src/main/resources/assets/netherrocks/blockstates/argonite_bars.json b/src/main/resources/assets/netherrocks/blockstates/argonite_bars.json new file mode 100644 index 00000000..2eff2872 --- /dev/null +++ b/src/main/resources/assets/netherrocks/blockstates/argonite_bars.json @@ -0,0 +1,32 @@ +{ + "multipart": [ + { "apply": { "model": "netherrocks:block/argonite_bars_post_ends" }}, + { "when": { "north": false, "east": false, "south": false, "west": false }, + "apply": { "model": "netherrocks:block/argonite_bars_post" } + }, + { "when": { "north": true, "east": false, "south": false, "west": false }, + "apply": { "model": "netherrocks:block/argonite_bars_cap" } + }, + { "when": { "north": false, "east": true, "south": false, "west": false }, + "apply": { "model": "netherrocks:block/argonite_bars_cap", "y": 90 } + }, + { "when": { "north": false, "east": false, "south": true, "west": false }, + "apply": { "model": "netherrocks:block/argonite_bars_cap_alt" } + }, + { "when": { "north": false, "east": false, "south": false, "west": true }, + "apply": { "model": "netherrocks:block/argonite_bars_cap_alt", "y": 90 } + }, + { "when": { "north": true }, + "apply": { "model": "netherrocks:block/argonite_bars_side" } + }, + { "when": { "east": true }, + "apply": { "model": "netherrocks:block/argonite_bars_side", "y": 90 } + }, + { "when": { "south": true }, + "apply": { "model": "netherrocks:block/argonite_bars_side_alt" } + }, + { "when": { "west": true }, + "apply": { "model": "netherrocks:block/argonite_bars_side_alt", "y": 90 } + } + ] +} diff --git a/src/main/resources/assets/netherrocks/blockstates/argonite_brick_slab.json b/src/main/resources/assets/netherrocks/blockstates/argonite_brick_slab.json new file mode 100644 index 00000000..2f729823 --- /dev/null +++ b/src/main/resources/assets/netherrocks/blockstates/argonite_brick_slab.json @@ -0,0 +1,13 @@ +{ + "variants": { + "type=bottom": { + "model": "netherrocks:block/argonite_brick_slab" + }, + "type=double": { + "model": "netherrocks:block/argonite_bricks" + }, + "type=top": { + "model": "netherrocks:block/argonite_brick_slab_top" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/netherrocks/blockstates/argonite_brick_stairs.json b/src/main/resources/assets/netherrocks/blockstates/argonite_brick_stairs.json new file mode 100644 index 00000000..29a90af6 --- /dev/null +++ b/src/main/resources/assets/netherrocks/blockstates/argonite_brick_stairs.json @@ -0,0 +1,44 @@ +{ + "variants": { + "facing=east,half=bottom,shape=straight": { "model": "netherrocks:block/argonite_brick_stairs" }, + "facing=west,half=bottom,shape=straight": { "model": "netherrocks:block/argonite_brick_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "netherrocks:block/argonite_brick_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "netherrocks:block/argonite_brick_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "netherrocks:block/argonite_brick_outer_stairs" }, + "facing=west,half=bottom,shape=outer_right": { "model": "netherrocks:block/argonite_brick_outer_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "netherrocks:block/argonite_brick_outer_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "netherrocks:block/argonite_brick_outer_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "netherrocks:block/argonite_brick_outer_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "netherrocks:block/argonite_brick_outer_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "netherrocks:block/argonite_brick_outer_stairs" }, + "facing=north,half=bottom,shape=outer_left": { "model": "netherrocks:block/argonite_brick_outer_stairs", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "netherrocks:block/argonite_brick_inner_stairs" }, + "facing=west,half=bottom,shape=inner_right": { "model": "netherrocks:block/argonite_brick_inner_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "netherrocks:block/argonite_brick_inner_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "netherrocks:block/argonite_brick_inner_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "netherrocks:block/argonite_brick_inner_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "netherrocks:block/argonite_brick_inner_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "netherrocks:block/argonite_brick_inner_stairs" }, + "facing=north,half=bottom,shape=inner_left": { "model": "netherrocks:block/argonite_brick_inner_stairs", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight": { "model": "netherrocks:block/argonite_brick_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight": { "model": "netherrocks:block/argonite_brick_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight": { "model": "netherrocks:block/argonite_brick_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight": { "model": "netherrocks:block/argonite_brick_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "netherrocks:block/argonite_brick_outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "netherrocks:block/argonite_brick_outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "netherrocks:block/argonite_brick_outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "netherrocks:block/argonite_brick_outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "netherrocks:block/argonite_brick_outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "netherrocks:block/argonite_brick_outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "netherrocks:block/argonite_brick_outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "netherrocks:block/argonite_brick_outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "netherrocks:block/argonite_brick_inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "netherrocks:block/argonite_brick_inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "netherrocks:block/argonite_brick_inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "netherrocks:block/argonite_brick_inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "netherrocks:block/argonite_brick_inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "netherrocks:block/argonite_brick_inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "netherrocks:block/argonite_brick_inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "netherrocks:block/argonite_brick_inner_stairs", "x": 180, "y": 270, "uvlock": true } + } +} diff --git a/src/main/resources/assets/netherrocks/blockstates/argonite_bricks.json b/src/main/resources/assets/netherrocks/blockstates/argonite_bricks.json new file mode 100644 index 00000000..56795aeb --- /dev/null +++ b/src/main/resources/assets/netherrocks/blockstates/argonite_bricks.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "netherrocks:block/argonite_bricks" } + } +} diff --git a/src/main/resources/assets/netherrocks/blockstates/argonite_door.json b/src/main/resources/assets/netherrocks/blockstates/argonite_door.json new file mode 100644 index 00000000..66a31395 --- /dev/null +++ b/src/main/resources/assets/netherrocks/blockstates/argonite_door.json @@ -0,0 +1,36 @@ +{ + "variants": { + "facing=east,half=lower,hinge=left,open=false": { "model": "netherrocks:block/argonite_door_bottom" }, + "facing=south,half=lower,hinge=left,open=false": { "model": "netherrocks:block/argonite_door_bottom", "y": 90 }, + "facing=west,half=lower,hinge=left,open=false": { "model": "netherrocks:block/argonite_door_bottom", "y": 180 }, + "facing=north,half=lower,hinge=left,open=false": { "model": "netherrocks:block/argonite_door_bottom", "y": 270 }, + "facing=east,half=lower,hinge=right,open=false": { "model": "netherrocks:block/argonite_door_bottom_rh" }, + "facing=south,half=lower,hinge=right,open=false": { "model": "netherrocks:block/argonite_door_bottom_rh", "y": 90 }, + "facing=west,half=lower,hinge=right,open=false": { "model": "netherrocks:block/argonite_door_bottom_rh", "y": 180 }, + "facing=north,half=lower,hinge=right,open=false": { "model": "netherrocks:block/argonite_door_bottom_rh", "y": 270 }, + "facing=east,half=lower,hinge=left,open=true": { "model": "netherrocks:block/argonite_door_bottom_rh", "y": 90 }, + "facing=south,half=lower,hinge=left,open=true": { "model": "netherrocks:block/argonite_door_bottom_rh", "y": 180 }, + "facing=west,half=lower,hinge=left,open=true": { "model": "netherrocks:block/argonite_door_bottom_rh", "y": 270 }, + "facing=north,half=lower,hinge=left,open=true": { "model": "netherrocks:block/argonite_door_bottom_rh" }, + "facing=east,half=lower,hinge=right,open=true": { "model": "netherrocks:block/argonite_door_bottom", "y": 270 }, + "facing=south,half=lower,hinge=right,open=true": { "model": "netherrocks:block/argonite_door_bottom" }, + "facing=west,half=lower,hinge=right,open=true": { "model": "netherrocks:block/argonite_door_bottom", "y": 90 }, + "facing=north,half=lower,hinge=right,open=true": { "model": "netherrocks:block/argonite_door_bottom", "y": 180 }, + "facing=east,half=upper,hinge=left,open=false": { "model": "netherrocks:block/argonite_door_top" }, + "facing=south,half=upper,hinge=left,open=false": { "model": "netherrocks:block/argonite_door_top", "y": 90 }, + "facing=west,half=upper,hinge=left,open=false": { "model": "netherrocks:block/argonite_door_top", "y": 180 }, + "facing=north,half=upper,hinge=left,open=false": { "model": "netherrocks:block/argonite_door_top", "y": 270 }, + "facing=east,half=upper,hinge=right,open=false": { "model": "netherrocks:block/argonite_door_top_rh" }, + "facing=south,half=upper,hinge=right,open=false": { "model": "netherrocks:block/argonite_door_top_rh", "y": 90 }, + "facing=west,half=upper,hinge=right,open=false": { "model": "netherrocks:block/argonite_door_top_rh", "y": 180 }, + "facing=north,half=upper,hinge=right,open=false": { "model": "netherrocks:block/argonite_door_top_rh", "y": 270 }, + "facing=east,half=upper,hinge=left,open=true": { "model": "netherrocks:block/argonite_door_top_rh", "y": 90 }, + "facing=south,half=upper,hinge=left,open=true": { "model": "netherrocks:block/argonite_door_top_rh", "y": 180 }, + "facing=west,half=upper,hinge=left,open=true": { "model": "netherrocks:block/argonite_door_top_rh", "y": 270 }, + "facing=north,half=upper,hinge=left,open=true": { "model": "netherrocks:block/argonite_door_top_rh" }, + "facing=east,half=upper,hinge=right,open=true": { "model": "netherrocks:block/argonite_door_top", "y": 270 }, + "facing=south,half=upper,hinge=right,open=true": { "model": "netherrocks:block/argonite_door_top" }, + "facing=west,half=upper,hinge=right,open=true": { "model": "netherrocks:block/argonite_door_top", "y": 90 }, + "facing=north,half=upper,hinge=right,open=true": { "model": "netherrocks:block/argonite_door_top", "y": 180 } + } +} diff --git a/src/main/resources/assets/netherrocks/blockstates/ashstone_bars.json b/src/main/resources/assets/netherrocks/blockstates/ashstone_bars.json new file mode 100644 index 00000000..33369915 --- /dev/null +++ b/src/main/resources/assets/netherrocks/blockstates/ashstone_bars.json @@ -0,0 +1,32 @@ +{ + "multipart": [ + { "apply": { "model": "netherrocks:block/ashstone_bars_post_ends" }}, + { "when": { "north": false, "east": false, "south": false, "west": false }, + "apply": { "model": "netherrocks:block/ashstone_bars_post" } + }, + { "when": { "north": true, "east": false, "south": false, "west": false }, + "apply": { "model": "netherrocks:block/ashstone_bars_cap" } + }, + { "when": { "north": false, "east": true, "south": false, "west": false }, + "apply": { "model": "netherrocks:block/ashstone_bars_cap", "y": 90 } + }, + { "when": { "north": false, "east": false, "south": true, "west": false }, + "apply": { "model": "netherrocks:block/ashstone_bars_cap_alt" } + }, + { "when": { "north": false, "east": false, "south": false, "west": true }, + "apply": { "model": "netherrocks:block/ashstone_bars_cap_alt", "y": 90 } + }, + { "when": { "north": true }, + "apply": { "model": "netherrocks:block/ashstone_bars_side" } + }, + { "when": { "east": true }, + "apply": { "model": "netherrocks:block/ashstone_bars_side", "y": 90 } + }, + { "when": { "south": true }, + "apply": { "model": "netherrocks:block/ashstone_bars_side_alt" } + }, + { "when": { "west": true }, + "apply": { "model": "netherrocks:block/ashstone_bars_side_alt", "y": 90 } + } + ] +} diff --git a/src/main/resources/assets/netherrocks/blockstates/ashstone_brick_slab.json b/src/main/resources/assets/netherrocks/blockstates/ashstone_brick_slab.json new file mode 100644 index 00000000..80bbf636 --- /dev/null +++ b/src/main/resources/assets/netherrocks/blockstates/ashstone_brick_slab.json @@ -0,0 +1,13 @@ +{ + "variants": { + "type=bottom": { + "model": "netherrocks:block/ashstone_brick_slab" + }, + "type=double": { + "model": "netherrocks:block/ashstone_bricks" + }, + "type=top": { + "model": "netherrocks:block/ashstone_brick_slab_top" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/netherrocks/blockstates/ashstone_brick_stairs.json b/src/main/resources/assets/netherrocks/blockstates/ashstone_brick_stairs.json new file mode 100644 index 00000000..30ffd7f8 --- /dev/null +++ b/src/main/resources/assets/netherrocks/blockstates/ashstone_brick_stairs.json @@ -0,0 +1,44 @@ +{ + "variants": { + "facing=east,half=bottom,shape=straight": { "model": "netherrocks:block/ashstone_brick_stairs" }, + "facing=west,half=bottom,shape=straight": { "model": "netherrocks:block/ashstone_brick_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "netherrocks:block/ashstone_brick_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "netherrocks:block/ashstone_brick_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "netherrocks:block/ashstone_brick_outer_stairs" }, + "facing=west,half=bottom,shape=outer_right": { "model": "netherrocks:block/ashstone_brick_outer_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "netherrocks:block/ashstone_brick_outer_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "netherrocks:block/ashstone_brick_outer_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "netherrocks:block/ashstone_brick_outer_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "netherrocks:block/ashstone_brick_outer_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "netherrocks:block/ashstone_brick_outer_stairs" }, + "facing=north,half=bottom,shape=outer_left": { "model": "netherrocks:block/ashstone_brick_outer_stairs", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "netherrocks:block/ashstone_brick_inner_stairs" }, + "facing=west,half=bottom,shape=inner_right": { "model": "netherrocks:block/ashstone_brick_inner_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "netherrocks:block/ashstone_brick_inner_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "netherrocks:block/ashstone_brick_inner_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "netherrocks:block/ashstone_brick_inner_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "netherrocks:block/ashstone_brick_inner_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "netherrocks:block/ashstone_brick_inner_stairs" }, + "facing=north,half=bottom,shape=inner_left": { "model": "netherrocks:block/ashstone_brick_inner_stairs", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight": { "model": "netherrocks:block/ashstone_brick_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight": { "model": "netherrocks:block/ashstone_brick_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight": { "model": "netherrocks:block/ashstone_brick_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight": { "model": "netherrocks:block/ashstone_brick_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "netherrocks:block/ashstone_brick_outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "netherrocks:block/ashstone_brick_outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "netherrocks:block/ashstone_brick_outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "netherrocks:block/ashstone_brick_outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "netherrocks:block/ashstone_brick_outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "netherrocks:block/ashstone_brick_outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "netherrocks:block/ashstone_brick_outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "netherrocks:block/ashstone_brick_outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "netherrocks:block/ashstone_brick_inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "netherrocks:block/ashstone_brick_inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "netherrocks:block/ashstone_brick_inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "netherrocks:block/ashstone_brick_inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "netherrocks:block/ashstone_brick_inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "netherrocks:block/ashstone_brick_inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "netherrocks:block/ashstone_brick_inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "netherrocks:block/ashstone_brick_inner_stairs", "x": 180, "y": 270, "uvlock": true } + } +} diff --git a/src/main/resources/assets/netherrocks/blockstates/ashstone_bricks.json b/src/main/resources/assets/netherrocks/blockstates/ashstone_bricks.json new file mode 100644 index 00000000..df31103f --- /dev/null +++ b/src/main/resources/assets/netherrocks/blockstates/ashstone_bricks.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "netherrocks:block/ashstone_bricks" } + } +} diff --git a/src/main/resources/assets/netherrocks/blockstates/ashstone_door.json b/src/main/resources/assets/netherrocks/blockstates/ashstone_door.json new file mode 100644 index 00000000..76fb9929 --- /dev/null +++ b/src/main/resources/assets/netherrocks/blockstates/ashstone_door.json @@ -0,0 +1,36 @@ +{ + "variants": { + "facing=east,half=lower,hinge=left,open=false": { "model": "netherrocks:block/ashstone_door_bottom" }, + "facing=south,half=lower,hinge=left,open=false": { "model": "netherrocks:block/ashstone_door_bottom", "y": 90 }, + "facing=west,half=lower,hinge=left,open=false": { "model": "netherrocks:block/ashstone_door_bottom", "y": 180 }, + "facing=north,half=lower,hinge=left,open=false": { "model": "netherrocks:block/ashstone_door_bottom", "y": 270 }, + "facing=east,half=lower,hinge=right,open=false": { "model": "netherrocks:block/ashstone_door_bottom_rh" }, + "facing=south,half=lower,hinge=right,open=false": { "model": "netherrocks:block/ashstone_door_bottom_rh", "y": 90 }, + "facing=west,half=lower,hinge=right,open=false": { "model": "netherrocks:block/ashstone_door_bottom_rh", "y": 180 }, + "facing=north,half=lower,hinge=right,open=false": { "model": "netherrocks:block/ashstone_door_bottom_rh", "y": 270 }, + "facing=east,half=lower,hinge=left,open=true": { "model": "netherrocks:block/ashstone_door_bottom_rh", "y": 90 }, + "facing=south,half=lower,hinge=left,open=true": { "model": "netherrocks:block/ashstone_door_bottom_rh", "y": 180 }, + "facing=west,half=lower,hinge=left,open=true": { "model": "netherrocks:block/ashstone_door_bottom_rh", "y": 270 }, + "facing=north,half=lower,hinge=left,open=true": { "model": "netherrocks:block/ashstone_door_bottom_rh" }, + "facing=east,half=lower,hinge=right,open=true": { "model": "netherrocks:block/ashstone_door_bottom", "y": 270 }, + "facing=south,half=lower,hinge=right,open=true": { "model": "netherrocks:block/ashstone_door_bottom" }, + "facing=west,half=lower,hinge=right,open=true": { "model": "netherrocks:block/ashstone_door_bottom", "y": 90 }, + "facing=north,half=lower,hinge=right,open=true": { "model": "netherrocks:block/ashstone_door_bottom", "y": 180 }, + "facing=east,half=upper,hinge=left,open=false": { "model": "netherrocks:block/ashstone_door_top" }, + "facing=south,half=upper,hinge=left,open=false": { "model": "netherrocks:block/ashstone_door_top", "y": 90 }, + "facing=west,half=upper,hinge=left,open=false": { "model": "netherrocks:block/ashstone_door_top", "y": 180 }, + "facing=north,half=upper,hinge=left,open=false": { "model": "netherrocks:block/ashstone_door_top", "y": 270 }, + "facing=east,half=upper,hinge=right,open=false": { "model": "netherrocks:block/ashstone_door_top_rh" }, + "facing=south,half=upper,hinge=right,open=false": { "model": "netherrocks:block/ashstone_door_top_rh", "y": 90 }, + "facing=west,half=upper,hinge=right,open=false": { "model": "netherrocks:block/ashstone_door_top_rh", "y": 180 }, + "facing=north,half=upper,hinge=right,open=false": { "model": "netherrocks:block/ashstone_door_top_rh", "y": 270 }, + "facing=east,half=upper,hinge=left,open=true": { "model": "netherrocks:block/ashstone_door_top_rh", "y": 90 }, + "facing=south,half=upper,hinge=left,open=true": { "model": "netherrocks:block/ashstone_door_top_rh", "y": 180 }, + "facing=west,half=upper,hinge=left,open=true": { "model": "netherrocks:block/ashstone_door_top_rh", "y": 270 }, + "facing=north,half=upper,hinge=left,open=true": { "model": "netherrocks:block/ashstone_door_top_rh" }, + "facing=east,half=upper,hinge=right,open=true": { "model": "netherrocks:block/ashstone_door_top", "y": 270 }, + "facing=south,half=upper,hinge=right,open=true": { "model": "netherrocks:block/ashstone_door_top" }, + "facing=west,half=upper,hinge=right,open=true": { "model": "netherrocks:block/ashstone_door_top", "y": 90 }, + "facing=north,half=upper,hinge=right,open=true": { "model": "netherrocks:block/ashstone_door_top", "y": 180 } + } +} diff --git a/src/main/resources/assets/netherrocks/blockstates/dragonstone_bars.json b/src/main/resources/assets/netherrocks/blockstates/dragonstone_bars.json new file mode 100644 index 00000000..962656fd --- /dev/null +++ b/src/main/resources/assets/netherrocks/blockstates/dragonstone_bars.json @@ -0,0 +1,32 @@ +{ + "multipart": [ + { "apply": { "model": "netherrocks:block/dragonstone_bars_post_ends" }}, + { "when": { "north": false, "east": false, "south": false, "west": false }, + "apply": { "model": "netherrocks:block/dragonstone_bars_post" } + }, + { "when": { "north": true, "east": false, "south": false, "west": false }, + "apply": { "model": "netherrocks:block/dragonstone_bars_cap" } + }, + { "when": { "north": false, "east": true, "south": false, "west": false }, + "apply": { "model": "netherrocks:block/dragonstone_bars_cap", "y": 90 } + }, + { "when": { "north": false, "east": false, "south": true, "west": false }, + "apply": { "model": "netherrocks:block/dragonstone_bars_cap_alt" } + }, + { "when": { "north": false, "east": false, "south": false, "west": true }, + "apply": { "model": "netherrocks:block/dragonstone_bars_cap_alt", "y": 90 } + }, + { "when": { "north": true }, + "apply": { "model": "netherrocks:block/dragonstone_bars_side" } + }, + { "when": { "east": true }, + "apply": { "model": "netherrocks:block/dragonstone_bars_side", "y": 90 } + }, + { "when": { "south": true }, + "apply": { "model": "netherrocks:block/dragonstone_bars_side_alt" } + }, + { "when": { "west": true }, + "apply": { "model": "netherrocks:block/dragonstone_bars_side_alt", "y": 90 } + } + ] +} diff --git a/src/main/resources/assets/netherrocks/blockstates/dragonstone_brick_slab.json b/src/main/resources/assets/netherrocks/blockstates/dragonstone_brick_slab.json new file mode 100644 index 00000000..d3758f59 --- /dev/null +++ b/src/main/resources/assets/netherrocks/blockstates/dragonstone_brick_slab.json @@ -0,0 +1,13 @@ +{ + "variants": { + "type=bottom": { + "model": "netherrocks:block/dragonstone_brick_slab" + }, + "type=double": { + "model": "netherrocks:block/dragonstone_bricks" + }, + "type=top": { + "model": "netherrocks:block/dragonstone_brick_slab_top" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/netherrocks/blockstates/dragonstone_brick_stairs.json b/src/main/resources/assets/netherrocks/blockstates/dragonstone_brick_stairs.json new file mode 100644 index 00000000..11486c7e --- /dev/null +++ b/src/main/resources/assets/netherrocks/blockstates/dragonstone_brick_stairs.json @@ -0,0 +1,44 @@ +{ + "variants": { + "facing=east,half=bottom,shape=straight": { "model": "netherrocks:block/dragonstone_brick_stairs" }, + "facing=west,half=bottom,shape=straight": { "model": "netherrocks:block/dragonstone_brick_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "netherrocks:block/dragonstone_brick_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "netherrocks:block/dragonstone_brick_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "netherrocks:block/dragonstone_brick_outer_stairs" }, + "facing=west,half=bottom,shape=outer_right": { "model": "netherrocks:block/dragonstone_brick_outer_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "netherrocks:block/dragonstone_brick_outer_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "netherrocks:block/dragonstone_brick_outer_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "netherrocks:block/dragonstone_brick_outer_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "netherrocks:block/dragonstone_brick_outer_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "netherrocks:block/dragonstone_brick_outer_stairs" }, + "facing=north,half=bottom,shape=outer_left": { "model": "netherrocks:block/dragonstone_brick_outer_stairs", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "netherrocks:block/dragonstone_brick_inner_stairs" }, + "facing=west,half=bottom,shape=inner_right": { "model": "netherrocks:block/dragonstone_brick_inner_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "netherrocks:block/dragonstone_brick_inner_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "netherrocks:block/dragonstone_brick_inner_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "netherrocks:block/dragonstone_brick_inner_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "netherrocks:block/dragonstone_brick_inner_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "netherrocks:block/dragonstone_brick_inner_stairs" }, + "facing=north,half=bottom,shape=inner_left": { "model": "netherrocks:block/dragonstone_brick_inner_stairs", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight": { "model": "netherrocks:block/dragonstone_brick_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight": { "model": "netherrocks:block/dragonstone_brick_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight": { "model": "netherrocks:block/dragonstone_brick_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight": { "model": "netherrocks:block/dragonstone_brick_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "netherrocks:block/dragonstone_brick_outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "netherrocks:block/dragonstone_brick_outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "netherrocks:block/dragonstone_brick_outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "netherrocks:block/dragonstone_brick_outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "netherrocks:block/dragonstone_brick_outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "netherrocks:block/dragonstone_brick_outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "netherrocks:block/dragonstone_brick_outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "netherrocks:block/dragonstone_brick_outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "netherrocks:block/dragonstone_brick_inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "netherrocks:block/dragonstone_brick_inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "netherrocks:block/dragonstone_brick_inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "netherrocks:block/dragonstone_brick_inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "netherrocks:block/dragonstone_brick_inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "netherrocks:block/dragonstone_brick_inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "netherrocks:block/dragonstone_brick_inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "netherrocks:block/dragonstone_brick_inner_stairs", "x": 180, "y": 270, "uvlock": true } + } +} diff --git a/src/main/resources/assets/netherrocks/blockstates/dragonstone_bricks.json b/src/main/resources/assets/netherrocks/blockstates/dragonstone_bricks.json new file mode 100644 index 00000000..4bafa4f6 --- /dev/null +++ b/src/main/resources/assets/netherrocks/blockstates/dragonstone_bricks.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "netherrocks:block/dragonstone_bricks" } + } +} diff --git a/src/main/resources/assets/netherrocks/blockstates/dragonstone_door.json b/src/main/resources/assets/netherrocks/blockstates/dragonstone_door.json new file mode 100644 index 00000000..f2d6d31b --- /dev/null +++ b/src/main/resources/assets/netherrocks/blockstates/dragonstone_door.json @@ -0,0 +1,36 @@ +{ + "variants": { + "facing=east,half=lower,hinge=left,open=false": { "model": "netherrocks:block/dragonstone_door_bottom" }, + "facing=south,half=lower,hinge=left,open=false": { "model": "netherrocks:block/dragonstone_door_bottom", "y": 90 }, + "facing=west,half=lower,hinge=left,open=false": { "model": "netherrocks:block/dragonstone_door_bottom", "y": 180 }, + "facing=north,half=lower,hinge=left,open=false": { "model": "netherrocks:block/dragonstone_door_bottom", "y": 270 }, + "facing=east,half=lower,hinge=right,open=false": { "model": "netherrocks:block/dragonstone_door_bottom_rh" }, + "facing=south,half=lower,hinge=right,open=false": { "model": "netherrocks:block/dragonstone_door_bottom_rh", "y": 90 }, + "facing=west,half=lower,hinge=right,open=false": { "model": "netherrocks:block/dragonstone_door_bottom_rh", "y": 180 }, + "facing=north,half=lower,hinge=right,open=false": { "model": "netherrocks:block/dragonstone_door_bottom_rh", "y": 270 }, + "facing=east,half=lower,hinge=left,open=true": { "model": "netherrocks:block/dragonstone_door_bottom_rh", "y": 90 }, + "facing=south,half=lower,hinge=left,open=true": { "model": "netherrocks:block/dragonstone_door_bottom_rh", "y": 180 }, + "facing=west,half=lower,hinge=left,open=true": { "model": "netherrocks:block/dragonstone_door_bottom_rh", "y": 270 }, + "facing=north,half=lower,hinge=left,open=true": { "model": "netherrocks:block/dragonstone_door_bottom_rh" }, + "facing=east,half=lower,hinge=right,open=true": { "model": "netherrocks:block/dragonstone_door_bottom", "y": 270 }, + "facing=south,half=lower,hinge=right,open=true": { "model": "netherrocks:block/dragonstone_door_bottom" }, + "facing=west,half=lower,hinge=right,open=true": { "model": "netherrocks:block/dragonstone_door_bottom", "y": 90 }, + "facing=north,half=lower,hinge=right,open=true": { "model": "netherrocks:block/dragonstone_door_bottom", "y": 180 }, + "facing=east,half=upper,hinge=left,open=false": { "model": "netherrocks:block/dragonstone_door_top" }, + "facing=south,half=upper,hinge=left,open=false": { "model": "netherrocks:block/dragonstone_door_top", "y": 90 }, + "facing=west,half=upper,hinge=left,open=false": { "model": "netherrocks:block/dragonstone_door_top", "y": 180 }, + "facing=north,half=upper,hinge=left,open=false": { "model": "netherrocks:block/dragonstone_door_top", "y": 270 }, + "facing=east,half=upper,hinge=right,open=false": { "model": "netherrocks:block/dragonstone_door_top_rh" }, + "facing=south,half=upper,hinge=right,open=false": { "model": "netherrocks:block/dragonstone_door_top_rh", "y": 90 }, + "facing=west,half=upper,hinge=right,open=false": { "model": "netherrocks:block/dragonstone_door_top_rh", "y": 180 }, + "facing=north,half=upper,hinge=right,open=false": { "model": "netherrocks:block/dragonstone_door_top_rh", "y": 270 }, + "facing=east,half=upper,hinge=left,open=true": { "model": "netherrocks:block/dragonstone_door_top_rh", "y": 90 }, + "facing=south,half=upper,hinge=left,open=true": { "model": "netherrocks:block/dragonstone_door_top_rh", "y": 180 }, + "facing=west,half=upper,hinge=left,open=true": { "model": "netherrocks:block/dragonstone_door_top_rh", "y": 270 }, + "facing=north,half=upper,hinge=left,open=true": { "model": "netherrocks:block/dragonstone_door_top_rh" }, + "facing=east,half=upper,hinge=right,open=true": { "model": "netherrocks:block/dragonstone_door_top", "y": 270 }, + "facing=south,half=upper,hinge=right,open=true": { "model": "netherrocks:block/dragonstone_door_top" }, + "facing=west,half=upper,hinge=right,open=true": { "model": "netherrocks:block/dragonstone_door_top", "y": 90 }, + "facing=north,half=upper,hinge=right,open=true": { "model": "netherrocks:block/dragonstone_door_top", "y": 180 } + } +} diff --git a/src/main/resources/assets/netherrocks/blockstates/fyrite_bars.json b/src/main/resources/assets/netherrocks/blockstates/fyrite_bars.json new file mode 100644 index 00000000..bfc5db24 --- /dev/null +++ b/src/main/resources/assets/netherrocks/blockstates/fyrite_bars.json @@ -0,0 +1,32 @@ +{ + "multipart": [ + { "apply": { "model": "netherrocks:block/fyrite_bars_post_ends" }}, + { "when": { "north": false, "east": false, "south": false, "west": false }, + "apply": { "model": "netherrocks:block/fyrite_bars_post" } + }, + { "when": { "north": true, "east": false, "south": false, "west": false }, + "apply": { "model": "netherrocks:block/fyrite_bars_cap" } + }, + { "when": { "north": false, "east": true, "south": false, "west": false }, + "apply": { "model": "netherrocks:block/fyrite_bars_cap", "y": 90 } + }, + { "when": { "north": false, "east": false, "south": true, "west": false }, + "apply": { "model": "netherrocks:block/fyrite_bars_cap_alt" } + }, + { "when": { "north": false, "east": false, "south": false, "west": true }, + "apply": { "model": "netherrocks:block/fyrite_bars_cap_alt", "y": 90 } + }, + { "when": { "north": true }, + "apply": { "model": "netherrocks:block/fyrite_bars_side" } + }, + { "when": { "east": true }, + "apply": { "model": "netherrocks:block/fyrite_bars_side", "y": 90 } + }, + { "when": { "south": true }, + "apply": { "model": "netherrocks:block/fyrite_bars_side_alt" } + }, + { "when": { "west": true }, + "apply": { "model": "netherrocks:block/fyrite_bars_side_alt", "y": 90 } + } + ] +} diff --git a/src/main/resources/assets/netherrocks/blockstates/fyrite_brick_slab.json b/src/main/resources/assets/netherrocks/blockstates/fyrite_brick_slab.json new file mode 100644 index 00000000..6113729d --- /dev/null +++ b/src/main/resources/assets/netherrocks/blockstates/fyrite_brick_slab.json @@ -0,0 +1,13 @@ +{ + "variants": { + "type=bottom": { + "model": "netherrocks:block/fyrite_brick_slab" + }, + "type=double": { + "model": "netherrocks:block/fyrite_bricks" + }, + "type=top": { + "model": "netherrocks:block/fyrite_brick_slab_top" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/netherrocks/blockstates/fyrite_brick_stairs.json b/src/main/resources/assets/netherrocks/blockstates/fyrite_brick_stairs.json new file mode 100644 index 00000000..00e52b51 --- /dev/null +++ b/src/main/resources/assets/netherrocks/blockstates/fyrite_brick_stairs.json @@ -0,0 +1,44 @@ +{ + "variants": { + "facing=east,half=bottom,shape=straight": { "model": "netherrocks:block/fyrite_brick_stairs" }, + "facing=west,half=bottom,shape=straight": { "model": "netherrocks:block/fyrite_brick_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "netherrocks:block/fyrite_brick_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "netherrocks:block/fyrite_brick_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "netherrocks:block/fyrite_brick_outer_stairs" }, + "facing=west,half=bottom,shape=outer_right": { "model": "netherrocks:block/fyrite_brick_outer_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "netherrocks:block/fyrite_brick_outer_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "netherrocks:block/fyrite_brick_outer_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "netherrocks:block/fyrite_brick_outer_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "netherrocks:block/fyrite_brick_outer_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "netherrocks:block/fyrite_brick_outer_stairs" }, + "facing=north,half=bottom,shape=outer_left": { "model": "netherrocks:block/fyrite_brick_outer_stairs", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "netherrocks:block/fyrite_brick_inner_stairs" }, + "facing=west,half=bottom,shape=inner_right": { "model": "netherrocks:block/fyrite_brick_inner_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "netherrocks:block/fyrite_brick_inner_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "netherrocks:block/fyrite_brick_inner_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "netherrocks:block/fyrite_brick_inner_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "netherrocks:block/fyrite_brick_inner_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "netherrocks:block/fyrite_brick_inner_stairs" }, + "facing=north,half=bottom,shape=inner_left": { "model": "netherrocks:block/fyrite_brick_inner_stairs", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight": { "model": "netherrocks:block/fyrite_brick_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight": { "model": "netherrocks:block/fyrite_brick_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight": { "model": "netherrocks:block/fyrite_brick_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight": { "model": "netherrocks:block/fyrite_brick_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "netherrocks:block/fyrite_brick_outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "netherrocks:block/fyrite_brick_outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "netherrocks:block/fyrite_brick_outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "netherrocks:block/fyrite_brick_outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "netherrocks:block/fyrite_brick_outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "netherrocks:block/fyrite_brick_outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "netherrocks:block/fyrite_brick_outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "netherrocks:block/fyrite_brick_outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "netherrocks:block/fyrite_brick_inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "netherrocks:block/fyrite_brick_inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "netherrocks:block/fyrite_brick_inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "netherrocks:block/fyrite_brick_inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "netherrocks:block/fyrite_brick_inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "netherrocks:block/fyrite_brick_inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "netherrocks:block/fyrite_brick_inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "netherrocks:block/fyrite_brick_inner_stairs", "x": 180, "y": 270, "uvlock": true } + } +} diff --git a/src/main/resources/assets/netherrocks/blockstates/fyrite_bricks.json b/src/main/resources/assets/netherrocks/blockstates/fyrite_bricks.json new file mode 100644 index 00000000..0d2573dc --- /dev/null +++ b/src/main/resources/assets/netherrocks/blockstates/fyrite_bricks.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "netherrocks:block/fyrite_bricks" } + } +} diff --git a/src/main/resources/assets/netherrocks/blockstates/fyrite_door.json b/src/main/resources/assets/netherrocks/blockstates/fyrite_door.json new file mode 100644 index 00000000..7ec3ef3f --- /dev/null +++ b/src/main/resources/assets/netherrocks/blockstates/fyrite_door.json @@ -0,0 +1,36 @@ +{ + "variants": { + "facing=east,half=lower,hinge=left,open=false": { "model": "netherrocks:block/fyrite_door_bottom" }, + "facing=south,half=lower,hinge=left,open=false": { "model": "netherrocks:block/fyrite_door_bottom", "y": 90 }, + "facing=west,half=lower,hinge=left,open=false": { "model": "netherrocks:block/fyrite_door_bottom", "y": 180 }, + "facing=north,half=lower,hinge=left,open=false": { "model": "netherrocks:block/fyrite_door_bottom", "y": 270 }, + "facing=east,half=lower,hinge=right,open=false": { "model": "netherrocks:block/fyrite_door_bottom_rh" }, + "facing=south,half=lower,hinge=right,open=false": { "model": "netherrocks:block/fyrite_door_bottom_rh", "y": 90 }, + "facing=west,half=lower,hinge=right,open=false": { "model": "netherrocks:block/fyrite_door_bottom_rh", "y": 180 }, + "facing=north,half=lower,hinge=right,open=false": { "model": "netherrocks:block/fyrite_door_bottom_rh", "y": 270 }, + "facing=east,half=lower,hinge=left,open=true": { "model": "netherrocks:block/fyrite_door_bottom_rh", "y": 90 }, + "facing=south,half=lower,hinge=left,open=true": { "model": "netherrocks:block/fyrite_door_bottom_rh", "y": 180 }, + "facing=west,half=lower,hinge=left,open=true": { "model": "netherrocks:block/fyrite_door_bottom_rh", "y": 270 }, + "facing=north,half=lower,hinge=left,open=true": { "model": "netherrocks:block/fyrite_door_bottom_rh" }, + "facing=east,half=lower,hinge=right,open=true": { "model": "netherrocks:block/fyrite_door_bottom", "y": 270 }, + "facing=south,half=lower,hinge=right,open=true": { "model": "netherrocks:block/fyrite_door_bottom" }, + "facing=west,half=lower,hinge=right,open=true": { "model": "netherrocks:block/fyrite_door_bottom", "y": 90 }, + "facing=north,half=lower,hinge=right,open=true": { "model": "netherrocks:block/fyrite_door_bottom", "y": 180 }, + "facing=east,half=upper,hinge=left,open=false": { "model": "netherrocks:block/fyrite_door_top" }, + "facing=south,half=upper,hinge=left,open=false": { "model": "netherrocks:block/fyrite_door_top", "y": 90 }, + "facing=west,half=upper,hinge=left,open=false": { "model": "netherrocks:block/fyrite_door_top", "y": 180 }, + "facing=north,half=upper,hinge=left,open=false": { "model": "netherrocks:block/fyrite_door_top", "y": 270 }, + "facing=east,half=upper,hinge=right,open=false": { "model": "netherrocks:block/fyrite_door_top_rh" }, + "facing=south,half=upper,hinge=right,open=false": { "model": "netherrocks:block/fyrite_door_top_rh", "y": 90 }, + "facing=west,half=upper,hinge=right,open=false": { "model": "netherrocks:block/fyrite_door_top_rh", "y": 180 }, + "facing=north,half=upper,hinge=right,open=false": { "model": "netherrocks:block/fyrite_door_top_rh", "y": 270 }, + "facing=east,half=upper,hinge=left,open=true": { "model": "netherrocks:block/fyrite_door_top_rh", "y": 90 }, + "facing=south,half=upper,hinge=left,open=true": { "model": "netherrocks:block/fyrite_door_top_rh", "y": 180 }, + "facing=west,half=upper,hinge=left,open=true": { "model": "netherrocks:block/fyrite_door_top_rh", "y": 270 }, + "facing=north,half=upper,hinge=left,open=true": { "model": "netherrocks:block/fyrite_door_top_rh" }, + "facing=east,half=upper,hinge=right,open=true": { "model": "netherrocks:block/fyrite_door_top", "y": 270 }, + "facing=south,half=upper,hinge=right,open=true": { "model": "netherrocks:block/fyrite_door_top" }, + "facing=west,half=upper,hinge=right,open=true": { "model": "netherrocks:block/fyrite_door_top", "y": 90 }, + "facing=north,half=upper,hinge=right,open=true": { "model": "netherrocks:block/fyrite_door_top", "y": 180 } + } +} diff --git a/src/main/resources/assets/netherrocks/blockstates/illumenite_bars.json b/src/main/resources/assets/netherrocks/blockstates/illumenite_bars.json new file mode 100644 index 00000000..bcc20b37 --- /dev/null +++ b/src/main/resources/assets/netherrocks/blockstates/illumenite_bars.json @@ -0,0 +1,32 @@ +{ + "multipart": [ + { "apply": { "model": "netherrocks:block/illumenite_bars_post_ends" }}, + { "when": { "north": false, "east": false, "south": false, "west": false }, + "apply": { "model": "netherrocks:block/illumenite_bars_post" } + }, + { "when": { "north": true, "east": false, "south": false, "west": false }, + "apply": { "model": "netherrocks:block/illumenite_bars_cap" } + }, + { "when": { "north": false, "east": true, "south": false, "west": false }, + "apply": { "model": "netherrocks:block/illumenite_bars_cap", "y": 90 } + }, + { "when": { "north": false, "east": false, "south": true, "west": false }, + "apply": { "model": "netherrocks:block/illumenite_bars_cap_alt" } + }, + { "when": { "north": false, "east": false, "south": false, "west": true }, + "apply": { "model": "netherrocks:block/illumenite_bars_cap_alt", "y": 90 } + }, + { "when": { "north": true }, + "apply": { "model": "netherrocks:block/illumenite_bars_side" } + }, + { "when": { "east": true }, + "apply": { "model": "netherrocks:block/illumenite_bars_side", "y": 90 } + }, + { "when": { "south": true }, + "apply": { "model": "netherrocks:block/illumenite_bars_side_alt" } + }, + { "when": { "west": true }, + "apply": { "model": "netherrocks:block/illumenite_bars_side_alt", "y": 90 } + } + ] +} diff --git a/src/main/resources/assets/netherrocks/blockstates/illumenite_brick_slab.json b/src/main/resources/assets/netherrocks/blockstates/illumenite_brick_slab.json new file mode 100644 index 00000000..790e9f4d --- /dev/null +++ b/src/main/resources/assets/netherrocks/blockstates/illumenite_brick_slab.json @@ -0,0 +1,13 @@ +{ + "variants": { + "type=bottom": { + "model": "netherrocks:block/illumenite_brick_slab" + }, + "type=double": { + "model": "netherrocks:block/illumenite_bricks" + }, + "type=top": { + "model": "netherrocks:block/illumenite_brick_slab_top" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/netherrocks/blockstates/illumenite_brick_stairs.json b/src/main/resources/assets/netherrocks/blockstates/illumenite_brick_stairs.json new file mode 100644 index 00000000..d3e1d622 --- /dev/null +++ b/src/main/resources/assets/netherrocks/blockstates/illumenite_brick_stairs.json @@ -0,0 +1,44 @@ +{ + "variants": { + "facing=east,half=bottom,shape=straight": { "model": "netherrocks:block/illumenite_brick_stairs" }, + "facing=west,half=bottom,shape=straight": { "model": "netherrocks:block/illumenite_brick_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "netherrocks:block/illumenite_brick_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "netherrocks:block/illumenite_brick_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "netherrocks:block/illumenite_brick_outer_stairs" }, + "facing=west,half=bottom,shape=outer_right": { "model": "netherrocks:block/illumenite_brick_outer_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "netherrocks:block/illumenite_brick_outer_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "netherrocks:block/illumenite_brick_outer_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "netherrocks:block/illumenite_brick_outer_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "netherrocks:block/illumenite_brick_outer_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "netherrocks:block/illumenite_brick_outer_stairs" }, + "facing=north,half=bottom,shape=outer_left": { "model": "netherrocks:block/illumenite_brick_outer_stairs", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "netherrocks:block/illumenite_brick_inner_stairs" }, + "facing=west,half=bottom,shape=inner_right": { "model": "netherrocks:block/illumenite_brick_inner_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "netherrocks:block/illumenite_brick_inner_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "netherrocks:block/illumenite_brick_inner_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "netherrocks:block/illumenite_brick_inner_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "netherrocks:block/illumenite_brick_inner_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "netherrocks:block/illumenite_brick_inner_stairs" }, + "facing=north,half=bottom,shape=inner_left": { "model": "netherrocks:block/illumenite_brick_inner_stairs", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight": { "model": "netherrocks:block/illumenite_brick_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight": { "model": "netherrocks:block/illumenite_brick_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight": { "model": "netherrocks:block/illumenite_brick_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight": { "model": "netherrocks:block/illumenite_brick_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "netherrocks:block/illumenite_brick_outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "netherrocks:block/illumenite_brick_outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "netherrocks:block/illumenite_brick_outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "netherrocks:block/illumenite_brick_outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "netherrocks:block/illumenite_brick_outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "netherrocks:block/illumenite_brick_outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "netherrocks:block/illumenite_brick_outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "netherrocks:block/illumenite_brick_outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "netherrocks:block/illumenite_brick_inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "netherrocks:block/illumenite_brick_inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "netherrocks:block/illumenite_brick_inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "netherrocks:block/illumenite_brick_inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "netherrocks:block/illumenite_brick_inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "netherrocks:block/illumenite_brick_inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "netherrocks:block/illumenite_brick_inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "netherrocks:block/illumenite_brick_inner_stairs", "x": 180, "y": 270, "uvlock": true } + } +} diff --git a/src/main/resources/assets/netherrocks/blockstates/illumenite_bricks.json b/src/main/resources/assets/netherrocks/blockstates/illumenite_bricks.json new file mode 100644 index 00000000..31e6827a --- /dev/null +++ b/src/main/resources/assets/netherrocks/blockstates/illumenite_bricks.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "netherrocks:block/illumenite_bricks" } + } +} diff --git a/src/main/resources/assets/netherrocks/blockstates/illumenite_door.json b/src/main/resources/assets/netherrocks/blockstates/illumenite_door.json new file mode 100644 index 00000000..33c46f95 --- /dev/null +++ b/src/main/resources/assets/netherrocks/blockstates/illumenite_door.json @@ -0,0 +1,36 @@ +{ + "variants": { + "facing=east,half=lower,hinge=left,open=false": { "model": "netherrocks:block/illumenite_door_bottom" }, + "facing=south,half=lower,hinge=left,open=false": { "model": "netherrocks:block/illumenite_door_bottom", "y": 90 }, + "facing=west,half=lower,hinge=left,open=false": { "model": "netherrocks:block/illumenite_door_bottom", "y": 180 }, + "facing=north,half=lower,hinge=left,open=false": { "model": "netherrocks:block/illumenite_door_bottom", "y": 270 }, + "facing=east,half=lower,hinge=right,open=false": { "model": "netherrocks:block/illumenite_door_bottom_rh" }, + "facing=south,half=lower,hinge=right,open=false": { "model": "netherrocks:block/illumenite_door_bottom_rh", "y": 90 }, + "facing=west,half=lower,hinge=right,open=false": { "model": "netherrocks:block/illumenite_door_bottom_rh", "y": 180 }, + "facing=north,half=lower,hinge=right,open=false": { "model": "netherrocks:block/illumenite_door_bottom_rh", "y": 270 }, + "facing=east,half=lower,hinge=left,open=true": { "model": "netherrocks:block/illumenite_door_bottom_rh", "y": 90 }, + "facing=south,half=lower,hinge=left,open=true": { "model": "netherrocks:block/illumenite_door_bottom_rh", "y": 180 }, + "facing=west,half=lower,hinge=left,open=true": { "model": "netherrocks:block/illumenite_door_bottom_rh", "y": 270 }, + "facing=north,half=lower,hinge=left,open=true": { "model": "netherrocks:block/illumenite_door_bottom_rh" }, + "facing=east,half=lower,hinge=right,open=true": { "model": "netherrocks:block/illumenite_door_bottom", "y": 270 }, + "facing=south,half=lower,hinge=right,open=true": { "model": "netherrocks:block/illumenite_door_bottom" }, + "facing=west,half=lower,hinge=right,open=true": { "model": "netherrocks:block/illumenite_door_bottom", "y": 90 }, + "facing=north,half=lower,hinge=right,open=true": { "model": "netherrocks:block/illumenite_door_bottom", "y": 180 }, + "facing=east,half=upper,hinge=left,open=false": { "model": "netherrocks:block/illumenite_door_top" }, + "facing=south,half=upper,hinge=left,open=false": { "model": "netherrocks:block/illumenite_door_top", "y": 90 }, + "facing=west,half=upper,hinge=left,open=false": { "model": "netherrocks:block/illumenite_door_top", "y": 180 }, + "facing=north,half=upper,hinge=left,open=false": { "model": "netherrocks:block/illumenite_door_top", "y": 270 }, + "facing=east,half=upper,hinge=right,open=false": { "model": "netherrocks:block/illumenite_door_top_rh" }, + "facing=south,half=upper,hinge=right,open=false": { "model": "netherrocks:block/illumenite_door_top_rh", "y": 90 }, + "facing=west,half=upper,hinge=right,open=false": { "model": "netherrocks:block/illumenite_door_top_rh", "y": 180 }, + "facing=north,half=upper,hinge=right,open=false": { "model": "netherrocks:block/illumenite_door_top_rh", "y": 270 }, + "facing=east,half=upper,hinge=left,open=true": { "model": "netherrocks:block/illumenite_door_top_rh", "y": 90 }, + "facing=south,half=upper,hinge=left,open=true": { "model": "netherrocks:block/illumenite_door_top_rh", "y": 180 }, + "facing=west,half=upper,hinge=left,open=true": { "model": "netherrocks:block/illumenite_door_top_rh", "y": 270 }, + "facing=north,half=upper,hinge=left,open=true": { "model": "netherrocks:block/illumenite_door_top_rh" }, + "facing=east,half=upper,hinge=right,open=true": { "model": "netherrocks:block/illumenite_door_top", "y": 270 }, + "facing=south,half=upper,hinge=right,open=true": { "model": "netherrocks:block/illumenite_door_top" }, + "facing=west,half=upper,hinge=right,open=true": { "model": "netherrocks:block/illumenite_door_top", "y": 90 }, + "facing=north,half=upper,hinge=right,open=true": { "model": "netherrocks:block/illumenite_door_top", "y": 180 } + } +} diff --git a/src/main/resources/assets/netherrocks/blockstates/malachite_bars.json b/src/main/resources/assets/netherrocks/blockstates/malachite_bars.json new file mode 100644 index 00000000..524c19e3 --- /dev/null +++ b/src/main/resources/assets/netherrocks/blockstates/malachite_bars.json @@ -0,0 +1,32 @@ +{ + "multipart": [ + { "apply": { "model": "netherrocks:block/malachite_bars_post_ends" }}, + { "when": { "north": false, "east": false, "south": false, "west": false }, + "apply": { "model": "netherrocks:block/malachite_bars_post" } + }, + { "when": { "north": true, "east": false, "south": false, "west": false }, + "apply": { "model": "netherrocks:block/malachite_bars_cap" } + }, + { "when": { "north": false, "east": true, "south": false, "west": false }, + "apply": { "model": "netherrocks:block/malachite_bars_cap", "y": 90 } + }, + { "when": { "north": false, "east": false, "south": true, "west": false }, + "apply": { "model": "netherrocks:block/malachite_bars_cap_alt" } + }, + { "when": { "north": false, "east": false, "south": false, "west": true }, + "apply": { "model": "netherrocks:block/malachite_bars_cap_alt", "y": 90 } + }, + { "when": { "north": true }, + "apply": { "model": "netherrocks:block/malachite_bars_side" } + }, + { "when": { "east": true }, + "apply": { "model": "netherrocks:block/malachite_bars_side", "y": 90 } + }, + { "when": { "south": true }, + "apply": { "model": "netherrocks:block/malachite_bars_side_alt" } + }, + { "when": { "west": true }, + "apply": { "model": "netherrocks:block/malachite_bars_side_alt", "y": 90 } + } + ] +} diff --git a/src/main/resources/assets/netherrocks/blockstates/malachite_brick_slab.json b/src/main/resources/assets/netherrocks/blockstates/malachite_brick_slab.json new file mode 100644 index 00000000..fdc750e2 --- /dev/null +++ b/src/main/resources/assets/netherrocks/blockstates/malachite_brick_slab.json @@ -0,0 +1,13 @@ +{ + "variants": { + "type=bottom": { + "model": "netherrocks:block/malachite_brick_slab" + }, + "type=double": { + "model": "netherrocks:block/malachite_bricks" + }, + "type=top": { + "model": "netherrocks:block/malachite_brick_slab_top" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/netherrocks/blockstates/malachite_brick_stairs.json b/src/main/resources/assets/netherrocks/blockstates/malachite_brick_stairs.json new file mode 100644 index 00000000..a266ccfb --- /dev/null +++ b/src/main/resources/assets/netherrocks/blockstates/malachite_brick_stairs.json @@ -0,0 +1,44 @@ +{ + "variants": { + "facing=east,half=bottom,shape=straight": { "model": "netherrocks:block/malachite_brick_stairs" }, + "facing=west,half=bottom,shape=straight": { "model": "netherrocks:block/malachite_brick_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "netherrocks:block/malachite_brick_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "netherrocks:block/malachite_brick_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "netherrocks:block/malachite_brick_outer_stairs" }, + "facing=west,half=bottom,shape=outer_right": { "model": "netherrocks:block/malachite_brick_outer_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "netherrocks:block/malachite_brick_outer_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "netherrocks:block/malachite_brick_outer_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "netherrocks:block/malachite_brick_outer_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "netherrocks:block/malachite_brick_outer_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "netherrocks:block/malachite_brick_outer_stairs" }, + "facing=north,half=bottom,shape=outer_left": { "model": "netherrocks:block/malachite_brick_outer_stairs", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "netherrocks:block/malachite_brick_inner_stairs" }, + "facing=west,half=bottom,shape=inner_right": { "model": "netherrocks:block/malachite_brick_inner_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "netherrocks:block/malachite_brick_inner_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "netherrocks:block/malachite_brick_inner_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "netherrocks:block/malachite_brick_inner_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "netherrocks:block/malachite_brick_inner_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "netherrocks:block/malachite_brick_inner_stairs" }, + "facing=north,half=bottom,shape=inner_left": { "model": "netherrocks:block/malachite_brick_inner_stairs", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight": { "model": "netherrocks:block/malachite_brick_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight": { "model": "netherrocks:block/malachite_brick_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight": { "model": "netherrocks:block/malachite_brick_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight": { "model": "netherrocks:block/malachite_brick_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "netherrocks:block/malachite_brick_outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "netherrocks:block/malachite_brick_outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "netherrocks:block/malachite_brick_outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "netherrocks:block/malachite_brick_outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "netherrocks:block/malachite_brick_outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "netherrocks:block/malachite_brick_outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "netherrocks:block/malachite_brick_outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "netherrocks:block/malachite_brick_outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "netherrocks:block/malachite_brick_inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "netherrocks:block/malachite_brick_inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "netherrocks:block/malachite_brick_inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "netherrocks:block/malachite_brick_inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "netherrocks:block/malachite_brick_inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "netherrocks:block/malachite_brick_inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "netherrocks:block/malachite_brick_inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "netherrocks:block/malachite_brick_inner_stairs", "x": 180, "y": 270, "uvlock": true } + } +} diff --git a/src/main/resources/assets/netherrocks/blockstates/malachite_bricks.json b/src/main/resources/assets/netherrocks/blockstates/malachite_bricks.json new file mode 100644 index 00000000..2518a75c --- /dev/null +++ b/src/main/resources/assets/netherrocks/blockstates/malachite_bricks.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "netherrocks:block/malachite_bricks" } + } +} diff --git a/src/main/resources/assets/netherrocks/blockstates/malachite_door.json b/src/main/resources/assets/netherrocks/blockstates/malachite_door.json new file mode 100644 index 00000000..34b512d4 --- /dev/null +++ b/src/main/resources/assets/netherrocks/blockstates/malachite_door.json @@ -0,0 +1,36 @@ +{ + "variants": { + "facing=east,half=lower,hinge=left,open=false": { "model": "netherrocks:block/malachite_door_bottom" }, + "facing=south,half=lower,hinge=left,open=false": { "model": "netherrocks:block/malachite_door_bottom", "y": 90 }, + "facing=west,half=lower,hinge=left,open=false": { "model": "netherrocks:block/malachite_door_bottom", "y": 180 }, + "facing=north,half=lower,hinge=left,open=false": { "model": "netherrocks:block/malachite_door_bottom", "y": 270 }, + "facing=east,half=lower,hinge=right,open=false": { "model": "netherrocks:block/malachite_door_bottom_rh" }, + "facing=south,half=lower,hinge=right,open=false": { "model": "netherrocks:block/malachite_door_bottom_rh", "y": 90 }, + "facing=west,half=lower,hinge=right,open=false": { "model": "netherrocks:block/malachite_door_bottom_rh", "y": 180 }, + "facing=north,half=lower,hinge=right,open=false": { "model": "netherrocks:block/malachite_door_bottom_rh", "y": 270 }, + "facing=east,half=lower,hinge=left,open=true": { "model": "netherrocks:block/malachite_door_bottom_rh", "y": 90 }, + "facing=south,half=lower,hinge=left,open=true": { "model": "netherrocks:block/malachite_door_bottom_rh", "y": 180 }, + "facing=west,half=lower,hinge=left,open=true": { "model": "netherrocks:block/malachite_door_bottom_rh", "y": 270 }, + "facing=north,half=lower,hinge=left,open=true": { "model": "netherrocks:block/malachite_door_bottom_rh" }, + "facing=east,half=lower,hinge=right,open=true": { "model": "netherrocks:block/malachite_door_bottom", "y": 270 }, + "facing=south,half=lower,hinge=right,open=true": { "model": "netherrocks:block/malachite_door_bottom" }, + "facing=west,half=lower,hinge=right,open=true": { "model": "netherrocks:block/malachite_door_bottom", "y": 90 }, + "facing=north,half=lower,hinge=right,open=true": { "model": "netherrocks:block/malachite_door_bottom", "y": 180 }, + "facing=east,half=upper,hinge=left,open=false": { "model": "netherrocks:block/malachite_door_top" }, + "facing=south,half=upper,hinge=left,open=false": { "model": "netherrocks:block/malachite_door_top", "y": 90 }, + "facing=west,half=upper,hinge=left,open=false": { "model": "netherrocks:block/malachite_door_top", "y": 180 }, + "facing=north,half=upper,hinge=left,open=false": { "model": "netherrocks:block/malachite_door_top", "y": 270 }, + "facing=east,half=upper,hinge=right,open=false": { "model": "netherrocks:block/malachite_door_top_rh" }, + "facing=south,half=upper,hinge=right,open=false": { "model": "netherrocks:block/malachite_door_top_rh", "y": 90 }, + "facing=west,half=upper,hinge=right,open=false": { "model": "netherrocks:block/malachite_door_top_rh", "y": 180 }, + "facing=north,half=upper,hinge=right,open=false": { "model": "netherrocks:block/malachite_door_top_rh", "y": 270 }, + "facing=east,half=upper,hinge=left,open=true": { "model": "netherrocks:block/malachite_door_top_rh", "y": 90 }, + "facing=south,half=upper,hinge=left,open=true": { "model": "netherrocks:block/malachite_door_top_rh", "y": 180 }, + "facing=west,half=upper,hinge=left,open=true": { "model": "netherrocks:block/malachite_door_top_rh", "y": 270 }, + "facing=north,half=upper,hinge=left,open=true": { "model": "netherrocks:block/malachite_door_top_rh" }, + "facing=east,half=upper,hinge=right,open=true": { "model": "netherrocks:block/malachite_door_top", "y": 270 }, + "facing=south,half=upper,hinge=right,open=true": { "model": "netherrocks:block/malachite_door_top" }, + "facing=west,half=upper,hinge=right,open=true": { "model": "netherrocks:block/malachite_door_top", "y": 90 }, + "facing=north,half=upper,hinge=right,open=true": { "model": "netherrocks:block/malachite_door_top", "y": 180 } + } +} diff --git a/src/main/resources/assets/netherrocks/blockstates/raw_argonite_block.json b/src/main/resources/assets/netherrocks/blockstates/raw_argonite_block.json new file mode 100644 index 00000000..0e6fa967 --- /dev/null +++ b/src/main/resources/assets/netherrocks/blockstates/raw_argonite_block.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "netherrocks:block/raw_argonite_block" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/netherrocks/blockstates/raw_fyrite_block.json b/src/main/resources/assets/netherrocks/blockstates/raw_fyrite_block.json new file mode 100644 index 00000000..cc39aebb --- /dev/null +++ b/src/main/resources/assets/netherrocks/blockstates/raw_fyrite_block.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "netherrocks:block/raw_fyrite_block" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/netherrocks/blockstates/raw_illumenite_block.json b/src/main/resources/assets/netherrocks/blockstates/raw_illumenite_block.json new file mode 100644 index 00000000..acf91785 --- /dev/null +++ b/src/main/resources/assets/netherrocks/blockstates/raw_illumenite_block.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "netherrocks:block/raw_illumenite_block" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/netherrocks/blockstates/raw_malachite_block.json b/src/main/resources/assets/netherrocks/blockstates/raw_malachite_block.json new file mode 100644 index 00000000..49288c27 --- /dev/null +++ b/src/main/resources/assets/netherrocks/blockstates/raw_malachite_block.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "netherrocks:block/raw_malachite_block" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/netherrocks/lang/en_us.json b/src/main/resources/assets/netherrocks/lang/en_us.json index 2ee07282..761a848c 100644 --- a/src/main/resources/assets/netherrocks/lang/en_us.json +++ b/src/main/resources/assets/netherrocks/lang/en_us.json @@ -8,16 +8,20 @@ "material.netherrocks.dragonstone": "Dragonstone", "block.netherrocks.fyrite_ore": "Fyrite Ore", "block.netherrocks.fyrite_block": "Fyrite Block", + "block.netherrocks.raw_fyrite_block": "Raw Fyrite Block", "block.netherrocks.malachite_ore": "Malachite Ore", "block.netherrocks.malachite_block": "Malachite Block", + "block.netherrocks.raw_malachite_block": "Raw Malachite Block", "block.netherrocks.ashstone_ore": "Ashstone Ore", "block.netherrocks.ashstone_block": "Ashstone Block", "block.netherrocks.illumenite_ore": "Illumenite Ore", "block.netherrocks.illumenite_block": "Illumenite Block", + "block.netherrocks.raw_illumenite_block": "Raw Illumenite Block", "block.netherrocks.dragonstone_ore": "Dragonstone Ore", "block.netherrocks.dragonstone_block": "Dragonstone Block", "block.netherrocks.argonite_ore": "Argonite Ore", "block.netherrocks.argonite_block": "Argonite Block", + "block.netherrocks.raw_argonite_block": "Raw Argonite Block", "block.netherrocks.nether_furnace": "Nether Furnace", "block.netherrocks.nether_furnace_burning": "Nether Furnace", "block.netherrocks.nether_blast_furnace" : "Nether Blast Furnace", @@ -26,11 +30,15 @@ "block.netherrocks.nether_smoker_burning" : "Nether Smoker", "item.netherrocks.fyrite_ingot": "Fyrite Ingot", + "item.netherrocks.raw_fyrite": "Raw Fyrite", "item.netherrocks.malachite_ingot": "Malachite Ingot", + "item.netherrocks.raw_malachite": "Raw Malachite", "item.netherrocks.ashstone_gem": "Ashstone Gem", "item.netherrocks.illumenite_ingot": "Illumenite Ingot", + "item.netherrocks.raw_illumenite": "Raw Illumenite", "item.netherrocks.dragonstone_gem": "Dragonstone Gem", "item.netherrocks.argonite_ingot": "Argonite Ingot", + "item.netherrocks.raw_argonite": "Raw Argonite", "item.netherrocks.fyrite_nugget": "Fyrite Nugget", "item.netherrocks.malachite_nugget": "Malachite Nugget", @@ -90,10 +98,47 @@ "item.netherrocks.dragonstone_leggings": "Dragonstone Leggings", "item.netherrocks.dragonstone_boots": "Dragonstone Boots", + "block.netherrocks.fyrite_bricks": "Fyrite Bricks", + "block.netherrocks.malachite_bricks": "Malachite Bricks", + "block.netherrocks.ashstone_bricks": "Ashstone Bricks", + "block.netherrocks.illumenite_bricks": "Illumenite Bricks", + "block.netherrocks.dragonstone_bricks": "Dragonstone Bricks", + "block.netherrocks.argonite_bricks": "Argonite Bricks", + "block.netherrocks.fyrite_brick_slab": "Fyrite Brick Slab", + "block.netherrocks.malachite_brick_slab": "Malachite Brick Slab", + "block.netherrocks.ashstone_brick_slab": "Ashstone Brick Slab", + "block.netherrocks.illumenite_brick_slab": "Illumenite Brick Slab", + "block.netherrocks.dragonstone_brick_slab": "Dragonstone Brick Slab", + "block.netherrocks.argonite_brick_slab": "Argonite Brick Slab", + + "block.netherrocks.fyrite_brick_stairs": "Fyrite Brick Stairs", + "block.netherrocks.malachite_brick_stairs": "Malachite Brick Stairs", + "block.netherrocks.ashstone_brick_stairs": "Ashstone Brick Stairs", + "block.netherrocks.illumenite_brick_stairs": "Illumenite Brick Stairs", + "block.netherrocks.dragonstone_brick_stairs": "Dragonstone Brick Stairs", + "block.netherrocks.argonite_brick_stairs": "Argonite Brick Stairs", + + "block.netherrocks.fyrite_bars": "Fyrite Bars", + "block.netherrocks.malachite_bars": "Malachite Bars", + "block.netherrocks.ashstone_bars": "Ashstone Bars", + "block.netherrocks.illumenite_bars": "Illumenite Bars", + "block.netherrocks.dragonstone_bars": "Dragonstone Bars", + "block.netherrocks.argonite_bars": "Argonite Bars", + + "block.netherrocks.argonite_door": "Argonite Door", + "block.netherrocks.ashstone_door": "Ashstone Door", + "block.netherrocks.dragonstone_door": "Dragonstone Door", + "block.netherrocks.fyrite_door": "Fyrite Door", + "block.netherrocks.illumenite_door": "Illumenite Door", + "block.netherrocks.malachite_door": "Malachite Door", + "container.nether_furnace": "Nether Furnace", "gui.netherrocks.smeltTimeProgress": "Smelt time %s/%s", "gui.netherrocks.fuelBurnTimeProgress": "Fuel burn time %s/%s", - + "gui.jei.category.fuel.smeltCount.single": "Smelts 1 item", + "gui.jei.category.fuel.smeltCount": "Smelts %s items", + "gui.jei.category.fuel": "Nether Fuel", + "advancements.root.welcome": "Ready to mine Hell!", "advancements.root.welcome.desc": "You've reached the Nether. Look for netherrocks ores.", "advancements.fyrite_ore_ach": "Warm to the Touch", @@ -132,4 +177,4 @@ "netherrocks.fyrite_shovel.info": "§aInstant glass when digging up sand.", "netherrocks.fyrite_sword.info": "§aHarnesses the power of fire.", "netherrocks.illumenite_sword.info": "§aGrants night vision on hit. Blinds and slows target." -} \ No newline at end of file +} diff --git a/src/main/resources/assets/netherrocks/lang/fr_fr.json b/src/main/resources/assets/netherrocks/lang/fr_fr.json index 03ce3616..f90ddc34 100644 --- a/src/main/resources/assets/netherrocks/lang/fr_fr.json +++ b/src/main/resources/assets/netherrocks/lang/fr_fr.json @@ -63,6 +63,33 @@ "item.netherrocks.dragonstone_chestplate": "Plastron en Dragonstone", "item.netherrocks.dragonstone_leggings": "Jambières en Dragonstone", "item.netherrocks.dragonstone_boots": "Bottes en Dragonstone", + "block.netherrocks.fyrite_bricks": "Brique de Fyrite", + "block.netherrocks.malachite_bricks": "Brique de Malachite", + "block.netherrocks.ashstone_bricks": "Brique d'Ashstone", + "block.netherrocks.illumenite_bricks": "Brique d'Illumenite", + "block.netherrocks.dragonstone_bricks": "Brique de Dragonstone", + "block.netherrocks.argonite_bricks": "Brique d'Argonite", + + "block.netherrocks.fyrite_brick_stairs": "Escalier en Brique de Fyrite", + "block.netherrocks.malachite_brick_stairs": "Escalier en Brique de Malachite", + "block.netherrocks.ashstone_brick_stairs": "Escalier en Brique d'Ashstone", + "block.netherrocks.illumenite_brick_stairs": "Escalier en Brique d'Illumenite", + "block.netherrocks.dragonstone_brick_stairs": "Escalier en Brique de Dragonstone", + "block.netherrocks.argonite_brick_stairs": "Escalier en Brique d'Argonite", + + "block.netherrocks.fyrite_bars": "Barreaux de Fyrite", + "block.netherrocks.malachite_bars": "Barreaux de Malachite", + "block.netherrocks.ashstone_bars": "Barreaux d'Ashstone", + "block.netherrocks.illumenite_bars": "Barreaux d'Illumenite", + "block.netherrocks.dragonstone_bars": "Barreaux de Dragonstone", + "block.netherrocks.argonite_bars": "Barreaux d'Argonite", + + "block.netherrocks.argonite_door": "Porte en Argonite", + "block.netherrocks.ashstone_door": "Porte en Ashstone", + "block.netherrocks.dragonstone_door": "Porte en Dragonstone", + "block.netherrocks.fyrite_door": "Porte en Fyrite", + "block.netherrocks.illumenite_door": "Porte en Illumenite", + "block.netherrocks.malachite_door": "Porte en Malachite", "container.netherrocks_nether_furnace": "Fourneau du Nether", "nether_furnace_gui": "Fourneau du Nether", @@ -101,4 +128,4 @@ "netherrocks.fyrite_pickaxe.info": "§aFonte automatique lors du minage.", "netherrocks.fyrite_sword.info": "§aExploite le pouvoir du feu.", "netherrocks.illumenite_sword.info": "§aDonne la vision nocturne au coups. Aveugle et ralentit la cible." -} \ No newline at end of file +} diff --git a/src/main/resources/assets/netherrocks/lang/uk_ua.json b/src/main/resources/assets/netherrocks/lang/uk_ua.json new file mode 100644 index 00000000..6f066354 --- /dev/null +++ b/src/main/resources/assets/netherrocks/lang/uk_ua.json @@ -0,0 +1,29 @@ +{ + "block.netherrocks.fyrite_bricks": "Фейритова цегла Bricks", + "block.netherrocks.malachite_bricks": "Малахітова цегла", + "block.netherrocks.ashstone_bricks": "Вулканічна цегла", + "block.netherrocks.illumenite_bricks": "Ілюменітова цегла", + "block.netherrocks.dragonstone_bricks": "Драконітова цегла", + "block.netherrocks.argonite_bricks": "Аргонітова цегла", + + "block.netherrocks.fyrite_brick_stairs": "Сходи з фейритової цегли", + "block.netherrocks.malachite_brick_stairs": "Сходи з малахітової цегли", + "block.netherrocks.ashstone_brick_stairs": "Сходи з вулканічної цегли", + "block.netherrocks.illumenite_brick_stairs": "Сходи з ілюменітової цегли", + "block.netherrocks.dragonstone_brick_stairs": "Сходи з драконіту цегли", + "block.netherrocks.argonite_brick_stairs": "Сходи з аргонітової цегли", + + "block.netherrocks.fyrite_bars": "Фейритові грати", + "block.netherrocks.malachite_bars": "Малахітові грати", + "block.netherrocks.ashstone_bars": "вулканічні грати", + "block.netherrocks.illumenite_bars": "Ілюменітові грати", + "block.netherrocks.dragonstone_bars": "Драконітові грати", + "block.netherrocks.argonite_bars": "Аргонітові грати", + + "block.netherrocks.argonite_door": "Аргонітові двері", + "block.netherrocks.ashstone_door": "вулканічні двері", + "block.netherrocks.dragonstone_door": "Драконітові двері", + "block.netherrocks.fyrite_door": "Фейрітові двері", + "block.netherrocks.illumenite_door": "Ілюменітові двері", + "block.netherrocks.malachite_door": "Малахітові двері" +} diff --git a/src/main/resources/assets/netherrocks/models/block/argonite_bars_cap.json b/src/main/resources/assets/netherrocks/models/block/argonite_bars_cap.json new file mode 100644 index 00000000..ef995381 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/argonite_bars_cap.json @@ -0,0 +1,24 @@ +{ + "ambientocclusion": false, + "textures": { + "particle": "netherrocks:block/argonite_bars", + "bars": "netherrocks:block/argonite_bars", + "edge": "netherrocks:block/argonite_bars" + }, + "elements": [ + { "from": [ 8, 0, 8 ], + "to": [ 8, 16, 9 ], + "faces": { + "west": { "uv": [ 8, 0, 7, 16 ], "texture": "#bars" }, + "east": { "uv": [ 7, 0, 8, 16 ], "texture": "#bars" } + } + }, + { "from": [ 7, 0, 9 ], + "to": [ 9, 16, 9 ], + "faces": { + "north": { "uv": [ 9, 0, 7, 16 ], "texture": "#bars" }, + "south": { "uv": [ 7, 0, 9, 16 ], "texture": "#bars" } + } + } + ] +} diff --git a/src/main/resources/assets/netherrocks/models/block/argonite_bars_cap_alt.json b/src/main/resources/assets/netherrocks/models/block/argonite_bars_cap_alt.json new file mode 100644 index 00000000..1ce03182 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/argonite_bars_cap_alt.json @@ -0,0 +1,24 @@ +{ + "ambientocclusion": false, + "textures": { + "particle": "netherrocks:block/argonite_bars", + "bars": "netherrocks:block/argonite_bars", + "edge": "netherrocks:block/argonite_bars" + }, + "elements": [ + { "from": [ 8, 0, 7 ], + "to": [ 8, 16, 8 ], + "faces": { + "west": { "uv": [ 8, 0, 9, 16 ], "texture": "#bars" }, + "east": { "uv": [ 9, 0, 8, 16 ], "texture": "#bars" } + } + }, + { "from": [ 7, 0, 7 ], + "to": [ 9, 16, 7 ], + "faces": { + "north": { "uv": [ 7, 0, 9, 16 ], "texture": "#bars" }, + "south": { "uv": [ 9, 0, 7, 16 ], "texture": "#bars" } + } + } + ] +} diff --git a/src/main/resources/assets/netherrocks/models/block/argonite_bars_post.json b/src/main/resources/assets/netherrocks/models/block/argonite_bars_post.json new file mode 100644 index 00000000..f44a175d --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/argonite_bars_post.json @@ -0,0 +1,23 @@ +{ + "ambientocclusion": false, + "textures": { + "particle": "netherrocks:block/argonite_bars", + "bars": "netherrocks:block/argonite_bars" + }, + "elements": [ + { "from": [ 8, 0, 7 ], + "to": [ 8, 16, 9 ], + "faces": { + "west": { "uv": [ 7, 0, 9, 16 ], "texture": "#bars" }, + "east": { "uv": [ 9, 0, 7, 16 ], "texture": "#bars" } + } + }, + { "from": [ 7, 0, 8 ], + "to": [ 9, 16, 8 ], + "faces": { + "north": { "uv": [ 7, 0, 9, 16 ], "texture": "#bars" }, + "south": { "uv": [ 9, 0, 7, 16 ], "texture": "#bars" } + } + } + ] +} diff --git a/src/main/resources/assets/netherrocks/models/block/argonite_bars_post_ends.json b/src/main/resources/assets/netherrocks/models/block/argonite_bars_post_ends.json new file mode 100644 index 00000000..bf1522ea --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/argonite_bars_post_ends.json @@ -0,0 +1,23 @@ +{ + "ambientocclusion": false, + "textures": { + "particle": "netherrocks:block/argonite_bars", + "edge": "netherrocks:block/argonite_bars" + }, + "elements": [ + { "from": [ 7, 0.001, 7 ], + "to": [ 9, 0.001, 9 ], + "faces": { + "down": { "uv": [ 7, 7, 9, 9 ], "texture": "#edge" }, + "up": { "uv": [ 7, 7, 9, 9 ], "texture": "#edge" } + } + }, + { "from": [ 7, 15.999, 7 ], + "to": [ 9, 15.999, 9 ], + "faces": { + "down": { "uv": [ 7, 7, 9, 9 ], "texture": "#edge" }, + "up": { "uv": [ 7, 7, 9, 9 ], "texture": "#edge" } + } + } + ] +} diff --git a/src/main/resources/assets/netherrocks/models/block/argonite_bars_side.json b/src/main/resources/assets/netherrocks/models/block/argonite_bars_side.json new file mode 100644 index 00000000..76e6fa4c --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/argonite_bars_side.json @@ -0,0 +1,37 @@ +{ + "ambientocclusion": false, + "textures": { + "particle": "netherrocks:block/argonite_bars", + "bars": "netherrocks:block/argonite_bars", + "edge": "netherrocks:block/argonite_bars" + }, + "elements": [ + { "from": [ 8, 0, 0 ], + "to": [ 8, 16, 8 ], + "faces": { + "west": { "uv": [ 16, 0, 8, 16 ], "texture": "#bars" }, + "east": { "uv": [ 8, 0, 16, 16 ], "texture": "#bars" } + } + }, + { "from": [ 7, 0, 0 ], + "to": [ 9, 16, 7 ], + "faces": { + "north": { "uv": [ 7, 0, 9, 16 ], "texture": "#edge", "cullface": "north" } + } + }, + { "from": [ 7, 0.001, 0 ], + "to": [ 9, 0.001, 7 ], + "faces": { + "down": { "uv": [ 9, 0, 7, 7 ], "texture": "#edge" }, + "up": { "uv": [ 7, 0, 9, 7 ], "texture": "#edge" } + } + }, + { "from": [ 7, 15.999, 0 ], + "to": [ 9, 15.999, 7 ], + "faces": { + "down": { "uv": [ 9, 0, 7, 7 ], "texture": "#edge" }, + "up": { "uv": [ 7, 0, 9, 7 ], "texture": "#edge" } + } + } + ] +} diff --git a/src/main/resources/assets/netherrocks/models/block/argonite_bars_side_alt.json b/src/main/resources/assets/netherrocks/models/block/argonite_bars_side_alt.json new file mode 100644 index 00000000..8af53b52 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/argonite_bars_side_alt.json @@ -0,0 +1,39 @@ +{ + "ambientocclusion": false, + "textures": { + "particle": "netherrocks:block/argonite_bars", + "bars": "netherrocks:block/argonite_bars", + "edge": "netherrocks:block/argonite_bars" + }, + "elements": [ + { "from": [ 8, 0, 8 ], + "to": [ 8, 16, 16 ], + "faces": { + "west": { "uv": [ 8, 0, 0, 16 ], "texture": "#bars" }, + "east": { "uv": [ 0, 0, 8, 16 ], "texture": "#bars" } + } + }, + { "from": [ 7, 0, 9 ], + "to": [ 9, 16, 16 ], + "faces": { + "south": { "uv": [ 7, 0, 9, 16 ], "texture": "#edge", "cullface": "south" }, + "down": { "uv": [ 9, 9, 7, 16 ], "texture": "#edge" }, + "up": { "uv": [ 7, 9, 9, 16 ], "texture": "#edge" } + } + }, + { "from": [ 7, 0.001, 9 ], + "to": [ 9, 0.001, 16 ], + "faces": { + "down": { "uv": [ 9, 9, 7, 16 ], "texture": "#edge" }, + "up": { "uv": [ 7, 9, 9, 16 ], "texture": "#edge" } + } + }, + { "from": [ 7, 15.999, 9 ], + "to": [ 9, 15.999, 16 ], + "faces": { + "down": { "uv": [ 9, 9, 7, 16 ], "texture": "#edge" }, + "up": { "uv": [ 7, 9, 9, 16 ], "texture": "#edge" } + } + } + ] +} diff --git a/src/main/resources/assets/netherrocks/models/block/argonite_brick_inner_stairs.json b/src/main/resources/assets/netherrocks/models/block/argonite_brick_inner_stairs.json new file mode 100644 index 00000000..0f5597a5 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/argonite_brick_inner_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "block/inner_stairs", + "textures": { + "bottom": "netherrocks:block/argonite_bricks", + "top": "netherrocks:block/argonite_bricks", + "side": "netherrocks:block/argonite_bricks" + } +} diff --git a/src/main/resources/assets/netherrocks/models/block/argonite_brick_outer_stairs.json b/src/main/resources/assets/netherrocks/models/block/argonite_brick_outer_stairs.json new file mode 100644 index 00000000..e7b8c6ef --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/argonite_brick_outer_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "block/outer_stairs", + "textures": { + "bottom": "netherrocks:block/argonite_bricks", + "top": "netherrocks:block/argonite_bricks", + "side": "netherrocks:block/argonite_bricks" + } +} diff --git a/src/main/resources/assets/netherrocks/models/block/argonite_brick_slab.json b/src/main/resources/assets/netherrocks/models/block/argonite_brick_slab.json new file mode 100644 index 00000000..fe2ca2e2 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/argonite_brick_slab.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab", + "textures": { + "bottom": "netherrocks:block/argonite_bricks", + "top": "netherrocks:block/argonite_bricks", + "side": "netherrocks:block/argonite_bricks" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/netherrocks/models/block/argonite_brick_slab_top.json b/src/main/resources/assets/netherrocks/models/block/argonite_brick_slab_top.json new file mode 100644 index 00000000..e9aaadc0 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/argonite_brick_slab_top.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab_top", + "textures": { + "bottom": "netherrocks:block/argonite_bricks", + "top": "netherrocks:block/argonite_bricks", + "side": "netherrocks:block/argonite_bricks" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/netherrocks/models/block/argonite_brick_stairs.json b/src/main/resources/assets/netherrocks/models/block/argonite_brick_stairs.json new file mode 100644 index 00000000..9f287aaf --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/argonite_brick_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "block/stairs", + "textures": { + "bottom": "netherrocks:block/argonite_bricks", + "top": "netherrocks:block/argonite_bricks", + "side": "netherrocks:block/argonite_bricks" + } +} diff --git a/src/main/resources/assets/netherrocks/models/block/argonite_bricks.json b/src/main/resources/assets/netherrocks/models/block/argonite_bricks.json new file mode 100644 index 00000000..1522c30f --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/argonite_bricks.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "netherrocks:block/argonite_bricks" + } +} diff --git a/src/main/resources/assets/netherrocks/models/block/argonite_door_bottom.json b/src/main/resources/assets/netherrocks/models/block/argonite_door_bottom.json new file mode 100644 index 00000000..b0113887 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/argonite_door_bottom.json @@ -0,0 +1,7 @@ +{ + "parent": "block/door_bottom", + "textures": { + "bottom": "netherrocks:block/argonite_door_lower", + "top": "netherrocks:block/argonite_door_upper" + } +} diff --git a/src/main/resources/assets/netherrocks/models/block/argonite_door_bottom_rh.json b/src/main/resources/assets/netherrocks/models/block/argonite_door_bottom_rh.json new file mode 100644 index 00000000..52274aea --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/argonite_door_bottom_rh.json @@ -0,0 +1,7 @@ +{ + "parent": "block/door_bottom_rh", + "textures": { + "bottom": "netherrocks:block/argonite_door_lower", + "top": "netherrocks:block/argonite_door_upper" + } +} diff --git a/src/main/resources/assets/netherrocks/models/block/argonite_door_top.json b/src/main/resources/assets/netherrocks/models/block/argonite_door_top.json new file mode 100644 index 00000000..55357154 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/argonite_door_top.json @@ -0,0 +1,7 @@ +{ + "parent": "block/door_top", + "textures": { + "bottom": "netherrocks:block/argonite_door_lower", + "top": "netherrocks:block/argonite_door_upper" + } +} diff --git a/src/main/resources/assets/netherrocks/models/block/argonite_door_top_rh.json b/src/main/resources/assets/netherrocks/models/block/argonite_door_top_rh.json new file mode 100644 index 00000000..d30eb8d9 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/argonite_door_top_rh.json @@ -0,0 +1,7 @@ +{ + "parent": "block/door_top_rh", + "textures": { + "bottom": "netherrocks:block/argonite_door_lower", + "top": "netherrocks:block/argonite_door_upper" + } +} diff --git a/src/main/resources/assets/netherrocks/models/block/ashstone_bars_cap.json b/src/main/resources/assets/netherrocks/models/block/ashstone_bars_cap.json new file mode 100644 index 00000000..896ce708 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/ashstone_bars_cap.json @@ -0,0 +1,24 @@ +{ + "ambientocclusion": false, + "textures": { + "particle": "netherrocks:block/ashstone_bars", + "bars": "netherrocks:block/ashstone_bars", + "edge": "netherrocks:block/ashstone_bars" + }, + "elements": [ + { "from": [ 8, 0, 8 ], + "to": [ 8, 16, 9 ], + "faces": { + "west": { "uv": [ 8, 0, 7, 16 ], "texture": "#bars" }, + "east": { "uv": [ 7, 0, 8, 16 ], "texture": "#bars" } + } + }, + { "from": [ 7, 0, 9 ], + "to": [ 9, 16, 9 ], + "faces": { + "north": { "uv": [ 9, 0, 7, 16 ], "texture": "#bars" }, + "south": { "uv": [ 7, 0, 9, 16 ], "texture": "#bars" } + } + } + ] +} diff --git a/src/main/resources/assets/netherrocks/models/block/ashstone_bars_cap_alt.json b/src/main/resources/assets/netherrocks/models/block/ashstone_bars_cap_alt.json new file mode 100644 index 00000000..e4b42651 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/ashstone_bars_cap_alt.json @@ -0,0 +1,24 @@ +{ + "ambientocclusion": false, + "textures": { + "particle": "netherrocks:block/ashstone_bars", + "bars": "netherrocks:block/ashstone_bars", + "edge": "netherrocks:block/ashstone_bars" + }, + "elements": [ + { "from": [ 8, 0, 7 ], + "to": [ 8, 16, 8 ], + "faces": { + "west": { "uv": [ 8, 0, 9, 16 ], "texture": "#bars" }, + "east": { "uv": [ 9, 0, 8, 16 ], "texture": "#bars" } + } + }, + { "from": [ 7, 0, 7 ], + "to": [ 9, 16, 7 ], + "faces": { + "north": { "uv": [ 7, 0, 9, 16 ], "texture": "#bars" }, + "south": { "uv": [ 9, 0, 7, 16 ], "texture": "#bars" } + } + } + ] +} diff --git a/src/main/resources/assets/netherrocks/models/block/ashstone_bars_post.json b/src/main/resources/assets/netherrocks/models/block/ashstone_bars_post.json new file mode 100644 index 00000000..2b5f36c4 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/ashstone_bars_post.json @@ -0,0 +1,23 @@ +{ + "ambientocclusion": false, + "textures": { + "particle": "netherrocks:block/ashstone_bars", + "bars": "netherrocks:block/ashstone_bars" + }, + "elements": [ + { "from": [ 8, 0, 7 ], + "to": [ 8, 16, 9 ], + "faces": { + "west": { "uv": [ 7, 0, 9, 16 ], "texture": "#bars" }, + "east": { "uv": [ 9, 0, 7, 16 ], "texture": "#bars" } + } + }, + { "from": [ 7, 0, 8 ], + "to": [ 9, 16, 8 ], + "faces": { + "north": { "uv": [ 7, 0, 9, 16 ], "texture": "#bars" }, + "south": { "uv": [ 9, 0, 7, 16 ], "texture": "#bars" } + } + } + ] +} diff --git a/src/main/resources/assets/netherrocks/models/block/ashstone_bars_post_ends.json b/src/main/resources/assets/netherrocks/models/block/ashstone_bars_post_ends.json new file mode 100644 index 00000000..36f8dbe7 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/ashstone_bars_post_ends.json @@ -0,0 +1,23 @@ +{ + "ambientocclusion": false, + "textures": { + "particle": "netherrocks:block/ashstone_bars", + "edge": "netherrocks:block/ashstone_bars" + }, + "elements": [ + { "from": [ 7, 0.001, 7 ], + "to": [ 9, 0.001, 9 ], + "faces": { + "down": { "uv": [ 7, 7, 9, 9 ], "texture": "#edge" }, + "up": { "uv": [ 7, 7, 9, 9 ], "texture": "#edge" } + } + }, + { "from": [ 7, 15.999, 7 ], + "to": [ 9, 15.999, 9 ], + "faces": { + "down": { "uv": [ 7, 7, 9, 9 ], "texture": "#edge" }, + "up": { "uv": [ 7, 7, 9, 9 ], "texture": "#edge" } + } + } + ] +} diff --git a/src/main/resources/assets/netherrocks/models/block/ashstone_bars_side.json b/src/main/resources/assets/netherrocks/models/block/ashstone_bars_side.json new file mode 100644 index 00000000..4647fa13 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/ashstone_bars_side.json @@ -0,0 +1,37 @@ +{ + "ambientocclusion": false, + "textures": { + "particle": "netherrocks:block/ashstone_bars", + "bars": "netherrocks:block/ashstone_bars", + "edge": "netherrocks:block/ashstone_bars" + }, + "elements": [ + { "from": [ 8, 0, 0 ], + "to": [ 8, 16, 8 ], + "faces": { + "west": { "uv": [ 16, 0, 8, 16 ], "texture": "#bars" }, + "east": { "uv": [ 8, 0, 16, 16 ], "texture": "#bars" } + } + }, + { "from": [ 7, 0, 0 ], + "to": [ 9, 16, 7 ], + "faces": { + "north": { "uv": [ 7, 0, 9, 16 ], "texture": "#edge", "cullface": "north" } + } + }, + { "from": [ 7, 0.001, 0 ], + "to": [ 9, 0.001, 7 ], + "faces": { + "down": { "uv": [ 9, 0, 7, 7 ], "texture": "#edge" }, + "up": { "uv": [ 7, 0, 9, 7 ], "texture": "#edge" } + } + }, + { "from": [ 7, 15.999, 0 ], + "to": [ 9, 15.999, 7 ], + "faces": { + "down": { "uv": [ 9, 0, 7, 7 ], "texture": "#edge" }, + "up": { "uv": [ 7, 0, 9, 7 ], "texture": "#edge" } + } + } + ] +} diff --git a/src/main/resources/assets/netherrocks/models/block/ashstone_bars_side_alt.json b/src/main/resources/assets/netherrocks/models/block/ashstone_bars_side_alt.json new file mode 100644 index 00000000..77638b89 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/ashstone_bars_side_alt.json @@ -0,0 +1,39 @@ +{ + "ambientocclusion": false, + "textures": { + "particle": "netherrocks:block/ashstone_bars", + "bars": "netherrocks:block/ashstone_bars", + "edge": "netherrocks:block/ashstone_bars" + }, + "elements": [ + { "from": [ 8, 0, 8 ], + "to": [ 8, 16, 16 ], + "faces": { + "west": { "uv": [ 8, 0, 0, 16 ], "texture": "#bars" }, + "east": { "uv": [ 0, 0, 8, 16 ], "texture": "#bars" } + } + }, + { "from": [ 7, 0, 9 ], + "to": [ 9, 16, 16 ], + "faces": { + "south": { "uv": [ 7, 0, 9, 16 ], "texture": "#edge", "cullface": "south" }, + "down": { "uv": [ 9, 9, 7, 16 ], "texture": "#edge" }, + "up": { "uv": [ 7, 9, 9, 16 ], "texture": "#edge" } + } + }, + { "from": [ 7, 0.001, 9 ], + "to": [ 9, 0.001, 16 ], + "faces": { + "down": { "uv": [ 9, 9, 7, 16 ], "texture": "#edge" }, + "up": { "uv": [ 7, 9, 9, 16 ], "texture": "#edge" } + } + }, + { "from": [ 7, 15.999, 9 ], + "to": [ 9, 15.999, 16 ], + "faces": { + "down": { "uv": [ 9, 9, 7, 16 ], "texture": "#edge" }, + "up": { "uv": [ 7, 9, 9, 16 ], "texture": "#edge" } + } + } + ] +} diff --git a/src/main/resources/assets/netherrocks/models/block/ashstone_brick_inner_stairs.json b/src/main/resources/assets/netherrocks/models/block/ashstone_brick_inner_stairs.json new file mode 100644 index 00000000..870a40e4 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/ashstone_brick_inner_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "block/inner_stairs", + "textures": { + "bottom": "netherrocks:block/ashstone_bricks", + "top": "netherrocks:block/ashstone_bricks", + "side": "netherrocks:block/ashstone_bricks" + } +} diff --git a/src/main/resources/assets/netherrocks/models/block/ashstone_brick_outer_stairs.json b/src/main/resources/assets/netherrocks/models/block/ashstone_brick_outer_stairs.json new file mode 100644 index 00000000..c526f719 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/ashstone_brick_outer_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "block/outer_stairs", + "textures": { + "bottom": "netherrocks:block/ashstone_bricks", + "top": "netherrocks:block/ashstone_bricks", + "side": "netherrocks:block/ashstone_bricks" + } +} diff --git a/src/main/resources/assets/netherrocks/models/block/ashstone_brick_slab.json b/src/main/resources/assets/netherrocks/models/block/ashstone_brick_slab.json new file mode 100644 index 00000000..ae49d432 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/ashstone_brick_slab.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab", + "textures": { + "bottom": "netherrocks:block/ashstone_bricks", + "top": "netherrocks:block/ashstone_bricks", + "side": "netherrocks:block/ashstone_bricks" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/netherrocks/models/block/ashstone_brick_slab_top.json b/src/main/resources/assets/netherrocks/models/block/ashstone_brick_slab_top.json new file mode 100644 index 00000000..31a14bec --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/ashstone_brick_slab_top.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab_top", + "textures": { + "bottom": "netherrocks:block/ashstone_bricks", + "top": "netherrocks:block/ashstone_bricks", + "side": "netherrocks:block/ashstone_bricks" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/netherrocks/models/block/ashstone_brick_stairs.json b/src/main/resources/assets/netherrocks/models/block/ashstone_brick_stairs.json new file mode 100644 index 00000000..668c57f1 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/ashstone_brick_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "block/stairs", + "textures": { + "bottom": "netherrocks:block/ashstone_bricks", + "top": "netherrocks:block/ashstone_bricks", + "side": "netherrocks:block/ashstone_bricks" + } +} diff --git a/src/main/resources/assets/netherrocks/models/block/ashstone_bricks.json b/src/main/resources/assets/netherrocks/models/block/ashstone_bricks.json new file mode 100644 index 00000000..8e35254e --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/ashstone_bricks.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "netherrocks:block/ashstone_bricks" + } +} diff --git a/src/main/resources/assets/netherrocks/models/block/ashstone_door_bottom.json b/src/main/resources/assets/netherrocks/models/block/ashstone_door_bottom.json new file mode 100644 index 00000000..6b4d9d2c --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/ashstone_door_bottom.json @@ -0,0 +1,7 @@ +{ + "parent": "block/door_bottom", + "textures": { + "bottom": "netherrocks:block/ashstone_door_lower", + "top": "netherrocks:block/ashstone_door_upper" + } +} diff --git a/src/main/resources/assets/netherrocks/models/block/ashstone_door_bottom_rh.json b/src/main/resources/assets/netherrocks/models/block/ashstone_door_bottom_rh.json new file mode 100644 index 00000000..388ceeae --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/ashstone_door_bottom_rh.json @@ -0,0 +1,7 @@ +{ + "parent": "block/door_bottom_rh", + "textures": { + "bottom": "netherrocks:block/ashstone_door_lower", + "top": "netherrocks:block/ashstone_door_upper" + } +} diff --git a/src/main/resources/assets/netherrocks/models/block/ashstone_door_top.json b/src/main/resources/assets/netherrocks/models/block/ashstone_door_top.json new file mode 100644 index 00000000..461b671e --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/ashstone_door_top.json @@ -0,0 +1,7 @@ +{ + "parent": "block/door_top", + "textures": { + "bottom": "netherrocks:block/ashstone_door_lower", + "top": "netherrocks:block/ashstone_door_upper" + } +} diff --git a/src/main/resources/assets/netherrocks/models/block/ashstone_door_top_rh.json b/src/main/resources/assets/netherrocks/models/block/ashstone_door_top_rh.json new file mode 100644 index 00000000..0c0765c2 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/ashstone_door_top_rh.json @@ -0,0 +1,7 @@ +{ + "parent": "block/door_top_rh", + "textures": { + "bottom": "netherrocks:block/ashstone_door_lower", + "top": "netherrocks:block/ashstone_door_upper" + } +} diff --git a/src/main/resources/assets/netherrocks/models/block/dragonstone_bars_cap.json b/src/main/resources/assets/netherrocks/models/block/dragonstone_bars_cap.json new file mode 100644 index 00000000..a952b367 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/dragonstone_bars_cap.json @@ -0,0 +1,24 @@ +{ + "ambientocclusion": false, + "textures": { + "particle": "netherrocks:block/dragonstone_bars", + "bars": "netherrocks:block/dragonstone_bars", + "edge": "netherrocks:block/dragonstone_bars" + }, + "elements": [ + { "from": [ 8, 0, 8 ], + "to": [ 8, 16, 9 ], + "faces": { + "west": { "uv": [ 8, 0, 7, 16 ], "texture": "#bars" }, + "east": { "uv": [ 7, 0, 8, 16 ], "texture": "#bars" } + } + }, + { "from": [ 7, 0, 9 ], + "to": [ 9, 16, 9 ], + "faces": { + "north": { "uv": [ 9, 0, 7, 16 ], "texture": "#bars" }, + "south": { "uv": [ 7, 0, 9, 16 ], "texture": "#bars" } + } + } + ] +} diff --git a/src/main/resources/assets/netherrocks/models/block/dragonstone_bars_cap_alt.json b/src/main/resources/assets/netherrocks/models/block/dragonstone_bars_cap_alt.json new file mode 100644 index 00000000..6f41dcf3 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/dragonstone_bars_cap_alt.json @@ -0,0 +1,24 @@ +{ + "ambientocclusion": false, + "textures": { + "particle": "netherrocks:block/dragonstone_bars", + "bars": "netherrocks:block/dragonstone_bars", + "edge": "netherrocks:block/dragonstone_bars" + }, + "elements": [ + { "from": [ 8, 0, 7 ], + "to": [ 8, 16, 8 ], + "faces": { + "west": { "uv": [ 8, 0, 9, 16 ], "texture": "#bars" }, + "east": { "uv": [ 9, 0, 8, 16 ], "texture": "#bars" } + } + }, + { "from": [ 7, 0, 7 ], + "to": [ 9, 16, 7 ], + "faces": { + "north": { "uv": [ 7, 0, 9, 16 ], "texture": "#bars" }, + "south": { "uv": [ 9, 0, 7, 16 ], "texture": "#bars" } + } + } + ] +} diff --git a/src/main/resources/assets/netherrocks/models/block/dragonstone_bars_post.json b/src/main/resources/assets/netherrocks/models/block/dragonstone_bars_post.json new file mode 100644 index 00000000..fc7cc44d --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/dragonstone_bars_post.json @@ -0,0 +1,23 @@ +{ + "ambientocclusion": false, + "textures": { + "particle": "netherrocks:block/dragonstone_bars", + "bars": "netherrocks:block/dragonstone_bars" + }, + "elements": [ + { "from": [ 8, 0, 7 ], + "to": [ 8, 16, 9 ], + "faces": { + "west": { "uv": [ 7, 0, 9, 16 ], "texture": "#bars" }, + "east": { "uv": [ 9, 0, 7, 16 ], "texture": "#bars" } + } + }, + { "from": [ 7, 0, 8 ], + "to": [ 9, 16, 8 ], + "faces": { + "north": { "uv": [ 7, 0, 9, 16 ], "texture": "#bars" }, + "south": { "uv": [ 9, 0, 7, 16 ], "texture": "#bars" } + } + } + ] +} diff --git a/src/main/resources/assets/netherrocks/models/block/dragonstone_bars_post_ends.json b/src/main/resources/assets/netherrocks/models/block/dragonstone_bars_post_ends.json new file mode 100644 index 00000000..2af75471 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/dragonstone_bars_post_ends.json @@ -0,0 +1,23 @@ +{ + "ambientocclusion": false, + "textures": { + "particle": "netherrocks:block/dragonstone_bars", + "edge": "netherrocks:block/dragonstone_bars" + }, + "elements": [ + { "from": [ 7, 0.001, 7 ], + "to": [ 9, 0.001, 9 ], + "faces": { + "down": { "uv": [ 7, 7, 9, 9 ], "texture": "#edge" }, + "up": { "uv": [ 7, 7, 9, 9 ], "texture": "#edge" } + } + }, + { "from": [ 7, 15.999, 7 ], + "to": [ 9, 15.999, 9 ], + "faces": { + "down": { "uv": [ 7, 7, 9, 9 ], "texture": "#edge" }, + "up": { "uv": [ 7, 7, 9, 9 ], "texture": "#edge" } + } + } + ] +} diff --git a/src/main/resources/assets/netherrocks/models/block/dragonstone_bars_side.json b/src/main/resources/assets/netherrocks/models/block/dragonstone_bars_side.json new file mode 100644 index 00000000..e580f936 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/dragonstone_bars_side.json @@ -0,0 +1,37 @@ +{ + "ambientocclusion": false, + "textures": { + "particle": "netherrocks:block/dragonstone_bars", + "bars": "netherrocks:block/dragonstone_bars", + "edge": "netherrocks:block/dragonstone_bars" + }, + "elements": [ + { "from": [ 8, 0, 0 ], + "to": [ 8, 16, 8 ], + "faces": { + "west": { "uv": [ 16, 0, 8, 16 ], "texture": "#bars" }, + "east": { "uv": [ 8, 0, 16, 16 ], "texture": "#bars" } + } + }, + { "from": [ 7, 0, 0 ], + "to": [ 9, 16, 7 ], + "faces": { + "north": { "uv": [ 7, 0, 9, 16 ], "texture": "#edge", "cullface": "north" } + } + }, + { "from": [ 7, 0.001, 0 ], + "to": [ 9, 0.001, 7 ], + "faces": { + "down": { "uv": [ 9, 0, 7, 7 ], "texture": "#edge" }, + "up": { "uv": [ 7, 0, 9, 7 ], "texture": "#edge" } + } + }, + { "from": [ 7, 15.999, 0 ], + "to": [ 9, 15.999, 7 ], + "faces": { + "down": { "uv": [ 9, 0, 7, 7 ], "texture": "#edge" }, + "up": { "uv": [ 7, 0, 9, 7 ], "texture": "#edge" } + } + } + ] +} diff --git a/src/main/resources/assets/netherrocks/models/block/dragonstone_bars_side_alt.json b/src/main/resources/assets/netherrocks/models/block/dragonstone_bars_side_alt.json new file mode 100644 index 00000000..41236801 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/dragonstone_bars_side_alt.json @@ -0,0 +1,39 @@ +{ + "ambientocclusion": false, + "textures": { + "particle": "netherrocks:block/dragonstone_bars", + "bars": "netherrocks:block/dragonstone_bars", + "edge": "netherrocks:block/dragonstone_bars" + }, + "elements": [ + { "from": [ 8, 0, 8 ], + "to": [ 8, 16, 16 ], + "faces": { + "west": { "uv": [ 8, 0, 0, 16 ], "texture": "#bars" }, + "east": { "uv": [ 0, 0, 8, 16 ], "texture": "#bars" } + } + }, + { "from": [ 7, 0, 9 ], + "to": [ 9, 16, 16 ], + "faces": { + "south": { "uv": [ 7, 0, 9, 16 ], "texture": "#edge", "cullface": "south" }, + "down": { "uv": [ 9, 9, 7, 16 ], "texture": "#edge" }, + "up": { "uv": [ 7, 9, 9, 16 ], "texture": "#edge" } + } + }, + { "from": [ 7, 0.001, 9 ], + "to": [ 9, 0.001, 16 ], + "faces": { + "down": { "uv": [ 9, 9, 7, 16 ], "texture": "#edge" }, + "up": { "uv": [ 7, 9, 9, 16 ], "texture": "#edge" } + } + }, + { "from": [ 7, 15.999, 9 ], + "to": [ 9, 15.999, 16 ], + "faces": { + "down": { "uv": [ 9, 9, 7, 16 ], "texture": "#edge" }, + "up": { "uv": [ 7, 9, 9, 16 ], "texture": "#edge" } + } + } + ] +} diff --git a/src/main/resources/assets/netherrocks/models/block/dragonstone_brick_inner_stairs.json b/src/main/resources/assets/netherrocks/models/block/dragonstone_brick_inner_stairs.json new file mode 100644 index 00000000..37c97002 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/dragonstone_brick_inner_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "block/inner_stairs", + "textures": { + "bottom": "netherrocks:block/dragonstone_bricks", + "top": "netherrocks:block/dragonstone_bricks", + "side": "netherrocks:block/dragonstone_bricks" + } +} diff --git a/src/main/resources/assets/netherrocks/models/block/dragonstone_brick_outer_stairs.json b/src/main/resources/assets/netherrocks/models/block/dragonstone_brick_outer_stairs.json new file mode 100644 index 00000000..b4f71f1d --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/dragonstone_brick_outer_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "block/outer_stairs", + "textures": { + "bottom": "netherrocks:block/dragonstone_bricks", + "top": "netherrocks:block/dragonstone_bricks", + "side": "netherrocks:block/dragonstone_bricks" + } +} diff --git a/src/main/resources/assets/netherrocks/models/block/dragonstone_brick_slab.json b/src/main/resources/assets/netherrocks/models/block/dragonstone_brick_slab.json new file mode 100644 index 00000000..084702f4 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/dragonstone_brick_slab.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab", + "textures": { + "bottom": "netherrocks:block/dragonstone_bricks", + "top": "netherrocks:block/dragonstone_bricks", + "side": "netherrocks:block/dragonstone_bricks" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/netherrocks/models/block/dragonstone_brick_slab_top.json b/src/main/resources/assets/netherrocks/models/block/dragonstone_brick_slab_top.json new file mode 100644 index 00000000..a805f6d3 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/dragonstone_brick_slab_top.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab_top", + "textures": { + "bottom": "netherrocks:block/dragonstone_bricks", + "top": "netherrocks:block/dragonstone_bricks", + "side": "netherrocks:block/dragonstone_bricks" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/netherrocks/models/block/dragonstone_brick_stairs.json b/src/main/resources/assets/netherrocks/models/block/dragonstone_brick_stairs.json new file mode 100644 index 00000000..b39a7cff --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/dragonstone_brick_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "block/stairs", + "textures": { + "bottom": "netherrocks:block/dragonstone_bricks", + "top": "netherrocks:block/dragonstone_bricks", + "side": "netherrocks:block/dragonstone_bricks" + } +} diff --git a/src/main/resources/assets/netherrocks/models/block/dragonstone_bricks.json b/src/main/resources/assets/netherrocks/models/block/dragonstone_bricks.json new file mode 100644 index 00000000..d2a9e1e1 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/dragonstone_bricks.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "netherrocks:block/dragonstone_bricks" + } +} diff --git a/src/main/resources/assets/netherrocks/models/block/dragonstone_door_bottom.json b/src/main/resources/assets/netherrocks/models/block/dragonstone_door_bottom.json new file mode 100644 index 00000000..5d4d561f --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/dragonstone_door_bottom.json @@ -0,0 +1,7 @@ +{ + "parent": "block/door_bottom", + "textures": { + "bottom": "netherrocks:block/dragonstone_door_lower", + "top": "netherrocks:block/dragonstone_door_upper" + } +} diff --git a/src/main/resources/assets/netherrocks/models/block/dragonstone_door_bottom_rh.json b/src/main/resources/assets/netherrocks/models/block/dragonstone_door_bottom_rh.json new file mode 100644 index 00000000..de07cb75 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/dragonstone_door_bottom_rh.json @@ -0,0 +1,7 @@ +{ + "parent": "block/door_bottom_rh", + "textures": { + "bottom": "netherrocks:block/dragonstone_door_lower", + "top": "netherrocks:block/dragonstone_door_upper" + } +} diff --git a/src/main/resources/assets/netherrocks/models/block/dragonstone_door_top.json b/src/main/resources/assets/netherrocks/models/block/dragonstone_door_top.json new file mode 100644 index 00000000..89364333 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/dragonstone_door_top.json @@ -0,0 +1,7 @@ +{ + "parent": "block/door_top", + "textures": { + "bottom": "netherrocks:block/dragonstone_door_lower", + "top": "netherrocks:block/dragonstone_door_upper" + } +} diff --git a/src/main/resources/assets/netherrocks/models/block/dragonstone_door_top_rh.json b/src/main/resources/assets/netherrocks/models/block/dragonstone_door_top_rh.json new file mode 100644 index 00000000..d88c6b5e --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/dragonstone_door_top_rh.json @@ -0,0 +1,7 @@ +{ + "parent": "block/door_top_rh", + "textures": { + "bottom": "netherrocks:block/dragonstone_door_lower", + "top": "netherrocks:block/dragonstone_door_upper" + } +} diff --git a/src/main/resources/assets/netherrocks/models/block/fyrite_bars_cap.json b/src/main/resources/assets/netherrocks/models/block/fyrite_bars_cap.json new file mode 100644 index 00000000..b3397401 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/fyrite_bars_cap.json @@ -0,0 +1,24 @@ +{ + "ambientocclusion": false, + "textures": { + "particle": "netherrocks:block/fyrite_bars", + "bars": "netherrocks:block/fyrite_bars", + "edge": "netherrocks:block/fyrite_bars" + }, + "elements": [ + { "from": [ 8, 0, 8 ], + "to": [ 8, 16, 9 ], + "faces": { + "west": { "uv": [ 8, 0, 7, 16 ], "texture": "#bars" }, + "east": { "uv": [ 7, 0, 8, 16 ], "texture": "#bars" } + } + }, + { "from": [ 7, 0, 9 ], + "to": [ 9, 16, 9 ], + "faces": { + "north": { "uv": [ 9, 0, 7, 16 ], "texture": "#bars" }, + "south": { "uv": [ 7, 0, 9, 16 ], "texture": "#bars" } + } + } + ] +} diff --git a/src/main/resources/assets/netherrocks/models/block/fyrite_bars_cap_alt.json b/src/main/resources/assets/netherrocks/models/block/fyrite_bars_cap_alt.json new file mode 100644 index 00000000..fb3aedce --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/fyrite_bars_cap_alt.json @@ -0,0 +1,24 @@ +{ + "ambientocclusion": false, + "textures": { + "particle": "netherrocks:block/fyrite_bars", + "bars": "netherrocks:block/fyrite_bars", + "edge": "netherrocks:block/fyrite_bars" + }, + "elements": [ + { "from": [ 8, 0, 7 ], + "to": [ 8, 16, 8 ], + "faces": { + "west": { "uv": [ 8, 0, 9, 16 ], "texture": "#bars" }, + "east": { "uv": [ 9, 0, 8, 16 ], "texture": "#bars" } + } + }, + { "from": [ 7, 0, 7 ], + "to": [ 9, 16, 7 ], + "faces": { + "north": { "uv": [ 7, 0, 9, 16 ], "texture": "#bars" }, + "south": { "uv": [ 9, 0, 7, 16 ], "texture": "#bars" } + } + } + ] +} diff --git a/src/main/resources/assets/netherrocks/models/block/fyrite_bars_post.json b/src/main/resources/assets/netherrocks/models/block/fyrite_bars_post.json new file mode 100644 index 00000000..6cba7974 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/fyrite_bars_post.json @@ -0,0 +1,23 @@ +{ + "ambientocclusion": false, + "textures": { + "particle": "netherrocks:block/fyrite_bars", + "bars": "netherrocks:block/fyrite_bars" + }, + "elements": [ + { "from": [ 8, 0, 7 ], + "to": [ 8, 16, 9 ], + "faces": { + "west": { "uv": [ 7, 0, 9, 16 ], "texture": "#bars" }, + "east": { "uv": [ 9, 0, 7, 16 ], "texture": "#bars" } + } + }, + { "from": [ 7, 0, 8 ], + "to": [ 9, 16, 8 ], + "faces": { + "north": { "uv": [ 7, 0, 9, 16 ], "texture": "#bars" }, + "south": { "uv": [ 9, 0, 7, 16 ], "texture": "#bars" } + } + } + ] +} diff --git a/src/main/resources/assets/netherrocks/models/block/fyrite_bars_post_ends.json b/src/main/resources/assets/netherrocks/models/block/fyrite_bars_post_ends.json new file mode 100644 index 00000000..d9323447 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/fyrite_bars_post_ends.json @@ -0,0 +1,23 @@ +{ + "ambientocclusion": false, + "textures": { + "particle": "netherrocks:block/fyrite_bars", + "edge": "netherrocks:block/fyrite_bars" + }, + "elements": [ + { "from": [ 7, 0.001, 7 ], + "to": [ 9, 0.001, 9 ], + "faces": { + "down": { "uv": [ 7, 7, 9, 9 ], "texture": "#edge" }, + "up": { "uv": [ 7, 7, 9, 9 ], "texture": "#edge" } + } + }, + { "from": [ 7, 15.999, 7 ], + "to": [ 9, 15.999, 9 ], + "faces": { + "down": { "uv": [ 7, 7, 9, 9 ], "texture": "#edge" }, + "up": { "uv": [ 7, 7, 9, 9 ], "texture": "#edge" } + } + } + ] +} diff --git a/src/main/resources/assets/netherrocks/models/block/fyrite_bars_side.json b/src/main/resources/assets/netherrocks/models/block/fyrite_bars_side.json new file mode 100644 index 00000000..1a42788b --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/fyrite_bars_side.json @@ -0,0 +1,37 @@ +{ + "ambientocclusion": false, + "textures": { + "particle": "netherrocks:block/fyrite_bars", + "bars": "netherrocks:block/fyrite_bars", + "edge": "netherrocks:block/fyrite_bars" + }, + "elements": [ + { "from": [ 8, 0, 0 ], + "to": [ 8, 16, 8 ], + "faces": { + "west": { "uv": [ 16, 0, 8, 16 ], "texture": "#bars" }, + "east": { "uv": [ 8, 0, 16, 16 ], "texture": "#bars" } + } + }, + { "from": [ 7, 0, 0 ], + "to": [ 9, 16, 7 ], + "faces": { + "north": { "uv": [ 7, 0, 9, 16 ], "texture": "#edge", "cullface": "north" } + } + }, + { "from": [ 7, 0.001, 0 ], + "to": [ 9, 0.001, 7 ], + "faces": { + "down": { "uv": [ 9, 0, 7, 7 ], "texture": "#edge" }, + "up": { "uv": [ 7, 0, 9, 7 ], "texture": "#edge" } + } + }, + { "from": [ 7, 15.999, 0 ], + "to": [ 9, 15.999, 7 ], + "faces": { + "down": { "uv": [ 9, 0, 7, 7 ], "texture": "#edge" }, + "up": { "uv": [ 7, 0, 9, 7 ], "texture": "#edge" } + } + } + ] +} diff --git a/src/main/resources/assets/netherrocks/models/block/fyrite_bars_side_alt.json b/src/main/resources/assets/netherrocks/models/block/fyrite_bars_side_alt.json new file mode 100644 index 00000000..e04d51a8 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/fyrite_bars_side_alt.json @@ -0,0 +1,39 @@ +{ + "ambientocclusion": false, + "textures": { + "particle": "netherrocks:block/fyrite_bars", + "bars": "netherrocks:block/fyrite_bars", + "edge": "netherrocks:block/fyrite_bars" + }, + "elements": [ + { "from": [ 8, 0, 8 ], + "to": [ 8, 16, 16 ], + "faces": { + "west": { "uv": [ 8, 0, 0, 16 ], "texture": "#bars" }, + "east": { "uv": [ 0, 0, 8, 16 ], "texture": "#bars" } + } + }, + { "from": [ 7, 0, 9 ], + "to": [ 9, 16, 16 ], + "faces": { + "south": { "uv": [ 7, 0, 9, 16 ], "texture": "#edge", "cullface": "south" }, + "down": { "uv": [ 9, 9, 7, 16 ], "texture": "#edge" }, + "up": { "uv": [ 7, 9, 9, 16 ], "texture": "#edge" } + } + }, + { "from": [ 7, 0.001, 9 ], + "to": [ 9, 0.001, 16 ], + "faces": { + "down": { "uv": [ 9, 9, 7, 16 ], "texture": "#edge" }, + "up": { "uv": [ 7, 9, 9, 16 ], "texture": "#edge" } + } + }, + { "from": [ 7, 15.999, 9 ], + "to": [ 9, 15.999, 16 ], + "faces": { + "down": { "uv": [ 9, 9, 7, 16 ], "texture": "#edge" }, + "up": { "uv": [ 7, 9, 9, 16 ], "texture": "#edge" } + } + } + ] +} diff --git a/src/main/resources/assets/netherrocks/models/block/fyrite_block.json b/src/main/resources/assets/netherrocks/models/block/fyrite_block.json index b2043826..6db65eb0 100644 --- a/src/main/resources/assets/netherrocks/models/block/fyrite_block.json +++ b/src/main/resources/assets/netherrocks/models/block/fyrite_block.json @@ -1,4 +1,4 @@ { "parent": "block/cube_all", - "textures": { "all": "netherrocks:block/fyrite_block" } + "textures": { "all": "netherrocks:block/fyrite_block_alt" } } \ No newline at end of file diff --git a/src/main/resources/assets/netherrocks/models/block/fyrite_brick_inner_stairs.json b/src/main/resources/assets/netherrocks/models/block/fyrite_brick_inner_stairs.json new file mode 100644 index 00000000..b853419b --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/fyrite_brick_inner_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "block/inner_stairs", + "textures": { + "bottom": "netherrocks:block/fyrite_bricks", + "top": "netherrocks:block/fyrite_bricks", + "side": "netherrocks:block/fyrite_bricks" + } +} diff --git a/src/main/resources/assets/netherrocks/models/block/fyrite_brick_outer_stairs.json b/src/main/resources/assets/netherrocks/models/block/fyrite_brick_outer_stairs.json new file mode 100644 index 00000000..79409d64 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/fyrite_brick_outer_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "block/outer_stairs", + "textures": { + "bottom": "netherrocks:block/fyrite_bricks", + "top": "netherrocks:block/fyrite_bricks", + "side": "netherrocks:block/fyrite_bricks" + } +} diff --git a/src/main/resources/assets/netherrocks/models/block/fyrite_brick_slab.json b/src/main/resources/assets/netherrocks/models/block/fyrite_brick_slab.json new file mode 100644 index 00000000..cbb08244 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/fyrite_brick_slab.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab", + "textures": { + "bottom": "netherrocks:block/fyrite_bricks", + "top": "netherrocks:block/fyrite_bricks", + "side": "netherrocks:block/fyrite_bricks" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/netherrocks/models/block/fyrite_brick_slab_top.json b/src/main/resources/assets/netherrocks/models/block/fyrite_brick_slab_top.json new file mode 100644 index 00000000..7ae2f2fd --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/fyrite_brick_slab_top.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab_top", + "textures": { + "bottom": "netherrocks:block/fyrite_bricks", + "top": "netherrocks:block/fyrite_bricks", + "side": "netherrocks:block/fyrite_bricks" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/netherrocks/models/block/fyrite_brick_stairs.json b/src/main/resources/assets/netherrocks/models/block/fyrite_brick_stairs.json new file mode 100644 index 00000000..530aa273 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/fyrite_brick_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "block/stairs", + "textures": { + "bottom": "netherrocks:block/fyrite_bricks", + "top": "netherrocks:block/fyrite_bricks", + "side": "netherrocks:block/fyrite_bricks" + } +} diff --git a/src/main/resources/assets/netherrocks/models/block/fyrite_bricks.json b/src/main/resources/assets/netherrocks/models/block/fyrite_bricks.json new file mode 100644 index 00000000..23502b77 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/fyrite_bricks.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "netherrocks:block/fyrite_bricks" + } +} diff --git a/src/main/resources/assets/netherrocks/models/block/fyrite_door_bottom.json b/src/main/resources/assets/netherrocks/models/block/fyrite_door_bottom.json new file mode 100644 index 00000000..39fd6905 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/fyrite_door_bottom.json @@ -0,0 +1,7 @@ +{ + "parent": "block/door_bottom", + "textures": { + "bottom": "netherrocks:block/fyrite_door_lower", + "top": "netherrocks:block/fyrite_door_upper" + } +} diff --git a/src/main/resources/assets/netherrocks/models/block/fyrite_door_bottom_rh.json b/src/main/resources/assets/netherrocks/models/block/fyrite_door_bottom_rh.json new file mode 100644 index 00000000..96a152d4 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/fyrite_door_bottom_rh.json @@ -0,0 +1,7 @@ +{ + "parent": "block/door_bottom_rh", + "textures": { + "bottom": "netherrocks:block/fyrite_door_lower", + "top": "netherrocks:block/fyrite_door_upper" + } +} diff --git a/src/main/resources/assets/netherrocks/models/block/fyrite_door_top.json b/src/main/resources/assets/netherrocks/models/block/fyrite_door_top.json new file mode 100644 index 00000000..a8861a4c --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/fyrite_door_top.json @@ -0,0 +1,7 @@ +{ + "parent": "block/door_top", + "textures": { + "bottom": "netherrocks:block/fyrite_door_lower", + "top": "netherrocks:block/fyrite_door_upper" + } +} diff --git a/src/main/resources/assets/netherrocks/models/block/fyrite_door_top_rh.json b/src/main/resources/assets/netherrocks/models/block/fyrite_door_top_rh.json new file mode 100644 index 00000000..bb4ee3b0 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/fyrite_door_top_rh.json @@ -0,0 +1,7 @@ +{ + "parent": "block/door_top_rh", + "textures": { + "bottom": "netherrocks:block/fyrite_door_lower", + "top": "netherrocks:block/fyrite_door_upper" + } +} diff --git a/src/main/resources/assets/netherrocks/models/block/illumenite_bars_cap.json b/src/main/resources/assets/netherrocks/models/block/illumenite_bars_cap.json new file mode 100644 index 00000000..021eec13 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/illumenite_bars_cap.json @@ -0,0 +1,24 @@ +{ + "ambientocclusion": false, + "textures": { + "particle": "netherrocks:block/illumenite_bars", + "bars": "netherrocks:block/illumenite_bars", + "edge": "netherrocks:block/illumenite_bars" + }, + "elements": [ + { "from": [ 8, 0, 8 ], + "to": [ 8, 16, 9 ], + "faces": { + "west": { "uv": [ 8, 0, 7, 16 ], "texture": "#bars" }, + "east": { "uv": [ 7, 0, 8, 16 ], "texture": "#bars" } + } + }, + { "from": [ 7, 0, 9 ], + "to": [ 9, 16, 9 ], + "faces": { + "north": { "uv": [ 9, 0, 7, 16 ], "texture": "#bars" }, + "south": { "uv": [ 7, 0, 9, 16 ], "texture": "#bars" } + } + } + ] +} diff --git a/src/main/resources/assets/netherrocks/models/block/illumenite_bars_cap_alt.json b/src/main/resources/assets/netherrocks/models/block/illumenite_bars_cap_alt.json new file mode 100644 index 00000000..2bd869a1 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/illumenite_bars_cap_alt.json @@ -0,0 +1,24 @@ +{ + "ambientocclusion": false, + "textures": { + "particle": "netherrocks:block/illumenite_bars", + "bars": "netherrocks:block/illumenite_bars", + "edge": "netherrocks:block/illumenite_bars" + }, + "elements": [ + { "from": [ 8, 0, 7 ], + "to": [ 8, 16, 8 ], + "faces": { + "west": { "uv": [ 8, 0, 9, 16 ], "texture": "#bars" }, + "east": { "uv": [ 9, 0, 8, 16 ], "texture": "#bars" } + } + }, + { "from": [ 7, 0, 7 ], + "to": [ 9, 16, 7 ], + "faces": { + "north": { "uv": [ 7, 0, 9, 16 ], "texture": "#bars" }, + "south": { "uv": [ 9, 0, 7, 16 ], "texture": "#bars" } + } + } + ] +} diff --git a/src/main/resources/assets/netherrocks/models/block/illumenite_bars_post.json b/src/main/resources/assets/netherrocks/models/block/illumenite_bars_post.json new file mode 100644 index 00000000..944abe83 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/illumenite_bars_post.json @@ -0,0 +1,23 @@ +{ + "ambientocclusion": false, + "textures": { + "particle": "netherrocks:block/illumenite_bars", + "bars": "netherrocks:block/illumenite_bars" + }, + "elements": [ + { "from": [ 8, 0, 7 ], + "to": [ 8, 16, 9 ], + "faces": { + "west": { "uv": [ 7, 0, 9, 16 ], "texture": "#bars" }, + "east": { "uv": [ 9, 0, 7, 16 ], "texture": "#bars" } + } + }, + { "from": [ 7, 0, 8 ], + "to": [ 9, 16, 8 ], + "faces": { + "north": { "uv": [ 7, 0, 9, 16 ], "texture": "#bars" }, + "south": { "uv": [ 9, 0, 7, 16 ], "texture": "#bars" } + } + } + ] +} diff --git a/src/main/resources/assets/netherrocks/models/block/illumenite_bars_post_ends.json b/src/main/resources/assets/netherrocks/models/block/illumenite_bars_post_ends.json new file mode 100644 index 00000000..ed27b7e1 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/illumenite_bars_post_ends.json @@ -0,0 +1,23 @@ +{ + "ambientocclusion": false, + "textures": { + "particle": "netherrocks:block/illumenite_bars", + "edge": "netherrocks:block/illumenite_bars" + }, + "elements": [ + { "from": [ 7, 0.001, 7 ], + "to": [ 9, 0.001, 9 ], + "faces": { + "down": { "uv": [ 7, 7, 9, 9 ], "texture": "#edge" }, + "up": { "uv": [ 7, 7, 9, 9 ], "texture": "#edge" } + } + }, + { "from": [ 7, 15.999, 7 ], + "to": [ 9, 15.999, 9 ], + "faces": { + "down": { "uv": [ 7, 7, 9, 9 ], "texture": "#edge" }, + "up": { "uv": [ 7, 7, 9, 9 ], "texture": "#edge" } + } + } + ] +} diff --git a/src/main/resources/assets/netherrocks/models/block/illumenite_bars_side.json b/src/main/resources/assets/netherrocks/models/block/illumenite_bars_side.json new file mode 100644 index 00000000..cefcc1be --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/illumenite_bars_side.json @@ -0,0 +1,37 @@ +{ + "ambientocclusion": false, + "textures": { + "particle": "netherrocks:block/illumenite_bars", + "bars": "netherrocks:block/illumenite_bars", + "edge": "netherrocks:block/illumenite_bars" + }, + "elements": [ + { "from": [ 8, 0, 0 ], + "to": [ 8, 16, 8 ], + "faces": { + "west": { "uv": [ 16, 0, 8, 16 ], "texture": "#bars" }, + "east": { "uv": [ 8, 0, 16, 16 ], "texture": "#bars" } + } + }, + { "from": [ 7, 0, 0 ], + "to": [ 9, 16, 7 ], + "faces": { + "north": { "uv": [ 7, 0, 9, 16 ], "texture": "#edge", "cullface": "north" } + } + }, + { "from": [ 7, 0.001, 0 ], + "to": [ 9, 0.001, 7 ], + "faces": { + "down": { "uv": [ 9, 0, 7, 7 ], "texture": "#edge" }, + "up": { "uv": [ 7, 0, 9, 7 ], "texture": "#edge" } + } + }, + { "from": [ 7, 15.999, 0 ], + "to": [ 9, 15.999, 7 ], + "faces": { + "down": { "uv": [ 9, 0, 7, 7 ], "texture": "#edge" }, + "up": { "uv": [ 7, 0, 9, 7 ], "texture": "#edge" } + } + } + ] +} diff --git a/src/main/resources/assets/netherrocks/models/block/illumenite_bars_side_alt.json b/src/main/resources/assets/netherrocks/models/block/illumenite_bars_side_alt.json new file mode 100644 index 00000000..c90a0d4e --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/illumenite_bars_side_alt.json @@ -0,0 +1,39 @@ +{ + "ambientocclusion": false, + "textures": { + "particle": "netherrocks:block/illumenite_bars", + "bars": "netherrocks:block/illumenite_bars", + "edge": "netherrocks:block/illumenite_bars" + }, + "elements": [ + { "from": [ 8, 0, 8 ], + "to": [ 8, 16, 16 ], + "faces": { + "west": { "uv": [ 8, 0, 0, 16 ], "texture": "#bars" }, + "east": { "uv": [ 0, 0, 8, 16 ], "texture": "#bars" } + } + }, + { "from": [ 7, 0, 9 ], + "to": [ 9, 16, 16 ], + "faces": { + "south": { "uv": [ 7, 0, 9, 16 ], "texture": "#edge", "cullface": "south" }, + "down": { "uv": [ 9, 9, 7, 16 ], "texture": "#edge" }, + "up": { "uv": [ 7, 9, 9, 16 ], "texture": "#edge" } + } + }, + { "from": [ 7, 0.001, 9 ], + "to": [ 9, 0.001, 16 ], + "faces": { + "down": { "uv": [ 9, 9, 7, 16 ], "texture": "#edge" }, + "up": { "uv": [ 7, 9, 9, 16 ], "texture": "#edge" } + } + }, + { "from": [ 7, 15.999, 9 ], + "to": [ 9, 15.999, 16 ], + "faces": { + "down": { "uv": [ 9, 9, 7, 16 ], "texture": "#edge" }, + "up": { "uv": [ 7, 9, 9, 16 ], "texture": "#edge" } + } + } + ] +} diff --git a/src/main/resources/assets/netherrocks/models/block/illumenite_brick_inner_stairs.json b/src/main/resources/assets/netherrocks/models/block/illumenite_brick_inner_stairs.json new file mode 100644 index 00000000..07936212 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/illumenite_brick_inner_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "block/inner_stairs", + "textures": { + "bottom": "netherrocks:block/illumenite_bricks", + "top": "netherrocks:block/illumenite_bricks", + "side": "netherrocks:block/illumenite_bricks" + } +} diff --git a/src/main/resources/assets/netherrocks/models/block/illumenite_brick_outer_stairs.json b/src/main/resources/assets/netherrocks/models/block/illumenite_brick_outer_stairs.json new file mode 100644 index 00000000..8d3eebfe --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/illumenite_brick_outer_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "block/outer_stairs", + "textures": { + "bottom": "netherrocks:block/illumenite_bricks", + "top": "netherrocks:block/illumenite_bricks", + "side": "netherrocks:block/illumenite_bricks" + } +} diff --git a/src/main/resources/assets/netherrocks/models/block/illumenite_brick_slab.json b/src/main/resources/assets/netherrocks/models/block/illumenite_brick_slab.json new file mode 100644 index 00000000..b43021d7 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/illumenite_brick_slab.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab", + "textures": { + "bottom": "netherrocks:block/illumenite_bricks", + "top": "netherrocks:block/illumenite_bricks", + "side": "netherrocks:block/illumenite_bricks" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/netherrocks/models/block/illumenite_brick_slab_top.json b/src/main/resources/assets/netherrocks/models/block/illumenite_brick_slab_top.json new file mode 100644 index 00000000..6505de4f --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/illumenite_brick_slab_top.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab_top", + "textures": { + "bottom": "netherrocks:block/illumenite_bricks", + "top": "netherrocks:block/illumenite_bricks", + "side": "netherrocks:block/illumenite_bricks" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/netherrocks/models/block/illumenite_brick_stairs.json b/src/main/resources/assets/netherrocks/models/block/illumenite_brick_stairs.json new file mode 100644 index 00000000..6e1cb975 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/illumenite_brick_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "block/stairs", + "textures": { + "bottom": "netherrocks:block/illumenite_bricks", + "top": "netherrocks:block/illumenite_bricks", + "side": "netherrocks:block/illumenite_bricks" + } +} diff --git a/src/main/resources/assets/netherrocks/models/block/illumenite_bricks.json b/src/main/resources/assets/netherrocks/models/block/illumenite_bricks.json new file mode 100644 index 00000000..6af9527b --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/illumenite_bricks.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "netherrocks:block/illumenite_bricks" + } +} diff --git a/src/main/resources/assets/netherrocks/models/block/illumenite_door_bottom.json b/src/main/resources/assets/netherrocks/models/block/illumenite_door_bottom.json new file mode 100644 index 00000000..0a0c5748 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/illumenite_door_bottom.json @@ -0,0 +1,7 @@ +{ + "parent": "block/door_bottom", + "textures": { + "bottom": "netherrocks:block/illumenite_door_lower", + "top": "netherrocks:block/illumenite_door_upper" + } +} diff --git a/src/main/resources/assets/netherrocks/models/block/illumenite_door_bottom_rh.json b/src/main/resources/assets/netherrocks/models/block/illumenite_door_bottom_rh.json new file mode 100644 index 00000000..e9493040 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/illumenite_door_bottom_rh.json @@ -0,0 +1,7 @@ +{ + "parent": "block/door_bottom_rh", + "textures": { + "bottom": "netherrocks:block/illumenite_door_lower", + "top": "netherrocks:block/illumenite_door_upper" + } +} diff --git a/src/main/resources/assets/netherrocks/models/block/illumenite_door_top.json b/src/main/resources/assets/netherrocks/models/block/illumenite_door_top.json new file mode 100644 index 00000000..7ded17dc --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/illumenite_door_top.json @@ -0,0 +1,7 @@ +{ + "parent": "block/door_top", + "textures": { + "bottom": "netherrocks:block/illumenite_door_lower", + "top": "netherrocks:block/illumenite_door_upper" + } +} diff --git a/src/main/resources/assets/netherrocks/models/block/illumenite_door_top_rh.json b/src/main/resources/assets/netherrocks/models/block/illumenite_door_top_rh.json new file mode 100644 index 00000000..31e1a45d --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/illumenite_door_top_rh.json @@ -0,0 +1,7 @@ +{ + "parent": "block/door_top_rh", + "textures": { + "bottom": "netherrocks:block/illumenite_door_lower", + "top": "netherrocks:block/illumenite_door_upper" + } +} diff --git a/src/main/resources/assets/netherrocks/models/block/malachite_bars_cap.json b/src/main/resources/assets/netherrocks/models/block/malachite_bars_cap.json new file mode 100644 index 00000000..b3fdaf43 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/malachite_bars_cap.json @@ -0,0 +1,24 @@ +{ + "ambientocclusion": false, + "textures": { + "particle": "netherrocks:block/malachite_bars", + "bars": "netherrocks:block/malachite_bars", + "edge": "netherrocks:block/malachite_bars" + }, + "elements": [ + { "from": [ 8, 0, 8 ], + "to": [ 8, 16, 9 ], + "faces": { + "west": { "uv": [ 8, 0, 7, 16 ], "texture": "#bars" }, + "east": { "uv": [ 7, 0, 8, 16 ], "texture": "#bars" } + } + }, + { "from": [ 7, 0, 9 ], + "to": [ 9, 16, 9 ], + "faces": { + "north": { "uv": [ 9, 0, 7, 16 ], "texture": "#bars" }, + "south": { "uv": [ 7, 0, 9, 16 ], "texture": "#bars" } + } + } + ] +} diff --git a/src/main/resources/assets/netherrocks/models/block/malachite_bars_cap_alt.json b/src/main/resources/assets/netherrocks/models/block/malachite_bars_cap_alt.json new file mode 100644 index 00000000..09a7d7a8 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/malachite_bars_cap_alt.json @@ -0,0 +1,24 @@ +{ + "ambientocclusion": false, + "textures": { + "particle": "netherrocks:block/malachite_bars", + "bars": "netherrocks:block/malachite_bars", + "edge": "netherrocks:block/malachite_bars" + }, + "elements": [ + { "from": [ 8, 0, 7 ], + "to": [ 8, 16, 8 ], + "faces": { + "west": { "uv": [ 8, 0, 9, 16 ], "texture": "#bars" }, + "east": { "uv": [ 9, 0, 8, 16 ], "texture": "#bars" } + } + }, + { "from": [ 7, 0, 7 ], + "to": [ 9, 16, 7 ], + "faces": { + "north": { "uv": [ 7, 0, 9, 16 ], "texture": "#bars" }, + "south": { "uv": [ 9, 0, 7, 16 ], "texture": "#bars" } + } + } + ] +} diff --git a/src/main/resources/assets/netherrocks/models/block/malachite_bars_post.json b/src/main/resources/assets/netherrocks/models/block/malachite_bars_post.json new file mode 100644 index 00000000..c40401c1 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/malachite_bars_post.json @@ -0,0 +1,23 @@ +{ + "ambientocclusion": false, + "textures": { + "particle": "netherrocks:block/malachite_bars", + "bars": "netherrocks:block/malachite_bars" + }, + "elements": [ + { "from": [ 8, 0, 7 ], + "to": [ 8, 16, 9 ], + "faces": { + "west": { "uv": [ 7, 0, 9, 16 ], "texture": "#bars" }, + "east": { "uv": [ 9, 0, 7, 16 ], "texture": "#bars" } + } + }, + { "from": [ 7, 0, 8 ], + "to": [ 9, 16, 8 ], + "faces": { + "north": { "uv": [ 7, 0, 9, 16 ], "texture": "#bars" }, + "south": { "uv": [ 9, 0, 7, 16 ], "texture": "#bars" } + } + } + ] +} diff --git a/src/main/resources/assets/netherrocks/models/block/malachite_bars_post_ends.json b/src/main/resources/assets/netherrocks/models/block/malachite_bars_post_ends.json new file mode 100644 index 00000000..fe60cb32 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/malachite_bars_post_ends.json @@ -0,0 +1,23 @@ +{ + "ambientocclusion": false, + "textures": { + "particle": "netherrocks:block/malachite_bars", + "edge": "netherrocks:block/malachite_bars" + }, + "elements": [ + { "from": [ 7, 0.001, 7 ], + "to": [ 9, 0.001, 9 ], + "faces": { + "down": { "uv": [ 7, 7, 9, 9 ], "texture": "#edge" }, + "up": { "uv": [ 7, 7, 9, 9 ], "texture": "#edge" } + } + }, + { "from": [ 7, 15.999, 7 ], + "to": [ 9, 15.999, 9 ], + "faces": { + "down": { "uv": [ 7, 7, 9, 9 ], "texture": "#edge" }, + "up": { "uv": [ 7, 7, 9, 9 ], "texture": "#edge" } + } + } + ] +} diff --git a/src/main/resources/assets/netherrocks/models/block/malachite_bars_side.json b/src/main/resources/assets/netherrocks/models/block/malachite_bars_side.json new file mode 100644 index 00000000..02710159 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/malachite_bars_side.json @@ -0,0 +1,37 @@ +{ + "ambientocclusion": false, + "textures": { + "particle": "netherrocks:block/malachite_bars", + "bars": "netherrocks:block/malachite_bars", + "edge": "netherrocks:block/malachite_bars" + }, + "elements": [ + { "from": [ 8, 0, 0 ], + "to": [ 8, 16, 8 ], + "faces": { + "west": { "uv": [ 16, 0, 8, 16 ], "texture": "#bars" }, + "east": { "uv": [ 8, 0, 16, 16 ], "texture": "#bars" } + } + }, + { "from": [ 7, 0, 0 ], + "to": [ 9, 16, 7 ], + "faces": { + "north": { "uv": [ 7, 0, 9, 16 ], "texture": "#edge", "cullface": "north" } + } + }, + { "from": [ 7, 0.001, 0 ], + "to": [ 9, 0.001, 7 ], + "faces": { + "down": { "uv": [ 9, 0, 7, 7 ], "texture": "#edge" }, + "up": { "uv": [ 7, 0, 9, 7 ], "texture": "#edge" } + } + }, + { "from": [ 7, 15.999, 0 ], + "to": [ 9, 15.999, 7 ], + "faces": { + "down": { "uv": [ 9, 0, 7, 7 ], "texture": "#edge" }, + "up": { "uv": [ 7, 0, 9, 7 ], "texture": "#edge" } + } + } + ] +} diff --git a/src/main/resources/assets/netherrocks/models/block/malachite_bars_side_alt.json b/src/main/resources/assets/netherrocks/models/block/malachite_bars_side_alt.json new file mode 100644 index 00000000..c6f32124 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/malachite_bars_side_alt.json @@ -0,0 +1,39 @@ +{ + "ambientocclusion": false, + "textures": { + "particle": "netherrocks:block/malachite_bars", + "bars": "netherrocks:block/malachite_bars", + "edge": "netherrocks:block/malachite_bars" + }, + "elements": [ + { "from": [ 8, 0, 8 ], + "to": [ 8, 16, 16 ], + "faces": { + "west": { "uv": [ 8, 0, 0, 16 ], "texture": "#bars" }, + "east": { "uv": [ 0, 0, 8, 16 ], "texture": "#bars" } + } + }, + { "from": [ 7, 0, 9 ], + "to": [ 9, 16, 16 ], + "faces": { + "south": { "uv": [ 7, 0, 9, 16 ], "texture": "#edge", "cullface": "south" }, + "down": { "uv": [ 9, 9, 7, 16 ], "texture": "#edge" }, + "up": { "uv": [ 7, 9, 9, 16 ], "texture": "#edge" } + } + }, + { "from": [ 7, 0.001, 9 ], + "to": [ 9, 0.001, 16 ], + "faces": { + "down": { "uv": [ 9, 9, 7, 16 ], "texture": "#edge" }, + "up": { "uv": [ 7, 9, 9, 16 ], "texture": "#edge" } + } + }, + { "from": [ 7, 15.999, 9 ], + "to": [ 9, 15.999, 16 ], + "faces": { + "down": { "uv": [ 9, 9, 7, 16 ], "texture": "#edge" }, + "up": { "uv": [ 7, 9, 9, 16 ], "texture": "#edge" } + } + } + ] +} diff --git a/src/main/resources/assets/netherrocks/models/block/malachite_brick_inner_stairs.json b/src/main/resources/assets/netherrocks/models/block/malachite_brick_inner_stairs.json new file mode 100644 index 00000000..54257844 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/malachite_brick_inner_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "block/inner_stairs", + "textures": { + "bottom": "netherrocks:block/malachite_bricks", + "top": "netherrocks:block/malachite_bricks", + "side": "netherrocks:block/malachite_bricks" + } +} diff --git a/src/main/resources/assets/netherrocks/models/block/malachite_brick_outer_stairs.json b/src/main/resources/assets/netherrocks/models/block/malachite_brick_outer_stairs.json new file mode 100644 index 00000000..325d1563 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/malachite_brick_outer_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "block/outer_stairs", + "textures": { + "bottom": "netherrocks:block/malachite_bricks", + "top": "netherrocks:block/malachite_bricks", + "side": "netherrocks:block/malachite_bricks" + } +} diff --git a/src/main/resources/assets/netherrocks/models/block/malachite_brick_slab.json b/src/main/resources/assets/netherrocks/models/block/malachite_brick_slab.json new file mode 100644 index 00000000..ebe28bcb --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/malachite_brick_slab.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab", + "textures": { + "bottom": "netherrocks:block/malachite_bricks", + "top": "netherrocks:block/malachite_bricks", + "side": "netherrocks:block/malachite_bricks" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/netherrocks/models/block/malachite_brick_slab_top.json b/src/main/resources/assets/netherrocks/models/block/malachite_brick_slab_top.json new file mode 100644 index 00000000..11928e6c --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/malachite_brick_slab_top.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab_top", + "textures": { + "bottom": "netherrocks:block/malachite_bricks", + "top": "netherrocks:block/malachite_bricks", + "side": "netherrocks:block/malachite_bricks" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/netherrocks/models/block/malachite_brick_stairs.json b/src/main/resources/assets/netherrocks/models/block/malachite_brick_stairs.json new file mode 100644 index 00000000..60fbfc80 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/malachite_brick_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "block/stairs", + "textures": { + "bottom": "netherrocks:block/malachite_bricks", + "top": "netherrocks:block/malachite_bricks", + "side": "netherrocks:block/malachite_bricks" + } +} diff --git a/src/main/resources/assets/netherrocks/models/block/malachite_bricks.json b/src/main/resources/assets/netherrocks/models/block/malachite_bricks.json new file mode 100644 index 00000000..7f69a421 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/malachite_bricks.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "netherrocks:block/malachite_bricks" + } +} diff --git a/src/main/resources/assets/netherrocks/models/block/malachite_door_bottom.json b/src/main/resources/assets/netherrocks/models/block/malachite_door_bottom.json new file mode 100644 index 00000000..f0da8927 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/malachite_door_bottom.json @@ -0,0 +1,7 @@ +{ + "parent": "block/door_bottom", + "textures": { + "bottom": "netherrocks:block/malachite_door_lower", + "top": "netherrocks:block/malachite_door_upper" + } +} diff --git a/src/main/resources/assets/netherrocks/models/block/malachite_door_bottom_rh.json b/src/main/resources/assets/netherrocks/models/block/malachite_door_bottom_rh.json new file mode 100644 index 00000000..aae4557d --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/malachite_door_bottom_rh.json @@ -0,0 +1,7 @@ +{ + "parent": "block/door_bottom_rh", + "textures": { + "bottom": "netherrocks:block/malachite_door_lower", + "top": "netherrocks:block/malachite_door_upper" + } +} diff --git a/src/main/resources/assets/netherrocks/models/block/malachite_door_top.json b/src/main/resources/assets/netherrocks/models/block/malachite_door_top.json new file mode 100644 index 00000000..66e3f5f8 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/malachite_door_top.json @@ -0,0 +1,7 @@ +{ + "parent": "block/door_top", + "textures": { + "bottom": "netherrocks:block/malachite_door_lower", + "top": "netherrocks:block/malachite_door_upper" + } +} diff --git a/src/main/resources/assets/netherrocks/models/block/malachite_door_top_rh.json b/src/main/resources/assets/netherrocks/models/block/malachite_door_top_rh.json new file mode 100644 index 00000000..6ed198a3 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/malachite_door_top_rh.json @@ -0,0 +1,7 @@ +{ + "parent": "block/door_top_rh", + "textures": { + "bottom": "netherrocks:block/malachite_door_lower", + "top": "netherrocks:block/malachite_door_upper" + } +} diff --git a/src/main/resources/assets/netherrocks/models/block/raw_argonite_block.json b/src/main/resources/assets/netherrocks/models/block/raw_argonite_block.json new file mode 100644 index 00000000..214d80a1 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/raw_argonite_block.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "netherrocks:block/raw_argonite_block" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/netherrocks/models/block/raw_fyrite_block.json b/src/main/resources/assets/netherrocks/models/block/raw_fyrite_block.json new file mode 100644 index 00000000..d66cb327 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/raw_fyrite_block.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "netherrocks:block/raw_fyrite_block" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/netherrocks/models/block/raw_illumenite_block.json b/src/main/resources/assets/netherrocks/models/block/raw_illumenite_block.json new file mode 100644 index 00000000..90a2e83e --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/raw_illumenite_block.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "netherrocks:block/raw_illumenite_block" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/netherrocks/models/block/raw_malachite_block.json b/src/main/resources/assets/netherrocks/models/block/raw_malachite_block.json new file mode 100644 index 00000000..2668460e --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/block/raw_malachite_block.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "netherrocks:block/raw_malachite_block" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/netherrocks/models/item/argonite_bars.json b/src/main/resources/assets/netherrocks/models/item/argonite_bars.json new file mode 100644 index 00000000..d64d518a --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/item/argonite_bars.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "netherrocks:block/argonite_bars" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/netherrocks/models/item/argonite_brick_slab.json b/src/main/resources/assets/netherrocks/models/item/argonite_brick_slab.json new file mode 100644 index 00000000..207e30ce --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/item/argonite_brick_slab.json @@ -0,0 +1,3 @@ +{ + "parent": "netherrocks:block/argonite_brick_slab" +} \ No newline at end of file diff --git a/src/main/resources/assets/netherrocks/models/item/argonite_brick_stairs.json b/src/main/resources/assets/netherrocks/models/item/argonite_brick_stairs.json new file mode 100644 index 00000000..889c6bed --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/item/argonite_brick_stairs.json @@ -0,0 +1,3 @@ +{ + "parent": "netherrocks:block/argonite_brick_stairs" +} \ No newline at end of file diff --git a/src/main/resources/assets/netherrocks/models/item/argonite_bricks.json b/src/main/resources/assets/netherrocks/models/item/argonite_bricks.json new file mode 100644 index 00000000..a98432e9 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/item/argonite_bricks.json @@ -0,0 +1,3 @@ +{ + "parent": "netherrocks:block/argonite_bricks" +} diff --git a/src/main/resources/assets/netherrocks/models/item/argonite_door.json b/src/main/resources/assets/netherrocks/models/item/argonite_door.json new file mode 100644 index 00000000..a2b66111 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/item/argonite_door.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "netherrocks:item/argonite_door" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/netherrocks/models/item/ashstone_bars.json b/src/main/resources/assets/netherrocks/models/item/ashstone_bars.json new file mode 100644 index 00000000..dcdbe977 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/item/ashstone_bars.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "netherrocks:block/ashstone_bars" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/netherrocks/models/item/ashstone_brick_slab.json b/src/main/resources/assets/netherrocks/models/item/ashstone_brick_slab.json new file mode 100644 index 00000000..9dcfbda2 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/item/ashstone_brick_slab.json @@ -0,0 +1,3 @@ +{ + "parent": "netherrocks:block/ashstone_brick_slab" +} \ No newline at end of file diff --git a/src/main/resources/assets/netherrocks/models/item/ashstone_brick_stairs.json b/src/main/resources/assets/netherrocks/models/item/ashstone_brick_stairs.json new file mode 100644 index 00000000..6c9386d9 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/item/ashstone_brick_stairs.json @@ -0,0 +1,3 @@ +{ + "parent": "netherrocks:block/ashstone_brick_stairs" +} \ No newline at end of file diff --git a/src/main/resources/assets/netherrocks/models/item/ashstone_bricks.json b/src/main/resources/assets/netherrocks/models/item/ashstone_bricks.json new file mode 100644 index 00000000..08252096 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/item/ashstone_bricks.json @@ -0,0 +1,3 @@ +{ + "parent": "netherrocks:block/ashstone_bricks" +} diff --git a/src/main/resources/assets/netherrocks/models/item/ashstone_door.json b/src/main/resources/assets/netherrocks/models/item/ashstone_door.json new file mode 100644 index 00000000..33db5c02 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/item/ashstone_door.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "netherrocks:item/ashstone_door" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/netherrocks/models/item/dragonstone_bars.json b/src/main/resources/assets/netherrocks/models/item/dragonstone_bars.json new file mode 100644 index 00000000..10d8db00 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/item/dragonstone_bars.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "netherrocks:block/dragonstone_bars" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/netherrocks/models/item/dragonstone_brick_slab.json b/src/main/resources/assets/netherrocks/models/item/dragonstone_brick_slab.json new file mode 100644 index 00000000..bcc76e28 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/item/dragonstone_brick_slab.json @@ -0,0 +1,3 @@ +{ + "parent": "netherrocks:block/dragonstone_brick_slab" +} \ No newline at end of file diff --git a/src/main/resources/assets/netherrocks/models/item/dragonstone_brick_stairs.json b/src/main/resources/assets/netherrocks/models/item/dragonstone_brick_stairs.json new file mode 100644 index 00000000..4490a1ed --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/item/dragonstone_brick_stairs.json @@ -0,0 +1,3 @@ +{ + "parent": "netherrocks:block/dragonstone_brick_stairs" +} \ No newline at end of file diff --git a/src/main/resources/assets/netherrocks/models/item/dragonstone_bricks.json b/src/main/resources/assets/netherrocks/models/item/dragonstone_bricks.json new file mode 100644 index 00000000..9b15d9dc --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/item/dragonstone_bricks.json @@ -0,0 +1,3 @@ +{ + "parent": "netherrocks:block/dragonstone_bricks" +} diff --git a/src/main/resources/assets/netherrocks/models/item/dragonstone_door.json b/src/main/resources/assets/netherrocks/models/item/dragonstone_door.json new file mode 100644 index 00000000..d7bff3de --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/item/dragonstone_door.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "netherrocks:item/dragonstone_door" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/netherrocks/models/item/fyrite_bars.json b/src/main/resources/assets/netherrocks/models/item/fyrite_bars.json new file mode 100644 index 00000000..23ab0d21 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/item/fyrite_bars.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "netherrocks:block/fyrite_bars" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/netherrocks/models/item/fyrite_brick_slab.json b/src/main/resources/assets/netherrocks/models/item/fyrite_brick_slab.json new file mode 100644 index 00000000..489a4442 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/item/fyrite_brick_slab.json @@ -0,0 +1,3 @@ +{ + "parent": "netherrocks:block/fyrite_brick_slab" +} \ No newline at end of file diff --git a/src/main/resources/assets/netherrocks/models/item/fyrite_brick_stairs.json b/src/main/resources/assets/netherrocks/models/item/fyrite_brick_stairs.json new file mode 100644 index 00000000..44ebb358 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/item/fyrite_brick_stairs.json @@ -0,0 +1,3 @@ +{ + "parent": "netherrocks:block/fyrite_brick_stairs" +} \ No newline at end of file diff --git a/src/main/resources/assets/netherrocks/models/item/fyrite_bricks.json b/src/main/resources/assets/netherrocks/models/item/fyrite_bricks.json new file mode 100644 index 00000000..a7596395 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/item/fyrite_bricks.json @@ -0,0 +1,3 @@ +{ + "parent": "netherrocks:block/fyrite_bricks" +} diff --git a/src/main/resources/assets/netherrocks/models/item/fyrite_door.json b/src/main/resources/assets/netherrocks/models/item/fyrite_door.json new file mode 100644 index 00000000..9977c8c9 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/item/fyrite_door.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "netherrocks:item/fyrite_door" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/netherrocks/models/item/illumenite_bars.json b/src/main/resources/assets/netherrocks/models/item/illumenite_bars.json new file mode 100644 index 00000000..e9e93f46 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/item/illumenite_bars.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "netherrocks:block/illumenite_bars" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/netherrocks/models/item/illumenite_brick_slab.json b/src/main/resources/assets/netherrocks/models/item/illumenite_brick_slab.json new file mode 100644 index 00000000..7638c5c7 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/item/illumenite_brick_slab.json @@ -0,0 +1,3 @@ +{ + "parent": "netherrocks:block/illumenite_brick_slab" +} \ No newline at end of file diff --git a/src/main/resources/assets/netherrocks/models/item/illumenite_brick_stairs.json b/src/main/resources/assets/netherrocks/models/item/illumenite_brick_stairs.json new file mode 100644 index 00000000..4c418530 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/item/illumenite_brick_stairs.json @@ -0,0 +1,3 @@ +{ + "parent": "netherrocks:block/illumenite_brick_stairs" +} \ No newline at end of file diff --git a/src/main/resources/assets/netherrocks/models/item/illumenite_bricks.json b/src/main/resources/assets/netherrocks/models/item/illumenite_bricks.json new file mode 100644 index 00000000..c5194c8e --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/item/illumenite_bricks.json @@ -0,0 +1,3 @@ +{ + "parent": "netherrocks:block/illumenite_bricks" +} diff --git a/src/main/resources/assets/netherrocks/models/item/illumenite_door.json b/src/main/resources/assets/netherrocks/models/item/illumenite_door.json new file mode 100644 index 00000000..adc3fc1f --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/item/illumenite_door.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "netherrocks:item/illumenite_door" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/netherrocks/models/item/malachite_bars.json b/src/main/resources/assets/netherrocks/models/item/malachite_bars.json new file mode 100644 index 00000000..2d038b06 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/item/malachite_bars.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "netherrocks:block/malachite_bars" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/netherrocks/models/item/malachite_brick_slab.json b/src/main/resources/assets/netherrocks/models/item/malachite_brick_slab.json new file mode 100644 index 00000000..30b7a9a0 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/item/malachite_brick_slab.json @@ -0,0 +1,3 @@ +{ + "parent": "netherrocks:block/malachite_brick_slab" +} \ No newline at end of file diff --git a/src/main/resources/assets/netherrocks/models/item/malachite_brick_stairs.json b/src/main/resources/assets/netherrocks/models/item/malachite_brick_stairs.json new file mode 100644 index 00000000..e3f91f03 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/item/malachite_brick_stairs.json @@ -0,0 +1,3 @@ +{ + "parent": "netherrocks:block/malachite_brick_stairs" +} \ No newline at end of file diff --git a/src/main/resources/assets/netherrocks/models/item/malachite_bricks.json b/src/main/resources/assets/netherrocks/models/item/malachite_bricks.json new file mode 100644 index 00000000..8fb556c3 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/item/malachite_bricks.json @@ -0,0 +1,3 @@ +{ + "parent": "netherrocks:block/malachite_bricks" +} diff --git a/src/main/resources/assets/netherrocks/models/item/malachite_door.json b/src/main/resources/assets/netherrocks/models/item/malachite_door.json new file mode 100644 index 00000000..7fd5a2ca --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/item/malachite_door.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "netherrocks:item/malachite_door" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/netherrocks/models/item/raw_argonite.json b/src/main/resources/assets/netherrocks/models/item/raw_argonite.json new file mode 100644 index 00000000..0e68ac19 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/item/raw_argonite.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "netherrocks:item/raw_argonite" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/netherrocks/models/item/raw_argonite_block.json b/src/main/resources/assets/netherrocks/models/item/raw_argonite_block.json new file mode 100644 index 00000000..35987a37 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/item/raw_argonite_block.json @@ -0,0 +1,3 @@ +{ + "parent": "netherrocks:block/raw_argonite_block" +} \ No newline at end of file diff --git a/src/main/resources/assets/netherrocks/models/item/raw_fyrite.json b/src/main/resources/assets/netherrocks/models/item/raw_fyrite.json new file mode 100644 index 00000000..736c4db1 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/item/raw_fyrite.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "netherrocks:item/raw_fyrite" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/netherrocks/models/item/raw_fyrite_block.json b/src/main/resources/assets/netherrocks/models/item/raw_fyrite_block.json new file mode 100644 index 00000000..ef7a25f9 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/item/raw_fyrite_block.json @@ -0,0 +1,3 @@ +{ + "parent": "netherrocks:block/raw_fyrite_block" +} \ No newline at end of file diff --git a/src/main/resources/assets/netherrocks/models/item/raw_illumenite.json b/src/main/resources/assets/netherrocks/models/item/raw_illumenite.json new file mode 100644 index 00000000..d769c362 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/item/raw_illumenite.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "netherrocks:item/raw_illumenite" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/netherrocks/models/item/raw_illumenite_block.json b/src/main/resources/assets/netherrocks/models/item/raw_illumenite_block.json new file mode 100644 index 00000000..dd635efd --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/item/raw_illumenite_block.json @@ -0,0 +1,3 @@ +{ + "parent": "netherrocks:block/raw_illumenite_block" +} \ No newline at end of file diff --git a/src/main/resources/assets/netherrocks/models/item/raw_malachite.json b/src/main/resources/assets/netherrocks/models/item/raw_malachite.json new file mode 100644 index 00000000..7a27f6c8 --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/item/raw_malachite.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "netherrocks:item/raw_malachite" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/netherrocks/models/item/raw_malachite_block.json b/src/main/resources/assets/netherrocks/models/item/raw_malachite_block.json new file mode 100644 index 00000000..bac9ce0a --- /dev/null +++ b/src/main/resources/assets/netherrocks/models/item/raw_malachite_block.json @@ -0,0 +1,3 @@ +{ + "parent": "netherrocks:block/raw_malachite_block" +} \ No newline at end of file diff --git a/src/main/resources/assets/netherrocks/textures/block/argonite_bars.png b/src/main/resources/assets/netherrocks/textures/block/argonite_bars.png new file mode 100644 index 00000000..66d30713 Binary files /dev/null and b/src/main/resources/assets/netherrocks/textures/block/argonite_bars.png differ diff --git a/src/main/resources/assets/netherrocks/textures/block/argonite_bricks.png b/src/main/resources/assets/netherrocks/textures/block/argonite_bricks.png new file mode 100644 index 00000000..34e96f00 Binary files /dev/null and b/src/main/resources/assets/netherrocks/textures/block/argonite_bricks.png differ diff --git a/src/main/resources/assets/netherrocks/textures/block/argonite_door_lower.png b/src/main/resources/assets/netherrocks/textures/block/argonite_door_lower.png new file mode 100644 index 00000000..5c021772 Binary files /dev/null and b/src/main/resources/assets/netherrocks/textures/block/argonite_door_lower.png differ diff --git a/src/main/resources/assets/netherrocks/textures/block/argonite_door_upper.png b/src/main/resources/assets/netherrocks/textures/block/argonite_door_upper.png new file mode 100644 index 00000000..2e12d7f5 Binary files /dev/null and b/src/main/resources/assets/netherrocks/textures/block/argonite_door_upper.png differ diff --git a/src/main/resources/assets/netherrocks/textures/block/ashstone_bars.png b/src/main/resources/assets/netherrocks/textures/block/ashstone_bars.png new file mode 100644 index 00000000..0c03dbd7 Binary files /dev/null and b/src/main/resources/assets/netherrocks/textures/block/ashstone_bars.png differ diff --git a/src/main/resources/assets/netherrocks/textures/block/ashstone_bricks.png b/src/main/resources/assets/netherrocks/textures/block/ashstone_bricks.png new file mode 100644 index 00000000..b9142607 Binary files /dev/null and b/src/main/resources/assets/netherrocks/textures/block/ashstone_bricks.png differ diff --git a/src/main/resources/assets/netherrocks/textures/block/ashstone_door_lower.png b/src/main/resources/assets/netherrocks/textures/block/ashstone_door_lower.png new file mode 100644 index 00000000..7958c0b5 Binary files /dev/null and b/src/main/resources/assets/netherrocks/textures/block/ashstone_door_lower.png differ diff --git a/src/main/resources/assets/netherrocks/textures/block/ashstone_door_upper.png b/src/main/resources/assets/netherrocks/textures/block/ashstone_door_upper.png new file mode 100644 index 00000000..9f721b72 Binary files /dev/null and b/src/main/resources/assets/netherrocks/textures/block/ashstone_door_upper.png differ diff --git a/src/main/resources/assets/netherrocks/textures/block/dragonstone_bars.png b/src/main/resources/assets/netherrocks/textures/block/dragonstone_bars.png new file mode 100644 index 00000000..7258002a Binary files /dev/null and b/src/main/resources/assets/netherrocks/textures/block/dragonstone_bars.png differ diff --git a/src/main/resources/assets/netherrocks/textures/block/dragonstone_bricks.png b/src/main/resources/assets/netherrocks/textures/block/dragonstone_bricks.png new file mode 100644 index 00000000..3e4a1a01 Binary files /dev/null and b/src/main/resources/assets/netherrocks/textures/block/dragonstone_bricks.png differ diff --git a/src/main/resources/assets/netherrocks/textures/block/dragonstone_door_lower.png b/src/main/resources/assets/netherrocks/textures/block/dragonstone_door_lower.png new file mode 100644 index 00000000..4e4e39bb Binary files /dev/null and b/src/main/resources/assets/netherrocks/textures/block/dragonstone_door_lower.png differ diff --git a/src/main/resources/assets/netherrocks/textures/block/dragonstone_door_upper.png b/src/main/resources/assets/netherrocks/textures/block/dragonstone_door_upper.png new file mode 100644 index 00000000..b9d8dd72 Binary files /dev/null and b/src/main/resources/assets/netherrocks/textures/block/dragonstone_door_upper.png differ diff --git a/src/main/resources/assets/netherrocks/textures/block/fyrite_bars.png b/src/main/resources/assets/netherrocks/textures/block/fyrite_bars.png new file mode 100644 index 00000000..96f27e65 Binary files /dev/null and b/src/main/resources/assets/netherrocks/textures/block/fyrite_bars.png differ diff --git a/src/main/resources/assets/netherrocks/textures/block/fyrite_block_alt.png b/src/main/resources/assets/netherrocks/textures/block/fyrite_block_alt.png new file mode 100644 index 00000000..4d832e6f Binary files /dev/null and b/src/main/resources/assets/netherrocks/textures/block/fyrite_block_alt.png differ diff --git a/src/main/resources/assets/netherrocks/textures/block/fyrite_bricks.png b/src/main/resources/assets/netherrocks/textures/block/fyrite_bricks.png new file mode 100644 index 00000000..58875409 Binary files /dev/null and b/src/main/resources/assets/netherrocks/textures/block/fyrite_bricks.png differ diff --git a/src/main/resources/assets/netherrocks/textures/block/fyrite_door_lower.png b/src/main/resources/assets/netherrocks/textures/block/fyrite_door_lower.png new file mode 100644 index 00000000..fa17113c Binary files /dev/null and b/src/main/resources/assets/netherrocks/textures/block/fyrite_door_lower.png differ diff --git a/src/main/resources/assets/netherrocks/textures/block/fyrite_door_upper.png b/src/main/resources/assets/netherrocks/textures/block/fyrite_door_upper.png new file mode 100644 index 00000000..a5536434 Binary files /dev/null and b/src/main/resources/assets/netherrocks/textures/block/fyrite_door_upper.png differ diff --git a/src/main/resources/assets/netherrocks/textures/block/illumenite_bars.png b/src/main/resources/assets/netherrocks/textures/block/illumenite_bars.png new file mode 100644 index 00000000..52a55c00 Binary files /dev/null and b/src/main/resources/assets/netherrocks/textures/block/illumenite_bars.png differ diff --git a/src/main/resources/assets/netherrocks/textures/block/illumenite_bricks.png b/src/main/resources/assets/netherrocks/textures/block/illumenite_bricks.png new file mode 100644 index 00000000..7956c66c Binary files /dev/null and b/src/main/resources/assets/netherrocks/textures/block/illumenite_bricks.png differ diff --git a/src/main/resources/assets/netherrocks/textures/block/illumenite_door_lower.png b/src/main/resources/assets/netherrocks/textures/block/illumenite_door_lower.png new file mode 100644 index 00000000..833b7de9 Binary files /dev/null and b/src/main/resources/assets/netherrocks/textures/block/illumenite_door_lower.png differ diff --git a/src/main/resources/assets/netherrocks/textures/block/illumenite_door_upper.png b/src/main/resources/assets/netherrocks/textures/block/illumenite_door_upper.png new file mode 100644 index 00000000..c63511bd Binary files /dev/null and b/src/main/resources/assets/netherrocks/textures/block/illumenite_door_upper.png differ diff --git a/src/main/resources/assets/netherrocks/textures/block/malachite_bars.png b/src/main/resources/assets/netherrocks/textures/block/malachite_bars.png new file mode 100644 index 00000000..f860103c Binary files /dev/null and b/src/main/resources/assets/netherrocks/textures/block/malachite_bars.png differ diff --git a/src/main/resources/assets/netherrocks/textures/block/malachite_bricks.png b/src/main/resources/assets/netherrocks/textures/block/malachite_bricks.png new file mode 100644 index 00000000..8677a53b Binary files /dev/null and b/src/main/resources/assets/netherrocks/textures/block/malachite_bricks.png differ diff --git a/src/main/resources/assets/netherrocks/textures/block/malachite_door_lower.png b/src/main/resources/assets/netherrocks/textures/block/malachite_door_lower.png new file mode 100644 index 00000000..bf36760f Binary files /dev/null and b/src/main/resources/assets/netherrocks/textures/block/malachite_door_lower.png differ diff --git a/src/main/resources/assets/netherrocks/textures/block/malachite_door_upper.png b/src/main/resources/assets/netherrocks/textures/block/malachite_door_upper.png new file mode 100644 index 00000000..589373e9 Binary files /dev/null and b/src/main/resources/assets/netherrocks/textures/block/malachite_door_upper.png differ diff --git a/src/main/resources/assets/netherrocks/textures/block/raw_argonite_block.png b/src/main/resources/assets/netherrocks/textures/block/raw_argonite_block.png new file mode 100644 index 00000000..20d4d106 Binary files /dev/null and b/src/main/resources/assets/netherrocks/textures/block/raw_argonite_block.png differ diff --git a/src/main/resources/assets/netherrocks/textures/block/raw_fyrite_block.png b/src/main/resources/assets/netherrocks/textures/block/raw_fyrite_block.png new file mode 100644 index 00000000..8b97d2b2 Binary files /dev/null and b/src/main/resources/assets/netherrocks/textures/block/raw_fyrite_block.png differ diff --git a/src/main/resources/assets/netherrocks/textures/block/raw_illumenite_block.png b/src/main/resources/assets/netherrocks/textures/block/raw_illumenite_block.png new file mode 100644 index 00000000..c4dc7c82 Binary files /dev/null and b/src/main/resources/assets/netherrocks/textures/block/raw_illumenite_block.png differ diff --git a/src/main/resources/assets/netherrocks/textures/block/raw_malachite_block.png b/src/main/resources/assets/netherrocks/textures/block/raw_malachite_block.png new file mode 100644 index 00000000..41751689 Binary files /dev/null and b/src/main/resources/assets/netherrocks/textures/block/raw_malachite_block.png differ diff --git a/src/main/resources/assets/netherrocks/textures/item/argonite_door.png b/src/main/resources/assets/netherrocks/textures/item/argonite_door.png new file mode 100644 index 00000000..3602a6eb Binary files /dev/null and b/src/main/resources/assets/netherrocks/textures/item/argonite_door.png differ diff --git a/src/main/resources/assets/netherrocks/textures/item/ashstone_door.png b/src/main/resources/assets/netherrocks/textures/item/ashstone_door.png new file mode 100644 index 00000000..12e5ad4b Binary files /dev/null and b/src/main/resources/assets/netherrocks/textures/item/ashstone_door.png differ diff --git a/src/main/resources/assets/netherrocks/textures/item/dragonstone_door.png b/src/main/resources/assets/netherrocks/textures/item/dragonstone_door.png new file mode 100644 index 00000000..25b7ce14 Binary files /dev/null and b/src/main/resources/assets/netherrocks/textures/item/dragonstone_door.png differ diff --git a/src/main/resources/assets/netherrocks/textures/item/fyrite_door.png b/src/main/resources/assets/netherrocks/textures/item/fyrite_door.png new file mode 100644 index 00000000..ab99abb4 Binary files /dev/null and b/src/main/resources/assets/netherrocks/textures/item/fyrite_door.png differ diff --git a/src/main/resources/assets/netherrocks/textures/item/illumenite_door.png b/src/main/resources/assets/netherrocks/textures/item/illumenite_door.png new file mode 100644 index 00000000..91110401 Binary files /dev/null and b/src/main/resources/assets/netherrocks/textures/item/illumenite_door.png differ diff --git a/src/main/resources/assets/netherrocks/textures/item/malachite_door.png b/src/main/resources/assets/netherrocks/textures/item/malachite_door.png new file mode 100644 index 00000000..7cb77d56 Binary files /dev/null and b/src/main/resources/assets/netherrocks/textures/item/malachite_door.png differ diff --git a/src/main/resources/assets/netherrocks/textures/item/raw_argonite.png b/src/main/resources/assets/netherrocks/textures/item/raw_argonite.png new file mode 100644 index 00000000..812e7d96 Binary files /dev/null and b/src/main/resources/assets/netherrocks/textures/item/raw_argonite.png differ diff --git a/src/main/resources/assets/netherrocks/textures/item/raw_fyrite.png b/src/main/resources/assets/netherrocks/textures/item/raw_fyrite.png new file mode 100644 index 00000000..c5bcd436 Binary files /dev/null and b/src/main/resources/assets/netherrocks/textures/item/raw_fyrite.png differ diff --git a/src/main/resources/assets/netherrocks/textures/item/raw_illumenite.png b/src/main/resources/assets/netherrocks/textures/item/raw_illumenite.png new file mode 100644 index 00000000..ac12d2e7 Binary files /dev/null and b/src/main/resources/assets/netherrocks/textures/item/raw_illumenite.png differ diff --git a/src/main/resources/assets/netherrocks/textures/item/raw_malachite.png b/src/main/resources/assets/netherrocks/textures/item/raw_malachite.png new file mode 100644 index 00000000..28925dfd Binary files /dev/null and b/src/main/resources/assets/netherrocks/textures/item/raw_malachite.png differ diff --git a/src/main/resources/assets/netherrocks/textures/item/raw_malachite1.png b/src/main/resources/assets/netherrocks/textures/item/raw_malachite1.png new file mode 100644 index 00000000..df4aba71 Binary files /dev/null and b/src/main/resources/assets/netherrocks/textures/item/raw_malachite1.png differ diff --git a/src/main/resources/data/forge/tags/blocks/storage_blocks.json b/src/main/resources/data/forge/tags/blocks/storage_blocks.json deleted file mode 100644 index b8d8212e..00000000 --- a/src/main/resources/data/forge/tags/blocks/storage_blocks.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "replace": false, - "values": [ - "#forge:storage_blocks/malachite", - "#forge:storage_blocks/ashstone", - "#forge:storage_blocks/dragonstone", - "#forge:storage_blocks/argonite", - "#forge:storage_blocks/illumenite", - "#forge:storage_blocks/fyrite" - ] -} diff --git a/src/main/resources/data/forge/tags/items/storage_blocks/illumenite.json b/src/main/resources/data/forge/tags/items/storage_blocks/illumenite.json deleted file mode 100644 index dc7e9cc5..00000000 --- a/src/main/resources/data/forge/tags/items/storage_blocks/illumenite.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "netherrocks:illumenite_block" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/items/storage_blocks/malachite.json b/src/main/resources/data/forge/tags/items/storage_blocks/malachite.json deleted file mode 100644 index 84bc77cd..00000000 --- a/src/main/resources/data/forge/tags/items/storage_blocks/malachite.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "netherrocks:malachite_block" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/blocks/beacon_base_blocks.json b/src/main/resources/data/minecraft/tags/blocks/beacon_base_blocks.json deleted file mode 100644 index 7699aecf..00000000 --- a/src/main/resources/data/minecraft/tags/blocks/beacon_base_blocks.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "replace": false, - "values": [ - "netherrocks:argonite_block", - "netherrocks:fyrite_block", - "netherrocks:illumenite_block", - "netherrocks:malachite_block" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/netherrocks/advancements/main/argonite_ore.json b/src/main/resources/data/netherrocks/advancements/main/argonite_ore.json index b6824aff..33738f99 100644 --- a/src/main/resources/data/netherrocks/advancements/main/argonite_ore.json +++ b/src/main/resources/data/netherrocks/advancements/main/argonite_ore.json @@ -23,7 +23,7 @@ "trigger": "minecraft:inventory_changed", "conditions" : { "items" : [ - {"item" : "netherrocks:argonite_ore"} + {"items" : ["netherrocks:argonite_ore","netherrocks:raw_argonite"] } ] } } diff --git a/src/main/resources/data/netherrocks/advancements/main/argonite_sword.json b/src/main/resources/data/netherrocks/advancements/main/argonite_sword.json index 8fc17eea..883f138a 100644 --- a/src/main/resources/data/netherrocks/advancements/main/argonite_sword.json +++ b/src/main/resources/data/netherrocks/advancements/main/argonite_sword.json @@ -18,7 +18,7 @@ "trigger": "minecraft:inventory_changed", "conditions" : { "items" : [ - {"item" : "netherrocks:argonite_sword"} + {"items" : ["netherrocks:argonite_sword"]} ] } } diff --git a/src/main/resources/data/netherrocks/advancements/main/ashstone_axe.json b/src/main/resources/data/netherrocks/advancements/main/ashstone_axe.json index d032181e..5c8f7316 100644 --- a/src/main/resources/data/netherrocks/advancements/main/ashstone_axe.json +++ b/src/main/resources/data/netherrocks/advancements/main/ashstone_axe.json @@ -18,7 +18,7 @@ "trigger": "minecraft:inventory_changed", "conditions" : { "items" : [ - {"item" : "netherrocks:ashstone_axe"} + {"items" : ["netherrocks:ashstone_axe"]} ] } } diff --git a/src/main/resources/data/netherrocks/advancements/main/ashstone_ore.json b/src/main/resources/data/netherrocks/advancements/main/ashstone_ore.json index e2a553a2..9454c606 100644 --- a/src/main/resources/data/netherrocks/advancements/main/ashstone_ore.json +++ b/src/main/resources/data/netherrocks/advancements/main/ashstone_ore.json @@ -23,7 +23,7 @@ "trigger": "minecraft:inventory_changed", "conditions" : { "items" : [ - {"item" : "netherrocks:ashstone_ore"} + {"items" : ["netherrocks:ashstone_ore","netherrocks:ashstone_gem"]} ] } } diff --git a/src/main/resources/data/netherrocks/advancements/main/dragonstone_ore.json b/src/main/resources/data/netherrocks/advancements/main/dragonstone_ore.json index 4b19b190..b5062833 100644 --- a/src/main/resources/data/netherrocks/advancements/main/dragonstone_ore.json +++ b/src/main/resources/data/netherrocks/advancements/main/dragonstone_ore.json @@ -23,7 +23,7 @@ "trigger": "minecraft:inventory_changed", "conditions" : { "items" : [ - {"item" : "netherrocks:dragonstone_ore"} + {"items" : ["netherrocks:dragonstone_ore","netherrocks:dragonstone_gem"]} ] } } diff --git a/src/main/resources/data/netherrocks/advancements/main/dragonstone_pickaxe.json b/src/main/resources/data/netherrocks/advancements/main/dragonstone_pickaxe.json index 2ee39710..7154c24c 100644 --- a/src/main/resources/data/netherrocks/advancements/main/dragonstone_pickaxe.json +++ b/src/main/resources/data/netherrocks/advancements/main/dragonstone_pickaxe.json @@ -18,7 +18,7 @@ "trigger": "minecraft:inventory_changed", "conditions" : { "items" : [ - {"item" : "netherrocks:dragonstone_pickaxe"} + {"items" : ["netherrocks:dragonstone_pickaxe"]} ] } } diff --git a/src/main/resources/data/netherrocks/advancements/main/fyrite_ore.json b/src/main/resources/data/netherrocks/advancements/main/fyrite_ore.json index 23b2f05b..ded254ce 100644 --- a/src/main/resources/data/netherrocks/advancements/main/fyrite_ore.json +++ b/src/main/resources/data/netherrocks/advancements/main/fyrite_ore.json @@ -23,7 +23,7 @@ "trigger": "minecraft:inventory_changed", "conditions" : { "items" : [ - {"item" : "netherrocks:fyrite_ore"} + {"items" : ["netherrocks:fyrite_ore","netherrocks:raw_fyrite"]} ] } } diff --git a/src/main/resources/data/netherrocks/advancements/main/fyrite_set.json b/src/main/resources/data/netherrocks/advancements/main/fyrite_set.json index caf82904..e1f2c3c2 100644 --- a/src/main/resources/data/netherrocks/advancements/main/fyrite_set.json +++ b/src/main/resources/data/netherrocks/advancements/main/fyrite_set.json @@ -18,7 +18,7 @@ "trigger": "minecraft:inventory_changed", "conditions" : { "items" : [ - {"item" : "netherrocks:fyrite_chestplate"} + {"items" : ["netherrocks:fyrite_chestplate"]} ] } }, @@ -26,7 +26,7 @@ "trigger": "minecraft:inventory_changed", "conditions" : { "items" : [ - {"item" : "netherrocks:fyrite_leggings"} + {"items" : ["netherrocks:fyrite_leggings"]} ] } }, @@ -34,7 +34,7 @@ "trigger": "minecraft:inventory_changed", "conditions" : { "items" : [ - {"item" : "netherrocks:fyrite_helmet"} + {"items" : ["netherrocks:fyrite_helmet"]} ] } }, @@ -42,7 +42,7 @@ "trigger": "minecraft:inventory_changed", "conditions" : { "items" : [ - {"item" : "netherrocks:fyrite_boots"} + {"items" : ["netherrocks:fyrite_boots"]} ] } } diff --git a/src/main/resources/data/netherrocks/advancements/main/illumenite_ore.json b/src/main/resources/data/netherrocks/advancements/main/illumenite_ore.json index 81832532..726d1c81 100644 --- a/src/main/resources/data/netherrocks/advancements/main/illumenite_ore.json +++ b/src/main/resources/data/netherrocks/advancements/main/illumenite_ore.json @@ -23,7 +23,7 @@ "trigger": "minecraft:inventory_changed", "conditions" : { "items" : [ - {"item" : "netherrocks:illumenite_ore"} + {"items" : ["netherrocks:illumenite_ore", "netherrocks:raw_illumenite"]} ] } } diff --git a/src/main/resources/data/netherrocks/advancements/main/illumenite_set.json b/src/main/resources/data/netherrocks/advancements/main/illumenite_set.json index 6e44c8d1..e61eec7b 100644 --- a/src/main/resources/data/netherrocks/advancements/main/illumenite_set.json +++ b/src/main/resources/data/netherrocks/advancements/main/illumenite_set.json @@ -18,7 +18,7 @@ "trigger": "minecraft:inventory_changed", "conditions" : { "items" : [ - {"item" : "netherrocks:illumenite_chestplate"} + {"items" : ["netherrocks:illumenite_chestplate"]} ] } }, @@ -26,7 +26,7 @@ "trigger": "minecraft:inventory_changed", "conditions" : { "items" : [ - {"item" : "netherrocks:illumenite_leggings"} + {"items" : ["netherrocks:illumenite_leggings"]} ] } }, @@ -34,7 +34,7 @@ "trigger": "minecraft:inventory_changed", "conditions" : { "items" : [ - {"item" : "netherrocks:illumenite_helmet"} + {"items" : ["netherrocks:illumenite_helmet"]} ] } }, @@ -42,7 +42,7 @@ "trigger": "minecraft:inventory_changed", "conditions" : { "items" : [ - {"item" : "netherrocks:illumenite_boots"} + {"items" : ["netherrocks:illumenite_boots"]} ] } } diff --git a/src/main/resources/data/netherrocks/advancements/main/malachite_ore.json b/src/main/resources/data/netherrocks/advancements/main/malachite_ore.json index 44d01a3b..4ebc0317 100644 --- a/src/main/resources/data/netherrocks/advancements/main/malachite_ore.json +++ b/src/main/resources/data/netherrocks/advancements/main/malachite_ore.json @@ -23,7 +23,7 @@ "trigger": "minecraft:inventory_changed", "conditions" : { "items" : [ - {"item" : "netherrocks:malachite_ore"} + {"items" : ["netherrocks:malachite_ore","netherrocks:raw_malachite"] } ] } } diff --git a/src/main/resources/data/netherrocks/advancements/main/malachite_set.json b/src/main/resources/data/netherrocks/advancements/main/malachite_set.json index 2a95ae5c..290edd94 100644 --- a/src/main/resources/data/netherrocks/advancements/main/malachite_set.json +++ b/src/main/resources/data/netherrocks/advancements/main/malachite_set.json @@ -18,7 +18,7 @@ "trigger": "minecraft:inventory_changed", "conditions" : { "items" : [ - {"item" : "netherrocks:malachite_chestplate"} + {"items" : ["netherrocks:malachite_chestplate"]} ] } }, @@ -26,7 +26,7 @@ "trigger": "minecraft:inventory_changed", "conditions" : { "items" : [ - {"item" : "netherrocks:malachite_leggings"} + {"items" : ["netherrocks:malachite_leggings"]} ] } }, @@ -34,7 +34,7 @@ "trigger": "minecraft:inventory_changed", "conditions" : { "items" : [ - {"item" : "netherrocks:malachite_helmet"} + {"items" : ["netherrocks:malachite_helmet"]} ] } }, @@ -42,7 +42,7 @@ "trigger": "minecraft:inventory_changed", "conditions" : { "items" : [ - {"item" : "netherrocks:malachite_boots"} + {"items" : ["netherrocks:malachite_boots"]} ] } } diff --git a/src/main/resources/data/netherrocks/advancements/main/nether_furnace.json b/src/main/resources/data/netherrocks/advancements/main/nether_furnace.json index 9bdab986..1ad76ac1 100644 --- a/src/main/resources/data/netherrocks/advancements/main/nether_furnace.json +++ b/src/main/resources/data/netherrocks/advancements/main/nether_furnace.json @@ -18,7 +18,9 @@ "trigger": "minecraft:inventory_changed", "conditions" : { "items" : [ - {"item" : "netherrocks:nether_furnace"} + { "items" : [ + "netherrocks:nether_furnace", "netherrocks:nether_smoker", + "netherrocks:nether_blast_furnace" ]} ] } } diff --git a/src/main/resources/data/netherrocks/advancements/recipes/argonite_tools.json b/src/main/resources/data/netherrocks/advancements/recipes/argonite_tools.json deleted file mode 100644 index 1f92dffe..00000000 --- a/src/main/resources/data/netherrocks/advancements/recipes/argonite_tools.json +++ /dev/null @@ -1,57 +0,0 @@ -{ - "parent" : "netherrocks:recipes/root", - "rewards": { - "recipes": [ - "netherrocks:argonite_axe", "netherrocks:argonite_hoe", "netherrocks:argonite_pickaxe", - "netherrocks:argonite_shovel", "netherrocks:argonite_sword" - ] - }, - "criteria" : { - "has_argonite" : { - "trigger": "minecraft:inventory_changed", - "conditions" : { - "items" : [ - { - "item" : "netherrocks:argonite_ingot" - } - ] - } - }, - "has_recipe1" : { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "netherrocks:argonite_axe" - } - }, - "has_recipe2" : { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "netherrocks:argonite_hoe" - } - }, - "has_recipe3" : { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "netherrocks:argonite_pickaxe" - } - }, - "has_recipe4" : { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "netherrocks:argonite_shovel" - } - }, - "has_recipe5" : { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "netherrocks:argonite_sword" - } - } - }, - "requirements": [ - [ - "has_argonite", "has_recipe1", "has_recipe2","has_recipe3","has_recipe4", - "has_recipe5" - ] - ] -} diff --git a/src/main/resources/data/netherrocks/advancements/recipes/ashstone_tools.json b/src/main/resources/data/netherrocks/advancements/recipes/ashstone_tools.json deleted file mode 100644 index e2782c36..00000000 --- a/src/main/resources/data/netherrocks/advancements/recipes/ashstone_tools.json +++ /dev/null @@ -1,57 +0,0 @@ -{ - "parent" : "netherrocks:recipes/root", - "rewards": { - "recipes": [ - "netherrocks:ashstone_axe", "netherrocks:ashstone_hoe", "netherrocks:ashstone_pickaxe", - "netherrocks:ashstone_shovel", "netherrocks:ashstone_sword" - ] - }, - "criteria" : { - "has_ashstone" : { - "trigger": "minecraft:inventory_changed", - "conditions" : { - "items" : [ - { - "item" : "netherrocks:ashstone_gem" - } - ] - } - }, - "has_recipe1" : { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "netherrocks:ashstone_axe" - } - }, - "has_recipe2" : { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "netherrocks:ashstone_hoe" - } - }, - "has_recipe3" : { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "netherrocks:ashstone_pickaxe" - } - }, - "has_recipe4" : { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "netherrocks:ashstone_shovel" - } - }, - "has_recipe5" : { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "netherrocks:ashstone_sword" - } - } - }, - "requirements": [ - [ - "has_ashstone", "has_recipe1", "has_recipe2","has_recipe3","has_recipe4", - "has_recipe5" - ] - ] -} diff --git a/src/main/resources/data/netherrocks/advancements/recipes/dragonstone_armor.json b/src/main/resources/data/netherrocks/advancements/recipes/dragonstone_armor.json deleted file mode 100644 index dc88ed80..00000000 --- a/src/main/resources/data/netherrocks/advancements/recipes/dragonstone_armor.json +++ /dev/null @@ -1,50 +0,0 @@ -{ - "parent" : "netherrocks:recipes/root", - "rewards": { - "recipes": [ - "netherrocks:dragonstone_boots", "netherrocks:dragonstone_chestplate", - "netherrocks:dragonstone_helmet", "netherrocks:dragonstone_leggings" - ] - }, - "criteria" : { - "has_dragonstone" : { - "trigger": "minecraft:inventory_changed", - "conditions" : { - "items" : [ - { - "item" : "netherrocks:dragonstone_gem" - } - ] - } - }, - "has_recipe1" : { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "netherrocks:dragonstone_boots" - } - }, - "has_recipe2" : { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "netherrocks:dragonstone_chestplate" - } - }, - "has_recipe3" : { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "netherrocks:dragonstone_helmet" - } - }, - "has_recipe4" : { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "netherrocks:dragonstone_leggings" - } - } - }, - "requirements": [ - [ - "has_dragonstone", "has_recipe1", "has_recipe2","has_recipe3","has_recipe4" - ] - ] -} diff --git a/src/main/resources/data/netherrocks/advancements/recipes/dragonstone_tools.json b/src/main/resources/data/netherrocks/advancements/recipes/dragonstone_tools.json deleted file mode 100644 index 6a0ecd26..00000000 --- a/src/main/resources/data/netherrocks/advancements/recipes/dragonstone_tools.json +++ /dev/null @@ -1,57 +0,0 @@ -{ - "parent" : "netherrocks:recipes/root", - "rewards": { - "recipes": [ - "netherrocks:dragonstone_axe", "netherrocks:dragonstone_hoe", "netherrocks:dragonstone_pickaxe", - "netherrocks:dragonstone_shovel", "netherrocks:dragonstone_sword" - ] - }, - "criteria" : { - "has_dragonstone" : { - "trigger": "minecraft:inventory_changed", - "conditions" : { - "items" : [ - { - "item" : "netherrocks:dragonstone_gem" - } - ] - } - }, - "has_recipe1" : { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "netherrocks:dragonstone_axe" - } - }, - "has_recipe2" : { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "netherrocks:dragonstone_hoe" - } - }, - "has_recipe3" : { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "netherrocks:dragonstone_pickaxe" - } - }, - "has_recipe4" : { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "netherrocks:dragonstone_shovel" - } - }, - "has_recipe5" : { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "netherrocks:dragonstone_sword" - } - } - }, - "requirements": [ - [ - "has_dragonstone", "has_recipe1", "has_recipe2","has_recipe3","has_recipe4", - "has_recipe5" - ] - ] -} diff --git a/src/main/resources/data/netherrocks/advancements/recipes/fyrite_armor.json b/src/main/resources/data/netherrocks/advancements/recipes/fyrite_armor.json deleted file mode 100644 index 04c9b4f5..00000000 --- a/src/main/resources/data/netherrocks/advancements/recipes/fyrite_armor.json +++ /dev/null @@ -1,50 +0,0 @@ -{ - "parent" : "netherrocks:recipes/root", - "rewards": { - "recipes": [ - "netherrocks:fyrite_boots", "netherrocks:fyrite_chestplate", - "netherrocks:fyrite_helmet", "netherrocks:fyrite_leggings" - ] - }, - "criteria" : { - "has_fyrite" : { - "trigger": "minecraft:inventory_changed", - "conditions" : { - "items" : [ - { - "item" : "netherrocks:fyrite_ingot" - } - ] - } - }, - "has_recipe1" : { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "netherrocks:fyrite_boots" - } - }, - "has_recipe2" : { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "netherrocks:fyrite_chestplate" - } - }, - "has_recipe3" : { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "netherrocks:fyrite_helmet" - } - }, - "has_recipe4" : { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "netherrocks:fyrite_leggings" - } - } - }, - "requirements": [ - [ - "has_fyrite", "has_recipe1", "has_recipe2","has_recipe3","has_recipe4" - ] - ] -} diff --git a/src/main/resources/data/netherrocks/advancements/recipes/fyrite_tools.json b/src/main/resources/data/netherrocks/advancements/recipes/fyrite_tools.json deleted file mode 100644 index ba23d964..00000000 --- a/src/main/resources/data/netherrocks/advancements/recipes/fyrite_tools.json +++ /dev/null @@ -1,50 +0,0 @@ -{ - "parent" : "netherrocks:recipes/root", - "rewards": { - "recipes": [ - "netherrocks:fyrite_axe", "netherrocks:fyrite_pickaxe", - "netherrocks:fyrite_shovel", "netherrocks:fyrite_sword" - ] - }, - "criteria" : { - "has_fyrite" : { - "trigger": "minecraft:inventory_changed", - "conditions" : { - "items" : [ - { - "item" : "netherrocks:fyrite_ingot" - } - ] - } - }, - "has_recipe1" : { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "netherrocks:fyrite_axe" - } - }, - "has_recipe3" : { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "netherrocks:fyrite_pickaxe" - } - }, - "has_recipe4" : { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "netherrocks:fyrite_shovel" - } - }, - "has_recipe5" : { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "netherrocks:fyrite_sword" - } - } - }, - "requirements": [ - [ - "has_fyrite", "has_recipe1", "has_recipe3","has_recipe4", "has_recipe5" - ] - ] -} diff --git a/src/main/resources/data/netherrocks/advancements/recipes/illumenite_armor.json b/src/main/resources/data/netherrocks/advancements/recipes/illumenite_armor.json deleted file mode 100644 index e47b1011..00000000 --- a/src/main/resources/data/netherrocks/advancements/recipes/illumenite_armor.json +++ /dev/null @@ -1,50 +0,0 @@ -{ - "parent" : "netherrocks:recipes/root", - "rewards": { - "recipes": [ - "netherrocks:illumenite_boots", "netherrocks:illumenite_chestplate", - "netherrocks:illumenite_helmet", "netherrocks:illumenite_leggings" - ] - }, - "criteria" : { - "has_illumenite" : { - "trigger": "minecraft:inventory_changed", - "conditions" : { - "items" : [ - { - "item" : "netherrocks:illumenite_ingot" - } - ] - } - }, - "has_recipe1" : { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "netherrocks:illumenite_boots" - } - }, - "has_recipe2" : { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "netherrocks:illumenite_chestplate" - } - }, - "has_recipe3" : { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "netherrocks:illumenite_helmet" - } - }, - "has_recipe4" : { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "netherrocks:illumenite_leggings" - } - } - }, - "requirements": [ - [ - "has_illumenite", "has_recipe1", "has_recipe2","has_recipe3","has_recipe4" - ] - ] -} diff --git a/src/main/resources/data/netherrocks/advancements/recipes/illumenite_tools.json b/src/main/resources/data/netherrocks/advancements/recipes/illumenite_tools.json deleted file mode 100644 index d1898a87..00000000 --- a/src/main/resources/data/netherrocks/advancements/recipes/illumenite_tools.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent" : "netherrocks:recipes/root", - "rewards": { - "recipes": [ - "netherrocks:illumenite_sword" - ] - }, - "criteria" : { - "has_illumenite" : { - "trigger": "minecraft:inventory_changed", - "conditions" : { - "items" : [ - { - "item" : "netherrocks:illumenite_ingot" - } - ] - } - }, - "has_sword" : { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item" : "netherrocks:illumenite_sword" - } - ] - } - } - }, - "requirements": [ - [ - "has_illumenite", "has_sword" - ] - ] -} diff --git a/src/main/resources/data/netherrocks/advancements/recipes/malachite_armor.json b/src/main/resources/data/netherrocks/advancements/recipes/malachite_armor.json deleted file mode 100644 index 7ac0e27f..00000000 --- a/src/main/resources/data/netherrocks/advancements/recipes/malachite_armor.json +++ /dev/null @@ -1,50 +0,0 @@ -{ - "parent" : "netherrocks:recipes/root", - "rewards": { - "recipes": [ - "netherrocks:malachite_boots", "netherrocks:malachite_chestplate", - "netherrocks:malachite_helmet", "netherrocks:malachite_leggings" - ] - }, - "criteria" : { - "has_malachite" : { - "trigger": "minecraft:inventory_changed", - "conditions" : { - "items" : [ - { - "item" : "netherrocks:malachite_ingot" - } - ] - } - }, - "has_recipe1" : { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "netherrocks:malachite_boots" - } - }, - "has_recipe2" : { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "netherrocks:malachite_chestplate" - } - }, - "has_recipe3" : { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "netherrocks:malachite_helmet" - } - }, - "has_recipe4" : { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "netherrocks:malachite_leggings" - } - } - }, - "requirements": [ - [ - "has_malachite", "has_recipe1", "has_recipe2","has_recipe3","has_recipe4" - ] - ] -} diff --git a/src/main/resources/data/netherrocks/advancements/recipes/malachite_tools.json b/src/main/resources/data/netherrocks/advancements/recipes/malachite_tools.json deleted file mode 100644 index 2bf0e011..00000000 --- a/src/main/resources/data/netherrocks/advancements/recipes/malachite_tools.json +++ /dev/null @@ -1,57 +0,0 @@ -{ - "parent" : "netherrocks:recipes/root", - "rewards": { - "recipes": [ - "netherrocks:malachite_axe", "netherrocks:malachite_hoe", "netherrocks:malachite_pickaxe", - "netherrocks:malachite_shovel", "netherrocks:malachite_sword" - ] - }, - "criteria" : { - "has_malachite" : { - "trigger": "minecraft:inventory_changed", - "conditions" : { - "items" : [ - { - "item" : "netherrocks:malachite_ingot" - } - ] - } - }, - "has_recipe1" : { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "netherrocks:malachite_axe" - } - }, - "has_recipe2" : { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "netherrocks:malachite_hoe" - } - }, - "has_recipe3" : { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "netherrocks:malachite_pickaxe" - } - }, - "has_recipe4" : { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "netherrocks:malachite_shovel" - } - }, - "has_recipe5" : { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "netherrocks:malachite_sword" - } - } - }, - "requirements": [ - [ - "has_malachite", "has_recipe1", "has_recipe2","has_recipe3","has_recipe4", - "has_recipe5" - ] - ] -} diff --git a/src/main/resources/data/netherrocks/advancements/recipes/more_nether_furnaces.json b/src/main/resources/data/netherrocks/advancements/recipes/more_nether_furnaces.json deleted file mode 100644 index d4c28268..00000000 --- a/src/main/resources/data/netherrocks/advancements/recipes/more_nether_furnaces.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "parent" : "netherrocks:recipes/root", - "rewards": { - "recipes": [ - "netherrocks:nether_smoker", "netherrocks:nether_blast_furnace" - ] - }, - "criteria" : { - "has_nether_furnace" : { - "trigger": "minecraft:inventory_changed", - "conditions" : { - "items" : [ - { - "item" : "netherrocks:nether_furnace" - } - ] - } - } - }, - "requirements": [ - [ - "has_nether_furnace" - ] - ] -} diff --git a/src/main/resources/data/netherrocks/advancements/recipes/nether_furnace.json b/src/main/resources/data/netherrocks/advancements/recipes/nether_furnace.json deleted file mode 100644 index edfb6897..00000000 --- a/src/main/resources/data/netherrocks/advancements/recipes/nether_furnace.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "parent" : "netherrocks:recipes/root", - "rewards": { - "recipes": [ - "netherrocks:nether_furnace" - ] - }, - "criteria" : { - "has_netherrack" : { - "trigger": "minecraft:inventory_changed", - "conditions" : { - "items" : [ - { - "item" : "minecraft:netherrack" - } - ] - } - } - }, - "requirements": [ - [ - "has_netherrack" - ] - ] -} diff --git a/src/main/resources/data/netherrocks/loot_modifiers/auto_smelt_tool.json b/src/main/resources/data/netherrocks/loot_modifiers/auto_smelt_tool.json index 2744b272..481d0e4f 100644 --- a/src/main/resources/data/netherrocks/loot_modifiers/auto_smelt_tool.json +++ b/src/main/resources/data/netherrocks/loot_modifiers/auto_smelt_tool.json @@ -6,19 +6,7 @@ { "condition": "minecraft:match_tool", "predicate": { - "item": "netherrocks:fyrite_pickaxe" - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "item": "netherrocks:fyrite_axe" - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "item": "netherrocks:fyrite_shovel" + "tag": "netherrocks:auto_smelt_tools" } } ] diff --git a/src/main/resources/data/netherrocks/recipes/argonite_axe.json b/src/main/resources/data/netherrocks/recipes/argonite_axe.json deleted file mode 100644 index 4dfb530f..00000000 --- a/src/main/resources/data/netherrocks/recipes/argonite_axe.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "result" : { - "item" : "netherrocks:argonite_axe" - }, - "pattern" : [ - "SS ", - "ST ", - " T " - ], - "type" : "minecraft:crafting_shaped", - "key" : { - "S" : { "tag" : "forge:ingots/argonite"}, - "T" : { "tag" : "forge:rods/wooden"} - } -} diff --git a/src/main/resources/data/netherrocks/recipes/argonite_block.json b/src/main/resources/data/netherrocks/recipes/argonite_block.json deleted file mode 100644 index 1703f09d..00000000 --- a/src/main/resources/data/netherrocks/recipes/argonite_block.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - - "type" : "minecraft:crafting_shaped", - "result" : { - "item" : "netherrocks:argonite_block" - }, - "pattern" : [ - "SSS", - "SSS", - "SSS" - ], - "key" : { - "S" : { "item" : "netherrocks:argonite_ingot"} - } -} \ No newline at end of file diff --git a/src/main/resources/data/netherrocks/recipes/argonite_hoe.json b/src/main/resources/data/netherrocks/recipes/argonite_hoe.json deleted file mode 100644 index 2fe33fec..00000000 --- a/src/main/resources/data/netherrocks/recipes/argonite_hoe.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - - "result" : { - "item" : "netherrocks:argonite_hoe" - }, - "pattern" : [ - "SS ", - " T ", - " T " - ], - "type" : "minecraft:crafting_shaped", - "key" : { - "S" : { "tag" : "forge:ingots/argonite"}, - "T" : { "tag" : "forge:rods/wooden"} - } -} \ No newline at end of file diff --git a/src/main/resources/data/netherrocks/recipes/argonite_ingot.json b/src/main/resources/data/netherrocks/recipes/argonite_ingot.json deleted file mode 100644 index 3ba7b65d..00000000 --- a/src/main/resources/data/netherrocks/recipes/argonite_ingot.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - - "type" : "minecraft:crafting_shapeless", - "ingredients" : [ - { "item" : "netherrocks:argonite_block" } - ], - "result" : { - "item" : "netherrocks:argonite_ingot", - "count" : 9 - } -} \ No newline at end of file diff --git a/src/main/resources/data/netherrocks/recipes/argonite_ingot_from_blasting.json b/src/main/resources/data/netherrocks/recipes/argonite_ingot_from_blasting.json deleted file mode 100644 index 2fd6b5d6..00000000 --- a/src/main/resources/data/netherrocks/recipes/argonite_ingot_from_blasting.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "type": "minecraft:blasting", - "ingredient": { - "item": "netherrocks:argonite_ore" - }, - "result": "netherrocks:argonite_ingot", - "experience": 0.7, - "cookingtime": 100 -} diff --git a/src/main/resources/data/netherrocks/recipes/argonite_ingot_from_smelting.json b/src/main/resources/data/netherrocks/recipes/argonite_ingot_from_smelting.json deleted file mode 100644 index eacb3868..00000000 --- a/src/main/resources/data/netherrocks/recipes/argonite_ingot_from_smelting.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "type": "minecraft:smelting", - "ingredient": { - "item": "netherrocks:argonite_ore" - }, - "result": "netherrocks:argonite_ingot", - "experience": 0.7, - "cookingtime": 200 -} diff --git a/src/main/resources/data/netherrocks/recipes/argonite_pickaxe.json b/src/main/resources/data/netherrocks/recipes/argonite_pickaxe.json deleted file mode 100644 index 44640028..00000000 --- a/src/main/resources/data/netherrocks/recipes/argonite_pickaxe.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - - "result" : { - "item" : "netherrocks:argonite_pickaxe" - }, - "pattern" : [ - "SSS", - " T ", - " T " - ], - "type" : "minecraft:crafting_shaped", - "key" : { - "S" : { "tag" : "forge:ingots/argonite"}, - "T" : { "tag" : "forge:rods/wooden"} - } -} \ No newline at end of file diff --git a/src/main/resources/data/netherrocks/recipes/argonite_shovel.json b/src/main/resources/data/netherrocks/recipes/argonite_shovel.json deleted file mode 100644 index 1be522c4..00000000 --- a/src/main/resources/data/netherrocks/recipes/argonite_shovel.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - - "result" : { - "item" : "netherrocks:argonite_shovel" - }, - "pattern" : [ - " S ", - " T ", - " T " - ], - "type" : "minecraft:crafting_shaped", - "key" : { - "S" : { "tag" : "forge:ingots/argonite"}, - "T" : { "tag" : "forge:rods/wooden"} - } -} \ No newline at end of file diff --git a/src/main/resources/data/netherrocks/recipes/argonite_sword.json b/src/main/resources/data/netherrocks/recipes/argonite_sword.json deleted file mode 100644 index 7dd2f9b5..00000000 --- a/src/main/resources/data/netherrocks/recipes/argonite_sword.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - - "result" : { - "item" : "netherrocks:argonite_sword" - }, - "pattern" : [ - " S ", - " S ", - " T " - ], - "type" : "minecraft:crafting_shaped", - "key" : { - "S" : { "tag" : "forge:ingots/argonite"}, - "T" : { "tag" : "forge:rods/wooden"} - } -} \ No newline at end of file diff --git a/src/main/resources/data/netherrocks/recipes/ashstone_axe.json b/src/main/resources/data/netherrocks/recipes/ashstone_axe.json deleted file mode 100644 index 5259d5b0..00000000 --- a/src/main/resources/data/netherrocks/recipes/ashstone_axe.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - - "result" : { - "item" : "netherrocks:ashstone_axe" - }, - "pattern" : [ - "SS ", - "ST ", - " T " - ], - "type" : "minecraft:crafting_shaped", - "key" : { - "S" : { "tag" : "forge:gems/ashstone"}, - "T" : { "tag" : "forge:rods/wooden"} - } -} \ No newline at end of file diff --git a/src/main/resources/data/netherrocks/recipes/ashstone_block.json b/src/main/resources/data/netherrocks/recipes/ashstone_block.json deleted file mode 100644 index b1ba06f0..00000000 --- a/src/main/resources/data/netherrocks/recipes/ashstone_block.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - - "type" : "minecraft:crafting_shaped", - "result" : { - "item" : "netherrocks:ashstone_block" - }, - "pattern" : [ - "SSS", - "SSS", - "SSS" - ], - "key" : { - "S" : { "item" : "netherrocks:ashstone_gem"} - } -} \ No newline at end of file diff --git a/src/main/resources/data/netherrocks/recipes/ashstone_gem.json b/src/main/resources/data/netherrocks/recipes/ashstone_gem.json deleted file mode 100644 index 1a52104f..00000000 --- a/src/main/resources/data/netherrocks/recipes/ashstone_gem.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - - "type" : "minecraft:crafting_shapeless", - "ingredients" : [ - { "item" : "netherrocks:ashstone_block" } - ], - "result" : { - "item" : "netherrocks:ashstone_gem", - "count" : 9 - } -} \ No newline at end of file diff --git a/src/main/resources/data/netherrocks/recipes/ashstone_gem_from_blasting.json b/src/main/resources/data/netherrocks/recipes/ashstone_gem_from_blasting.json deleted file mode 100644 index b5ae5035..00000000 --- a/src/main/resources/data/netherrocks/recipes/ashstone_gem_from_blasting.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "type": "minecraft:blasting", - "ingredient": { - "item": "netherrocks:ashstone_ore" - }, - "result": "netherrocks:ashstone_gem", - "experience": 0.8, - "cookingtime": 100 -} diff --git a/src/main/resources/data/netherrocks/recipes/ashstone_gem_from_smelting.json b/src/main/resources/data/netherrocks/recipes/ashstone_gem_from_smelting.json deleted file mode 100644 index 6eacb2ed..00000000 --- a/src/main/resources/data/netherrocks/recipes/ashstone_gem_from_smelting.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "type": "minecraft:smelting", - "ingredient": { - "item": "netherrocks:ashstone_ore" - }, - "result": "netherrocks:ashstone_gem", - "experience": 0.8, - "cookingtime": 200 -} diff --git a/src/main/resources/data/netherrocks/recipes/ashstone_hoe.json b/src/main/resources/data/netherrocks/recipes/ashstone_hoe.json deleted file mode 100644 index 2f7cbb27..00000000 --- a/src/main/resources/data/netherrocks/recipes/ashstone_hoe.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - - "result" : { - "item" : "netherrocks:ashstone_hoe" - }, - "pattern" : [ - "SS ", - " T ", - " T " - ], - "type" : "minecraft:crafting_shaped", - "key" : { - "S" : { "tag" : "forge:gems/ashstone"}, - "T" : { "tag" : "forge:rods/wooden"} - } -} \ No newline at end of file diff --git a/src/main/resources/data/netherrocks/recipes/ashstone_pickaxe.json b/src/main/resources/data/netherrocks/recipes/ashstone_pickaxe.json deleted file mode 100644 index 020fb1d0..00000000 --- a/src/main/resources/data/netherrocks/recipes/ashstone_pickaxe.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - - "result" : { - "item" : "netherrocks:ashstone_pickaxe" - }, - "pattern" : [ - "SSS", - " T ", - " T " - ], - "type" : "minecraft:crafting_shaped", - "key" : { - "S" : { "tag" : "forge:gems/ashstone"}, - "T" : { "tag" : "forge:rods/wooden"} - } -} \ No newline at end of file diff --git a/src/main/resources/data/netherrocks/recipes/ashstone_shovel.json b/src/main/resources/data/netherrocks/recipes/ashstone_shovel.json deleted file mode 100644 index d35ae4cf..00000000 --- a/src/main/resources/data/netherrocks/recipes/ashstone_shovel.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - - "result" : { - "item" : "netherrocks:ashstone_shovel" - }, - "pattern" : [ - " S ", - " T ", - " T " - ], - "type" : "minecraft:crafting_shaped", - "key" : { - "S" : { "tag" : "forge:gems/ashstone"}, - "T" : { "tag" : "forge:rods/wooden"} - } -} \ No newline at end of file diff --git a/src/main/resources/data/netherrocks/recipes/ashstone_sword.json b/src/main/resources/data/netherrocks/recipes/ashstone_sword.json deleted file mode 100644 index 65a32948..00000000 --- a/src/main/resources/data/netherrocks/recipes/ashstone_sword.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - - "result" : { - "item" : "netherrocks:ashstone_sword" - }, - "pattern" : [ - " S ", - " S ", - " T " - ], - "type" : "minecraft:crafting_shaped", - "key" : { - "S" : { "tag" : "forge:gems/ashstone"}, - "T" : { "tag" : "forge:rods/wooden"} - } -} \ No newline at end of file diff --git a/src/main/resources/data/netherrocks/recipes/dragonstone_axe.json b/src/main/resources/data/netherrocks/recipes/dragonstone_axe.json deleted file mode 100644 index 4f2d6593..00000000 --- a/src/main/resources/data/netherrocks/recipes/dragonstone_axe.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - - "result" : { - "item" : "netherrocks:dragonstone_axe" - }, - "pattern" : [ - "SS ", - "ST ", - " T " - ], - "type" : "minecraft:crafting_shaped", - "key" : { - "S" : { "tag" : "forge:gems/dragonstone"}, - "T" : { "tag" : "forge:rods/wooden"} - } -} \ No newline at end of file diff --git a/src/main/resources/data/netherrocks/recipes/dragonstone_block.json b/src/main/resources/data/netherrocks/recipes/dragonstone_block.json deleted file mode 100644 index 49d905e2..00000000 --- a/src/main/resources/data/netherrocks/recipes/dragonstone_block.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - - "type" : "minecraft:crafting_shaped", - "result" : { - "item" : "netherrocks:dragonstone_block" - }, - "pattern" : [ - "SSS", - "SSS", - "SSS" - ], - "key" : { - "S" : { "item" : "netherrocks:dragonstone_gem"} - } -} \ No newline at end of file diff --git a/src/main/resources/data/netherrocks/recipes/dragonstone_boots.json b/src/main/resources/data/netherrocks/recipes/dragonstone_boots.json deleted file mode 100644 index 34b5467c..00000000 --- a/src/main/resources/data/netherrocks/recipes/dragonstone_boots.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - - "result" : { - "item" : "netherrocks:dragonstone_boots" - }, - "pattern" : [ - "S S", - "S S" - ], - "type" : "minecraft:crafting_shaped", - "key" : { - "S" : { "tag" : "forge:gems/dragonstone"} - } -} \ No newline at end of file diff --git a/src/main/resources/data/netherrocks/recipes/dragonstone_chestplate.json b/src/main/resources/data/netherrocks/recipes/dragonstone_chestplate.json deleted file mode 100644 index c9ec8154..00000000 --- a/src/main/resources/data/netherrocks/recipes/dragonstone_chestplate.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - - "result" : { - "item" : "netherrocks:dragonstone_chestplate" - }, - "pattern" : [ - "S S", - "SSS", - "SSS" - ], - "type" : "minecraft:crafting_shaped", - "key" : { - "S" : { "tag" : "forge:gems/dragonstone"} - } -} \ No newline at end of file diff --git a/src/main/resources/data/netherrocks/recipes/dragonstone_gem.json b/src/main/resources/data/netherrocks/recipes/dragonstone_gem.json deleted file mode 100644 index 008f4b27..00000000 --- a/src/main/resources/data/netherrocks/recipes/dragonstone_gem.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - - "type" : "minecraft:crafting_shapeless", - "ingredients" : [ - { "item" : "netherrocks:dragonstone_block" } - ], - "result" : { - "item" : "netherrocks:dragonstone_gem", - "count" : 9 - } -} \ No newline at end of file diff --git a/src/main/resources/data/netherrocks/recipes/dragonstone_gem_from_blasting.json b/src/main/resources/data/netherrocks/recipes/dragonstone_gem_from_blasting.json deleted file mode 100644 index aa356275..00000000 --- a/src/main/resources/data/netherrocks/recipes/dragonstone_gem_from_blasting.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "type": "minecraft:blasting", - "ingredient": { - "item": "netherrocks:dragonstone_ore" - }, - "result": "netherrocks:dragonstone_gem", - "experience": 1.0, - "cookingtime": 100 -} diff --git a/src/main/resources/data/netherrocks/recipes/dragonstone_gem_from_smelting.json b/src/main/resources/data/netherrocks/recipes/dragonstone_gem_from_smelting.json deleted file mode 100644 index 46864f97..00000000 --- a/src/main/resources/data/netherrocks/recipes/dragonstone_gem_from_smelting.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "type": "minecraft:smelting", - "ingredient": { - "item": "netherrocks:dragonstone_ore" - }, - "result": "netherrocks:dragonstone_gem", - "experience": 1.0, - "cookingtime": 200 -} diff --git a/src/main/resources/data/netherrocks/recipes/dragonstone_helmet.json b/src/main/resources/data/netherrocks/recipes/dragonstone_helmet.json deleted file mode 100644 index 8341ce53..00000000 --- a/src/main/resources/data/netherrocks/recipes/dragonstone_helmet.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - - "result" : { - "item" : "netherrocks:dragonstone_helmet" - }, - "pattern" : [ - "SSS", - "S S" - ], - "type" : "minecraft:crafting_shaped", - "key" : { - "S" : { "tag" : "forge:gems/dragonstone"} - } -} \ No newline at end of file diff --git a/src/main/resources/data/netherrocks/recipes/dragonstone_hoe.json b/src/main/resources/data/netherrocks/recipes/dragonstone_hoe.json deleted file mode 100644 index f260d907..00000000 --- a/src/main/resources/data/netherrocks/recipes/dragonstone_hoe.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - - "result" : { - "item" : "netherrocks:dragonstone_hoe" - }, - "pattern" : [ - "SS ", - " T ", - " T " - ], - "type" : "minecraft:crafting_shaped", - "key" : { - "S" : { "tag" : "forge:gems/dragonstone"}, - "T" : { "tag" : "forge:rods/wooden"} - } -} \ No newline at end of file diff --git a/src/main/resources/data/netherrocks/recipes/dragonstone_leggings.json b/src/main/resources/data/netherrocks/recipes/dragonstone_leggings.json deleted file mode 100644 index 287e988d..00000000 --- a/src/main/resources/data/netherrocks/recipes/dragonstone_leggings.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - - "result" : { - "item" : "netherrocks:dragonstone_leggings" - }, - "pattern" : [ - "SSS", - "S S", - "S S" - ], - "type" : "minecraft:crafting_shaped", - "key" : { - "S" : { "tag" : "forge:gems/dragonstone"} - } -} \ No newline at end of file diff --git a/src/main/resources/data/netherrocks/recipes/dragonstone_pickaxe.json b/src/main/resources/data/netherrocks/recipes/dragonstone_pickaxe.json deleted file mode 100644 index caa623e4..00000000 --- a/src/main/resources/data/netherrocks/recipes/dragonstone_pickaxe.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - - "result" : { - "item" : "netherrocks:dragonstone_pickaxe" - }, - "pattern" : [ - "SSS", - " T ", - " T " - ], - "type" : "minecraft:crafting_shaped", - "key" : { - "S" : { "tag" : "forge:gems/dragonstone"}, - "T" : { "tag" : "forge:rods/wooden"} - } -} \ No newline at end of file diff --git a/src/main/resources/data/netherrocks/recipes/dragonstone_shovel.json b/src/main/resources/data/netherrocks/recipes/dragonstone_shovel.json deleted file mode 100644 index 9a92d3ee..00000000 --- a/src/main/resources/data/netherrocks/recipes/dragonstone_shovel.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - - "result" : { - "item" : "netherrocks:dragonstone_shovel" - }, - "pattern" : [ - " S ", - " T ", - " T " - ], - "type" : "minecraft:crafting_shaped", - "key" : { - "S" : { "tag" : "forge:gems/dragonstone"}, - "T" : { "tag" : "forge:rods/wooden"} - } -} \ No newline at end of file diff --git a/src/main/resources/data/netherrocks/recipes/dragonstone_sword.json b/src/main/resources/data/netherrocks/recipes/dragonstone_sword.json deleted file mode 100644 index 1efee330..00000000 --- a/src/main/resources/data/netherrocks/recipes/dragonstone_sword.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - - "result" : { - "item" : "netherrocks:dragonstone_sword" - }, - "pattern" : [ - " S ", - " S ", - " T " - ], - "type" : "minecraft:crafting_shaped", - "key" : { - "S" : { "tag" : "forge:gems/dragonstone"}, - "T" : { "tag" : "forge:rods/wooden"} - } -} \ No newline at end of file diff --git a/src/main/resources/data/netherrocks/recipes/fyrite_axe.json b/src/main/resources/data/netherrocks/recipes/fyrite_axe.json deleted file mode 100644 index ab34f471..00000000 --- a/src/main/resources/data/netherrocks/recipes/fyrite_axe.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - - "result" : { - "item" : "netherrocks:fyrite_axe" - }, - "pattern" : [ - "SS ", - "ST ", - " T " - ], - "type" : "minecraft:crafting_shaped", - "key" : { - "S" : { "tag" : "forge:ingots/fyrite"}, - "T" : { "tag" : "forge:rods/wooden"} - } -} \ No newline at end of file diff --git a/src/main/resources/data/netherrocks/recipes/fyrite_block.json b/src/main/resources/data/netherrocks/recipes/fyrite_block.json deleted file mode 100644 index e7ce0c36..00000000 --- a/src/main/resources/data/netherrocks/recipes/fyrite_block.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - - "type" : "minecraft:crafting_shaped", - "result" : { - "item" : "netherrocks:fyrite_block" - }, - "pattern" : [ - "SSS", - "SSS", - "SSS" - ], - "key" : { - "S" : { "item" : "netherrocks:fyrite_ingot"} - } -} \ No newline at end of file diff --git a/src/main/resources/data/netherrocks/recipes/fyrite_boots.json b/src/main/resources/data/netherrocks/recipes/fyrite_boots.json deleted file mode 100644 index 6e5e5068..00000000 --- a/src/main/resources/data/netherrocks/recipes/fyrite_boots.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - - "result" : { - "item" : "netherrocks:fyrite_boots" - }, - "pattern" : [ - "S S", - "S S" - ], - "type" : "minecraft:crafting_shaped", - "key" : { - "S" : { "tag" : "forge:ingots/fyrite"} - } -} \ No newline at end of file diff --git a/src/main/resources/data/netherrocks/recipes/fyrite_chestplate.json b/src/main/resources/data/netherrocks/recipes/fyrite_chestplate.json deleted file mode 100644 index 54554d8f..00000000 --- a/src/main/resources/data/netherrocks/recipes/fyrite_chestplate.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - - "result" : { - "item" : "netherrocks:fyrite_chestplate" - }, - "pattern" : [ - "S S", - "SSS", - "SSS" - ], - "type" : "minecraft:crafting_shaped", - "key" : { - "S" : { "tag" : "forge:ingots/fyrite"} - } -} \ No newline at end of file diff --git a/src/main/resources/data/netherrocks/recipes/fyrite_helmet.json b/src/main/resources/data/netherrocks/recipes/fyrite_helmet.json deleted file mode 100644 index 387bc42b..00000000 --- a/src/main/resources/data/netherrocks/recipes/fyrite_helmet.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - - "result" : { - "item" : "netherrocks:fyrite_helmet" - }, - "pattern" : [ - "SSS", - "S S" - ], - "type" : "minecraft:crafting_shaped", - "key" : { - "S" : { "tag" : "forge:ingots/fyrite"} - } -} \ No newline at end of file diff --git a/src/main/resources/data/netherrocks/recipes/fyrite_ingot.json b/src/main/resources/data/netherrocks/recipes/fyrite_ingot.json deleted file mode 100644 index 57d0bdc7..00000000 --- a/src/main/resources/data/netherrocks/recipes/fyrite_ingot.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - - "type" : "minecraft:crafting_shapeless", - "ingredients" : [ - { "item" : "netherrocks:fyrite_block" } - ], - "result" : { - "item" : "netherrocks:fyrite_ingot", - "count" : 9 - } -} \ No newline at end of file diff --git a/src/main/resources/data/netherrocks/recipes/fyrite_ingot_from_blasting.json b/src/main/resources/data/netherrocks/recipes/fyrite_ingot_from_blasting.json deleted file mode 100644 index b19ee9bd..00000000 --- a/src/main/resources/data/netherrocks/recipes/fyrite_ingot_from_blasting.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "type": "minecraft:blasting", - "ingredient": { - "item": "netherrocks:fyrite_ore" - }, - "result": "netherrocks:fyrite_ingot", - "experience": 0.8, - "cookingtime": 100 -} diff --git a/src/main/resources/data/netherrocks/recipes/fyrite_ingot_from_smelting.json b/src/main/resources/data/netherrocks/recipes/fyrite_ingot_from_smelting.json deleted file mode 100644 index cd1ba838..00000000 --- a/src/main/resources/data/netherrocks/recipes/fyrite_ingot_from_smelting.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "type": "minecraft:smelting", - "ingredient": { - "item": "netherrocks:fyrite_ore" - }, - "result": "netherrocks:fyrite_ingot", - "experience": 0.8, - "cookingtime": 200 -} diff --git a/src/main/resources/data/netherrocks/recipes/fyrite_leggings.json b/src/main/resources/data/netherrocks/recipes/fyrite_leggings.json deleted file mode 100644 index e89543dd..00000000 --- a/src/main/resources/data/netherrocks/recipes/fyrite_leggings.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - - "result" : { - "item" : "netherrocks:fyrite_leggings" - }, - "pattern" : [ - "SSS", - "S S", - "S S" - ], - "type" : "minecraft:crafting_shaped", - "key" : { - "S" : { "tag" : "forge:ingots/fyrite"} - } -} \ No newline at end of file diff --git a/src/main/resources/data/netherrocks/recipes/fyrite_pickaxe.json b/src/main/resources/data/netherrocks/recipes/fyrite_pickaxe.json deleted file mode 100644 index e0a5a69d..00000000 --- a/src/main/resources/data/netherrocks/recipes/fyrite_pickaxe.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - - "result" : { - "item" : "netherrocks:fyrite_pickaxe" - }, - "pattern" : [ - "SSS", - " T ", - " T " - ], - "type" : "minecraft:crafting_shaped", - "key" : { - "S" : { "tag" : "forge:ingots/fyrite"}, - "T" : { "tag" : "forge:rods/wooden"} - } -} \ No newline at end of file diff --git a/src/main/resources/data/netherrocks/recipes/fyrite_shovel.json b/src/main/resources/data/netherrocks/recipes/fyrite_shovel.json deleted file mode 100644 index 3a424e40..00000000 --- a/src/main/resources/data/netherrocks/recipes/fyrite_shovel.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - - "result" : { - "item" : "netherrocks:fyrite_shovel" - }, - "pattern" : [ - " S ", - " T ", - " T " - ], - "type" : "minecraft:crafting_shaped", - "key" : { - "S" : { "tag" : "forge:ingots/fyrite"}, - "T" : { "tag" : "forge:rods/wooden"} - } -} \ No newline at end of file diff --git a/src/main/resources/data/netherrocks/recipes/fyrite_sword.json b/src/main/resources/data/netherrocks/recipes/fyrite_sword.json deleted file mode 100644 index 0e2f1c27..00000000 --- a/src/main/resources/data/netherrocks/recipes/fyrite_sword.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - - "result" : { - "item" : "netherrocks:fyrite_sword" - }, - "pattern" : [ - " S ", - " S ", - " T " - ], - "type" : "minecraft:crafting_shaped", - "key" : { - "S" : { "tag" : "forge:ingots/fyrite"}, - "T" : { "tag" : "forge:rods/wooden"} - } -} \ No newline at end of file diff --git a/src/main/resources/data/netherrocks/recipes/illumenite_block.json b/src/main/resources/data/netherrocks/recipes/illumenite_block.json deleted file mode 100644 index 54f72ddb..00000000 --- a/src/main/resources/data/netherrocks/recipes/illumenite_block.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - - "type" : "minecraft:crafting_shaped", - "result" : { - "item" : "netherrocks:illumenite_block" - }, - "pattern" : [ - "SSS", - "SSS", - "SSS" - ], - "key" : { - "S" : { "item" : "netherrocks:illumenite_ingot"} - } -} \ No newline at end of file diff --git a/src/main/resources/data/netherrocks/recipes/illumenite_boots.json b/src/main/resources/data/netherrocks/recipes/illumenite_boots.json deleted file mode 100644 index 570b33c0..00000000 --- a/src/main/resources/data/netherrocks/recipes/illumenite_boots.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - - "result" : { - "item" : "netherrocks:illumenite_boots" - }, - "pattern" : [ - "S S", - "S S" - ], - "type" : "minecraft:crafting_shaped", - "key" : { - "S" : { "item" : "netherrocks:illumenite_ingot"} - } -} \ No newline at end of file diff --git a/src/main/resources/data/netherrocks/recipes/illumenite_chestplate.json b/src/main/resources/data/netherrocks/recipes/illumenite_chestplate.json deleted file mode 100644 index 7f6d882c..00000000 --- a/src/main/resources/data/netherrocks/recipes/illumenite_chestplate.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - - "result" : { - "item" : "netherrocks:illumenite_chestplate" - }, - "pattern" : [ - "S S", - "SSS", - "SSS" - ], - "type" : "minecraft:crafting_shaped", - "key" : { - "S" : { "item" : "netherrocks:illumenite_ingot"} - } -} \ No newline at end of file diff --git a/src/main/resources/data/netherrocks/recipes/illumenite_helmet.json b/src/main/resources/data/netherrocks/recipes/illumenite_helmet.json deleted file mode 100644 index 0ffc1b68..00000000 --- a/src/main/resources/data/netherrocks/recipes/illumenite_helmet.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - - "result" : { - "item" : "netherrocks:illumenite_helmet" - }, - "pattern" : [ - "SSS", - "S S" - ], - "type" : "minecraft:crafting_shaped", - "key" : { - "S" : { "item" : "netherrocks:illumenite_ingot"} - } -} \ No newline at end of file diff --git a/src/main/resources/data/netherrocks/recipes/illumenite_ingot.json b/src/main/resources/data/netherrocks/recipes/illumenite_ingot.json deleted file mode 100644 index b881dc34..00000000 --- a/src/main/resources/data/netherrocks/recipes/illumenite_ingot.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - - "type" : "minecraft:crafting_shapeless", - "ingredients" : [ - { "item" : "netherrocks:illumenite_block" } - ], - "result" : { - "item" : "netherrocks:illumenite_ingot", - "count" : 9 - } -} \ No newline at end of file diff --git a/src/main/resources/data/netherrocks/recipes/illumenite_ingot_from_blasting.json b/src/main/resources/data/netherrocks/recipes/illumenite_ingot_from_blasting.json deleted file mode 100644 index 29eb3580..00000000 --- a/src/main/resources/data/netherrocks/recipes/illumenite_ingot_from_blasting.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "type": "minecraft:blasting", - "ingredient": { - "item": "netherrocks:illumenite_ore" - }, - "result": "netherrocks:illumenite_ingot", - "experience": 0.8, - "cookingtime": 100 -} diff --git a/src/main/resources/data/netherrocks/recipes/illumenite_ingot_from_smelting.json b/src/main/resources/data/netherrocks/recipes/illumenite_ingot_from_smelting.json deleted file mode 100644 index 77c2a92b..00000000 --- a/src/main/resources/data/netherrocks/recipes/illumenite_ingot_from_smelting.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "type": "minecraft:smelting", - "ingredient": { - "item": "netherrocks:illumenite_ore" - }, - "result": "netherrocks:illumenite_ingot", - "experience": 0.8, - "cookingtime": 200 -} diff --git a/src/main/resources/data/netherrocks/recipes/illumenite_leggings.json b/src/main/resources/data/netherrocks/recipes/illumenite_leggings.json deleted file mode 100644 index d392a0a0..00000000 --- a/src/main/resources/data/netherrocks/recipes/illumenite_leggings.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - - "result" : { - "item" : "netherrocks:illumenite_leggings" - }, - "pattern" : [ - "SSS", - "S S", - "S S" - ], - "type" : "minecraft:crafting_shaped", - "key" : { - "S" : { "item" : "netherrocks:illumenite_ingot"} - } -} \ No newline at end of file diff --git a/src/main/resources/data/netherrocks/recipes/illumenite_sword.json b/src/main/resources/data/netherrocks/recipes/illumenite_sword.json deleted file mode 100644 index e1aa741a..00000000 --- a/src/main/resources/data/netherrocks/recipes/illumenite_sword.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - - "result" : { - "item" : "netherrocks:illumenite_sword" - }, - "pattern" : [ - " S ", - " S ", - " T " - ], - "type" : "minecraft:crafting_shaped", - "key" : { - "S" : { "item" : "netherrocks:illumenite_ingot"}, - "T" : { "tag" : "forge:rods/wooden"} - } -} \ No newline at end of file diff --git a/src/main/resources/data/netherrocks/recipes/malachite_axe.json b/src/main/resources/data/netherrocks/recipes/malachite_axe.json deleted file mode 100644 index cd48d9e1..00000000 --- a/src/main/resources/data/netherrocks/recipes/malachite_axe.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - - "result" : { - "item" : "netherrocks:malachite_axe" - }, - "pattern" : [ - "SS ", - "ST ", - " T " - ], - "type" : "minecraft:crafting_shaped", - "key" : { - "S" : { "tag" : "forge:ingots/malachite"}, - "T" : { "tag" : "forge:rods/wooden"} - } -} \ No newline at end of file diff --git a/src/main/resources/data/netherrocks/recipes/malachite_block.json b/src/main/resources/data/netherrocks/recipes/malachite_block.json deleted file mode 100644 index 0b8d2a8c..00000000 --- a/src/main/resources/data/netherrocks/recipes/malachite_block.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - - "type" : "minecraft:crafting_shaped", - "result" : { - "item" : "netherrocks:malachite_block" - }, - "pattern" : [ - "SSS", - "SSS", - "SSS" - ], - "key" : { - "S" : { "item" : "netherrocks:malachite_ingot"} - } -} \ No newline at end of file diff --git a/src/main/resources/data/netherrocks/recipes/malachite_boots.json b/src/main/resources/data/netherrocks/recipes/malachite_boots.json deleted file mode 100644 index e14174b3..00000000 --- a/src/main/resources/data/netherrocks/recipes/malachite_boots.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - - "result" : { - "item" : "netherrocks:malachite_boots" - }, - "pattern" : [ - "S S", - "S S" - ], - "type" : "minecraft:crafting_shaped", - "key" : { - "S" : { "tag" : "forge:ingots/malachite"} - } -} \ No newline at end of file diff --git a/src/main/resources/data/netherrocks/recipes/malachite_chestplate.json b/src/main/resources/data/netherrocks/recipes/malachite_chestplate.json deleted file mode 100644 index 32020417..00000000 --- a/src/main/resources/data/netherrocks/recipes/malachite_chestplate.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - - "result" : { - "item" : "netherrocks:malachite_chestplate" - }, - "pattern" : [ - "S S", - "SSS", - "SSS" - ], - "type" : "minecraft:crafting_shaped", - "key" : { - "S" : { "tag" : "forge:ingots/malachite"} - } -} \ No newline at end of file diff --git a/src/main/resources/data/netherrocks/recipes/malachite_helmet.json b/src/main/resources/data/netherrocks/recipes/malachite_helmet.json deleted file mode 100644 index 7fba04dc..00000000 --- a/src/main/resources/data/netherrocks/recipes/malachite_helmet.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - - "result" : { - "item" : "netherrocks:malachite_helmet" - }, - "pattern" : [ - "SSS", - "S S" - ], - "type" : "minecraft:crafting_shaped", - "key" : { - "S" : { "tag" : "forge:ingots/malachite"} - } -} \ No newline at end of file diff --git a/src/main/resources/data/netherrocks/recipes/malachite_hoe.json b/src/main/resources/data/netherrocks/recipes/malachite_hoe.json deleted file mode 100644 index 93c27a1a..00000000 --- a/src/main/resources/data/netherrocks/recipes/malachite_hoe.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - - "result" : { - "item" : "netherrocks:malachite_hoe" - }, - "pattern" : [ - "SS ", - " T ", - " T " - ], - "type" : "minecraft:crafting_shaped", - "key" : { - "S" : { "tag" : "forge:ingots/malachite"}, - "T" : { "tag" : "forge:rods/wooden"} - } -} \ No newline at end of file diff --git a/src/main/resources/data/netherrocks/recipes/malachite_ingot.json b/src/main/resources/data/netherrocks/recipes/malachite_ingot.json deleted file mode 100644 index 641804eb..00000000 --- a/src/main/resources/data/netherrocks/recipes/malachite_ingot.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - - "type" : "minecraft:crafting_shapeless", - "ingredients" : [ - { "item" : "netherrocks:malachite_block" } - ], - "result" : { - "item" : "netherrocks:malachite_ingot", - "count" : 9 - } -} \ No newline at end of file diff --git a/src/main/resources/data/netherrocks/recipes/malachite_ingot_from_blasting.json b/src/main/resources/data/netherrocks/recipes/malachite_ingot_from_blasting.json deleted file mode 100644 index f2055643..00000000 --- a/src/main/resources/data/netherrocks/recipes/malachite_ingot_from_blasting.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "type": "minecraft:blasting", - "ingredient": { - "item": "netherrocks:malachite_ore" - }, - "result": "netherrocks:malachite_ingot", - "experience": 0.5, - "cookingtime": 100 -} diff --git a/src/main/resources/data/netherrocks/recipes/malachite_ingot_from_smelting.json b/src/main/resources/data/netherrocks/recipes/malachite_ingot_from_smelting.json deleted file mode 100644 index 9c4946be..00000000 --- a/src/main/resources/data/netherrocks/recipes/malachite_ingot_from_smelting.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "type": "minecraft:smelting", - "ingredient": { - "item": "netherrocks:malachite_ore" - }, - "result": "netherrocks:malachite_ingot", - "experience": 0.5, - "cookingtime": 200 -} diff --git a/src/main/resources/data/netherrocks/recipes/malachite_leggings.json b/src/main/resources/data/netherrocks/recipes/malachite_leggings.json deleted file mode 100644 index c0ea4bf0..00000000 --- a/src/main/resources/data/netherrocks/recipes/malachite_leggings.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - - "result" : { - "item" : "netherrocks:malachite_leggings" - }, - "pattern" : [ - "SSS", - "S S", - "S S" - ], - "type" : "minecraft:crafting_shaped", - "key" : { - "S" : { "tag" : "forge:ingots/malachite"} - } -} \ No newline at end of file diff --git a/src/main/resources/data/netherrocks/recipes/malachite_pickaxe.json b/src/main/resources/data/netherrocks/recipes/malachite_pickaxe.json deleted file mode 100644 index f8298ba7..00000000 --- a/src/main/resources/data/netherrocks/recipes/malachite_pickaxe.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - - "result" : { - "item" : "netherrocks:malachite_pickaxe" - }, - "pattern" : [ - "SSS", - " T ", - " T " - ], - "type" : "minecraft:crafting_shaped", - "key" : { - "S" : { "tag" : "forge:ingots/malachite"}, - "T" : { "tag" : "forge:rods/wooden"} - } -} \ No newline at end of file diff --git a/src/main/resources/data/netherrocks/recipes/malachite_shovel.json b/src/main/resources/data/netherrocks/recipes/malachite_shovel.json deleted file mode 100644 index 702f9498..00000000 --- a/src/main/resources/data/netherrocks/recipes/malachite_shovel.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - - "result" : { - "item" : "netherrocks:malachite_shovel" - }, - "pattern" : [ - " S ", - " T ", - " T " - ], - "type" : "minecraft:crafting_shaped", - "key" : { - "S" : { "tag" : "forge:ingots/malachite"}, - "T" : { "tag" : "forge:rods/wooden"} - } -} \ No newline at end of file diff --git a/src/main/resources/data/netherrocks/recipes/malachite_sword.json b/src/main/resources/data/netherrocks/recipes/malachite_sword.json deleted file mode 100644 index 46ee432e..00000000 --- a/src/main/resources/data/netherrocks/recipes/malachite_sword.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - - "result" : { - "item" : "netherrocks:malachite_sword" - }, - "pattern" : [ - " S ", - " S ", - " T " - ], - "type" : "minecraft:crafting_shaped", - "key" : { - "S" : { "tag" : "forge:ingots/malachite"}, - "T" : { "tag" : "forge:rods/wooden"} - } -} \ No newline at end of file diff --git a/src/main/resources/data/netherrocks/recipes/nether_furnace.json b/src/main/resources/data/netherrocks/recipes/nether_furnace.json deleted file mode 100644 index 755542fd..00000000 --- a/src/main/resources/data/netherrocks/recipes/nether_furnace.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type" : "minecraft:crafting_shaped", - "result" : { - "item" : "netherrocks:nether_furnace" - }, - "pattern" : [ - "SSS", - "SYS", - "SSS" - ], - "key" : { - "S" : { "item" : "minecraft:netherrack"}, - "Y" : { "item" : "minecraft:flint_and_steel"} - } -} \ No newline at end of file diff --git a/src/main/resources/data/netherrocks/tags/items/nether_furnace_fuels.json b/src/main/resources/data/netherrocks/tags/items/nether_furnace_fuels.json index 26e6c4b4..ac32dacd 100644 --- a/src/main/resources/data/netherrocks/tags/items/nether_furnace_fuels.json +++ b/src/main/resources/data/netherrocks/tags/items/nether_furnace_fuels.json @@ -4,6 +4,7 @@ "netherrocks:fyrite_sword", "netherrocks:fyrite_axe", "netherrocks:fyrite_pickaxe", - "netherrocks:fyrite_shovel" + "netherrocks:fyrite_shovel", + "netherrocks:fyrite_bars" ] } diff --git a/src/main/resources/pack.mcmeta b/src/main/resources/pack.mcmeta index c05761bb..77ccc42c 100644 --- a/src/main/resources/pack.mcmeta +++ b/src/main/resources/pack.mcmeta @@ -1,6 +1,6 @@ { "pack":{ - "pack_format": 6, + "pack_format": 7, "description":"SimpleOres:Netherrocks resources" } } \ No newline at end of file diff --git a/update.json b/update.json index b805fb6d..3f14547c 100644 --- a/update.json +++ b/update.json @@ -22,6 +22,8 @@ "1.16.4-latest" : "1.16.4-2.3.3.2", "1.16.4-recommended" : "1.16.4-2.3.3.2", "1.16.5-latest" : "1.16.5-2.3.6.5", - "1.16.5-recommended" : "1.16.5-2.3.6.4" + "1.16.5-recommended" : "1.16.5-2.3.6.4", + "1.17.1-latest" : "1.17.1-3.0.0.7-final", + "1.17.1-recommended" : "1.17.1-3.0.0.7-final" } }