Skip to content

Commit 5e18499

Browse files
committed
Update dependencies and versions
1 parent 3617c49 commit 5e18499

7 files changed

Lines changed: 24 additions & 42 deletions

File tree

build.gradle

Lines changed: 7 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
plugins {
2-
id 'fabric-loom' version '1.10-SNAPSHOT'
3-
id 'legacy-looming' version "1.10-SNAPSHOT" // Version must be the same as fabric-loom's
2+
id 'fabric-loom' version '1.14-SNAPSHOT'
3+
id 'legacy-looming' version "1.14-SNAPSHOT" // Version must be the same as fabric-loom's
44
id 'maven-publish'
5-
id 'com.gradleup.shadow' version '8.3.6'
6-
id 'xyz.wagyourtail.jvmdowngrader' version '1.3.0'
5+
id 'com.gradleup.shadow' version '9.3.0'
6+
id 'xyz.wagyourtail.jvmdowngrader' version '1.3.4'
77
id "com.modrinth.minotaur" version "2.+"
8-
id 'jacoco'
9-
id "org.sonarqube" version "5.0.0.4638"
108
}
119

1210
version = project.mod_version
@@ -43,13 +41,13 @@ dependencies {
4341
modImplementation(include(legacy.apiModule("legacy-fabric-logger-api-v1", project.fabric_version)))
4442
modImplementation(include("maven.modrinth:spasm:${project.spasm_version}"))
4543

46-
shadow(runtimeOnly('net.fabricmc:mapping-io:0.7.1')) {
44+
shadow(runtimeOnly('net.fabricmc:mapping-io:0.8.0')) {
4745
transitive = false
4846
}
49-
shadow(runtimeOnly('net.fabricmc:tiny-remapper:0.11.2')) {
47+
shadow(runtimeOnly('net.fabricmc:tiny-remapper:0.12.1')) {
5048
transitive = false
5149
}
52-
shadow(runtimeOnly('net.fabricmc:access-widener:2.1.0')) {
50+
shadow(runtimeOnly('net.fabricmc:class-tweaker:0.2')) {
5351
transitive = false
5452
}
5553

@@ -136,20 +134,6 @@ test {
136134
useJUnitPlatform()
137135
}
138136

139-
jacocoTestReport {
140-
reports {
141-
xml.required = true
142-
html.outputLocation = layout.buildDirectory.dir('jacocoHtml')
143-
}
144-
}
145-
146-
sonar {
147-
properties {
148-
property "sonar.host.url", System.getenv("SONAR_URL")
149-
property "sonar.token", System.getenv("SONAR_TOKEN")
150-
}
151-
}
152-
153137
// configure the maven publication
154138
publishing {
155139
publications {

gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ org.gradle.jvmargs=-Xmx1G
66
# Fabric Properties
77
minecraft_version = 1.6.4
88
yarn_build = 458
9-
loader_version = 0.15.11
9+
loader_version = 0.18.2
1010
fabric_version = 1.9.1+1.12.2
1111
spasm_version=0.2
1212

1313
# Mod Properties
14-
mod_version = 1.27.3
14+
mod_version = 1.28.0
1515
maven_group = io.github.fabriccompatibilitylayers
1616
archives_base_name = mod-remapping-api

gradle/wrapper/gradle-wrapper.jar

2 KB
Binary file not shown.

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

gradlew

Lines changed: 3 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gradlew.bat

Lines changed: 1 addition & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/remapper/ModTrRemapper.java

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,10 @@
1212
import io.github.fabriccompatibilitylayers.modremappingapi.impl.remapper.resource.RefmapRemapper;
1313
import io.github.fabriccompatibilitylayers.modremappingapi.impl.remapper.visitor.MixinPostApplyVisitorProvider;
1414
import io.github.fabriccompatibilitylayers.modremappingapi.impl.utils.FileUtils;
15-
import net.fabricmc.accesswidener.AccessWidenerReader;
16-
import net.fabricmc.accesswidener.AccessWidenerRemapper;
17-
import net.fabricmc.accesswidener.AccessWidenerWriter;
15+
import net.fabricmc.classtweaker.api.ClassTweaker;
16+
import net.fabricmc.classtweaker.api.ClassTweakerReader;
17+
import net.fabricmc.classtweaker.api.ClassTweakerWriter;
18+
import net.fabricmc.classtweaker.api.visitor.ClassTweakerVisitor;
1819
import net.fabricmc.loader.api.FabricLoader;
1920
import net.fabricmc.mappingio.tree.MappingTree;
2021
import net.fabricmc.tinyremapper.NonClassCopyMode;
@@ -148,11 +149,12 @@ public static void remapMods(TinyRemapper remapper, Map<ModCandidate, Path> path
148149
}
149150

150151
private static byte[] remapAccessWidener(byte[] data, Remapper remapper, String targetNamespace) {
151-
var writer = new AccessWidenerWriter();
152-
var remappingDecorator = new AccessWidenerRemapper(writer, remapper, "intermediary", targetNamespace);
153-
var accessWidenerReader = new AccessWidenerReader(remappingDecorator);
154-
accessWidenerReader.read(data, "intermediary");
155-
return writer.write();
152+
var header = ClassTweakerReader.readHeader(data);
153+
var writer = ClassTweakerWriter.create(header.getVersion());
154+
var remappingDecorator = ClassTweakerVisitor.remap(writer, remapper, header.getNamespace(), targetNamespace);
155+
var reader = ClassTweakerReader.create(remappingDecorator);
156+
reader.read(data);
157+
return writer.getOutput();
156158
}
157159

158160
private static final Gson GSON = new Gson();

0 commit comments

Comments
 (0)