Revert "Version 1.16.0"

This reverts commit 8aac6f4.

CHANGELOG.md

@@ -2,53 +2,11 @@
 
 ## [1.20](https://minecraft.fandom.com/wiki/Java_Edition_1.20.1)
 
-### [Version 1.16 [Minecraft 1.20.2]]
-
-#### [Version 1.16.0 [1.20.2 Update & Rebalance]](https://github.com/ChromexUnderscore/OriginsTweaks/releases/tag/1.16.0)
-
-This is a big one.
-
-+ Updated to Minecraft 1.20.2
-+ Updated to Origins >= 1.12.
-  + Since power and action types were used that have been added after Origins 1.12, this version unfortunately no longer supports older than Origins 1.12.0 or Minecraft 1.20.2.
-+ Changed dependencies to require any version of Fabric API and Pehkui, to avoid issues with future releases of origins and outdated / bugged pehkui releases.
-+ Fixed various formatting inconsistencies.
-+ Fixed various missing translation keys.
-+ Fixed some typos.
-+ Merged, moved and rearranged various powers and sub-powers to make origins descriptions less cluttered.
-+ Changed ``burn_in_daylight`` to require either or both a netherite helmet and any level of fire resistance on the helmet slot.
-+ Extended the time that ``burning_wrath`` sets the player on fire from ``10`` to ``60`` seconds.
-+ Added a missing toggle badge to Feline's ``cat_vision``.
-+ Switched the shulker inventory keybind from ``secondary_active`` to ``primary_active``.
-+ Tweaked ``zora_dash`` velocity numbers and added the power to ``swim_speed``.
-+ Fixed the missing cooldown bar for ``throw_ender_pearl`` and restricted it's usage while ``recall beacon`` is active.
-+ Added a badge to ``water_breathing`` hinting towards ways to counter this drawback.
-+ Removed power ``antigravity_power`` from shulk.
-+ Removed the weakness debuff from ``aurophobia``.
-+ Removed power ``cloud`` from merling.
-+ Removed power ``reflex`` from enderian.
-  + Added a projectile immunity to ``ender_body`` instead.
-+ Removed power ``evil_presence`` from avian.
-+ Decreased volume for feline's purring sound while asleep.
-+ Reduced divergence of ``firecharged_projectiles`` from ``2`` to ``1``.
-+ Changed ``heavens_grace`` projectile damage bonus to use ``multiply_base_multiplicative`` instead of ``multiply_total_multiplicative``.
-+ Changed ``master_of_webs`` cobweb crafting to use 2 string instead of 9, changed ``string_refill`` accordingly.
-+ Split up ``master_of_webs`` into two powers.
-  + ``spider_silk`` now contains the ``webshot`` and ``silk_resource`` (formerly ``string_resource``) sub-powers.
-  + ``webshot`` now grapples towards entities instead of trapping them.
-  + Reintroduced vanilla ``webbing`` sub-power from ``master_of_webs`` in connection to ``silk_resource``.
-+ Changed ``protective_shell`` to disable buildup for 3 seconds instead of a complicated break mechanic, and reduced shell damage taken on hit.
-+ Removed the previously added easter egg.
-+ Removed power ``seventh_sense`` from feline.
-+ Changed volume of ``spectral_wail`` to be more accurate with the range of the ability.
-+ Removed power ``thermal_lift`` from blazeborn.
-+ Removed power ``turtle_helmet`` from merling.
-
-### [Version 1.15 [Minecraft 1.20.0 / 1.20.1]]
+### [Version 1.15 [Minecraft 1.20]]
 
 #### [Version 1.15.4 [Removed Quilt Metadata & Player Suggestions]](https://github.com/ChromexUnderscore/OriginsTweaks/releases/tag/1.15.4)
 
