Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

4.x Update #156

Merged
merged 32 commits into from
Nov 25, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
c053426
Begin changes for new DynAssetGen and DefaultResources
lukebemish Aug 25, 2023
11a7730
More changes for new system, including updating resource generation
lukebemish Aug 25, 2023
c9a98dd
More changes including updating worldgen and recipe system
lukebemish Aug 25, 2023
c946d97
Begin converting configs and more work on caching
lukebemish Aug 26, 2023
e33367b
Changes to tag system and put ores in correct tags
lukebemish Aug 27, 2023
113ea80
Convert to new system and figure out texture caching
lukebemish Aug 27, 2023
a0baebc
Update quilt stuff to match new system
lukebemish Aug 28, 2023
ddc8423
Re-add mappings stuff and minor fixes
lukebemish Aug 28, 2023
ebe6764
Switch to sprite sources for texture generation
lukebemish Aug 28, 2023
4b898c9
Fix licenses
lukebemish Aug 28, 2023
fb14872
Improve modifier and detailed stone system
lukebemish Aug 29, 2023
632f9da
Add a config I forgot to transition
lukebemish Aug 29, 2023
700f3e0
Add compat for Spelunkery
lukebemish Aug 29, 2023
1fab249
Some more documentation
lukebemish Aug 29, 2023
b3b0a91
Update README
lukebemish Aug 29, 2023
13ac0da
Fix bad use of DetailedStone builder
lukebemish Aug 29, 2023
0155c93
Fix missing ground type in tag attachment modifier
lukebemish Aug 29, 2023
060c7fe
Add references to globaldata folder to README
lukebemish Aug 29, 2023
cd2bedb
Minor formatting changes
lukebemish Aug 31, 2023
949775b
Merge branch '1.20.1' into dev-4.x
lukebemish Aug 31, 2023
01b33db
Update DefaultResources and refactor for neoforge switch
lukebemish Aug 31, 2023
ff9e74e
Merge branch '1.20.1' into dev-4.x
lukebemish Aug 31, 2023
1949dc0
Fix MDG being messed up with switch to neoforge
lukebemish Aug 31, 2023
25c159a
Switch nullable annotations to jspecify and minor cleanups
lukebemish Sep 8, 2023
3cd2957
Begin adding fabric support
lukebemish Oct 27, 2023
62622ba
More fabric support and fix resource generation
lukebemish Oct 27, 2023
18cec07
Switch to fabriquilt naming
lukebemish Oct 27, 2023
bec80bd
Rename forge package to neoforge
lukebemish Oct 27, 2023
ef29904
Add embers support, in theory - untested
lukebemish Oct 27, 2023
d610f37
Switch custom neoforge ore block subclass to self-mixin
lukebemish Oct 27, 2023
606b31f
[no ci] switch build tooling and update to 1.20.2
lukebemish Nov 25, 2023
d584024
[no-ci] merge remote-tracking branch 'origin/1.20.2' into dev-4.x
lukebemish Nov 25, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .github/workflows/pullrequest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
runs-on: ubuntu-latest
if: ${{ github.event.workflow_run.event == 'pull_request' && github.event.workflow_run.conclusion == 'success' }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
persist-credentials: false
repository: lukebemish/artifact-sync
Expand Down
72 changes: 39 additions & 33 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -1,37 +1,43 @@
name: Release
concurrency: ci-${{ github.ref }}
on:
workflow_dispatch:
workflow_dispatch:
jobs:
build:
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3
with:
fetch-depth: 0
- uses: fregante/setup-git-user@v2
- uses: actions/setup-java@v3
with:
distribution: "temurin"
java-version: 17
- uses: gradle/gradle-build-action@v2
with:
arguments: tagRelease
cache-read-only: ${{ !startsWith(github.ref, 'refs/heads/1.') }}
- uses: gradle/gradle-build-action@v2
with:
arguments: checkLicenses build
cache-read-only: ${{ !startsWith(github.ref, 'refs/heads/1.') }}
- uses: gradle/gradle-build-action@v2
with:
arguments: publish curseforge modrinth
cache-read-only: ${{ !startsWith(github.ref, 'refs/heads/1.') }}
env:
MAVEN_USER: github
MAVEN_PASSWORD: ${{ secrets.RELEASE_MAVEN_PASSWORD }}
CURSEFORGE_KEY: ${{ secrets.CURSEFORGE_KEY }}
MODRINTH_KEY: ${{ secrets.MODRINTH_KEY }}
MAVEN_URL: https://maven.lukebemish.dev/releases/
- run: |
git push
git push --tags
build:
runs-on: ubuntu-22.04
steps:
- name: Setup Java
run: |
echo "JAVA_HOME=$JAVA_HOME_17_X64" >> "$GITHUB_ENV"
- uses: actions/checkout@v4
with:
fetch-depth: 0
- uses: fregante/setup-git-user@v2
- uses: actions/cache@v3
with:
path: |
**/.gradle/loom-cache
key: ${{ runner.os }}-gradle-${{ hashFiles('**/libs.versions.*', '**/*.gradle*', '**/gradle-wrapper.properties') }}
restore-keys: ${{ runner.os }}-gradle-
- uses: gradle/gradle-build-action@v2
name: Setup Gradle
with:
gradle-home-cache-cleanup: true
- name: Tag Release
run: |
./gradlew tagRelease
- name: Build
run: |
./gradlew checkLicenses build
- name: Publish
run: |
./gradlew publish curseforge modrinth
env:
MAVEN_USER: github
MAVEN_PASSWORD: ${{ secrets.RELEASE_MAVEN_PASSWORD }}
CURSEFORGE_KEY: ${{ secrets.CURSEFORGE_KEY }}
MODRINTH_KEY: ${{ secrets.MODRINTH_KEY }}
MAVEN_URL: https://maven.lukebemish.dev/releases/
- run: |
git push
git push --tags
64 changes: 37 additions & 27 deletions .github/workflows/snapshot.yml
Original file line number Diff line number Diff line change
@@ -1,31 +1,41 @@
name: Snapshot
concurrency: ci-${{ github.ref }}
on:
workflow_dispatch:
push:
branches:
- 1.*
workflow_dispatch:
push:
branches:
- 1.*
jobs:
build:
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3
with:
persist-credentials: false
fetch-depth: 0
- uses: actions/setup-java@v3
with:
distribution: "temurin"
java-version: 17
- uses: gradle/gradle-build-action@v2
with:
arguments: checkLicenses build
cache-read-only: ${{ !startsWith(github.ref, 'refs/heads/1.') }}
- uses: gradle/gradle-build-action@v2
with:
arguments: publish
cache-read-only: ${{ !startsWith(github.ref, 'refs/heads/1.') }}
env:
MAVEN_USER: github
MAVEN_PASSWORD: ${{ secrets.SNAPSHOT_MAVEN_PASSWORD }}
SNAPSHOT_MAVEN_URL: https://maven.lukebemish.dev/snapshots/
build:
runs-on: ubuntu-22.04
steps:
- name: Setup Java
run: |
echo "JAVA_HOME=$JAVA_HOME_17_X64" >> "$GITHUB_ENV"
- uses: actions/checkout@v4
with:
fetch-depth: 0
- uses: fregante/setup-git-user@v2
- uses: actions/cache@v3
with:
path: |
**/.gradle/loom-cache
key: ${{ runner.os }}-gradle-${{ hashFiles('**/libs.versions.*', '**/*.gradle*', '**/gradle-wrapper.properties') }}
restore-keys: ${{ runner.os }}-gradle-
- uses: gradle/gradle-build-action@v2
name: Setup Gradle
with:
gradle-home-cache-cleanup: true
- name: Build
id: build
run: |
./gradlew checkLicenses build
env:
SNAPSHOT_MAVEN_URL: https://maven.lukebemish.dev/snapshots/
- name: Publish
run: |
./gradlew publish
env:
MAVEN_USER: github
MAVEN_PASSWORD: ${{ secrets.SNAPSHOT_MAVEN_PASSWORD }}
SNAPSHOT_MAVEN_URL: https://maven.lukebemish.dev/snapshots/
57 changes: 34 additions & 23 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,26 +5,37 @@ jobs:
build:
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3
with:
persist-credentials: false
fetch-depth: 0
- uses: actions/setup-java@v3
with:
distribution: "temurin"
java-version: 17
- uses: gradle/gradle-build-action@v2
with:
arguments: checkLicenses build
cache-read-only: ${{ !startsWith(github.ref, 'refs/heads/1.') }}
- uses: gradle/gradle-build-action@v2
with:
arguments: publish
cache-read-only: ${{ !startsWith(github.ref, 'refs/heads/1.') }}
env:
PR_NUMBER: ${{ github.event.pull_request.number }}
- name: Archive publishable artifacts
uses: actions/upload-artifact@v3
with:
name: artifacts
path: build/repo
- name: Setup Java
run: |
echo "JAVA_HOME=$JAVA_HOME_17_X64" >> "$GITHUB_ENV"
- uses: actions/checkout@v4
with:
persist-credentials: false
fetch-depth: 0
- uses: fregante/setup-git-user@v2
- uses: actions/cache/restore@v3
with:
path: |
**/.gradle/loom-cache
key: ${{ runner.os }}-gradle-${{ hashFiles('**/libs.versions.*', '**/*.gradle*', '**/gradle-wrapper.properties') }}
restore-keys: ${{ runner.os }}-gradle-
- uses: gradle/gradle-build-action@v2
name: Setup Gradle
with:
cache-read-only: true
gradle-home-cache-cleanup: true
- name: Build
run: |
./gradlew checkLicenses build
env:
PR_NUMBER: ${{ github.event.pull_request.number }}
- name: Publish
run: |
./gradlew publish
env:
PR_NUMBER: ${{ github.event.pull_request.number }}
- name: Archive publishable artifacts
uses: actions/upload-artifact@v3
with:
name: artifacts
path: build/repo
21 changes: 21 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,24 @@ build
eclipse
run
runserver

# julia

# Files generated by invoking Julia with --code-coverage
*.jl.cov
*.jl.*.cov

# Files generated by invoking Julia with --track-allocation
*.jl.mem

# System-specific files and directories generated by the BinaryProvider and BinDeps packages
# They contain absolute paths specific to the host computer, and so should not be committed
deps/deps.jl
deps/build.log
deps/downloads/
deps/usr/
deps/src/

# Build artifacts for creating documentation generated by the Documenter package
docs/build/
docs/site/
60 changes: 0 additions & 60 deletions Common/build.gradle

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading
Loading