Skip to content
This repository was archived by the owner on Feb 19, 2019. It is now read-only.

Commit d8a4c95

Browse files
ZeroMemesLeafHacker
authored andcommitted
Fixed Mixin Compile
Refmap was defined as "mixins.capi.refmap.json" but on compile "mixins.refmap.json" was generated. This issue has been fixed along with merging the 2 mixin json configs that were present into one to reduce confusion and ensure compatibility. Also defined test sourceSet mixin refmap configuration
1 parent 8a83a2a commit d8a4c95

File tree

4 files changed

+13
-20
lines changed

4 files changed

+13
-20
lines changed

build.gradle

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,5 +67,7 @@ dependencies {
6767

6868
mixin {
6969
defaultObfuscationEnv notch
70+
add sourceSets.main, 'mixins.capi.refmap.json'
71+
add sourceSets.test, 'mixins.client.refmap.json'
7072
}
7173

src/main/java/me/zero/client/load/ClientTweaker.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,8 @@ public void injectIntoClassLoader(LaunchClassLoader classLoader) {
5757
// Initialize the Mixin Bootstrap
5858
MixinBootstrap.init();
5959

60-
// Load the ClientAPI and Wrapper mixins
60+
// Load the ClientAPI mixin config
6161
Mixins.addConfiguration("mixins.capi.json");
62-
Mixins.addConfiguration("mixins.wrapper.capi.json");
6362

6463
// Optional mixin configuration, added by client developers
6564
String mixin = "mixins.client.json";

src/main/resources/mixins.capi.json

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,15 @@
1919
"MixinRender",
2020
"MixinRenderItem",
2121
"MixinRenderLivingBase",
22-
"MixinRenderManager"
22+
"MixinRenderManager",
23+
"wrapper.ICPacketPlayer",
24+
"wrapper.IEntityPlayer",
25+
"wrapper.IGameType",
26+
"wrapper.IItemRenderer",
27+
"wrapper.IKeyBinding",
28+
"wrapper.IPlayerControllerMP",
29+
"wrapper.IRenderManager",
30+
"wrapper.IShaderGroup",
31+
"wrapper.ISPacketPlayerPosLook"
2332
]
2433
}

src/main/resources/mixins.wrapper.capi.json

Lines changed: 0 additions & 17 deletions
This file was deleted.

0 commit comments

Comments
 (0)