did ma thang

README.md

@@ -3,11 +3,15 @@
 Aspects is an element-based Origins addon, meaning it expands the functions and features of the Origins mod created by Apace100.
 Thank you to [Lazul1ne](https://github.com/lazuline) and perseus_fallen on Discord for help with fixing issues. :)
 
+## Celestia team information
+
+This is a fork of Aspects meant for use with Terra Originum. I'm not here to fix issues related to the base mod, just to fix issues brought up from usage with Terra Originum, however, I might fix issues related to the base mod when I'm bored enough.
+
 ## Requirements
 
 - [Fabric Api](https://www.curseforge.com/minecraft/mc-mods/fabric-api)
 - [Origins](https://www.curseforge.com/minecraft/mc-mods/origins)
-- [Origins Extra Keybinds](https://www.curseforge.com/minecraft/mc-mods/origins-extra-keybinds)
+- [Origins Extra Keybinds](https://www.curseforge.com/minecraft/mc-mods/origins-extra-keybinds) (**NOTE**) this is not necessary when in use alongside [Terra Originum](https://modrinth.com/mod/terra-originum)
 
 ## Further Support
 [https://discord.gg/p533EcFTSx](https://discord.gg/p533EcFTSx)

gradle.properties

@@ -1,6 +1,5 @@
 # Done to increase the memory available to gradle.
 org.gradle.jvmargs=-Xmx6G
-org.gradle.java.home=C:/Program Files/Java/jdk-17.0.2
 
 # Fabric Properties
 minecraft_version=1.20.1
@@ -11,7 +10,7 @@ loader_version=0.14.9
 fabric_version=0.90.4+1.20.1
 
 # Mod Properties
-	mod_version = 1.0.9-1.20.x
+	mod_version = 1.0.9-1.20.x-CE
 	maven_group = com.aspects
 	archives_base_name = aspects
 

src/main/java/net/fabricmc/fishplex/mixin/AspectsMixin.java

@@ -12,5 +12,6 @@ public class AspectsMixin {
 	@Inject(at = @At("HEAD"), method = "init()V")
 	private void init(CallbackInfo info) {
 		Aspects.LOGGER.info("Hello from Aspects! :D");
+		Aspects.LOGGER.info("and hello from the Celestia team, too");
 	}
 }

src/main/resources/data/aspects/powers/anemo/tempus/tempus_primary.json

@@ -28,8 +28,8 @@
         "bar_index":2,
         "inverted":true
     },
-    "key":"key.origins.ternary_active",
+    "key":"key.origins.quaternary_active",
     "name":"Lightning Bolt",
-    "description":"When pressing the [Ternary] key, you will summon a lightning bolt at the block or entity you are looking at, doing damage and setting nearby blocks on fire as well."
+    "description":"When pressing the [Quaternary] key, you will summon a lightning bolt at the block or entity you are looking at, doing damage and setting nearby blocks on fire as well."
 
     }

src/main/resources/data/aspects/powers/anemo/tempus/tempus_secondary.json

@@ -51,8 +51,8 @@
         "bar_index":3
 
     },
-    "key": "key.origins.quaternary_active",
+    "key": "key.origins.quinary_active",
         "cooldown": 700,
         "name":"Raging Gales",
-        "description":"As your secondary ability, you can push enemies away by a few blocks whilst healing yourself and dealing damage to others with your [Quaternary] key."
+        "description":"As your secondary ability, you can push enemies away by a few blocks whilst healing yourself and dealing damage to others with your [Quinary] key."
     }

src/main/resources/data/aspects/powers/cryo_primary.json

@@ -30,9 +30,9 @@
         "bar_index":5,
         "inverted":true
     },
-    "key":"key.origins.ternary_active",
+    "key":"key.origins.quaternary_active",
     "name":"Freeze Focus",
-    "description":"When pressing the [Ternary] key, you will fire a ray of ice in the direction you are facing that will deal eight points of freeze damage to the target and freeze over water on impact."
+    "description":"When pressing the [Quaternary] key, you will fire a ray of ice in the direction you are facing that will deal eight points of freeze damage to the target and freeze over water on impact."
 
     }
 

