diff --git a/.github/workflows/branches.yml b/.github/workflows/branches.yml new file mode 100644 index 000000000..21f0c3f1d --- /dev/null +++ b/.github/workflows/branches.yml @@ -0,0 +1,29 @@ +name: 'Build branches' + +on: + push: + branches-ignore: [ master ] + +jobs: + build: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + - name: Set up JDK 1.8 + uses: actions/setup-java@v1 + with: + java-version: 1.8 + - name: Grant execute permission for gradlew + run: chmod +x gradlew + - name: Use gradle cache for faster builds + uses: actions/cache@v1 + with: + path: ~/.gradle/caches + key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }} + - name: Generate assets + uses: GabrielBB/xvfb-action@v1.2 + with: + run: ./gradlew runData --no-daemon + - name: Build with Gradle + run: ./gradlew build --no-daemon diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index b9b5e0ec2..6943a0e35 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -21,5 +21,9 @@ jobs: with: path: ~/.gradle/caches key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }} + - name: Generate assets + uses: GabrielBB/xvfb-action@v1.2 + with: + run: ./gradlew runData --no-daemon - name: Build with Gradle - run: ./gradlew build + run: ./gradlew build --no-daemon diff --git a/.github/workflows/pull_requests.yml b/.github/workflows/pull_requests.yml index 5b7d544fd..6eb200a4f 100644 --- a/.github/workflows/pull_requests.yml +++ b/.github/workflows/pull_requests.yml @@ -1,4 +1,4 @@ -name: 'Build master' +name: 'Build PRs' on: pull_request: @@ -21,11 +21,15 @@ jobs: with: path: ~/.gradle/caches key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }} + - name: Generate assets + uses: GabrielBB/xvfb-action@v1.2 + with: + run: ./gradlew runData --no-daemon - name: Build with Gradle - run: | - echo "::set-env name=PR_NUMBER::$(jq --raw-output .pull_request.number "$GITHUB_EVENT_PATH")" - ./gradlew build + env: + PR_NUMBER: ${{ github.event.pull_request.number }} + run: ./gradlew build --no-daemon - uses: actions/upload-artifact@v2 with: - name: jar-artifacts - path: build/libs/appliedenergistics2-?.?.?+pr.*[0-9].jar \ No newline at end of file + name: dist + path: build/libs/ diff --git a/.gitignore b/.gitignore index 0ba358568..e784eb173 100644 --- a/.gitignore +++ b/.gitignore @@ -14,8 +14,9 @@ !README.md !LICENSE -# include sourcecode +# include sourcecode except generated !src/ +src/generated # include git important files !.gitmodules diff --git a/build.gradle b/build.gradle index 2dbf72621..7b931f571 100644 --- a/build.gradle +++ b/build.gradle @@ -55,9 +55,14 @@ tasks.withType(JavaCompile) { // Create version number version = version_major + "." + version_minor + "." + version_patch -ext.prNumber = System.getenv('PR_NUMBER') ?: false -if (ext.prNumber) { - version = version + "+pr." + ext.prNumber +ext.pr = System.getenv('PR_NUMBER') ?: "" +if (ext.pr) { + version = version + "+pr." + ext.pr +} + +ext.branch = System.getenv('BRANCH') ?: "" +if (ext.branch) { + version = version + "+branch." + ext.branch } // Maven group and artifact name diff --git a/gradle/scripts/artifacts.gradle b/gradle/scripts/artifacts.gradle index 4c0d65f43..0dae2247c 100644 --- a/gradle/scripts/artifacts.gradle +++ b/gradle/scripts/artifacts.gradle @@ -16,6 +16,10 @@ * along with Applied Energistics 2. If not, see . */ +processResources { + exclude '.cache' +} + jar { from sourceSets.main.output.classesDirs from sourceSets.api.output.classesDirs diff --git a/src/generated/resources/data/appliedenergistics2/loot_tables/blocks/charged_quartz_ore.json b/src/generated/resources/data/appliedenergistics2/loot_tables/blocks/charged_quartz_ore.json deleted file mode 100644 index b7ab6cde2..000000000 --- a/src/generated/resources/data/appliedenergistics2/loot_tables/blocks/charged_quartz_ore.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ], - "name": "appliedenergistics2:charged_quartz_ore" - }, - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:ore_drops" - }, - { - "function": "minecraft:explosion_decay" - } - ], - "name": "minecraft:lapis_lazuli" - } - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/appliedenergistics2/loot_tables/blocks/chiseled_quartz_block.json b/src/generated/resources/data/appliedenergistics2/loot_tables/blocks/chiseled_quartz_block.json deleted file mode 100644 index 402d65586..000000000 --- a/src/generated/resources/data/appliedenergistics2/loot_tables/blocks/chiseled_quartz_block.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "name": "main", - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "appliedenergistics2:chiseled_quartz_block" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/appliedenergistics2/loot_tables/blocks/chiseled_quartz_slab.json b/src/generated/resources/data/appliedenergistics2/loot_tables/blocks/chiseled_quartz_slab.json deleted file mode 100644 index 99800725e..000000000 --- a/src/generated/resources/data/appliedenergistics2/loot_tables/blocks/chiseled_quartz_slab.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "name": "main", - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "appliedenergistics2:chiseled_quartz_slab" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/appliedenergistics2/loot_tables/blocks/chiseled_quartz_stairs.json b/src/generated/resources/data/appliedenergistics2/loot_tables/blocks/chiseled_quartz_stairs.json deleted file mode 100644 index e4615a458..000000000 --- a/src/generated/resources/data/appliedenergistics2/loot_tables/blocks/chiseled_quartz_stairs.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "name": "main", - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "appliedenergistics2:chiseled_quartz_stairs" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/appliedenergistics2/loot_tables/blocks/fluix_block.json b/src/generated/resources/data/appliedenergistics2/loot_tables/blocks/fluix_block.json deleted file mode 100644 index 7b2b9a6ae..000000000 --- a/src/generated/resources/data/appliedenergistics2/loot_tables/blocks/fluix_block.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "name": "main", - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "appliedenergistics2:fluix_block" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/appliedenergistics2/loot_tables/blocks/fluix_slab.json b/src/generated/resources/data/appliedenergistics2/loot_tables/blocks/fluix_slab.json deleted file mode 100644 index 5366eed60..000000000 --- a/src/generated/resources/data/appliedenergistics2/loot_tables/blocks/fluix_slab.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "name": "main", - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "appliedenergistics2:fluix_slab" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/appliedenergistics2/loot_tables/blocks/fluix_stairs.json b/src/generated/resources/data/appliedenergistics2/loot_tables/blocks/fluix_stairs.json deleted file mode 100644 index 69218ef61..000000000 --- a/src/generated/resources/data/appliedenergistics2/loot_tables/blocks/fluix_stairs.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "name": "main", - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "appliedenergistics2:fluix_stairs" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/appliedenergistics2/loot_tables/blocks/matrix_frame.json b/src/generated/resources/data/appliedenergistics2/loot_tables/blocks/matrix_frame.json deleted file mode 100644 index 68701f9f6..000000000 --- a/src/generated/resources/data/appliedenergistics2/loot_tables/blocks/matrix_frame.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "type": "minecraft:block" -} \ No newline at end of file diff --git a/src/generated/resources/data/appliedenergistics2/loot_tables/blocks/quartz_block.json b/src/generated/resources/data/appliedenergistics2/loot_tables/blocks/quartz_block.json deleted file mode 100644 index f3b91c4db..000000000 --- a/src/generated/resources/data/appliedenergistics2/loot_tables/blocks/quartz_block.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "name": "main", - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "appliedenergistics2:quartz_block" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/appliedenergistics2/loot_tables/blocks/quartz_fixture.json b/src/generated/resources/data/appliedenergistics2/loot_tables/blocks/quartz_fixture.json deleted file mode 100644 index 4f0f463ea..000000000 --- a/src/generated/resources/data/appliedenergistics2/loot_tables/blocks/quartz_fixture.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "name": "main", - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "appliedenergistics2:quartz_fixture" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/appliedenergistics2/loot_tables/blocks/quartz_glass.json b/src/generated/resources/data/appliedenergistics2/loot_tables/blocks/quartz_glass.json deleted file mode 100644 index f42bc412f..000000000 --- a/src/generated/resources/data/appliedenergistics2/loot_tables/blocks/quartz_glass.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "name": "main", - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "appliedenergistics2:quartz_glass" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/appliedenergistics2/loot_tables/blocks/quartz_ore.json b/src/generated/resources/data/appliedenergistics2/loot_tables/blocks/quartz_ore.json deleted file mode 100644 index 9f00e7dca..000000000 --- a/src/generated/resources/data/appliedenergistics2/loot_tables/blocks/quartz_ore.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ], - "name": "appliedenergistics2:quartz_ore" - }, - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:ore_drops" - }, - { - "function": "minecraft:explosion_decay" - } - ], - "name": "minecraft:quartz" - } - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/appliedenergistics2/loot_tables/blocks/quartz_pillar.json b/src/generated/resources/data/appliedenergistics2/loot_tables/blocks/quartz_pillar.json deleted file mode 100644 index ecabb9222..000000000 --- a/src/generated/resources/data/appliedenergistics2/loot_tables/blocks/quartz_pillar.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "name": "main", - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "appliedenergistics2:quartz_pillar" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/appliedenergistics2/loot_tables/blocks/quartz_pillar_slab.json b/src/generated/resources/data/appliedenergistics2/loot_tables/blocks/quartz_pillar_slab.json deleted file mode 100644 index e30e7cef0..000000000 --- a/src/generated/resources/data/appliedenergistics2/loot_tables/blocks/quartz_pillar_slab.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "name": "main", - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "appliedenergistics2:quartz_pillar_slab" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/appliedenergistics2/loot_tables/blocks/quartz_pillar_stairs.json b/src/generated/resources/data/appliedenergistics2/loot_tables/blocks/quartz_pillar_stairs.json deleted file mode 100644 index f9a9fbecc..000000000 --- a/src/generated/resources/data/appliedenergistics2/loot_tables/blocks/quartz_pillar_stairs.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "name": "main", - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "appliedenergistics2:quartz_pillar_stairs" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/appliedenergistics2/loot_tables/blocks/quartz_slab.json b/src/generated/resources/data/appliedenergistics2/loot_tables/blocks/quartz_slab.json deleted file mode 100644 index eaf5b95a6..000000000 --- a/src/generated/resources/data/appliedenergistics2/loot_tables/blocks/quartz_slab.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "name": "main", - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "appliedenergistics2:quartz_slab" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/appliedenergistics2/loot_tables/blocks/quartz_stairs.json b/src/generated/resources/data/appliedenergistics2/loot_tables/blocks/quartz_stairs.json deleted file mode 100644 index a5d0892ac..000000000 --- a/src/generated/resources/data/appliedenergistics2/loot_tables/blocks/quartz_stairs.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "name": "main", - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "appliedenergistics2:quartz_stairs" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/appliedenergistics2/loot_tables/blocks/quartz_vibrant_glass.json b/src/generated/resources/data/appliedenergistics2/loot_tables/blocks/quartz_vibrant_glass.json deleted file mode 100644 index fea390735..000000000 --- a/src/generated/resources/data/appliedenergistics2/loot_tables/blocks/quartz_vibrant_glass.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "name": "main", - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "appliedenergistics2:quartz_vibrant_glass" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/appliedenergistics2/loot_tables/blocks/sky_stone_block.json b/src/generated/resources/data/appliedenergistics2/loot_tables/blocks/sky_stone_block.json deleted file mode 100644 index bbc449c5d..000000000 --- a/src/generated/resources/data/appliedenergistics2/loot_tables/blocks/sky_stone_block.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "name": "main", - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "appliedenergistics2:sky_stone_block" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/appliedenergistics2/loot_tables/blocks/sky_stone_brick.json b/src/generated/resources/data/appliedenergistics2/loot_tables/blocks/sky_stone_brick.json deleted file mode 100644 index 44955f15e..000000000 --- a/src/generated/resources/data/appliedenergistics2/loot_tables/blocks/sky_stone_brick.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "name": "main", - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "appliedenergistics2:sky_stone_brick" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/appliedenergistics2/loot_tables/blocks/sky_stone_brick_slab.json b/src/generated/resources/data/appliedenergistics2/loot_tables/blocks/sky_stone_brick_slab.json deleted file mode 100644 index 37ba6528f..000000000 --- a/src/generated/resources/data/appliedenergistics2/loot_tables/blocks/sky_stone_brick_slab.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "name": "main", - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "appliedenergistics2:sky_stone_brick_slab" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/appliedenergistics2/loot_tables/blocks/sky_stone_brick_stairs.json b/src/generated/resources/data/appliedenergistics2/loot_tables/blocks/sky_stone_brick_stairs.json deleted file mode 100644 index ed691afdc..000000000 --- a/src/generated/resources/data/appliedenergistics2/loot_tables/blocks/sky_stone_brick_stairs.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "name": "main", - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "appliedenergistics2:sky_stone_brick_stairs" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/appliedenergistics2/loot_tables/blocks/sky_stone_chest.json b/src/generated/resources/data/appliedenergistics2/loot_tables/blocks/sky_stone_chest.json deleted file mode 100644 index 22995d06e..000000000 --- a/src/generated/resources/data/appliedenergistics2/loot_tables/blocks/sky_stone_chest.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "name": "main", - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "appliedenergistics2:sky_stone_chest" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/appliedenergistics2/loot_tables/blocks/sky_stone_slab.json b/src/generated/resources/data/appliedenergistics2/loot_tables/blocks/sky_stone_slab.json deleted file mode 100644 index dcb3acc10..000000000 --- a/src/generated/resources/data/appliedenergistics2/loot_tables/blocks/sky_stone_slab.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "name": "main", - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "appliedenergistics2:sky_stone_slab" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/appliedenergistics2/loot_tables/blocks/sky_stone_small_brick.json b/src/generated/resources/data/appliedenergistics2/loot_tables/blocks/sky_stone_small_brick.json deleted file mode 100644 index a7aa9f17b..000000000 --- a/src/generated/resources/data/appliedenergistics2/loot_tables/blocks/sky_stone_small_brick.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "name": "main", - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "appliedenergistics2:sky_stone_small_brick" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/appliedenergistics2/loot_tables/blocks/sky_stone_small_brick_slab.json b/src/generated/resources/data/appliedenergistics2/loot_tables/blocks/sky_stone_small_brick_slab.json deleted file mode 100644 index c9c4ee37e..000000000 --- a/src/generated/resources/data/appliedenergistics2/loot_tables/blocks/sky_stone_small_brick_slab.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "name": "main", - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "appliedenergistics2:sky_stone_small_brick_slab" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/appliedenergistics2/loot_tables/blocks/sky_stone_small_brick_stairs.json b/src/generated/resources/data/appliedenergistics2/loot_tables/blocks/sky_stone_small_brick_stairs.json deleted file mode 100644 index c9ed09d77..000000000 --- a/src/generated/resources/data/appliedenergistics2/loot_tables/blocks/sky_stone_small_brick_stairs.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "name": "main", - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "appliedenergistics2:sky_stone_small_brick_stairs" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/appliedenergistics2/loot_tables/blocks/sky_stone_stairs.json b/src/generated/resources/data/appliedenergistics2/loot_tables/blocks/sky_stone_stairs.json deleted file mode 100644 index ae26bfaf3..000000000 --- a/src/generated/resources/data/appliedenergistics2/loot_tables/blocks/sky_stone_stairs.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "name": "main", - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "appliedenergistics2:sky_stone_stairs" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/appliedenergistics2/loot_tables/blocks/smooth_sky_stone_block.json b/src/generated/resources/data/appliedenergistics2/loot_tables/blocks/smooth_sky_stone_block.json deleted file mode 100644 index 85591354e..000000000 --- a/src/generated/resources/data/appliedenergistics2/loot_tables/blocks/smooth_sky_stone_block.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "name": "main", - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "appliedenergistics2:smooth_sky_stone_block" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/appliedenergistics2/loot_tables/blocks/smooth_sky_stone_chest.json b/src/generated/resources/data/appliedenergistics2/loot_tables/blocks/smooth_sky_stone_chest.json deleted file mode 100644 index f01323eb0..000000000 --- a/src/generated/resources/data/appliedenergistics2/loot_tables/blocks/smooth_sky_stone_chest.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "name": "main", - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "appliedenergistics2:smooth_sky_stone_chest" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/appliedenergistics2/loot_tables/blocks/smooth_sky_stone_slab.json b/src/generated/resources/data/appliedenergistics2/loot_tables/blocks/smooth_sky_stone_slab.json deleted file mode 100644 index 3dc859e8f..000000000 --- a/src/generated/resources/data/appliedenergistics2/loot_tables/blocks/smooth_sky_stone_slab.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "name": "main", - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "appliedenergistics2:smooth_sky_stone_slab" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/appliedenergistics2/loot_tables/blocks/smooth_sky_stone_stairs.json b/src/generated/resources/data/appliedenergistics2/loot_tables/blocks/smooth_sky_stone_stairs.json deleted file mode 100644 index 6b04849cf..000000000 --- a/src/generated/resources/data/appliedenergistics2/loot_tables/blocks/smooth_sky_stone_stairs.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "name": "main", - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "appliedenergistics2:smooth_sky_stone_stairs" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/appliedenergistics2/recipes/slabs/block_cutter/chiseled_quartz_block.json b/src/generated/resources/data/appliedenergistics2/recipes/slabs/block_cutter/chiseled_quartz_block.json deleted file mode 100644 index 9d0b3efe9..000000000 --- a/src/generated/resources/data/appliedenergistics2/recipes/slabs/block_cutter/chiseled_quartz_block.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "features": [ - "DECORATIVE_BLOCKS", - "CERTUS" - ], - "type": "appliedenergistics2:feature" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "item": "appliedenergistics2:chiseled_quartz_block" - }, - "result": "appliedenergistics2:chiseled_quartz_slab", - "count": 2 - } - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/appliedenergistics2/recipes/slabs/block_cutter/fluix_block.json b/src/generated/resources/data/appliedenergistics2/recipes/slabs/block_cutter/fluix_block.json deleted file mode 100644 index 36f622037..000000000 --- a/src/generated/resources/data/appliedenergistics2/recipes/slabs/block_cutter/fluix_block.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "features": [ - "FLUIX", - "DECORATIVE_BLOCKS" - ], - "type": "appliedenergistics2:feature" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "item": "appliedenergistics2:fluix_block" - }, - "result": "appliedenergistics2:fluix_slab", - "count": 2 - } - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/appliedenergistics2/recipes/slabs/block_cutter/quartz_block.json b/src/generated/resources/data/appliedenergistics2/recipes/slabs/block_cutter/quartz_block.json deleted file mode 100644 index 21f1f62b1..000000000 --- a/src/generated/resources/data/appliedenergistics2/recipes/slabs/block_cutter/quartz_block.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "features": [ - "DECORATIVE_BLOCKS", - "CERTUS" - ], - "type": "appliedenergistics2:feature" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "item": "appliedenergistics2:quartz_block" - }, - "result": "appliedenergistics2:quartz_slab", - "count": 2 - } - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/appliedenergistics2/recipes/slabs/block_cutter/quartz_pillar.json b/src/generated/resources/data/appliedenergistics2/recipes/slabs/block_cutter/quartz_pillar.json deleted file mode 100644 index f5756c2c6..000000000 --- a/src/generated/resources/data/appliedenergistics2/recipes/slabs/block_cutter/quartz_pillar.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "features": [ - "DECORATIVE_BLOCKS", - "CERTUS" - ], - "type": "appliedenergistics2:feature" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "item": "appliedenergistics2:quartz_pillar" - }, - "result": "appliedenergistics2:quartz_pillar_slab", - "count": 2 - } - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/appliedenergistics2/recipes/slabs/block_cutter/sky_stone_block.json b/src/generated/resources/data/appliedenergistics2/recipes/slabs/block_cutter/sky_stone_block.json deleted file mode 100644 index bcc489c3f..000000000 --- a/src/generated/resources/data/appliedenergistics2/recipes/slabs/block_cutter/sky_stone_block.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "features": [ - "SKY_STONE", - "DECORATIVE_BLOCKS" - ], - "type": "appliedenergistics2:feature" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "item": "appliedenergistics2:sky_stone_block" - }, - "result": "appliedenergistics2:sky_stone_slab", - "count": 2 - } - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/appliedenergistics2/recipes/slabs/block_cutter/sky_stone_brick.json b/src/generated/resources/data/appliedenergistics2/recipes/slabs/block_cutter/sky_stone_brick.json deleted file mode 100644 index 59e96045b..000000000 --- a/src/generated/resources/data/appliedenergistics2/recipes/slabs/block_cutter/sky_stone_brick.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "features": [ - "DECORATIVE_BLOCKS", - "SKY_STONE" - ], - "type": "appliedenergistics2:feature" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "item": "appliedenergistics2:sky_stone_brick" - }, - "result": "appliedenergistics2:sky_stone_brick_slab", - "count": 2 - } - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/appliedenergistics2/recipes/slabs/block_cutter/sky_stone_small_brick.json b/src/generated/resources/data/appliedenergistics2/recipes/slabs/block_cutter/sky_stone_small_brick.json deleted file mode 100644 index a35ae0555..000000000 --- a/src/generated/resources/data/appliedenergistics2/recipes/slabs/block_cutter/sky_stone_small_brick.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "features": [ - "DECORATIVE_BLOCKS", - "SKY_STONE" - ], - "type": "appliedenergistics2:feature" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "item": "appliedenergistics2:sky_stone_small_brick" - }, - "result": "appliedenergistics2:sky_stone_small_brick_slab", - "count": 2 - } - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/appliedenergistics2/recipes/slabs/block_cutter/smooth_sky_stone_block.json b/src/generated/resources/data/appliedenergistics2/recipes/slabs/block_cutter/smooth_sky_stone_block.json deleted file mode 100644 index d8c005681..000000000 --- a/src/generated/resources/data/appliedenergistics2/recipes/slabs/block_cutter/smooth_sky_stone_block.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "features": [ - "SKY_STONE", - "DECORATIVE_BLOCKS" - ], - "type": "appliedenergistics2:feature" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "item": "appliedenergistics2:smooth_sky_stone_block" - }, - "result": "appliedenergistics2:smooth_sky_stone_slab", - "count": 2 - } - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/appliedenergistics2/recipes/slabs/chiseled_quartz_block.json b/src/generated/resources/data/appliedenergistics2/recipes/slabs/chiseled_quartz_block.json deleted file mode 100644 index 88aa8736b..000000000 --- a/src/generated/resources/data/appliedenergistics2/recipes/slabs/chiseled_quartz_block.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "features": [ - "DECORATIVE_BLOCKS", - "CERTUS" - ], - "type": "appliedenergistics2:feature" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "###" - ], - "key": { - "#": { - "item": "appliedenergistics2:chiseled_quartz_block" - } - }, - "result": { - "item": "appliedenergistics2:chiseled_quartz_slab", - "count": 6 - } - } - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/appliedenergistics2/recipes/slabs/fluix_block.json b/src/generated/resources/data/appliedenergistics2/recipes/slabs/fluix_block.json deleted file mode 100644 index 0fba6dabf..000000000 --- a/src/generated/resources/data/appliedenergistics2/recipes/slabs/fluix_block.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "features": [ - "FLUIX", - "DECORATIVE_BLOCKS" - ], - "type": "appliedenergistics2:feature" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "###" - ], - "key": { - "#": { - "item": "appliedenergistics2:fluix_block" - } - }, - "result": { - "item": "appliedenergistics2:fluix_slab", - "count": 6 - } - } - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/appliedenergistics2/recipes/slabs/quartz_block.json b/src/generated/resources/data/appliedenergistics2/recipes/slabs/quartz_block.json deleted file mode 100644 index 35183a69a..000000000 --- a/src/generated/resources/data/appliedenergistics2/recipes/slabs/quartz_block.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "features": [ - "DECORATIVE_BLOCKS", - "CERTUS" - ], - "type": "appliedenergistics2:feature" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "###" - ], - "key": { - "#": { - "item": "appliedenergistics2:quartz_block" - } - }, - "result": { - "item": "appliedenergistics2:quartz_slab", - "count": 6 - } - } - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/appliedenergistics2/recipes/slabs/quartz_pillar.json b/src/generated/resources/data/appliedenergistics2/recipes/slabs/quartz_pillar.json deleted file mode 100644 index 457d5702c..000000000 --- a/src/generated/resources/data/appliedenergistics2/recipes/slabs/quartz_pillar.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "features": [ - "DECORATIVE_BLOCKS", - "CERTUS" - ], - "type": "appliedenergistics2:feature" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "###" - ], - "key": { - "#": { - "item": "appliedenergistics2:quartz_pillar" - } - }, - "result": { - "item": "appliedenergistics2:quartz_pillar_slab", - "count": 6 - } - } - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/appliedenergistics2/recipes/slabs/sky_stone_block.json b/src/generated/resources/data/appliedenergistics2/recipes/slabs/sky_stone_block.json deleted file mode 100644 index 5492a7a6f..000000000 --- a/src/generated/resources/data/appliedenergistics2/recipes/slabs/sky_stone_block.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "features": [ - "SKY_STONE", - "DECORATIVE_BLOCKS" - ], - "type": "appliedenergistics2:feature" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "###" - ], - "key": { - "#": { - "item": "appliedenergistics2:sky_stone_block" - } - }, - "result": { - "item": "appliedenergistics2:sky_stone_slab", - "count": 6 - } - } - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/appliedenergistics2/recipes/slabs/sky_stone_brick.json b/src/generated/resources/data/appliedenergistics2/recipes/slabs/sky_stone_brick.json deleted file mode 100644 index b1c036ec2..000000000 --- a/src/generated/resources/data/appliedenergistics2/recipes/slabs/sky_stone_brick.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "features": [ - "DECORATIVE_BLOCKS", - "SKY_STONE" - ], - "type": "appliedenergistics2:feature" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "###" - ], - "key": { - "#": { - "item": "appliedenergistics2:sky_stone_brick" - } - }, - "result": { - "item": "appliedenergistics2:sky_stone_brick_slab", - "count": 6 - } - } - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/appliedenergistics2/recipes/slabs/sky_stone_small_brick.json b/src/generated/resources/data/appliedenergistics2/recipes/slabs/sky_stone_small_brick.json deleted file mode 100644 index 46c1d331c..000000000 --- a/src/generated/resources/data/appliedenergistics2/recipes/slabs/sky_stone_small_brick.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "features": [ - "DECORATIVE_BLOCKS", - "SKY_STONE" - ], - "type": "appliedenergistics2:feature" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "###" - ], - "key": { - "#": { - "item": "appliedenergistics2:sky_stone_small_brick" - } - }, - "result": { - "item": "appliedenergistics2:sky_stone_small_brick_slab", - "count": 6 - } - } - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/appliedenergistics2/recipes/slabs/smooth_sky_stone_block.json b/src/generated/resources/data/appliedenergistics2/recipes/slabs/smooth_sky_stone_block.json deleted file mode 100644 index cd04860d1..000000000 --- a/src/generated/resources/data/appliedenergistics2/recipes/slabs/smooth_sky_stone_block.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "features": [ - "SKY_STONE", - "DECORATIVE_BLOCKS" - ], - "type": "appliedenergistics2:feature" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "###" - ], - "key": { - "#": { - "item": "appliedenergistics2:smooth_sky_stone_block" - } - }, - "result": { - "item": "appliedenergistics2:smooth_sky_stone_slab", - "count": 6 - } - } - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/appliedenergistics2/recipes/stairs/block_cutter/chiseled_quartz_block.json b/src/generated/resources/data/appliedenergistics2/recipes/stairs/block_cutter/chiseled_quartz_block.json deleted file mode 100644 index 57a491918..000000000 --- a/src/generated/resources/data/appliedenergistics2/recipes/stairs/block_cutter/chiseled_quartz_block.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "features": [ - "DECORATIVE_BLOCKS", - "CERTUS" - ], - "type": "appliedenergistics2:feature" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "item": "appliedenergistics2:chiseled_quartz_block" - }, - "result": "appliedenergistics2:chiseled_quartz_stairs", - "count": 1 - } - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/appliedenergistics2/recipes/stairs/block_cutter/fluix_block.json b/src/generated/resources/data/appliedenergistics2/recipes/stairs/block_cutter/fluix_block.json deleted file mode 100644 index 611d3588e..000000000 --- a/src/generated/resources/data/appliedenergistics2/recipes/stairs/block_cutter/fluix_block.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "features": [ - "FLUIX", - "DECORATIVE_BLOCKS" - ], - "type": "appliedenergistics2:feature" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "item": "appliedenergistics2:fluix_block" - }, - "result": "appliedenergistics2:fluix_stairs", - "count": 1 - } - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/appliedenergistics2/recipes/stairs/block_cutter/quartz_block.json b/src/generated/resources/data/appliedenergistics2/recipes/stairs/block_cutter/quartz_block.json deleted file mode 100644 index e50e68a33..000000000 --- a/src/generated/resources/data/appliedenergistics2/recipes/stairs/block_cutter/quartz_block.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "features": [ - "DECORATIVE_BLOCKS", - "CERTUS" - ], - "type": "appliedenergistics2:feature" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "item": "appliedenergistics2:quartz_block" - }, - "result": "appliedenergistics2:quartz_stairs", - "count": 1 - } - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/appliedenergistics2/recipes/stairs/block_cutter/quartz_pillar.json b/src/generated/resources/data/appliedenergistics2/recipes/stairs/block_cutter/quartz_pillar.json deleted file mode 100644 index d2b3ac908..000000000 --- a/src/generated/resources/data/appliedenergistics2/recipes/stairs/block_cutter/quartz_pillar.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "features": [ - "DECORATIVE_BLOCKS", - "CERTUS" - ], - "type": "appliedenergistics2:feature" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "item": "appliedenergistics2:quartz_pillar" - }, - "result": "appliedenergistics2:quartz_pillar_stairs", - "count": 1 - } - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/appliedenergistics2/recipes/stairs/block_cutter/sky_stone_block.json b/src/generated/resources/data/appliedenergistics2/recipes/stairs/block_cutter/sky_stone_block.json deleted file mode 100644 index 947027d74..000000000 --- a/src/generated/resources/data/appliedenergistics2/recipes/stairs/block_cutter/sky_stone_block.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "features": [ - "SKY_STONE", - "DECORATIVE_BLOCKS" - ], - "type": "appliedenergistics2:feature" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "item": "appliedenergistics2:sky_stone_block" - }, - "result": "appliedenergistics2:sky_stone_stairs", - "count": 1 - } - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/appliedenergistics2/recipes/stairs/block_cutter/sky_stone_brick.json b/src/generated/resources/data/appliedenergistics2/recipes/stairs/block_cutter/sky_stone_brick.json deleted file mode 100644 index eb1e8060e..000000000 --- a/src/generated/resources/data/appliedenergistics2/recipes/stairs/block_cutter/sky_stone_brick.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "features": [ - "DECORATIVE_BLOCKS", - "SKY_STONE" - ], - "type": "appliedenergistics2:feature" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "item": "appliedenergistics2:sky_stone_brick" - }, - "result": "appliedenergistics2:sky_stone_brick_stairs", - "count": 1 - } - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/appliedenergistics2/recipes/stairs/block_cutter/sky_stone_small_brick.json b/src/generated/resources/data/appliedenergistics2/recipes/stairs/block_cutter/sky_stone_small_brick.json deleted file mode 100644 index e834ed172..000000000 --- a/src/generated/resources/data/appliedenergistics2/recipes/stairs/block_cutter/sky_stone_small_brick.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "features": [ - "DECORATIVE_BLOCKS", - "SKY_STONE" - ], - "type": "appliedenergistics2:feature" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "item": "appliedenergistics2:sky_stone_small_brick" - }, - "result": "appliedenergistics2:sky_stone_small_brick_stairs", - "count": 1 - } - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/appliedenergistics2/recipes/stairs/block_cutter/smooth_sky_stone_block.json b/src/generated/resources/data/appliedenergistics2/recipes/stairs/block_cutter/smooth_sky_stone_block.json deleted file mode 100644 index dcf3a0d02..000000000 --- a/src/generated/resources/data/appliedenergistics2/recipes/stairs/block_cutter/smooth_sky_stone_block.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "features": [ - "SKY_STONE", - "DECORATIVE_BLOCKS" - ], - "type": "appliedenergistics2:feature" - } - ], - "recipe": { - "type": "minecraft:stonecutting", - "ingredient": { - "item": "appliedenergistics2:smooth_sky_stone_block" - }, - "result": "appliedenergistics2:smooth_sky_stone_stairs", - "count": 1 - } - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/appliedenergistics2/recipes/stairs/chiseled_quartz_block.json b/src/generated/resources/data/appliedenergistics2/recipes/stairs/chiseled_quartz_block.json deleted file mode 100644 index aa155ac80..000000000 --- a/src/generated/resources/data/appliedenergistics2/recipes/stairs/chiseled_quartz_block.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "features": [ - "DECORATIVE_BLOCKS", - "CERTUS" - ], - "type": "appliedenergistics2:feature" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "# ", - "## ", - "###" - ], - "key": { - "#": { - "item": "appliedenergistics2:chiseled_quartz_block" - } - }, - "result": { - "item": "appliedenergistics2:chiseled_quartz_stairs", - "count": 4 - } - } - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/appliedenergistics2/recipes/stairs/fluix_block.json b/src/generated/resources/data/appliedenergistics2/recipes/stairs/fluix_block.json deleted file mode 100644 index 7505d32c7..000000000 --- a/src/generated/resources/data/appliedenergistics2/recipes/stairs/fluix_block.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "features": [ - "FLUIX", - "DECORATIVE_BLOCKS" - ], - "type": "appliedenergistics2:feature" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "# ", - "## ", - "###" - ], - "key": { - "#": { - "item": "appliedenergistics2:fluix_block" - } - }, - "result": { - "item": "appliedenergistics2:fluix_stairs", - "count": 4 - } - } - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/appliedenergistics2/recipes/stairs/quartz_block.json b/src/generated/resources/data/appliedenergistics2/recipes/stairs/quartz_block.json deleted file mode 100644 index 5ed6dbb70..000000000 --- a/src/generated/resources/data/appliedenergistics2/recipes/stairs/quartz_block.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "features": [ - "DECORATIVE_BLOCKS", - "CERTUS" - ], - "type": "appliedenergistics2:feature" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "# ", - "## ", - "###" - ], - "key": { - "#": { - "item": "appliedenergistics2:quartz_block" - } - }, - "result": { - "item": "appliedenergistics2:quartz_stairs", - "count": 4 - } - } - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/appliedenergistics2/recipes/stairs/quartz_pillar.json b/src/generated/resources/data/appliedenergistics2/recipes/stairs/quartz_pillar.json deleted file mode 100644 index 0fb45e803..000000000 --- a/src/generated/resources/data/appliedenergistics2/recipes/stairs/quartz_pillar.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "features": [ - "DECORATIVE_BLOCKS", - "CERTUS" - ], - "type": "appliedenergistics2:feature" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "# ", - "## ", - "###" - ], - "key": { - "#": { - "item": "appliedenergistics2:quartz_pillar" - } - }, - "result": { - "item": "appliedenergistics2:quartz_pillar_stairs", - "count": 4 - } - } - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/appliedenergistics2/recipes/stairs/sky_stone_block.json b/src/generated/resources/data/appliedenergistics2/recipes/stairs/sky_stone_block.json deleted file mode 100644 index b3943e00b..000000000 --- a/src/generated/resources/data/appliedenergistics2/recipes/stairs/sky_stone_block.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "features": [ - "SKY_STONE", - "DECORATIVE_BLOCKS" - ], - "type": "appliedenergistics2:feature" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "# ", - "## ", - "###" - ], - "key": { - "#": { - "item": "appliedenergistics2:sky_stone_block" - } - }, - "result": { - "item": "appliedenergistics2:sky_stone_stairs", - "count": 4 - } - } - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/appliedenergistics2/recipes/stairs/sky_stone_brick.json b/src/generated/resources/data/appliedenergistics2/recipes/stairs/sky_stone_brick.json deleted file mode 100644 index 0d3df1788..000000000 --- a/src/generated/resources/data/appliedenergistics2/recipes/stairs/sky_stone_brick.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "features": [ - "DECORATIVE_BLOCKS", - "SKY_STONE" - ], - "type": "appliedenergistics2:feature" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "# ", - "## ", - "###" - ], - "key": { - "#": { - "item": "appliedenergistics2:sky_stone_brick" - } - }, - "result": { - "item": "appliedenergistics2:sky_stone_brick_stairs", - "count": 4 - } - } - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/appliedenergistics2/recipes/stairs/sky_stone_small_brick.json b/src/generated/resources/data/appliedenergistics2/recipes/stairs/sky_stone_small_brick.json deleted file mode 100644 index 9e4e92bd3..000000000 --- a/src/generated/resources/data/appliedenergistics2/recipes/stairs/sky_stone_small_brick.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "features": [ - "DECORATIVE_BLOCKS", - "SKY_STONE" - ], - "type": "appliedenergistics2:feature" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "# ", - "## ", - "###" - ], - "key": { - "#": { - "item": "appliedenergistics2:sky_stone_small_brick" - } - }, - "result": { - "item": "appliedenergistics2:sky_stone_small_brick_stairs", - "count": 4 - } - } - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/appliedenergistics2/recipes/stairs/smooth_sky_stone_block.json b/src/generated/resources/data/appliedenergistics2/recipes/stairs/smooth_sky_stone_block.json deleted file mode 100644 index b8739d331..000000000 --- a/src/generated/resources/data/appliedenergistics2/recipes/stairs/smooth_sky_stone_block.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "features": [ - "SKY_STONE", - "DECORATIVE_BLOCKS" - ], - "type": "appliedenergistics2:feature" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "# ", - "## ", - "###" - ], - "key": { - "#": { - "item": "appliedenergistics2:smooth_sky_stone_block" - } - }, - "result": { - "item": "appliedenergistics2:smooth_sky_stone_stairs", - "count": 4 - } - } - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/appliedenergistics2/recipes/tools/nether_quartz_axe.json b/src/generated/resources/data/appliedenergistics2/recipes/tools/nether_quartz_axe.json deleted file mode 100644 index 901715f1b..000000000 --- a/src/generated/resources/data/appliedenergistics2/recipes/tools/nether_quartz_axe.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "features": [ - "NETHER_QUARTZ_TOOLS", - "QUARTZ_AXE" - ], - "type": "appliedenergistics2:feature" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX ", - "X/ ", - " / " - ], - "key": { - "/": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:gems/quartz" - } - }, - "result": { - "item": "appliedenergistics2:nether_quartz_axe" - } - } - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/appliedenergistics2/recipes/tools/nether_quartz_cutting_knife.json b/src/generated/resources/data/appliedenergistics2/recipes/tools/nether_quartz_cutting_knife.json deleted file mode 100644 index a815ba18a..000000000 --- a/src/generated/resources/data/appliedenergistics2/recipes/tools/nether_quartz_cutting_knife.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "features": [ - "NETHER_QUARTZ_TOOLS", - "QUARTZ_KNIFE" - ], - "type": "appliedenergistics2:feature" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - " /", - "I/ ", - "XX " - ], - "key": { - "/": { - "tag": "forge:rods/wooden" - }, - "I": { - "tag": "forge:ingots/iron" - }, - "X": { - "tag": "forge:gems/quartz" - } - }, - "result": { - "item": "appliedenergistics2:nether_quartz_cutting_knife" - } - } - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/appliedenergistics2/recipes/tools/nether_quartz_hoe.json b/src/generated/resources/data/appliedenergistics2/recipes/tools/nether_quartz_hoe.json deleted file mode 100644 index c214492d9..000000000 --- a/src/generated/resources/data/appliedenergistics2/recipes/tools/nether_quartz_hoe.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "features": [ - "NETHER_QUARTZ_TOOLS", - "QUARTZ_HOE" - ], - "type": "appliedenergistics2:feature" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX ", - " / ", - " / " - ], - "key": { - "/": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:gems/quartz" - } - }, - "result": { - "item": "appliedenergistics2:nether_quartz_hoe" - } - } - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/appliedenergistics2/recipes/tools/nether_quartz_pickaxe.json b/src/generated/resources/data/appliedenergistics2/recipes/tools/nether_quartz_pickaxe.json deleted file mode 100644 index 216d8dae8..000000000 --- a/src/generated/resources/data/appliedenergistics2/recipes/tools/nether_quartz_pickaxe.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "features": [ - "NETHER_QUARTZ_TOOLS", - "QUARTZ_PICKAXE" - ], - "type": "appliedenergistics2:feature" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - " / ", - " / " - ], - "key": { - "/": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:gems/quartz" - } - }, - "result": { - "item": "appliedenergistics2:nether_quartz_pickaxe" - } - } - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/appliedenergistics2/recipes/tools/nether_quartz_spade.json b/src/generated/resources/data/appliedenergistics2/recipes/tools/nether_quartz_spade.json deleted file mode 100644 index 059694487..000000000 --- a/src/generated/resources/data/appliedenergistics2/recipes/tools/nether_quartz_spade.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "features": [ - "NETHER_QUARTZ_TOOLS", - "QUARTZ_SPADE" - ], - "type": "appliedenergistics2:feature" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - " X ", - " / ", - " / " - ], - "key": { - "/": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:gems/quartz" - } - }, - "result": { - "item": "appliedenergistics2:nether_quartz_spade" - } - } - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/appliedenergistics2/recipes/tools/nether_quartz_sword.json b/src/generated/resources/data/appliedenergistics2/recipes/tools/nether_quartz_sword.json deleted file mode 100644 index 2dc0353ba..000000000 --- a/src/generated/resources/data/appliedenergistics2/recipes/tools/nether_quartz_sword.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "features": [ - "NETHER_QUARTZ_TOOLS", - "QUARTZ_SWORD" - ], - "type": "appliedenergistics2:feature" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - " X ", - " X ", - " / " - ], - "key": { - "/": { - "tag": "forge:rods/wooden" - }, - "X": { - "tag": "forge:gems/quartz" - } - }, - "result": { - "item": "appliedenergistics2:nether_quartz_sword" - } - } - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/appliedenergistics2/recipes/tools/nether_quartz_wrench.json b/src/generated/resources/data/appliedenergistics2/recipes/tools/nether_quartz_wrench.json deleted file mode 100644 index 3dbe9bfd9..000000000 --- a/src/generated/resources/data/appliedenergistics2/recipes/tools/nether_quartz_wrench.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "features": [ - "NETHER_QUARTZ_TOOLS", - "QUARTZ_WRENCH" - ], - "type": "appliedenergistics2:feature" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X X", - " X ", - "X X" - ], - "key": { - "X": { - "tag": "forge:gems/quartz" - } - }, - "result": { - "item": "appliedenergistics2:nether_quartz_wrench" - } - } - } - ] -} \ No newline at end of file