Clean up + balancing

.gitignore

@@ -7,5 +7,3 @@
 /saves
 Aspects.code-workspace
 .DS_Store
-/libs
-/remappedSrc

README.md

@@ -3,16 +3,10 @@
 ## Introduction
 
 Aspects is an element-based Origins addon, meaning it expands the functions and features of the Origins mod created by Apace100.
-Thank you to [AbyssDweller](https://github.com/AbyssDweller) and Perseus#0745 on Discord for help with fixing issues. :)
 
 ## 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)
 
-## Further Support
-[https://discord.gg/p533EcFTSx](https://discord.gg/p533EcFTSx)
-
-
-

build.gradle

@@ -53,6 +53,10 @@ dependencies {
 
 	// Fabric API. This is technically optional, but you probably want it anyway.
 	modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
+	modApi("me.shedaniel.cloth:cloth-config-fabric:8.2.88") {
+		exclude(group: "net.fabricmc.fabric-api")
+	}
+
 }
 
 processResources {
@@ -64,7 +68,6 @@ processResources {
 }
 
 tasks.withType(JavaCompile).configureEach {
-	// Minecraft 1.18 (1.18-pre2) upwards uses Java 17.
 	it.options.release = 17
 }
 

gradle.properties

@@ -11,7 +11,7 @@ loader_version=0.14.9
 fabric_version=0.60.0+1.19.2
 
 # Mod Properties
-	mod_version = 1.0.7-1.19.x
+	mod_version = 1.0.8
 	maven_group = com.aspects
 	archives_base_name = aspects
 

remappedSrc/net/fabricmc/fishplex/Aspects.java

@@ -0,0 +1,35 @@
+package net.fabricmc.fishplex;
+
+import net.fabricmc.api.ModInitializer;
+import net.fabricmc.fabric.api.item.v1.FabricItemSettings;
+import net.minecraft.item.Item;
+import net.minecraft.util.Identifier;
+import net.minecraft.util.registry.Registry;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+public class Aspects implements ModInitializer {
+	// This logger is used to write text to the console and the log file.
+	// It is considered best practice to use your mod id as the logger's name.
+	// That way, it's clear which mod wrote info, warnings, and errors.
+	public static final Item ANEMO_FEATHER = new Item(new FabricItemSettings());
+	public static final Item PYRO_FIRE = new Item(new FabricItemSettings());
+	public static final Item HYDRO_KELP = new Item(new FabricItemSettings());
+	public static final Item GEO_DIAMOND = new Item(new FabricItemSettings());
+	public static final Item ORDO_STAR = new Item(new FabricItemSettings());
+	public static final Item PERDITIO_BONE = new Item(new FabricItemSettings());
+	public static final Logger LOGGER = LogManager.getLogger("aspects");
+
+		@Override
+		public void onInitialize() {
+			Registry.register(Registry.ITEM, new Identifier("aspects", "anemo_feather"), ANEMO_FEATHER);
+			Registry.register(Registry.ITEM, new Identifier("aspects", "pyro_fire"), PYRO_FIRE);
+			Registry.register(Registry.ITEM, new Identifier("aspects", "hydro_kelp"), HYDRO_KELP);
+			Registry.register(Registry.ITEM, new Identifier("aspects", "geo_diamond"), GEO_DIAMOND);
+			Registry.register(Registry.ITEM, new Identifier("aspects", "ordo_star"), ORDO_STAR);
+			Registry.register(Registry.ITEM, new Identifier("aspects", "perditio_bone"), PERDITIO_BONE);
+			LOGGER.info("Hello from Aspects :D");
+
+	}
+}

remappedSrc/net/fabricmc/fishplex/mixin/AspectsMixin.java

@@ -0,0 +1,16 @@
+package net.fabricmc.fishplex.mixin;
+
+import net.fabricmc.fishplex.Aspects;
+import net.minecraft.client.gui.screen.TitleScreen;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+@Mixin(TitleScreen.class)
+public class AspectsMixin {
+	@Inject(at = @At("HEAD"), method = "init()V")
+	private void init(CallbackInfo info) {
+		Aspects.LOGGER.info("Hello from Aspects! :D");
+	}
+}

src/main/java/net/fabricmc/fishplex/Aspects.java

@@ -29,7 +29,5 @@ public void onInitialize() {
 			Registry.register(Registry.ITEM, new Identifier("aspects", "geo_diamond"), GEO_DIAMOND);
 			Registry.register(Registry.ITEM, new Identifier("aspects", "ordo_star"), ORDO_STAR);
 			Registry.register(Registry.ITEM, new Identifier("aspects", "perditio_bone"), PERDITIO_BONE);
-			LOGGER.info("Hello from Aspects :D");
-
 	}
 }

src/main/resources/aspects.mixins.json

@@ -2,7 +2,7 @@
   "required": true,
   "minVersion": "0.8",
   "package": "net.fabricmc.fishplex.mixin",
-  "compatibilityLevel": "JAVA_17",
+  "compatibilityLevel": "JAVA_16",
   "mixins": [
   ],
   "client": [

src/main/resources/data/aspects/origin_layers/elements.json

@@ -1,12 +1,12 @@
 {
     "order": 0,
     "origins": [
-        "aspects:anemo",
-        "aspects:hydro",
-        "aspects:geo",
-        "aspects:pyro",
-        "aspects:ordo",
-        "aspects:perditio",
+        "aspects:anemo_layers/anemo",
+        "aspects:hydro_layers/hydro",
+        "aspects:geo_layers/geo",
+        "aspects:pyro_layers/pyro",
+        "aspects:ordo_layers/ordo",
+        "aspects:perditio_layers/perditio",
         "aspects:vacuos"
     ],
     "name": "Aspect",

src/main/resources/data/aspects/origin_layers/origins.json

@@ -4,68 +4,68 @@
         {
             "condition": {
                 "type": "origins:origin",
-                "origin": "aspects:pyro",
+                "origin": "aspects:pyro_layers/pyro",
                 "layer": "aspects:elements"
             },
             "origins": [
-                "aspects:pyro/magmus",
-                "aspects:pyro/ignis",
+                "aspects:pyro_layers/magmus",
+                "aspects:pyro_layers/ignis",
                 "aspects:imp"
             ]
         },
         {
             "condition": {
                 "type": "origins:origin",
-                "origin": "aspects:hydro",
+                "origin": "aspects:hydro_layers/hydro",
                 "layer": "aspects:elements"
             },
             "origins": [
-                "aspects:hydro/cryo",
+                "aspects:hydro_layers/cryo",
                 "aspects:imp"
             ]
         },
         {
             "condition": {
                 "type":"origins:origin",
-                "origin":"aspects:anemo",
+                "origin":"aspects:anemo_layers/anemo",
                 "layer":"aspects:elements"
             },
             "origins": [
-                "aspects:anemo/tempus",
-                "aspects:anemo/avis",
+                "aspects:anemo_layers/tempus",
+                "aspects:anemo_layers/avis",
                 "aspects:imp"
             ]
             },
             {
                 "condition": {
                     "type":"origins:origin",
-                    "origin":"aspects:geo",
+                    "origin":"aspects:geo_layers/geo",
                     "layer":"aspects:elements"
                 },
                 "origins": [
-                    "aspects:geo/dendro",
+                    "aspects:geo_layers/dendro",
                     "aspects:imp"
                 ]
                 },
                 {
                     "condition": {
                         "type":"origins:origin",
-                        "origin":"aspects:perditio",
+                        "origin":"aspects:perditio_layers/perditio",
                         "layer":"aspects:elements"
                     },
                     "origins": [
-                        "aspects:perditio/luna",
+                        "aspects:perditio_layers/luna",
                         "aspects:imp"
                     ]
                     },
                     {
                         "condition": {
                             "type":"origins:origin",
-                            "origin":"aspects:ordo",
+                            "origin":"aspects:ordo_layers/ordo",
                             "layer":"aspects:elements"
                         },
                         "origins": [
-                            "aspects:ordo/solus",
+                            "aspects:ordo_layers/solus",
                             "aspects:imp"
                         ]
                         }

src/main/resources/data/aspects/origins/anemo_layers/anemo.json

@@ -0,0 +1,16 @@
+{
+    "powers": [
+        "aspects:anemo/fleet_footed",
+        "aspects:anemo/negate_fall_damage",
+        "aspects:anemo/chained",
+        "aspects:anemo/windborn",
+        "aspects:anemo/wise",
+        "aspects:start",
+        "aspects:anemo/anemo_team"
+    ],
+    "icon": {
+        "item": "aspects:anemo_feather"
+    },
+    "name": "§aAnemo",
+    "description": "A lone wind whipped explorer sits perched on a cliff side, a thick book fit for an academic's mind in hand. There they sit, absently watching as the pages detailing the grand discoveries of generations comprised of scholars and adventurers flip from the movement of the wind."
+}

src/main/resources/data/aspects/origins/anemo_layers/tempus.json

@@ -0,0 +1,14 @@
+{
+    "powers": [
+        "aspects:anemo/tempus/fleet",
+        "aspects:anemo/tempus/storm_strength",
+        "aspects:anemo/tempus/lightning_immunity",
+        "aspects:anemo/tempus/tempus_primary",
+        "aspects:anemo/tempus/tempus_secondary"
+    ],
+    "icon": {
+        "item": "minecraft:amethyst_shard"
+    },
+    "name": "§5Tempus",
+    "description": "Dark minds crackling and churning, Tempus types have always been misunderstood by the rest. Crowds gather and watch in horror as lightning explodes across the sky, thunder booming from above. The Tempus user stands unafraid at the top of the hill, watching as a storm approaches the horizon."
+}

src/main/resources/data/aspects/origins/geo_layers/dendro.json

@@ -0,0 +1,16 @@
+{
+    "powers": [
+        "aspects:geo/dendro/flower_regen",
+        "aspects:geo/dendro/poison_resistance",
+        "aspects:geo/dendro/grass_speed",
+        "aspects:geo/dendro/dendro_primary",
+        "aspects:geo/dendro/dendro_secondary",
+        "aspects:geo/dendro/golem_expire",
+        "aspects:geo/dendro/golem_resource"
+    ],
+    "icon": {
+        "item": "minecraft:wheat_seeds"
+    },
+    "name": "§2Dendro",
+    "description": "Lovers of art, nature and all things beautiful, the Dendro people inhabit local forests. Every now and then, a brave adventurer will venture into the woods to witness their song."
+}

src/main/resources/data/aspects/origins/geo_layers/geo.json

@@ -0,0 +1,14 @@
+{
+    "powers": [
+        "aspects:geo/resistance",
+        "aspects:geo/explosion_damage",
+        "aspects:geo/earthborn",
+        "aspects:start",
+        "aspects:geo/geo_team"
+    ],
+    "icon": {
+        "item": "aspects:geo_diamond"
+    },
+    "name": "§eGeo",
+    "description": "Tales are told of the rock-people who used to dwell deep below the land, feeding off ore and slate where they could. Creatures of massive size, the people of Geo are more than a legend."
+}

src/main/resources/data/aspects/origins/hydro_layers/altum.json

@@ -0,0 +1,10 @@
+{
+    "powers": [
+
+    ],
+    "icon": {
+        "item": "minecraft:snowball"
+    },
+    "name": "§bAltum",
+    "description": "Far from any source of illumination, darkly lit faces reflect off the spectral ocean's view. The deep sea shines in the eyes of the Altum."
+}

src/main/resources/data/aspects/origins/hydro_layers/cryo.json

@@ -0,0 +1,13 @@
+{
+    "powers": [
+        "aspects:hydro/cryo/cold_biomes",
+        "aspects:hydro/cryo/frost_walker",
+        "aspects:hydro/cryo/cryo_primary",
+        "aspects:hydro/cryo/cryo_secondary"
+    ],
+    "icon": {
+        "item": "minecraft:snowball"
+    },
+    "name": "§bCryo",
+    "description": "A lone traveller drags their heels across the frozen lake, their sole companion the red-collared friend trailing behind. Ever-persistent and unbothered by the shards of glass ripping at their skin, the Cryo users are said to be the most resilient of their Aspect."
+}

src/main/resources/data/aspects/origins/hydro_layers/hydro.json

@@ -0,0 +1,15 @@
+{
+    "powers": [
+        "aspects:hydro/water_breathing",
+        "aspects:hydro/constitution",
+        "aspects:hydro/fire_damage",
+        "aspects:hydro/waterborn",
+        "aspects:hydro/hydro_team",
+        "aspects:start"
+    ],
+    "icon": {
+        "item": "aspects:hydro_kelp"
+    },
+    "name": "§9Hydro",
+    "description": "The siren song of the ever-changing Hydro in the depths is echoed throughout deep and shallow waters, whispered to the unlucky sailor lost at sea."
+}

src/main/resources/data/aspects/origins/ordo_layers/ordo.json

@@ -0,0 +1,17 @@
+{
+    "powers": [
+        "aspects:ordo/holy_light",
+        "aspects:ordo/positive_influence",
+        "aspects:ordo/darkness_damage",
+        "aspects:ordo/night_aversion",
+        "aspects:ordo/holy",
+        "aspects:ordo/lightborn",
+        "aspects:start",
+        "aspects:ordo/ordo_team"
+    ],
+    "icon": {
+        "item": "aspects:ordo_star"
+    },
+    "name": "Ordo",
+    "description": "Tales of old speak of mages and paladins with healing properties and the power of light in their palms, besting their foes and aiding allies in need."
+}

src/main/resources/data/aspects/origins/ordo_layers/solus.json

@@ -0,0 +1,15 @@
+{
+    "powers": [
+        "aspects:ordo/solus/fire_resistance",
+        "aspects:ordo/solus/sunbaked",
+        "aspects:ordo/solus/sun_bar",
+        "aspects:ordo/solus/decay",
+        "aspects:ordo/solus/solus_primary",
+        "aspects:ordo/solus/solus_secondary"
+    ],
+    "icon": {
+        "item": "minecraft:sunflower"
+    },
+    "name": "§6Solus",
+    "description": "Sons, daughters and children of the bright solar divinity themselves, Solus users hold the power of the universe's light within them."
+}

src/main/resources/data/aspects/origins/perditio_layers/luna.json

@@ -0,0 +1,16 @@
+{
+    "powers": [
+        "aspects:perditio/luna/full_moon",
+        "aspects:perditio/luna/nightwalker",
+        "aspects:perditio/luna/wolf_affinity",
+        "aspects:perditio/luna/invisibility",
+        "aspects:perditio/luna/wither_immunity",
+        "aspects:perditio/luna/luna_primary",
+        "aspects:perditio/luna/luna_secondary"
+    ],
+    "icon": {
+        "item": "minecraft:lily_of_the_valley"
+    },
+    "name": "§7Luna",
+    "description": "The Luna users are beings of such beauty that it is perceived by the magicless as the result of the blood of the otherworldly."
+}