src/main/resources/data/aspects/powers/cryo_secondary.json

@@ -34,9 +34,9 @@
         "inverted":true
     },
         "key": {
-            "key": "key.origins.quaternary_active"
+            "key": "key.origins.quinary_active"
         },
         "name":"Icy Aura",
-        "description":"With your [Quaternary] key, you can deal six points of freeze damage to those around you within an 8 block radius."
+        "description":"With your [Quinary] key, you can deal six points of freeze damage to those around you within an 8 block radius."
 
 }

src/main/resources/data/aspects/powers/dendro_primary.json

@@ -17,7 +17,7 @@
         "bar_index":8,
         "inverted":true
     },
-    "key":"key.origins.ternary_active",
+    "key":"key.origins.quaternary_active",
     "name":"Poison Cloud",
-    "description":"As your primary ability, you can spawn a poison cloud around you with your [Ternary] key."
+    "description":"As your primary ability, you can spawn a poison cloud around you with your [Quaternary] key."
 }

src/main/resources/data/aspects/powers/dendro_secondary.json

@@ -21,8 +21,8 @@
         "bar_index":8
     },
     "key": {
-        "key": "key.origins.quaternary_active"
+        "key": "key.origins.quinary_active"
     },
     "name":"Friendly Assistance",
-    "description":"As your secondary ability, you can spawn in a temporary (20 second lifespan) Iron Golem to help you fight off enemies with your [Quaternary] key."
+    "description":"As your secondary ability, you can spawn in a temporary (20 second lifespan) Iron Golem to help you fight off enemies with your [Quinary] key."
 }

src/main/resources/data/aspects/powers/geo/dendro/dendro_primary.json

@@ -17,7 +17,7 @@
         "bar_index":8,
         "inverted":true
     },
-    "key":"key.origins.ternary_active",
+    "key":"key.origins.quaternary_active",
     "name":"Poison Cloud",
-    "description":"As your primary ability, you can spawn a poison cloud around you with your [Ternary] key."
+    "description":"As your primary ability, you can spawn a poison cloud around you with your [Quaternary] key."
 }

src/main/resources/data/aspects/powers/geo/dendro/dendro_secondary.json

@@ -21,8 +21,8 @@
         "bar_index":8
     },
     "key": {
-        "key": "key.origins.quaternary_active"
+        "key": "key.origins.quinary_active"
     },
     "name":"Friendly Assistance",
-    "description":"As your secondary ability, you can spawn in a temporary (20 second lifespan) Iron Golem to help you fight off enemies with your [Quaternary] key."
+    "description":"As your secondary ability, you can spawn in a temporary (20 second lifespan) Iron Golem to help you fight off enemies with your [Quinary] key."
 }

src/main/resources/data/aspects/powers/hydro/cryo/cryo_primary.json

@@ -30,9 +30,9 @@
         "bar_index":5,
         "inverted":true
     },
-    "key":"key.origins.ternary_active",
+    "key":"key.origins.quaternary_active",
     "name":"Freeze Focus",
-    "description":"When pressing the [Ternary] key, you will fire a ray of ice in the direction you are facing that will deal eight points of freeze damage to the target and freeze over water on impact."
+    "description":"When pressing the [Quaternary] key, you will fire a ray of ice in the direction you are facing that will deal eight points of freeze damage to the target and freeze over water on impact."
 
     }
 

src/main/resources/data/aspects/powers/hydro/cryo/cryo_secondary.json

@@ -34,9 +34,9 @@
         "inverted":true
     },
         "key": {
-            "key": "key.origins.quaternary_active"
+            "key": "key.origins.quinary_active"
         },
         "name":"Icy Aura",
-        "description":"With your [Quaternary] key, you can deal six points of freeze damage to those around you within an 8 block radius."
+        "description":"With your [Quinary] key, you can deal six points of freeze damage to those around you within an 8 block radius."
 
 }

