Fix mixin and crochet issues, closes #2

CottonMC · May 8, 2019 · a9b64a7 · a9b64a7
1 parent 0e4689d
commit a9b64a7
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 14 deletions.
diff --git a/build.gradle b/build.gradle
@@ -25,17 +25,13 @@ targetCompatibility = 1.8
 
 archivesBaseName = "skillcheck"
 group = "io.github.cottonmc"
-version = "1.0.0+1.14"
+version = "1.0.1+1.14"
 
 minecraft {
 	refmapName = 'mixins.skillcheck.refmap.json'
 }
 
 repositories {
-	mavenLocal()
-	maven {
-		url 'https://www.jitpack.io'
-	}
 	maven {
 		url 'http://server.bbkr.space:8081/artifactory/libs-snapshot'
 	}
@@ -53,8 +49,8 @@ dependencies {
 	modCompile "io.github.prospector.modmenu:ModMenu:1.5.1-81"
 	modCompile "io.github.cottonmc:cotton:0.6.1+1.14-SNAPSHOT"
 	include "io.github.cottonmc:cotton:0.6.1+1.14-SNAPSHOT"
-	modCompile "com.github.raphydaphy:crochet:a203643485"
-	include "com.github.raphydaphy:crochet:a203643485"
+	modCompile "crochet:Crochet:1.0.2"
+	include "crochet:Crochet:1.0.2"
 	modCompile "cloth-config:ClothConfig:0.2.1.14"
 	include "cloth-config:ClothConfig:0.2.1.14"
 }

diff --git a/...illcheck/mixins/MixinWeaverContainer.java → ...skillcheck/mixins/MixinLoomContainer.java b/...illcheck/mixins/MixinWeaverContainer.java → ...skillcheck/mixins/MixinLoomContainer.java
@@ -14,7 +14,7 @@
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(LoomContainer.class)
-public abstract class MixinWeaverContainer {
+public abstract class MixinLoomContainer {
 	private PlayerEntity player;
 
 	@Inject(method = "<init>(ILnet/minecraft/entity/player/PlayerInventory;Lnet/minecraft/container/BlockContext;)V", at = @At("RETURN"))

diff --git a/.../skillcheck/mixins/MixinWeaverScreen.java → ...mc/skillcheck/mixins/MixinLoomScreen.java b/.../skillcheck/mixins/MixinWeaverScreen.java → ...mc/skillcheck/mixins/MixinLoomScreen.java
@@ -15,7 +15,7 @@
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(LoomScreen.class)
-public abstract class MixinWeaverScreen {
+public abstract class MixinLoomScreen {
 	private PlayerEntity player;
 
 	@Inject(method = "<init>", at = @At("RETURN"))

diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
@@ -24,7 +24,11 @@
     ]
   },
   "mixins": [
-    "skillcheck.common.json"
+    "skillcheck.common.json",
+    {
+      "config": "skillcheck.client.json",
+      "environment": "client"
+    }
   ],
   "requires": {
     "fabricloader": ">=0.4.0",

diff --git a/src/main/resources/skillcheck.client.json b/src/main/resources/skillcheck.client.json
@@ -0,0 +1,14 @@
+{
+  "required": true,
+  "package": "io.github.cottonmc.skillcheck.mixins",
+  "compatibilityLevel": "JAVA_8",
+  "refmap": "mixins.skillcheck.refmap.json",
+  "cliet": [
+    "MixinBannerTooltip",
+    "MixinThiefClient",
+    "MixinLoomScreen"
+  ],
+  "injectors": {
+    "defaultRequire": 1
+  }
+}
diff --git a/src/main/resources/skillcheck.common.json b/src/main/resources/skillcheck.common.json
@@ -5,10 +5,7 @@
   "refmap": "mixins.skillcheck.refmap.json",
   "mixins": [
     "MixinArrow",
-    "MixinWeaverContainer",
-    "MixinWeaverScreen",
-    "MixinBannerTooltip",
-    "MixinThiefClient",
+    "MixinLoomContainer",
     "MixinThiefCommon"
   ],
   "injectors": {