bump version

Reviewed-on: #1

CHANGELOG

@@ -25,10 +25,20 @@
 - cotton and cotton armour are now obtainable
 - cotton seeds can be obtained from breaking grass
 
-## 1.20.1-1.0.10 (maybe 1.20.1-1.1.0)
+## 1.20.1-1.0.10 
 - fixed two kitsune powers being on the same key
 - (internal) corrected class capitalisation
 - (internal)added terraoriginum:wings power
 - increased protection effectiveness from 1.1 to 1.2 on latian origins for sun protection
 - added light protection for spirit based origins
-- added a description for sun protection enchant
+- added a description for sun protection enchant
+
+## 1.20.1-1.0.11
+- forgot to include icarus as new dependency
+
+## 1.20.1-1.0.12
+- fixed poorly written conditions for ectoplasm drain (still poorly written but works correctly now)
+
+## 1.20.1-1.0.13
+- the munch no longer has the wings test power
+- im going to go insane if i have to make another fix today

README.md

@@ -4,25 +4,25 @@
   <a title="Fabric API" href="https://minecraft.curseforge.com/projects/fabric-api" target="_blank" rel="noopener noreferrer"><img style="display: block; margin-left: auto; margin-right: auto;" src="https://i.imgur.com/Ol1Tcf8.png" alt="" width="150" height="50" /></a>
 </p>
 <p align="center">
-  <a href="https://github.com/RyanTLG/GamerOrigins"><img src="https://github.com/RyanTLG/GamerItems/blob/1-18-1/unstable/badges/epic-gaming.svg" alt="epicgaming"/></a>
+  <a href="https://git.bigsmithy.org/Smithy/terra-originum"><img src="https://github.com/BigGaemer/GamerItems/blob/1-18-1/unstable/badges/epic-gaming.svg" alt="epicgaming"/></a>
-  <a href="https://github.com/RyanTLG/GamerOrigins"><img src="https://github.com/RyanTLG/GamerItems/blob/1-18-1/unstable/badges/i-have-severe-depression.svg" alt="epicgaming"/></a>
+  <a href="https://git.bigsmithy.org/Smithy/terra-originum"><img src="https://github.com/BigGaemer/GamerItems/blob/1-18-1/unstable/badges/i-have-severe-depression.svg" alt="epicgaming"/></a>
 </p>
 <p align="center">
