Merge branch 'cosmo-main'

settings.gradle

@@ -1,6 +1,6 @@
 pluginManagement {
     repositories {
-        jcenter()
+        mavenCentral()
         maven {
             name = 'Fabric'
             url = 'https://maven.fabricmc.net/'

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

@@ -1,7 +1,10 @@
 package net.arcmods.arcteam.terraoriginum;
 
+import net.arcmods.arcteam.terraoriginum.blocks.cottonCropBlock;
 import net.arcmods.arcteam.terraoriginum.blocks.crucifix;
 import net.arcmods.arcteam.terraoriginum.items.iconItems;
+import net.arcmods.arcteam.terraoriginum.items.cottonItems;
+import net.arcmods.arcteam.terraoriginum.items.mync_eye;
 import net.arcmods.arcteam.terraoriginum.items.umbrella;
 import net.arcmods.arcteam.terraoriginum.registry.modEnchantments;
 import net.fabricmc.api.ModInitializer;
@@ -22,9 +25,13 @@ public class TerraOriginum implements ModInitializer {
 		iconItems.register();
 		modEnchantments.register();
 		crucifix.register();
+		cottonCropBlock.register();
+		cottonItems.register();
 		
 		ItemGroupEvents.modifyEntriesEvent(ItemGroups.TOOLS).register((content) -> content.add(umbrella.UMBRELLA));
 		ItemGroupEvents.modifyEntriesEvent(ItemGroups.FUNCTIONAL).register((content) -> content.add(crucifix.CRUCIFIX));
+		ItemGroupEvents.modifyEntriesEvent(ItemGroups.NATURAL).register((content) -> content.add(cottonItems.COTTON_SEEDS));
+		ItemGroupEvents.modifyEntriesEvent(ItemGroups.INGREDIENTS).register((content) -> content.add(cottonItems.COTTON_BALL));
 		LOGGER.info("man this Origins is " + MOD_ID);
 	}
 }

src/main/java/net/arcmods/arcteam/terraoriginum/blocks/cottonCropBlock.java

@@ -0,0 +1,49 @@
+package net.arcmods.arcteam.terraoriginum.blocks;
+
+import net.arcmods.arcteam.terraoriginum.items.cottonItems;
+import net.minecraft.block.AbstractBlock;
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockState;
+import net.minecraft.block.CropBlock;
+import net.minecraft.block.ShapeContext;
+import net.minecraft.item.ItemConvertible;
+import net.minecraft.registry.Registries;
+import net.minecraft.registry.Registry;
+import net.minecraft.sound.BlockSoundGroup;
+import net.minecraft.util.Identifier;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.shape.VoxelShape;
+import net.minecraft.world.BlockView;
+
+public class cottonCropBlock extends CropBlock{
+    
+            private static final VoxelShape[] AGE_TO_SHAPE = new VoxelShape[]{Block.createCuboidShape(0.0D, 0.0D, 0.0D, 16.0D, 2.0D, 16.0D),
+            Block.createCuboidShape(0.0D, 0.0D, 0.0D, 16.0D, 3.0D, 16.0D),
+            Block.createCuboidShape(0.0D, 0.0D, 0.0D, 16.0D, 4.0D, 16.0D),
+            Block.createCuboidShape(0.0D, 0.0D, 0.0D, 16.0D, 5.0D, 16.0D),
+            Block.createCuboidShape(0.0D, 0.0D, 0.0D, 16.0D, 6.0D, 16.0D),
+            Block.createCuboidShape(0.0D, 0.0D, 0.0D, 16.0D, 7.0D, 16.0D),
+            Block.createCuboidShape(0.0D, 0.0D, 0.0D, 16.0D, 8.0D, 16.0D),
+            Block.createCuboidShape(0.0D, 0.0D, 0.0D, 16.0D, 9.0D, 16.0D)
+    };
+
+        public cottonCropBlock(AbstractBlock.Settings settings) {
+            super(settings);
+        }
+
+        public ItemConvertible getSeedsItem() {
+            return cottonItems.COTTON_SEEDS;
+        }
+
+        public VoxelShape getOutlineShape(BlockState state, BlockView world, BlockPos pos, ShapeContext context) {
+            return AGE_TO_SHAPE[(Integer)state.get(this.getAgeProperty())];
+        }
+
+        public static final CropBlock COTTON_CROP_BLOCK = new CropBlock(AbstractBlock.Settings.create().nonOpaque().noCollision().ticksRandomly().breakInstantly().sounds(BlockSoundGroup.CROP));
+
+        public static void register() {
+            Registry.register(Registries.BLOCK, new Identifier("terraoriginum", "cotton_crop_block"), COTTON_CROP_BLOCK);
+        }
+
+
+}

src/main/java/net/arcmods/arcteam/terraoriginum/client/layerRenderer.java

@@ -1,13 +1,17 @@
 package net.arcmods.arcteam.terraoriginum.client;
 
+import net.arcmods.arcteam.terraoriginum.blocks.cottonCropBlock;
 import net.arcmods.arcteam.terraoriginum.items.umbrella;
 import net.fabricmc.api.ClientModInitializer;
+import net.fabricmc.fabric.api.blockrenderlayer.v1.BlockRenderLayerMap;
+import net.minecraft.client.render.RenderLayer;
 
 public class layerRenderer implements ClientModInitializer {
 
     @Override
     public void onInitializeClient() {
         umbrella.registerRenderLayers();
+        BlockRenderLayerMap.INSTANCE.putBlocks(RenderLayer.getCutout(), cottonCropBlock.COTTON_CROP_BLOCK);
     }
     
 }

src/main/java/net/arcmods/arcteam/terraoriginum/items/cottonItems.java

@@ -0,0 +1,19 @@
+package net.arcmods.arcteam.terraoriginum.items;
+
+import net.arcmods.arcteam.terraoriginum.blocks.cottonCropBlock;
+import net.minecraft.item.AliasedBlockItem;
+import net.minecraft.item.Item;
+import net.minecraft.registry.Registries;
+import net.minecraft.registry.Registry;
+import net.minecraft.util.Identifier;
+
+public class cottonItems {
+
+    public static final Item COTTON_SEEDS = new AliasedBlockItem(cottonCropBlock.COTTON_CROP_BLOCK, new Item.Settings());
+    public static final Item COTTON_BALL = new Item(new Item.Settings());
+
+    public static void register() {
+        Registry.register(Registries.ITEM, new Identifier("terraoriginum", "cotton_seeds"), COTTON_SEEDS);
+        Registry.register(Registries.ITEM, new Identifier("terraoriginum", "cotton_ball"), COTTON_BALL);
+    }
+}

src/main/resources/assets/terraoriginum/blockstates/cotton_crop_block.json

@@ -0,0 +1,29 @@
+{
+    "variants": {
+      "age=0": {
+        "model": "terraoriginum:block/cotton_crop_stage0"
+      },
+      "age=1": {
+        "model": "terraoriginum:block/cotton_crop_stage0"
+      },
+      "age=2": {
+        "model": "terraoriginum:block/cotton_crop_stage1"
+      },
+      "age=3": {
+        "model": "terraoriginum:block/cotton_crop_stage1"
+      },
+      "age=4": {
+        "model": "terraoriginum:block/cotton_crop_stage2"
+      },
+      "age=5": {
+        "model": "terraoriginum:block/cotton_crop_stage2"
+      },
+      "age=6": {
+        "model": "terraoriginum:block/cotton_crop_stage2"
+      },
+      "age=7": {
+        "model": "terraoriginum:block/cotton_crop_stage3"
+      }
+    }
+  }
+

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

@@ -5,6 +5,9 @@
   "item.terraoriginum.umbrella": "Umbrella",
 
   //-----shit i cant be assed to categorise-----/
+  "item.terraoriginum.cotton_seeds": "Cotton Seeds",
+  "item.terraoriginum.cotton_ball": "Cotton ball",
+
   "death.attack.lack_of_ectoplasm": "%1$s faded away",
   "death.attack.lack_of_ectoplasm.player": "%1$s faded away whilst trying to escape %2$s",
 
@@ -219,20 +222,27 @@
   "power.terraoriginum.muckunde-powers/hydrophobic.name": "Hydrophobic",
   "power.terraoriginum.muckunde-powers/hydrophobic.description": "your body completely ignores water",
 
-  //-----empyrian-----//
-  "origin.terraoriginum.empyrian.name": "Empyrian",
-  "origin.terraoriginum.empyrian.description": "Weightless floating creatures, adept at flight and forming pressurized air using their strange abilities.",
-  "power.terraoriginum.empyrian-powers/ballast.name": "Ballast",
-  "power.terraoriginum.empyrian-powers/ballast.description": "Wearing armor weighs you down, making it more difficult and exhausting to float.",
-  "power.terraoriginum.empyrian-powers/buoyant.name": "Buoyant",
-  "power.terraoriginum.empyrian-powers/buoyant.description": "You can't sink in water and will rise to its surface, even allowing you to walk on it.",
-  "power.terraoriginum.empyrian-powers/burst.name": "Burst",
-  "power.terraoriginum.empyrian-powers/burst.description": "Taking 5 or more damage when flying will burst you, piercing your armor and preventing you from flying until you've regenerated most of your health.",
-  "power.terraoriginum.empyrian-powers/lightweight_keys.name": "Lightweight",
-  "power.terraoriginum.empyrian-powers/lightweight_keys.description": "You can control the air surrounding you, allowing you to fall, fly and fall gracefully. Flying is exhausting and only possible when able to sprint.",
-  "power.terraoriginum.empyrian-powers/shoot.name": "Dual Strike",
-  "power.terraoriginum.empyrian-powers/shoot.description": "Lob a ball of compressed air, knocking back targets but dealing no damage."
-  // the tooltips have no lang def or i cant figure out how to set it (most likely the former)
+  //-----Monarch-----//
+  "origin.terraoriginum.monarch.name": "Monarch",
+  "origin.terraoriginum.monarch.description": "The Monarchs were the first of them all, they took pride in the fact that they were superior to all others of their time, that was until newer and better species came along and drove them to near extinction. \nNow they have returned after evolving into something far more powerful",
+  "power.terraoriginum.monarchpowers/hyperefficient_blood.name": "Hyperefficient Blood",
+  "power.terraoriginum.monarchpowers/hyperefficient_blood.description": "Your blood is extremely efficient, destroying any poisons within your bloodstream before they have a chance to do any damage",
+  "power.terraoriginum.monarchpowers/solar_energy.name": "Solar Energy",
+  "power.terraoriginum.monarchpowers/solar_energy.description": "You draw energy from the sun and store it within your body, and access it at will to use various abilities",
+  "power.terraoriginum.monarchpowers/sun_fueled.name": "Sun Fueled",
+  "power.terraoriginum.monarchpowers/sun_fueled.description": "You have evolved to draw power from the sun, leading you to become more powerful during the day",
+  "power.terraoriginum.monarchpowers/nuclear_rush.name": "Nuclear Rush",
+  "power.terraoriginum.monarchpowers/nuclear_rush.description": "using the sun energy stored within your body, you can temporarily start a weak thermonuclear reaction, pushing your body beyond the limitations of living flesh.",
+  "power.terraoriginum.monarchpowers/instant_transmission.name": "Instant Transmission",
+  "power.terraoriginum.monarchpowers/instant_transmission.description": "Use the thermonuclear energy stored in your body to erase the space between you and your target",
+  "power.terraoriginum.monarchpowers/nyctophobia.name": "Nyctophobia",
+  "power.terraoriginum.monarchpowers/nyctophobia.description": "Your power is derived from the sun, making you weaker during the night",
+  "power.terraoriginum.monarchpowers/shining.name": "Shining",
+  "power.terraoriginum.monarchpowers/shining.description": "An entire lifetime of absorbing the sun's energy makes you radiate it's light",
+  "power.terraoriginum.monarchpowers/super_dash.name": "Super Dash",
+  "power.terraoriginum.monarchpowers/super_dash.description": "release a large portion of the solar energy stored within your body to create a large amount of thrust in whatever direction you are facing",
+  "power.terraoriginun.monarchpowers/hydropetrification.name": "Hydropetrification",
+  "power.terraoriginum.monarchpowers/hydropetrification.description": "Your body's cells contain a high concentration of neutrinos to facilitate nuclear processes whithin itself, this causes your entire body to heavily slow down underwater"
 
 
 }

src/main/resources/assets/terraoriginum/models/block/cotton_crop_stage0.json

@@ -0,0 +1,7 @@
+{
+    "parent": "minecraft:block/crop",
+    "textures": {
+      "crop": "terraoriginum:block/cotton_crop_block_stage0"
+    }
+  }
+

src/main/resources/assets/terraoriginum/models/block/cotton_crop_stage1.json

@@ -0,0 +1,7 @@
+{
+    "parent": "minecraft:block/crop",
+    "textures": {
+      "crop": "terraoriginum:block/cotton_crop_block_stage1"
+    }
+  }
+

src/main/resources/assets/terraoriginum/models/block/cotton_crop_stage2.json

@@ -0,0 +1,7 @@
+{
+    "parent": "minecraft:block/crop",
+    "textures": {
+      "crop": "terraoriginum:block/cotton_crop_block_stage2"
+    }
+  }
+

src/main/resources/assets/terraoriginum/models/block/cotton_crop_stage3.json

@@ -0,0 +1,7 @@
+{
+    "parent": "minecraft:block/crop",
+    "textures": {
+      "crop": "terraoriginum:block/cotton_crop_block_stage3"
+    }
+  }
+

src/main/resources/assets/terraoriginum/models/item/cotton_ball.json

@@ -0,0 +1,6 @@
+{
+    "parent": "item/generated",
+    "textures": {
+      "layer0": "terraoriginum:item/cotton_ball"
+    }
+}

src/main/resources/assets/terraoriginum/models/item/cotton_seeds.json

@@ -0,0 +1,6 @@
+{
+    "parent": "item/generated",
+    "textures": {
+      "layer0": "terraoriginum:item/cotton_seeds"
+    }
+}

src/main/resources/data/c/tags/items/cotton_balls.json

@@ -0,0 +1,6 @@
+{
+    "replace": false,
+    "values": [
+      "terraoriginum:cotton_ball"
+    ]
+  }

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

@@ -15,6 +15,7 @@
 		"terraoriginum:fairy",
 		"terraoriginum:muckunde",
 		"terraoriginum:mync",
+		"terraoriginum:monarch",
 		{
 			"condition": {
 				"type": "origins:equipped_item",

src/main/resources/data/terraoriginum/loot_tables/blocks/cotton_crop_block.json

@@ -0,0 +1,68 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "rolls": 3,
+      "bonus_rolls": 0,
+      "entries": [
+        {
+          "type": "minecraft:alternatives",
+          "children": [
+            {
+              "type": "minecraft:item",
+              "name": "terraoriginum:cotton_ball",
+              "conditions": [
+                {
+                  "condition": "minecraft:block_state_property",
+                  "block": "terraoriginum:cotton_crop_block",
+                  "properties": {
+                    "age": "7"
+                  }
+                }
+              ]
+            },
+            {
+              "type": "minecraft:item",
+              "name": "terraoriginum:cotton_seeds"
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "rolls": 1,
+      "bonus_rolls": 0,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "terraoriginum:cotton_seeds",
+          "functions": [
+            {
+              "function": "minecraft:apply_bonus",
+              "enchantment": "minecraft:fortune",
+              "formula": "minecraft:binomial_with_bonus_count",
+              "parameters": {
+                "extra": 3,
+                "probability": 0.5714286
+              }
+            }
+          ]
+        }
+      ],
+      "conditions": [
+        {
+          "condition": "minecraft:block_state_property",
+          "block": "terraoriginum:cotton_crop_block",
+          "properties": {
+            "age": "7"
+          }
+        }
+      ]
+    }
+  ],
+  "functions": [
+    {
+      "function": "minecraft:explosion_decay"
+    }
+  ]
+}

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

@@ -0,0 +1,17 @@
+{
+    "powers": [
+      "terraoriginum:monarchpowers/solar_energy",
+      "terraoriginum:monarchpowers/nuclear_rush",
+      "terraoriginum:monarchpowers/instant_transmission",
+      "terraoriginum:monarchpowers/super_dash",
+      "terraoriginum:monarchpowers/hyperefficient_blood",
+      "terraoriginum:monarchpowers/hydropetrification",
+      "terraoriginum:monarchpowers/sun_fueled",
+      "terraoriginum:monarchpowers/nyctophobia",
+      "terraoriginum:monarchpowers/shining"
+    ],
+    "icon": "fire_charge",
+    "order": 999,
+    "impact": 3
+  }
+  

src/main/resources/data/terraoriginum/powers/monarchpowers/hydropetrification.json

@@ -0,0 +1,29 @@
+{
+    "type": "origins:action_over_time",
+    "interval": 1,
+    "condition": {
+            "type": "origins:submerged_in",
+            "fluid": "minecraft:water"
+    },
+    "entity_action": {
+        "type": "origins:and",
+        "actions": [
+        {
+            "type": "origins:add_velocity",
+            "x": 0,
+            "y": 0,
+            "z": 0,
+            "set": true
+        },
+        {
+            "type": "origins:apply_effect",
+            "effect": {
+                "effect": "minecraft:mining_fatigue",
+                "duration": 200,
+                "amplifier": 2
+            }
+              
+        }
+        ]
+    }
+}

src/main/resources/data/terraoriginum/powers/monarchpowers/hyperefficient_blood.json

@@ -0,0 +1,10 @@
+{
+    "type": "origins:effect_immunity",
+    "effects": [
+      "minecraft:wither",
+      "minecraft:poison",
+      "minecraft:instant_damage",
+      "minecraft:hunger"
+    ]
+  }
+  

src/main/resources/data/terraoriginum/powers/monarchpowers/instant_transmission.json

@@ -0,0 +1,66 @@
+{
+    "condition": {
+        "type": "origins:resource",
+        "resource": "terraoriginum:monarchpowers/solar_energy",
+        "comparison": ">=",
+        "compare_to": 50
+    },
+    "type": "origins:active_self",
+    "entity_action": {
+        "type": "origins:and",
+        "actions": [
+            {
+                "type": "origins:delay",
+                "action": {
+                    "type": "origins:raycast",
+                    "distance": 20,
+                    "block": true,
+                    "entity": true,
+                    "shape_type": "visual",
+                    "fluid_handling": "any",
+                    "miss_action": {
+                        "type": "origins:nothing"
+                    },
+                    "command_at_hit": "tp @s ~ ~ ~",
+                    "command_along_ray": "/particle smoke ~ ~ ~ 0 0 0 0 10",
+                    "command_step": 0.3
+                },
+                "ticks": 0
+            },
+            {
+                "type": "origins:play_sound",
+                "sound": "entity.illusioner.cast_spell",
+                "volume": 1,
+                "pitch": 1
+            },
+            {
+                "type": "origins:spawn_particles",
+                "particle": "instant_effect",
+                "count": 800,
+                "speed": 0.1,
+                "force": true,
+                "spread": {
+                    "x": 0.5,
+                    "y": 0.5,
+                    "z": 0.5
+                },
+                "offset_y": 0.5
+            },
+            {
+                "type": "origins:change_resource",
+                "resource": "terraoriginum:monarchpowers/solar_energy",
+                "change": -50,
+                "operation": "add"
+              }
+
+        ]
+    },
+    "cooldown": 0,
+    "hud_render": {
+        "sprite_location": "origins:textures/gui/community/huang/resource_bar_01.png",
+        "bar_index": "19"
+    },
+    "key": {
+        "key": "secondary"
+    }
+}

src/main/resources/data/terraoriginum/powers/monarchpowers/nuclear_rush.json

@@ -0,0 +1,55 @@
+{
+    "condition": {
+        "type": "origins:resource",
+        "resource": "terraoriginum:monarchpowers/solar_energy",
+        "comparison": ">=",
+        "compare_to": 100
+    },
+    "type": "origins:active_self",
+    "entity_action": {
+      "type": "origins:and",
+      "actions": [
+        {
+          "type": "origins:apply_effect",
+          "effect": {
+            "effect": "minecraft:strength",
+            "duration": 120,
+            "amplifier": 4
+          }
+        },
+        {
+            "type": "origins:apply_effect",
+            "effect": {
+              "effect": "minecraft:speed",
+              "duration": 200,
+              "amplifier": 3
+            }
+        },
+        {
+            "type": "origins:apply_effect",
+            "effect": {
+              "effect": "minecraft:resistance",
+              "duration": 200,
+              "amplifier": 3
+            }
+        },
+        {
+          "type": "origins:change_resource",
+          "resource": "terraoriginum:monarchpowers/solar_energy",
+          "change": -100,
+          "operation": "add"
+        },
+        {
+          "type": "origins:exhaust",
+          "amount": 2
+        }
+      ]
+      
+    },
+    "cooldown": 3000,
+    "hud_render": {
+      "sprite_location": "origins:textures/gui/community/huang/resource_bar_01.png",
+      "bar_index": "7"
+    },
+    "key": "primary"
+  }

src/main/resources/data/terraoriginum/powers/monarchpowers/nyctophobia.json

@@ -0,0 +1,31 @@
+{
+  "type": "origins:action_over_time",
+  "condition": {
+      "type": "origins:daytime",
+      "inverted": true
+    },
+    "entity_action": {
+      "type": "origins:and",
+      "actions": [{
+        "type": "origins:apply_effect",
+        "effects": [{
+            "effect": "minecraft:slowness",
+            "amplifier": 0,
+            "duration": 35,
+            "show_particles": false,
+            "show_icon": false
+          },
+          {
+            "effect": "minecraft:weakness",
+            "amplifier": 2,
+            "duration": 35,
+            "show_particles": false,
+            "show_icon": false
+          }
+        ]
+      }
+    ]
+    },
+    "update_health": true
+  }
+  

src/main/resources/data/terraoriginum/powers/monarchpowers/shining.json

@@ -0,0 +1,6 @@
+{
+    "type": "origins:model_color",
+    "blue": 0.5,
+    "red": 1,
+    "green": 1
+}

src/main/resources/data/terraoriginum/powers/monarchpowers/solar_energy.json

@@ -0,0 +1,11 @@
+{
+    "type": "origins:resource",
+    "min": 0,
+    "max": 400,
+    "start_value": 10,
+    "hud_render": {
+        "should_render": true,
+        "sprite_location": "origins:textures/gui/community/huang/resource_bar_01.png",
+        "bar_index": 14
+    }
+}

src/main/resources/data/terraoriginum/powers/monarchpowers/sun_fueled.json

@@ -0,0 +1,13 @@
+{
+"condition": {
+    "type": "origins:daytime"
+  },
+  "type": "origins:action_over_time",
+  "interval": 40,
+  "entity_action": {
+	  "type": "origins:change_resource",
+	  "resource": "terraoriginum:monarchpowers/solar_energy",
+	  "change": 10,
+	  "operation": "add"
+  }
+}

src/main/resources/data/terraoriginum/powers/monarchpowers/super_dash.json

@@ -0,0 +1,45 @@
+{
+    "type": "origins:active_self",
+    "entity_action": {
+        "type": "origins:and",
+        "actions": [{
+                "type": "origins:play_sound",
+                "sound": "minecraft:entity.evoker.cast_spell"
+            },
+            {
+                "type": "origins:add_velocity",
+                "space": "local",
+                "z": 20
+            },
+            {
+                "type": "origins:execute_command",
+                "command": "particle dust_color_transition 0.9 0.38 0 1 0.88 0.11 0.14 ~ ~1 ~ 0.5 0 0.5 10 100 force"
+
+            },
+            {
+                "type": "origins:execute_command",
+                "command": "particle explosion ~ ~1 ~ 0 0 0 0 1"
+            },
+            {
+                "type": "origins:change_resource",
+                "resource": "terraoriginum:monarchpowers/solar_energy",
+                "change": -200
+            }
+        ]
+    },
+    "key": {
+        "key": "key.origins.ternary_active"
+    },
+    "condition": {
+        "type": "origins:resource",
+        "resource": "terraoriginum:monarchpowers/solar_energy",
+        "comparison": ">=",
+        "compare_to": 200
+    },
+"cooldown": 100,
+"hud_render": {
+"sprite_location": "origins:textures/gui/community/huang/resource_bar_02.png",
+"bar_index": 5,
+"should_render": true
+}
+}