-+ Removed ``quilt_mod.json`` because quilt natively supports fabric mods (and I'm too stupid to use quilt metadata).
++ Removed ``quilt_mod.json`` because quilt natively supports fabric mods (and I'm too stoopid to use quilt metadata).
   + closes #41.
 + Made changes to Merling's Dash ability.
   + Reduced base dash velocity from 2 to 1.5.

gradle.properties

@@ -1,12 +1,12 @@
 org.gradle.jvmargs=-Xmx1G
 
-mod_version = 1.16.0
+mod_version = 1.15.4
 maven_group = com.chromexunderscore.originstweaks
 archives_base_name = originstweaks
 
-minecraft_version=1.20.2
-yarn_mappings=1.20.2+build.4
-loader_version=0.15.7
+minecraft_version=1.20.1
+yarn_mappings=1.20.1+build.9
+loader_version=0.14.21
 
 #Fabric api
-fabric_version=0.91.6+1.20.2
+fabric_version=0.85.0+1.20.1

src/main/resources/data/origins/origins/arachnid.json

@@ -1,18 +1,21 @@
 {
     "icon": {
-        "item": "minecraft:cobweb"
+        "item": "minecraft:spider_eye"
     },
+    "name": "origin.origins.arachnid.name",
+    "description": "origin.origins.arachnid.description",
     "order": 1,
     "impact": 1,
     "loading_priority": 1,
-    "powers": [
-        "originstweaks:spider_silk",
-        "originstweaks:climbing",
+	"powers": [
         "originstweaks:master_of_webs",
-        "origins:master_of_webs_no_slowdown",
-        "origins:arthropod",
+        "origins:master_of_webs",
+        "originstweaks:climbing",
+        "originstweaks:arthropod_appearance",
+        "originstweaks:carnivore",
+        "originstweaks:carnivore_block",
         "origins:fragile",
-        "origins:carnivore",
+        "origins:arthropod",
         "originstweaks:arachnid_sounds"
     ]
 }

src/main/resources/data/origins/origins/avian.json

@@ -1,18 +1,21 @@
 {
-    "icon": {
-        "item": "minecraft:feather"
-    },
-    "order": 0,
-    "impact": 1,
-    "loading_priority": 1,
-    "powers": [
-        "originstweaks:heavens_grace",
-        "origins:slow_falling",
-        "origins:tailwind",
-        "origins:like_air",
-        "origins:vegetarian",
-        "origins:fresh_air",
-        "origins:lay_eggs",
-        "originstweaks:avian_sounds"
-    ]
+	"icon": {
+		"item": "minecraft:feather"
+	},
+	"name": "origin.origins.avian.name",
+    "description": "origin.origins.avian.description",
+	"order": 0,
+	"impact": 1,
+	"loading_priority": 1,
+	"powers": [
+		"originstweaks:evil_presence",
+		"originstweaks:heavens_grace",
+		"origins:slow_falling",
+		"origins:tailwind",
+		"origins:like_air",
+		"originstweaks:vegetarian",
+		"origins:fresh_air",
+		"origins:lay_eggs",
+		"originstweaks:avian_sounds"
+	]
 }

src/main/resources/data/origins/origins/blazeborn.json

@@ -1,21 +1,24 @@
 {
-    "icon": {
-        "item": "minecraft:blaze_powder"
-    },
-    "order": 1,
-    "impact": 3,
-    "loading_priority": 1,
-    "powers": [
-        "origins:burning_wrath",
-        "originstweaks:firecharged_projectile",
-        "origins:fire_immunity",
-        "origins:nether_spawn",
-        "origins:hotblooded",
-        "origins:water_vulnerability",
-        "originstweaks:water_cauldron",
-        "origins:damage_from_snowballs",
-        "origins:damage_from_potions",
-        "origins:flame_particles",
-        "originstweaks:blazeborn_sounds"
-    ]
+	"icon": {
+		"item": "minecraft:blaze_powder"
+	},
+	"name": "origin.origins.blazeborn.name",
+    "description": "origin.origins.blazeborn.description",
+	"order": 1,
+	"impact": 3,
+	"loading_priority": 1,
+	"powers": [
+		"origins:burning_wrath",
+		"originstweaks:thermal_lift",
+		"originstweaks:firecharged_projectile",
+		"origins:fire_immunity",
+		"origins:nether_spawn",
+		"origins:hotblooded",
+		"origins:water_vulnerability",
+		"originstweaks:water_cauldron",
+		"origins:damage_from_snowballs",
+		"origins:damage_from_potions",
+		"origins:flame_particles",
+		"originstweaks:blazeborn_sounds"
+	]
 }

src/main/resources/data/origins/origins/elytrian.json

@@ -1,15 +1,17 @@
 {
-    "icon": {
-        "item": "minecraft:elytra"
-    },
-    "order": 3,
-    "impact": 1,
-    "loading_priority": 1,
-    "powers": [
-        "originstweaks:gift_of_the_skies",
-        "origins:aerial_combatant",
-        "origins:claustrophobia",
-        "origins:more_kinetic_damage",
-        "originstweaks:elytrian_sounds"
-    ]
+	"icon": {
+		"item": "minecraft:elytra"
+	},
+	"name": "origin.origins.elytrian.name",
+    "description": "origin.origins.elytrian.description",
+	"order": 3,
+	"impact": 1,
+	"loading_priority": 1,
+	"powers": [
+		"originstweaks:gift_of_the_skies",
+		"origins:aerial_combatant",
+		"origins:claustrophobia",
+		"origins:more_kinetic_damage",
+		"originstweaks:elytrian_sounds"
+	]
 }

src/main/resources/data/origins/origins/enderian.json

@@ -2,13 +2,16 @@
 	"icon": {
 		"item": "minecraft:ender_pearl"
 	},
+	"name": "origin.origins.enderian.name",
+    "description": "origin.origins.enderian.description",
 	"order": 1,
 	"impact": 2,
 	"loading_priority": 1,
 	"powers": [
 		"origins:throw_ender_pearl",
 		"originstweaks:recall",
 		"originstweaks:ender_body",
+		"originstweaks:reflex",
 		"origins:water_vulnerability",
 		"origins:pumpkin_hate",
 		"origins:ender_particles",

src/main/resources/data/origins/origins/feline.json

@@ -1,19 +1,23 @@
 {
-    "icon": {
-        "item": "minecraft:salmon"
-    },
-    "order": 0,
-    "impact": 2,
-    "loading_priority": 1,
-    "powers": [
-        "originstweaks:natural_hunter",
-        "origins:fall_immunity",
-        "origins:sprint_jump",
-        "origins:velvet_paws",
-        "origins:nine_lives",
-        "origins:weak_arms",
-        "origins:scare_creepers",
-        "origins:cat_vision",
-        "originstweaks:feline_sounds"
-    ]
+	"icon": {
+		"item": "minecraft:salmon"
+	},
+	"name": "origin.origins.feline.name",
+    "description": "origin.origins.feline.description",
+	"order": 0,
+	"impact": 2,
+	"loading_priority": 1,
+	"powers": [
+		"originstweaks:sharp_claws",
+		"originstweaks:seventh_sense",
+		"origins:fall_immunity",
+		"origins:sprint_jump",
+		"origins:velvet_paws",
+		"origins:nine_lives",
+		"origins:weak_arms",
+		"origins:scare_creepers",
+		"origins:cat_vision",
+		"originstweaks:feline_sounds",
+		"originstweaks:natural_hunter"
+	]
 }

src/main/resources/data/origins/origins/merling.json

@@ -1,22 +1,27 @@
 {
-    "icon": {
-        "item": "minecraft:trident"
-    },
-    "order": 0,
-    "impact": 3,
-    "loading_priority": 1,
-    "powers": [
-        "origins:water_breathing",
-        "originstweaks:aquadynamic",
-        "origins:swim_speed",
-        "origins:water_vision",
-        "origins:aqua_affinity",
-        "origins:like_water",
-        "origins:aquatic",
-        "origins:conduit_power_on_land",
-        "origins:air_from_potions",
-        "originstweaks:water_cauldron",
-        "originstweaks:turtle_helmet",
-        "originstweaks:merling_sounds"
-    ]
+	"icon": {
+		"item": "minecraft:trident"
+	},
+	"name": "origin.origins.merling.name",
+    "description": "origin.origins.merling.description",
+	"order": 0,
+	"impact": 3,
+	"loading_priority": 1,
+	"powers": [
+		"origins:water_breathing",
+		"originstweaks:cloud",
+		"origins:water_vision",
+		"origins:aqua_affinity",
+		"origins:swim_speed",
+		"origins:like_water",
+		"origins:aquatic",
+		"origins:conduit_power_on_land",
+		"origins:air_from_potions",
+		"originstweaks:merling_trident",
+		"originstweaks:zora_dash",
+		"originstweaks:aquadynamic",
+		"originstweaks:water_cauldron",
+		"originstweaks:turtle_helmet",
+		"originstweaks:merling_sounds"
+	]
 }

src/main/resources/data/origins/origins/phantom.json

@@ -1,20 +1,22 @@
 {
-    "icon": {
-        "item": "minecraft:phantom_membrane"
-    },
-    "order": 2,
-    "impact": 3,
-    "loading_priority": 1,
-    "powers": [
-        "origins:phantomize",
-        "origins:phasing",
-        "originstweaks:spectral_wail",
-        "originstweaks:aurophobia",
-        "origins:burn_in_daylight",
-        "origins:hunger_over_time",
-        "origins:translucent",
-        "origins:phantomize_overlay",
-        "origins:invisibility",
-        "originstweaks:phantom_sounds"
-    ]
+	"icon": {
+		"item": "minecraft:phantom_membrane"
+	},
+	"name": "origin.origins.phantom.name",
+    "description": "origin.origins.phantom.description",
+	"order": 2,
+	"impact": 3,
+	"loading_priority": 1,
+	"powers": [
+		"origins:phantomize",
+		"origins:translucent",
+		"origins:phasing",
+		"origins:invisibility",
+		"origins:burn_in_daylight",
+		"origins:hunger_over_time",
+		"origins:phantomize_overlay",
+		"originstweaks:aurophobia",
+		"originstweaks:spectral_wail",
+		"originstweaks:phantom_sounds"
+	]
 }