From 7c2e26b4720f7126eb264a7e074735606fd8d5a6 Mon Sep 17 00:00:00 2001
From: Me <135455255+IcarussOne@users.noreply.github.com>
Date: Mon, 10 Jun 2024 03:17:29 -0500
Subject: [PATCH] Finish cloths

---
 .../mod/emt/harkenscythe/init/HSBlocks.java    |   4 ++--
 .../mod/emt/harkenscythe/init/HSRegistry.java  |   3 ++-
 .../blockstates/bloodweave_cloth.json          |  17 +++++++++++++++++
 .../blockstates/soulweave_cloth.json           |  17 +++++++++++++++++
 .../assets/harkenscythe/lang/en_us.lang        |   4 +++-
 .../textures/blocks/cloth_blood.png            | Bin 0 -> 539 bytes
 .../textures/blocks/cloth_soul.png             | Bin 0 -> 611 bytes
 7 files changed, 41 insertions(+), 4 deletions(-)
 create mode 100644 src/main/resources/assets/harkenscythe/blockstates/bloodweave_cloth.json
 create mode 100644 src/main/resources/assets/harkenscythe/blockstates/soulweave_cloth.json
 create mode 100644 src/main/resources/assets/harkenscythe/textures/blocks/cloth_blood.png
 create mode 100644 src/main/resources/assets/harkenscythe/textures/blocks/cloth_soul.png

diff --git a/src/main/java/mod/emt/harkenscythe/init/HSBlocks.java b/src/main/java/mod/emt/harkenscythe/init/HSBlocks.java
index 5ad0b44..335523f 100644
--- a/src/main/java/mod/emt/harkenscythe/init/HSBlocks.java
+++ b/src/main/java/mod/emt/harkenscythe/init/HSBlocks.java
@@ -58,8 +58,8 @@ public static void onRegisterBlocksEvent(@Nonnull final RegistryEvent.Register<B
                 HSRegistry.setup(new HSBlockMaterial(Material.ROCK, MapColor.NETHERRACK, 5.0F, 5.0F, SoundType.STONE), "biomass_block").setCreativeTab(HarkenScythe.TAB),
                 HSRegistry.setup(new HSBlockMaterial(Material.IRON, MapColor.DIAMOND, 5.0F, 10.0F, SoundType.METAL), "livingmetal_block").setCreativeTab(HarkenScythe.TAB),
                 HSRegistry.setup(new HSBlockCreep(), "creep_block").setCreativeTab(HarkenScythe.TAB),
-                HSRegistry.setup(new HSBlockCloth(MapColor.DIAMOND), "bloodweave_cloth").setCreativeTab(HarkenScythe.TAB),
-                HSRegistry.setup(new HSBlockCloth(MapColor.DIAMOND), "soulweave_cloth").setCreativeTab(HarkenScythe.TAB),
+                HSRegistry.setup(new HSBlockCloth(MapColor.RED), "bloodweave_cloth").setCreativeTab(HarkenScythe.TAB),
+                HSRegistry.setup(new HSBlockCloth(MapColor.LIGHT_BLUE), "soulweave_cloth").setCreativeTab(HarkenScythe.TAB),
                 HSRegistry.setup(new HSBloodCrucible(), "blood_crucible").setCreativeTab(HarkenScythe.TAB),
                 HSRegistry.setup(new HSSoulCrucible(), "soul_crucible").setCreativeTab(HarkenScythe.TAB),
                 HSRegistry.setup(new HSSoulAltar(), "soul_altar").setCreativeTab(HarkenScythe.TAB),
diff --git a/src/main/java/mod/emt/harkenscythe/init/HSRegistry.java b/src/main/java/mod/emt/harkenscythe/init/HSRegistry.java
index bbef1a8..c1efcae 100644
--- a/src/main/java/mod/emt/harkenscythe/init/HSRegistry.java
+++ b/src/main/java/mod/emt/harkenscythe/init/HSRegistry.java
@@ -74,8 +74,9 @@ public static void registerRecipes()
         HSSoulAltarRecipes.addRecipe(Items.COOKIE, HSItems.soul_cookie, 10);
         HSSoulAltarRecipes.addRecipe(Items.GLASS_BOTTLE, Items.EXPERIENCE_BOTTLE, 20);
         HSSoulAltarRecipes.addRecipe(Items.IRON_INGOT, HSItems.livingmetal_ingot, 10);
-        HSSoulAltarRecipes.addRecipe(new ItemStack(Blocks.SAND).getItem(), new ItemStack(Blocks.SOUL_SAND).getItem(), 10); // TODO: OreDictionary
         HSSoulAltarRecipes.addRecipe(PotionUtils.addPotionToItemStack(new ItemStack(Items.POTIONITEM), PotionTypes.WATER).getItem(), Items.DRAGON_BREATH, 30); // TODO: Move this to blood
+        HSSoulAltarRecipes.addRecipe(new ItemStack(Blocks.SAND).getItem(), new ItemStack(Blocks.SOUL_SAND).getItem(), 10); // TODO: OreDictionary
+        HSSoulAltarRecipes.addRecipe(new ItemStack(Blocks.WOOL).getItem(), new ItemStack(HSBlocks.soulweave_cloth).getItem(), 10); // TODO: OreDictionary
     }
 
     @SideOnly(Side.CLIENT)
