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] 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