Skip to content

Commit

Permalink
Jar is now the same for fabric and forge
Browse files Browse the repository at this point in the history
  • Loading branch information
Rakambda committed Apr 13, 2021
1 parent 11aad32 commit 8c7c57a
Show file tree
Hide file tree
Showing 104 changed files with 2,634 additions and 345 deletions.
8 changes: 4 additions & 4 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
name: Bug report
about: Create a report to help us improve
title: ''
labels: "type: \U0001F41B bug"
assignees: RakSrinaNa
labels: bug
assignees: 'RakSrinaNa'

---

Expand All @@ -16,8 +16,8 @@ Steps to reproduce the behavior:
2.

**Infos:**
- Minecraft verson: [e.g. 1.14.4]
- Mod loader: [Forge/Fabric]
- Minecraft version: [e.g. 1.0.0]
- Mod version: [e.g. 1.0.0]
- Fabric/Forge version: [e.g. 1.0.0]

If you provide a crash report please include it in a readable way (like pastebin or gist for example).
8 changes: 0 additions & 8 deletions .github/ISSUE_TEMPLATE/config.yml

This file was deleted.

4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
name: Feature request
about: Suggest an idea for this project
title: ''
labels: "type: \U0001F9F1 enhancement"
assignees: RakSrinaNa
labels: enhancement
assignees: 'RakSrinaNa'

---

Expand Down
8 changes: 7 additions & 1 deletion .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,11 @@ updates:
directory: "/"
schedule:
interval: "daily"
assignees:
reviewers:
- RakSrinaNa
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "daily"
reviewers:
- RakSrinaNa
14 changes: 10 additions & 4 deletions .github/workflows/gradle_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,16 @@ jobs:
steps:
- name: Checkout source
uses: actions/checkout@v2
with:
fetch-depth: 0
- name: Restore keystore
run: |
echo "${{ secrets.KEYSTORE_FORGE_MODS }}" > keystoreForgeMods.jks.asc
gpg -d --passphrase "${{ secrets.KEYSTORE_FORGE_MODS_PASSPHRASE }}" --batch keystoreForgeMods.jks.asc > keystoreForgeMods.jks
- name: Set up JDK
uses: actions/setup-java@v1
uses: actions/setup-java@v2
with:
distribution: 'adopt'
java-version: ${{ env.APP_JAVA_VERSION }}
- uses: actions/cache@v1
name: Restore gradle cache
Expand Down Expand Up @@ -45,13 +48,16 @@ jobs:
steps:
- name: Checkout source
uses: actions/checkout@v2
with:
fetch-depth: 0
- name: Restore keystore
run: |
echo "${{ secrets.KEYSTORE_FORGE_MODS }}" > keystoreForgeMods.jks.asc
gpg -d --passphrase "${{ secrets.KEYSTORE_FORGE_MODS_PASSPHRASE }}" --batch keystoreForgeMods.jks.asc > keystoreForgeMods.jks
- name: Set up JDK
uses: actions/setup-java@v1
uses: actions/setup-java@v2
with:
distribution: 'adopt'
java-version: ${{ env.APP_JAVA_VERSION }}
- uses: actions/cache@v1
name: Restore gradle cache
Expand All @@ -70,6 +76,6 @@ jobs:
- name: Set gradle permissions
run: chmod +x gradlew
- name: Push on CurseForge
run: ./gradlew curseforge -PcurseforgeApiKey="${{ secrets.CURSEFORGE_API_KEY }}" -PforgeKeyStore=keystoreForgeMods.jks -PforgeKeyStoreAlias=${{ secrets.KEYSTORE_FORGE_MODS_ALIAS }} -PforgeKeyStorePass=${{ secrets.KEYSTORE_FORGE_MODS_STORE_PASS }} -PforgeKeyStoreKeyPass=${{ secrets.KEYSTORE_FORGE_MODS_KEY_PASS }} -PforgeSignSHA1=f927f4701bf4c0620c7bd0a501ce278f5e5ecc62
run: ./gradlew buildJar curseforge -PcurseforgeApiKey="${{ secrets.CURSEFORGE_API_KEY }}" -PforgeKeyStore=keystoreForgeMods.jks -PforgeKeyStoreAlias=${{ secrets.KEYSTORE_FORGE_MODS_ALIAS }} -PforgeKeyStorePass=${{ secrets.KEYSTORE_FORGE_MODS_STORE_PASS }} -PforgeKeyStoreKeyPass=${{ secrets.KEYSTORE_FORGE_MODS_KEY_PASS }} -PforgeSignSHA1=f927f4701bf4c0620c7bd0a501ce278f5e5ecc62
- name: Push on Modrinth
run: ./gradlew publishModrinth -DmodrinthToken="${{ secrets.MODRINTH_TOKEN }}" -PforgeKeyStore=keystoreForgeMods.jks -PforgeKeyStoreAlias=${{ secrets.KEYSTORE_FORGE_MODS_ALIAS }} -PforgeKeyStorePass=${{ secrets.KEYSTORE_FORGE_MODS_STORE_PASS }} -PforgeKeyStoreKeyPass=${{ secrets.KEYSTORE_FORGE_MODS_KEY_PASS }} -PforgeSignSHA1=f927f4701bf4c0620c7bd0a501ce278f5e5ecc62
run: ./gradlew buildJar publishModrinth -DmodrinthToken="${{ secrets.MODRINTH_TOKEN }}" -PforgeKeyStore=keystoreForgeMods.jks -PforgeKeyStoreAlias=${{ secrets.KEYSTORE_FORGE_MODS_ALIAS }} -PforgeKeyStorePass=${{ secrets.KEYSTORE_FORGE_MODS_STORE_PASS }} -PforgeKeyStoreKeyPass=${{ secrets.KEYSTORE_FORGE_MODS_KEY_PASS }} -PforgeSignSHA1=f927f4701bf4c0620c7bd0a501ce278f5e5ecc62
29 changes: 18 additions & 11 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,14 +1,21 @@
*.zip
# gradle
.gradle/
build/
out/
classes/

# idea
.idea/
*.iml
*.ipr
*.iws

.gradle
.idea
build
eclipse
/logs
/run
/run-client
/run-server
# vscode
.settings/
.vscode/
bin/
.classpath
.project

version.properties
secrets.properties
# minecraft
run/
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
Further release notes can be found [on the releases page](https://github.com/RakSrinaNa/FallingTree/releases).

## [Fabric-1.16.5-2.11.0] - 2021-03-24

* Add configuration whitelistedNonDecayLeaves to add leaves that doesn't decay and need to be broken by the tool (uses durability) (#77)
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ This mod will change the way you break trees. 2 modes are available:
* Instantaneous: Break one log and the whole tree will fall
* Shift down: Break a block and the log will slowly shift down as you cut it (good if you don't want to "cheat" too much but are lazy to go cut top log blocks 😛)

![Demonstration of breaking a tree](https://github.com/RakSrinaNa/FallingTree/raw/1.16.1/assets/demo.gif)
![Demonstration of breaking a tree](https://github.com/RakSrinaNa/FallingTree/raw/1.17/assets/demo.gif)

Several options are available in the config file:

Expand Down
Binary file removed assets/demo.gif
Binary file not shown.
File renamed without changes.
Loading

0 comments on commit 8c7c57a

Please sign in to comment.