src/main/resources/data/aspects/powers/ignis_primary.json

@@ -19,7 +19,7 @@
         "inverted":true
     }
 },
-"key":"key.origins.ternary_active",
+"key":"key.origins.quaternary_active",
     "name":"Ignition",
-    "description":"Using your primary active ability, you can light yourself on fire for a short duration, granting you an attack buff with your [Ternary] key."
+    "description":"Using your primary active ability, you can light yourself on fire for a short duration, granting you an attack buff with your [Quaternary] key."
 }

src/main/resources/data/aspects/powers/ignis_secondary.json

@@ -30,8 +30,8 @@
     "sprite_location":"origins:textures/gui/community/huang/resource_bar_02.png",
     "bar_index":15
     },
-    "key": "key.origins.quaternary_active",
+    "key": "key.origins.quinary_active",
     "cooldown": 900,
     "name":"Ring of Fire",
-    "description":"As your secondary ability, you can light entities around you on fire for a few seconds with your [Quaternary] key."
+    "description":"As your secondary ability, you can light entities around you on fire for a few seconds with your [Quinary] key."
 }

src/main/resources/data/aspects/powers/luna_primary.json

@@ -2,10 +2,10 @@
     "type": "origins:toggle",
     "active_by_default": false,
     "key": {
-      "key":"key.origins.ternary_active",
+      "key":"key.origins.quaternary_active",
       "continuous": false
     },
   "retain_state": false,
   "name":"Invisibility",
-  "description":"As your primary ability, you can toggle invisibility with your [Ternary] key."
+  "description":"As your primary ability, you can toggle invisibility with your [Quaternary] key."
 }

src/main/resources/data/aspects/powers/luna_secondary.json

@@ -18,8 +18,8 @@
         "bar_index":9
     },
     "key": {
-        "key": "key.origins.quaternary_active"
+        "key": "key.origins.quinary_active"
     },
     "name":"Dark Shroud",
-    "description":"With your secondary ability, you can disperse a shroud of wither with your [Quaternary] key."
+    "description":"With your secondary ability, you can disperse a shroud of wither with your [Quinary] key."
 }

src/main/resources/data/aspects/powers/magmus_primary.json

@@ -17,10 +17,10 @@
         }
     ]
     },
-    "key": "key.origins.ternary_active",
+    "key": "key.origins.quaternary_active",
     "cooldown": 800,
     "name":"Molten Fists",
-    "description":"As your primary ability, you can grant yourself an amplified strength effect with the [Ternary] key. / Strength 3 for 400 ticks",
+    "description":"As your primary ability, you can grant yourself an amplified strength effect with the [Quaternary] key. / Strength 3 for 400 ticks",
     "hud_render": {
         "inverted":true,
         "sprite_location":"origins:textures/gui/community/huang/resource_bar_02.png",

src/main/resources/data/aspects/powers/magmus_secondary.json

@@ -17,10 +17,10 @@
         }
     ]
     },
-    "key": "key.origins.quaternary_active",
+    "key": "key.origins.quinary_active",
     "cooldown": 1400,
     "name":"Magmaskin",
-    "description":"With your secondary ability [Quaternary] key, you may grant yourself a highly amplified resistance effect. / Resistance 3 for 700 ticks",
+    "description":"With your secondary ability [Quinary] key, you may grant yourself a highly amplified resistance effect. / Resistance 3 for 700 ticks",
     "hud_render": {
         "inverted":true,
         "sprite_location":"origins:textures/gui/community/huang/resource_bar_01.png",

src/main/resources/data/aspects/powers/ordo/solus/solus_primary.json

@@ -23,7 +23,7 @@
         "bar_index":10,
         "inverted":true
     },
-    "key":"key.origins.ternary_active",
+    "key":"key.origins.quaternary_active",
     "name":"Solar Revealing",
