Move the Forge EventBus (and some other classes) to api-base (#164)

TheGlitch76 · web-flow · commit fc655ee13eac · 2020-08-04T20:52:03.000-05:00
diff --git a/patchwork-api-base/src/main/java/net/minecraftforge/api/distmarker/Dist.java b/patchwork-api-base/src/main/java/net/minecraftforge/api/distmarker/Dist.java
diff --git a/patchwork-api-base/src/main/java/net/minecraftforge/common/MinecraftForge.java b/patchwork-api-base/src/main/java/net/minecraftforge/common/MinecraftForge.java
diff --git a/patchwork-api-base/src/main/java/net/minecraftforge/fml/LogicalSide.java b/patchwork-api-base/src/main/java/net/minecraftforge/fml/LogicalSide.java
diff --git a/patchwork-api-base/src/main/resources/fabric.mod.json b/patchwork-api-base/src/main/resources/fabric.mod.json
@@ -17,7 +17,7 @@
     "fabricloader": ">=0.8.4",
     "fabric": ">=0.15.1"
   },
-  "description": "Common zero-overhead classes used across Patchwork modules",
+  "description": "Common classes that don't require Mixins or involve mod loading",
   "custom": {
     "modmenu:api": true,
     "modmenu:parent": "patchwork"
diff --git a/patchwork-capabilities/build.gradle b/patchwork-capabilities/build.gradle
@@ -3,5 +3,4 @@ version = getSubprojectVersion(project, "0.3.0")
 
 dependencies {
 	implementation project(path: ':patchwork-api-base', configuration: 'dev')
-	implementation project(path: ':patchwork-fml', configuration: 'dev')
 }
diff --git a/patchwork-capabilities/src/main/resources/fabric.mod.json b/patchwork-capabilities/src/main/resources/fabric.mod.json
@@ -14,7 +14,6 @@
   ],
   "depends": {
     "patchwork-api-base": "*",
-    "patchwork-fml": "*"
   },
   "mixins": [
     "patchwork-capabilities.mixins.json"
diff --git a/patchwork-data-generators/src/main/resources/fabric.mod.json b/patchwork-data-generators/src/main/resources/fabric.mod.json
@@ -13,7 +13,8 @@
     "PatchworkMC"
   ],
   "depends": {
-    "patchwork-api-base": "*"
+    "patchwork-api-base": "*",
+    "patchwork-fml": "*"
   },
   "mixins": [
   ],
diff --git a/patchwork-events-entity/build.gradle b/patchwork-events-entity/build.gradle
@@ -3,7 +3,6 @@ version = getSubprojectVersion(project, "0.5.0")
 
 dependencies {
 	implementation project(path: ':patchwork-api-base', configuration: 'dev')
-	implementation project(path: ':patchwork-fml', configuration: 'dev')
 	implementation project(path: ':patchwork-extensions', configuration: 'dev')
 	implementation project(path: ':patchwork-extensions-item', configuration: 'dev')
 }
