Merge branch 'gmr-main' into cosmo-main

.vscode/settings.json

@@ -1,3 +1,4 @@
 {
-    "java.configuration.updateBuildConfiguration": "automatic"
+    "java.configuration.updateBuildConfiguration": "automatic",
+    "java.compile.nullAnalysis.mode": "automatic"
 }

src/main/java/net/arcmods/arcteam/terraoriginum/TerraOriginum.java

@@ -22,6 +22,6 @@ public class TerraOriginum implements ModInitializer {
 		modEnchantments.register();
 		
 		ItemGroupEvents.modifyEntriesEvent(ItemGroups.TOOLS).register((content) -> content.add(umbrella.UMBRELLA));
-		LOGGER.info("man this Origins is gaming");
+		LOGGER.info("man this Origins is " + MOD_ID);
 	}
 }

src/main/resources/data/terraoriginum/origins/spirit.json

@@ -2,7 +2,12 @@
 	"powers": [
 		"terraoriginum:spirit-powers/ectoplasm",
 		"terraoriginum:spirit-powers/ectodiff",
-		"terraoriginum:spirit-powers/lackofectodmg"
+		"terraoriginum:spirit-powers/lackofectodmg",
+		"terraoriginum:spirit-powers/skin",
+		"terraoriginum:spirit-powers/phasing1",
+		"terraoriginum:spirit-powers/phasing2",
+		"terraoriginum:spirit-powers/phasing3",
+		"terraoriginum:spirit-powers/undead"
 	],
 	"icon": "minecraft:air",
 	"order": 1001,

src/main/resources/data/terraoriginum/powers/spirit-powers/phasing1.json

@@ -0,0 +1,14 @@
+{
+  "type": "origins:toggle",
+  "key": {
+    "key": "key.origins.primary_active",
+    "continuous": false
+  },
+  "retain_state": false,
+  "condition": {
+    "type": "origins:resource",
+    "resource": "terraoriginum:spirit-powers/ectoplasm",
+    "comparison": ">=",
+    "compare_to": 1
+  }
+}

src/main/resources/data/terraoriginum/powers/spirit-powers/phasing2.json

@@ -0,0 +1,26 @@
+{
+  "type": "origins:phasing",
+  "hidden": true,
+  "blacklist": true,
+  "render_type": "blindness",
+  "view_distance": 10,
+  "block_condition": {
+    "type": "origins:in_tag",
+    "tag": "origins:unphasable"
+  },
+  "phase_down_condition": {
+    "type": "origins:and",
+    "conditions": [
+      {
+        "type": "origins:sneaking"
+      },
+      {
+        "type": "origins:on_block"
+      }
+    ]
+  },
+  "condition": {
+    "type": "origins:power_active",
+    "power": "terraoriginum:spirit-powers/phasing1"
+  }
+}

src/main/resources/data/terraoriginum/powers/spirit-powers/phasing3.json

@@ -0,0 +1,27 @@
+{
+  "type": "origins:action_over_time",
+  "interval": 20,
+  "hidden": true,
+  "entity_action": {
+    "type": "origins:if_else_list",
+    "actions": [
+        {
+          "condition": {
+            "type": "origins:power_active",
+            "power": "terraoriginum:spirit-powers/phasing1"
+          },
+            "action": {
+                "type": "origins:and",
+                "actions": [
+                    {
+                        "type": "origins:change_resource",
+                        "resource": "terraoriginum:spirit-powers/ectoplasm",
+                        "change": -7,
+                        "operation": "add"
+                    }
+                ]
+            }
+        }
+    ]
+  }
+}

src/main/resources/data/terraoriginum/powers/spirit-powers/skin.json

@@ -0,0 +1,5 @@
+{
+    "type": "origins:model_color",
+    "alpha": 0.7
+
+}

src/main/resources/data/terraoriginum/powers/spirit-powers/undead.json

@@ -0,0 +1,4 @@
+{
+    "type": "origins:entity_group",
+    "group": "undead"
+}