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

All in one merge #173

Merged
merged 14 commits into from
Jan 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 12 additions & 14 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,23 +20,21 @@ jobs:
with:
cache-read-only: false
gradle-home-cache-cleanup: true
- name: make gradle wrapper executable
if: ${{ runner.os != 'Windows' }}
run: chmod +x ./gradlecw
# Already needs to be executable, so the dirty check is correct
# - name: make gradle wrapper executable
# if: ${{ runner.os != 'Windows' }}
# run: chmod +x ./gradlecw
- name: build
run: ./gradlecw build
- name: capture build artifacts
uses: actions/upload-artifact@v2
with:
name: Artifacts
path: |
NEAFabric/build/libs/*
NEAForge/build/libs/*
NEAVersionless/build/libs/*
- name: Test Report
uses: dorny/test-reporter@v1
if: success() || failure()
with:
name: JUnit Tests
path: '**/build/test-results/test/TEST-*.xml'
reporter: java-junit
path: 'versions/**/build/libs/*.jar'
# - name: Test Report
# uses: dorny/test-reporter@v1
# if: success() || failure()
# with:
# name: JUnit Tests
# path: '**/build/test-results/test/TEST-*.xml'
# reporter: java-junit
368 changes: 353 additions & 15 deletions .github/workflows/tag.yml

Large diffs are not rendered by default.

6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -41,3 +41,9 @@ gradle/wrapper
VersionShared
UtilityCode
formatter.xml
src/main/fabric-resources/fabric.mod.json
src/main/forge-resources/META-INF/mods.toml
src/main/neoforge-resources/META-INF/mods.toml
**/src/main/java/dev/tr7zw/config/CustomConfigScreen.java
**/src/main/java/dev/tr7zw/util/ComponentProvider.java
src/main/resources/pack.mcmeta

This file was deleted.

35 changes: 0 additions & 35 deletions NEAFabric/src/main/resources/fabric.mod.json

This file was deleted.

64 changes: 0 additions & 64 deletions NEAFabric/src/test/java/dev/tr7zw/tests/MixinTests.java

This file was deleted.

142 changes: 0 additions & 142 deletions NEAFabric/src/test/java/dev/tr7zw/tests/TestUtil.java

This file was deleted.

This file was deleted.

29 changes: 0 additions & 29 deletions NEAForge/src/main/resources/META-INF/mods.toml

This file was deleted.

6 changes: 0 additions & 6 deletions NEAForge/src/main/resources/pack.mcmeta

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@

public class Config {

public int configVersion = 9;
public float animationSmoothingSpeed = 20f;
public int configVersion = 10;
public float animationSmoothingSpeed = 0.5f;
public Set<String> holdingItems = new HashSet<>(
Arrays.asList("minecraft:clock", "minecraft:compass", "minecraft:torch", "minecraft:lantern",
"minecraft:soul_torch", "minecraft:soul_lantern", "minecraft:recovery_compass"));
Expand Down
Loading
Loading