From c5d76927421cf6432f1b63b7ba0fc6e985a67d4e Mon Sep 17 00:00:00 2001
From: Octol1ttle <l1ttleofficial@outlook.com>
Date: Thu, 18 Jul 2024 19:58:18 +0500
Subject: [PATCH] fix: put mixins in separate package from common and client

Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com>
---
 gradle.properties                                   |  2 +-
 .../common/KnockdownsFMLLoadingPlugin.java          |  1 -
 .../{common => }/mixin/EntityLivingBaseMixin.java   |  2 +-
 .../{common => }/mixin/EntityPlayerMixin.java       |  2 +-
 .../{client => }/mixin/PlayerControllerMPMixin.java |  2 +-
 src/main/resources/mixins.knockdowns.client.json    | 13 -------------
 src/main/resources/mixins.knockdowns.json           |  6 ++++--
 7 files changed, 8 insertions(+), 20 deletions(-)
 rename src/main/java/ru/octol1ttle/knockdowns/{common => }/mixin/EntityLivingBaseMixin.java (96%)
 rename src/main/java/ru/octol1ttle/knockdowns/{common => }/mixin/EntityPlayerMixin.java (94%)
 rename src/main/java/ru/octol1ttle/knockdowns/{client => }/mixin/PlayerControllerMPMixin.java (95%)
 delete mode 100644 src/main/resources/mixins.knockdowns.client.json

diff --git a/gradle.properties b/gradle.properties
index c38451c..b5ab346 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -15,7 +15,7 @@ show_testing_output = false
 
 # Mod Information
 # HIGHLY RECOMMEND complying with SemVer for mod_version: https://semver.org/
-mod_version = 1.1.0
+mod_version=1.1.1
 root_package = ru.octol1ttle
 mod_id = knockdowns
 mod_name = Knockdowns (Legacy)
diff --git a/src/main/java/ru/octol1ttle/knockdowns/common/KnockdownsFMLLoadingPlugin.java b/src/main/java/ru/octol1ttle/knockdowns/common/KnockdownsFMLLoadingPlugin.java
index 457d398..77e881b 100644
--- a/src/main/java/ru/octol1ttle/knockdowns/common/KnockdownsFMLLoadingPlugin.java
+++ b/src/main/java/ru/octol1ttle/knockdowns/common/KnockdownsFMLLoadingPlugin.java
@@ -38,7 +38,6 @@ public class KnockdownsFMLLoadingPlugin implements IFMLLoadingPlugin, IEarlyMixi
     public List<String> getMixinConfigs() {
         ArrayList<String> list = new ArrayList<>();
         list.add("mixins.knockdowns.json");
-        list.add("mixins.knockdowns.client.json");
         return list;
     }
 }
diff --git a/src/main/java/ru/octol1ttle/knockdowns/common/mixin/EntityLivingBaseMixin.java b/src/main/java/ru/octol1ttle/knockdowns/mixin/EntityLivingBaseMixin.java
similarity index 96%
rename from src/main/java/ru/octol1ttle/knockdowns/common/mixin/EntityLivingBaseMixin.java
rename to src/main/java/ru/octol1ttle/knockdowns/mixin/EntityLivingBaseMixin.java
index 598bbbc..5e7e824 100644
--- a/src/main/java/ru/octol1ttle/knockdowns/common/mixin/EntityLivingBaseMixin.java
+++ b/src/main/java/ru/octol1ttle/knockdowns/mixin/EntityLivingBaseMixin.java
@@ -1,4 +1,4 @@
-package ru.octol1ttle.knockdowns.common.mixin;
+package ru.octol1ttle.knockdowns.mixin;
 
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLivingBase;
diff --git a/src/main/java/ru/octol1ttle/knockdowns/common/mixin/EntityPlayerMixin.java b/src/main/java/ru/octol1ttle/knockdowns/mixin/EntityPlayerMixin.java
similarity index 94%
rename from src/main/java/ru/octol1ttle/knockdowns/common/mixin/EntityPlayerMixin.java
rename to src/main/java/ru/octol1ttle/knockdowns/mixin/EntityPlayerMixin.java
index 0b6e54f..8d870c3 100644
--- a/src/main/java/ru/octol1ttle/knockdowns/common/mixin/EntityPlayerMixin.java
+++ b/src/main/java/ru/octol1ttle/knockdowns/mixin/EntityPlayerMixin.java
@@ -1,4 +1,4 @@
-package ru.octol1ttle.knockdowns.common.mixin;
+package ru.octol1ttle.knockdowns.mixin;
 
 import com.llamalad7.mixinextras.injector.ModifyReturnValue;
 import net.minecraft.entity.player.EntityPlayer;
diff --git a/src/main/java/ru/octol1ttle/knockdowns/client/mixin/PlayerControllerMPMixin.java b/src/main/java/ru/octol1ttle/knockdowns/mixin/PlayerControllerMPMixin.java
similarity index 95%
rename from src/main/java/ru/octol1ttle/knockdowns/client/mixin/PlayerControllerMPMixin.java
rename to src/main/java/ru/octol1ttle/knockdowns/mixin/PlayerControllerMPMixin.java
index c5bfb92..481557d 100644
--- a/src/main/java/ru/octol1ttle/knockdowns/client/mixin/PlayerControllerMPMixin.java
+++ b/src/main/java/ru/octol1ttle/knockdowns/mixin/PlayerControllerMPMixin.java
@@ -1,4 +1,4 @@
-package ru.octol1ttle.knockdowns.client.mixin;
+package ru.octol1ttle.knockdowns.mixin;
 
 import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
 import net.minecraft.client.Minecraft;
diff --git a/src/main/resources/mixins.knockdowns.client.json b/src/main/resources/mixins.knockdowns.client.json
deleted file mode 100644
index 619948d..0000000
--- a/src/main/resources/mixins.knockdowns.client.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "package": "ru.octol1ttle.knockdowns.client.mixin",
-  "required": true,
-  "refmap": "${mixin_refmap}",
-  "target": "@env(DEFAULT)",
-  "minVersion": "0.8.5",
-  "compatibilityLevel": "JAVA_8",
-  "mixins": [],
-  "server": [],
-  "client": [
-    "PlayerControllerMPMixin"
-  ]
-}
diff --git a/src/main/resources/mixins.knockdowns.json b/src/main/resources/mixins.knockdowns.json
index 55681b4..eddeb74 100644
--- a/src/main/resources/mixins.knockdowns.json
+++ b/src/main/resources/mixins.knockdowns.json
@@ -1,5 +1,5 @@
 {
-  "package": "ru.octol1ttle.knockdowns.common.mixin",
+  "package": "ru.octol1ttle.knockdowns.mixin",
 	"required": true,
 	"refmap": "${mixin_refmap}",
 	"target": "@env(DEFAULT)",
@@ -7,5 +7,7 @@
 	"compatibilityLevel": "JAVA_8",
 	"mixins": [ "EntityLivingBaseMixin", "EntityPlayerMixin" ],
 	"server": [],
-	"client": []
+  "client": [
+    "PlayerControllerMPMixin"
+  ]
 }