Skip to content

Commit 4078f4f

Browse files
committed
Fix path encoding issues and Backward compatibility again
1 parent 142f441 commit 4078f4f

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/context/v1/ModRemapperV1Context.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import io.github.fabriccompatibiltylayers.modremappingapi.impl.remapper.visitor.MRAApplyVisitor;
2121
import io.github.fabriccompatibiltylayers.modremappingapi.impl.utils.FileUtils;
2222
import net.fabricmc.loader.api.FabricLoader;
23+
import net.fabricmc.loader.impl.launch.FabricLauncherBase;
2324
import net.fabricmc.tinyremapper.TinyRemapper;
2425

2526
import java.io.IOException;
@@ -189,7 +190,7 @@ public List<ModRemapper> discoverMods(boolean remapClassEdits) {
189190

190191
if (!candidateToOutput.isEmpty()) this.remapMods(candidateToOutput);
191192

192-
// modPaths.values().forEach(FabricLauncherBase.getLauncher()::addToClassPath);
193+
candidateToOutput.values().forEach(FabricLauncherBase.getLauncher()::addToClassPath);
193194

194195
return new ArrayList<>();
195196
}

src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/remapper/TrRemapperHelper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ private static boolean useHardMixinRemap(Path inputPath) throws IOException, URI
9191

9292
if (!Files.exists(manifestPath)) return false;
9393

94-
Manifest manifest = new Manifest(manifestPath.toUri().toURL().openStream());
94+
Manifest manifest = new Manifest(Files.newInputStream(manifestPath));
9595
Attributes mainAttributes = manifest.getMainAttributes();
9696

9797
return "static".equalsIgnoreCase(mainAttributes.getValue("Fabric-Loom-Mixin-Remap-Type"));

src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/utils/FileUtils.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ private static void zipFile(File fileToZip, String fileName, ZipOutputStream zip
235235

236236
@ApiStatus.Internal
237237
public static FileSystem getJarFileSystem(Path path) throws URISyntaxException, IOException {
238-
return FileSystems.newFileSystem(new URI("jar:" + path.toUri()), ZIP_PROPERTIES);
238+
return FileSystems.newFileSystem(URI.create("jar:" + path.toUri()), ZIP_PROPERTIES);
239239
}
240240

241241
@ApiStatus.Internal

0 commit comments

Comments
 (0)