Loader 0.4

6 files changed, 39 insertions, 27 deletions

diff --git a/src/main/resources/assets/roughlyenoughitems/icon.png b/src/main/resources/assets/roughlyenoughitems/icon.png
deleted file mode 100644
index bd34c710a..000000000
--- a/src/main/resources/assets/roughlyenoughitems/icon.png
+++ /dev/null
diff --git a/src/main/resources/assets/roughlyenoughitems/lang/en_us.json b/src/main/resources/assets/roughlyenoughitems/lang/en_us.json
index dca02f522..666ece12a 100755
--- a/src/main/resources/assets/roughlyenoughitems/lang/en_us.json
+++ b/src/main/resources/assets/roughlyenoughitems/lang/en_us.json
@@ -77,6 +77,7 @@
   "text.rei.config.enable_legacy_speedcraft_support": "Enable Legacy Plugin Support: ",
   "text.rei.config.april_fools": "April Fools",
   "text.rei.config.april_fools.2019": "Force 2019 REI April Fools' joke: ",
+  "text.rei.no_config_api": "Cloth Config API does not exist!\nPlease install it in order to show an in-game config screen!",
   "_comment": "Don't change / translate the credit down below if you are doing it :)",
   "text.rei.credit.text": "§lRoughly Enough Items\n§7Originally a fork for Almost Enough Items.\n\n§lDevelopers\n  - Originally by ZenDarva\n  - Created by Danielshe\n  - Plugin Support by TehNut\n\n§lLanguage Translation\n  English - Danielshe\n  Simplified Chinese - Danielshe\n  Traditional Chinese - hugoalh & Danielshe\n  French - Yanis48\n  German - MelanX\n  Estonian - Madis0\n  Portuguese - thiagokenis\n  LOLCAT - Danielshe\n  Upside Down - Danielshe\n\n§lLicense\n§7Roughly Enough Items is using MIT."
 }
\ No newline at end of file
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
index 61cc91dad..71f8021a9 100755
--- a/src/main/resources/fabric.mod.json
+++ b/src/main/resources/fabric.mod.json
@@ -1,24 +1,48 @@
 {
+  "schemaVersion": 1,
   "id": "roughlyenoughitems",
   "name": "RoughlyEnoughItems",
   "description": "To allow players to view items and recipes. Version: ${version}",
-  "version": "2.6",
-  "side": "client",
+  "version": "${version}",
   "authors": [
     "Danielshe"
   ],
-  "initializers": [
-    "me.shedaniel.rei.RoughlyEnoughItemsCore",
-    "me.shedaniel.rei.client.ClientHelper",
-    "me.shedaniel.rei.client.ScreenHelper"
-  ],
+  "contact": {
+    "homepage": "https://minecraft.curseforge.com/projects/roughly-enough-items",
+    "sources": "https://github.com/shedaniel/RoughlyEnoughItems",
+    "issues": "https://github.com/shedaniel/RoughlyEnoughItems/issues"
+  },
+  "license": "MIT",
+  "icon": "pack.png",
+  "environment": "client",
+  "entrypoints": {
+    "client": [
+      "me.shedaniel.rei.RoughlyEnoughItemsCore",
+      "me.shedaniel.rei.client.ClientHelper",
+      "me.shedaniel.rei.client.ScreenHelper"
+    ],
+    "main": [
+      "me.shedaniel.rei.RoughlyEnoughItemsNetwork"
+    ]
+  },
   "requires": {
-    "fabric": "^0.2.3"
+    "fabricloader": ">=0.4.0",
+    "fabric": "^0.2.6",
+    "cloth": "*"
   },
-  "recommended": {
-    "pluginloader": "^1.0.6"
+  "recommends": {
+    "cloth-config": ">=0.1.0"
   },
-  "mixins": {
-    "client": "roughlyenoughitems.client.json"
+  "mixins": [
+    "roughlyenoughitems.mixins.json"
+  ],
+  "custom": {
+    "modmenu:clientsideOnly": true,
+    "roughlyenoughitems:plugins": [
+      {
+        "id": "default_plugin",
+        "class": "me.shedaniel.rei.plugin.DefaultPlugin"
+      }
+    ]
   }
 }
diff --git a/src/main/resources/pluginloader.json b/src/main/resources/pluginloader.json
deleted file mode 100644
index 8c256add0..000000000
--- a/src/main/resources/pluginloader.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "id": "roughlyenoughitems",
-  "initializer": "me.shedaniel.rei.RoughlyEnoughItemsPlugins",
-  "data": {
-    "side": "CLIENT"
-  }
-}
\ No newline at end of file
diff --git a/src/main/resources/plugins/roughlyenoughitems.plugin.json b/src/main/resources/plugins/roughlyenoughitems.plugin.json
deleted file mode 100644
index 8ea3542ee..000000000
--- a/src/main/resources/plugins/roughlyenoughitems.plugin.json
+++ /dev/null
@@ -1,6 +0,0 @@
-[
-  {
-    "id": "default_plugin",
-    "initializer": "me.shedaniel.rei.plugin.DefaultPlugin"
-  }
-]
\ No newline at end of file
diff --git a/src/main/resources/roughlyenoughitems.client.json b/src/main/resources/roughlyenoughitems.mixins.json
index d95b69afc..205734ddf 100755
--- a/src/main/resources/roughlyenoughitems.client.json
+++ b/src/main/resources/roughlyenoughitems.mixins.json
@@ -3,9 +3,9 @@
   "package": "me.shedaniel.rei.mixin",
   "minVersion": "0.7.11",
   "compatibilityLevel": "JAVA_8",
-  "mixins": [
+  "mixins": [],
+  "client": [
     "MixinContainerScreen",
-    "MixinCreativePlayerInventoryScreen",
     "MixinBrewingRecipeRegistry",
     "MixinRecipeBookGui"
   ],