diff --git a/src/main/resources/assets/harkenscythe/blockstates/bloodweave_cloth.json b/src/main/resources/assets/harkenscythe/blockstates/bloodweave_cloth.json
new file mode 100644
index 0000000..29424e8
--- /dev/null
+++ b/src/main/resources/assets/harkenscythe/blockstates/bloodweave_cloth.json
@@ -0,0 +1,17 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "model": "cube_all",
+    "textures": {
+      "all": "harkenscythe:blocks/cloth_blood"
+    }
+  },
+  "variants": {
+    "normal": [
+      {}
+    ],
+    "inventory": [
+      {}
+    ]
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/harkenscythe/blockstates/soulweave_cloth.json b/src/main/resources/assets/harkenscythe/blockstates/soulweave_cloth.json
new file mode 100644
index 0000000..4a80a83
--- /dev/null
+++ b/src/main/resources/assets/harkenscythe/blockstates/soulweave_cloth.json
@@ -0,0 +1,17 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "model": "cube_all",
+    "textures": {
+      "all": "harkenscythe:blocks/cloth_soul"
+    }
+  },
+  "variants": {
+    "normal": [
+      {}
+    ],
+    "inventory": [
+      {}
+    ]
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/harkenscythe/lang/en_us.lang b/src/main/resources/assets/harkenscythe/lang/en_us.lang
index e3c80a3..1c8c30a 100644
--- a/src/main/resources/assets/harkenscythe/lang/en_us.lang
+++ b/src/main/resources/assets/harkenscythe/lang/en_us.lang
@@ -4,11 +4,13 @@ itemGroup.harkenscythe.tab=Harken Scythe
 # BLOCKS
 tile.harkenscythe.blood_crucible.name=Blood Crucible
 tile.harkenscythe.biomass_block.name=Biomass Block
+tile.harkenscythe.bloodweave_cloth.name=Bloodweave Cloth
 tile.harkenscythe.creep_block.name=Creep Block
 tile.harkenscythe.livingmetal_block.name=Block of Livingmetal
+tile.harkenscythe.soul_altar.name=Altar of Souls
 tile.harkenscythe.soul_cake.name=Cake of Souls
 tile.harkenscythe.soul_crucible.name=Soul Crucible
-tile.harkenscythe.soul_altar.name=Altar of Souls
+tile.harkenscythe.soulweave_cloth.name=Soulweave Cloth
 
 # ITEMS
 item.harkenscythe.ancient_necronomicon.name=Ancient Necronomicon
diff --git a/src/main/resources/assets/harkenscythe/textures/blocks/cloth_blood.png b/src/main/resources/assets/harkenscythe/textures/blocks/cloth_blood.png
new file mode 100644
index 0000000000000000000000000000000000000000..d63bdaf9de78ec2f4301b46c84ec9fcfcd641697
GIT binary patch
literal 539
zcmV+$0_6RPP)<h;3K|Lk000e1NJLTq000mG000mO0ssI2kdbIM00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02*{fSaefwW^{L9
za%BKeVQFr3E>1;MAa*k@H7+qQF!XYv0004sNkl<ZI8P<g32MVY429vjL*hM)?btbA
zp_J}~(lvy1rKEJBJ!-#rKqQhzdipivuu5h(>HH#@aW+}=RxGa4`E@#f&fC{waXg+}
zCbMncFwW_C8a8?Jl(#=s|5q*Fi-n?xtiI1`{f>3=4@T8lGNrrD>Y!*>cCzcN`6_$<
zHgAPG`7e3PzRUi%TFQ{#Ptb}aw%w*RFg`G&I4ssc*cDySWRPQ7Z4CF}r~-rA?|Cwf
zc{?}?;Eu)<4N+BTyoTs=j6E5ak-xJ8IA#+XV3>ilW#ruzFfhyx)(bS4vzSt`=Po*W
zRH+Chk$(*NpvXM{b1ZfS#_B>ae(@M<j<>Q;kP?8y0NPr@$DxgCgmL3UIi4#}HOm|Z
z3_t{vBw>hsbQ<E8++^@aj3l!R7~J&iAaA~E*T_)tg9>#K#x#!&R7g@M`3S>Q+b4(t
zczh`hcoZSg6VXAsXg&vXAo*GL;Npi6iD~P%10?49bz;F8e3Dpc%Zg>S8AuiC{#k}M
dQKNrXcK-^(!`_cT=!O6Q002ovPDHLkV1kIM<y!y%

literal 0
HcmV?d00001

diff --git a/src/main/resources/assets/harkenscythe/textures/blocks/cloth_soul.png b/src/main/resources/assets/harkenscythe/textures/blocks/cloth_soul.png
new file mode 100644
index 0000000000000000000000000000000000000000..3a966a567c77be0e40da453f1f1d54687bceb681
GIT binary patch
literal 611
zcmV-p0-XJcP)<h;3K|Lk000e1NJLTq000mG000mO0ssI2kdbIM00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02*{fSaefwW^{L9
za%BKeVQFr3E>1;MAa*k@H7+qQF!XYv0005fNkl<ZI8P;#iAq9I5Qfit<Z>66_Y9=M
zib6!Y?ucfVOM20(6q#sB7AjHD@-TgK4jj01=FI%_&CFHNOwYO+MJ{fmnXXfPinTY<
z?7fv6y3H52wGN-uqn910{>;IMoL(!ZHgg-x#OOOY`HOYl39?I5yEq}AXEL!54!y`(
z3thYXpa_chc6jZ|V`BJ;?bPR7$;5VBD^9}yN(Mi8kd_Lh#@eqY&GN>8VFN}f43W?=
zAjG>{MG}R0#!CZa!W~MLt-KF6NRjg!?cdM?PYSs3am~sOj4GjK48|7j;v}4Il1W!~
zAyB|2gWuTQ8`{8dD2O(_;b&HW0mGpO+EZu<A8Fb}gm8Da=%H$QlMy$T@%~=-Ku~KX
zQ_K6@d6PYOW3DoT+z=iqTbi;f`cd-0;0pl^p;U#oxVnu6X{Z_)CXOfu>r$vvOV?Qg
zEdU0rzej>1^g|{^WaYJ);-keD9O=g!GePv|LD=#>(Tp*4RD}Xt3GUU%z)+241Ij>=
zBva%yjEscLbd#o60Lb$7BH<wj5+n>dkPI3dgJCN9e+D1GnIFLrGfnd8fhp;g&&h-Z
xPQ@<?E82Kv_THE@3Ze?Cbgy?pjQpm(-9LX`f_n(0n)?6%002ovPDHLkV1f$_2EqUU

literal 0
HcmV?d00001