Skip to content

Commit b0e43b1

Browse files
committed
merge to ModMaster
1 parent 33d9cc6 commit b0e43b1

File tree

91 files changed

+154
-353
lines changed

Some content is hidden

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

91 files changed

+154
-353
lines changed

.github/ISSUE_TEMPLATE/bug_report.yml

+9-9
Original file line numberDiff line numberDiff line change
@@ -17,35 +17,35 @@ body:
1717
id: mc-version
1818
attributes:
1919
label: Minecraft version
20-
placeholder: e.g. 1.20.2
20+
placeholder: e.g. 1.20.6
2121
validations:
2222
required: true
2323
- type: input
24-
id: walkers-version
24+
id: skinshifter-version
2525
attributes:
26-
label: Woodwalkers version
27-
placeholder: e.g. 2.1
26+
label: SkinShiftter version
27+
placeholder: e.g. 1.0
2828
validations:
2929
required: true
3030
- type: input
3131
id: craftedcore-version
3232
attributes:
3333
label: CraftedCore version
34-
placeholder: e.g. 2.1
34+
placeholder: e.g. 5.1
3535
validations:
3636
required: true
3737
- type: input
3838
id: modloader-version
3939
attributes:
4040
label: Modloader version
41-
placeholder: "e.g. 48.2.0"
41+
placeholder: e.g. 48.2.0
4242
validations:
4343
required: true
4444
- type: textarea
4545
attributes:
46-
label: "The latest.log file"
47-
description: "Drag-and-Drop your latest.log file or append a link to a Gist-file."
48-
placeholder: "Your latest.log file"
46+
label: The latest.log file
47+
description: Drag-and-Drop your latest.log file or append a link to a Gist-file.
48+
placeholder: Your latest.log file
4949
validations:
5050
required: true
5151
- type: textarea

.github/ISSUE_TEMPLATE/config.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1+
#file: noinspection YAMLSchemaValidation
12
blank_issues_enabled: true
23
contact_links:
34
- name: ToCraft's Mods Discord
45
url: https://discord.gg/Y3KqxWDUYy
5-
about: Join for personal support and acess to the community.
6+
about: Join for personal support and access to the community.

.github/workflows/build_current.yml

+5-8
Original file line numberDiff line numberDiff line change
@@ -23,16 +23,14 @@ jobs:
2323
steps:
2424
- uses: actions/checkout@v4
2525

26-
- name: Set up JDK 21
26+
- name: Set up JDK 22
2727
uses: actions/setup-java@v4
2828
with:
29-
java-version: 21
30-
distribution: 'temurin'
31-
- name: Validate Gradle Wrapper
32-
uses: gradle/actions/wrapper-validation@v3
33-
29+
java-version: 22
30+
distribution: "temurin"
3431
- name: Setup Gradle
35-
uses: gradle/actions/setup-gradle@v3
32+
uses: gradle/actions/setup-gradle@v4
33+
3634
- name: Build
3735
run: ./gradlew check build --parallel
3836

@@ -46,7 +44,6 @@ jobs:
4644
path: |
4745
build/**/**/libs/
4846
!build/*/libs/
49-
!build/**/craftedcore/libs/
5047
!build/libs/
5148
!**/*-dev.jar
5249
!**/*-shadow.jar

.github/workflows/clear_cache.yml

-32
This file was deleted.

.github/workflows/release.yml

+12-24
Original file line numberDiff line numberDiff line change
@@ -33,25 +33,22 @@ jobs:
3333
steps:
3434
- uses: actions/checkout@v4
3535

36-
- name: Set up JDK 21
36+
- name: Set up JDK 22
3737
uses: actions/setup-java@v4
3838
with:
39-
java-version: 21
40-
distribution: 'temurin'
41-
- name: Validate Gradle Wrapper
42-
uses: gradle/actions/wrapper-validation@v3
43-
39+
java-version: 22
40+
distribution: "temurin"
4441
- name: Setup Gradle
45-
uses: gradle/actions/setup-gradle@v3
42+
uses: gradle/actions/setup-gradle@v4
4643

