Skip to content
This repository was archived by the owner on Jun 3, 2024. It is now read-only.

Commit c890fab

Browse files
committed
Remove "jars" in favor of loader 0.10.0 remapping
Also removes the duplicate ClientRegistry class in god-classes and fixes a missed patchwork-api-base dependency
1 parent 94d0092 commit c890fab

5 files changed

Lines changed: 7 additions & 25 deletions

File tree

build.gradle

Lines changed: 2 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ allprojects {
6666
dependencies {
6767
minecraft "com.mojang:minecraft:$Globals.mcVersion"
6868
mappings "net.fabricmc:yarn:${Globals.mcVersion}${Globals.yarnVersion}:v2"
69-
modImplementation "net.fabricmc:fabric-loader:0.8.4+build.198"
69+
modImplementation "net.fabricmc:fabric-loader:0.10.0+build.208"
7070
modImplementation "net.fabricmc.fabric-api:fabric-api:0.15.1+build.260-1.14"
7171

7272
implementation 'net.patchworkmc:patchwork-eventbus:2.0.1:all'
@@ -268,31 +268,13 @@ dependencies {
268268

269269
minecraft "com.mojang:minecraft:$Globals.mcVersion"
270270
mappings "net.fabricmc:yarn:${Globals.mcVersion}${Globals.yarnVersion}:v2"
271-
modImplementation "net.fabricmc:fabric-loader:0.8.4+build.198"
271+
modImplementation "net.fabricmc:fabric-loader:0.10.0+build.208"
272272
modImplementation "net.fabricmc.fabric-api:fabric-api:0.15.1+build.260-1.14"
273273

274274
implementation 'com.electronwill.night-config:toml:3.6.2'
275275
include 'com.electronwill.night-config:core:3.6.2'
276276
include 'com.electronwill.night-config:toml:3.6.2'
277277
include 'net.patchworkmc:patchwork-eventbus:2.0.0:all'
278-
279-
fileTree(dir: 'jars', include: '*.jar').each {
280-
String baseName = it.name.replace(".jar", "")
281-
String version = "0.1.0"
282-
int split = baseName.lastIndexOf('-')
283-
284-
if (split != -1) {
285-
version = baseName.substring(split + 1)
286-
baseName = baseName.substring(0, split)
287-
}
288-
289-
String name = "testmod:${baseName}:${version}"
290-
291-
System.out.println("Found test mod: " + it.name.replace(".jar", "") + " -> " + name)
292-
293-
modCompileOnly name
294-
modRuntime name
295-
}
296278
}
297279

298280
loom {

patchwork-api-base/src/main/resources/fabric.mod.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
],
1515
"depends": {
1616
// This is mirrored in the top-level project because of a Loader issue
17-
"fabricloader": ">=0.8.4",
17+
"fabricloader": ">=0.10.0",
1818
"fabric": ">=0.15.1"
1919
},
2020
"description": "Common classes that don't require Mixins or involve mod loading",

patchwork-items/build.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,6 @@ archivesBaseName = "patchwork-items"
22
version = getSubprojectVersion(project, "0.1.0")
33

44
dependencies {
5-
compile project(path: ':patchwork-capabilities', configuration: 'dev')
5+
implementation project(path: ':patchwork-api-base', configuration: 'dev')
6+
implementation project(path: ':patchwork-capabilities', configuration: 'dev')
67
}

patchwork-items/src/main/resources/fabric.mod.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@
1111
"icon": "assets/patchwork-items/icon.png",
1212
"environment": "*",
1313
"depends": {
14-
"fabricloader": ">=0.8.4",
15-
"fabric": "*"
14+
"patchwork-api-base": "*"
1615
},
1716
"mixins": [
1817
"patchwork-items.mixins.json"

src/main/resources/fabric.mod.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"depends": {
1616
// This is copied over from patchwork-api-base until Loader/201 is resolved properly.
1717
// Loader/204 exists as a bandage fix, but not a real solution.
18-
"fabricloader": ">=0.8.4",
18+
"fabricloader": ">=0.10.0",
1919
"fabric": ">=0.15.1"
2020
},
2121
"description": "Implementation of Minecraft Forge for Fabric.",

0 commit comments

Comments
 (0)