Skip to content

Commit

Permalink
[Port] Update to snapshot (v2.4.2)
Browse files Browse the repository at this point in the history
  • Loading branch information
CDAGaming committed Jun 19, 2024
1 parent 80caac7 commit 0e1cfe0
Show file tree
Hide file tree
Showing 9 changed files with 11 additions and 65 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
- uses: actions/upload-artifact@v4
with:
name: artifacts
path: build/libs/*.jar
path: fabric/build/libs/*.jar

- name: stop daemon
run: ./gradlew --stop
2 changes: 1 addition & 1 deletion .github/workflows/deploy_all.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:
- uses: actions/upload-artifact@v4
with:
name: artifacts
path: build/libs/*.jar
path: fabric/build/libs/*.jar

- name: stop daemon
run: ./gradlew --stop
2 changes: 1 addition & 1 deletion .github/workflows/deploy_curseforge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:
- uses: actions/upload-artifact@v4
with:
name: artifacts
path: build/libs/*.jar
path: fabric/build/libs/*.jar

- name: stop daemon
run: ./gradlew --stop
2 changes: 1 addition & 1 deletion .github/workflows/deploy_modrinth.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:
- uses: actions/upload-artifact@v4
with:
name: artifacts
path: build/libs/*.jar
path: fabric/build/libs/*.jar

- name: stop daemon
run: ./gradlew --stop
2 changes: 1 addition & 1 deletion common/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ tasks.register("generateMyResources") {

// Setup Name Schema for Uploading
val archiveName = "mod_name"()!!
var targetFile = file("$rootDir/build/libs/$fileFormat.jar")
var targetFile = file("$rootDir/fabric/build/libs/$fileFormat-fabric.jar")
if (!targetFile.exists() && (isJarMod)) {
// Fallback to an alternative Sub-Project Output when in a Jar Mod configuration and the target file isn't there
targetFile = file("$rootDir/$fmlName/build/libs/$fileFormat-$fmlName.jar")
Expand Down
10 changes: 0 additions & 10 deletions fabric/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -47,16 +47,6 @@ configurations.compileClasspath.get().extendsFrom(common)
configurations.runtimeClasspath.get().extendsFrom(common)

dependencies {
// Fabric Integrations (1.14+)
if (isModern) {
// Required for loading translation data
modImplementation(fabricApi.fabricModule("fabric-resource-loader-v0", "fabric_api_version"()!!))
"include"(fabricApi.fabricModule("fabric-resource-loader-v0", "fabric_api_version"()!!))

// Mod Menu API Implementation
"modImplementation"("${"modmenu_group"()}:modmenu:${"modmenu_version"()}")
}

common(project(path = ":common")) { isTransitive = false }
common(project(path = ":common", configuration = "shade"))
common(project(path = ":common", configuration = "runtime"))
Expand Down

This file was deleted.

3 changes: 0 additions & 3 deletions fabric/src/main/resources/fabric.mod.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,6 @@
"entrypoints": {
"client": [
"com.gitlab.cdagaming.craftpresence.fabric.CraftPresenceFabric"
],
"modmenu": [
"com.gitlab.cdagaming.craftpresence.fabric.impl.ModMenuImpl"
]
},
"depends": {
Expand Down
12 changes: 6 additions & 6 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
org.gradle.jvmargs=-Xmx3G
org.gradle.daemon=false
# Archive Info
mod_name=CraftPresence
mod_name=CraftPresence-Staging
group=com.gitlab.cdagaming
enabled_platforms=fabric,forge
enabled_platforms=fabric
# Critical Info
isLegacy=false
isJarMod=false
Expand All @@ -21,7 +21,7 @@ display_version=
# Fabric Info
fabric_loader_version=0.15.11
fabric_api_version=0.100.2+1.21
fabric_game_version_range=>=1.21 <1.22
fabric_game_version_range=*
fabric_loader_version_range=>=0.13.0
# Forge Info
forge_version=14-beta
Expand All @@ -30,10 +30,10 @@ forge_game_version_range=[1.21, 1.22)
forge_loader_version_range=[21.0.0-beta,)
# Deployment Info
versionId=2.4.2
deploymentType=Release
deploymentType=Alpha
versionLabel=Release
additional_mc_versions=
additional_loaders=quilt
additional_mc_versions=1.22-snapshot
additional_loaders=
# Integration Info
source_java_version=21
build_java_version=21
Expand Down

0 comments on commit 0e1cfe0

Please sign in to comment.