4744
- name: Extract Artifact Type, Archive Base Name & Mod Version
4845
run: |
4946
cat $GITHUB_WORKSPACE/gradle.properties | grep ^artifact_type= >> $GITHUB_ENV
5047
cat $GITHUB_WORKSPACE/gradle.properties | grep ^archives_base_name= >> $GITHUB_ENV
5148
cat $GITHUB_WORKSPACE/gradle.properties | grep ^mod_version= >> $GITHUB_ENV
5249
53-
- name: Build + Publish to Maven, Modrinth & CurseForge
54-
run: ./gradlew check build publish modrinth curseforge --parallel
50+
- name: Build + Publish to Maven, Modrinth & CurseForge + Pack the ZIP for GH-Release
51+
run: ./gradlew check build publish modrinth curseforge packTheMod --parallel
5552
env:
5653
MAVEN_PASS: ${{ secrets.MAVEN_PASS }}
5754
CURSEFORGE_TOKEN: ${{ secrets.CURSEFORGE_TOKEN }}
@@ -76,21 +73,14 @@ jobs:
7673
run: |
7774
cat $GITHUB_WORKSPACE/gradle.properties | grep ^archives_base_name= >> $GITHUB_ENV
7875
cat $GITHUB_WORKSPACE/gradle.properties | grep ^mod_version= >> $GITHUB_ENV
79-
- name: Download artifact
80-
id: download-artifact
81-
uses: dawidd6/action-download-artifact@v6
82-
with:
83-
skip_unpack: true
8476
- name: Create GitHub Release
8577
if: |
8678
${{ env.artifact_type }} == 'release'
8779
uses: softprops/action-gh-release@v2
8880
with:
8981
tag_name: "${{ env.mod_version }}"
9082
files: |
91-
build/**/fabric/build/libs/${{ env.archives_base_name }}-${{ env.mod_version }}-*-fabric.jar,
92-
build/**/forge/build/libs/${{ env.archives_base_name }}-${{ env.mod_version }}-*-forge.jar,
93-
build/**/neoforge/build/libs/${{ env.archives_base_name }}-${{ env.mod_version }}-*-neoforge.jar
83+
build/${{ env.archives_base_name }}-${{ env.mod_version }}.zip
9484
body_path: ${{ github.workspace }}/extracted.CHANGELOG.md
9585
discord_message:
9686
name: "Send Discord Release Message"
@@ -100,16 +90,14 @@ jobs:
10090
steps:
10191
- uses: actions/checkout@v4
10292

103-
- name: Set up JDK 21
93+
- name: Set up JDK 22
10494
uses: actions/setup-java@v4
10595
with:
106-
java-version: 21
107-
distribution: 'temurin'
108-
- name: Validate Gradle Wrapper
109-
uses: gradle/actions/wrapper-validation@v3
110-
96+
java-version: 22
97+
distribution: "temurin"
11198
- name: Setup Gradle
112-
uses: gradle/actions/setup-gradle@v3
99+
uses: gradle/actions/setup-gradle@v4
100+
113101
- name: Send Discord Message
114102
run: ./gradlew discordRelease --parallel
115103
env:

CHANGELOG.md

+3
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,6 @@ SkinShifter 1.0
22
================
33

44
Initial Release!
5+
6+
*SkinShifter* lets you change your Player Skin in game!
7+
(Don't worry- you won't change you're actual skin, it just renders differently.)

build.gradle

-112
This file was deleted.

build.gradle.kts

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
plugins {
2+
id("dev.tocraft.modmaster.version")
3+
}
4+
5+
ext {
6+
val modMeta = mutableMapOf<String, Any>()
7+
modMeta["minecraft_version"] = project.name
8+
modMeta["version"] = version
9+
modMeta["craftedcore_version"] = project.properties["craftedcore_version"] as String
10+
set("mod_meta", modMeta)
11+
}

common/build.gradle

-6
This file was deleted.

common/build.gradle.kts

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
plugins {
2+
id("dev.tocraft.modmaster.common")
3+
}
4+
5+
dependencies {
6+
modApi("dev.tocraft:craftedcore:${parent!!.name}-${rootProject.properties["craftedcore_version"]}")
7+
}

fabric/build.gradle

-6
This file was deleted.

fabric/build.gradle.kts

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
plugins {
2+
id("dev.tocraft.modmaster.fabric")
3+
}
4+
5+
tasks.withType<ProcessResources> {
6+
@Suppress("UNCHECKED_CAST") val modMeta = parent!!.ext["mod_meta"]!! as Map<String, Any>
7+
//inputs.properties.putAll(modMeta)
8+
9+
filesMatching("fabric.mod.json") {
10+
expand(modMeta)
11+
}
12+
13+
outputs.upToDateWhen { false }
14+
}
15+
16+
dependencies {
17+
modApi("dev.tocraft:craftedcore-fabric:${parent!!.name}-${rootProject.properties["craftedcore_version"]}")
18+
}

forge/build.gradle

-12
This file was deleted.

0 commit comments

Comments
 (0)