-    "description":"All entities within a 40 block radius of you will be highlighted with your primary ability [Ternary] key. What an eyesore."
+    "description":"All entities within a 40 block radius of you will be highlighted with your primary ability [Quaternary] key. What an eyesore."
 }

src/main/resources/data/aspects/powers/ordo/solus/solus_secondary.json

@@ -52,8 +52,8 @@
         "bar_index":20
     },
     "key": {
-        "key": "key.origins.quaternary_active"
+        "key": "key.origins.quinary_active"
     },
     "name":"Icarus",
-    "description":"Send all surrounding enemies multiple blocks into the air, and then light them on fire with your [Quaternary] key. They shouldn't have strayed so close to the sun!"
+    "description":"Send all surrounding enemies multiple blocks into the air, and then light them on fire with your [Quinary] key. They shouldn't have strayed so close to the sun!"
 }

src/main/resources/data/aspects/powers/perditio/luna/luna_primary.json

@@ -2,10 +2,10 @@
     "type": "origins:toggle",
     "active_by_default": false,
     "key": {
-      "key":"key.origins.ternary_active",
+      "key":"key.origins.quaternary_active",
       "continuous": false
     },
   "retain_state": false,
   "name":"Invisibility",
-  "description":"As your primary ability, you can toggle invisibility with your [Ternary] key."
+  "description":"As your primary ability, you can toggle invisibility with your [Quaternary] key."
 }

src/main/resources/data/aspects/powers/perditio/luna/luna_secondary.json

@@ -18,8 +18,8 @@
         "bar_index":9
     },
     "key": {
-        "key": "key.origins.quaternary_active"
+        "key": "key.origins.quinary_active"
     },
     "name":"Dark Shroud",
-    "description":"With your secondary ability, you can disperse a shroud of wither with your [Quaternary] key."
+    "description":"With your secondary ability, you can disperse a shroud of wither with your [quinary] key."
 }

src/main/resources/data/aspects/powers/pyro/ignis/ignis_primary.json

@@ -19,7 +19,7 @@
         "inverted":true
     }
 },
-"key":"key.origins.ternary_active",
+"key":"key.origins.quaternary_active",
     "name":"Ignition",
-    "description":"Using your primary active ability, you can light yourself on fire for a short duration, granting you an attack buff with your [Ternary] key."
+    "description":"Using your primary active ability, you can light yourself on fire for a short duration, granting you an attack buff with your [Quaternary] key."
 }

src/main/resources/data/aspects/powers/pyro/ignis/ignis_secondary.json

@@ -30,8 +30,8 @@
     "sprite_location":"origins:textures/gui/community/huang/resource_bar_02.png",
     "bar_index":15
     },
-    "key": "key.origins.quaternary_active",
+    "key": "key.origins.quinary_active",
     "cooldown": 900,
     "name":"Ring of Fire",
-    "description":"As your secondary ability, you can light entities around you on fire for a few seconds with your [Quaternary] key."
+    "description":"As your secondary ability, you can light entities around you on fire for a few seconds with your [Quinary] key."
 }

src/main/resources/data/aspects/powers/pyro/magmus/magmus_primary.json

@@ -17,10 +17,10 @@
         }
     ]
     },
-    "key": "key.origins.ternary_active",
+    "key": "key.origins.quaternary_active",
     "cooldown": 800,
     "name":"Molten Fists",
-    "description":"As your primary ability, you can grant yourself an amplified strength effect with the [Ternary] key. / Strength 3 for 400 ticks",
+    "description":"As your primary ability, you can grant yourself an amplified strength effect with the [Quaternary] key. / Strength 3 for 400 ticks",
     "hud_render": {
         "inverted":true,
         "sprite_location":"origins:textures/gui/community/huang/resource_bar_02.png",

src/main/resources/data/aspects/powers/pyro/magmus/magmus_secondary.json

@@ -17,10 +17,10 @@
         }
     ]
     },
-    "key": "key.origins.quaternary_active",
+    "key": "key.origins.quinary_active",
     "cooldown": 1400,
     "name":"Magmaskin",