diff --git a/patchwork-events-entity/src/main/resources/fabric.mod.json b/patchwork-events-entity/src/main/resources/fabric.mod.json
@@ -17,7 +17,6 @@
   },
   "depends": {
     "patchwork-api-base": "*",
-    "patchwork-fml": "*",
     "patchwork-extensions-item": "*"
   },
   "mixins": [
diff --git a/patchwork-events-input/build.gradle b/patchwork-events-input/build.gradle
@@ -3,5 +3,4 @@ version = getSubprojectVersion(project, "0.3.0")
 
 dependencies {
 	implementation project(path: ':patchwork-api-base', configuration: 'dev')
-	implementation project(path: ':patchwork-fml', configuration: 'dev')
 }
diff --git a/patchwork-events-input/src/main/resources/fabric.mod.json b/patchwork-events-input/src/main/resources/fabric.mod.json
@@ -13,8 +13,7 @@
     "PatchworkMC"
   ],
   "depends": {
-    "patchwork-api-base": "*",
-    "patchwork-fml": "*"
+    "patchwork-api-base": "*"
   },
   "mixins": [
     "patchwork-events-input.mixins.json"
diff --git a/patchwork-events-rendering/build.gradle b/patchwork-events-rendering/build.gradle
@@ -3,5 +3,4 @@ version = getSubprojectVersion(project, "0.3.0")
 
 dependencies {
 	implementation project(path: ':patchwork-api-base', configuration: 'dev')
-	implementation project(path: ':patchwork-fml', configuration: 'dev')
 }
diff --git a/patchwork-events-rendering/src/main/resources/fabric.mod.json b/patchwork-events-rendering/src/main/resources/fabric.mod.json
@@ -13,8 +13,7 @@
     "PatchworkMC"
   ],
   "depends": {
-    "patchwork-api-base": "*",
-    "patchwork-fml": "*"
+    "patchwork-api-base": "*"
   },
   "mixins": [
     "patchwork-events-rendering.mixins.json"
diff --git a/patchwork-events-world/build.gradle b/patchwork-events-world/build.gradle
@@ -3,5 +3,4 @@ version = getSubprojectVersion(project, "0.3.0")
 
 dependencies {
 	implementation project(path: ':patchwork-api-base', configuration: 'dev')
-	implementation project(path: ':patchwork-fml', configuration: 'dev')
 }
diff --git a/patchwork-events-world/src/main/resources/fabric.mod.json b/patchwork-events-world/src/main/resources/fabric.mod.json
@@ -14,7 +14,6 @@
   ],
   "depends": {
     "patchwork-api-base": "*",
-    "patchwork-fml": "*"
   },
   "mixins": [
     "patchwork-events-world.mixins.json"
diff --git a/patchwork-extensions-shearing/build.gradle b/patchwork-extensions-shearing/build.gradle
@@ -3,5 +3,4 @@ version = getSubprojectVersion(project, "0.3.0")
 
 dependencies {
 	implementation project(path: ':patchwork-api-base', configuration: 'dev')
-	implementation project(path: ':patchwork-fml', configuration: 'dev')
 }
diff --git a/patchwork-extensions-shearing/src/main/resources/fabric.mod.json b/patchwork-extensions-shearing/src/main/resources/fabric.mod.json
@@ -14,7 +14,6 @@
   ],
   "depends": {
     "patchwork-api-base": "*",
-    "patchwork-fml": "*"
   },
   "mixins": [
     "patchwork-extensions-shearing.mixins.json"
diff --git a/patchwork-gui/build.gradle b/patchwork-gui/build.gradle
@@ -3,5 +3,4 @@ version = getSubprojectVersion(project, "0.3.0")
 
 dependencies {
 	implementation project(path: ':patchwork-api-base', configuration: 'dev')
-	implementation project(path: ':patchwork-fml', configuration: 'dev')
 }
diff --git a/patchwork-gui/src/main/resources/fabric.mod.json b/patchwork-gui/src/main/resources/fabric.mod.json
@@ -14,7 +14,6 @@
   ],
   "depends": {
     "patchwork-api-base": "*",
-    "patchwork-fml": "*"
   },
   "mixins": [
     "patchwork-gui.mixins.json"
diff --git a/patchwork-loot/build.gradle b/patchwork-loot/build.gradle
@@ -3,6 +3,5 @@ version = getSubprojectVersion(project, "0.3.0")
 
 dependencies {
 	implementation project(path: ':patchwork-api-base', configuration: 'dev')
-	implementation project(path: ':patchwork-fml', configuration: 'dev')
 }
 
diff --git a/patchwork-networking-messages/build.gradle b/patchwork-networking-messages/build.gradle
@@ -3,6 +3,5 @@ version = getSubprojectVersion(project, "0.3.0")
 
 dependencies {
 	implementation project(path: ':patchwork-api-base', configuration: 'dev')
-	implementation project(path: ':patchwork-fml', configuration: 'dev')
 	implementation project(path: ':patchwork-networking', configuration: 'dev')
 }
diff --git a/patchwork-networking-messages/src/main/resources/fabric.mod.json b/patchwork-networking-messages/src/main/resources/fabric.mod.json
@@ -14,7 +14,6 @@
   ],
   "depends": {
     "patchwork-api-base": "*",
-    "patchwork-fml": "*",
     "patchwork-networking": "*"
   },
   "entrypoints": {

Original file line number	Diff line number	Diff line change
`@@ -3,5 +3,4 @@ version = getSubprojectVersion(project, "0.3.0")`
`3`	`3`
`4`	`4`	`dependencies {`
`5`	`5`	`implementation project(path: ':patchwork-api-base', configuration: 'dev')`
`6`		`- implementation project(path: ':patchwork-fml', configuration: 'dev')`
`7`	`6`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,6 @@ version = getSubprojectVersion(project, "0.5.0")`
`3`	`3`
`4`	`4`	`dependencies {`
`5`	`5`	`implementation project(path: ':patchwork-api-base', configuration: 'dev')`
`6`		`- implementation project(path: ':patchwork-fml', configuration: 'dev')`
`7`	`6`	`implementation project(path: ':patchwork-extensions', configuration: 'dev')`
`8`	`7`	`implementation project(path: ':patchwork-extensions-item', configuration: 'dev')`
`9`	`8`	`}`