-  <a href="https://github.com/RyanTLG/GamerOrigins"><img src="https://github.com/RyanTLG/GamerItems/blob/1-18-1/unstable/badges/i-want-die.svg" alt="epicgaming"/></a>
+  <a href="https://git.bigsmithy.org/Smithy/terra-originum"><img src="https://github.com/BigGaemer/GamerItems/blob/1-18-1/unstable/badges/i-want-die.svg" alt="epicgaming"/></a>
 </p>
 <p align="center">
   <a href="https://fabricmc.net/"><img src="https://img.shields.io/badge/modloader-Fabric-1976d2?style=flat-square&logo=data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAACXBIWXMAAAsTAAALEwEAmpwYAAAFHGlUWHRYTUw6Y29tLmFkb2JlLnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQiPz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENvcmUgNS42LWMxNDIgNzkuMTYwOTI0LCAyMDE3LzA3LzEzLTAxOjA2OjM5ICAgICAgICAiPiA8cmRmOlJERiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtbG5zOmRjPSJodHRwOi8vcHVybC5vcmcvZGMvZWxlbWVudHMvMS4xLyIgeG1sbnM6cGhvdG9zaG9wPSJodHRwOi8vbnMuYWRvYmUuY29tL3Bob3Rvc2hvcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RFdnQ9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZUV2ZW50IyIgeG1wOkNyZWF0b3JUb29sPSJBZG9iZSBQaG90b3Nob3AgQ0MgMjAxOCAoV2luZG93cykiIHhtcDpDcmVhdGVEYXRlPSIyMDE4LTEyLTE2VDE2OjU0OjE3LTA4OjAwIiB4bXA6TW9kaWZ5RGF0ZT0iMjAxOS0wNy0yOFQyMToxNzo0OC0wNzowMCIgeG1wOk1ldGFkYXRhRGF0ZT0iMjAxOS0wNy0yOFQyMToxNzo0OC0wNzowMCIgZGM6Zm9ybWF0PSJpbWFnZS9wbmciIHBob3Rvc2hvcDpDb2xvck1vZGU9IjMiIHBob3Rvc2hvcDpJQ0NQcm9maWxlPSJzUkdCIElFQzYxOTY2LTIuMSIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDowZWRiMWMyYy1mZjhjLWU0NDEtOTMxZi00OTVkNGYxNGM3NjAiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6MGVkYjFjMmMtZmY4Yy1lNDQxLTkzMWYtNDk1ZDRmMTRjNzYwIiB4bXBNTTpPcmlnaW5hbERvY3VtZW50SUQ9InhtcC5kaWQ6MGVkYjFjMmMtZmY4Yy1lNDQxLTkzMWYtNDk1ZDRmMTRjNzYwIj4gPHhtcE1NOkhpc3Rvcnk+IDxyZGY6U2VxPiA8cmRmOmxpIHN0RXZ0OmFjdGlvbj0iY3JlYXRlZCIgc3RFdnQ6aW5zdGFuY2VJRD0ieG1wLmlpZDowZWRiMWMyYy1mZjhjLWU0NDEtOTMxZi00OTVkNGYxNGM3NjAiIHN0RXZ0OndoZW49IjIwMTgtMTItMTZUMTY6NTQ6MTctMDg6MDAiIHN0RXZ0OnNvZnR3YXJlQWdlbnQ9IkFkb2JlIFBob3Rvc2hvcCBDQyAyMDE4IChXaW5kb3dzKSIvPiA8L3JkZjpTZXE+IDwveG1wTU06SGlzdG9yeT4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/eHBhY2tldCBlbmQ9InIiPz4/HiGMAAAAtUlEQVRYw+XXrQqAMBQF4D2P2eBL+QIG8RnEJFaNBjEum+0+zMQLtwwv+wV3ZzhhMDgfJ0wUSinxZUQWgKos1JP/AbD4OneIDyQPwCFniA+EJ4CaXm4TxAXCC0BNHgLhAdAnx9hC8PwGSRtAFVMQjF7cNTWED8B1cgwW20yfJgAvrssAsZ1cB3g/xckAxr6FmCDU5N6f488BrpCQ4rQBJkiMYh4ACmLzwOQF0CExinkCsvw7vgGikl+OotaKRwAAAABJRU5ErkJggg==" alt="epicgaming"/></a>
 </p>
 
-GamerOrigins adds a few origins to the Origins mod
+Terra Originum is an origins mod made for Celestia SMP
 
 ### Modpack usage
 
-You want to use it in a modpack? Sure! Just remember to credit me or the ARCMods team, this is a threat.
+You want to use it in a modpack? Sure! Just remember to credit the Smithy team, this is a threat.
 
 ### Issues
 
