Skip to content

Commit fac58a6

Browse files
committed
Mutliloader port! Closes #60, closes #39, closes #44
1 parent 13fec7f commit fac58a6

185 files changed

Lines changed: 2761 additions & 1773 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.gitattributes

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,15 @@
1-
# Disable autocrlf on generated files, they always generate with LF
2-
# Add any extra files or paths here to make git stop saying they
3-
# are changed when only line endings change.
4-
src/generated/**/.cache/cache text eol=lf
5-
src/generated/**/*.json text eol=lf
6-
1+
* text eol=lf
2+
*.bat text eol=crlf
3+
*.patch text eol=lf
4+
*.java text eol=lf
5+
*.gradle text eol=crlf
6+
*.png binary
7+
*.gif binary
8+
*.exe binary
9+
*.dll binary
10+
*.jar binary
11+
*.lzma binary
12+
*.zip binary
13+
*.pyd binary
14+
*.cfg text eol=lf
15+
*.jks binary
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
name: Addition or Enhancement
2+
description: Suggest something that would improve the mod
3+
labels: [ "enhancement" ]
4+
body:
5+
- type: textarea
6+
attributes:
7+
label: Describe the Addition
8+
description: What should we add or change to the mod to make it better?
9+
validations:
10+
required: true
11+
- type: textarea
12+
attributes:
13+
label: Screenshots and Videos
14+
description: If applicable, add screenshots or videos to help explain your suggestion
15+
validations:
16+
required: false
17+
- type: textarea
18+
attributes:
19+
label: Additional Context
20+
description: Add any extra context about the addition here
21+
validations:
22+
required: false
23+
- type: markdown
24+
attributes:
25+
value: "Thank you for taking the time to suggest this addition and to help improve our mod!"

.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 0 additions & 48 deletions
This file was deleted.
Lines changed: 94 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,94 @@
1+
name: Bug Report
2+
description: Create a bug report to help us improve the mod.
3+
labels: [ "bug" ]
4+
body:
5+
- type: textarea
6+
attributes:
7+
label: Describe the Bug
8+
description: A clear and concise description of what the bug is
9+
validations:
10+
required: true
11+
- type: textarea
12+
attributes:
13+
label: Reproduction Steps
14+
description: Tell us about the steps to reproduce the bug
15+
value: |
16+
1.
17+
2.
18+
3.
19+
validations:
20+
required: true
21+
- type: textarea
22+
attributes:
23+
label: Expected Result
24+
description: A clear and concise description of what you expected to happen
25+
validations:
26+
required: true
27+
- type: textarea
28+
attributes:
29+
label: Screenshots and Videos
30+
description: If applicable, add screenshots or videos to help explain your problem
31+
validations:
32+
required: false
33+
- type: input
34+
attributes:
35+
label: Operating System
36+
description: The operating system you were using when the bug occurred
37+
placeholder: Windows 11, macOS, Linux
38+
validations:
39+
required: true
40+
- type: dropdown
41+
attributes:
42+
label: Mod Version
43+
description: The version of the mod you were using
44+
options:
45+
- "1.3.0"
46+
- "1.2.2"
47+
- "1.2.1"
48+
- "1.2.0"
49+
- "1.1.7"
50+
- "1.1.6"
51+
- "1.1.4"
52+
validations:
53+
required: true
54+
- type: dropdown
55+
attributes:
56+
label: Minecraft Version
57+
description: The version of Minecraft you were using
58+
options:
59+
- "1.20.1"
60+
- "1.21.1"
61+
validations:
62+
required: true
63+
- type: dropdown
64+
attributes:
65+
label: Mod Loader
66+
description: Which mod loader were you using?
67+
options:
68+
- "Forge"
69+
- "Fabric"
70+
- "NeoForge"
71+
validations:
72+
required: true
73+
- type: input
74+
attributes:
75+
label: Loader Version
76+
description: The version of the loader used (e.g., Forge 47.2.0 or Fabric Loader 0.15.7)
77+
placeholder: 47.2.0
78+
validations:
79+
required: true
80+
- type: textarea
81+
attributes:
82+
label: Other Mods / Modpack
83+
description: Please list other mods or the name of the modpack you are running.
84+
validations:
85+
required: false
86+
- type: textarea
87+
attributes:
88+
label: Additional Context
89+
description: Attach crash reports or logs here (use Pastebin or similar if long).
90+
validations:
91+
required: false
92+
- type: markdown
93+
attributes:
94+
value: "Thank you for taking the time to fill out this bug report and helping us build our mod!"

.github/workflows/build.yml

Lines changed: 26 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,43 @@
1-
name: Build JAR
1+
name: Build
22

33
on:
4-
workflow_dispatch:
54
push:
6-
branches:
7-
- 'main'
8-
paths:
9-
- 'build.gradle'
5+
branches: [ "1.20.1", "1.21.1" ]
106
pull_request:
11-
branches:
12-
- 'main'
13-
paths:
14-
- 'src/**'
15-
- '*.gradle'
7+
branches: [ "1.20.1", "1.21.1" ]
168

179
jobs:
1810
build:
19-
runs-on: ubuntu-20.04
20-
steps:
11+
runs-on: ubuntu-latest
2112

13+
steps:
2214
- name: Checkout Repository
23-
uses: actions/checkout@master
15+
uses: actions/checkout@v4
2416

2517
- name: Validate Gradle Wrapper
26-
uses: gradle/wrapper-validation-action@v1
18+
uses: gradle/actions/wrapper-validation@v5
2719

28-
- name: Cache Gradle packages
29-
uses: actions/cache@v2
30-
with:
31-
path: ~/.gradle/caches
32-
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
33-
restore-keys: ${{ runner.os }}-gradle
34-
35-
- uses: actions/setup-java@v2
20+
- name: Setup Java 21
21+
uses: actions/setup-java@v4
3622
with:
37-
distribution: 'adopt'
38-
java-version: '8'
23+
distribution: 'temurin'
24+
java-version: '21'
25+
26+
- name: Make Gradle Wrapper Executable
27+
run: chmod +x gradlew
28+
29+
- name: Setup Gradle
30+
uses: gradle/actions/setup-gradle@v3
3931

40-
- name: Gradle Build
32+
- name: Build with Gradle
4133
run: ./gradlew build
4234

43-
- name: Upload Build Artifact
44-
uses: actions/upload-artifact@v2
35+
- name: Capture Build Artifacts
36+
if: success()
37+
uses: actions/upload-artifact@v4
4538
with:
46-
name: Generated JAR
47-
path: build/libs/
39+
name: ShieldExpansion-${{ github.ref_name }}
40+
path: |
41+
**/build/libs/*.jar
42+
!**/build/libs/*-sources.jar
43+
!**/build/libs/*-dev.jar

.github/workflows/publish.yml

Lines changed: 0 additions & 47 deletions
This file was deleted.

0 commit comments

Comments
 (0)