From 11b92751075b748589665eea7ffb9113d3de6be6 Mon Sep 17 00:00:00 2001 From: Technici4n <13494793+Technici4n@users.noreply.github.com> Date: Mon, 25 Mar 2024 12:23:52 +0100 Subject: [PATCH] Add datagenned files and update actions --- .github/workflows/build.yml | 27 ++++++--------- .github/workflows/publish.yml | 4 --- src/.gitignore | 2 +- .../immeng/blockstates/connector_me.json | 30 ++++++++++++++++ .../blockstates/connector_me_relay.json | 30 ++++++++++++++++ .../immeng/models/item/wirecoil_me.json | 6 ++++ .../immeng/models/item/wirecoil_me_dense.json | 6 ++++ .../recipes/misc/connector_me.json | 34 +++++++++++++++++++ .../recipes/misc/connector_me_relay.json | 34 +++++++++++++++++++ .../recipes/misc/wirecoil_me.json | 34 +++++++++++++++++++ .../recipes/misc/wirecoil_me_dense.json | 34 +++++++++++++++++++ .../loot_tables/blocks/connector_me.json | 21 ++++++++++++ .../blocks/connector_me_relay.json | 21 ++++++++++++ .../data/immeng/recipes/connector_me.json | 21 ++++++++++++ .../immeng/recipes/connector_me_relay.json | 20 +++++++++++ .../data/immeng/recipes/wirecoil_me.json | 21 ++++++++++++ .../immeng/recipes/wirecoil_me_dense.json | 21 ++++++++++++ .../tags/blocks/mineable/pickaxe.json | 6 ++++ 18 files changed, 351 insertions(+), 21 deletions(-) create mode 100644 src/generated/resources/assets/immeng/blockstates/connector_me.json create mode 100644 src/generated/resources/assets/immeng/blockstates/connector_me_relay.json create mode 100644 src/generated/resources/assets/immeng/models/item/wirecoil_me.json create mode 100644 src/generated/resources/assets/immeng/models/item/wirecoil_me_dense.json create mode 100644 src/generated/resources/data/immeng/advancements/recipes/misc/connector_me.json create mode 100644 src/generated/resources/data/immeng/advancements/recipes/misc/connector_me_relay.json create mode 100644 src/generated/resources/data/immeng/advancements/recipes/misc/wirecoil_me.json create mode 100644 src/generated/resources/data/immeng/advancements/recipes/misc/wirecoil_me_dense.json create mode 100644 src/generated/resources/data/immeng/loot_tables/blocks/connector_me.json create mode 100644 src/generated/resources/data/immeng/loot_tables/blocks/connector_me_relay.json create mode 100644 src/generated/resources/data/immeng/recipes/connector_me.json create mode 100644 src/generated/resources/data/immeng/recipes/connector_me_relay.json create mode 100644 src/generated/resources/data/immeng/recipes/wirecoil_me.json create mode 100644 src/generated/resources/data/immeng/recipes/wirecoil_me_dense.json create mode 100644 src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3ad5cd1..ee6eb7b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -17,24 +17,19 @@ jobs: with: distribution: temurin java-version: 17 - - name: Use Gradle cache for faster builds - uses: actions/cache@v3 + - name: Setup Gradle + uses: gradle/gradle-build-action@v2 with: - path: ~/.gradle/caches - key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }} - - name: Cleanup Gradle Cache - # Remove some files from the Gradle cache, so they aren't cached by GitHub Actions. - # Restoring these files from a GitHub Actions cache might cause problems for future builds. + cache-read-only: ${{ github.ref != 'refs/heads/main' }} + - name: Generate assets + run: ./gradlew runData + - name: Check that datagen ran + run: test -d ./src/generated/resources/.cache + - name: Make sure that datagenned files in the repo are up-to-date run: | - rm -f ~/.gradle/caches/modules-2/modules-2.lock - rm -f ~/.gradle/caches/modules-2/gc.properties - - name: Setup Gradle Wrapper Cache - uses: actions/cache@v3 - with: - path: ~/.gradle/wrapper - key: ${{ runner.os }}-gradle-wrapper-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }} - - name: Generate data - run: ./gradlew runData --max-workers 1 + # Print status for easier debugging + git status + if [ -n "$(git status --porcelain)" ]; then exit 1; fi - name: Build run: ./gradlew build --max-workers 1 - name: Upload artifacts diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 05d00a7..a3a5f19 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -21,10 +21,6 @@ jobs: with: distribution: temurin java-version: 17 - - name: Generate data - run: ./gradlew runData --max-workers 1 - env: - MOD_VERSION: ${{ github.event.release.tag_name }} - name: Build run: ./gradlew build --max-workers 1 env: diff --git a/src/.gitignore b/src/.gitignore index 9ab870d..b0ad2e4 100644 --- a/src/.gitignore +++ b/src/.gitignore @@ -1 +1 @@ -generated/ +generated/resources/.cache diff --git a/src/generated/resources/assets/immeng/blockstates/connector_me.json b/src/generated/resources/assets/immeng/blockstates/connector_me.json new file mode 100644 index 0000000..d2432e6 --- /dev/null +++ b/src/generated/resources/assets/immeng/blockstates/connector_me.json @@ -0,0 +1,30 @@ +{ + "variants": { + "facing=down": { + "model": "immeng:block/connector_me" + }, + "facing=east": { + "model": "immeng:block/connector_me", + "x": 90, + "y": 270 + }, + "facing=north": { + "model": "immeng:block/connector_me", + "x": 90, + "y": 180 + }, + "facing=south": { + "model": "immeng:block/connector_me", + "x": 90 + }, + "facing=up": { + "model": "immeng:block/connector_me", + "x": 180 + }, + "facing=west": { + "model": "immeng:block/connector_me", + "x": 90, + "y": 90 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/immeng/blockstates/connector_me_relay.json b/src/generated/resources/assets/immeng/blockstates/connector_me_relay.json new file mode 100644 index 0000000..5c9b158 --- /dev/null +++ b/src/generated/resources/assets/immeng/blockstates/connector_me_relay.json @@ -0,0 +1,30 @@ +{ + "variants": { + "facing=down": { + "model": "immeng:block/connector_me_relay" + }, + "facing=east": { + "model": "immeng:block/connector_me_relay", + "x": 90, + "y": 270 + }, + "facing=north": { + "model": "immeng:block/connector_me_relay", + "x": 90, + "y": 180 + }, + "facing=south": { + "model": "immeng:block/connector_me_relay", + "x": 90 + }, + "facing=up": { + "model": "immeng:block/connector_me_relay", + "x": 180 + }, + "facing=west": { + "model": "immeng:block/connector_me_relay", + "x": 90, + "y": 90 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/immeng/models/item/wirecoil_me.json b/src/generated/resources/assets/immeng/models/item/wirecoil_me.json new file mode 100644 index 0000000..b537aad --- /dev/null +++ b/src/generated/resources/assets/immeng/models/item/wirecoil_me.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "immeng:item/wirecoil_me" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/immeng/models/item/wirecoil_me_dense.json b/src/generated/resources/assets/immeng/models/item/wirecoil_me_dense.json new file mode 100644 index 0000000..c2b949c --- /dev/null +++ b/src/generated/resources/assets/immeng/models/item/wirecoil_me_dense.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "immeng:item/wirecoil_me_dense" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/immeng/advancements/recipes/misc/connector_me.json b/src/generated/resources/data/immeng/advancements/recipes/misc/connector_me.json new file mode 100644 index 0000000..b267473 --- /dev/null +++ b/src/generated/resources/data/immeng/advancements/recipes/misc/connector_me.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_fluix": { + "conditions": { + "items": [ + { + "items": [ + "ae2:fluix_crystal" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "immeng:connector_me" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_fluix" + ] + ], + "rewards": { + "recipes": [ + "immeng:connector_me" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/immeng/advancements/recipes/misc/connector_me_relay.json b/src/generated/resources/data/immeng/advancements/recipes/misc/connector_me_relay.json new file mode 100644 index 0000000..05b1950 --- /dev/null +++ b/src/generated/resources/data/immeng/advancements/recipes/misc/connector_me_relay.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_fluix": { + "conditions": { + "items": [ + { + "items": [ + "ae2:fluix_crystal" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "immeng:connector_me_relay" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_fluix" + ] + ], + "rewards": { + "recipes": [ + "immeng:connector_me_relay" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/immeng/advancements/recipes/misc/wirecoil_me.json b/src/generated/resources/data/immeng/advancements/recipes/misc/wirecoil_me.json new file mode 100644 index 0000000..091e56f --- /dev/null +++ b/src/generated/resources/data/immeng/advancements/recipes/misc/wirecoil_me.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_cable": { + "conditions": { + "items": [ + { + "items": [ + "ae2:fluix_glass_cable" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "immeng:wirecoil_me" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_cable" + ] + ], + "rewards": { + "recipes": [ + "immeng:wirecoil_me" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/immeng/advancements/recipes/misc/wirecoil_me_dense.json b/src/generated/resources/data/immeng/advancements/recipes/misc/wirecoil_me_dense.json new file mode 100644 index 0000000..1e07a7c --- /dev/null +++ b/src/generated/resources/data/immeng/advancements/recipes/misc/wirecoil_me_dense.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_cable": { + "conditions": { + "items": [ + { + "items": [ + "ae2:fluix_covered_dense_cable" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "immeng:wirecoil_me_dense" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_cable" + ] + ], + "rewards": { + "recipes": [ + "immeng:wirecoil_me_dense" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/immeng/loot_tables/blocks/connector_me.json b/src/generated/resources/data/immeng/loot_tables/blocks/connector_me.json new file mode 100644 index 0000000..dbebb06 --- /dev/null +++ b/src/generated/resources/data/immeng/loot_tables/blocks/connector_me.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "immeng:connector_me" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "immeng:blocks/connector_me" +} \ No newline at end of file diff --git a/src/generated/resources/data/immeng/loot_tables/blocks/connector_me_relay.json b/src/generated/resources/data/immeng/loot_tables/blocks/connector_me_relay.json new file mode 100644 index 0000000..90405b4 --- /dev/null +++ b/src/generated/resources/data/immeng/loot_tables/blocks/connector_me_relay.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "immeng:connector_me_relay" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "immeng:blocks/connector_me_relay" +} \ No newline at end of file diff --git a/src/generated/resources/data/immeng/recipes/connector_me.json b/src/generated/resources/data/immeng/recipes/connector_me.json new file mode 100644 index 0000000..c5ffa3a --- /dev/null +++ b/src/generated/resources/data/immeng/recipes/connector_me.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "F": { + "item": "ae2:fluix_block" + }, + "f": { + "item": "ae2:fluix_crystal" + } + }, + "pattern": [ + " f ", + "FfF", + "FfF" + ], + "result": { + "count": 4, + "item": "immeng:connector_me" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/immeng/recipes/connector_me_relay.json b/src/generated/resources/data/immeng/recipes/connector_me_relay.json new file mode 100644 index 0000000..eb78d9a --- /dev/null +++ b/src/generated/resources/data/immeng/recipes/connector_me_relay.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "F": { + "item": "ae2:fluix_block" + }, + "f": { + "item": "ae2:fluix_crystal" + } + }, + "pattern": [ + " f ", + "FfF" + ], + "result": { + "count": 8, + "item": "immeng:connector_me_relay" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/immeng/recipes/wirecoil_me.json b/src/generated/resources/data/immeng/recipes/wirecoil_me.json new file mode 100644 index 0000000..ca9892e --- /dev/null +++ b/src/generated/resources/data/immeng/recipes/wirecoil_me.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "c": { + "item": "ae2:fluix_glass_cable" + }, + "s": { + "tag": "forge:rods/wooden" + } + }, + "pattern": [ + " c ", + "csc", + " c " + ], + "result": { + "count": 4, + "item": "immeng:wirecoil_me" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/immeng/recipes/wirecoil_me_dense.json b/src/generated/resources/data/immeng/recipes/wirecoil_me_dense.json new file mode 100644 index 0000000..9c6a36a --- /dev/null +++ b/src/generated/resources/data/immeng/recipes/wirecoil_me_dense.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "c": { + "item": "ae2:fluix_covered_dense_cable" + }, + "s": { + "tag": "forge:rods/wooden" + } + }, + "pattern": [ + " c ", + "csc", + " c " + ], + "result": { + "count": 4, + "item": "immeng:wirecoil_me_dense" + } +} \ 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 0000000..dc6c192 --- /dev/null +++ b/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json @@ -0,0 +1,6 @@ +{ + "values": [ + "immeng:connector_me", + "immeng:connector_me_relay" + ] +} \ No newline at end of file