From 621356df11ec687075ef950b483675010f8a5bb0 Mon Sep 17 00:00:00 2001 From: CosmoOrSth <79050675+CosmoOrSth@users.noreply.github.com> Date: Mon, 20 Jan 2025 16:39:35 +0530 Subject: [PATCH 01/12] Changes(real) - Fixed bug which caused the Monarch's solar energy to not be functional. - Changed texture of the cotton crop. - Changed texture of the cotton ball. - Added Item "Ghostly Cloth". - Renamed java class "sun_totem" to "sunTotem" to fit convention. --- CHANGELOG | 7 ++++-- .../smithy/terraoriginum/TerraOriginum.java | 10 ++++----- .../terraoriginum/items/ghostlyItems.java | 20 ++++++++++++++++++ .../items/{sun_totem.java => sunTotem.java} | 2 +- .../blockstates/cotton_crop_block.json | 12 +++++------ .../assets/terraoriginum/lang/en_us.json | 2 ++ .../models/block/cotton_crop_stage0.json | 4 ++-- .../models/block/cotton_crop_stage1.json | 4 ++-- .../models/block/cotton_crop_stage2.json | 4 ++-- .../models/block/cotton_crop_stage3.json | 4 ++-- .../models/block/cotton_crop_stage4.json | 7 ++++++ .../models/block/cotton_crop_stage5.json | 7 ++++++ .../models/item/ghostly_cloth.json | 6 ++++++ .../block/cotton_crop_block_stage0.png | Bin 228 -> 0 bytes .../block/cotton_crop_block_stage1.png | Bin 316 -> 0 bytes .../block/cotton_crop_block_stage2.png | Bin 430 -> 0 bytes .../block/cotton_crop_block_stage3.png | Bin 294 -> 0 bytes .../textures/block/crop_cotton_0.png | Bin 0 -> 449 bytes .../textures/block/crop_cotton_1.png | Bin 0 -> 474 bytes .../textures/block/crop_cotton_2.png | Bin 0 -> 508 bytes .../textures/block/crop_cotton_3.png | Bin 0 -> 562 bytes .../textures/block/crop_cotton_4.png | Bin 0 -> 577 bytes .../textures/block/crop_cotton_5.png | Bin 0 -> 589 bytes .../textures/item/cotton_ball.png | Bin 248 -> 614 bytes .../textures/item/ghostly_cloth.png | Bin 0 -> 373 bytes .../monarch-powers/instant_transmission.json | 4 ++-- .../monarch-powers/lackofsundamage.json | 2 +- .../powers/monarch-powers/nuclear_rush.json | 4 ++-- .../powers/monarch-powers/sun_fueled.json | 2 +- .../powers/monarch-powers/super_dash.json | 4 ++-- .../powers/monarch-powers/totem_fueled.json | 2 +- .../terraoriginum/recipes/ghostly_cloth.json | 20 ++++++++++++++++++ 32 files changed, 95 insertions(+), 32 deletions(-) create mode 100644 src/main/java/com/smithy/terraoriginum/items/ghostlyItems.java rename src/main/java/com/smithy/terraoriginum/items/{sun_totem.java => sunTotem.java} (95%) create mode 100644 src/main/resources/assets/terraoriginum/models/block/cotton_crop_stage4.json create mode 100644 src/main/resources/assets/terraoriginum/models/block/cotton_crop_stage5.json create mode 100644 src/main/resources/assets/terraoriginum/models/item/ghostly_cloth.json delete mode 100644 src/main/resources/assets/terraoriginum/textures/block/cotton_crop_block_stage0.png delete mode 100644 src/main/resources/assets/terraoriginum/textures/block/cotton_crop_block_stage1.png delete mode 100644 src/main/resources/assets/terraoriginum/textures/block/cotton_crop_block_stage2.png delete mode 100644 src/main/resources/assets/terraoriginum/textures/block/cotton_crop_block_stage3.png create mode 100644 src/main/resources/assets/terraoriginum/textures/block/crop_cotton_0.png create mode 100644 src/main/resources/assets/terraoriginum/textures/block/crop_cotton_1.png create mode 100644 src/main/resources/assets/terraoriginum/textures/block/crop_cotton_2.png create mode 100644 src/main/resources/assets/terraoriginum/textures/block/crop_cotton_3.png create mode 100644 src/main/resources/assets/terraoriginum/textures/block/crop_cotton_4.png create mode 100644 src/main/resources/assets/terraoriginum/textures/block/crop_cotton_5.png create mode 100644 src/main/resources/assets/terraoriginum/textures/item/ghostly_cloth.png create mode 100644 src/main/resources/data/terraoriginum/recipes/ghostly_cloth.json diff --git a/CHANGELOG b/CHANGELOG index 08fadf9..e7de6c8 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ # Changes -- changed namespace of 'monarchpowers' directory to 'monarch-powers' to fit convention. -- added 'farmland' to list of blocks that the Blight will turn to coarse dirt upon stepping on it. \ No newline at end of file +- Fixed bug which caused the Monarch's solar energy to not be functional. +- Changed texture of the cotton crop. +- Changed texture of the cotton ball. +- Added Item "Ghostly Cloth". +- Renamed java class "sun_totem" to "sunTotem" to fit convention. \ No newline at end of file diff --git a/src/main/java/com/smithy/terraoriginum/TerraOriginum.java b/src/main/java/com/smithy/terraoriginum/TerraOriginum.java index 13e6ebf..a4b95f6 100644 --- a/src/main/java/com/smithy/terraoriginum/TerraOriginum.java +++ b/src/main/java/com/smithy/terraoriginum/TerraOriginum.java @@ -2,10 +2,7 @@ package com.smithy.terraoriginum; import com.smithy.terraoriginum.blocks.cottonCropBlock; import com.smithy.terraoriginum.blocks.crucifix; -import com.smithy.terraoriginum.items.iconItems; -import com.smithy.terraoriginum.items.sun_totem; -import com.smithy.terraoriginum.items.cottonItems; -import com.smithy.terraoriginum.items.umbrella; +import com.smithy.terraoriginum.items.*; import com.smithy.terraoriginum.registry.modEnchantments; import net.fabricmc.api.ModInitializer; import net.fabricmc.fabric.api.itemgroup.v1.ItemGroupEvents; @@ -27,10 +24,11 @@ public class TerraOriginum implements ModInitializer { crucifix.register(); cottonCropBlock.register(); cottonItems.register(); - sun_totem.register(); + sunTotem.register(); + ghostlyItems.register(); ItemGroupEvents.modifyEntriesEvent(ItemGroups.TOOLS).register((content) -> content.add(umbrella.UMBRELLA)); - ItemGroupEvents.modifyEntriesEvent(ItemGroups.TOOLS).register((content) -> content.add(sun_totem.SUN_TOTEM)); + ItemGroupEvents.modifyEntriesEvent(ItemGroups.TOOLS).register((content) -> content.add(sunTotem.SUN_TOTEM)); 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)); diff --git a/src/main/java/com/smithy/terraoriginum/items/ghostlyItems.java b/src/main/java/com/smithy/terraoriginum/items/ghostlyItems.java new file mode 100644 index 0000000..378b4e6 --- /dev/null +++ b/src/main/java/com/smithy/terraoriginum/items/ghostlyItems.java @@ -0,0 +1,20 @@ +package com.smithy.terraoriginum.items; + +import net.fabricmc.fabric.api.item.v1.FabricItemSettings; +import net.minecraft.item.Item; +import net.minecraft.registry.Registries; +import net.minecraft.registry.Registry; +import net.minecraft.util.Identifier; + +public class ghostlyItems { + + public static final Item GHOSTLY_CLOTH = new Item(new FabricItemSettings()); + + public static void register() { + + Registry.register(Registries.ITEM, new Identifier("terraoriginum", "ghostly_cloth"), GHOSTLY_CLOTH); + + } + + +} diff --git a/src/main/java/com/smithy/terraoriginum/items/sun_totem.java b/src/main/java/com/smithy/terraoriginum/items/sunTotem.java similarity index 95% rename from src/main/java/com/smithy/terraoriginum/items/sun_totem.java rename to src/main/java/com/smithy/terraoriginum/items/sunTotem.java index 50eee4c..a0800df 100644 --- a/src/main/java/com/smithy/terraoriginum/items/sun_totem.java +++ b/src/main/java/com/smithy/terraoriginum/items/sunTotem.java @@ -7,7 +7,7 @@ import net.minecraft.registry.Registry; import net.minecraft.util.Identifier; import net.minecraft.util.Rarity; -public class sun_totem { +public class sunTotem { public static final Item SUN_TOTEM = new Item(new Item.Settings().maxCount(1).rarity(Rarity.EPIC)); diff --git a/src/main/resources/assets/terraoriginum/blockstates/cotton_crop_block.json b/src/main/resources/assets/terraoriginum/blockstates/cotton_crop_block.json index 54811bb..90fad72 100644 --- a/src/main/resources/assets/terraoriginum/blockstates/cotton_crop_block.json +++ b/src/main/resources/assets/terraoriginum/blockstates/cotton_crop_block.json @@ -4,25 +4,25 @@ "model": "terraoriginum:block/cotton_crop_stage0" }, "age=1": { - "model": "terraoriginum:block/cotton_crop_stage0" + "model": "terraoriginum:block/cotton_crop_stage1" }, "age=2": { "model": "terraoriginum:block/cotton_crop_stage1" }, "age=3": { - "model": "terraoriginum:block/cotton_crop_stage1" + "model": "terraoriginum:block/cotton_crop_stage2" }, "age=4": { - "model": "terraoriginum:block/cotton_crop_stage2" + "model": "terraoriginum:block/cotton_crop_stage3" }, "age=5": { - "model": "terraoriginum:block/cotton_crop_stage2" + "model": "terraoriginum:block/cotton_crop_stage3" }, "age=6": { - "model": "terraoriginum:block/cotton_crop_stage2" + "model": "terraoriginum:block/cotton_crop_stage4" }, "age=7": { - "model": "terraoriginum:block/cotton_crop_stage3" + "model": "terraoriginum:block/cotton_crop_stage5" } } } diff --git a/src/main/resources/assets/terraoriginum/lang/en_us.json b/src/main/resources/assets/terraoriginum/lang/en_us.json index f0611b9..a5c0e81 100644 --- a/src/main/resources/assets/terraoriginum/lang/en_us.json +++ b/src/main/resources/assets/terraoriginum/lang/en_us.json @@ -8,6 +8,8 @@ "item.terraoriginum.cotton_seeds": "Cotton Seeds", "item.terraoriginum.cotton_ball": "Cotton ball", + "item.terraoriginum.ghostly_cloth": "Ghostly Cloth", + "item.terraoriginum.sun_totem": "Sun Totem", "death.attack.lack_of_ectoplasm": "%1$s faded away", 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 index d30efc5..63325ea 100644 --- a/src/main/resources/assets/terraoriginum/models/block/cotton_crop_stage0.json +++ b/src/main/resources/assets/terraoriginum/models/block/cotton_crop_stage0.json @@ -1,7 +1,7 @@ { - "parent": "minecraft:block/crop", + "parent": "minecraft:block/cross", "textures": { - "crop": "terraoriginum:block/cotton_crop_block_stage0" + "cross": "terraoriginum:block/crop_cotton_0" } } 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 index 56163a7..e8df0e0 100644 --- a/src/main/resources/assets/terraoriginum/models/block/cotton_crop_stage1.json +++ b/src/main/resources/assets/terraoriginum/models/block/cotton_crop_stage1.json @@ -1,7 +1,7 @@ { - "parent": "minecraft:block/crop", + "parent": "minecraft:block/cross", "textures": { - "crop": "terraoriginum:block/cotton_crop_block_stage1" + "cross": "terraoriginum:block/crop_cotton_1" } } 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 index e9eaf81..7c2af95 100644 --- a/src/main/resources/assets/terraoriginum/models/block/cotton_crop_stage2.json +++ b/src/main/resources/assets/terraoriginum/models/block/cotton_crop_stage2.json @@ -1,7 +1,7 @@ { - "parent": "minecraft:block/crop", + "parent": "minecraft:block/cross", "textures": { - "crop": "terraoriginum:block/cotton_crop_block_stage2" + "cross": "terraoriginum:block/crop_cotton_2" } } 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 index 744385d..5a0ab03 100644 --- a/src/main/resources/assets/terraoriginum/models/block/cotton_crop_stage3.json +++ b/src/main/resources/assets/terraoriginum/models/block/cotton_crop_stage3.json @@ -1,7 +1,7 @@ { - "parent": "minecraft:block/crop", + "parent": "minecraft:block/cross", "textures": { - "crop": "terraoriginum:block/cotton_crop_block_stage3" + "cross": "terraoriginum:block/crop_cotton_3" } } diff --git a/src/main/resources/assets/terraoriginum/models/block/cotton_crop_stage4.json b/src/main/resources/assets/terraoriginum/models/block/cotton_crop_stage4.json new file mode 100644 index 0000000..5063029 --- /dev/null +++ b/src/main/resources/assets/terraoriginum/models/block/cotton_crop_stage4.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "terraoriginum:block/crop_cotton_4" + } + } + diff --git a/src/main/resources/assets/terraoriginum/models/block/cotton_crop_stage5.json b/src/main/resources/assets/terraoriginum/models/block/cotton_crop_stage5.json new file mode 100644 index 0000000..744e9ad --- /dev/null +++ b/src/main/resources/assets/terraoriginum/models/block/cotton_crop_stage5.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "terraoriginum:block/crop_cotton_5" + } + } + diff --git a/src/main/resources/assets/terraoriginum/models/item/ghostly_cloth.json b/src/main/resources/assets/terraoriginum/models/item/ghostly_cloth.json new file mode 100644 index 0000000..2936806 --- /dev/null +++ b/src/main/resources/assets/terraoriginum/models/item/ghostly_cloth.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "terraoriginum:item/ghostly_cloth" + } +} \ 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 deleted file mode 100644 index 4f65c1460650b2f12ab48bc2acf9a48129ddc4b6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 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~< 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 deleted file mode 100644 index 6b3bb542dd9c0c52f5472bb02af71e9677e01dd2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 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^ 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 deleted file mode 100644 index ce1b0e7ee922479818f53f7258aa4ba1d96d70b2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 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 diff --git a/src/main/resources/assets/terraoriginum/textures/block/crop_cotton_0.png b/src/main/resources/assets/terraoriginum/textures/block/crop_cotton_0.png new file mode 100644 index 0000000000000000000000000000000000000000..9e07042259d67d2f6c021371f923f3bfb95a66a5 GIT binary patch literal 449 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`3dtTpz6=aiY77hwEes65fI|H(?C}QgA;uvCaIypgtb#cOv z=0$mJ{}p_;J$u5{_W$6@6bYtFEQc)PV*YD>YHHWxPGxI}DiknbV8}EV-fO>J4QM5U zNQrAiiDPJphkp=*Z(>ezeon4JP-aeQrRm2+UZA`xNIoU8B-JXpC>2OC7#SFu=o%R7 z8d`=Jm|7W{TA3JY8yHv_7^ux*HAB&mo1c=IR*73f_`$thKn)sj8%i>BQ;SOya|>|m zVYo6U6sSiKq{qk8+0`%DmBHCr*C|rhM9*NizJ&@<(hMXS>>nEB?8=Z)Qc_TCrLUi! zS&~tjq?eqZtDg(;Wf91e`lWfL#i=Q}C8-r9rA4X5{7=ni0Zm}=boFyt=akR{0NX2r APXGV_ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/terraoriginum/textures/block/crop_cotton_1.png b/src/main/resources/assets/terraoriginum/textures/block/crop_cotton_1.png new file mode 100644 index 0000000000000000000000000000000000000000..f0b4befc7f3162a822ce6fa39c680e9eb3795372 GIT binary patch literal 474 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`3dtTpz6=aiY77hwEes65fI|H(?DB|bo;uvCaIypgtb#Vhn zz?HKf44UBaSEkg`Utqe`AOpLV+46F zPsvQH#H}Ix;NC8v1`W6kC7HRY#U+Wk1-SJvT$vLJ)FTMeKE+F;OwmH6sc>X zXRuq}LIo&k29gZ+4-Im5WymNgDJZtm*H6zZ$tX?IOU}>L&xQE12;@oq(!A2*)D+#4 b)QXbQqSRvkr{=SOCNOxq`njxgN@xNAxD1f9 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/terraoriginum/textures/block/crop_cotton_2.png b/src/main/resources/assets/terraoriginum/textures/block/crop_cotton_2.png new file mode 100644 index 0000000000000000000000000000000000000000..bd629d030714027e87edba7fb44188b3fbf4e3df GIT binary patch literal 508 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`3dtTpz6=aiY77hwEes65fI|H(?C{p0*;uvCaIypgtbql-e zU7r6F4NuORtS#}6eYw#eeLj&t{+resoZWfv&XL^=OBman*IN8b-?8!FPnF;HM?1gT zyEaZwIPMk2ut=M2=Yj+M{U*;3JISPQ+>B$8WZGnTp{MoB4tKVFZaV)py;>J!s4QV) z*zXu1SCd-F3bb3K#5JPCF*L-(KZwCMF()}cCs!dTGbgpu^kX6~P+k=zpORRTYL#4+ z3Zxi}42(>44UBaSEkg`Utqe`AOpLV+46FPsvQH#H}Ix;NC8v1`W6k zC7HRY#U+Wk1-SJvT$vLJ)FTMeKE+F;OwmH6sc>XXRuq}LIo&k29gZ+4-Im5 zWymNgDJZtm*H6zZ$tX?IOU}>L&xQE12;@oq(!A2*)D+#4)QXbQqSRvkr{=SOCNOxq L`njxgN@xNAKMJ6t literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/terraoriginum/textures/block/crop_cotton_3.png b/src/main/resources/assets/terraoriginum/textures/block/crop_cotton_3.png new file mode 100644 index 0000000000000000000000000000000000000000..2c2d6f936173cbdfb4848b0feb8dc24f7cc3ca8f GIT binary patch literal 562 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`3dtTpz6=aiY77hwEes65fI|H(?D6-7c#WBRRIHUSfkSmqA5a=}d&Yz&?a24^OCSj+8Tn;_A_pZvIl z^^BOnxo=NevNgUucQ@>Lae#aK!(a2?o#MLgaiQ$X0p?7%Z8H-R7PVWQkUkNoEWxJm zAosv0d9ekZ-vpi?KEjdJc9Ut7WQ!wPL&l^a)hY#{wJbF#@$qza^$T`oaCX*piqtjHGuW+fp#qdN14#z^ zhXy&jGGvsL6ck(O>!)XyWRxc9CFker=R$m01oEVQX|H(?D6-Yl#WBRRIwmUf4UHRp3=RNq_FY7JzrDi3=1{}PX+Cs zEsq`m~YG}NnaQ4N$1Jc?j z+79et6jp!1D)GTAfl-^~p-Xkg=fory)5AH8H+c>zFgut8zGS#7t-!m$!Ns3lMe@&bm&K zx+Z!CyY($pfRbh)$zcD`AZJ&GjFOUqVk>?9^vsfs(j>j){9OH9h%bvkp42bRD=kh< d(Je`>C@C#UE#`k}J_~39gQu&X%Q~loCIFw|yQ=^I literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/terraoriginum/textures/block/crop_cotton_5.png b/src/main/resources/assets/terraoriginum/textures/block/crop_cotton_5.png new file mode 100644 index 0000000000000000000000000000000000000000..6033edf03457f72991a4d8fa862d520c58a4c93d GIT binary patch literal 589 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`3dtTpz6=aiY77hwEes65fI|H(?D00x##WBRnswR3&cRxZ6hMhBr2 zT}p2&9P{94ra8pGJ7zeNE2X_WLPwD@x+8A zCw`YjbNlA-C$v?(+BjjEB+G=kTwXRJPrU*j2nI1T*gpP{^!Sd^L!f6wN?apK9797q z{DT;L6LXUDb8;1eGILTZO+O~`0_9af@+pZWsaDBFsX&Us$iT=%*T7iU&@#lp)XLD* z%EVaPz`)ADKy41I8H$G7{FKbJO57U45AN*(YS4h&P?DLOT3nKtTYy^+!<9LqKs|yW zJwBe!u71I;49?EFPLaAMdIr1oEmVM#W+2I6|Ii?3SB8v|l7eC@ef{*zl8n+Mz2y8{ r{alDIi$I>#FU>10PEFA*Nv$X;ElMrse`-DpXaa+$tDnm{r-UW|ZZE+W 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 index 1df0fbec9d3b0c96ed9f96ba7ec43c6b1d80ae4b..7c5b03cd1f615e1e3d49c1164e46ea4c805ef388 100644 GIT binary patch literal 614 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`3dtTpz6=aiY77hwEes65fI|H(?D00iw#WBR<^w~*@d@Tk7 zu9h-VjforA995`pl*(CuAZ~&B3r2$&hIXgq^v@n`C9cxfa>^!g=Dz&@`FVNQqx{2B z+O_w+uiGxojo!)2V$!!*=d{xC!Z|y0Z+kM`TzjhFal?^n{q>orRvR9RX^`k?5@=fU zdRCYr&tcW-```JMIG$CCJ)aX2s(SO4VFaf|^Bl8RyZnSTH2ioyGMM{kJ)4-<+-=DC z$uy9`@sdZ#1?@D&NZZ8omj5Tqz2Nx}!tgVQ_vV|($*Gag(itaLXlZS1^Uzl3J;VC9 z&h(Uhzj@jk@1m7Fye>drij=rUlsJZlc=!h~_$KBg=jY@q1ZC!=R+@fH1HPJKJt#6?Mlr#fL z2K$EwIlD4sl#~<{Tj}ekXO?7?Cg~;T=j!J|d|3qYq<(2$X>n?bZb@oINoi4PG5=HZ RSwIsQJYD@<);T3K0RYtd(MA9O delta 220 zcmaFH@`G`LNm?TIGJ(mY9zO;~0-#poTpu;)gk zfDYqk!6WY9g*=S?#2ZXfI*bnHGJL$4do0tMr-7$|Rb*4>{luK6S&rKd?P2=NwCQcd zVu3UU591ErV%{^^ESDL4gf}IX{CmK{aK1ou@@nx6b)e(;QX@Rme0>?TfNTyR27yb# PlR=cHtDnm{r-UW|2>4Ai diff --git a/src/main/resources/assets/terraoriginum/textures/item/ghostly_cloth.png b/src/main/resources/assets/terraoriginum/textures/item/ghostly_cloth.png new file mode 100644 index 0000000000000000000000000000000000000000..f078feca871f336c4eafdcff726c13938786798c GIT binary patch literal 373 zcmV-*0gC>KP)m)-bxEm11u?)iy zb+ADwzGmYwf=;Mw;qC&7smj!{%P?8c?bSI4=iJ@KF@wNr%$QMyqBvV(tBnK^LSP&3 zG>9e=", "compare_to": 50 }, @@ -48,7 +48,7 @@ }, { "type": "origins:change_resource", - "resource": "terraoriginum:monarchpowers/solar_energy", + "resource": "terraoriginum:monarch-powers/solar_energy", "change": -50, "operation": "add" } diff --git a/src/main/resources/data/terraoriginum/powers/monarch-powers/lackofsundamage.json b/src/main/resources/data/terraoriginum/powers/monarch-powers/lackofsundamage.json index 4f78cfb..88ae6d3 100644 --- a/src/main/resources/data/terraoriginum/powers/monarch-powers/lackofsundamage.json +++ b/src/main/resources/data/terraoriginum/powers/monarch-powers/lackofsundamage.json @@ -8,7 +8,7 @@ { "condition": { "type": "origins:resource", - "resource": "terraoriginum:monarchpowers/solar_energy", + "resource": "terraoriginum:monarch-powers/solar_energy", "comparison": "<", "compare_to": 50 }, diff --git a/src/main/resources/data/terraoriginum/powers/monarch-powers/nuclear_rush.json b/src/main/resources/data/terraoriginum/powers/monarch-powers/nuclear_rush.json index b537e2a..54f9651 100644 --- a/src/main/resources/data/terraoriginum/powers/monarch-powers/nuclear_rush.json +++ b/src/main/resources/data/terraoriginum/powers/monarch-powers/nuclear_rush.json @@ -1,7 +1,7 @@ { "condition": { "type": "origins:resource", - "resource": "terraoriginum:monarchpowers/solar_energy", + "resource": "terraoriginum:monarch-powers/solar_energy", "comparison": ">=", "compare_to": 100 }, @@ -35,7 +35,7 @@ }, { "type": "origins:change_resource", - "resource": "terraoriginum:monarchpowers/solar_energy", + "resource": "terraoriginum:monarch-powers/solar_energy", "change": -100, "operation": "add" }, diff --git a/src/main/resources/data/terraoriginum/powers/monarch-powers/sun_fueled.json b/src/main/resources/data/terraoriginum/powers/monarch-powers/sun_fueled.json index 4f79d4a..4e7b837 100644 --- a/src/main/resources/data/terraoriginum/powers/monarch-powers/sun_fueled.json +++ b/src/main/resources/data/terraoriginum/powers/monarch-powers/sun_fueled.json @@ -6,7 +6,7 @@ "interval": 40, "entity_action": { "type": "origins:change_resource", - "resource": "terraoriginum:monarchpowers/solar_energy", + "resource": "terraoriginum:monarch-powers/solar_energy", "change": 10, "operation": "add" } diff --git a/src/main/resources/data/terraoriginum/powers/monarch-powers/super_dash.json b/src/main/resources/data/terraoriginum/powers/monarch-powers/super_dash.json index 2fac9b6..53b6094 100644 --- a/src/main/resources/data/terraoriginum/powers/monarch-powers/super_dash.json +++ b/src/main/resources/data/terraoriginum/powers/monarch-powers/super_dash.json @@ -21,7 +21,7 @@ }, { "type": "origins:change_resource", - "resource": "terraoriginum:monarchpowers/solar_energy", + "resource": "terraoriginum:monarch-powers/solar_energy", "change": -300 } ] @@ -31,7 +31,7 @@ }, "condition": { "type": "origins:resource", - "resource": "terraoriginum:monarchpowers/solar_energy", + "resource": "terraoriginum:monarch-powers/solar_energy", "comparison": ">=", "compare_to": 200 }, diff --git a/src/main/resources/data/terraoriginum/powers/monarch-powers/totem_fueled.json b/src/main/resources/data/terraoriginum/powers/monarch-powers/totem_fueled.json index 4865875..114bebd 100644 --- a/src/main/resources/data/terraoriginum/powers/monarch-powers/totem_fueled.json +++ b/src/main/resources/data/terraoriginum/powers/monarch-powers/totem_fueled.json @@ -17,7 +17,7 @@ "interval": 40, "entity_action": { "type": "origins:change_resource", - "resource": "terraoriginum:monarchpowers/solar_energy", + "resource": "terraoriginum:monarch-powers/solar_energy", "change": 4, "operation": "add" } diff --git a/src/main/resources/data/terraoriginum/recipes/ghostly_cloth.json b/src/main/resources/data/terraoriginum/recipes/ghostly_cloth.json new file mode 100644 index 0000000..617b5ac --- /dev/null +++ b/src/main/resources/data/terraoriginum/recipes/ghostly_cloth.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + " # ", + "#E#", + " # " + ], + "key": { + "#": { + "item": "terraoriginum:cotton_ball" + }, + "E": { + "item": "minecraft:echo_shard" + } + }, + "result": { + "item": "terraoriginum:ghostly_cloth", + "count": 1 + } +} \ No newline at end of file From 146dba3dac40b9ab63ea31efcf3aef00e27027b6 Mon Sep 17 00:00:00 2001 From: CosmoOrSth <79050675+CosmoOrSth@users.noreply.github.com> Date: Mon, 20 Jan 2025 16:40:14 +0530 Subject: [PATCH 02/12] Update en_us.json --- .../assets/terraoriginum/lang/en_us.json | 58 +++++++------------ 1 file changed, 21 insertions(+), 37 deletions(-) diff --git a/src/main/resources/assets/terraoriginum/lang/en_us.json b/src/main/resources/assets/terraoriginum/lang/en_us.json index a5c0e81..3898808 100644 --- a/src/main/resources/assets/terraoriginum/lang/en_us.json +++ b/src/main/resources/assets/terraoriginum/lang/en_us.json @@ -227,42 +227,26 @@ //-----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.monarch-powers/hyperefficient_blood.name": "Hyperefficient Blood", - "power.terraoriginum.monarch-powers/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.monarch-powers/solar_energy.name": "Solar Energy", - "power.terraoriginum.monarch-powers/solar_energy.description": "You draw energy from the sun and store it within your body, and access it at will to use various abilities. But if you run out, your body will no longer be able to keep itself together", - "power.terraoriginum.monarch-powers/sun_fueled.name": "Sun Fueled", - "power.terraoriginum.monarch-powers/sun_fueled.description": "You have evolved to draw power from the sun, leading you to become more powerful during the day", - "power.terraoriginum.monarch-powers/nuclear_rush.name": "Nuclear Rush", - "power.terraoriginum.monarch-powers/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.monarch-powers/instant_transmission.name": "Instant Transmission", - "power.terraoriginum.monarch-powers/instant_transmission.description": "Use the thermonuclear energy stored in your body to erase the space between you and your target", - "power.terraoriginum.monarch-powers/nyctophobia.name": "Nyctophobia", - "power.terraoriginum.monarch-powers/nyctophobia.description": "Your power is derived from the sun, making you weaker during the night", - "power.terraoriginum.monarch-powers/shining.name": "Shining", - "power.terraoriginum.monarch-powers/shining.description": "An entire lifetime of absorbing the sun's energy makes you radiate it's light", - "power.terraoriginum.monarch-powers/super_dash.name": "Super Dash", - "power.terraoriginum.monarch-powers/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.terraoriginum.monarch-powers/hydropetrification.name": "Hydropetrification", - "power.terraoriginum.monarch-powers/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", - "power.terraoriginum.monarch-powers/totem_fueled.name": "Totem Fueled", - "power.terraoriginum.monarch-powers/totem_fueled.description": "Craft a Sun Totem and hold it to get small amounts of sun energy even outside the sun", - - //-----Blight-----// - "origin.terraoriginum.blight.name": "Blight", - "origin.terraoriginum.blight.description": "Blights are foul and disgusting creatures. Created in the depths of the nether, they exist for the purpose of bring rot and wither to all forms of nature.", - "power.terraoriginum.blight-powers/bane_of_agriculture.name": "Bane of Agriculture", - "power.terraoriginum.blight-powers/bane_of_agriculture.description": "Through a process not very well understood, blights can rapidly reverse the growth of all crops in about a 6 block radius around themselves", - "power.terraoriginum.blight-powers/blighted_feet.name": "Blighted Feet", - "power.terraoriginum.blight-powers/blighted_feet.description": "The Blight's cursed feet destroy life within the soil they touch, turning it to course dirt.", - "power.terraoriginum.blight-powers/nether_spawn.name": "Nether Spawn", - "power.terraoriginum.blight-powers/nether_spawn.description": "Blights created in the nether, hence you will start there when you spawn. Curiously, they are not immune to fire like most other nether inhabitants", - "power.terraoriginum.blight-powers/foul_flesh.name": "Foul Flesh", - "power.terraoriginum.blight-powers/foul_flesh.description": "The Blight's flesh is foul and rotten, and as such no poison can effect it.", - "power.terraoriginum.blight-powers/florivory.name": "Florvory", - "power.terraoriginum.blight-powers/florivory.description": "The Blight cannot naturally regenerate, and needs to devour flowers to reconstitute it's body if damaged.", - "power.terraoriginum.blight-powers/dead_cells.name": "Dead Cells", - "power.terraoriginum.blight-powers/dead_cells.description": "A large portion of a Blight's body is comprised of dead cells, hitting them does not damage it's vital functions, essentially acting as a small amount of armour for the blight." + "origin.terraoriginum.monarch.description": "A prideful race that have bioengineered themselves to draw energy directly from the sun.", + "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. But if you run out, your body will no longer be able to keep itself together", + "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.terraoriginum.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", + "power.terraoriginum.monarchpowers/totem_fueled.name": "Totem Fueled", + "power.terraoriginum.monarchpowers/totem_fueled.description": "Craft a Sun Totem and hold it to get small amounts of sun energy even outside the sun" } \ No newline at end of file From 8e2ec142b1623f76d712939777719f48fa625d16 Mon Sep 17 00:00:00 2001 From: Ryan <78032176+BigGaemer@users.noreply.github.com> Date: Tue, 21 Jan 2025 19:57:28 +0200 Subject: [PATCH 03/12] added robes items --- CHANGELOG | 4 +- build.gradle | 21 ++++- gradle.properties | 5 +- gradle/wrapper/gradle-wrapper.properties | 2 +- .../smithy/terraoriginum/TerraOriginum.java | 1 + .../customMaterials/robesMaterial.java | 89 +++++++++++++++++++ .../terraoriginum/items/robesItems.java | 34 +++++++ .../data/minecraft/tags/functions/tick.json | 5 -- 8 files changed, 151 insertions(+), 10 deletions(-) create mode 100644 src/main/java/com/smithy/terraoriginum/customMaterials/robesMaterial.java create mode 100644 src/main/java/com/smithy/terraoriginum/items/robesItems.java delete mode 100644 src/main/resources/data/minecraft/tags/functions/tick.json diff --git a/CHANGELOG b/CHANGELOG index e7de6c8..ef0c6fd 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,8 @@ # Changes +## 1.20.1-1.0.6 - Fixed bug which caused the Monarch's solar energy to not be functional. - Changed texture of the cotton crop. - Changed texture of the cotton ball. - Added Item "Ghostly Cloth". -- Renamed java class "sun_totem" to "sunTotem" to fit convention. \ No newline at end of file +- Renamed java class "sun_totem" to "sunTotem" to fit convention. +- added robes \ No newline at end of file diff --git a/build.gradle b/build.gradle index a71990d..1637348 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'fabric-loom' version '1.5-SNAPSHOT' + id 'fabric-loom' version '1.9-SNAPSHOT' id 'maven-publish' } @@ -32,6 +32,21 @@ repositories { name "jitpack" url "https://jitpack.io" } + maven { + name = 'GeckoLib' + url 'https://dl.cloudsmith.io/public/geckolib3/geckolib/maven/' + content { + includeGroup("software.bernie.geckolib") + } + } + maven { + name = 'GeckoLib' + url 'https://dl.cloudsmith.io/public/geckolib3/geckolib/maven/' + content { + includeGroupByRegex("software\\.bernie.*") + includeGroup("com.eliotlash.mclib") + } +} } dependencies { @@ -40,12 +55,16 @@ dependencies { modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" + modImplementation "com.terraformersmc:modmenu:${project.modmenu_version}" + modImplementation "com.github.apace100:origins-fabric:${project.origins_version}" modImplementation "com.github.apace100:apoli:${project.apoli_version}" modApi("com.github.Virtuoel:Pehkui:${pehkui_version}", { exclude group: "net.fabricmc.fabric-api" }) + modImplementation("software.bernie.geckolib:geckolib-fabric-${minecraft_version}:${geckolib_version}") + implementation("com.eliotlash.mclib:mclib:20") } processResources { diff --git a/gradle.properties b/gradle.properties index 09d6e67..a017ce0 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,7 +4,7 @@ org.gradle.jvmargs=-Xmx2G # Fabric Properties minecraft_version=1.20.1 yarn_mappings=1.20.1+build.10 -loader_version=0.15.6 +loader_version=0.16.10 # Mod Properties mod_version=1.20.1-1.0.4 @@ -12,8 +12,9 @@ maven_group=com.smithy archives_base_name=TerraOriginum # Dependencies -fabric_version=0.91.0+1.20.1 +fabric_version=0.92.3+1.20.1 modmenu_version=7.2.2 pehkui_version=3.7.8 origins_version=v1.10.0 apoli_version=2.9.0 +geckolib_version=4.7 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index a595206..81aa1c0 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/src/main/java/com/smithy/terraoriginum/TerraOriginum.java b/src/main/java/com/smithy/terraoriginum/TerraOriginum.java index a4b95f6..7c1ee2c 100644 --- a/src/main/java/com/smithy/terraoriginum/TerraOriginum.java +++ b/src/main/java/com/smithy/terraoriginum/TerraOriginum.java @@ -26,6 +26,7 @@ public class TerraOriginum implements ModInitializer { cottonItems.register(); sunTotem.register(); ghostlyItems.register(); + robesItems.register(); ItemGroupEvents.modifyEntriesEvent(ItemGroups.TOOLS).register((content) -> content.add(umbrella.UMBRELLA)); ItemGroupEvents.modifyEntriesEvent(ItemGroups.TOOLS).register((content) -> content.add(sunTotem.SUN_TOTEM)); diff --git a/src/main/java/com/smithy/terraoriginum/customMaterials/robesMaterial.java b/src/main/java/com/smithy/terraoriginum/customMaterials/robesMaterial.java new file mode 100644 index 0000000..4e8ce58 --- /dev/null +++ b/src/main/java/com/smithy/terraoriginum/customMaterials/robesMaterial.java @@ -0,0 +1,89 @@ +package com.smithy.terraoriginum.customMaterials; + +import net.minecraft.item.ArmorItem; +import net.minecraft.item.ArmorMaterial; +import net.minecraft.recipe.Ingredient; +import net.minecraft.sound.SoundEvent; +import net.minecraft.sound.SoundEvents; + +import java.util.function.Supplier; + +import com.smithy.terraoriginum.TerraOriginum; +import com.smithy.terraoriginum.items.cottonItems; + +public enum robesMaterial implements ArmorMaterial { + ROBES("robes", 42, new int[] { 4, 9, 7, 4 }, 19, + SoundEvents.ITEM_ARMOR_EQUIP_NETHERITE, 5, 0.1f, () -> Ingredient.ofItems(cottonItems.COTTON_BALL)); + + private final String name; + private final int durabilityMultiplier; + private final int[] protectionAmounts; + private final int enchantability; + private final SoundEvent equipSound; + private final float toughness; + private final float knockbackResistance; + private final Supplier repairIngredient; + + private static final int[] BASE_DURABILITY = { 11, 16, 15, 13 }; + + robesMaterial( + String name, + int durabilityMultiplier, + int[] protectionAmounts, + int enchantability, + SoundEvent equipSound, + float toughness, + float knockbackResistance, + Supplier repairIngredient + ) { + + this.name = name; + this.durabilityMultiplier = durabilityMultiplier; + this.protectionAmounts = protectionAmounts; + this.enchantability = enchantability; + this.equipSound = equipSound; + this.toughness = toughness; + this.knockbackResistance = knockbackResistance; + this.repairIngredient = repairIngredient; + } + + @Override + public int getDurability(ArmorItem.Type type) { + return BASE_DURABILITY[type.ordinal()] * this.durabilityMultiplier; + } + + @Override + public int getProtection(ArmorItem.Type type) { + return protectionAmounts[type.ordinal()]; + } + + @Override + public int getEnchantability() { + return this.enchantability; + } + + @Override + public SoundEvent getEquipSound() { + return this.equipSound; + } + + @Override + public Ingredient getRepairIngredient() { + return this.repairIngredient.get(); + } + + @Override + public String getName() { + return TerraOriginum.MOD_ID + ":" + this.name; + } + + @Override + public float getToughness() { + return this.toughness; + } + + @Override + public float getKnockbackResistance() { + return this.knockbackResistance; + } +} \ No newline at end of file diff --git a/src/main/java/com/smithy/terraoriginum/items/robesItems.java b/src/main/java/com/smithy/terraoriginum/items/robesItems.java new file mode 100644 index 0000000..abf778b --- /dev/null +++ b/src/main/java/com/smithy/terraoriginum/items/robesItems.java @@ -0,0 +1,34 @@ +package com.smithy.terraoriginum.items; + +import com.smithy.terraoriginum.TerraOriginum; +import com.smithy.terraoriginum.customMaterials.robesMaterial; + +import net.fabricmc.fabric.api.item.v1.FabricItemSettings; +import net.fabricmc.fabric.api.itemgroup.v1.ItemGroupEvents; +import net.minecraft.item.ArmorItem; +import net.minecraft.item.Item; +import net.minecraft.item.ItemGroups; +import net.minecraft.registry.Registries; +import net.minecraft.registry.Registry; +import net.minecraft.util.Identifier; +import net.minecraft.util.Rarity; + +public class robesItems { + + public static final Item ROBES_HELMET = new ArmorItem(robesMaterial.ROBES, ArmorItem.Type.HELMET, new FabricItemSettings().rarity(Rarity.EPIC)); + public static final Item ROBES_CHESTPLATE = new ArmorItem(robesMaterial.ROBES, ArmorItem.Type.CHESTPLATE, new FabricItemSettings().rarity(Rarity.EPIC)); + public static final Item ROBES_LEGGING = new ArmorItem(robesMaterial.ROBES, ArmorItem.Type.LEGGINGS, new FabricItemSettings().rarity(Rarity.EPIC)); + public static final Item ROBES_BOOTS = new ArmorItem(robesMaterial.ROBES, ArmorItem.Type.BOOTS, new FabricItemSettings().rarity(Rarity.EPIC)); + + public static void register() { + Registry.register(Registries.ITEM, new Identifier(TerraOriginum.MOD_ID, "robes_helmet"), ROBES_HELMET); + Registry.register(Registries.ITEM, new Identifier(TerraOriginum.MOD_ID, "robes_chestplate"), ROBES_CHESTPLATE); + Registry.register(Registries.ITEM, new Identifier(TerraOriginum.MOD_ID, "robes_leggings"), ROBES_LEGGING); + Registry.register(Registries.ITEM, new Identifier(TerraOriginum.MOD_ID, "robes_boots"), ROBES_BOOTS); + + ItemGroupEvents.modifyEntriesEvent(ItemGroups.COMBAT).register((content) -> content.add(ROBES_HELMET)); + ItemGroupEvents.modifyEntriesEvent(ItemGroups.COMBAT).register((content) -> content.add(ROBES_CHESTPLATE)); + ItemGroupEvents.modifyEntriesEvent(ItemGroups.COMBAT).register((content) -> content.add(ROBES_LEGGING)); + ItemGroupEvents.modifyEntriesEvent(ItemGroups.COMBAT).register((content) -> content.add(ROBES_BOOTS)); + } +} diff --git a/src/main/resources/data/minecraft/tags/functions/tick.json b/src/main/resources/data/minecraft/tags/functions/tick.json deleted file mode 100644 index 7f5e242..0000000 --- a/src/main/resources/data/minecraft/tags/functions/tick.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "terraoriginum:tick" - ] -} \ No newline at end of file From f2e2ae2bf982d63ca2fe18798a85c5aa961acc91 Mon Sep 17 00:00:00 2001 From: Ryan <78032176+BigGaemer@users.noreply.github.com> Date: Wed, 22 Jan 2025 19:36:39 +0200 Subject: [PATCH 04/12] added munch --- .vscode/settings.json | 3 +- CHANGELOG | 3 +- .../smithy/terraoriginum/TerraOriginum.java | 3 + .../smithy/terraoriginum/items/iconItems.java | 2 + .../terraoriginum/mixin/EntityMixin.java | 16 +- .../mixin/PowderSnowBlockMixin.java | 24 + .../power/canStandOnPowderSnow.java | 11 + .../power/preventBlockSlowness.java | 11 + .../terraoriginum/registry/modPowers.java | 24 + .../assets/terraoriginum/lang/en_us.json | 510 ++++++++++-------- .../terraoriginum/models/item/tiny.json | 6 + .../terraoriginum/textures/item/tiny.png | Bin 0 -> 90 bytes .../data/origins/origin_layers/origin.json | 1 + .../data/terraoriginum/origins/munch.json | 22 + .../powers/lato-powers/rage_addition.json | 36 +- .../powers/munch-powers/better_health.json | 7 + .../powers/munch-powers/climbing.json | 79 +++ .../powers/munch-powers/little_health.json | 8 + .../powers/munch-powers/mounting.json | 56 ++ .../powers/munch-powers/nimble.json | 37 ++ .../powers/munch-powers/quiet.json | 7 + .../powers/munch-powers/short_arms.json | 8 + .../powers/munch-powers/speedy_bastard.json | 22 + .../powers/munch-powers/tiny.json | 8 + .../powers/munch-powers/tiny_appetite.json | 8 + .../powers/munch-powers/tiny_motion.json | 8 + .../powers/munch-powers/tiny_width.json | 9 + .../powers/munch-powers/too_tiny.json | 21 + .../tags/entity_types/hostiles.json | 33 ++ src/main/resources/fabric.mod.json | 3 +- src/main/resources/terra.mixins.json | 4 +- 31 files changed, 730 insertions(+), 260 deletions(-) create mode 100644 src/main/java/com/smithy/terraoriginum/mixin/PowderSnowBlockMixin.java create mode 100644 src/main/java/com/smithy/terraoriginum/power/canStandOnPowderSnow.java create mode 100644 src/main/java/com/smithy/terraoriginum/power/preventBlockSlowness.java create mode 100644 src/main/java/com/smithy/terraoriginum/registry/modPowers.java create mode 100644 src/main/resources/assets/terraoriginum/models/item/tiny.json create mode 100644 src/main/resources/assets/terraoriginum/textures/item/tiny.png create mode 100644 src/main/resources/data/terraoriginum/origins/munch.json create mode 100644 src/main/resources/data/terraoriginum/powers/munch-powers/better_health.json create mode 100644 src/main/resources/data/terraoriginum/powers/munch-powers/climbing.json create mode 100755 src/main/resources/data/terraoriginum/powers/munch-powers/little_health.json create mode 100644 src/main/resources/data/terraoriginum/powers/munch-powers/mounting.json create mode 100644 src/main/resources/data/terraoriginum/powers/munch-powers/nimble.json create mode 100644 src/main/resources/data/terraoriginum/powers/munch-powers/quiet.json create mode 100644 src/main/resources/data/terraoriginum/powers/munch-powers/short_arms.json create mode 100644 src/main/resources/data/terraoriginum/powers/munch-powers/speedy_bastard.json create mode 100644 src/main/resources/data/terraoriginum/powers/munch-powers/tiny.json create mode 100644 src/main/resources/data/terraoriginum/powers/munch-powers/tiny_appetite.json create mode 100644 src/main/resources/data/terraoriginum/powers/munch-powers/tiny_motion.json create mode 100644 src/main/resources/data/terraoriginum/powers/munch-powers/tiny_width.json create mode 100644 src/main/resources/data/terraoriginum/powers/munch-powers/too_tiny.json create mode 100644 src/main/resources/data/terraoriginum/tags/entity_types/hostiles.json diff --git a/.vscode/settings.json b/.vscode/settings.json index 0be1c0c..d16746c 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,4 +1,5 @@ { "java.configuration.updateBuildConfiguration": "automatic", - "java.compile.nullAnalysis.mode": "automatic" + "java.compile.nullAnalysis.mode": "automatic", + "java.jdt.ls.vmargs": "-XX:+UseParallelGC -XX:GCTimeRatio=4 -XX:AdaptiveSizePolicyWeight=90 -Dsun.zip.disableMemoryMapping=true -Xmx2G -Xms100m -Xlog:disable" } \ No newline at end of file diff --git a/CHANGELOG b/CHANGELOG index ef0c6fd..541014a 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -5,4 +5,5 @@ - Changed texture of the cotton ball. - Added Item "Ghostly Cloth". - Renamed java class "sun_totem" to "sunTotem" to fit convention. -- added robes \ No newline at end of file +- added robes +- added the munch \ No newline at end of file diff --git a/src/main/java/com/smithy/terraoriginum/TerraOriginum.java b/src/main/java/com/smithy/terraoriginum/TerraOriginum.java index 7c1ee2c..05f213b 100644 --- a/src/main/java/com/smithy/terraoriginum/TerraOriginum.java +++ b/src/main/java/com/smithy/terraoriginum/TerraOriginum.java @@ -4,6 +4,8 @@ import com.smithy.terraoriginum.blocks.cottonCropBlock; import com.smithy.terraoriginum.blocks.crucifix; import com.smithy.terraoriginum.items.*; import com.smithy.terraoriginum.registry.modEnchantments; +import com.smithy.terraoriginum.registry.modPowers; + import net.fabricmc.api.ModInitializer; import net.fabricmc.fabric.api.itemgroup.v1.ItemGroupEvents; import net.minecraft.item.ItemGroups; @@ -27,6 +29,7 @@ public class TerraOriginum implements ModInitializer { sunTotem.register(); ghostlyItems.register(); robesItems.register(); + modPowers.register(); ItemGroupEvents.modifyEntriesEvent(ItemGroups.TOOLS).register((content) -> content.add(umbrella.UMBRELLA)); ItemGroupEvents.modifyEntriesEvent(ItemGroups.TOOLS).register((content) -> content.add(sunTotem.SUN_TOTEM)); diff --git a/src/main/java/com/smithy/terraoriginum/items/iconItems.java b/src/main/java/com/smithy/terraoriginum/items/iconItems.java index d63b5ad..dc1ac60 100644 --- a/src/main/java/com/smithy/terraoriginum/items/iconItems.java +++ b/src/main/java/com/smithy/terraoriginum/items/iconItems.java @@ -11,10 +11,12 @@ public class iconItems { public static final Item MYNC_EYE = new Item(new Item.Settings().maxCount(1).rarity(Rarity.EPIC)); public static final Item SPIRIT = new Item(new Item.Settings().maxCount(1).rarity(Rarity.EPIC)); + public static final Item TINY = new Item(new Item.Settings().maxCount(1).rarity(Rarity.EPIC)); public static void register() { Registry.register(Registries.ITEM, new Identifier(TerraOriginum.MOD_ID, "mync_eye"), MYNC_EYE); Registry.register(Registries.ITEM, new Identifier(TerraOriginum.MOD_ID, "spirit"), SPIRIT); + Registry.register(Registries.ITEM, new Identifier(TerraOriginum.MOD_ID, "tiny"), TINY); } } diff --git a/src/main/java/com/smithy/terraoriginum/mixin/EntityMixin.java b/src/main/java/com/smithy/terraoriginum/mixin/EntityMixin.java index bfdea9e..3aac6ca 100644 --- a/src/main/java/com/smithy/terraoriginum/mixin/EntityMixin.java +++ b/src/main/java/com/smithy/terraoriginum/mixin/EntityMixin.java @@ -1,15 +1,21 @@ package com.smithy.terraoriginum.mixin; import com.smithy.terraoriginum.items.umbrella; +import com.smithy.terraoriginum.power.preventBlockSlowness; + +import io.github.apace100.apoli.component.PowerHolderComponent; +import net.minecraft.block.BlockState; import net.minecraft.entity.Entity; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Box; +import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; @Mixin(Entity.class) @@ -33,6 +39,14 @@ public abstract class EntityMixin { } } - + @Inject(method = "slowMovement", at = @At("HEAD"), cancellable = true) + private void terraoriginum$preventBlockSlowness(BlockState state, Vec3d multiplier, CallbackInfo ci) { + for (preventBlockSlowness power : PowerHolderComponent.getPowers((Entity) (Object) this, preventBlockSlowness.class)) { + if (power.isActive()) { + ci.cancel(); + return; + } + } + } } \ No newline at end of file diff --git a/src/main/java/com/smithy/terraoriginum/mixin/PowderSnowBlockMixin.java b/src/main/java/com/smithy/terraoriginum/mixin/PowderSnowBlockMixin.java new file mode 100644 index 0000000..c8f558c --- /dev/null +++ b/src/main/java/com/smithy/terraoriginum/mixin/PowderSnowBlockMixin.java @@ -0,0 +1,24 @@ +package com.smithy.terraoriginum.mixin; + +import io.github.apace100.apoli.component.PowerHolderComponent; +import net.minecraft.block.PowderSnowBlock; +import net.minecraft.entity.Entity; +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.CallbackInfoReturnable; + +import com.smithy.terraoriginum.power.canStandOnPowderSnow; + +@Mixin(PowderSnowBlock.class) +public class PowderSnowBlockMixin { + @Inject(method = "canWalkOnPowderSnow", at = @At("HEAD"), cancellable = true) + private static void terraoriginum$canStandOnPowderSnow(Entity entity, CallbackInfoReturnable cir) { + for (canStandOnPowderSnow canStandOnPowderSnowPower : PowerHolderComponent.getPowers(entity, canStandOnPowderSnow.class)) { + if (canStandOnPowderSnowPower.isActive()) { + cir.setReturnValue(true); + return; + } + } + } +} diff --git a/src/main/java/com/smithy/terraoriginum/power/canStandOnPowderSnow.java b/src/main/java/com/smithy/terraoriginum/power/canStandOnPowderSnow.java new file mode 100644 index 0000000..92675a8 --- /dev/null +++ b/src/main/java/com/smithy/terraoriginum/power/canStandOnPowderSnow.java @@ -0,0 +1,11 @@ +package com.smithy.terraoriginum.power; + +import io.github.apace100.apoli.power.Power; +import io.github.apace100.apoli.power.PowerType; +import net.minecraft.entity.LivingEntity; + +public class canStandOnPowderSnow extends Power { + public canStandOnPowderSnow(PowerType type, LivingEntity entity) { + super(type, entity); + } +} diff --git a/src/main/java/com/smithy/terraoriginum/power/preventBlockSlowness.java b/src/main/java/com/smithy/terraoriginum/power/preventBlockSlowness.java new file mode 100644 index 0000000..6a6212c --- /dev/null +++ b/src/main/java/com/smithy/terraoriginum/power/preventBlockSlowness.java @@ -0,0 +1,11 @@ +package com.smithy.terraoriginum.power; + +import io.github.apace100.apoli.power.Power; +import io.github.apace100.apoli.power.PowerType; +import net.minecraft.entity.LivingEntity; + +public class preventBlockSlowness extends Power { + public preventBlockSlowness(PowerType type, LivingEntity entity) { + super(type, entity); + } +} \ No newline at end of file diff --git a/src/main/java/com/smithy/terraoriginum/registry/modPowers.java b/src/main/java/com/smithy/terraoriginum/registry/modPowers.java new file mode 100644 index 0000000..2fc4cd8 --- /dev/null +++ b/src/main/java/com/smithy/terraoriginum/registry/modPowers.java @@ -0,0 +1,24 @@ +package com.smithy.terraoriginum.registry; + +import com.smithy.terraoriginum.TerraOriginum; +import com.smithy.terraoriginum.power.canStandOnPowderSnow; +import com.smithy.terraoriginum.power.preventBlockSlowness; + +import io.github.apace100.apoli.power.factory.PowerFactory; +import io.github.apace100.apoli.registry.ApoliRegistries; +import io.github.apace100.calio.data.SerializableData; +import net.minecraft.registry.Registry; +import net.minecraft.util.Identifier; + +public class modPowers { + + public static final PowerFactory CAN_WALK_ON_POWDER_SNOW = new PowerFactory<>( new Identifier(TerraOriginum.MOD_ID, "can_walk_on_powder_snow"), new SerializableData(), data -> (type, entity) -> new canStandOnPowderSnow(type, entity)).allowCondition(); + public static final PowerFactory PREVENT_BLOCK_SLOWNESS = new PowerFactory<>(new Identifier(TerraOriginum.MOD_ID, "prevent_block_slowness"), new SerializableData(), data -> (type, entity) -> new preventBlockSlowness(type, entity)).allowCondition(); + + + public static void register() { + Registry.register(ApoliRegistries.POWER_FACTORY, CAN_WALK_ON_POWDER_SNOW.getSerializerId(), CAN_WALK_ON_POWDER_SNOW); + Registry.register(ApoliRegistries.POWER_FACTORY, PREVENT_BLOCK_SLOWNESS.getSerializerId(), PREVENT_BLOCK_SLOWNESS); + + } +} diff --git a/src/main/resources/assets/terraoriginum/lang/en_us.json b/src/main/resources/assets/terraoriginum/lang/en_us.json index 3898808..a7fbe77 100644 --- a/src/main/resources/assets/terraoriginum/lang/en_us.json +++ b/src/main/resources/assets/terraoriginum/lang/en_us.json @@ -1,252 +1,288 @@ { - //-----Icon Items-----// - "item.terraoriginum.mync_eye": "Mync Eye", - "item.terraoriginum.spirit": "Spirit", - "item.terraoriginum.umbrella": "Umbrella", + //-----Icon Items-----// + "item.terraoriginum.mync_eye": "Mync Eye", + "item.terraoriginum.spirit": "Spirit", + + //-----shit i cant be assed to categorise-----/ + "item.terraoriginum.umbrella": "Umbrella", + "item.terraoriginum.cotton_seeds": "Cotton Seeds", + "item.terraoriginum.cotton_ball": "Cotton ball", + "item.terraoriginum.ghostly_cloth": "Ghostly Cloth", + "item.terraoriginum.sun_totem": "Sun Totem", + "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", + "death.attack.lack_of_sun": "%1$s fell apart", + "death.attack.lack_of_sun.player": "%1$s fell apart whilst fighting %2$s", + "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", + + //-----Immortal Human-----// + "origin.terraoriginum.immortal_human.name": "Immortal Human", + "origin.terraoriginum.immortal_human.description": "You hate life, but out of spite, the gods cursed you with being immortal. How unfortunate.", + "power.terraoriginum.immortal_human-powers/immortal.name": "Immortal", + "power.terraoriginum.immortal_human-powers/immortal.description": "You cannot die, no matter how hard you try.", + "power.terraoriginum.immortal_human-powers/pathetic.name": "Pathetic", + "power.terraoriginum.immortal_human-powers/pathetic.description": "You cannot deal damage to anything.", + + //-----Demon-----// + "origin.terraoriginum.demon.name": "Demon", + "origin.terraoriginum.demon.description": "A powerful ghostly creature, it's body is built for one purpose... evil", + "power.terraoriginum.demon-powers/self_transfiguration1.name": "Self Transfiguration", + "power.terraoriginum.demon-powers/self_transfiguration1.description": "A demon has the innate ability to transfigure it's own body to temporarily increase it's physical capabilities, but beware whilst using it, because it rapidly drains ectoplasm", + "power.terraoriginum.demon-powers/stained.name": "Stained", + "power.terraoriginum.demon-powers/stained.description": "A demon is stained in the blood of it's victims", + "power.terraoriginum.demon-powers/extra_health.name": "Extra Health", + "power.terraoriginum.demon-powers/extra_health.description": "A demon's body is exceptionally well built, allowing it to take a bit more punishment than usual before perishing", + "power.terraoriginum.demon-powers/rigid.name": "", + "power.terraoriginum.demon-powers/regid.description": "A demon's body is exceptionally well built, allowing it to take a bit more punishment than usual before perishing", + + //-----Wraith-----// + "origin.terraoriginum.wraith.name": "Wraith", + "origin.terraoriginum.wraith.description": "A tormented soul brought back to the land of life, hungering to distribute it's agony to the living.", + "power.terraoriginum.wraith-powers/soaring1.name": "Soaring", + "power.terraoriginum.wraith-powers/soaring1.description": "A Wraith has the ability to exhert it's ectoplasm to reduce it's body's response to gravity as well as create a thrust, allowing it to swim through the air.", + "power.terraoriginum.wraith-powers/torment1.name": "Torment", + "power.terraoriginum.wraith-powers/torment1.description": "The Wraith recalls the eons of agony it suffered, causing it's body to respond to the trauma by strengthening itself. Expends ectoplasm quickly.", + "power.terraoriginum.wraith-powers/charred.name": "Charred", + "power.terraoriginum.wraith-powers/charred.description": "Wraiths are burned of torment, which gives them a literally charred appearance.", + + //-----Shade-----// + "origin.terraoriginum.shade.name": "Shade", + "origin.terraoriginum.shade.description": "Shades are shy ghostly entities, generally choosing to remain hidden from other non-ghostly entities.", + "power.terraoriginum.shade-powers/invisibility1.name": "Invisibility", + "power.terraoriginum.shade-powers/invisibility1.description": "Shades have the ability to turn their entire bodies, including any armour they are wearing, entirely invisible. The invisibility is counteracted by the glowing effect and expends some ectoplasm", + + //-----Merfolk-----// + "origin.terraoriginum.merfolk.name": "Merfolk", + "origin.terraoriginum.merfolk.description": "A creature well adapted to live in the seas. They are much like humans, if humans were aquatic", + "power.terraoriginum.merfolk-powers/hydration.name": "Hydration", + "power.terraoriginum.merfolk-powers/hydration.description": "A merfolk needs to remain hydrated in order to survive. Being in rain or water will increase hydration, whilst being outside both will dry you out", + "power.terraoriginum.merfolk-powers/waterbreathing.name": "Water Breathing", + "power.terraoriginum.merfolk-powers/waterbreathing.description": "A merfolk has the ability to breath underwater", + "power.terraoriginum.merfolk-powers/webbedfeet.name": "Webbed Feet", + "power.terraoriginum.merfolk-powers/webbedfeet.description": "A merfolk has webbed feet to help it swim under water. however, this makes it walk slower on land and also makes it not be able to jump as high as more land creatures.", + "power.terraoriginum.merfolk-powers/wethands.name": "Wet Hands", + "power.terraoriginum.merfolk-powers/wethands.description": "A merfolk's hands are made for use underwater, making it harder to break blocks on dry land. Also a great song", - //-----shit i cant be assed to categorise-----/ - "item.terraoriginum.cotton_seeds": "Cotton Seeds", - "item.terraoriginum.cotton_ball": "Cotton ball", + //-----Spirit-----// + "origin.terraoriginum.spirit.name": "Spirit", + "origin.terraoriginum.spirit.description": "A ghostly creature which has not been buile for any specific purpose.", + "power.terraoriginum.spirit-powers/ectoplasm.name": "Ectoplasm", + "power.terraoriginum.spirit-powers/ectoplasm.description": "Ectoplasm is the life essence of any ghostly creature, without it, they will slowly start to die.", + "power.terraoriginum.spirit-powers/nightvis.name": "Night Vision", + "power.terraoriginum.spirit-powers/nightvis.description": "A ghost likes the darkness, so they're able to see in the dark.", + "power.terraoriginum.spirit-powers/phasing1.name": "Phasing", + "power.terraoriginum.spirit-powers/phasing1.description": "Ghosts have the ability to phase through blocks, this is because they are incorporeal. toggleable", + "power.terraoriginum.spirit-powers/undead.name": "Undead", + "power.terraoriginum.spirit-powers/undead.description": "Spirits are undead, meaning that health and poison potion effects are swapped and you cannot drown.", + "power.terraoriginum.spirit-powers/ectodiff.name": "Luminophobia", + "power.terraoriginum.spirit-powers/ectodiff.description": "Light gradually decreases the amount of ectoplasm that you have, which causes you to take damage or die if it becomes too low.", + "power.terraoriginum.spirit-powers/skin.name": "Translucent skin", + "power.terraoriginum.spirit-powers/skin.description": "Your skin is slightly translucent, allowing others to see through you.", - "item.terraoriginum.ghostly_cloth": "Ghostly Cloth", + //-----Serpenta-----// + "origin.terraoriginum.serpenta.name": "Serpenta", + "origin.terraoriginum.serpenta.description": "A hybrid between merfolk and sea serpents... don't ask how they managed that.", + "power.terraoriginum.serpenta-powers/boilingshot.name": "Boiling Shot", + "power.terraoriginum.serpenta-powers/boilingshot.description": "shoot a jet of boiling water, this dehydrates you and has a cooldown of 30 seconds", + "power.terraoriginum.serpenta-powers/scales.name": "Scales", + "power.terraoriginum.serpenta-powers/scales.description": "A serpenta has thick scales, giving it some natural armour", - "item.terraoriginum.sun_totem": "Sun Totem", + //-----Fairy-----// + "origin.terraoriginum.fairy.name": "Fairy", + "origin.terraoriginum.fairy.description": "A tiny humanoid creature that has wings.", + "power.terraoriginum.fairy-powers/smallheight.name": "Small", + "power.terraoriginum.fairy-powers/smallheight.description": "You are only about one block tall", + "power.terraoriginum.fairy-powers/fragile.name": "Fragile", + "power.terraoriginum.fairy-powers/fragile.description": "You only have half the usual health", + "power.terraoriginum.fairy-powers/yummyhoney.name": "Yummy Honey", + "power.terraoriginum.fairy-powers/yummyhoney.description": "honey is extremely good for you, providing a lot of food and topping up your saturation", + "power.terraoriginum.fairy-powers/nimble.name": "Nimble", + "power.terraoriginum.fairy-powers/nimble.description": "You must remain lightweight to fly, this means you cannot wear armour stronger than chainmail.", + "power.terraoriginum.fairy-powers/pollenation.name": "Pollenation", + "power.terraoriginum.fairy-powers/pollenation.description": "you pollenate plants in a 4 block radius to yourself, making them grow faster.", - "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", + //-----Lato-----// + "origin.terraoriginum.lato.name": "Lato", + "origin.terraoriginum.lato.description": "A creature from a faraway world, one with very little sun, one with a very high gravitational pull.", + "power.terraoriginum.lato-powers/sun_damage.name": "Xeroderma Pigmentosum", + "power.terraoriginum.lato-powers/sun_damage.description": "Your skin sizzles up in the sun.", + "power.terraoriginum.lato-powers/teleport.name": "Teleportation", + "power.terraoriginum.lato-powers/teleport.description": "You can teleport some distance away.", + "power.terraoriginum.lato-powers/perfect_vision.name": "Perfect Vision", + "power.terraoriginum.lato-powers/perfect_vision.description": "Carefully constructed eyes that allow for perfect vision, they also are toggleable.", + "power.terraoriginum.lato-powers/rage.name": "Rage", + "power.terraoriginum.lato-powers/rage.description": "Rage gives strength and speed for a short period of time.", + "power.terraoriginum.lato-powers/strong.name": "Strong", + "power.terraoriginum.lato-powers/strong.description": "You do more damage than regular people.", + "power.terraoriginum.lato-powers/twelve_hearts.name": "Healthy", + "power.terraoriginum.lato-powers/twelve_hearts.description": "Being what you are, you have 12 hearts.", + "power.terraoriginum.lato-powers/lato_blooded.name": "Lato Blooded", + "power.terraoriginum.lato-powers/lato_blooded.description": "A Latian's blood can work out most poisoning by itself.", + "power.terraoriginum.lato-powers/tailwind.name": "Tailwind", + "power.terraoriginum.lato-powers/tailwind.description": "You are a little bit quicker on foot than others.", + "power.terraoriginum.lato-powers/natural_armor.name": "Thick Skin", + "power.terraoriginum.lato-powers/natural_armor.description": "Even without wearing armor, your skin provides natural protection.", + "power.terraoriginum.lato-powers/long_arms.name": "Long Arms", + "power.terraoriginum.lato-powers/long_arms.description": "You have slightly longer arms.", + "power.terraoriginum.lato-powers/tall.name": "Tall", + "power.terraoriginum.lato-powers/tall.description": "You are half a block taller.", - "death.attack.lack_of_sun": "%1$s fell apart", - "death.attack.lack_of_sun.player": "%1$s fell apart whilst fighting %2$s", + //-----Mync-----// + "origin.terraoriginum.mync.name": "Mync", + "origin.terraoriginum.mync.description": "Myncs are blind Latos. They can't teleport like regular Latos but are stronger than most Latos.", + "power.terraoriginum.mync-powers/mync_blind.name": "Mushroom Sense", + "power.terraoriginum.mync-powers/mync_blind.description": "Standing by mushrooms or mushroom related blocks allows you to connect to and feel through their roots to better perceive your surroundings.", + "power.terraoriginum.mync-powers/mync_tailwind.name": "Tailwind", + "power.terraoriginum.mync-powers/mync_tailwind.description": "You are a little bit quicker on foot than others.", + "power.terraoriginum.mync-powers/mync_rage.name": "Rage", + "power.terraoriginum.mync-powers/mync_rage.description": "Rage gives strength and speed for a short period of time.", + "power.terraoriginum.mync-powers/mync_natural_armour.name": "Thick Skin", + "power.terraoriginum.mync-powers/mync_natural_armour.description": "Even without wearing armor, your skin provides natural protection.", + "power.terraoriginum.mync-powers/mync_vision.name": "Blind", + "power.terraoriginum.mync-powers/mync_vision.description": "Myncs, being blind Latos, have to perceive their environment through sound.", + "power.terraoriginum.mync-powers/mync_echolocate.name": "Echolocation", + "power.terraoriginum.mync-powers/mync_echolocate.description": "Use your [Tab button] to make a sound to figure out how your surrounding area looks like. Nearby wool will stop this from working, but you can use a night vision potion to get it to work permanently.", + "power.terraoriginum.mync-powers/mync_strong.name": "Strong", + "power.terraoriginum.mync-powers/mync_strong.description": "You do more damage than regular people.", + "death.attack.terraoriginum:burn_in_sun": "%1$s sizzled up in the sun.", + "death.attack.terraoriginum:burn_in_sun.player": "%1$s sizzled up in the sun whilst trying to escape %2$s.", - "death.attack.boiling": "%1$s boiled up", - "death.attack.boiling.player": "%1$s boiled up whilst trying to fight off %2$s", + //-----Kitsune-----// + "origin.terraoriginum.kitsune.name": "Kitsune", + "origin.terraoriginum.kitsune.description": "This race of Spirit Foxes dwell around settlements waiting for for treasure to be left unguarded. Though weak in terms of vitality they use their spiritual power to hide and strengthen their power.", + "power.terraoriginum.kitsune-powers/armor.name": "Rich Man's Armour", + "power.terraoriginum.kitsune-powers/armor.description": "You cannot use chanimail armor or leather armor because mmm, unfancy", + "power.terraoriginum.kitsune-powers/diet.name": "Vulpine Diet", + "power.terraoriginum.kitsune-powers/diet.description": "Kitsune love berries and therefore they cure 4 hunger points and 14.4 saturation points (like golden carrots) & your diet is restricted to meat, fish, and berries, so you can't really eat vegetables.", + "power.terraoriginum.kitsune-powers/fox_pouch.name": "Mighty Mouth", + "power.terraoriginum.kitsune-powers/fox_pouch.description": "You carry a secret stash that no one but you has acccess to. You can access this pouch by using your load hotbar activator key.", + "power.terraoriginum.kitsune-powers/home.name": "Home Sweet Home", + "power.terraoriginum.kitsune-powers/home.description": "Your natural spawnpoint is in the Taiga biome.", + "power.terraoriginum.kitsune-powers/hungy.name": "Fast Metabolism", + "power.terraoriginum.kitsune-powers/hungy.description": "A small body performing great movements requires a large amount of food!", + "power.terraoriginum.kitsune-powers/paws.name": "Paws", + "power.terraoriginum.kitsune-powers/paws.description": "You are unable to hold a shield and deal less damage with projectiles because of how your paws are built.", + "power.terraoriginum.kitsune-powers/phasing.name": "Phasing", + "power.terraoriginum.kitsune-powers/phasing.description": "You can walk through solid material, except obsidian, crying obsidian, barriers and bedrock, BUT you are unable to phase up or down.", + "power.terraoriginum.kitsune-powers/pounce.name": "Pounce", + "power.terraoriginum.kitsune-powers/pounce.description": "You perform a great leap towards the direction you're facing. You also deal more damage while falling.", + "power.terraoriginum.kitsune-powers/run.name": "Scram!", + "power.terraoriginum.kitsune-powers/run.description": "Whenever your health goes below 4 hearts, you gain a small speed boost", + "power.terraoriginum.kitsune-powers/speed.name": "Small Frame", + "power.terraoriginum.kitsune-powers/speed.description": "Your small frame gives little weight, making it easier to move at the cost of health.", - "enchantment.terraoriginum.sun_protection": "Sun Protection", + //-----Yulde-----// + "origin.terraoriginum.yulde.name": "Yulde", + "origin.terraoriginum.yulde.description": "A Yulde is a Lato with the ability to change the tides of battle, at the cost of their lives.", + "power.terraoriginum.yulde-powers/last_stand.name": "Last Stand", + "power.terraoriginum.yulde-powers/last_stand.description": "You gain strength 4 and speed 2 for 60 seconds, after which you will, without fail, die.", + "death.attack.terraoriginum:last_stand": "%1$s made their last stand.", + "death.attack.terraoriginum:last_stand.player": "%1$s made their last stand before dying to %2$s.", - //-----Immortal Human-----// - "origin.terraoriginum.immortal_human.name": "Immortal Human", - "origin.terraoriginum.immortal_human.description": "You hate life, but out of spite, the gods cursed you with being immortal. How unfortunate.", - "power.terraoriginum.immortal_human-powers/immortal.name": "Immortal", - "power.terraoriginum.immortal_human-powers/immortal.description": "You cannot die, no matter how hard you try.", - "power.terraoriginum.immortal_human-powers/pathetic.name": "Pathetic", - "power.terraoriginum.immortal_human-powers/pathetic.description": "You cannot deal damage to anything.", + //-----florian-----// + "origin.terraoriginum.florian.name": "Florian", + "origin.terraoriginum.florian.description": "Florians are soft-hearted creatures of nature. They rarely pose a threat and stand as keepers of the natural environment.", + "power.terraoriginum.florian-powers/absorbing.name": "Absorbing", + "power.terraoriginum.florian-powers/absorbing.description": "You gain strength when in contact with water.", + "power.terraoriginum.florian-powers/flammable.name": "Flammable", + "power.terraoriginum.florian-powers/flammable.description": "You take twice as much damage from fire", + "power.terraoriginum.florian-powers/photosynthesis.name": "Photosynthesis", + "power.terraoriginum.florian-powers/photosynthesis.description": "You are satiated when in the sun.", + "power.terraoriginum.florian-powers/pocket_sand.name": "Pocket Sand", + "power.terraoriginum.florian-powers/pocket_sand.description": "As a protective measure, you keep sand in your pocket to temporarily blind an attacker", + "power.terraoriginum.florian-powers/aura_of_growth.name": "Growth Aura", + "power.terraoriginum.florian-powers/aura_of_growth.description": "Crops around you grow at a faster rate.", + "power.terraoriginum.florian-powers/bonemeal.name": "Bonemeal Body", + "power.terraoriginum.florian-powers/bonemeal.description": "When hit, you spread bonemeal into your surrounding area.", + "power.terraoriginum.florian-powers/compost.name": "Compostable", + "power.terraoriginum.florian-powers/compost.description": "When you're in a composter, it gradually fills up", + "power.terraoriginum.florian-powers/green_fingered.name": "Green Fingered", + "power.terraoriginum.florian-powers/green_fingered.description": "Your skin has a slightly green hue to it", + "power.terraoriginum.florian-powers/small.name": "Small", + "power.terraoriginum.florian-powers/small.description": "You are quite small and have 5 hearts because of it.", + "power.terraoriginum.florian-powers/weak.name": "Weak", + "power.terraoriginum.florian-powers/weak.description": "Because you are a creature of nature, you cannot do much damage.", - //-----Demon-----// - "origin.terraoriginum.demon.name": "Demon", - "origin.terraoriginum.demon.description": "A powerful ghostly creature, it's body is built for one purpose... evil", - "power.terraoriginum.demon-powers/self_transfiguration1.name": "Self Transfiguration", - "power.terraoriginum.demon-powers/self_transfiguration1.description": "A demon has the innate ability to transfigure it's own body to temporarily increase it's physical capabilities, but beware whilst using it, because it rapidly drains ectoplasm", - "power.terraoriginum.demon-powers/stained.name": "Stained", - "power.terraoriginum.demon-powers/stained.description": "A demon is stained in the blood of it's victims", - "power.terraoriginum.demon-powers/extra_health.name": "Extra Health", - "power.terraoriginum.demon-powers/extra_health.description": "A demon's body is exceptionally well built, allowing it to take a bit more punishment than usual before perishing", - "power.terraoriginum.demon-powers/rigid.name": "", - "power.terraoriginum.demon-powers/regid.description": "A demon's body is exceptionally well built, allowing it to take a bit more punishment than usual before perishing", + //-----Muckunde-----// + "origin.terraoriginum.muckunde.name": "Muckunde", + "origin.terraoriginum.muckunde.description": "A dirt creature often found borrowing underground.", + "power.terraoriginum.muckunde-powers/toughskin.name": "Tough Skin", + "power.terraoriginum.muckunde-powers/toughskin.description": "A muckunde has hard skin, giving it some natural armour", + "power.terraoriginum.muckunde-powers/likesoil1.name": "Like Soil", + "power.terraoriginum.muckunde-powers/likesoil1.description": "This origin has the ability to phase through any dirt-like blocks.", + "power.terraoriginum.muckunde-powers/yummybeets.name": "Yummy Beets", + "power.terraoriginum.muckunde-powers/yummybeets.description": "Your body makes good use of the nutritional composition of beetroot", + "power.terraoriginum.muckunde-powers/hydrophobic.name": "Hydrophobic", + "power.terraoriginum.muckunde-powers/hydrophobic.description": "your body completely ignores water", - //-----Wraith-----// - "origin.terraoriginum.wraith.name": "Wraith", - "origin.terraoriginum.wraith.description": "A tormented soul brought back to the land of life, hungering to distribute it's agony to the living.", - "power.terraoriginum.wraith-powers/soaring1.name": "Soaring", - "power.terraoriginum.wraith-powers/soaring1.description": "A Wraith has the ability to exhert it's ectoplasm to reduce it's body's response to gravity as well as create a thrust, allowing it to swim through the air.", - "power.terraoriginum.wraith-powers/torment1.name": "Torment", - "power.terraoriginum.wraith-powers/torment1.description": "The Wraith recalls the eons of agony it suffered, causing it's body to respond to the trauma by strengthening itself. Expends ectoplasm quickly.", - "power.terraoriginum.wraith-powers/charred.name": "Charred", - "power.terraoriginum.wraith-powers/charred.description": "Wraiths are burned of torment, which gives them a literally charred appearance.", + //-----Monarch-----// + "origin.terraoriginum.monarch.name": "Monarch", + "origin.terraoriginum.monarch.description": "A prideful race that have bioengineered themselves to draw energy directly from the sun.", + "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. But if you run out, your body will no longer be able to keep itself together", + "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.terraoriginum.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", + "power.terraoriginum.monarchpowers/totem_fueled.name": "Totem Fueled", + "power.terraoriginum.monarchpowers/totem_fueled.description": "Craft a Sun Totem and hold it to get small amounts of sun energy even outside the sun", - //-----Shade-----// - "origin.terraoriginum.shade.name": "Shade", - "origin.terraoriginum.shade.description": "Shades are shy ghostly entities, generally choosing to remain hidden from other non-ghostly entities.", - "power.terraoriginum.shade-powers/invisibility1.name": "Invisibility", - "power.terraoriginum.shade-powers/invisibility1.description": "Shades have the ability to turn their entire bodies, including any armour they are wearing, entirely invisible. The invisibility is counteracted by the glowing effect and expends some ectoplasm", + //-----Blight-----// + "origin.terraoriginum.blight.name": "Blight", + "origin.terraoriginum.blight.description": "Blights are foul and disgusting creatures. Created in the depths of the nether, they exist for the purpose of bring rot and wither to all forms of nature.", + "power.terraoriginum.blight-powers/bane_of_agriculture.name": "Bane of Agriculture", + "power.terraoriginum.blight-powers/bane_of_agriculture.description": "Through a process not very well understood, blights can rapidly reverse the growth of all crops in about a 6 block radius around themselves", + "power.terraoriginum.blight-powers/blighted_feet.name": "Blighted Feet", + "power.terraoriginum.blight-powers/blighted_feet.description": "The Blight's cursed feet destroy life within the soil they touch, turning it to course dirt.", + "power.terraoriginum.blight-powers/nether_spawn.name": "Nether Spawn", + "power.terraoriginum.blight-powers/nether_spawn.description": "Blights were created in the nether, hence you will start there when you spawn. Curiously, they are not immune to fire like most other nether inhabitants", + "power.terraoriginum.blight-powers/foul_flesh.name": "Foul Flesh", + "power.terraoriginum.blight-powers/foul_flesh.description": "The Blight's flesh is foul and rotten, and as such no poison can effect it.", + "power.terraoriginum.blight-powers/florivory.name": "Florvory", + "power.terraoriginum.blight-powers/florivory.description": "The Blight cannot naturally regenerate, and needs to devour flowers to reconstitute it's body if damaged.", + "power.terraoriginum.blight-powers/dead_cells.name": "Dead Cells", + "power.terraoriginum.blight-powers/dead_cells.description": "A large portion of a Blight's body is comprised of dead cells, hitting them does not damage it's vital functions, essentially acting as a small amount of armour for the blight.", - //-----Merfolk-----// - "origin.terraoriginum.merfolk.name": "Merfolk", - "origin.terraoriginum.merfolk.description": "A creature well adapted to live in the seas. They are much like humans, if humans were aquatic", - "power.terraoriginum.merfolk-powers/hydration.name": "Hydration", - "power.terraoriginum.merfolk-powers/hydration.description": "A merfolk needs to remain hydrated in order to survive. Being in rain or water will increase hydration, whilst being outside both will dry you out", - "power.terraoriginum.merfolk-powers/waterbreathing.name": "Water Breathing", - "power.terraoriginum.merfolk-powers/waterbreathing.description": "A merfolk has the ability to breath underwater", - "power.terraoriginum.merfolk-powers/webbedfeet.name": "Webbed Feet", - "power.terraoriginum.merfolk-powers/webbedfeet.description": "A merfolk has webbed feet to help it swim under water. however, this makes it walk slower on land and also makes it not be able to jump as high as more land creatures.", - "power.terraoriginum.merfolk-powers/wethands.name": "Wet Hands", - "power.terraoriginum.merfolk-powers/wethands.description": "A merfolk's hands are made for use underwater, making it harder to break blocks on dry land. Also a great song", - - //-----Spirit-----// - "origin.terraoriginum.spirit.name": "Spirit", - "origin.terraoriginum.spirit.description": "A ghostly creature which has not been buile for any specific purpose.", - "power.terraoriginum.spirit-powers/ectoplasm.name": "Ectoplasm", - "power.terraoriginum.spirit-powers/ectoplasm.description": "Ectoplasm is the life essence of any ghostly creature, without it, they will slowly start to die.", - "power.terraoriginum.spirit-powers/nightvis.name": "Night Vision", - "power.terraoriginum.spirit-powers/nightvis.description": "A ghost likes the darkness, so they're able to see in the dark.", - "power.terraoriginum.spirit-powers/phasing1.name": "Phasing", - "power.terraoriginum.spirit-powers/phasing1.description": "Ghosts have the ability to phase through blocks, this is because they are incorporeal. toggleable", - "power.terraoriginum.spirit-powers/undead.name": "Undead", - "power.terraoriginum.spirit-powers/undead.description": "Spirits are undead, meaning that health and poison potion effects are swapped and you cannot drown.", - "power.terraoriginum.spirit-powers/ectodiff.name": "Luminophobia", - "power.terraoriginum.spirit-powers/ectodiff.description": "Light gradually decreases the amount of ectoplasm that you have, which causes you to take damage or die if it becomes too low.", - "power.terraoriginum.spirit-powers/skin.name": "Translucent skin", - "power.terraoriginum.spirit-powers/skin.description": "Your skin is slightly translucent, allowing others to see through you.", - - //-----Serpenta-----// - "origin.terraoriginum.serpenta.name": "Serpenta", - "origin.terraoriginum.serpenta.description": "A hybrid between merfolk and sea serpents... don't ask how they managed that.", - "power.terraoriginum.serpenta-powers/boilingshot.name": "Boiling Shot", - "power.terraoriginum.serpenta-powers/boilingshot.description": "shoot a jet of boiling water, this dehydrates you and has a cooldown of 30 seconds", - "power.terraoriginum.serpenta-powers/scales.name": "Scales", - "power.terraoriginum.serpenta-powers/scales.description": "A serpenta has thick scales, giving it some natural armour", - - //-----Fairy-----// - "origin.terraoriginum.fairy.name": "Fairy", - "origin.terraoriginum.fairy.description": "A tiny humanoid creature that has wings.", - "power.terraoriginum.fairy-powers/smallheight.name": "Small", - "power.terraoriginum.fairy-powers/smallheight.description": "You are only about one block tall", - "power.terraoriginum.fairy-powers/fragile.name": "Fragile", - "power.terraoriginum.fairy-powers/fragile.description": "You only have half the usual health", - "power.terraoriginum.fairy-powers/yummyhoney.name": "Yummy Honey", - "power.terraoriginum.fairy-powers/yummyhoney.description": "honey is extremely good for you, providing a lot of food and topping up your saturation", - "power.terraoriginum.fairy-powers/nimble.name": "Nimble", - "power.terraoriginum.fairy-powers/nimble.description": "You must remain lightweight to fly, this means you cannot wear armour stronger than chainmail.", - "power.terraoriginum.fairy-powers/pollenation.name": "Pollenation", - "power.terraoriginum.fairy-powers/pollenation.description": "you pollenate plants in a 4 block radius to yourself, making them grow faster.", - - //-----Lato-----// - "origin.terraoriginum.lato.name": "Lato", - "origin.terraoriginum.lato.description": "A creature from a faraway world, one with very little sun, one with a very high gravitational pull.", - "power.terraoriginum.lato-powers/sun_damage.name": "Xeroderma Pigmentosum", - "power.terraoriginum.lato-powers/sun_damage.description": "Your skin sizzles up in the sun.", - "power.terraoriginum.lato-powers/teleport.name": "Teleportation", - "power.terraoriginum.lato-powers/teleport.description": "You can teleport some distance away.", - "power.terraoriginum.lato-powers/perfect_vision.name": "Perfect Vision", - "power.terraoriginum.lato-powers/perfect_vision.description": "Carefully constructed eyes that allow for perfect vision, they also are toggleable.", - "power.terraoriginum.lato-powers/rage.name": "Rage", - "power.terraoriginum.lato-powers/rage.description": "Rage gives strength and speed for a short period of time.", - "power.terraoriginum.lato-powers/strong.name": "Strong", - "power.terraoriginum.lato-powers/strong.description": "You do more damage than regular people.", - "power.terraoriginum.lato-powers/twelve_hearts.name": "Healthy", - "power.terraoriginum.lato-powers/twelve_hearts.description": "Being what you are, you have 12 hearts.", - "power.terraoriginum.lato-powers/lato_blooded.name": "Lato Blooded", - "power.terraoriginum.lato-powers/lato_blooded.description": "A Latian's blood can work out most poisoning by itself.", - "power.terraoriginum.lato-powers/tailwind.name": "Tailwind", - "power.terraoriginum.lato-powers/tailwind.description": "You are a little bit quicker on foot than others.", - "power.terraoriginum.lato-powers/natural_armor.name": "Thick Skin", - "power.terraoriginum.lato-powers/natural_armor.description": "Even without wearing armor, your skin provides natural protection.", - "power.terraoriginum.lato-powers/long_arms.name": "Long Arms", - "power.terraoriginum.lato-powers/long_arms.description": "You have slightly longer arms.", - "power.terraoriginum.lato-powers/tall.name": "Tall", - "power.terraoriginum.lato-powers/tall.description": "You are half a block taller.", - - //-----Mync-----// - "origin.terraoriginum.mync.name": "Mync", - "origin.terraoriginum.mync.description": "Myncs are blind Latos. They can't teleport like regular Latos but are stronger than most Latos.", - "power.terraoriginum.mync-powers/mync_blind.name": "Mushroom Sense", - "power.terraoriginum.mync-powers/mync_blind.description": "Standing by mushrooms or mushroom related blocks allows you to connect to and feel through their roots to better perceive your surroundings.", - "power.terraoriginum.mync-powers/mync_tailwind.name": "Tailwind", - "power.terraoriginum.mync-powers/mync_tailwind.description": "You are a little bit quicker on foot than others.", - "power.terraoriginum.mync-powers/mync_rage.name": "Rage", - "power.terraoriginum.mync-powers/mync_rage.description": "Rage gives strength and speed for a short period of time.", - "power.terraoriginum.mync-powers/mync_natural_armour.name": "Thick Skin", - "power.terraoriginum.mync-powers/mync_natural_armour.description": "Even without wearing armor, your skin provides natural protection.", - "power.terraoriginum.mync-powers/mync_vision.name": "Blind", - "power.terraoriginum.mync-powers/mync_vision.description": "Myncs, being blind Latos, have to perceive their environment through sound.", - "power.terraoriginum.mync-powers/mync_echolocate.name": "Echolocation", - "power.terraoriginum.mync-powers/mync_echolocate.description": "Use your [Tab button] to make a sound to figure out how your surrounding area looks like. Nearby wool will stop this from working, but you can use a night vision potion to get it to work permanently.", - "power.terraoriginum.mync-powers/mync_strong.name": "Strong", - "power.terraoriginum.mync-powers/mync_strong.description": "You do more damage than regular people.", - - "death.attack.terraoriginum:burn_in_sun": "%1$s sizzled up in the sun.", - "death.attack.terraoriginum:burn_in_sun.player": "%1$s sizzled up in the sun whilst trying to escape %2$s.", - - //-----Kitsune-----// - "origin.terraoriginum.kitsune.name": "Kitsune", - "origin.terraoriginum.kitsune.description": "This race of Spirit Foxes dwell around settlements waiting for for treasure to be left unguarded. Though weak in terms of vitality they use their spiritual power to hide and strengthen their power.", - "power.terraoriginum.kitsune-powers/armor.name": "Rich Man's Armour", - "power.terraoriginum.kitsune-powers/armor.description": "You cannot use chanimail armor or leather armor because mmm, unfancy", - "power.terraoriginum.kitsune-powers/diet.name": "Vulpine Diet", - "power.terraoriginum.kitsune-powers/diet.description": "Kitsune love berries and therefore they cure 4 hunger points and 14.4 saturation points (like golden carrots) & your diet is restricted to meat, fish, and berries, so you can't really eat vegetables.", - "power.terraoriginum.kitsune-powers/fox_pouch.name": "Mighty Mouth", - "power.terraoriginum.kitsune-powers/fox_pouch.description": "You carry a secret stash that no one but you has acccess to. You can access this pouch by using your load hotbar activator key.", - "power.terraoriginum.kitsune-powers/home.name": "Home Sweet Home", - "power.terraoriginum.kitsune-powers/home.description": "Your natural spawnpoint is in the Taiga biome.", - "power.terraoriginum.kitsune-powers/hungy.name": "Fast Metabolism", - "power.terraoriginum.kitsune-powers/hungy.description": "A small body performing great movements requires a large amount of food!", - "power.terraoriginum.kitsune-powers/paws.name": "Paws", - "power.terraoriginum.kitsune-powers/paws.description": "You are unable to hold a shield and deal less damage with projectiles because of how your paws are built.", - "power.terraoriginum.kitsune-powers/phasing.name": "Phasing", - "power.terraoriginum.kitsune-powers/phasing.description": "You can walk through solid material, except obsidian, crying obsidian, barriers and bedrock, BUT you are unable to phase up or down.", - "power.terraoriginum.kitsune-powers/pounce.name": "Pounce", - "power.terraoriginum.kitsune-powers/pounce.description": "You perform a great leap towards the direction you're facing. You also deal more damage while falling.", - "power.terraoriginum.kitsune-powers/run.name": "Scram!", - "power.terraoriginum.kitsune-powers/run.description": "Whenever your health goes below 4 hearts, you gain a small speed boost", - "power.terraoriginum.kitsune-powers/speed.name": "Small Frame", - "power.terraoriginum.kitsune-powers/speed.description": "Your small frame gives little weight, making it easier to move at the cost of health.", - - //-----Yulde-----// - "origin.terraoriginum.yulde.name": "Yulde", - "origin.terraoriginum.yulde.description": "A Yulde is a Lato with the ability to change the tides of battle, at the cost of their lives.", - "power.terraoriginum.yulde-powers/last_stand.name": "Last Stand", - "power.terraoriginum.yulde-powers/last_stand.description": "You gain strength 4 and speed 2 for 60 seconds, after which you will, without fail, die.", - - "death.attack.terraoriginum:last_stand": "%1$s made their last stand.", - "death.attack.terraoriginum:last_stand.player": "%1$s made their last stand before dying to %2$s.", - - //-----florian-----// - "origin.terraoriginum.florian.name": "Florian", - "origin.terraoriginum.florian.description": "Florians are soft-hearted creatures of nature. They rarely pose a threat and stand as keepers of the natural environment.", - "power.terraoriginum.florian-powers/absorbing.name": "Absorbing", - "power.terraoriginum.florian-powers/absorbing.description": "You gain strength when in contact with water.", - "power.terraoriginum.florian-powers/flammable.name": "Flammable", - "power.terraoriginum.florian-powers/flammable.description": "You take twice as much damage from fire", - "power.terraoriginum.florian-powers/photosynthesis.name": "Photosynthesis", - "power.terraoriginum.florian-powers/photosynthesis.description": "You are satiated when in the sun.", - "power.terraoriginum.florian-powers/pocket_sand.name": "Pocket Sand", - "power.terraoriginum.florian-powers/pocket_sand.description": "As a protective measure, you keep sand in your pocket to temporarily blind an attacker", - "power.terraoriginum.florian-powers/aura_of_growth.name": "Growth Aura", - "power.terraoriginum.florian-powers/aura_of_growth.description": "Crops around you grow at a faster rate.", - "power.terraoriginum.florian-powers/bonemeal.name": "Bonemeal Body", - "power.terraoriginum.florian-powers/bonemeal.description": "When hit, you spread bonemeal into your surrounding area.", - "power.terraoriginum.florian-powers/compost.name": "Compostable", - "power.terraoriginum.florian-powers/compost.description": "When you're in a composter, it gradually fills up", - "power.terraoriginum.florian-powers/green_fingered.name": "Green Fingered", - "power.terraoriginum.florian-powers/green_fingered.description": "Your skin has a slightly green hue to it", - "power.terraoriginum.florian-powers/small.name": "Small", - "power.terraoriginum.florian-powers/small.description": "You are quite small and have 5 hearts because of it.", - "power.terraoriginum.florian-powers/weak.name": "Weak", - "power.terraoriginum.florian-powers/weak.description": "Because you are a creature of nature, you cannot do much damage.", - - //-----Muckunde-----// - "origin.terraoriginum.muckunde.name": "Muckunde", - "origin.terraoriginum.muckunde.description": "A dirt creature often found borrowing underground.", - "power.terraoriginum.muckunde-powers/toughskin.name": "Tough Skin", - "power.terraoriginum.muckunde-powers/toughskin.description": "A muckunde has hard skin, giving it some natural armour", - "power.terraoriginum.muckunde-powers/likesoil1.name": "Like Soil", - "power.terraoriginum.muckunde-powers/likesoil1.description": "This origin has the ability to phase through any dirt-like blocks.", - "power.terraoriginum.muckunde-powers/yummybeets.name": "Yummy Beets", - "power.terraoriginum.muckunde-powers/yummybeets.description": "Your body makes good use of the nutritional composition of beetroot", - "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": "A prideful race that have bioengineered themselves to draw energy directly from the sun.", - "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. But if you run out, your body will no longer be able to keep itself together", - "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.terraoriginum.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", - "power.terraoriginum.monarchpowers/totem_fueled.name": "Totem Fueled", - "power.terraoriginum.monarchpowers/totem_fueled.description": "Craft a Sun Totem and hold it to get small amounts of sun energy even outside the sun" + //-----Munch-----// + "origin.terraoriginum.munch.name": "Munch", + "origin.terraoriginum.munch.description": "The Munch are a very small species which can ", + "power.terraoriginum.munch-powers/tiny.name": "Tiny", + "power.terraoriginum.munch-powers/tiny.description": "You are very tiny. About 4 pixels tall. Conveniently, this also makes you more difficult to hit.", + "power.terraoriginum.munch-powers/little_health.name": "Little Health", + "power.terraoriginum.munch-powers/little_health.description": "You have very little health due to your tiny size, you little munch.", + "power.terraoriginum.munch-powers/nimble.name": "Too Small to Damage", + "power.terraoriginum.munch-powers/nimble.description": "You are immune to thorns and velocity based damage. You are not slowed by blocks such as sweet berry bushes or cobwebs. You can walk on powder snow.", + "power.terraoriginum.munch-powers/better_health.name": "Better Healing", + "power.terraoriginum.munch-powers/better_health.description": "You heal twice as fast as the average joe, must be compensating for something.", + "power.terraoriginum.munch-powers/too_tiny.name": "Too Tiny", + "power.terraoriginum.munch-powers/too_tiny.description": "You are so small, most mobs don't even feel threatened by you, and as such, they don't attack you.", + "power.terraoriginum.munch-powers/short_arms.name": "Short Arms", + "power.terraoriginum.munch-powers/short_arms.description": "You are small, therefore you can't reach as far as the average joe.", + "power.terraoriginum.munch-powers/tiny_motion.name": "Sized Speed", + "power.terraoriginum.munch-powers/tiny_motion.description": "You're about as fast as you are tiny, and you can only jump up a little over half a block.", + "power.terraoriginum.munch-powers/speedy_bastard.name": "Speedy Bastard", + "power.terraoriginum.munch-powers/speedy_bastard.description": "You are a fast little munch, aren't you? Maybe not normally, but now §ocan be§r.", + "power.terraoriginum.munch-powers/climbing.name": "Wall Runner", + "power.terraoriginum.munch-powers/climbing.description": "You have evolved a swift and seamless climbing technique which allows you to glide up vertical terrains with the grace and speed of a wall runner.", + "power.terraoriginum.munch-powers/mounting.name": "Mounting", + "power.terraoriginum.munch-powers/mounting.description": "You can mount and ride other players and entities. Whether seeking a vantage point, or swift transport. Surely you didn't think I meant mounting in §othat§r way, did you?", + "power.terraoriginum.munch-powers/quiet.name": "Quiet", + "power.terraoriginum.munch-powers/quiet.description": "You're too small to make sound, sculk sensors don't even hear you.", + "power.terraoriginum.munch-powers/tiny_appetite.name": "Tiny Appetite", + "power.terraoriginum.munch-powers/tiny_appetite.description": "You don't lose hunger very quickly" } \ No newline at end of file diff --git a/src/main/resources/assets/terraoriginum/models/item/tiny.json b/src/main/resources/assets/terraoriginum/models/item/tiny.json new file mode 100644 index 0000000..345332c --- /dev/null +++ b/src/main/resources/assets/terraoriginum/models/item/tiny.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "terraoriginum:item/tiny" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/terraoriginum/textures/item/tiny.png b/src/main/resources/assets/terraoriginum/textures/item/tiny.png new file mode 100644 index 0000000000000000000000000000000000000000..95e652683da9767be9e8a76ba6944e9bd0c8d764 GIT binary patch literal 90 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`ik>cxAr}70DGLM)f>z8=yu#3S n(SSj1(Zv#n=0.14.0", "fabric": "*", "minecraft": "1.20.1", - "pehkui": ">=3.7.8" + "pehkui": ">=3.7.8", + "apugli": "2.10.4+1.20.1-fabric" }, "conflicts": { } diff --git a/src/main/resources/terra.mixins.json b/src/main/resources/terra.mixins.json index 55c6cf7..f9e1ef1 100644 --- a/src/main/resources/terra.mixins.json +++ b/src/main/resources/terra.mixins.json @@ -5,7 +5,9 @@ "compatibilityLevel": "JAVA_16", "mixins": [ "PlayerConditionsMixin", - "PlayerEntityMixin" + "PlayerEntityMixin", + "EntityMixin", + "PowderSnowBlockMixin" ], "injectors": { "defaultRequire": 1 From 32ac0711e41e86af52871aa9f657578bd22fce39 Mon Sep 17 00:00:00 2001 From: Ryan <78032176+BigGaemer@users.noreply.github.com> Date: Thu, 23 Jan 2025 17:01:17 +0200 Subject: [PATCH 05/12] changed florian --- CHANGELOG | 3 ++- src/main/resources/assets/terraoriginum/lang/en_us.json | 4 ++-- src/main/resources/data/terraoriginum/origins/florian.json | 3 ++- src/main/resources/data/terraoriginum/origins/munch.json | 1 - .../too_tiny.json => florian-powers/passivemobs.json} | 0 5 files changed, 6 insertions(+), 5 deletions(-) rename src/main/resources/data/terraoriginum/powers/{munch-powers/too_tiny.json => florian-powers/passivemobs.json} (100%) diff --git a/CHANGELOG b/CHANGELOG index 541014a..20df753 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -6,4 +6,5 @@ - Added Item "Ghostly Cloth". - Renamed java class "sun_totem" to "sunTotem" to fit convention. - added robes -- added the munch \ No newline at end of file +- added the munch +- mobs are now passive to florian \ No newline at end of file diff --git a/src/main/resources/assets/terraoriginum/lang/en_us.json b/src/main/resources/assets/terraoriginum/lang/en_us.json index a7fbe77..cb2847c 100644 --- a/src/main/resources/assets/terraoriginum/lang/en_us.json +++ b/src/main/resources/assets/terraoriginum/lang/en_us.json @@ -204,6 +204,8 @@ "power.terraoriginum.florian-powers/small.description": "You are quite small and have 5 hearts because of it.", "power.terraoriginum.florian-powers/weak.name": "Weak", "power.terraoriginum.florian-powers/weak.description": "Because you are a creature of nature, you cannot do much damage.", + "power.terraoriginum.munch-powers/passivemobs.name": "Passive Mobs", + "power.terraoriginum.munch-powers/passivemobs.description": "Mobs just don't care enough to attack you.", //-----Muckunde-----// "origin.terraoriginum.muckunde.name": "Muckunde", @@ -268,8 +270,6 @@ "power.terraoriginum.munch-powers/nimble.description": "You are immune to thorns and velocity based damage. You are not slowed by blocks such as sweet berry bushes or cobwebs. You can walk on powder snow.", "power.terraoriginum.munch-powers/better_health.name": "Better Healing", "power.terraoriginum.munch-powers/better_health.description": "You heal twice as fast as the average joe, must be compensating for something.", - "power.terraoriginum.munch-powers/too_tiny.name": "Too Tiny", - "power.terraoriginum.munch-powers/too_tiny.description": "You are so small, most mobs don't even feel threatened by you, and as such, they don't attack you.", "power.terraoriginum.munch-powers/short_arms.name": "Short Arms", "power.terraoriginum.munch-powers/short_arms.description": "You are small, therefore you can't reach as far as the average joe.", "power.terraoriginum.munch-powers/tiny_motion.name": "Sized Speed", diff --git a/src/main/resources/data/terraoriginum/origins/florian.json b/src/main/resources/data/terraoriginum/origins/florian.json index 34d6ff9..7d507a7 100644 --- a/src/main/resources/data/terraoriginum/origins/florian.json +++ b/src/main/resources/data/terraoriginum/origins/florian.json @@ -13,7 +13,8 @@ "terraoriginum:florian-powers/aura_of_growth", "terraoriginum:florian-powers/pocket_sand", "terraoriginum:florian-powers/weak", - "terraoriginum:florian-powers/five_hearts" + "terraoriginum:florian-powers/five_hearts", + "terraoriginum:florian-powers/passivemobs" ], "icon": "minecraft:rose_bush", "order": 1000, diff --git a/src/main/resources/data/terraoriginum/origins/munch.json b/src/main/resources/data/terraoriginum/origins/munch.json index a2e25d8..99e5126 100644 --- a/src/main/resources/data/terraoriginum/origins/munch.json +++ b/src/main/resources/data/terraoriginum/origins/munch.json @@ -7,7 +7,6 @@ "terraoriginum:munch-powers/little_health", "terraoriginum:munch-powers/better_health", "terraoriginum:munch-powers/tiny_appetite", - "terraoriginum:munch-powers/too_tiny", "terraoriginum:munch-powers/nimble", "terraoriginum:munch-powers/quiet", "terraoriginum:munch-powers/climbing", diff --git a/src/main/resources/data/terraoriginum/powers/munch-powers/too_tiny.json b/src/main/resources/data/terraoriginum/powers/florian-powers/passivemobs.json similarity index 100% rename from src/main/resources/data/terraoriginum/powers/munch-powers/too_tiny.json rename to src/main/resources/data/terraoriginum/powers/florian-powers/passivemobs.json From ca3731a6abe96f0900b7a5bdde81dd7bfd737511 Mon Sep 17 00:00:00 2001 From: Ryan <78032176+BigGaemer@users.noreply.github.com> Date: Thu, 23 Jan 2025 19:03:16 +0200 Subject: [PATCH 06/12] eat shit --- src/main/resources/fabric.mod.json | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 6522893..7ce0f56 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -25,7 +25,7 @@ "client": [ "com.smithy.terraoriginum.client.TerraKeybinds", "com.smithy.terraoriginum.client.layerRenderer" - ] + ] }, "mixins": [ "terra.mixins.json" @@ -35,9 +35,7 @@ "fabricloader": ">=0.14.0", "fabric": "*", "minecraft": "1.20.1", - "pehkui": ">=3.7.8", - "apugli": "2.10.4+1.20.1-fabric" + "pehkui": ">=3.7.8" }, - "conflicts": { - } -} + "conflicts": {} +} \ No newline at end of file From d153a4ca34f43b01d8586fb7ffe6806bbc986b1d Mon Sep 17 00:00:00 2001 From: CosmoOrSth <79050675+CosmoOrSth@users.noreply.github.com> Date: Thu, 23 Jan 2025 23:23:41 +0530 Subject: [PATCH 07/12] partial implementation of ghostly armour --- CHANGELOG | 4 +- .../smithy/terraoriginum/TerraOriginum.java | 2 +- .../client/TerraOriginumClient.java | 13 ++ .../client/armour/ghostlyArmourModel.java | 23 +++ .../client/armour/ghostlyArmourRenderer.java | 16 +++ .../terraoriginum/items/ghostlyArmour.java | 108 ++++++++++++++ ...obesItems.java => ghostlyArmourItems.java} | 31 ++-- .../item/armor/ghost_armour.animation.json | 127 ++++++++++++++++ .../geo/item/armor/ghost_armour.geo.json | 135 ++++++++++++++++++ .../textures/item/armor/ghost_armour.png | Bin 0 -> 3805 bytes .../powers/spirit-powers/ectodiff.json | 69 ++++++++- 11 files changed, 508 insertions(+), 20 deletions(-) create mode 100644 src/main/java/com/smithy/terraoriginum/client/TerraOriginumClient.java create mode 100644 src/main/java/com/smithy/terraoriginum/client/armour/ghostlyArmourModel.java create mode 100644 src/main/java/com/smithy/terraoriginum/client/armour/ghostlyArmourRenderer.java create mode 100644 src/main/java/com/smithy/terraoriginum/items/ghostlyArmour.java rename src/main/java/com/smithy/terraoriginum/items/{robesItems.java => ghostlyArmourItems.java} (50%) create mode 100644 src/main/resources/assets/terraoriginum/animations/item/armor/ghost_armour.animation.json create mode 100644 src/main/resources/assets/terraoriginum/geo/item/armor/ghost_armour.geo.json create mode 100644 src/main/resources/assets/terraoriginum/textures/item/armor/ghost_armour.png diff --git a/CHANGELOG b/CHANGELOG index 20df753..305bd6e 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -7,4 +7,6 @@ - Renamed java class "sun_totem" to "sunTotem" to fit convention. - added robes - added the munch -- mobs are now passive to florian \ No newline at end of file +- mobs are now passive to florian +- registered items related to ghostly armour +- added a model for ghostly armour \ No newline at end of file diff --git a/src/main/java/com/smithy/terraoriginum/TerraOriginum.java b/src/main/java/com/smithy/terraoriginum/TerraOriginum.java index 05f213b..359a6e1 100644 --- a/src/main/java/com/smithy/terraoriginum/TerraOriginum.java +++ b/src/main/java/com/smithy/terraoriginum/TerraOriginum.java @@ -28,7 +28,7 @@ public class TerraOriginum implements ModInitializer { cottonItems.register(); sunTotem.register(); ghostlyItems.register(); - robesItems.register(); + ghostlyArmourItems.register(); modPowers.register(); ItemGroupEvents.modifyEntriesEvent(ItemGroups.TOOLS).register((content) -> content.add(umbrella.UMBRELLA)); diff --git a/src/main/java/com/smithy/terraoriginum/client/TerraOriginumClient.java b/src/main/java/com/smithy/terraoriginum/client/TerraOriginumClient.java new file mode 100644 index 0000000..58764a9 --- /dev/null +++ b/src/main/java/com/smithy/terraoriginum/client/TerraOriginumClient.java @@ -0,0 +1,13 @@ +package com.smithy.terraoriginum.client; + +import net.fabricmc.api.ClientModInitializer; + +public class TerraOriginumClient implements ClientModInitializer { + + + @Override + public void onInitializeClient() { + + + } +} diff --git a/src/main/java/com/smithy/terraoriginum/client/armour/ghostlyArmourModel.java b/src/main/java/com/smithy/terraoriginum/client/armour/ghostlyArmourModel.java new file mode 100644 index 0000000..4953e2a --- /dev/null +++ b/src/main/java/com/smithy/terraoriginum/client/armour/ghostlyArmourModel.java @@ -0,0 +1,23 @@ +package com.smithy.terraoriginum.client.armour; + +import com.smithy.terraoriginum.items.ghostlyArmour; +import net.minecraft.util.Identifier; +import software.bernie.geckolib.model.GeoModel; + +public class ghostlyArmourModel extends GeoModel { + + @Override + public Identifier getModelResource(ghostlyArmour animatable) { + return new Identifier("terraoriginum", "geo/ghostly_armour.geo.json"); + } + + @Override + public Identifier getTextureResource(ghostlyArmour animatable) { + return new Identifier("terraoriginum", "textures/models/armor/ghost_armour_model_texture"); + } + + @Override + public Identifier getAnimationResource(ghostlyArmour animatable) { + return null; + } +} diff --git a/src/main/java/com/smithy/terraoriginum/client/armour/ghostlyArmourRenderer.java b/src/main/java/com/smithy/terraoriginum/client/armour/ghostlyArmourRenderer.java new file mode 100644 index 0000000..3c0d0cb --- /dev/null +++ b/src/main/java/com/smithy/terraoriginum/client/armour/ghostlyArmourRenderer.java @@ -0,0 +1,16 @@ +package com.smithy.terraoriginum.client.armour; + +import com.smithy.terraoriginum.TerraOriginum; +import com.smithy.terraoriginum.items.ghostlyArmour; +import net.minecraft.util.Identifier; +import software.bernie.geckolib.GeckoLib; +import software.bernie.geckolib.model.DefaultedItemGeoModel; +import software.bernie.geckolib.renderer.GeoArmorRenderer; + +public class ghostlyArmourRenderer extends GeoArmorRenderer { + + public ghostlyArmourRenderer() { + super(new DefaultedItemGeoModel<>(new Identifier(TerraOriginum.MOD_ID, "armor/ghost_armour"))); + } + +} diff --git a/src/main/java/com/smithy/terraoriginum/items/ghostlyArmour.java b/src/main/java/com/smithy/terraoriginum/items/ghostlyArmour.java new file mode 100644 index 0000000..2253206 --- /dev/null +++ b/src/main/java/com/smithy/terraoriginum/items/ghostlyArmour.java @@ -0,0 +1,108 @@ +package com.smithy.terraoriginum.items; + +import com.smithy.terraoriginum.client.armour.ghostlyArmourRenderer; +import it.unimi.dsi.fastutil.objects.ObjectArrayList; +import it.unimi.dsi.fastutil.objects.ObjectOpenHashSet; +import net.minecraft.client.render.entity.model.BipedEntityModel; +import net.minecraft.entity.Entity; +import net.minecraft.entity.EquipmentSlot; +import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.decoration.ArmorStandEntity; +import net.minecraft.item.ArmorItem; +import net.minecraft.item.ArmorMaterial; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import software.bernie.example.client.renderer.armor.GeckoArmorRenderer; +import software.bernie.geckolib.animatable.GeoItem; +import software.bernie.geckolib.animatable.client.RenderProvider; +import software.bernie.geckolib.constant.DataTickets; +import software.bernie.geckolib.constant.DefaultAnimations; +import software.bernie.geckolib.core.animatable.instance.AnimatableInstanceCache; +import software.bernie.geckolib.core.animation.AnimatableManager; +import software.bernie.geckolib.core.animation.AnimationController; +import software.bernie.geckolib.core.object.PlayState; +import software.bernie.geckolib.renderer.GeoArmorRenderer; +import software.bernie.geckolib.util.GeckoLibUtil; + +import java.util.Set; +import java.util.function.Consumer; +import java.util.function.Supplier; + +public class ghostlyArmour extends ArmorItem implements GeoItem { + + private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this); + private final Supplier renderProvider = GeoItem.makeRenderer(this); + + public ghostlyArmour(ArmorMaterial armorMaterial, ArmorItem.Type type, Settings properties) { + super(armorMaterial, type, properties); + } + + // Create our armor model/renderer for Fabric and return it + @Override + public void createRenderer(Consumer consumer) { + consumer.accept(new RenderProvider() { + private GeoArmorRenderer renderer; + + @Override + public BipedEntityModel getHumanoidArmorModel(LivingEntity livingEntity, ItemStack itemStack, EquipmentSlot equipmentSlot, BipedEntityModel original) { + if (this.renderer == null) + this.renderer = new ghostlyArmourRenderer(); + + // This prepares our GeoArmorRenderer for the current render frame. + // These parameters may be null however, so we don't do anything further with them + this.renderer.prepForRender(livingEntity, itemStack, equipmentSlot, original); + + return this.renderer; + } + }); + } + + @Override + public Supplier getRenderProvider() { + return this.renderProvider; + } + + // Let's add our animation controller + @Override + public void registerControllers(AnimatableManager.ControllerRegistrar controllers) { + controllers.add(new AnimationController<>(this, 20, state -> { + // Apply our generic idle animation. + // Whether it plays or not is decided down below + + // Let's gather some data from the state to use below + // This is the entity that is currently wearing/holding the item + Entity entity = state.getData(DataTickets.ENTITY); + + // We'll just have ArmorStands always animate, so we can return here + if (entity instanceof ArmorStandEntity) + return PlayState.CONTINUE; + + // For this example, we only want the animation to play if the entity is wearing all pieces of the armor + // Let's collect the armor pieces the entity is currently wearing + Set wornArmor = new ObjectOpenHashSet<>(); + + for (ItemStack stack : entity.getArmorItems()) { + // We can stop immediately if any of the slots are empty + if (stack.isEmpty()) + return PlayState.STOP; + + wornArmor.add(stack.getItem()); + } + + // Check each of the pieces match our set + boolean isFullSet = wornArmor.containsAll(ObjectArrayList.of( + ghostlyArmourItems.GHOSTLY_BOOTS, + ghostlyArmourItems.GHOSTLY_LEGGING, + ghostlyArmourItems.GHOSTLY_CHESTPLATE, + ghostlyArmourItems.GHOSTLY_HELMET)); + + // Play the animation if the full set is being worn, otherwise stop + return isFullSet ? PlayState.CONTINUE : PlayState.STOP; + })); + } + + @Override + public AnimatableInstanceCache getAnimatableInstanceCache() { + return this.cache; + } +} diff --git a/src/main/java/com/smithy/terraoriginum/items/robesItems.java b/src/main/java/com/smithy/terraoriginum/items/ghostlyArmourItems.java similarity index 50% rename from src/main/java/com/smithy/terraoriginum/items/robesItems.java rename to src/main/java/com/smithy/terraoriginum/items/ghostlyArmourItems.java index abf778b..957ecee 100644 --- a/src/main/java/com/smithy/terraoriginum/items/robesItems.java +++ b/src/main/java/com/smithy/terraoriginum/items/ghostlyArmourItems.java @@ -13,22 +13,25 @@ import net.minecraft.registry.Registry; import net.minecraft.util.Identifier; import net.minecraft.util.Rarity; -public class robesItems { - - public static final Item ROBES_HELMET = new ArmorItem(robesMaterial.ROBES, ArmorItem.Type.HELMET, new FabricItemSettings().rarity(Rarity.EPIC)); - public static final Item ROBES_CHESTPLATE = new ArmorItem(robesMaterial.ROBES, ArmorItem.Type.CHESTPLATE, new FabricItemSettings().rarity(Rarity.EPIC)); - public static final Item ROBES_LEGGING = new ArmorItem(robesMaterial.ROBES, ArmorItem.Type.LEGGINGS, new FabricItemSettings().rarity(Rarity.EPIC)); - public static final Item ROBES_BOOTS = new ArmorItem(robesMaterial.ROBES, ArmorItem.Type.BOOTS, new FabricItemSettings().rarity(Rarity.EPIC)); +public class ghostlyArmourItems { + + public static final Item GHOSTLY_HELMET = new ghostlyArmour(robesMaterial.ROBES, ArmorItem.Type.HELMET, new FabricItemSettings().rarity(Rarity.EPIC)); + public static final Item GHOSTLY_CHESTPLATE = new ghostlyArmour(robesMaterial.ROBES, ArmorItem.Type.CHESTPLATE, new FabricItemSettings().rarity(Rarity.EPIC)); + public static final Item GHOSTLY_LEGGING = new ghostlyArmour(robesMaterial.ROBES, ArmorItem.Type.LEGGINGS, new FabricItemSettings().rarity(Rarity.EPIC)); + public static final Item GHOSTLY_BOOTS = new ghostlyArmour(robesMaterial.ROBES, ArmorItem.Type.BOOTS, new FabricItemSettings().rarity(Rarity.EPIC)); public static void register() { - Registry.register(Registries.ITEM, new Identifier(TerraOriginum.MOD_ID, "robes_helmet"), ROBES_HELMET); - Registry.register(Registries.ITEM, new Identifier(TerraOriginum.MOD_ID, "robes_chestplate"), ROBES_CHESTPLATE); - Registry.register(Registries.ITEM, new Identifier(TerraOriginum.MOD_ID, "robes_leggings"), ROBES_LEGGING); - Registry.register(Registries.ITEM, new Identifier(TerraOriginum.MOD_ID, "robes_boots"), ROBES_BOOTS); + Registry.register(Registries.ITEM, new Identifier(TerraOriginum.MOD_ID, "ghostly_helmet"), GHOSTLY_HELMET); + Registry.register(Registries.ITEM, new Identifier(TerraOriginum.MOD_ID, "ghostly_chestplate"), GHOSTLY_CHESTPLATE); + Registry.register(Registries.ITEM, new Identifier(TerraOriginum.MOD_ID, "ghostly_leggings"), GHOSTLY_LEGGING); + Registry.register(Registries.ITEM, new Identifier(TerraOriginum.MOD_ID, "ghostly_boots"), GHOSTLY_BOOTS); - ItemGroupEvents.modifyEntriesEvent(ItemGroups.COMBAT).register((content) -> content.add(ROBES_HELMET)); - ItemGroupEvents.modifyEntriesEvent(ItemGroups.COMBAT).register((content) -> content.add(ROBES_CHESTPLATE)); - ItemGroupEvents.modifyEntriesEvent(ItemGroups.COMBAT).register((content) -> content.add(ROBES_LEGGING)); - ItemGroupEvents.modifyEntriesEvent(ItemGroups.COMBAT).register((content) -> content.add(ROBES_BOOTS)); + ItemGroupEvents.modifyEntriesEvent(ItemGroups.COMBAT).register((content) -> content.add(GHOSTLY_HELMET)); + ItemGroupEvents.modifyEntriesEvent(ItemGroups.COMBAT).register((content) -> content.add(GHOSTLY_CHESTPLATE)); + ItemGroupEvents.modifyEntriesEvent(ItemGroups.COMBAT).register((content) -> content.add(GHOSTLY_LEGGING)); + ItemGroupEvents.modifyEntriesEvent(ItemGroups.COMBAT).register((content) -> content.add(GHOSTLY_BOOTS)); } + + + } diff --git a/src/main/resources/assets/terraoriginum/animations/item/armor/ghost_armour.animation.json b/src/main/resources/assets/terraoriginum/animations/item/armor/ghost_armour.animation.json new file mode 100644 index 0000000..1ec2009 --- /dev/null +++ b/src/main/resources/assets/terraoriginum/animations/item/armor/ghost_armour.animation.json @@ -0,0 +1,127 @@ +{ + "format_version": "1.8.0", + "animations": { + "walk": { + "loop": "hold_on_last_frame", + "animation_length": 0.25, + "bones": { + "torsoEnd": { + "rotation": { + "0.0": { + "vector": [0, 0, 0], + "easing": "linear" + }, + "0.25": { + "vector": [20, 0, 0], + "easing": "linear" + } + }, + "position": { + "0.0": { + "vector": [0, 0, 0], + "easing": "linear" + }, + "0.25": { + "vector": [0, -2, -3], + "easing": "linear" + } + } + }, + "bandanaEnd": { + "rotation": { + "0.0": { + "vector": [0, 0, 0], + "easing": "linear" + }, + "0.25": { + "vector": [20, 0, 0], + "easing": "linear" + } + }, + "position": { + "0.0": { + "vector": [0, 0, 0], + "easing": "linear" + }, + "0.25": { + "vector": [0, -2, 1], + "easing": "linear" + } + } + } + } + }, + "sprint": { + "loop": "hold_on_last_frame", + "animation_length": 0.25, + "bones": { + "bandanaEnd": { + "rotation": { + "0.0": { + "vector": [0, 0, 0], + "easing": "linear" + }, + "0.25": { + "vector": [55, 0, 0], + "easing": "linear" + } + }, + "position": { + "0.0": { + "vector": [0, 0, 0], + "easing": "linear" + }, + "0.25": { + "vector": [0, -4, 4], + "easing": "linear" + } + } + }, + "torsoEnd": { + "rotation": { + "0.0": { + "vector": [0, 0, 0], + "easing": "linear" + }, + "0.25": { + "vector": [50, 0, 0], + "easing": "linear" + } + }, + "position": { + "0.0": { + "vector": [0, 0, 0], + "easing": "linear" + }, + "0.25": { + "vector": [0, -6, -5], + "easing": "linear" + } + } + } + } + }, + "idle": { + "animation_length": 3, + "bones": { + "bandanaEnd": { + "rotation": { + "0.0": { + "vector": [0, 0, 0], + "easing": "linear" + }, + "1.5": { + "vector": [2.5, 0, 0], + "easing": "linear" + }, + "3.0": { + "vector": [0, 0, 0], + "easing": "linear" + } + } + } + } + } + }, + "geckolib_format_version": 2 +} \ No newline at end of file diff --git a/src/main/resources/assets/terraoriginum/geo/item/armor/ghost_armour.geo.json b/src/main/resources/assets/terraoriginum/geo/item/armor/ghost_armour.geo.json new file mode 100644 index 0000000..6577653 --- /dev/null +++ b/src/main/resources/assets/terraoriginum/geo/item/armor/ghost_armour.geo.json @@ -0,0 +1,135 @@ +{ + "format_version": "1.12.0", + "minecraft:geometry": [ + { + "description": { + "identifier": "geometry.ghost_armour", + "texture_width": 128, + "texture_height": 128, + "visible_bounds_width": 3, + "visible_bounds_height": 3.5, + "visible_bounds_offset": [0, 1.25, 0] + }, + "bones": [ + { + "name": "bipedHead", + "pivot": [0, 24, 0] + }, + { + "name": "armorHead", + "parent": "bipedHead", + "pivot": [0, 24, 0], + "cubes": [ + {"origin": [-5, 24, -5], "size": [10, 9, 10], "uv": [0, 16]}, + {"origin": [-4, 24, -4], "size": [8, 8, 8], "uv": [32, 35]} + ] + }, + { + "name": "bandana", + "parent": "armorHead", + "pivot": [0, 24, 0], + "cubes": [ + {"origin": [-6, 23, -6], "size": [12, 4, 12], "uv": [0, 0]} + ] + }, + { + "name": "bandanaEnd", + "parent": "armorHead", + "pivot": [0, 24, 0], + "cubes": [ + {"origin": [-4, 15, 6], "size": [3, 11, 0], "pivot": [-3, 24, 7], "rotation": [7.5, 0, 0], "uv": [72, 0]} + ] + }, + { + "name": "bipedBody", + "pivot": [0, 24, 0] + }, + { + "name": "armorBody", + "parent": "bipedBody", + "pivot": [0, 24, 0] + }, + { + "name": "torso", + "parent": "armorBody", + "pivot": [0, 24, 0], + "cubes": [ + {"origin": [-4, 12, -3], "size": [8, 12, 6], "uv": [40, 16]} + ] + }, + { + "name": "torsoEnd", + "parent": "armorBody", + "pivot": [0, 24, 0], + "cubes": [ + {"origin": [1, 7, 3], "size": [2, 10, 0], "pivot": [2, 15, 2], "rotation": [5, 0, 0], "uv": [76, 65]} + ] + }, + { + "name": "bipedRightArm", + "pivot": [-4, 22, 0] + }, + { + "name": "armorRightArm", + "parent": "bipedRightArm", + "pivot": [-4, 22, 0], + "cubes": [ + {"origin": [-9, 12, -3], "size": [5, 13, 6], "uv": [0, 51]} + ] + }, + { + "name": "bipedLeftArm", + "pivot": [4, 22, 0] + }, + { + "name": "armorLeftArm", + "parent": "bipedLeftArm", + "pivot": [4, 22, 0], + "cubes": [ + {"origin": [4, 12, -3], "size": [5, 13, 6], "uv": [22, 51]} + ] + }, + { + "name": "bipedLeftLeg", + "pivot": [2, 12, 0] + }, + { + "name": "armorLeftLeg", + "parent": "bipedLeftLeg", + "pivot": [2, 12, 0], + "cubes": [ + {"origin": [0, 4, -3], "size": [5, 9, 6], "uv": [44, 51]} + ] + }, + { + "name": "armorLeftBoot", + "parent": "bipedLeftLeg", + "pivot": [2, 12, 0], + "cubes": [ + {"origin": [0, 0, -3], "size": [5, 4, 6], "uv": [0, 70]} + ] + }, + { + "name": "bipedRightLeg", + "pivot": [-2, 12, 0] + }, + { + "name": "armorRightLeg", + "parent": "bipedRightLeg", + "pivot": [-2, 12, 0], + "cubes": [ + {"origin": [-5, 4, -3], "size": [5, 9, 6], "uv": [64, 34]} + ] + }, + { + "name": "armorRightBoot", + "parent": "bipedRightLeg", + "pivot": [-2, 12, 0], + "cubes": [ + {"origin": [-5, 0, -3], "size": [5, 4, 6], "uv": [22, 70]} + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/terraoriginum/textures/item/armor/ghost_armour.png b/src/main/resources/assets/terraoriginum/textures/item/armor/ghost_armour.png new file mode 100644 index 0000000000000000000000000000000000000000..b6670a58c33c69df98209bfb0ae9e292667b8b1f GIT binary patch literal 3805 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 k^jFO@DfxfIAj3waKY7PH%=) Date: Thu, 23 Jan 2025 22:03:51 +0200 Subject: [PATCH 08/12] fixed ectoplasm and probably got the game to shut op about missing textures --- .../textures/models/armor/robes_layer_1.png | Bin 0 -> 1589 bytes .../textures/models/armor/robes_layer_2.png | Bin 0 -> 1589 bytes .../powers/lato-powers/sun_damage.json | 52 +++---- .../powers/spirit-powers/ectodiff.json | 134 ++++++++++-------- 4 files changed, 100 insertions(+), 86 deletions(-) create mode 100755 src/main/resources/assets/terraoriginum/textures/models/armor/robes_layer_1.png create mode 100755 src/main/resources/assets/terraoriginum/textures/models/armor/robes_layer_2.png diff --git a/src/main/resources/assets/terraoriginum/textures/models/armor/robes_layer_1.png b/src/main/resources/assets/terraoriginum/textures/models/armor/robes_layer_1.png new file mode 100755 index 0000000000000000000000000000000000000000..d42a75f9421f2497a2a4fcd0bd9ded02fa133127 GIT binary patch literal 1589 zcmeAS@N?(olHy`uVBq!ia0y~yU<5K58911MRQ8&P5Fo{p?&#~tz_78O`%fY(0|PTd zfKP}kP<#}OhQNpofz1YAIzSnvB*-uL|HuXm!Qa_cfeC@Lz$3Dlfq`!?2s66>p0E}u zC|TkfQ4*Y=R#Ki=l*&+$n3-3imzP?iV4`QBXJq(MA#*A)6lZz5IEGZjy}h6aEPZ%d v4t&-BYrLhwxFWBJcR|!B8mJKX#CV%Ii=Xe)o~6r+KpEZB)z4*}Q$iB}=5w@- literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/terraoriginum/textures/models/armor/robes_layer_2.png b/src/main/resources/assets/terraoriginum/textures/models/armor/robes_layer_2.png new file mode 100755 index 0000000000000000000000000000000000000000..d42a75f9421f2497a2a4fcd0bd9ded02fa133127 GIT binary patch literal 1589 zcmeAS@N?(olHy`uVBq!ia0y~yU<5K58911MRQ8&P5Fo{p?&#~tz_78O`%fY(0|PTd zfKP}kP<#}OhQNpofz1YAIzSnvB*-uL|HuXm!Qa_cfeC@Lz$3Dlfq`!?2s66>p0E}u zC|TkfQ4*Y=R#Ki=l*&+$n3-3imzP?iV4`QBXJq(MA#*A)6lZz5IEGZjy}h6aEPZ%d v4t&-BYrLhwxFWBJcR|!B8mJKX#CV%Ii=Xe)o~6r+KpEZB)z4*}Q$iB}=5w@- literal 0 HcmV?d00001 diff --git a/src/main/resources/data/terraoriginum/powers/lato-powers/sun_damage.json b/src/main/resources/data/terraoriginum/powers/lato-powers/sun_damage.json index a987ec8..7e20e1e 100644 --- a/src/main/resources/data/terraoriginum/powers/lato-powers/sun_damage.json +++ b/src/main/resources/data/terraoriginum/powers/lato-powers/sun_damage.json @@ -1,37 +1,37 @@ { - "condition": { - "type": "origins:and", - "conditions": [ - { - "inverted": true, - "type": "origins:inventory", - "process_mode": "items", - "slots": [ - "weapon.mainhand", - "weapon.offhand" - ], - "item_condition": { - "type": "origins:ingredient", - "ingredient": { - "item": "terraoriginum:umbrella" - } + "condition": { + "type": "origins:and", + "conditions": [ + { + "inverted": true, + "type": "origins:inventory", + "process_mode": "items", + "slots": [ + "weapon.mainhand", + "weapon.offhand" + ], + "item_condition": { + "type": "origins:ingredient", + "ingredient": { + "item": "terraoriginum:umbrella" + } + } + }, + { + "type": "origins:exposed_to_sun" } - }, - { - "type": "origins:exposed_to_sun" - } - ] - }, + ] + }, "type": "origins:damage_over_time", "interval": 15, "onset_delay": 1, "damage": 3, "damage_easy": 2, "damage_source": { - "name": "terraoriginum:burn_in_sun", - "unblockable": true, - "bypasses_armor": true + "name": "terraoriginum:burn_in_sun", + "unblockable": true, + "bypasses_armor": true }, "protection_enchantment": "terraoriginum:sun_protection", "protection_effectiveness": 1.1 - } \ No newline at end of file +} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/spirit-powers/ectodiff.json b/src/main/resources/data/terraoriginum/powers/spirit-powers/ectodiff.json index e24bafd..e5790f3 100644 --- a/src/main/resources/data/terraoriginum/powers/spirit-powers/ectodiff.json +++ b/src/main/resources/data/terraoriginum/powers/spirit-powers/ectodiff.json @@ -4,6 +4,76 @@ "entity_action": { "type": "origins:if_else_list", "actions": [ + { + "condition": { + "type": "origins:and", + "conditions": [ + { + "type": "origins:inventory", + "process_mode": "items", + "slots": [ + "armor.head" + ], + "item_condition": { + "type": "origins:ingredient", + "ingredient": { + "item": "terraoriginum:ghostly_helmet" + } + } + }, + { + "type": "origins:inventory", + "process_mode": "items", + "slots": [ + "armor.chest" + ], + "item_condition": { + "type": "origins:ingredient", + "ingredient": { + "item": "terraoriginum:ghostly_chestplate" + } + } + }, + { + "type": "origins:inventory", + "process_mode": "items", + "slots": [ + "armor.legs" + ], + "item_condition": { + "type": "origins:ingredient", + "ingredient": { + "item": "terraoriginum:ghostly_leggings" + } + } + }, + { + "type": "origins:inventory", + "process_mode": "items", + "slots": [ + "armor.feet" + ], + "item_condition": { + "type": "origins:ingredient", + "ingredient": { + "item": "terraoriginum:ghostly_boots" + } + } + } + ] + }, + "action": { + "type": "origins:and", + "actions": [ + { + "type": "origins:change_resource", + "resource": "terraoriginum:spirit-powers/ectoplasm", + "change": 2, + "operation": "add" + } + ] + } + }, { "condition": { "type": "origins:brightness", @@ -24,71 +94,15 @@ }, { "condition": { - "type": "origins:and", - "conditions":[ + "type": "origins:or", + "conditions": [ { "type": "origins:brightness", "comparison": "<=", "compare_to": 0.17948718 - }, - { - "inverted": true, - "type": "origins:inventory", - "process_mode": "items", - "slots": [ - "armor.head" - ], - "item_condition": { - "type": "origins:ingredient", - "ingredient": { - "item": "terraoriginum:ghostly_helmet" - } - } - }, - { - "inverted": true, - "type": "origins:inventory", - "process_mode": "items", - "slots": [ - "armor.chest" - ], - "item_condition": { - "type": "origins:ingredient", - "ingredient": { - "item": "terraoriginum:ghostly_chestplate" - } - } - }, - { - "inverted": true, - "type": "origins:inventory", - "process_mode": "items", - "slots": [ - "armor.legs" - ], - "item_condition": { - "type": "origins:ingredient", - "ingredient": { - "item": "terraoriginum:ghostly_leggings" - } - } - }, - { - "inverted": true, - "type": "origins:inventory", - "process_mode": "items", - "slots": [ - "armor.feet" - ], - "item_condition": { - "type": "origins:ingredient", - "ingredient": { - "item": "terraoriginum:ghostly_boots" - } } - } - ] - }, + ] + }, "action": { "type": "origins:and", "actions": [ From a1142274dd736e8dcd51aa084f3365f12de3f5b3 Mon Sep 17 00:00:00 2001 From: CosmoOrSth <79050675+CosmoOrSth@users.noreply.github.com> Date: Fri, 24 Jan 2025 01:52:13 +0530 Subject: [PATCH 09/12] i encourage suicide --- .../assets/terraoriginum/lang/en_us.json | 1 + .../terraoriginum/models/item/ghostly_helmet.json | 6 ++++++ .../textures/item/ghostly_helmet.png | Bin 0 -> 390 bytes 3 files changed, 7 insertions(+) create mode 100644 src/main/resources/assets/terraoriginum/models/item/ghostly_helmet.json create mode 100644 src/main/resources/assets/terraoriginum/textures/item/ghostly_helmet.png diff --git a/src/main/resources/assets/terraoriginum/lang/en_us.json b/src/main/resources/assets/terraoriginum/lang/en_us.json index cb2847c..341d465 100644 --- a/src/main/resources/assets/terraoriginum/lang/en_us.json +++ b/src/main/resources/assets/terraoriginum/lang/en_us.json @@ -16,6 +16,7 @@ "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", + "item.terraoriginum.ghostly_helmet": "Ghostly Hood", //-----Immortal Human-----// "origin.terraoriginum.immortal_human.name": "Immortal Human", diff --git a/src/main/resources/assets/terraoriginum/models/item/ghostly_helmet.json b/src/main/resources/assets/terraoriginum/models/item/ghostly_helmet.json new file mode 100644 index 0000000..72f0f55 --- /dev/null +++ b/src/main/resources/assets/terraoriginum/models/item/ghostly_helmet.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "terraoriginum:item/ghostly_helmet" + } + } \ No newline at end of file diff --git a/src/main/resources/assets/terraoriginum/textures/item/ghostly_helmet.png b/src/main/resources/assets/terraoriginum/textures/item/ghostly_helmet.png new file mode 100644 index 0000000000000000000000000000000000000000..f0670047b464423e034f320becd877e90aaf3198 GIT binary patch literal 390 zcmV;10eSw3P)|sVsH Date: Fri, 24 Jan 2025 16:29:01 +0200 Subject: [PATCH 10/12] fixed textures (fuck you and your fucking mouth mullet) --- .../textures/item/armor/ghost_armour.png | Bin 3805 -> 3814 bytes .../textures/item/ghostly_helmet.png | Bin 390 -> 521 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/src/main/resources/assets/terraoriginum/textures/item/armor/ghost_armour.png b/src/main/resources/assets/terraoriginum/textures/item/armor/ghost_armour.png index b6670a58c33c69df98209bfb0ae9e292667b8b1f..4fce6dbd46da16fa4ee7e5609e04f55e82dc4093 100644 GIT binary patch delta 3718 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 diff --git a/src/main/resources/assets/terraoriginum/textures/item/ghostly_helmet.png b/src/main/resources/assets/terraoriginum/textures/item/ghostly_helmet.png index f0670047b464423e034f320becd877e90aaf3198..62ca17ff212832990a36d9b4050702511f0c97ef 100644 GIT binary patch delta 507 zcmVcYKn3%N6U8-JG>ifS=UZ9mR!KVC~?Kw+VmP{s6lGolw_)-r{Rs5Cu5UTN z!%I=HKe`dXrV!JNaOidG4uS#Q*102Rz&aD`H-f@!mShQFjR1;zUovKf41aJZfOI8*St!^#rjFxOuz%yA632An-=4Dq=FWiF8Sw1v=;zy$IA-E> z{HrrySBT@f)3?bP7!Os#q{{OA@kwyURxs5Lp880Pv-BKlaTMf7ynvq@F+Bql0e<2A zXTd{Q3GSp6EJeIttyzj{KYlOn1ce30sx)m?_rG_*GISK)8}QEp{L*+SthGTDFJkWS zP*r;;sN9ykj;H3YrCY}NzLfthzy~<}AJ8=c4!a(_EC^QfV8$QO(1~$Wdq01R~k24RrJsalbi?V>lcWWvGz{5uZ7 ze;Zp9kfx~=Lcp>t^nI^a&+|~0|sVsH Date: Fri, 24 Jan 2025 21:31:37 +0530 Subject: [PATCH 11/12] added item textures for ghostly armor --- .../assets/terraoriginum/lang/en_us.json | 3 +++ .../terraoriginum/models/item/ghostly_boots.json | 6 ++++++ .../models/item/ghostly_chestplate.json | 6 ++++++ .../models/item/ghostly_leggings.json | 6 ++++++ .../terraoriginum/textures/item/ghostly_boots.png | Bin 0 -> 265 bytes .../textures/item/ghostly_chestplate.png | Bin 0 -> 365 bytes .../textures/item/ghostly_leggings.png | Bin 0 -> 336 bytes 7 files changed, 21 insertions(+) create mode 100644 src/main/resources/assets/terraoriginum/models/item/ghostly_boots.json create mode 100644 src/main/resources/assets/terraoriginum/models/item/ghostly_chestplate.json create mode 100644 src/main/resources/assets/terraoriginum/models/item/ghostly_leggings.json create mode 100644 src/main/resources/assets/terraoriginum/textures/item/ghostly_boots.png create mode 100644 src/main/resources/assets/terraoriginum/textures/item/ghostly_chestplate.png create mode 100644 src/main/resources/assets/terraoriginum/textures/item/ghostly_leggings.png diff --git a/src/main/resources/assets/terraoriginum/lang/en_us.json b/src/main/resources/assets/terraoriginum/lang/en_us.json index 341d465..622649f 100644 --- a/src/main/resources/assets/terraoriginum/lang/en_us.json +++ b/src/main/resources/assets/terraoriginum/lang/en_us.json @@ -17,6 +17,9 @@ "death.attack.boiling.player": "%1$s boiled up whilst trying to fight off %2$s", "enchantment.terraoriginum.sun_protection": "Sun Protection", "item.terraoriginum.ghostly_helmet": "Ghostly Hood", + "item.terraoriginum.ghostly_chestplate": "Ghostly Robe", + "item.terraoriginum.ghostly_leggings": "Ghostly Pants", + "item.terraoriginum.ghostly_boots": "Ghostly Socks", //-----Immortal Human-----// "origin.terraoriginum.immortal_human.name": "Immortal Human", diff --git a/src/main/resources/assets/terraoriginum/models/item/ghostly_boots.json b/src/main/resources/assets/terraoriginum/models/item/ghostly_boots.json new file mode 100644 index 0000000..aa74e93 --- /dev/null +++ b/src/main/resources/assets/terraoriginum/models/item/ghostly_boots.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "terraoriginum:item/ghostly_boots" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/terraoriginum/models/item/ghostly_chestplate.json b/src/main/resources/assets/terraoriginum/models/item/ghostly_chestplate.json new file mode 100644 index 0000000..16f0829 --- /dev/null +++ b/src/main/resources/assets/terraoriginum/models/item/ghostly_chestplate.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "terraoriginum:item/ghostly_chestplate" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/terraoriginum/models/item/ghostly_leggings.json b/src/main/resources/assets/terraoriginum/models/item/ghostly_leggings.json new file mode 100644 index 0000000..83dd1be --- /dev/null +++ b/src/main/resources/assets/terraoriginum/models/item/ghostly_leggings.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "terraoriginum:item/ghostly_leggings" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/terraoriginum/textures/item/ghostly_boots.png b/src/main/resources/assets/terraoriginum/textures/item/ghostly_boots.png new file mode 100644 index 0000000000000000000000000000000000000000..2ee33881deca0d18f9e620eca6218bb8b22d47ad GIT binary patch literal 265 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9E8FF=^FDVbFUD7f3x z#WBRf|LtT)uEPofuKU$m!g7U$m|E}sPs)9%mdzQtqBKZCYR-kyh3l?Ve!ig3^gmGL z!uQ%+-L9)LIj0@4-Ka5P$!8nq*Fxf~Ed7s9gfHB=Rm^MUAziLFPq|)nJrrPCRG4J4 z$l>Z&wso`Eu0H$`Yrx}t>G?a}WhZzI?iA#)?*m+BxFwU>$Fq7k_SwDXCHYXIXyM9S>;%DyxOnX|6j4@{<7B)Pcixo^ag{c LtDnm{r-UW|tXOJ8 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/terraoriginum/textures/item/ghostly_chestplate.png b/src/main/resources/assets/terraoriginum/textures/item/ghostly_chestplate.png new file mode 100644 index 0000000000000000000000000000000000000000..281b7fbd325a7719e0b53d1cebe75e823705bfbf GIT binary patch literal 365 zcmV-z0h0cSP)AWO>$iKI6?O+_oV(V#|KJvMU!6_vvrAUlXwrvxG(ARaH`a%ejb9SEsOmG~BifB#K zsF2pSt|nA9I)@Z1O%JI!A+8oTF*{c=)UBD z{suS;B=PK%zys~*cy50H%%MP`XQf_2z=rkDzs`}Jf6JEFRRYff)f0RJaF<=J%iNd%5tk2ygoFx#awR}42*mGz_$Uz1e)sO(9%Mbt z*bD$_E&_`80r5*9UJ1n9KFdD0?6V_=!%#Hh3%LGguVj(dJA3d--mZA{=R$7 z2y`7gOb*2WpoG=GFP|CzfBQNYhabN)aq)npc(ED)6pZ`-^T)sczkW7gGk}qU(~6Ok zi-B20+#Dv49tL_qiPu2qf5m3N{~zC_{{H-N>D}A6TX7k{29)@XGm01(zA*g%e-B?2 ivH-(D3XcK9Q3?Q>07wYUM?6sg0000 Date: Fri, 24 Jan 2025 19:10:24 +0200 Subject: [PATCH 12/12] bumb version --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index a017ce0..b66a0d2 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,7 +7,7 @@ yarn_mappings=1.20.1+build.10 loader_version=0.16.10 # Mod Properties -mod_version=1.20.1-1.0.4 +mod_version=1.20.1-1.0.6 maven_group=com.smithy archives_base_name=TerraOriginum