Move to patchwork-extensions-item module

Virtuoel · Virtuoel · commit 6f189daecc3e · 2020-02-28T03:29:53.000+03:00
diff --git a/patchwork-extensions-item/build.gradle b/patchwork-extensions-item/build.gradle
@@ -0,0 +1,6 @@
+archivesBaseName = "patchwork-extensions-item"
+version = getSubprojectVersion(project, "0.1.0")
+
+dependencies {
+	compile project(path: ':patchwork-fml', configuration: 'dev')
+}
diff --git a/patchwork-extensions-item/src/main/java/com/patchworkmc/impl/extensions/item/PatchworkItemSettingsExtensions.java b/patchwork-extensions-item/src/main/java/com/patchworkmc/impl/extensions/item/PatchworkItemSettingsExtensions.java
@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-package com.patchworkmc.impl.extension;
+package com.patchworkmc.impl.extensions.item;
 
 import java.util.Map;
 import java.util.concurrent.Callable;
diff --git a/patchwork-extensions-item/src/main/java/com/patchworkmc/mixin/extensions/item/ItemTagsAccessor.java b/patchwork-extensions-item/src/main/java/com/patchworkmc/mixin/extensions/item/ItemTagsAccessor.java
@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-package com.patchworkmc.mixin.extension;
+package com.patchworkmc.mixin.extensions.item;
 
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Accessor;
diff --git a/patchwork-extensions-item/src/main/java/com/patchworkmc/mixin/extensions/item/MixinAxeItem.java b/patchwork-extensions-item/src/main/java/com/patchworkmc/mixin/extensions/item/MixinAxeItem.java
@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-package com.patchworkmc.mixin.extension;
+package com.patchworkmc.mixin.extensions.item;
 
 import org.spongepowered.asm.mixin.Mixin;
 import net.minecraftforge.common.extensions.IForgeItem;
diff --git a/patchwork-extensions-item/src/main/java/com/patchworkmc/mixin/extensions/item/MixinEnchantedBookItem.java b/patchwork-extensions-item/src/main/java/com/patchworkmc/mixin/extensions/item/MixinEnchantedBookItem.java
@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-package com.patchworkmc.mixin.extension;
+package com.patchworkmc.mixin.extensions.item;
 
 import org.spongepowered.asm.mixin.Mixin;
 import net.minecraftforge.common.extensions.IForgeItem;
diff --git a/patchwork-extensions-item/src/main/java/com/patchworkmc/mixin/extensions/item/MixinItem.java b/patchwork-extensions-item/src/main/java/com/patchworkmc/mixin/extensions/item/MixinItem.java
@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-package com.patchworkmc.mixin.extension;
+package com.patchworkmc.mixin.extensions.item;
 
 import java.util.HashSet;
 import java.util.Map;
@@ -46,7 +46,7 @@
 import net.minecraft.tag.Tag;
 import net.minecraft.util.Identifier;
 
