From f06ceb345c4d85d5f4dab5456965eecf95828de4 Mon Sep 17 00:00:00 2001 From: CosmoOrSth <79050675+CosmoOrSth@users.noreply.github.com> Date: Fri, 31 May 2024 20:44:23 +0530 Subject: [PATCH 1/4] partial implementation of cotton crop - all functionality except loot table for the cotton crop block has been added - textures should be considered placeholders and are subject to change --- settings.gradle | 2 +- .../arcteam/terraoriginum/TerraOriginum.java | 6 ++ .../terraoriginum/blocks/cottonCropBlock.java | 49 +++++++++++++ .../terraoriginum/client/layerRenderer.java | 4 ++ .../terraoriginum/items/cottonItems.java | 19 +++++ .../blockstates/cotton_crop_block.json | 29 ++++++++ .../assets/terraoriginum/lang/en_us.json | 3 + .../models/block/cotton_crop_stage0.json | 7 ++ .../models/block/cotton_crop_stage1.json | 7 ++ .../models/block/cotton_crop_stage2.json | 7 ++ .../models/block/cotton_crop_stage3.json | 7 ++ .../models/item/cotton_ball.json | 6 ++ .../models/item/cotton_seeds.json | 6 ++ .../block/cotton_crop_block_stage0.png | Bin 0 -> 228 bytes .../block/cotton_crop_block_stage1.png | Bin 0 -> 316 bytes .../block/cotton_crop_block_stage2.png | Bin 0 -> 430 bytes .../block/cotton_crop_block_stage3.png | Bin 0 -> 294 bytes .../textures/item/cotton_ball.png | Bin 0 -> 248 bytes .../textures/item/cotton_seeds.png | Bin 0 -> 200 bytes .../loot_tables/cotton_crop_block.json | 68 ++++++++++++++++++ 20 files changed, 219 insertions(+), 1 deletion(-) create mode 100644 src/main/java/net/arcmods/arcteam/terraoriginum/blocks/cottonCropBlock.java create mode 100644 src/main/java/net/arcmods/arcteam/terraoriginum/items/cottonItems.java create mode 100644 src/main/resources/assets/terraoriginum/blockstates/cotton_crop_block.json create mode 100644 src/main/resources/assets/terraoriginum/models/block/cotton_crop_stage0.json create mode 100644 src/main/resources/assets/terraoriginum/models/block/cotton_crop_stage1.json create mode 100644 src/main/resources/assets/terraoriginum/models/block/cotton_crop_stage2.json create mode 100644 src/main/resources/assets/terraoriginum/models/block/cotton_crop_stage3.json create mode 100644 src/main/resources/assets/terraoriginum/models/item/cotton_ball.json create mode 100644 src/main/resources/assets/terraoriginum/models/item/cotton_seeds.json create mode 100644 src/main/resources/assets/terraoriginum/textures/block/cotton_crop_block_stage0.png create mode 100644 src/main/resources/assets/terraoriginum/textures/block/cotton_crop_block_stage1.png create mode 100644 src/main/resources/assets/terraoriginum/textures/block/cotton_crop_block_stage2.png create mode 100644 src/main/resources/assets/terraoriginum/textures/block/cotton_crop_block_stage3.png create mode 100644 src/main/resources/assets/terraoriginum/textures/item/cotton_ball.png create mode 100644 src/main/resources/assets/terraoriginum/textures/item/cotton_seeds.png create mode 100644 src/main/resources/data/terraoriginum/loot_tables/cotton_crop_block.json diff --git a/settings.gradle b/settings.gradle index 5b60df3..27e3d10 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,6 +1,6 @@ pluginManagement { repositories { - jcenter() + mavenCentral() maven { name = 'Fabric' url = 'https://maven.fabricmc.net/' diff --git a/src/main/java/net/arcmods/arcteam/terraoriginum/TerraOriginum.java b/src/main/java/net/arcmods/arcteam/terraoriginum/TerraOriginum.java index 5184bd1..43f5cd5 100644 --- a/src/main/java/net/arcmods/arcteam/terraoriginum/TerraOriginum.java +++ b/src/main/java/net/arcmods/arcteam/terraoriginum/TerraOriginum.java @@ -1,6 +1,8 @@ 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.cottonItems; import net.arcmods.arcteam.terraoriginum.items.mync_eye; import net.arcmods.arcteam.terraoriginum.items.umbrella; import net.arcmods.arcteam.terraoriginum.registry.modEnchantments; @@ -22,9 +24,13 @@ public class TerraOriginum implements ModInitializer { mync_eye.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); } } diff --git a/src/main/java/net/arcmods/arcteam/terraoriginum/blocks/cottonCropBlock.java b/src/main/java/net/arcmods/arcteam/terraoriginum/blocks/cottonCropBlock.java new file mode 100644 index 0000000..f854681 --- /dev/null +++ b/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); + } + + +} diff --git a/src/main/java/net/arcmods/arcteam/terraoriginum/client/layerRenderer.java b/src/main/java/net/arcmods/arcteam/terraoriginum/client/layerRenderer.java index 0eab116..25d4ec1 100644 --- a/src/main/java/net/arcmods/arcteam/terraoriginum/client/layerRenderer.java +++ b/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); } } diff --git a/src/main/java/net/arcmods/arcteam/terraoriginum/items/cottonItems.java b/src/main/java/net/arcmods/arcteam/terraoriginum/items/cottonItems.java new file mode 100644 index 0000000..598fec0 --- /dev/null +++ b/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); + } +} diff --git a/src/main/resources/assets/terraoriginum/blockstates/cotton_crop_block.json b/src/main/resources/assets/terraoriginum/blockstates/cotton_crop_block.json new file mode 100644 index 0000000..54811bb --- /dev/null +++ b/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" + } + } + } + diff --git a/src/main/resources/assets/terraoriginum/lang/en_us.json b/src/main/resources/assets/terraoriginum/lang/en_us.json index b9ccec7..3cfa645 100644 --- a/src/main/resources/assets/terraoriginum/lang/en_us.json +++ b/src/main/resources/assets/terraoriginum/lang/en_us.json @@ -3,6 +3,9 @@ "item.terraoriginum.mync_eye": "you shouldnt have this", "item.terraoriginum.umbrella": "Umbrella", + "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", diff --git a/src/main/resources/assets/terraoriginum/models/block/cotton_crop_stage0.json b/src/main/resources/assets/terraoriginum/models/block/cotton_crop_stage0.json new file mode 100644 index 0000000..d30efc5 --- /dev/null +++ b/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" + } + } + diff --git a/src/main/resources/assets/terraoriginum/models/block/cotton_crop_stage1.json b/src/main/resources/assets/terraoriginum/models/block/cotton_crop_stage1.json new file mode 100644 index 0000000..56163a7 --- /dev/null +++ b/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" + } + } + diff --git a/src/main/resources/assets/terraoriginum/models/block/cotton_crop_stage2.json b/src/main/resources/assets/terraoriginum/models/block/cotton_crop_stage2.json new file mode 100644 index 0000000..e9eaf81 --- /dev/null +++ b/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" + } + } + diff --git a/src/main/resources/assets/terraoriginum/models/block/cotton_crop_stage3.json b/src/main/resources/assets/terraoriginum/models/block/cotton_crop_stage3.json new file mode 100644 index 0000000..744385d --- /dev/null +++ b/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" + } + } + diff --git a/src/main/resources/assets/terraoriginum/models/item/cotton_ball.json b/src/main/resources/assets/terraoriginum/models/item/cotton_ball.json new file mode 100644 index 0000000..608bf74 --- /dev/null +++ b/src/main/resources/assets/terraoriginum/models/item/cotton_ball.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "terraoriginum:item/cotton_ball" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/terraoriginum/models/item/cotton_seeds.json b/src/main/resources/assets/terraoriginum/models/item/cotton_seeds.json new file mode 100644 index 0000000..efc5834 --- /dev/null +++ b/src/main/resources/assets/terraoriginum/models/item/cotton_seeds.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "terraoriginum:item/cotton_seeds" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/terraoriginum/textures/block/cotton_crop_block_stage0.png b/src/main/resources/assets/terraoriginum/textures/block/cotton_crop_block_stage0.png new file mode 100644 index 0000000000000000000000000000000000000000..4f65c1460650b2f12ab48bc2acf9a48129ddc4b6 GIT binary patch literal 228 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC z{oH>NS%G|^0G|+7drl@(1_lRFh6E!9N02B3i`MQWAjMV^R=Jk$+22-;|X2^&}CYcBNS%G}50G|-o1S19?H3nZXh8$;Jpk$&kV~i<_FF%950Z+CCW3n+ro)u%F5l}UQ zS+TDqkm4%|@(cct3>aJw+&KZ1;VkfoECwn#48n}Z^H-z*1sgqG978mMZTmTeoE15o zBQNdU`M>n{fpg_DM?Wx0+&eloJZ1Xgxq;IUoXo!8GV`inal@fob3?n{$UTnITC`|I zqnT65RUDA(+JdFAIB#g3N;w$*Qc&90HYS5h137zR&QKbLh*2~7a|y>e~< literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/terraoriginum/textures/block/cotton_crop_block_stage2.png b/src/main/resources/assets/terraoriginum/textures/block/cotton_crop_block_stage2.png new file mode 100644 index 0000000000000000000000000000000000000000..6b3bb542dd9c0c52f5472bb02af71e9677e01dd2 GIT binary patch literal 430 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC z{oH>NS%LhV0G|+7e`N*-Q3gj=h7d)D1S5w3|NjRoFgUO<1j{pc2{9NlFjz1!#2Yd^ zdi2PKfkBCZL7#ykPM;w_hQUsV!CsWXiig3Rfx&=*!Cr&`XtpT>L$o$aup)z{9Frp( zgTI5Iixz_u8-uqh$U;%h=W0Mor6kBN7-$h8z!0Is%L`P`S>O>_%)r2R7=#&*=dVZs z3eNU)aSYK2w!IK8bjW~*C1A@WC*Hj(i#C7Xue?e4L%*s2*~gr(PkR3o@Nim^ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/terraoriginum/textures/block/cotton_crop_block_stage3.png b/src/main/resources/assets/terraoriginum/textures/block/cotton_crop_block_stage3.png new file mode 100644 index 0000000000000000000000000000000000000000..ce1b0e7ee922479818f53f7258aa4ba1d96d70b2 GIT binary patch literal 294 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC z{oH>NS%G|s0G|-o1S5tVXI>vQ2469TM~@!;|NkGT1PIPw$#@E+I7)*2f`Nh{z;Lg5 zZzNERv%n*=n1O-sFbFdq&tH)O6m0f%aSYK2w(VyWVm9Pp;&l7-zkm0=t))I{N*Wh! z78?KCXA#P{S_Psa|TNZlPPW>;#nF*_`R~3hCvb}lII_z>T3!Bcf zN>yKn@R`T>-b!CP@TBL+u9n~5-X1@0wf7{8CTBzU%CD0iq)2`cS+H`CP*%V3|MP+o dGtSQBceulnvQ1;(U7&LqJYD@<);T3K0RWyQZn*#e literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/terraoriginum/textures/item/cotton_ball.png b/src/main/resources/assets/terraoriginum/textures/item/cotton_ball.png new file mode 100644 index 0000000000000000000000000000000000000000..1df0fbec9d3b0c96ed9f96ba7ec43c6b1d80ae4b GIT binary patch literal 248 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9F5M?jcysy3fAP;i2$ zi(`nz>Er~7Ef4;#o%i3sXWFy>_5Od_87J{DX0tJ>Fz4y_u_Zssbvvw3IDt`Ji|61B zi`x@Tl%;u+9-FYtc8bwEcwx_tNC6$j&4NeVzYBR7`-wN0q;wb^%w_m^G51)eHBSRi z1FOiU`-wSCvmCb_+QamjY17+^#R6#z9>yKK#k^;-SuQj92yaR%`S*Z@;e3JSOi;grABzB`T8z8=oFJv3 zbK=MUx4-{OtUIjMca{6n9-aU5>;5%|^4%3!({&_5^56bny|y(DZOu$_X^f8PO(uW- z{_THww7))KtHNPNlQT?n*fbbS?HH<6PW)%#Rd`b0#3nG=pUqC6f#J>jP(gJwIc1>J7(8A5T-G@yGywp~&q%cZ literal 0 HcmV?d00001 diff --git a/src/main/resources/data/terraoriginum/loot_tables/cotton_crop_block.json b/src/main/resources/data/terraoriginum/loot_tables/cotton_crop_block.json new file mode 100644 index 0000000..406ce96 --- /dev/null +++ b/src/main/resources/data/terraoriginum/loot_tables/cotton_crop_block.json @@ -0,0 +1,68 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "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" + } + ] +} \ No newline at end of file From bd3339a9c91bc340727994421072aba4b1bc4657 Mon Sep 17 00:00:00 2001 From: Ryan <78032176+BigGaemer@users.noreply.github.com> Date: Wed, 5 Jun 2024 17:36:53 +0200 Subject: [PATCH 2/4] fixed cotton and added it to a tag --- src/main/resources/data/c/tags/items/cotton_balls.json | 6 ++++++ .../loot_tables/{ => blocks}/cotton_crop_block.json | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 src/main/resources/data/c/tags/items/cotton_balls.json rename src/main/resources/data/terraoriginum/loot_tables/{ => blocks}/cotton_crop_block.json (98%) diff --git a/src/main/resources/data/c/tags/items/cotton_balls.json b/src/main/resources/data/c/tags/items/cotton_balls.json new file mode 100644 index 0000000..dc4d0bf --- /dev/null +++ b/src/main/resources/data/c/tags/items/cotton_balls.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "terraoriginum:cotton_ball" + ] + } \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/loot_tables/cotton_crop_block.json b/src/main/resources/data/terraoriginum/loot_tables/blocks/cotton_crop_block.json similarity index 98% rename from src/main/resources/data/terraoriginum/loot_tables/cotton_crop_block.json rename to src/main/resources/data/terraoriginum/loot_tables/blocks/cotton_crop_block.json index 406ce96..5923d3c 100644 --- a/src/main/resources/data/terraoriginum/loot_tables/cotton_crop_block.json +++ b/src/main/resources/data/terraoriginum/loot_tables/blocks/cotton_crop_block.json @@ -2,7 +2,7 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 3, "bonus_rolls": 0, "entries": [ { From 33c4c11a7ebe0f6ee352c4650a0856f58e75b2e7 Mon Sep 17 00:00:00 2001 From: CosmoOrSth <79050675+CosmoOrSth@users.noreply.github.com> Date: Fri, 2 Aug 2024 17:44:47 +0530 Subject: [PATCH 3/4] complete implementation of 'Monarch' origin --- .../assets/terraoriginum/lang/en_us.json | 22 +++++++ .../data/origins/origin_layers/origin.json | 1 + .../data/terraoriginum/origins/monarch.json | 17 +++++ .../monarchpowers/hydropetrification.json | 29 ++++++++ .../monarchpowers/hyperefficient_blood.json | 10 +++ .../monarchpowers/instant_transmission.json | 66 +++++++++++++++++++ .../powers/monarchpowers/nuclear_rush.json | 55 ++++++++++++++++ .../powers/monarchpowers/nyctophobia.json | 31 +++++++++ .../powers/monarchpowers/shining.json | 6 ++ .../powers/monarchpowers/solar_energy.json | 11 ++++ .../powers/monarchpowers/sun_fueled.json | 13 ++++ .../powers/monarchpowers/super_dash.json | 40 +++++++++++ 12 files changed, 301 insertions(+) create mode 100644 src/main/resources/data/terraoriginum/origins/monarch.json create mode 100644 src/main/resources/data/terraoriginum/powers/monarchpowers/hydropetrification.json create mode 100644 src/main/resources/data/terraoriginum/powers/monarchpowers/hyperefficient_blood.json create mode 100644 src/main/resources/data/terraoriginum/powers/monarchpowers/instant_transmission.json create mode 100644 src/main/resources/data/terraoriginum/powers/monarchpowers/nuclear_rush.json create mode 100644 src/main/resources/data/terraoriginum/powers/monarchpowers/nyctophobia.json create mode 100644 src/main/resources/data/terraoriginum/powers/monarchpowers/shining.json create mode 100644 src/main/resources/data/terraoriginum/powers/monarchpowers/solar_energy.json create mode 100644 src/main/resources/data/terraoriginum/powers/monarchpowers/sun_fueled.json create mode 100644 src/main/resources/data/terraoriginum/powers/monarchpowers/super_dash.json diff --git a/src/main/resources/assets/terraoriginum/lang/en_us.json b/src/main/resources/assets/terraoriginum/lang/en_us.json index 3cfa645..aee718e 100644 --- a/src/main/resources/assets/terraoriginum/lang/en_us.json +++ b/src/main/resources/assets/terraoriginum/lang/en_us.json @@ -211,6 +211,28 @@ "power.terraoriginum.muckunde-powers/hydrophobic.name": "Hydrophobic", "power.terraoriginum.muckunde-powers/hydrophobic.description": "your body completely ignores water", + //-----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", + "death.attack.terraoriginum:last_stand": "%1$s made their last stand.", "death.attack.terraoriginum:last_stand.player": "%1$s made their last stand trying to kill %2$s." diff --git a/src/main/resources/data/origins/origin_layers/origin.json b/src/main/resources/data/origins/origin_layers/origin.json index 6af652a..5e84047 100644 --- a/src/main/resources/data/origins/origin_layers/origin.json +++ b/src/main/resources/data/origins/origin_layers/origin.json @@ -14,6 +14,7 @@ "terraoriginum:florian", "terraoriginum:fairy", "terraoriginum:muckunde", + "terraoriginum:monarch", { "condition": { "type": "origins:equipped_item", diff --git a/src/main/resources/data/terraoriginum/origins/monarch.json b/src/main/resources/data/terraoriginum/origins/monarch.json new file mode 100644 index 0000000..ea607dd --- /dev/null +++ b/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 + } + \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/monarchpowers/hydropetrification.json b/src/main/resources/data/terraoriginum/powers/monarchpowers/hydropetrification.json new file mode 100644 index 0000000..d7b7995 --- /dev/null +++ b/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 + } + + } + ] + } +} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/monarchpowers/hyperefficient_blood.json b/src/main/resources/data/terraoriginum/powers/monarchpowers/hyperefficient_blood.json new file mode 100644 index 0000000..a33325a --- /dev/null +++ b/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" + ] + } + \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/monarchpowers/instant_transmission.json b/src/main/resources/data/terraoriginum/powers/monarchpowers/instant_transmission.json new file mode 100644 index 0000000..ca82f15 --- /dev/null +++ b/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" + } +} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/monarchpowers/nuclear_rush.json b/src/main/resources/data/terraoriginum/powers/monarchpowers/nuclear_rush.json new file mode 100644 index 0000000..b537e2a --- /dev/null +++ b/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" + } \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/monarchpowers/nyctophobia.json b/src/main/resources/data/terraoriginum/powers/monarchpowers/nyctophobia.json new file mode 100644 index 0000000..1a3938b --- /dev/null +++ b/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 + } + \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/monarchpowers/shining.json b/src/main/resources/data/terraoriginum/powers/monarchpowers/shining.json new file mode 100644 index 0000000..5ea6e92 --- /dev/null +++ b/src/main/resources/data/terraoriginum/powers/monarchpowers/shining.json @@ -0,0 +1,6 @@ +{ + "type": "origins:model_color", + "blue": 0.5, + "red": 1, + "green": 1 +} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/monarchpowers/solar_energy.json b/src/main/resources/data/terraoriginum/powers/monarchpowers/solar_energy.json new file mode 100644 index 0000000..1010b8a --- /dev/null +++ b/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 + } +} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/monarchpowers/sun_fueled.json b/src/main/resources/data/terraoriginum/powers/monarchpowers/sun_fueled.json new file mode 100644 index 0000000..2c3efc0 --- /dev/null +++ b/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" + } +} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/monarchpowers/super_dash.json b/src/main/resources/data/terraoriginum/powers/monarchpowers/super_dash.json new file mode 100644 index 0000000..bb91bf8 --- /dev/null +++ b/src/main/resources/data/terraoriginum/powers/monarchpowers/super_dash.json @@ -0,0 +1,40 @@ +{ + "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 minecraft:dust_color_transition 1 0 0 1 0 0 0 ~ ~ ~ 0.5 0 0.5 10 100 force" + }, + { + "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 +} +} \ No newline at end of file From 2b00c24bcb9c37d0dffe78a7f82533b3f460228f Mon Sep 17 00:00:00 2001 From: CosmoOrSth <79050675+CosmoOrSth@users.noreply.github.com> Date: Sat, 3 Aug 2024 16:49:53 +0530 Subject: [PATCH 4/4] Small update to 'Super Dash' ability --- .../terraoriginum/powers/monarchpowers/super_dash.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/resources/data/terraoriginum/powers/monarchpowers/super_dash.json b/src/main/resources/data/terraoriginum/powers/monarchpowers/super_dash.json index bb91bf8..d5fe0f1 100644 --- a/src/main/resources/data/terraoriginum/powers/monarchpowers/super_dash.json +++ b/src/main/resources/data/terraoriginum/powers/monarchpowers/super_dash.json @@ -13,7 +13,12 @@ }, { "type": "origins:execute_command", - "command": "particle minecraft:dust_color_transition 1 0 0 1 0 0 0 ~ ~ ~ 0.5 0 0.5 10 100 force" + "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",