Skip to content

Commit

Permalink
Use calamus instead of mcp for testing
Browse files Browse the repository at this point in the history
  • Loading branch information
thecatcore committed Sep 6, 2024
1 parent 26a9ccb commit 1bc243b
Show file tree
Hide file tree
Showing 4 changed files with 13,525 additions and 29,687 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ public class TestModRemapper implements ModRemapper {

@Override
public String[] getJarFolders() {
return new String[0];
return new String[]{"test-mods"};
}

@Override
Expand All @@ -47,14 +47,14 @@ public void registerPostVisitors(VisitorInfos infos) {

@Override
public Optional<String> getSourceNamespace() {
return Optional.of("searge");
return Optional.of("calamus");
}

@Override
public Optional<Supplier<InputStream>> getExtraMapping() {
return Optional.of(() -> {
try {
return Files.newInputStream(MOD_CONTAINER.findPath("./mappings-COMBINED-mcp-1.6.4-9.11.1.1345-official-5205111.tiny").get());
return Files.newInputStream(MOD_CONTAINER.findPath("./calamus-1.6.4.tiny").get());
} catch (IOException e) {
throw new RuntimeException(e);
}
Expand All @@ -64,7 +64,7 @@ public Optional<Supplier<InputStream>> getExtraMapping() {
@Override
public void afterRemap() {
assert Objects.equals(
MappingUtils.mapClass("net/minecraft/server/gui/TextAreaLogHandlerINNER1"),
MappingUtils.mapClass("net/minecraft/unmapped/C_0760609"),
FabricLoader.getInstance().isDevelopmentEnvironment() ?
"net/minecraft/client/class_785"
: "net/minecraft/class_785"
Expand Down
2 changes: 2 additions & 0 deletions src/test/resources/ATTRIBUTIONS.MD
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
The file `calamus-1.6.4.tiny` was taken from OrnitheMC's "[Calamus](https://maven.ornithemc.net/releases/net/ornithemc/calamus-intermediary/1.6.4/calamus-intermediary-1.6.4-v2.jar)" intermediaries under the CC0 license.
The `intermediary` namespace renamed to `calamus`.
Loading

0 comments on commit 1bc243b

Please sign in to comment.