Tests as separate projects

Arctic-Circle-System · Mar 20, 2020 · 5bbfd0d · 5bbfd0d
1 parent ef60e26
commit 5bbfd0d
Show file tree

Hide file tree

Showing 9 changed files with 28 additions and 61 deletions.
diff --git a/chainmail-tests/build.gradle b/chainmail-tests/build.gradle
@@ -0,0 +1,4 @@
+dependencies {
+    compile project(path: ":chainmail")
+    include project(path: ":chainmail")
+}
diff --git a/chainmail-tests/gradle.properties b/chainmail-tests/gradle.properties
@@ -0,0 +1 @@
+mod_id = chainmail-tests
diff --git a/...ail/src/main/java/ninjaphenix/test/A.java → ...ava/ninjaphenix/tests/chainmail/Main.java b/...ail/src/main/java/ninjaphenix/test/A.java → ...ava/ninjaphenix/tests/chainmail/Main.java
@@ -1,4 +1,4 @@
-package ninjaphenix.test;
+package ninjaphenix.tests.chainmail;
 
 import net.fabricmc.api.ModInitializer;
 import net.minecraft.block.Block;
@@ -8,15 +8,16 @@
 import net.minecraft.item.Item;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.registry.Registry;
-import ninjaphenix.test.a.block.TestBlock;
-import ninjaphenix.test.a.block.entity.TestBlockEntity;
+import ninjaphenix.tests.chainmail.block.TestBlock;
+import ninjaphenix.tests.chainmail.block.entity.TestBlockEntity;
 
-public class A implements ModInitializer
+public class Main implements ModInitializer
 {
+    public static Main INSTANCE = new Main();
+
     @Override
     public void onInitialize()
     {
-        System.out.println("Now were making test mods :tiny_potato:");
         final Block TEST_BLOCK = Registry.register(Registry.BLOCK, new Identifier("test_a", "test_block"), new TestBlock(Block.Settings.of(Material.CLAY)));
         Registry.register(Registry.BLOCK_ENTITY_TYPE, new Identifier("test_a", "test_block_entity"),
                 BlockEntityType.Builder.create(TestBlockEntity::new, TEST_BLOCK).build(null));

diff --git a/...a/ninjaphenix/test/A/block/TestBlock.java → ...enix/tests/chainmail/block/TestBlock.java b/...a/ninjaphenix/test/A/block/TestBlock.java → ...enix/tests/chainmail/block/TestBlock.java
@@ -1,10 +1,10 @@
-package ninjaphenix.test.a.block;
+package ninjaphenix.tests.chainmail.block;
 
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockEntityProvider;
 import net.minecraft.block.entity.BlockEntity;
 import net.minecraft.world.BlockView;
-import ninjaphenix.test.a.block.entity.TestBlockEntity;
+import ninjaphenix.tests.chainmail.block.entity.TestBlockEntity;
 
 public class TestBlock extends Block implements BlockEntityProvider
 {

diff --git a/.../test/A/block/entity/TestBlockEntity.java → ...ainmail/block/entity/TestBlockEntity.java b/.../test/A/block/entity/TestBlockEntity.java → ...ainmail/block/entity/TestBlockEntity.java
@@ -1,4 +1,4 @@
-package ninjaphenix.test.a.block.entity;
+package ninjaphenix.tests.chainmail.block.entity;
 
 import net.minecraft.block.entity.BlockEntity;
 import net.minecraft.util.Identifier;

diff --git a/chainmail-tests/src/main/resources/fabric.mod.json b/chainmail-tests/src/main/resources/fabric.mod.json
@@ -0,0 +1,12 @@
+{
+  "schemaVersion": 1,
+  "id": "chainmail-tests",
+  "version": "${version}",
+  "name": "Chainmail Test Mod",
+  "environment": "*",
+  "entrypoints": {
+    "main": [
+      "ninjaphenix.tests.chainmail.Main::INSTANCE"
+    ]
+  }
+}
diff --git a/chainmail/src/main/java/ninjaphenix/chainmail/impl/Main.java b/chainmail/src/main/java/ninjaphenix/chainmail/impl/Main.java
diff --git a/chainmail/src/main/resources/fabric.mod.json b/chainmail/src/main/resources/fabric.mod.json
@@ -12,16 +12,11 @@
   },
   "license": "MIT-0",
   "environment": "*",
-  "entrypoints": {
-    "main": [
-      "ninjaphenix.chainmail.impl.Main"
-    ]
-  },
   "mixins": [
     "chainmail.common.mixins.json"
   ],
   "depends": {
-    "fabricloader": ">=0.7.4",
+    "fabricloader": ">=0.7",
     "fabric": "*",
     "minecraft": "~1.15"
   }

diff --git a/settings.gradle b/settings.gradle
@@ -9,4 +9,5 @@ pluginManagement {
 }
 
 include 'chainmail'
+include 'chainmail-tests'
 include 'torcherino'