Skip to content

Commit

Permalink
Add datagenned files to the repo (AppliedEnergistics#7582)
Browse files Browse the repository at this point in the history
  • Loading branch information
Technici4n authored Feb 1, 2024
1 parent 0b9fc3d commit 35e31fb
Show file tree
Hide file tree
Showing 1,640 changed files with 37,036 additions and 14 deletions.
9 changes: 6 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,15 @@ jobs:
steps:
- uses: actions/checkout@v3
- uses: ./.github/actions/gradle-setup
- name: Validate no assets
run: test ! -d ./src/generated
- name: Generate assets
run: ./gradlew runData
- name: Validate assets
- 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: |
# Print status for easier debugging
git status
if [ -n "$(git status --porcelain)" ]; then exit 1; fi
# Gradle Step for PRs
- name: Build PR with Gradle
run: ./gradlew build
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/export_guide.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@ jobs:
run: sudo apt-get install xvfb libgl1-mesa-dri zopfli
- uses: actions/checkout@v3
- uses: ./.github/actions/gradle-setup
- name: Generate Assets
run: ./gradlew runData
- name: Export Guide
run: DRI_PRIME=0 xvfb-run ./gradlew runGuideexport
- name: Optimize PNG compression
Expand Down
6 changes: 0 additions & 6 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,6 @@ jobs:
steps:
- uses: actions/checkout@v3
- uses: ./.github/actions/gradle-setup
- name: Validate no assets
run: test ! -d ./src/generated
- name: Generate assets
run: ./gradlew runData --no-daemon --max-workers 1
- name: Validate assets
run: test -d ./src/generated/resources/.cache
- name: Build with Gradle
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand Down
6 changes: 3 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@
!*.md
!LICENSE

# include sourcecode except generated
# include sourcecode
!src/
src/generated
src/generated/resources/.cache
out
build
!/libs/
Expand All @@ -41,4 +41,4 @@ build
!.github/

# Explicit ignores
Thumbs.db
Thumbs.db
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"variants": {
"formed=false": {
"model": "ae2:block/crafting/16k_storage"
},
"formed=true": {
"model": "ae2:block/crafting/16k_storage_formed"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"variants": {
"formed=false": {
"model": "ae2:block/crafting/1k_storage"
},
"formed=true": {
"model": "ae2:block/crafting/1k_storage_formed"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"variants": {
"formed=false": {
"model": "ae2:block/crafting/256k_storage"
},
"formed=true": {
"model": "ae2:block/crafting/256k_storage_formed"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"variants": {
"formed=false": {
"model": "ae2:block/crafting/4k_storage"
},
"formed=true": {
"model": "ae2:block/crafting/4k_storage_formed"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"variants": {
"formed=false": {
"model": "ae2:block/crafting/64k_storage"
},
"formed=true": {
"model": "ae2:block/crafting/64k_storage_formed"
}
}
}
7 changes: 7 additions & 0 deletions src/generated/resources/assets/ae2/blockstates/cable_bus.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "ae2:block/cable_bus"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "ae2:block/cell_workbench"
}
}
}
114 changes: 114 additions & 0 deletions src/generated/resources/assets/ae2/blockstates/charger.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,114 @@
{
"variants": {
"facing=down,spin=0": {
"model": "ae2:block/charger",
"x": 90
},
"facing=down,spin=1": {
"ae2:z": 270,
"model": "ae2:block/charger",
"x": 90
},
"facing=down,spin=2": {
"ae2:z": 180,
"model": "ae2:block/charger",
"x": 90
},
"facing=down,spin=3": {
"ae2:z": 90,
"model": "ae2:block/charger",
"x": 90
},
"facing=east,spin=0": {
"model": "ae2:block/charger",
"y": 90
},
"facing=east,spin=1": {
"ae2:z": 270,
"model": "ae2:block/charger",
"y": 90
},
"facing=east,spin=2": {
"ae2:z": 180,
"model": "ae2:block/charger",
"y": 90
},
"facing=east,spin=3": {
"ae2:z": 90,
"model": "ae2:block/charger",
"y": 90
},
"facing=north,spin=0": {
"model": "ae2:block/charger"
},
"facing=north,spin=1": {
"ae2:z": 270,
"model": "ae2:block/charger"
},
"facing=north,spin=2": {
"ae2:z": 180,
"model": "ae2:block/charger"
},
"facing=north,spin=3": {
"ae2:z": 90,
"model": "ae2:block/charger"
},
"facing=south,spin=0": {
"model": "ae2:block/charger",
"y": 180
},
"facing=south,spin=1": {
"ae2:z": 90,
"model": "ae2:block/charger",
"y": 180
},
"facing=south,spin=2": {
"ae2:z": 180,
"model": "ae2:block/charger",
"y": 180
},
"facing=south,spin=3": {
"ae2:z": 270,
"model": "ae2:block/charger",
"y": 180
},
"facing=up,spin=0": {
"ae2:z": 180,
"model": "ae2:block/charger",
"x": 270
},
"facing=up,spin=1": {
"ae2:z": 90,
"model": "ae2:block/charger",
"x": 270
},
"facing=up,spin=2": {
"model": "ae2:block/charger",
"x": 270
},
"facing=up,spin=3": {
"ae2:z": 270,
"model": "ae2:block/charger",
"x": 270
},
"facing=west,spin=0": {
"model": "ae2:block/charger",
"y": 270
},
"facing=west,spin=1": {
"ae2:z": 270,
"model": "ae2:block/charger",
"y": 270
},
"facing=west,spin=2": {
"ae2:z": 180,
"model": "ae2:block/charger",
"y": 270
},
"facing=west,spin=3": {
"ae2:z": 90,
"model": "ae2:block/charger",
"y": 270
}
}
}
Loading

0 comments on commit 35e31fb

Please sign in to comment.