-    "description":"With your secondary ability [Quaternary] key, you may grant yourself a highly amplified resistance effect. / Resistance 3 for 700 ticks",
+    "description":"With your secondary ability [Quinary] key, you may grant yourself a highly amplified resistance effect. / Resistance 3 for 700 ticks",
     "hud_render": {
         "inverted":true,
         "sprite_location":"origins:textures/gui/community/huang/resource_bar_01.png",

src/main/resources/data/aspects/powers/solus_primary.json

@@ -23,7 +23,7 @@
         "bar_index":10,
         "inverted":true
     },
-    "key":"key.origins.ternary_active",
+    "key":"key.origins.quaternary_active",
     "name":"Solar Revealing",
-    "description":"All entities within a 40 block radius of you will be highlighted with your primary ability [Ternary] key. What an eyesore."
+    "description":"All entities within a 40 block radius of you will be highlighted with your primary ability [Quaternary] key. What an eyesore."
 }

src/main/resources/data/aspects/powers/solus_secondary.json

@@ -52,8 +52,8 @@
         "bar_index":20
     },
     "key": {
-        "key": "key.origins.quaternary_active"
+        "key": "key.origins.quinary_active"
     },
     "name":"Icarus",
-    "description":"Send all surrounding enemies multiple blocks into the air, and then light them on fire with your [Quaternary] key. They shouldn't have strayed so close to the sun!"
+    "description":"Send all surrounding enemies multiple blocks into the air, and then light them on fire with your [Quinary] key. They shouldn't have strayed so close to the sun!"
 }

src/main/resources/data/aspects/powers/tempus_primary.json

@@ -28,8 +28,8 @@
         "bar_index":2,
         "inverted":true
     },
-    "key":"key.origins.ternary_active",
+    "key":"key.origins.quaternary_active",
     "name":"Lightning Bolt",
-    "description":"When pressing the [Ternary] key, you will summon a lightning bolt at the block or entity you are looking at, doing damage and setting nearby blocks on fire as well."
+    "description":"When pressing the [Quaternary] key, you will summon a lightning bolt at the block or entity you are looking at, doing damage and setting nearby blocks on fire as well."
 
     }

src/main/resources/data/aspects/powers/tempus_secondary.json

@@ -51,8 +51,8 @@
         "bar_index":3
 
     },
-    "key": "key.origins.quaternary_active",
+    "key": "key.origins.quinary_active",
         "cooldown": 400,
         "name":"Raging Gales",
-        "description":"As your secondary ability, you can push enemies away by a few blocks whilst healing yourself and dealing damage to others with your [Quaternary] key."
+        "description":"As your secondary ability, you can push enemies away by a few blocks whilst healing yourself and dealing damage to others with your [Quinary] key."
     }

src/main/resources/fabric.mod.json

@@ -3,15 +3,16 @@
   "id": "aspects",
   "version": "${version}",
 
-  "name": "Aspects",
+  "name": "Aspects - Celestia Edition",
-  "description": "An element-based Origins addon for the Fabric modloader.",
+  "description": "An element-based Origins addon altered for the Celestia SMP modpack.",
   "authors": [
-    "Fishplex"
+    "Fishplex (original creator)",
+    "Gæmer"
   ],
   "contact": {
-    "homepage": "https://github.com/Fishplex/Aspects",
+    "homepage": "https://github.com/BigSmithy/Aspects-Celestia-Compat",
-    "sources": "https://github.com/Fishplex/Aspects",
+    "sources": "https://github.com/BigSmithy/Aspects-Celestia-Compat",
-    "issues": "https://github.com/Fishplex/Aspects/issues"
+    "issues": "https://github.com/BigSmithy/Aspects-Celestia-Compat/issues"
   },
 
   "license": "CC0-1.0",
@@ -34,6 +35,10 @@
     "java": ">=17",
     "extrakeybinds":"*",
     "origins": ">=1.10.0"
+  },
+
+  "suggests": {
+    "terraoriginum": "*"
   }