-If you find an issue or bug in the mod or just have a general suggestion you can write it [here](https://github.com/RyanTLG/GamerOrigins/issues)
+If you find an issue or bug in the mod or just have a general suggestion you can write it [here](https://git.bigsmithy.org/Smithy/terra-originum/issues)
 
 
 ### About requests

gradle.properties

@@ -11,7 +11,7 @@ parchment_minecraft=1.20.1
 parchment_mappings=2023.09.03
 
 # Mod Properties
-mod_version=1.20.1-1.0.9
+mod_version=1.20.1-1.0.15
 maven_group=com.smithy
 archives_base_name=TerraOriginum
 

src/main/resources/assets/terraoriginum/lang/en_us.json

@@ -16,9 +16,9 @@
     "death.attack.boiling": "%1$s boiled up",
     "death.attack.boiling.player": "%1$s boiled up whilst trying to fight off %2$s",
     "enchantment.terraoriginum.sun_protection": "Sun Protection",
-    "enchantment.terraoriginum.sun_protection.description": "Protects Latians from the sun temporarily",
+    "enchantment.terraoriginum.sun_protection.desc": "Protects Latians from the sun temporarily",
     "enchantment.terraoriginum.light_protection": "Light Protection",
-    "enchantment.terraoriginum.light_protection.description": "Reduces Ectoplasm loss for spirits",
+    "enchantment.terraoriginum.light_protection.desc": "Reduces Ectoplasm loss for spirits",
     "item.terraoriginum.ghostly_helmet": "Ghostly Hood",
     "item.terraoriginum.ghostly_chestplate": "Ghostly Robe",
     "item.terraoriginum.ghostly_leggings": "Ghostly Pants",

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

@@ -17,6 +17,7 @@
 		"terraoriginum:muckunde",
 		"terraoriginum:blight",
 		"terraoriginum:munch",
+		"terraoriginum:angel",
 		"terraoriginum:sylt",
 		{
 			"condition": {

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

@@ -0,0 +1,8 @@
+{
+  "powers": [
+    "terraoriginum:angel-powers/divine_grace"
+  ],
+  "icon": "minecraft:rotten_flesh",
+  "order": 1011,
+  "impact": 3
+}

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

@@ -12,7 +12,7 @@
 		"terraoriginum:munch-powers/climbing",
 		"terraoriginum:munch-powers/mounting",
 		"terraoriginum:munch-powers/speedy_bastard",
-		"terraoriginum:wings"
+		"terraoriginum:florian-powers/passivemobs"
 	],
 	"icon": {
 		"item": "terraoriginum:tiny"

src/main/resources/data/terraoriginum/powers/angel-powers/divine_grace.json

@@ -0,0 +1,42 @@
+{
+  "type": "origins:multiple",
+  "divine_grace":
+  {
+    "type": "origins:resource",
+    "min": 0,
+    "max": 22,
+    "start_value": 11,
+    "hud_render": {
+      "should_render": true,
+      "bar_index": 4,
+      "sprite_location": "origins:textures/gui/resource_bar.png"
+    }
+  },
+  "instant_fall_from_grace":
+  {
+    "type": "origins:self_action_on_kill",
+    "target_condition": {
+      "type": "origins:or",
+      "conditions": [
+        {
+          "type": "origins:in_tag",
+          "tag": "terraoriginum:nomercy"
+        }
+      ]
+    },
+    "entity_action": {
+      "type": "origins:and",
+      "actions": [
+        {
+          "type": "origins:change_resource",
+          "resource": "*:*_divine_grace",
+          "change": -22
+        }
+      ]
+    },
+    "cooldown": 0,
+    "hud_render": {
+      "should_render": false
+    }
+  }
+}

src/main/resources/data/terraoriginum/powers/angel-powers/lesser_heal_ray.json

@@ -0,0 +1,39 @@
+{
+  "type": "origins:active_self",
+  "entity_action": {
+    "type": "origins:and",
+    "actions": [
+      {
+        "type": "origins:delay",
+        "action": {
+          "type": "origins:raycast",
+          "distance": 20,
+          "block": false,
+          "entity": true,
+          "shape_type": "visual",
+          "fluid_handling": "any",
+          "miss_action": {
+            "type": "origins:nothing"
+          },
+          "command_at_hit": "/execute as @e[distance=..2] run effect give @s minecraft:regeneration 0 5",
+          "command_along_ray": "/particle electric_spark ~ ~ ~ 0 0 0 0 10",
+          "command_step": 0.3
+        },
+        "ticks": 0
+      },
+      {
+        "type": "origins:play_sound",
+        "sound": "block.beacon.activate",
+        "volume": 1,
+        "pitch": 1
+      }
+
+    ]
+  },
+  "cooldown": 100,
+  "hud_render": {
+    "sprite_location": "origins:textures/gui/community/huang/resource_bar_01.png",
+    "bar_index": "4"
+  },
+  "key": "secondary"
+}

src/main/resources/data/terraoriginum/powers/kitsune-powers/hungy.json

@@ -1,7 +1,7 @@
 {
   "type": "origins:modify_exhaustion",
   "modifier":{
-	   "value": 5,
+	   "value": 1.5,
 	   "operation": "multiply_base"
 	   }
 }

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

@@ -4,6 +4,29 @@
     "entity_action": {
         "type": "origins:if_else_list",
         "actions": [
+            {
+                "condition": {
+                    "type": "origins:or",
+                    "conditions": [
+                        {
+                            "type": "origins:brightness",
+                            "comparison": "<=",
+                            "compare_to": 0.17948718
+                        }
+                    ]
+                },
+                "action": {
+                    "type": "origins:and",
+                    "actions": [
+                        {
+                            "type": "origins:change_resource",
+                            "resource": "terraoriginum:spirit-powers/ectoplasm",
+                            "change": 4,
+                            "operation": "add"
+                        }
+                    ]
+                }
+            },
             {
                 "condition": {
                     "type": "origins:and",
@@ -111,29 +134,6 @@
                         }
                     ]
                 }
-            },
-            {
-                "condition": {
-                    "type": "origins:or",
-                    "conditions": [
-                        {
-                            "type": "origins:brightness",
-                            "comparison": "<=",
-                            "compare_to": 0.17948718
-                        }
-                    ]
-                },
-                "action": {
-                    "type": "origins:and",
-                    "actions": [
-                        {
-                            "type": "origins:change_resource",
-                            "resource": "terraoriginum:spirit-powers/ectoplasm",
-                            "change": 4,
-                            "operation": "add"
-                        }
-                    ]
-                }
             }
         ]
     }

src/main/resources/data/terraoriginum/recipes/sun_totem.json

@@ -1,7 +1,7 @@
 {
     "type": "minecraft:crafting_shaped",
     "pattern": [
-      " / ",
+      " D ",
       "#P#",
       " / "
     ],
@@ -14,6 +14,9 @@
       },
       "P": {
         "item": "minecraft:totem_of_undying"
+      },
+      "D": {
+        "item": "minecraft:nether_star"
       }
     },
     "result": {

src/main/resources/data/terraoriginum/tags/entity_types/innocent.json

@@ -0,0 +1,22 @@
+{
+  "replace": false,
+  "values": [
+    "minecraft:ocelot",
+    "minecraft:rabbit",
+    "minecraft:fox",
+    "minecraft:tropical_fish",
+    "minecraft:mule",
+    "minecraft:donkey",
+    "minecraft:horse",
+    "minecraft:turtle",
+    "minecraft:skeleton_horse",
+    "minecraft:squid",
+    "minecraft:strider",
+    "minecraft:wandering_trader",
+    "minecraft:zombie_horse",
+    "minecraft:cod",
+    "minecraft:frog",
+    "minecraft:glow_squid",
+    "minecraft:villager"
+  ]
+}

src/main/resources/data/terraoriginum/tags/entity_types/nomercy.json

@@ -0,0 +1,12 @@
+{
+  "replace": false,
+  "values": [
+    "minecraft:cat",
+    "minecraft:wolf",
+    "minecraft:parrot",
+    "minecraft:allay",
+    "minecraft:panda",
+    "minecraft:axolotl",
+    "minecraft:bee"
+  ]
+}

src/main/resources/data/terraoriginum/tags/entity_types/unholy.json

@@ -0,0 +1,13 @@
+{
+  "replace": false,
+  "values": [
+    "minecraft:drowned",
+    "minecraft:husk",
+    "minecraft:zombie",
+    "minecraft:zombie_horse",
+    "minecraft:zombie_villager",
+    "minecraft:zombified_piglin",
+    "#minecraft:skeletons",
+    "minecraft:phantoms"
+  ]
+}

src/main/resources/fabric.mod.json

@@ -35,7 +35,8 @@
     "fabricloader": ">=0.14.0",
     "fabric": "*",
     "minecraft": "1.20.1",
-    "pehkui": ">=3.7.8"
+    "pehkui": ">=3.7.8",
+    "icarus": ">=2.11.0"
   },
   "conflicts": {}
 }