-import com.patchworkmc.impl.extension.PatchworkItemSettingsExtensions;
+import com.patchworkmc.impl.extensions.item.PatchworkItemSettingsExtensions;
 
 @Mixin(Item.class)
 public abstract class MixinItem implements IForgeItem {
diff --git a/patchwork-extensions-item/src/main/java/com/patchworkmc/mixin/extensions/item/MixinItemSettings.java b/patchwork-extensions-item/src/main/java/com/patchworkmc/mixin/extensions/item/MixinItemSettings.java
@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-package com.patchworkmc.mixin.extension;
+package com.patchworkmc.mixin.extensions.item;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -28,7 +28,7 @@
 import net.minecraft.item.Item;
 import net.minecraft.item.Item.Settings;
 
-import com.patchworkmc.impl.extension.PatchworkItemSettingsExtensions;
+import com.patchworkmc.impl.extensions.item.PatchworkItemSettingsExtensions;
 
 @Mixin(Item.Settings.class)
 public abstract class MixinItemSettings implements PatchworkItemSettingsExtensions {
diff --git a/patchwork-extensions-item/src/main/java/com/patchworkmc/mixin/extensions/item/MixinPotionItems.java b/patchwork-extensions-item/src/main/java/com/patchworkmc/mixin/extensions/item/MixinPotionItems.java
@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-package com.patchworkmc.mixin.extension;
+package com.patchworkmc.mixin.extensions.item;
 
 import org.spongepowered.asm.mixin.Mixin;
 import net.minecraftforge.common.extensions.IForgeItem;
diff --git a/patchwork-extensions-item/src/main/java/com/patchworkmc/mixin/extensions/item/MixinSpawnEggItem.java b/patchwork-extensions-item/src/main/java/com/patchworkmc/mixin/extensions/item/MixinSpawnEggItem.java
@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-package com.patchworkmc.mixin.extension;
+package com.patchworkmc.mixin.extensions.item;
 
 import org.spongepowered.asm.mixin.Mixin;
 import net.minecraftforge.common.extensions.IForgeItem;
diff --git a/patchwork-extensions-item/src/main/java/com/patchworkmc/mixin/extensions/item/client/MixinItem.java b/patchwork-extensions-item/src/main/java/com/patchworkmc/mixin/extensions/item/client/MixinItem.java
@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-package com.patchworkmc.mixin.extension.client;
+package com.patchworkmc.mixin.extensions.item.client;
 
 import javax.annotation.Nullable;
 
@@ -31,7 +31,7 @@
 import net.minecraft.client.render.item.ItemDynamicRenderer;
 import net.minecraft.item.Item;
 
-import com.patchworkmc.impl.extension.PatchworkItemSettingsExtensions;
+import com.patchworkmc.impl.extensions.item.PatchworkItemSettingsExtensions;
 
 @Mixin(Item.class)
 public abstract class MixinItem implements IForgeItem {
diff --git a/patchwork-extensions-item/src/main/java/com/patchworkmc/mixin/extensions/item/client/MixinItemSettings.java b/patchwork-extensions-item/src/main/java/com/patchworkmc/mixin/extensions/item/client/MixinItemSettings.java
@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-package com.patchworkmc.mixin.extension.client;
+package com.patchworkmc.mixin.extensions.item.client;
 
 import java.util.concurrent.Callable;
 import java.util.function.Supplier;
@@ -28,7 +28,7 @@
 import net.minecraft.client.render.item.ItemDynamicRenderer;
 import net.minecraft.item.Item;
 
-import com.patchworkmc.impl.extension.PatchworkItemSettingsExtensions;
+import com.patchworkmc.impl.extensions.item.PatchworkItemSettingsExtensions;
 
 @Mixin(Item.Settings.class)
 public abstract class MixinItemSettings implements PatchworkItemSettingsExtensions {
diff --git a/patchwork-extensions-item/src/main/java/net/minecraftforge/common/extensions/IForgeItem.java b/patchwork-extensions-item/src/main/java/net/minecraftforge/common/extensions/IForgeItem.java
diff --git a/patchwork-extensions-item/src/main/resources/assets/patchwork-extensions-item/icon.png b/patchwork-extensions-item/src/main/resources/assets/patchwork-extensions-item/icon.png
diff --git a/patchwork-extensions-item/src/main/resources/fabric.mod.json b/patchwork-extensions-item/src/main/resources/fabric.mod.json
@@ -0,0 +1,29 @@
+{
+  "schemaVersion": 1,
+  "id": "patchwork-extensions-item",
+  "name": "Patchwork Item Extensions",
+  "version": "${version}",
+  "description": "Implements the Minecraft Forge extensions API for items",
+  "environment": "*",
+  "license": "LGPL-2.1-only",
+  "icon": "assets/patchwork-extensions-item/icon.png",
+  "contact": {
+    "issues": "https://github.com/PatchworkMC/patchwork-api/issues",
+    "sources": "https://github.com/PatchworkMC/patchwork-api"
+  },
+  "authors": [
+    "PatchworkMC"
+  ],
+  "depends": {
+    "fabricloader": ">=0.6.2",
+    "fabric": "*",
+    "patchwork-fml": "*"
+  },
+  "mixins": [
+    "patchwork-extensions-item.mixins.json"
+  ],
+  "custom": {
+    "modmenu:api": true,
+    "modmenu:parent": "patchwork"
+  }
+}
diff --git a/patchwork-extensions-item/src/main/resources/patchwork-extensions-item.mixins.json b/patchwork-extensions-item/src/main/resources/patchwork-extensions-item.mixins.json
@@ -0,0 +1,21 @@
+{
+  "required": true,
+  "package": "com.patchworkmc.mixin.extensions.item",
+  "compatibilityLevel": "JAVA_8",
+  "mixins": [
+    "ItemTagsAccessor",
+    "MixinAxeItem",
+    "MixinEnchantedBookItem",
+    "MixinItem",
+    "MixinItemSettings",
+    "MixinPotionItems",
+    "MixinSpawnEggItem"
+  ],
+  "client": [
+    "client.MixinItem",
+    "client.MixinItemSettings"
+  ],
+  "injectors": {
+    "defaultRequire": 1
+  }
+}
diff --git a/patchwork-extensions/build.gradle b/patchwork-extensions/build.gradle
@@ -1,6 +1,2 @@
 archivesBaseName = "patchwork-extensions"
 version = getSubprojectVersion(project, "0.1.0")
-
-dependencies {
-	compile project(path: ':patchwork-fml', configuration: 'dev')
-}
diff --git a/patchwork-extensions/src/main/resources/patchwork-extensions.mixins.json b/patchwork-extensions/src/main/resources/patchwork-extensions.mixins.json
@@ -3,21 +3,10 @@
   "package": "com.patchworkmc.mixin.extension",
   "compatibilityLevel": "JAVA_8",
   "mixins": [
-    "ItemTagsAccessor",
-    "MixinAxeItem",
-    "MixinEnchantedBookItem",
     "MixinEntityType",
     "MixinEntityTypeBuilder",
-    "MixinItem",
-    "MixinItemSettings",
-    "MixinPotionItems",
-    "MixinSpawnEggItem",
     "MixinStatusEffect"
   ],
-  "client": [
-    "client.MixinItem",
-    "client.MixinItemSettings"
-  ],
   "injectors": {
     "defaultRequire": 1
   }
diff --git a/settings.gradle b/settings.gradle
@@ -19,6 +19,7 @@ include 'patchwork-events-lifecycle'
 include 'patchwork-events-world'
 include 'patchwork-extensions-shearing'
 include 'patchwork-extensions'
+include 'patchwork-extensions-item'
 include 'patchwork-fml'
 include 'patchwork-registries'
 include 'patchwork-gui'
