From 37b89d82b72929c968ba6452b20cc6fca85e4b9b Mon Sep 17 00:00:00 2001
From: falkory <falkor220@gmail.com>
Date: Wed, 9 Aug 2023 22:31:18 +0100
Subject: [PATCH 1/8] Mess with the fabric json again

---
 Fabric/src/main/resources/fabric.mod.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Fabric/src/main/resources/fabric.mod.json b/Fabric/src/main/resources/fabric.mod.json
index 051105004e..1ec8814e3d 100644
--- a/Fabric/src/main/resources/fabric.mod.json
+++ b/Fabric/src/main/resources/fabric.mod.json
@@ -55,7 +55,7 @@
     "cardinal-components-entity": "~5.2.1",
     "cardinal-components-item": "~5.2.1",
     "cardinal-components-block": "~5.2.1",
-    "paucal": "0.6.*",
+    "paucal": "*",
     "cloth-config": "11.1.*",
     "patchouli": ">=1.20.1-80"
   },

From a7cbe544402744148e3221b145884a42272eb521 Mon Sep 17 00:00:00 2001
From: falkory <falkor220@gmail.com>
Date: Sun, 24 Sep 2023 00:41:06 +0100
Subject: [PATCH 2/8] Trying to get armour back

---
 .../client/model/HexRobesModels.java          |  15 +-
 .../hexcasting/client/model/ModelArmor.java   | 176 ++++++++++++++++++
 .../hexcasting/common/lib/HexItems.java       |   4 +
 .../models/item/robes_helmet_1.json           |   6 +
 .../textures/item/robes/1-boots.png           | Bin 259 -> 259 bytes
 .../textures/item/robes/1-chestplate.png      | Bin 379 -> 367 bytes
 .../textures/item/robes/1-helmet.png          | Bin 468 -> 472 bytes
 .../textures/item/robes/1-leggings.png        | Bin 368 -> 367 bytes
 .../textures/item/robes/2-boots.png           | Bin 315 -> 310 bytes
 .../textures/item/robes/2-chestplate.png      | Bin 403 -> 394 bytes
 .../textures/item/robes/2-helmet.png          | Bin 430 -> 438 bytes
 .../textures/item/robes/2-leggings.png        | Bin 259 -> 268 bytes
 .../textures/item/robes/3-boots.png           | Bin 305 -> 300 bytes
 .../textures/item/robes/3-chestplate.png      | Bin 446 -> 427 bytes
 .../textures/item/robes/3-helmet.png          | Bin 460 -> 462 bytes
 .../textures/item/robes/3-leggings.png        | Bin 248 -> 255 bytes
 16 files changed, 196 insertions(+), 5 deletions(-)
 create mode 100644 Common/src/main/java/at/petrak/hexcasting/client/model/ModelArmor.java
 create mode 100644 Common/src/main/resources/assets/hexcasting/models/item/robes_helmet_1.json

diff --git a/Common/src/main/java/at/petrak/hexcasting/client/model/HexRobesModels.java b/Common/src/main/java/at/petrak/hexcasting/client/model/HexRobesModels.java
index 7f35494cab..d221479580 100644
--- a/Common/src/main/java/at/petrak/hexcasting/client/model/HexRobesModels.java
+++ b/Common/src/main/java/at/petrak/hexcasting/client/model/HexRobesModels.java
@@ -5,34 +5,39 @@
 // Paste this class into your mod and generate all required imports
 
 import net.minecraft.client.model.geom.ModelLayerLocation;
+import net.minecraft.client.model.geom.ModelPart;
 import net.minecraft.client.model.geom.PartPose;
 import net.minecraft.client.model.geom.builders.*;
+import net.minecraft.world.entity.EquipmentSlot;
 
 import static at.petrak.hexcasting.api.HexAPI.modLoc;
 
-public class HexRobesModels {
+public class HexRobesModels extends ModelArmor{
     // This layer location should be baked with EntityRendererProvider.Context in the entity renderer and passed into
     // this model's constructor
     public static final ModelLayerLocation LAYER_LOCATION = new ModelLayerLocation(modLoc("robes"), "main");
 
+    public HexRobesModels(ModelPart root, EquipmentSlot slot) {
+        super(root, slot);
+    }
+
     public static LayerDefinition variant1() {
         MeshDefinition meshdefinition = new MeshDefinition();
         PartDefinition partdefinition = meshdefinition.getRoot();
 
-        PartDefinition Hood = partdefinition.addOrReplaceChild("Hood",
+        PartDefinition head = partdefinition.addOrReplaceChild("Hood",
             CubeListBuilder.create()
                 .texOffs(0, 0).addBox(-8.0F, 0.0F, 0.0F, 8.0F, 8.0F, 8.0F, new CubeDeformation(0.0F))
                 .texOffs(0, 16).addBox(-8.0F, 0.0F, 0.0F, 8.0F, 8.0F, 8.0F, new CubeDeformation(0.0F)),
             PartPose.offset(4.0F, -8.0F, -4.0F));
-
-        PartDefinition Horns = partdefinition.addOrReplaceChild("Horns",
+        head.addOrReplaceChild("Horns",
             CubeListBuilder.create()
                 .texOffs(24, 0).addBox(-8.0F, 0.0F, 0.0F, 8.0F, 4.0F, 0.0F, new CubeDeformation(0.0F))
                 .texOffs(24, 0).mirror().addBox(9.5F, 0.0F, 0.0F, 8.0F, 4.0F, 0.0F, new CubeDeformation(0.0F))
                 .mirror(false),
             PartPose.offset(-4.8F, -8.2F, 0.0F));
 
-        PartDefinition Torso = partdefinition.addOrReplaceChild("Torso",
+        PartDefinition torso = partdefinition.addOrReplaceChild("Torso",
             CubeListBuilder.create()
                 .texOffs(40, 0).addBox(-8.0F, 0.0F, 0.0F, 8.0F, 12.0F, 4.0F, new CubeDeformation(0.0F))
                 .texOffs(40, 16).addBox(-8.0F, 0.0F, 0.0F, 8.0F, 12.0F, 4.0F, new CubeDeformation(0.0F)),
diff --git a/Common/src/main/java/at/petrak/hexcasting/client/model/ModelArmor.java b/Common/src/main/java/at/petrak/hexcasting/client/model/ModelArmor.java
new file mode 100644
index 0000000000..d896e4a8b4
--- /dev/null
+++ b/Common/src/main/java/at/petrak/hexcasting/client/model/ModelArmor.java
@@ -0,0 +1,176 @@
+package at.petrak.hexcasting.client.model;
+
+
+import com.mojang.blaze3d.vertex.PoseStack;
+import com.mojang.blaze3d.vertex.VertexConsumer;
+import net.minecraft.client.model.HumanoidModel;
+import net.minecraft.client.model.geom.ModelPart;
+import net.minecraft.client.model.geom.PartPose;
+import net.minecraft.client.model.geom.builders.CubeListBuilder;
+import net.minecraft.client.model.geom.builders.MeshDefinition;
+import net.minecraft.client.model.geom.builders.PartDefinition;
+import net.minecraft.world.entity.EquipmentSlot;
+import net.minecraft.world.entity.LivingEntity;
+import net.minecraft.world.entity.decoration.ArmorStand;
+
+public class ModelArmor extends HumanoidModel<LivingEntity> {
+
+    public final EquipmentSlot slot;
+    public float armorScale = 1.05f;
+
+    public final ModelPart rightFoot;
+    public final ModelPart leftFoot;
+
+    public ModelArmor(ModelPart root, EquipmentSlot slot) {
+        super(root);
+        this.rightFoot = root.getChild("right_foot");
+        this.leftFoot = root.getChild("left_foot");
+
+        this.slot = slot;
+        this.young = false;
+    }
+
+
+    public static MeshDefinition createArmorMesh() {
+        MeshDefinition meshdefinition = new MeshDefinition();
+        PartDefinition partdefinition = meshdefinition.getRoot();
+
+        partdefinition.addOrReplaceChild("head", CubeListBuilder.create(), PartPose.ZERO);
+        partdefinition.addOrReplaceChild("hat", CubeListBuilder.create(), PartPose.ZERO);
+        partdefinition.addOrReplaceChild("body", CubeListBuilder.create(), PartPose.ZERO);
+        partdefinition.addOrReplaceChild("right_arm", CubeListBuilder.create(), PartPose.ZERO);
+        partdefinition.addOrReplaceChild("left_arm", CubeListBuilder.create(), PartPose.ZERO);
+        partdefinition.addOrReplaceChild("right_leg", CubeListBuilder.create(), PartPose.ZERO);
+        partdefinition.addOrReplaceChild("left_leg", CubeListBuilder.create(), PartPose.ZERO);
+        partdefinition.addOrReplaceChild("right_foot", CubeListBuilder.create(), PartPose.ZERO);
+        partdefinition.addOrReplaceChild("left_foot", CubeListBuilder.create(), PartPose.ZERO);
+
+        return meshdefinition;
+    }
+
+    @Override
+    public void setupAnim(LivingEntity entityIn, float limbSwing, float limbSwingAmount, float ageInTicks, float netHeadYaw, float headPitch) {
+        if (!(entityIn instanceof ArmorStand)) {
+            super.setupAnim(entityIn, limbSwing, limbSwingAmount, ageInTicks, netHeadYaw, headPitch);
+            return;
+        }
+        if (entityIn instanceof ArmorStand armorStand) {
+            this.head.xRot = ((float) Math.PI / 180F) * armorStand.getHeadPose().getX();
+            this.head.yRot = ((float) Math.PI / 180F) * armorStand.getHeadPose().getY();
+            this.head.zRot = ((float) Math.PI / 180F) * armorStand.getHeadPose().getZ();
+            this.head.setPos(0.0F, 1.0F, 0.0F);
+            this.body.xRot = ((float) Math.PI / 180F) * armorStand.getBodyPose().getX();
+            this.body.yRot = ((float) Math.PI / 180F) * armorStand.getBodyPose().getY();
+            this.body.zRot = ((float) Math.PI / 180F) * armorStand.getBodyPose().getZ();
+            this.leftArm.xRot = ((float) Math.PI / 180F) * armorStand.getLeftArmPose().getX();
+            this.leftArm.yRot = ((float) Math.PI / 180F) * armorStand.getLeftArmPose().getY();
+            this.leftArm.zRot = ((float) Math.PI / 180F) * armorStand.getLeftArmPose().getZ();
+            this.rightArm.xRot = ((float) Math.PI / 180F) * armorStand.getRightArmPose().getX();
+            this.rightArm.yRot = ((float) Math.PI / 180F) * armorStand.getRightArmPose().getY();
+            this.rightArm.zRot = ((float) Math.PI / 180F) * armorStand.getRightArmPose().getZ();
+            this.leftLeg.xRot = ((float) Math.PI / 180F) * armorStand.getLeftLegPose().getX();
+            this.leftLeg.yRot = ((float) Math.PI / 180F) * armorStand.getLeftLegPose().getY();
+            this.leftLeg.zRot = ((float) Math.PI / 180F) * armorStand.getLeftLegPose().getZ();
+            this.leftLeg.setPos(1.9F, 11.0F, 0.0F);
+            this.rightLeg.xRot = ((float) Math.PI / 180F) * armorStand.getRightLegPose().getX();
+            this.rightLeg.yRot = ((float) Math.PI / 180F) * armorStand.getRightLegPose().getY();
+            this.rightLeg.zRot = ((float) Math.PI / 180F) * armorStand.getRightLegPose().getZ();
+            this.rightLeg.setPos(-1.9F, 11.0F, 0.0F);
+            this.hat.copyFrom(this.head);
+        }
+    }
+
+    @Override
+    public void renderToBuffer(PoseStack poseStack, VertexConsumer bufferIn, int packedLightIn, int packedOverlayIn, float red, float green, float blue, float alpha) {
+        poseStack.pushPose();
+        poseStack.scale(armorScale, armorScale, armorScale);
+        this.setHeadRotation();
+        this.setChestRotation();
+        this.setLegsRotation();
+        this.setBootRotation();
+        head.visible = slot == EquipmentSlot.HEAD;
+        body.visible = slot == EquipmentSlot.CHEST;
+        rightArm.visible = slot == EquipmentSlot.CHEST;
+        leftArm.visible = slot == EquipmentSlot.CHEST;
+        rightLeg.visible = slot == EquipmentSlot.LEGS;
+        leftLeg.visible = slot == EquipmentSlot.LEGS;
+        rightFoot.visible = slot == EquipmentSlot.FEET;
+        leftFoot.visible = slot == EquipmentSlot.FEET;
+        if (this.young) {
+            float f = 2.0F;
+            poseStack.pushPose();
+            poseStack.scale(1.5F / f, 1.5F / f, 1.5F / f);
+            poseStack.translate(0.0F, 16.0F * 1, 0.0F);
+            head.render(poseStack, bufferIn, packedLightIn, packedOverlayIn, red, green, blue, alpha);
+            poseStack.popPose();
+            poseStack.pushPose();
+            poseStack.scale(1.0F / f, 1.0F / f, 1.0F / f);
+            poseStack.translate(0.0F, 24.0F * 1, 0.0F);
+            body.render(poseStack, bufferIn, packedLightIn, packedOverlayIn, red, green, blue, alpha);
+            poseStack.popPose();
+        } else {
+            head.render(poseStack, bufferIn, packedLightIn, packedOverlayIn, red, green, blue, alpha);
+            if (crouching) {
+                poseStack.translate(0.0F, 0.2F, 0.0F);
+            }
+            body.render(poseStack, bufferIn, packedLightIn, packedOverlayIn, red, green, blue, alpha);
+
+            poseStack.pushPose();
+            if (crouching) {
+                poseStack.translate(0.0F, -0.15F, 0.0F);
+            }
+            rightArm.render(poseStack, bufferIn, packedLightIn, packedOverlayIn, red, green, blue, alpha);
+            leftArm.render(poseStack, bufferIn, packedLightIn, packedOverlayIn, red, green, blue, alpha);
+            poseStack.popPose();
+        }
+        poseStack.translate(0.0F, 1.25F, 0.0F);
+        if (crouching) {
+            poseStack.translate(0.0F, -0.15F, 0.05F);
+        }
+        rightLeg.render(poseStack, bufferIn, packedLightIn, packedOverlayIn, red, green, blue, alpha);
+        leftLeg.render(poseStack, bufferIn, packedLightIn, packedOverlayIn, red, green, blue, alpha);
+        rightFoot.render(poseStack, bufferIn, packedLightIn, packedOverlayIn, red, green, blue, alpha);
+        leftFoot.render(poseStack, bufferIn, packedLightIn, packedOverlayIn, red, green, blue, alpha);
+        poseStack.popPose();
+    }
+
+    public void setHeadRotation() {
+        setRotation(head, head.xRot, head.yRot, head.zRot);
+    }
+
+    public void setChestRotation() {
+        /* if (e instanceof EntityPlayer){ ((EntityPlayer)e).get } */
+        this.body.y = body.y - 1;
+        this.rightArm.x = rightArm.x + 5;
+        this.rightArm.y = rightArm.y - 1;
+        this.leftArm.x = leftArm.x - 5;
+        this.leftArm.y = leftArm.y - 1;
+        setRotation(body, body.xRot, body.yRot, body.zRot);
+        setRotation(rightArm, rightArm.xRot, rightArm.yRot, rightArm.zRot);
+        setRotation(leftArm, leftArm.xRot, leftArm.yRot, leftArm.zRot);
+    }
+
+    public void setLegsRotation() {
+        this.rightLeg.x = rightLeg.x + 2;
+        this.rightLeg.y = rightLeg.y - 22;
+        this.leftLeg.x = leftLeg.x - 2;
+        this.leftLeg.y = leftLeg.y - 22;
+        setRotation(rightLeg, rightLeg.xRot, rightLeg.yRot, rightLeg.zRot);
+        setRotation(leftLeg, leftLeg.xRot, leftLeg.yRot, leftLeg.zRot);
+    }
+
+    public void setBootRotation() {
+        this.rightFoot.y = rightLeg.y - 0;
+        this.rightFoot.z = rightLeg.z;
+        this.leftFoot.y = leftLeg.y - 0;
+        this.leftFoot.z = leftLeg.z;
+        setRotation(rightFoot, rightLeg.xRot, rightLeg.yRot, rightLeg.zRot);
+        setRotation(leftFoot, leftLeg.xRot, leftLeg.yRot, leftLeg.zRot);
+    }
+
+    public static void setRotation(ModelPart model, float x, float y, float z) {
+        model.xRot = x;
+        model.yRot = y;
+        model.zRot = z;
+    }
+}
diff --git a/Common/src/main/java/at/petrak/hexcasting/common/lib/HexItems.java b/Common/src/main/java/at/petrak/hexcasting/common/lib/HexItems.java
index d6b90adf3c..cd721231c8 100644
--- a/Common/src/main/java/at/petrak/hexcasting/common/lib/HexItems.java
+++ b/Common/src/main/java/at/petrak/hexcasting/common/lib/HexItems.java
@@ -5,6 +5,7 @@
 import at.petrak.hexcasting.common.items.ItemLens;
 import at.petrak.hexcasting.common.items.ItemLoreFragment;
 import at.petrak.hexcasting.common.items.ItemStaff;
+import at.petrak.hexcasting.common.items.armor.ItemRobes;
 import at.petrak.hexcasting.common.items.magic.*;
 import at.petrak.hexcasting.common.items.pigment.ItemAmethystAndCopperPigment;
 import at.petrak.hexcasting.common.items.pigment.ItemDyePigment;
@@ -100,6 +101,9 @@ public static void registerItemCreativeTab(CreativeModeTab.Output r, CreativeMod
             new ItemStack(HexItems.BATTERY),
             MediaConstants.CRYSTAL_UNIT * 64,
             MediaConstants.CRYSTAL_UNIT * 64), HexCreativeTabs.HEX);
+
+    public static final ItemRobes ARMOR_HOOD_1 = make("robes_helmet_1",
+            new ItemRobes(ArmorItem.Type.HELMET, unstackable()));
     public static final Supplier<ItemStack> BATTERY_QUENCHED_SHARD_STACK = addToTab(() -> ItemMediaBattery.withMedia(
             new ItemStack(HexItems.BATTERY),
             MediaConstants.QUENCHED_SHARD_UNIT * 64,
diff --git a/Common/src/main/resources/assets/hexcasting/models/item/robes_helmet_1.json b/Common/src/main/resources/assets/hexcasting/models/item/robes_helmet_1.json
new file mode 100644
index 0000000000..9ea823c893
--- /dev/null
+++ b/Common/src/main/resources/assets/hexcasting/models/item/robes_helmet_1.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "hexcasting:item/robes/1-helmet"
+  }
+}
diff --git a/Common/src/main/resources/assets/hexcasting/textures/item/robes/1-boots.png b/Common/src/main/resources/assets/hexcasting/textures/item/robes/1-boots.png
index 70f60e68db2bd4e85f1799d298ff6fbb05d1a667..8858f9282d2494928324335a867fb40e3f6be2c0 100644
GIT binary patch
delta 182
zcmV;n07?IY0)qmORe%15HUFR7IrIPWiESu~<2>!*;{Jv;D2A}08*-uPKZAm#9){r`
zW=k+Ue2(b=CS0!h_`(*0tsp6h+W>#Vn*XhC84L=Nk_-=?KgUoA6HC?gXF&D_3$kXI
z!uy|IVi*7uQ;?KoNM-P6U|?YQzwvwvBisf1Z(e}gvghFm3@-y<V(1pIpetZtU|`sI
kzJ(E4GZG(vG!9Jw0C<34N8e%OWdHyG07*qoM6N<$g0e<Y{Qv*}

delta 182
zcmZo>YG#@cTF*FZ<^TD2EI<GM)S0W%_1Na^!$&|NjkXO7q>C1P(`%kGgQM+Xzgm4t
z#kW_+Z5G0M*K4X4v>iN_W^kv0;p~<Fsd<7tK}kwH=i~Ms4B!y%HY`YV_{PS)DQ(7~
z<@4_)N-zjd77|YE01780B>dR_@K=u84sO5uJ6X4<{@+_Hq0e^U$OYX5$M6F{umL2S
ha@M2f&qWIpMh2&o35A=(w(~Opfv2mV%Q~loCIH@`RZjo_

diff --git a/Common/src/main/resources/assets/hexcasting/textures/item/robes/1-chestplate.png b/Common/src/main/resources/assets/hexcasting/textures/item/robes/1-chestplate.png
index 5d8ebc911e0bcd7da0c194bd1da3d2d349a7a5dc..ec1d177c7dbf9257ce703debfb6d6ed0f9a35197 100644
GIT binary patch
delta 327
zcmV-N0l5DA0`CHlF@GsZL_t(Ijm46&OT$1I#eb24TcjXH>d<C#5-tcG1A>EFA&aBX
zV8Oq^PLi>^E_U)C=qgT5Zf)rwkT`|5TcC7|(|6n@aT9zHxbNP3-@W@T@ZWG`p?bs8
zBo^7!G3(#>mXL3^PXJ_j&iM1W@ia>V<szFp2c{s)a{yu$S$`+0-mr{SWN8Ggs#y@L
zh*v0O-K4P^q{SNF^#Jf)kF;2mgb$iCVb=Nz+x^ZWeAgrF2YMdTJT2C2_q%$6<z@xI
z{l%abQ_KJ#-(MD|6U^p`^=x53Ae@Z!<jv@&)_MgIiMiYE=)LM3tOn*!b9a41I2mzy
zsyIG8;qm>2t3Y#AGm58{K+FQOi8;K+E6nDJ(`|P+JM#2rV!2t>W@QzEK`<_x_N(SU
Z!4K5|eB6>6fKUJc002ovPDHLkV1l2Tp-}(;

delta 339
zcmV-Z0j&P-0{a4xF@H5lL_t(Ijm1;3Y63wJeHU!fT=1fD*#oN(3~9tAO^SSgpad)|
zt<w7e))r}O>})Mk3U+Dk3vytkRl1WyWQ!}V-4tQgS@+Tf^59^1=DjyFyL-TY!=ptf
z>}j4zvbD$ezvU~GoDatUfc@c!X}m10W^<sEZ0%ie!v1gs0Dp{R*Q(eFdwL|h7Kczd
z7X!fK?cLAf6PgSoKXAmBL7FQ>eqfpKy=c^oL7FQQHzTN`K$<IvM$IH;yM<}Iv|?$l
zpo+rnV3X|t0FfV<YB%B}r0VfkVvS%rSZx;`C(CvVgV_Z0;n-=NbFEt-5{aAD(8T!M
zP6zza^q-$Fm`qI|#RKY>*LeGQKivugX`Bv7OyDN`@JdHmZ5Lj%8bVyv&Bw9HcGmm=
l`xiJ~?q79T{9ODe_y#Q+h8t&X*SG)x002ovPDHLkV1la}qEP?<

diff --git a/Common/src/main/resources/assets/hexcasting/textures/item/robes/1-helmet.png b/Common/src/main/resources/assets/hexcasting/textures/item/robes/1-helmet.png
index 153b2a7a834f7e56f005804258d9d496522ad0d5..193241ef9cd0cc48e42045f7af3a9e34ecec4b16 100644
GIT binary patch
delta 433
zcmV;i0Z#tZ1K0zQF@KUtL_t(Ijm?q0OIu+S#(y^yA&AgoBE-QKmkJl5-Xe4hf?UXy
z3c6+x1L6lAG~l3+Y6txTTpThe2qO3~NYF*PxHMD=h=i!aMS@)KYle%)?R2`g8n3P3
z;%_?d!*kAicn-V}%_~xgxOnw){-+jXe$tal#O30&Aa}R6Tz{MvB$bHEeY5wj_W)?A
zL|lf)hG=ST2H;(!g-B}~PQ_w$U<-i7^{>8Gb!-4!rO3|A6Y_qU7|Gx&Mb)t>7YiKC
z3hB-y>CPmZlb4i>1*(pXs}vI>nZFsBhAsemzmGN3&?P%J#r0YTA7U}~OGf}))ozG}
z8~L2BlAW3Ny?+lv1W0yGOYi$H^nCop+w>)o);0i~ipA3C836h6F2BxmeqV?>u4*?(
zUlFTxf>W_@Di&7hgn{o(L5F!fz~kHaeqdeCn;_9uiri|ypLlMyA6F@$;dvV@OqT++
zXt?p;1GW!;X!-K4zs3EH0G5jz4+4CW?)E`34P6d)Rx0FRXGKgym+tmK`EO%ArlE^>
b@7K#8nG?GOW&Q0?00000NkvXXu0mjfjXuxU

delta 429
zcmV;e0aE_h1JnbMF@KIpL_t(Ijm?oUNE=}k$A2fqAyi5=INXpyq#(D116@NQ9ApSM
zxCkMWp*1K9Ds%}1I#fD$5pk(?5fnjUz{xm-QbPqnLTX%&a6`Dy3<pO$y-s)4^wJhw
z`kUVO=l|aK_&<0gT2SOODGBP2)tVM%9_YzuQqpNR<h$RMPJg>0`Akagn}c`12SCeb
zQu2CffswH>0G`LkiR%em$7U(J1;B^nSE1H(y8w7fQ7&yV6#TMQ+`v<cp4;W-s=?>d
zExBZxTr$nU$^|!94SH@DPbt=l8^1EJOhW)pzg}yWX-N6)8=OzW=;LuN+TQ@U^L<8R
zF{X=8DVH`w?|*|30cNKP@^Zptdh!K{<!8k81OTpMvt6hGP;H&@#W@c9hUnwY_ZgZ0
zf!%82IySCjW4D^jy_<?U%<lsNRtx))bw5v{L{BMp4j043cMccvl=}A#-mjlWYNN5(
zp9dT@x3y~PEZpM$MgV)4Cl3M~$c&y9%QU23*_C=_S0*gekQqHIe{Jl?G7Smt{r~b4
Xeag4HlmI+s00000NkvXXu0mjfdgjQ4

diff --git a/Common/src/main/resources/assets/hexcasting/textures/item/robes/1-leggings.png b/Common/src/main/resources/assets/hexcasting/textures/item/robes/1-leggings.png
index 1b93352abad98bf765918c03a59396527a978fd3..7c4a6f4090546a123708f3fe9c3a8c8f1a499fbf 100644
GIT binary patch
delta 327
zcmV-N0l5C~0`CHlF@GsZL_t(Ijop$zO9Md=#ee6YN=O?HA&Kb?hy;QJEKDD`4-hbr
z!qQ$)!OwAptsvM~Sy@T0$f>2U7mMU_v4|Il!UeJxa+^D|ik;vzJNtO^=FQH+Ux%Rs
z>sv=shhKHh7WgZ=;#$7KMkY(aGy&-PKHfN>A2y{UY~x1(0DpHNa0i0*APYb*489#f
zD{#1LY03K+?gF;-)qZQUo+5O8U!BL*1Ioo_>U~lI00q-jMZXCpknHY_=QGE7I}o%3
zL8D})T%;T%3u6~A?-PaH4<A!^faSP*Enfk^m`a{rheWdoV=C!QMy$zIqFKaVZkucG
zmTGQ?H<>x<k3c%7YNxTSM#<vl`HomHnV&yg;t1O)7w7*$tugUIq$6yjAASlZa}D=D
Z#0Nd5hl?Kf8w&sc002ovPDHLkV1jQGlB56t

delta 328
zcmaFQ^nq!DVZD~8i(`mIZ*qb}#(@rB0|(=;_GTY>ucs%kNI$sjX5h&V$65Xzj$S@3
zjX?15=4x{ufBU`372hs?|GzSQw&X{t13*yl^rv&1_IY_DkG%q|5+6RA`spW_DqOrK
zy82Pm)o{ZjGcL@PPkzv}=mAiF!LBoQZ3lf$iL2HG@FdhHBqU4_5^l^^VmrX=u<h^5
z<>dve2H&2F`%CEUuQ()-`=a#`mx#DRcFWF3cem#kZ0y$0Tkt_rLPBCj;x=n7Nkan=
z`1kYthYx?F+wA}UgK%D*R%g?569Ws}IFW7qW?ymFLAQe~4}a@_Yg;})-}KO9k!Nc%
zob?^s{(e7ac!0+xP2YBZ@53vb&-SDRb$nsycU!{p=|6~j-p&aqn;d8@!@%(QU0X71
So9+$<An<hcb6Mw<&;$SsF`je)

diff --git a/Common/src/main/resources/assets/hexcasting/textures/item/robes/2-boots.png b/Common/src/main/resources/assets/hexcasting/textures/item/robes/2-boots.png
index 39ab875a16989226f26c6dc8a2fd083c26fef5e0..51eb230217d93e0cb1179badac62ea0aa84fa56a 100644
GIT binary patch
delta 270
zcmV+p0rCF30=5E>F@Nw$L_t(IjqQ)2i^5<WhMx`lFbHb{i|NAZ6-@)vr^RR!=K6tf
z1B(NL#UgU?nsG_6s0ddzYSK$X7LM}|@H5Cn_bFVtaBxriUY_5}`@uiIgRp%mY+pWl
zUz1560tAlB>tuK%2966L0m5ZROL9Hk7&tDwD7w3>@g$T?DSw!5R(FqgQN;GJSMtjj
z>gA$*X+Hxn>#E}Ru&310$*;2*qoRBt&$UZ|uzgv}2|fpBF<;q0|F)pi(wTLSK!IAW
z$G08IaM{sx0K;5hc`=q31Mt@WQWp5l4*;q?6U&P+%mn~iGXGjm=B4?m_s2K^NeNIn
UchSt{00000Ne4wvM6N<$f;tg^EC2ui

delta 275
zcmdnSw3}&yVf|N67sn8b-sA)c)-8;TvsV6RHVOX!_>nTRSV=Dr5Txb_^2F{ATcDv+
z+?@afKh7UGaA3p3Upa0wEQEJ;f~3#K?LGKvlLWIkk0B4U-~FAfp`SO0=S$41t7=!|
z`|dPn`QQJSemSrKL0j!venSzvzhC+et_+*!`1F{0J=?yi-~Nl|+MnPsS8y=?x_^EH
z_u;dh^Cf}0k1r7V)tgwazKYRr>!*O`of3aoHc8lJuKIhwpw>)Tm>CG>AJS#}S`!Dx
zAoFj|H8+R}n7w0OBM>N7EYfVQveRdt&vayUkHK?g?KVq(S%KAg9gGYHGyTJ2&)aS1
PVE_V8S3j3^P6<r_^lNhn

diff --git a/Common/src/main/resources/assets/hexcasting/textures/item/robes/2-chestplate.png b/Common/src/main/resources/assets/hexcasting/textures/item/robes/2-chestplate.png
index d87942f6539c9ffbf86b9236002af23b62909b84..474e0b1daf3ec37576c3b1ae0fdb64b306700bcc 100644
GIT binary patch
delta 354
zcmV-o0iFJn1BwHXF@Ho!L_t(Ijm49(YQj(yhQEk7nohN5v4*a;bO`tWQrv_-K!<?P
z$tNfj!M;G34uV4;ppYpQI(8^H2<>Rmc2R>%D~OOK9qhfFYn;0DpKfyg^X0$i-oSs$
zQj5mvRU!+)uw%(*&-D|>c2f1MYQ8zU1mI&fqx%-@{F?LtNq;cxSQ%;fEl?{}jYOX7
zCl|-(hDRy8-K<nARe=p;vrc;ebb`q;(l5*T0szfQgOmMAs!4h^V6k2qrgFZ(VX>Hk
zPL>h(uMbSWrzRjA^=Uuf8IZl^oO&zP%>YlIF94_$(SX6YXB->ASNDL&+gvKT^k%?3
zbGg5x>m2n~Y+FE8bOW$01$l4BI)MaBPzs=iIax+}2C7*OT5ZDsIJQGL>T9E%!D784
z9QBdc8N|OJ<+;ATg^um$xPx)e@?1aJHSj;{2YbAaEsjnfHvj+t07*qoM6N<$g3sls
AdjJ3c

delta 363
zcmV-x0hIoV1Cs-gF@H@-L_t(Ijm1+jOT$nQ{vz#~K#`EXY^4+h2dy-F7Yjl_a1opx
z-NYXuZjN2+C=?0?K`^czRB$L+oXl$p<$)QpbcjRqp7#<r2XDG?-+lMpcQ3$yhar=r
z?X#Q~#<QV8zdh#X%yKIAnryy2H~|3gWQoz+<FC^w20%WZ4S$Ud3MdNbx4N1lkNNrO
z-l2w(Q7bnCK(E~?vNcJ+)kUw}sWfW@aVp@N4UNP#8+c!Q!ZjOObDRp5s})3+0RWi2
zsfzo%Ta}4%DscOH5B{~#34$oZ)$>RJd9p<Pc!j}*tr0wZysQTm7f}RLJ~7H(tnTV~
zxK1k4C02PrZ)8sQYo0eT*s;NXgemDVv@@1T<~MVtfD%)p3V}2;PKEM7Hp?1aLnC08
zgCGhOka{4p3_%ovK4*aZ3p70Dt5?V@N6DS?iQzFnrzZY6z5$Neo52?ZPb&Zb002ov
JPDHLkV1g%^pq&5!

diff --git a/Common/src/main/resources/assets/hexcasting/textures/item/robes/2-helmet.png b/Common/src/main/resources/assets/hexcasting/textures/item/robes/2-helmet.png
index 8e8be419cd28ba7807bdf196873b03afe8ec017d..915b21c7940a57295e56ac53ae72b47e9d623970 100644
GIT binary patch
delta 399
zcmV;A0dW4V1GWQ@F@JDLL_t(IjlGh+OF~f?#(zcx5mJ#tI#{?A+@&rEE)hWpO%YUM
zgU}SwBrZY(EkS=lfrEn35;TZ7Ndzu^L5oNq!X?Cydy|yZ?KIRCuiY!P^qb!EoacRc
z&dagU!`8~8(Cb+0(q^TZvbC}(+Rch+H!GsM$x8px{Q7hwUVoo%OifnzgL+Xas{lCM
z9zy$J0P$X00AO_TiqL)-huec%R61V60DziWLCNO;*mNF)^Gh$({WLU<yG$DU#DpQ)
zK=+}cX#l*P%`)wBQK*+G)XP*`AKadf8$3FOjjql|#PXD%rI|U#wo5qN9sty$!pY7v
z0IA0`*DujdpMN0%K(+OOSbIRp=TM6ZYEePS=h!%~_gc*d=<MxgOzU0-&BTVL5lyU9
zQ!4;O6YJk^ANpN_qe$LVa}JO6A8>JhXiGh&J1M#o0mL584GXly=M9R0EQxF~F0#qE
t2*{G~d4uL(xE}#o5&>EId*i?I33uGHBS^Ov=Kufz00>D%PDHLkV1lnXy<q?V

delta 390
zcmV;10eSwm1Fi#*F@I=DL_t(IjlGhwO9EjS#(#!12v(#t+#nGlh)W#gDlLM8(a_T3
z=3o#sB#w?je?W`4WGxL6gh^A{;80SdTsXv`N6DRn#$nUf5Q?X#(9&;uzvp}2m*;!=
z983_8hQ+YHC{-M@G+W})uo#$aF)-U=ylIv`)!b~<M6*$|HGj>zcMgk>PaOcS<Rg_y
z1Bl+cAAqIxH&U52Ude~9sUxpt06<r7qbhX(c2^Ez>sN2}Wcr4|%fmfxkH?a1Vf@fH
z3;?vtMWi(^tzL&#uS3T)c|QNLc!pRux)(@@oei1oO+UV)WxSFP09{kbCMp1wlrm4+
z?WoU^0H9-<xPK46QI$HnrlM;qs#0hFG%#tkA28%Nacx^q;<OX{hC!~7q^q|9$Q6=P
zZ=ajs?Bvl_TXnhS54fpk9VMkaN->@Y;Oh0xvcQ>yq?m}vK~XK{MYWh05jiMAQq2Af
k&m$rSMMMt%z42f90rthQ@<FgHzyJUM07*qoM6N<$f>hJE$^ZZW

diff --git a/Common/src/main/resources/assets/hexcasting/textures/item/robes/2-leggings.png b/Common/src/main/resources/assets/hexcasting/textures/item/robes/2-leggings.png
index 64677f65ddcb192e706ca8f0827595bea9912fbf..ba0d088357fbada391711bfbc25e62cd97b1a43a 100644
GIT binary patch
delta 227
zcmV<90382=0*nHXF@MHML_t(IjbmUKXuyar;BQ#-AD@Pe=UY(ppm6*RYyP*oWuRzy
z@ccOg0|NuY{ZB6$UVs0}aPie;6hl~W*#y%F1B!g&3=9k}8J>N7h9b^{PxGml_ZUvS
zyobvU>@Gmoy#4l0sHi)GnYa>h2Ef4f+dCOf-<t>X>wh!xOkAw$uzKPCr<W*vDSjyo
zF}w!6{{EFHF`NdF0x%4?|LG;V{~0!(Z(&3PC>{fzeSC(~sZ#t>SmiKWfNndoD=xme
djMeag1ptavS>?HDSOfq7002ovPDHLkV1gVsX}ACY

delta 218
zcmV<0044v70)qmOF@L>DL_t(IjbmUKXuyar5TKd*AD@N|*Jq>XVL{hi<`#jW>Dj9{
z3{OA3V|e%N8v_GF>VITISTIy0X+j3ld_oZMk1tTfneb`8{Nf42<rhzI*@52$mtQ<#
z*naZ>l;^;pD<MOi0WjOQ-#ox@>e*(PU;pb$#9%c5s~4VrdQ*qOm*SVe5W{N#B(w>O
z;WU60fMLMXPw&wE&#>Y8Y(_+Y;xXXa#}_!AD#b5>RSqK-&}~O{1p@>AWIiwe087hP
UpR^zeJ^%m!07*qoM6N<$f|}7|KmY&$

diff --git a/Common/src/main/resources/assets/hexcasting/textures/item/robes/3-boots.png b/Common/src/main/resources/assets/hexcasting/textures/item/robes/3-boots.png
index 583db2e5b30747d208e2d668f9ed28a8f60dede1..5f30152ccf46ca675860506ad19526bedfe24b49 100644
GIT binary patch
delta 259
zcmV+e0sQ{40;~d%F@NSsL_t(IjqQ=G3c^qrhM$SqMcs-&-Cz(5i)M}Mf?@X{48iIZ
z2nH`eunUHjfkDw^aaxWnZZ|N~Ik+7SR`E@T=X~G83m^Pr6v41F$>e);m>Hj#Ou4u`
zZVv%ioHseK<UsZ+DHR(;X-vbiw5kouB1&V8Yl3f+6Np5xy?lpn2X~hv+k1#e#Ct)v
zHOg$$MkIpU<Dm(fl`0|;*rrXlHOg{=*Ja=Fh|(Cd7N}*j77(Q|zT;^U)u3PR;X57x
ztJ50S9Vmh84p^Pm0Qinazur@S>Wp##V1Hd2FjqAtn?jELNS^MLR+e~lkU0PV002ov
JPDHLkV1lTRbq@dl

delta 265
zcmV+k0rvi^0<i*+F@NhxL_t(IjqQ;!Yr;SnhMyGY2t`D$i@3QJhpbWPs&vb8tA8Os
zqJN>Q?gha~2(B%tTOky;9HB@c`2**4hso*CRr*fHbKm#y!UzBHn&5Rf*XI54{qEgj
zCavbOe0~97aoE(vh6DOi^3ZIMRRyBkajJ@LhpZ|b?g;*xntwo*ImvN%b@1yaB{}X;
zWqw@{h^ZFs9;(byzb8lV<UgXy9MSF(h^ej#E|=p_l2rwMKefw#KP9UQ;!rvg+h8&n
z5r-0h<$g^R&8#4bW-Rw>0OC+G8I0_oJ);=__*5$o#<r$mZ(C~YPI3kY&{qQQ*j7jY
P0000<MNUMnLIPldipPIH

diff --git a/Common/src/main/resources/assets/hexcasting/textures/item/robes/3-chestplate.png b/Common/src/main/resources/assets/hexcasting/textures/item/robes/3-chestplate.png
index 3940489bbe91bd18eb88c51fcf383e8e1fe4d314..5bc6f69e08b37dc16968cdb80f8c413a6c115b4c 100644
GIT binary patch
delta 387
zcmV-}0et?x1FHj&F@I%AL_t(Ijm49(O9EjS#(x*C)?k=8Bnc4>nGJ?RqZCbH(Appb
z6-Yz0MG@KNe-Je|G)3Sfw)h7G3Pl`;lyQT0d53f&j@O`f-RC(5J=6ES@AEw0^WFO$
z{5K?fv9)q)xf{h=PIB)P(To+I3VZrKTYR;?55PyO#q~>Z?0;!)4qz2)IcdU87&b^n
zl0u?HG-K_?wgrw2->BF|Dv|^SCWG}ar(tRi&q?4e&P~oZCd<Jk!MI^+wEI1;LA&1@
zYvSJ9{ZhS5^Sdctp;RveaK3iHDE97F0nnQgsv=X!f;|x@!PEP#Ft&!Nk<N$Mx$rx+
z>F}(FI|1U%8+@il{7fR94><z8sX8Y9KtM?6V+3v?K-Vzn8V0H&3kIHV0I<05Mo0g0
z;#MnVj<OX1>~~Ojz89|HNdTZKGO8kTbJ-ylj1PqmY|d}se$F0)Pfh3e@Px<etCWal
hgnwgrqEP!2`~U*9kuGMf8$SR5002ovPDHLkV1oNevH}1A

delta 407
zcmV;I0cifK1HJ>0F@JbTL_t(Ijm48cNW)MN#($NpwqT2t6f#)x4-Qhn(oMSv77Mxw
zx)wnY1hJb_H)ppZT`Y)`Ahalg&I;-xA#0$ahBU<%y2iognb$Z9e$&0X@9w_4<H3I;
z;v1XuB`+Ab)~k`=JF6BwHI@v;6+gMWwhe$~J6yco|Jp6c0e`$}y&4${5{3ctQ%jPf
ztXlMTG6jj_Lm5p5Se~94THi(TQ%j_x6N1y~xq>Sc_)c{)0YEA`AxJ^H)pKzNgKz<N
zFrd|QIla4-3I*ZsrfEE4eYWKhn#Lml<(1t~;>LL%fSi@aG<51EP-9830t%k28|iG8
z?QnLpN2RtUe18d53vm?)-&{M0p%EjYYIGeN$1+9ocswqtQy4+6k``ouey2mf)4?=!
zwAuL|g`+zFm|N`8b!;K`<>8jY(iH$ZnF7x|Q-5tpV}uj{n1+sN=+sW$SxhbfP=9T(
zKD#QG_v;Al4~L`uWA0wwBU!a5{f%Kq$@eGt0wY0{uMl3MHzxo9002ovPDHLkV1n1C
Bx8eW*

diff --git a/Common/src/main/resources/assets/hexcasting/textures/item/robes/3-helmet.png b/Common/src/main/resources/assets/hexcasting/textures/item/robes/3-helmet.png
index ec8e33ee88ed9c3962c0c38a161c6af153e225b9..ed2b85bb7c0e7083a6caf50cb9e072cc535e8aa9 100644
GIT binary patch
delta 423
zcmV;Y0a*Ub1I`1GF@K0jL_t(Ijm?tJD+F;E#y=}5NeIOrkP<Z|2IV#>P0dMLYmc)v
z<s|tBT$Gf9lN+^#+Tx%bBrXnWFBY{WZHui*lU*~^ZhqXpE@s*t<Hyl+dVf6c^FH5i
zF95ox2whVIpU^c$sIpX*`}<z5Yl^tPNqYr1_X~W>(KSW9zke2myY>CGST$TJ;`S=z
zS^(QJSzcSkh{drj6983~M7@Xr(A05?%L7<mTlM0QOHS-=(iZL_mq}B09G-RtyzTi?
zfsvVK8e3cG8yv;9OpI8Z<BO|MjY~3O@v7mT&Q9{B0{K#b$F~>GH(Dq=4!KMkBNq3>
zLzVBG8eR~S-GAdu^bgTI^FUj;%d@^ddker}?ufIygf~}%507szh)4!AdyQ?G*p`Wz
zy=Ho`(N7H)a4|o35*YhY8&oVi4vA!xXS)bMA{nLZI6&Rs9IPy418eQ|4L=L)UoM3X
zb4Q+wN=E=&nZ2qH{1#)qhEQcmqz<-4>R?-_vLwcOjUX@A`72ae3Owuog%1_|+J&JY
RPc;Al002ovPDHLkV1ioez+3<T

delta 421
zcmV;W0b2gf1Iz=EF@J_hL_t(Ijm?s~OT%Ck#eWrXC_X@oLxv)vf&?6bI=BRvKnB4<
z3N9%WIw%MZ{tXI(li(r>qAm_1NEMvap@SBMf|ROLuo+4cp_Qo9=VC$|<74zp_i^sI
z=li$-7`iG9T@`%7&{d%+a#J4e2f3lE;_0yv6#P6a@GZyCRe$m3RfWIx&8s#IH;VYZ
z#<&&0woI1S*T|&O*p>-^rpO}xIsrgu-#tDLV0nElh+{r^`(THJl;ojUpzb(Wdu_q?
zO3h_#zMYPq9tKB7u`QEKD$Uu=U980?Wm4&;VW~GkrRGwpxwxLk^~MWz$Kjz^Ad^Z5
z;<3heP7i0rWPiWH*uW6Ug)S0OGO)gxy#U~}e9o119L%*4g6ny7%)VomOW2l)ZJC(m
z5;H5qVQRF1kHzdkWE@6oRI%<jY#q+=Y*zu;I-H~KIDdDrx^x*?>yF2N7C0(x#!k!U
zfr~~*0Q<KmO&|Cz#-%BtDYD4tc11q7D>OwG<I>cZ>mK|Snj%M@_5Z>L>?7D{oD2s(
P00000NkvXXu0mjfCws~F

diff --git a/Common/src/main/resources/assets/hexcasting/textures/item/robes/3-leggings.png b/Common/src/main/resources/assets/hexcasting/textures/item/robes/3-leggings.png
index e244acbac01f83927e914e11049babdda320a559..1406c33b03866ebb281c8a09455a4f86d1caf717 100644
GIT binary patch
delta 214
zcmV;{04e|Y0sjGzF@L#9L_t(IjbmUKXuyar;BQ#-AI9EzzJ(E4?Aga>45#nS!_Wf<
zah~@7e|&rO|MH1#|J{tV{}U2tU|?WiLFRmXVau>5;~@hBgDAuM59SOE3|H}rGcYhP
zFd-YjFL9W`WrjS1eAa6QL4lJ5#i`-~tYPrv&Kay>fG&>51y2k(T);r%Ft~nGnV~Ik
zKZZ@X#BqiJ+3Dc=O=X5X84npwz5I;f0&L<K1~4!%Ff<;Sj@5Oz#0MS#02$q?Ub7T-
QeE<Le07*qoM6N<$f=;1e*Z=?k

delta 207
zcmey*_=9nRVf`jg7sn8b-sA*{i~}8d0t;sTl0SB@pw>)z(~Zsj`VxM&w|f?{^F6Y8
z`~UxsZ?FD86~6s%w`Asjb(M1mfS~Ej&o2(WiQb>;*npsoUw?{(gv7c>qUi}h;AGa|
z|4^*?e2hEW*P1vs#?ES%qbnaVtx5dw<ecQ1#0EV(j>8@gj=9>kmAyYIVfIkyxFlQ3
z@@8rApAy?t-ly;Q^N6#JdqZck1jwcfr3IW}*B=VWS1>SWrY`Bxd+N&100f?{elF{r
G5}E*9>|U<`


From f284c1f1dadb2c07fffe91747003a254c9d7724e Mon Sep 17 00:00:00 2001
From: falkory <falkor220@gmail.com>
Date: Sun, 24 Sep 2023 15:42:17 +0100
Subject: [PATCH 3/8] Revert "Trying to get armour back"

This reverts commit a7cbe544402744148e3221b145884a42272eb521.
---
 .../client/model/HexRobesModels.java          |  15 +-
 .../hexcasting/client/model/ModelArmor.java   | 176 ------------------
 .../hexcasting/common/lib/HexItems.java       |   4 -
 .../models/item/robes_helmet_1.json           |   6 -
 .../textures/item/robes/1-boots.png           | Bin 259 -> 259 bytes
 .../textures/item/robes/1-chestplate.png      | Bin 367 -> 379 bytes
 .../textures/item/robes/1-helmet.png          | Bin 472 -> 468 bytes
 .../textures/item/robes/1-leggings.png        | Bin 367 -> 368 bytes
 .../textures/item/robes/2-boots.png           | Bin 310 -> 315 bytes
 .../textures/item/robes/2-chestplate.png      | Bin 394 -> 403 bytes
 .../textures/item/robes/2-helmet.png          | Bin 438 -> 430 bytes
 .../textures/item/robes/2-leggings.png        | Bin 268 -> 259 bytes
 .../textures/item/robes/3-boots.png           | Bin 300 -> 305 bytes
 .../textures/item/robes/3-chestplate.png      | Bin 427 -> 446 bytes
 .../textures/item/robes/3-helmet.png          | Bin 462 -> 460 bytes
 .../textures/item/robes/3-leggings.png        | Bin 255 -> 248 bytes
 16 files changed, 5 insertions(+), 196 deletions(-)
 delete mode 100644 Common/src/main/java/at/petrak/hexcasting/client/model/ModelArmor.java
 delete mode 100644 Common/src/main/resources/assets/hexcasting/models/item/robes_helmet_1.json

diff --git a/Common/src/main/java/at/petrak/hexcasting/client/model/HexRobesModels.java b/Common/src/main/java/at/petrak/hexcasting/client/model/HexRobesModels.java
index d221479580..7f35494cab 100644
--- a/Common/src/main/java/at/petrak/hexcasting/client/model/HexRobesModels.java
+++ b/Common/src/main/java/at/petrak/hexcasting/client/model/HexRobesModels.java
@@ -5,39 +5,34 @@
 // Paste this class into your mod and generate all required imports
 
 import net.minecraft.client.model.geom.ModelLayerLocation;
-import net.minecraft.client.model.geom.ModelPart;
 import net.minecraft.client.model.geom.PartPose;
 import net.minecraft.client.model.geom.builders.*;
-import net.minecraft.world.entity.EquipmentSlot;
 
 import static at.petrak.hexcasting.api.HexAPI.modLoc;
 
-public class HexRobesModels extends ModelArmor{
+public class HexRobesModels {
     // This layer location should be baked with EntityRendererProvider.Context in the entity renderer and passed into
     // this model's constructor
     public static final ModelLayerLocation LAYER_LOCATION = new ModelLayerLocation(modLoc("robes"), "main");
 
-    public HexRobesModels(ModelPart root, EquipmentSlot slot) {
-        super(root, slot);
-    }
-
     public static LayerDefinition variant1() {
         MeshDefinition meshdefinition = new MeshDefinition();
         PartDefinition partdefinition = meshdefinition.getRoot();
 
-        PartDefinition head = partdefinition.addOrReplaceChild("Hood",
+        PartDefinition Hood = partdefinition.addOrReplaceChild("Hood",
             CubeListBuilder.create()
                 .texOffs(0, 0).addBox(-8.0F, 0.0F, 0.0F, 8.0F, 8.0F, 8.0F, new CubeDeformation(0.0F))
                 .texOffs(0, 16).addBox(-8.0F, 0.0F, 0.0F, 8.0F, 8.0F, 8.0F, new CubeDeformation(0.0F)),
             PartPose.offset(4.0F, -8.0F, -4.0F));
-        head.addOrReplaceChild("Horns",
+
+        PartDefinition Horns = partdefinition.addOrReplaceChild("Horns",
             CubeListBuilder.create()
                 .texOffs(24, 0).addBox(-8.0F, 0.0F, 0.0F, 8.0F, 4.0F, 0.0F, new CubeDeformation(0.0F))
                 .texOffs(24, 0).mirror().addBox(9.5F, 0.0F, 0.0F, 8.0F, 4.0F, 0.0F, new CubeDeformation(0.0F))
                 .mirror(false),
             PartPose.offset(-4.8F, -8.2F, 0.0F));
 
-        PartDefinition torso = partdefinition.addOrReplaceChild("Torso",
+        PartDefinition Torso = partdefinition.addOrReplaceChild("Torso",
             CubeListBuilder.create()
                 .texOffs(40, 0).addBox(-8.0F, 0.0F, 0.0F, 8.0F, 12.0F, 4.0F, new CubeDeformation(0.0F))
                 .texOffs(40, 16).addBox(-8.0F, 0.0F, 0.0F, 8.0F, 12.0F, 4.0F, new CubeDeformation(0.0F)),
diff --git a/Common/src/main/java/at/petrak/hexcasting/client/model/ModelArmor.java b/Common/src/main/java/at/petrak/hexcasting/client/model/ModelArmor.java
deleted file mode 100644
index d896e4a8b4..0000000000
--- a/Common/src/main/java/at/petrak/hexcasting/client/model/ModelArmor.java
+++ /dev/null
@@ -1,176 +0,0 @@
-package at.petrak.hexcasting.client.model;
-
-
-import com.mojang.blaze3d.vertex.PoseStack;
-import com.mojang.blaze3d.vertex.VertexConsumer;
-import net.minecraft.client.model.HumanoidModel;
-import net.minecraft.client.model.geom.ModelPart;
-import net.minecraft.client.model.geom.PartPose;
-import net.minecraft.client.model.geom.builders.CubeListBuilder;
-import net.minecraft.client.model.geom.builders.MeshDefinition;
-import net.minecraft.client.model.geom.builders.PartDefinition;
-import net.minecraft.world.entity.EquipmentSlot;
-import net.minecraft.world.entity.LivingEntity;
-import net.minecraft.world.entity.decoration.ArmorStand;
-
-public class ModelArmor extends HumanoidModel<LivingEntity> {
-
-    public final EquipmentSlot slot;
-    public float armorScale = 1.05f;
-
-    public final ModelPart rightFoot;
-    public final ModelPart leftFoot;
-
-    public ModelArmor(ModelPart root, EquipmentSlot slot) {
-        super(root);
-        this.rightFoot = root.getChild("right_foot");
-        this.leftFoot = root.getChild("left_foot");
-
-        this.slot = slot;
-        this.young = false;
-    }
-
-
-    public static MeshDefinition createArmorMesh() {
-        MeshDefinition meshdefinition = new MeshDefinition();
-        PartDefinition partdefinition = meshdefinition.getRoot();
-
-        partdefinition.addOrReplaceChild("head", CubeListBuilder.create(), PartPose.ZERO);
-        partdefinition.addOrReplaceChild("hat", CubeListBuilder.create(), PartPose.ZERO);
-        partdefinition.addOrReplaceChild("body", CubeListBuilder.create(), PartPose.ZERO);
-        partdefinition.addOrReplaceChild("right_arm", CubeListBuilder.create(), PartPose.ZERO);
-        partdefinition.addOrReplaceChild("left_arm", CubeListBuilder.create(), PartPose.ZERO);
-        partdefinition.addOrReplaceChild("right_leg", CubeListBuilder.create(), PartPose.ZERO);
-        partdefinition.addOrReplaceChild("left_leg", CubeListBuilder.create(), PartPose.ZERO);
-        partdefinition.addOrReplaceChild("right_foot", CubeListBuilder.create(), PartPose.ZERO);
-        partdefinition.addOrReplaceChild("left_foot", CubeListBuilder.create(), PartPose.ZERO);
-
-        return meshdefinition;
-    }
-
-    @Override
-    public void setupAnim(LivingEntity entityIn, float limbSwing, float limbSwingAmount, float ageInTicks, float netHeadYaw, float headPitch) {
-        if (!(entityIn instanceof ArmorStand)) {
-            super.setupAnim(entityIn, limbSwing, limbSwingAmount, ageInTicks, netHeadYaw, headPitch);
-            return;
-        }
-        if (entityIn instanceof ArmorStand armorStand) {
-            this.head.xRot = ((float) Math.PI / 180F) * armorStand.getHeadPose().getX();
-            this.head.yRot = ((float) Math.PI / 180F) * armorStand.getHeadPose().getY();
-            this.head.zRot = ((float) Math.PI / 180F) * armorStand.getHeadPose().getZ();
-            this.head.setPos(0.0F, 1.0F, 0.0F);
-            this.body.xRot = ((float) Math.PI / 180F) * armorStand.getBodyPose().getX();
-            this.body.yRot = ((float) Math.PI / 180F) * armorStand.getBodyPose().getY();
-            this.body.zRot = ((float) Math.PI / 180F) * armorStand.getBodyPose().getZ();
-            this.leftArm.xRot = ((float) Math.PI / 180F) * armorStand.getLeftArmPose().getX();
-            this.leftArm.yRot = ((float) Math.PI / 180F) * armorStand.getLeftArmPose().getY();
-            this.leftArm.zRot = ((float) Math.PI / 180F) * armorStand.getLeftArmPose().getZ();
-            this.rightArm.xRot = ((float) Math.PI / 180F) * armorStand.getRightArmPose().getX();
-            this.rightArm.yRot = ((float) Math.PI / 180F) * armorStand.getRightArmPose().getY();
-            this.rightArm.zRot = ((float) Math.PI / 180F) * armorStand.getRightArmPose().getZ();
-            this.leftLeg.xRot = ((float) Math.PI / 180F) * armorStand.getLeftLegPose().getX();
-            this.leftLeg.yRot = ((float) Math.PI / 180F) * armorStand.getLeftLegPose().getY();
-            this.leftLeg.zRot = ((float) Math.PI / 180F) * armorStand.getLeftLegPose().getZ();
-            this.leftLeg.setPos(1.9F, 11.0F, 0.0F);
-            this.rightLeg.xRot = ((float) Math.PI / 180F) * armorStand.getRightLegPose().getX();
-            this.rightLeg.yRot = ((float) Math.PI / 180F) * armorStand.getRightLegPose().getY();
-            this.rightLeg.zRot = ((float) Math.PI / 180F) * armorStand.getRightLegPose().getZ();
-            this.rightLeg.setPos(-1.9F, 11.0F, 0.0F);
-            this.hat.copyFrom(this.head);
-        }
-    }
-
-    @Override
-    public void renderToBuffer(PoseStack poseStack, VertexConsumer bufferIn, int packedLightIn, int packedOverlayIn, float red, float green, float blue, float alpha) {
-        poseStack.pushPose();
-        poseStack.scale(armorScale, armorScale, armorScale);
-        this.setHeadRotation();
-        this.setChestRotation();
-        this.setLegsRotation();
-        this.setBootRotation();
-        head.visible = slot == EquipmentSlot.HEAD;
-        body.visible = slot == EquipmentSlot.CHEST;
-        rightArm.visible = slot == EquipmentSlot.CHEST;
-        leftArm.visible = slot == EquipmentSlot.CHEST;
-        rightLeg.visible = slot == EquipmentSlot.LEGS;
-        leftLeg.visible = slot == EquipmentSlot.LEGS;
-        rightFoot.visible = slot == EquipmentSlot.FEET;
-        leftFoot.visible = slot == EquipmentSlot.FEET;
-        if (this.young) {
-            float f = 2.0F;
-            poseStack.pushPose();
-            poseStack.scale(1.5F / f, 1.5F / f, 1.5F / f);
-            poseStack.translate(0.0F, 16.0F * 1, 0.0F);
-            head.render(poseStack, bufferIn, packedLightIn, packedOverlayIn, red, green, blue, alpha);
-            poseStack.popPose();
-            poseStack.pushPose();
-            poseStack.scale(1.0F / f, 1.0F / f, 1.0F / f);
-            poseStack.translate(0.0F, 24.0F * 1, 0.0F);
-            body.render(poseStack, bufferIn, packedLightIn, packedOverlayIn, red, green, blue, alpha);
-            poseStack.popPose();
-        } else {
-            head.render(poseStack, bufferIn, packedLightIn, packedOverlayIn, red, green, blue, alpha);
-            if (crouching) {
-                poseStack.translate(0.0F, 0.2F, 0.0F);
-            }
-            body.render(poseStack, bufferIn, packedLightIn, packedOverlayIn, red, green, blue, alpha);
-
-            poseStack.pushPose();
-            if (crouching) {
-                poseStack.translate(0.0F, -0.15F, 0.0F);
-            }
-            rightArm.render(poseStack, bufferIn, packedLightIn, packedOverlayIn, red, green, blue, alpha);
-            leftArm.render(poseStack, bufferIn, packedLightIn, packedOverlayIn, red, green, blue, alpha);
-            poseStack.popPose();
-        }
-        poseStack.translate(0.0F, 1.25F, 0.0F);
-        if (crouching) {
-            poseStack.translate(0.0F, -0.15F, 0.05F);
-        }
-        rightLeg.render(poseStack, bufferIn, packedLightIn, packedOverlayIn, red, green, blue, alpha);
-        leftLeg.render(poseStack, bufferIn, packedLightIn, packedOverlayIn, red, green, blue, alpha);
-        rightFoot.render(poseStack, bufferIn, packedLightIn, packedOverlayIn, red, green, blue, alpha);
-        leftFoot.render(poseStack, bufferIn, packedLightIn, packedOverlayIn, red, green, blue, alpha);
-        poseStack.popPose();
-    }
-
-    public void setHeadRotation() {
-        setRotation(head, head.xRot, head.yRot, head.zRot);
-    }
-
-    public void setChestRotation() {
-        /* if (e instanceof EntityPlayer){ ((EntityPlayer)e).get } */
-        this.body.y = body.y - 1;
-        this.rightArm.x = rightArm.x + 5;
-        this.rightArm.y = rightArm.y - 1;
-        this.leftArm.x = leftArm.x - 5;
-        this.leftArm.y = leftArm.y - 1;
-        setRotation(body, body.xRot, body.yRot, body.zRot);
-        setRotation(rightArm, rightArm.xRot, rightArm.yRot, rightArm.zRot);
-        setRotation(leftArm, leftArm.xRot, leftArm.yRot, leftArm.zRot);
-    }
-
-    public void setLegsRotation() {
-        this.rightLeg.x = rightLeg.x + 2;
-        this.rightLeg.y = rightLeg.y - 22;
-        this.leftLeg.x = leftLeg.x - 2;
-        this.leftLeg.y = leftLeg.y - 22;
-        setRotation(rightLeg, rightLeg.xRot, rightLeg.yRot, rightLeg.zRot);
-        setRotation(leftLeg, leftLeg.xRot, leftLeg.yRot, leftLeg.zRot);
-    }
-
-    public void setBootRotation() {
-        this.rightFoot.y = rightLeg.y - 0;
-        this.rightFoot.z = rightLeg.z;
-        this.leftFoot.y = leftLeg.y - 0;
-        this.leftFoot.z = leftLeg.z;
-        setRotation(rightFoot, rightLeg.xRot, rightLeg.yRot, rightLeg.zRot);
-        setRotation(leftFoot, leftLeg.xRot, leftLeg.yRot, leftLeg.zRot);
-    }
-
-    public static void setRotation(ModelPart model, float x, float y, float z) {
-        model.xRot = x;
-        model.yRot = y;
-        model.zRot = z;
-    }
-}
diff --git a/Common/src/main/java/at/petrak/hexcasting/common/lib/HexItems.java b/Common/src/main/java/at/petrak/hexcasting/common/lib/HexItems.java
index cd721231c8..d6b90adf3c 100644
--- a/Common/src/main/java/at/petrak/hexcasting/common/lib/HexItems.java
+++ b/Common/src/main/java/at/petrak/hexcasting/common/lib/HexItems.java
@@ -5,7 +5,6 @@
 import at.petrak.hexcasting.common.items.ItemLens;
 import at.petrak.hexcasting.common.items.ItemLoreFragment;
 import at.petrak.hexcasting.common.items.ItemStaff;
-import at.petrak.hexcasting.common.items.armor.ItemRobes;
 import at.petrak.hexcasting.common.items.magic.*;
 import at.petrak.hexcasting.common.items.pigment.ItemAmethystAndCopperPigment;
 import at.petrak.hexcasting.common.items.pigment.ItemDyePigment;
@@ -101,9 +100,6 @@ public static void registerItemCreativeTab(CreativeModeTab.Output r, CreativeMod
             new ItemStack(HexItems.BATTERY),
             MediaConstants.CRYSTAL_UNIT * 64,
             MediaConstants.CRYSTAL_UNIT * 64), HexCreativeTabs.HEX);
-
-    public static final ItemRobes ARMOR_HOOD_1 = make("robes_helmet_1",
-            new ItemRobes(ArmorItem.Type.HELMET, unstackable()));
     public static final Supplier<ItemStack> BATTERY_QUENCHED_SHARD_STACK = addToTab(() -> ItemMediaBattery.withMedia(
             new ItemStack(HexItems.BATTERY),
             MediaConstants.QUENCHED_SHARD_UNIT * 64,
diff --git a/Common/src/main/resources/assets/hexcasting/models/item/robes_helmet_1.json b/Common/src/main/resources/assets/hexcasting/models/item/robes_helmet_1.json
deleted file mode 100644
index 9ea823c893..0000000000
--- a/Common/src/main/resources/assets/hexcasting/models/item/robes_helmet_1.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "parent": "minecraft:item/generated",
-  "textures": {
-    "layer0": "hexcasting:item/robes/1-helmet"
-  }
-}
diff --git a/Common/src/main/resources/assets/hexcasting/textures/item/robes/1-boots.png b/Common/src/main/resources/assets/hexcasting/textures/item/robes/1-boots.png
index 8858f9282d2494928324335a867fb40e3f6be2c0..70f60e68db2bd4e85f1799d298ff6fbb05d1a667 100644
GIT binary patch
delta 182
zcmZo>YG#@cTF*FZ<^TD2EI<GM)S0W%_1Na^!$&|NjkXO7q>C1P(`%kGgQM+Xzgm4t
z#kW_+Z5G0M*K4X4v>iN_W^kv0;p~<Fsd<7tK}kwH=i~Ms4B!y%HY`YV_{PS)DQ(7~
z<@4_)N-zjd77|YE01780B>dR_@K=u84sO5uJ6X4<{@+_Hq0e^U$OYX5$M6F{umL2S
ha@M2f&qWIpMh2&o35A=(w(~Opfv2mV%Q~loCIH@`RZjo_

delta 182
zcmV;n07?IY0)qmORe%15HUFR7IrIPWiESu~<2>!*;{Jv;D2A}08*-uPKZAm#9){r`
zW=k+Ue2(b=CS0!h_`(*0tsp6h+W>#Vn*XhC84L=Nk_-=?KgUoA6HC?gXF&D_3$kXI
z!uy|IVi*7uQ;?KoNM-P6U|?YQzwvwvBisf1Z(e}gvghFm3@-y<V(1pIpetZtU|`sI
kzJ(E4GZG(vG!9Jw0C<34N8e%OWdHyG07*qoM6N<$g0e<Y{Qv*}

diff --git a/Common/src/main/resources/assets/hexcasting/textures/item/robes/1-chestplate.png b/Common/src/main/resources/assets/hexcasting/textures/item/robes/1-chestplate.png
index ec1d177c7dbf9257ce703debfb6d6ed0f9a35197..5d8ebc911e0bcd7da0c194bd1da3d2d349a7a5dc 100644
GIT binary patch
delta 339
zcmV-Z0j&P-0{a4xF@H5lL_t(Ijm1;3Y63wJeHU!fT=1fD*#oN(3~9tAO^SSgpad)|
zt<w7e))r}O>})Mk3U+Dk3vytkRl1WyWQ!}V-4tQgS@+Tf^59^1=DjyFyL-TY!=ptf
z>}j4zvbD$ezvU~GoDatUfc@c!X}m10W^<sEZ0%ie!v1gs0Dp{R*Q(eFdwL|h7Kczd
z7X!fK?cLAf6PgSoKXAmBL7FQ>eqfpKy=c^oL7FQQHzTN`K$<IvM$IH;yM<}Iv|?$l
zpo+rnV3X|t0FfV<YB%B}r0VfkVvS%rSZx;`C(CvVgV_Z0;n-=NbFEt-5{aAD(8T!M
zP6zza^q-$Fm`qI|#RKY>*LeGQKivugX`Bv7OyDN`@JdHmZ5Lj%8bVyv&Bw9HcGmm=
l`xiJ~?q79T{9ODe_y#Q+h8t&X*SG)x002ovPDHLkV1la}qEP?<

delta 327
zcmV-N0l5DA0`CHlF@GsZL_t(Ijm46&OT$1I#eb24TcjXH>d<C#5-tcG1A>EFA&aBX
zV8Oq^PLi>^E_U)C=qgT5Zf)rwkT`|5TcC7|(|6n@aT9zHxbNP3-@W@T@ZWG`p?bs8
zBo^7!G3(#>mXL3^PXJ_j&iM1W@ia>V<szFp2c{s)a{yu$S$`+0-mr{SWN8Ggs#y@L
zh*v0O-K4P^q{SNF^#Jf)kF;2mgb$iCVb=Nz+x^ZWeAgrF2YMdTJT2C2_q%$6<z@xI
z{l%abQ_KJ#-(MD|6U^p`^=x53Ae@Z!<jv@&)_MgIiMiYE=)LM3tOn*!b9a41I2mzy
zsyIG8;qm>2t3Y#AGm58{K+FQOi8;K+E6nDJ(`|P+JM#2rV!2t>W@QzEK`<_x_N(SU
Z!4K5|eB6>6fKUJc002ovPDHLkV1l2Tp-}(;

diff --git a/Common/src/main/resources/assets/hexcasting/textures/item/robes/1-helmet.png b/Common/src/main/resources/assets/hexcasting/textures/item/robes/1-helmet.png
index 193241ef9cd0cc48e42045f7af3a9e34ecec4b16..153b2a7a834f7e56f005804258d9d496522ad0d5 100644
GIT binary patch
delta 429
zcmV;e0aE_h1JnbMF@KIpL_t(Ijm?oUNE=}k$A2fqAyi5=INXpyq#(D116@NQ9ApSM
zxCkMWp*1K9Ds%}1I#fD$5pk(?5fnjUz{xm-QbPqnLTX%&a6`Dy3<pO$y-s)4^wJhw
z`kUVO=l|aK_&<0gT2SOODGBP2)tVM%9_YzuQqpNR<h$RMPJg>0`Akagn}c`12SCeb
zQu2CffswH>0G`LkiR%em$7U(J1;B^nSE1H(y8w7fQ7&yV6#TMQ+`v<cp4;W-s=?>d
zExBZxTr$nU$^|!94SH@DPbt=l8^1EJOhW)pzg}yWX-N6)8=OzW=;LuN+TQ@U^L<8R
zF{X=8DVH`w?|*|30cNKP@^Zptdh!K{<!8k81OTpMvt6hGP;H&@#W@c9hUnwY_ZgZ0
zf!%82IySCjW4D^jy_<?U%<lsNRtx))bw5v{L{BMp4j043cMccvl=}A#-mjlWYNN5(
zp9dT@x3y~PEZpM$MgV)4Cl3M~$c&y9%QU23*_C=_S0*gekQqHIe{Jl?G7Smt{r~b4
Xeag4HlmI+s00000NkvXXu0mjfdgjQ4

delta 433
zcmV;i0Z#tZ1K0zQF@KUtL_t(Ijm?q0OIu+S#(y^yA&AgoBE-QKmkJl5-Xe4hf?UXy
z3c6+x1L6lAG~l3+Y6txTTpThe2qO3~NYF*PxHMD=h=i!aMS@)KYle%)?R2`g8n3P3
z;%_?d!*kAicn-V}%_~xgxOnw){-+jXe$tal#O30&Aa}R6Tz{MvB$bHEeY5wj_W)?A
zL|lf)hG=ST2H;(!g-B}~PQ_w$U<-i7^{>8Gb!-4!rO3|A6Y_qU7|Gx&Mb)t>7YiKC
z3hB-y>CPmZlb4i>1*(pXs}vI>nZFsBhAsemzmGN3&?P%J#r0YTA7U}~OGf}))ozG}
z8~L2BlAW3Ny?+lv1W0yGOYi$H^nCop+w>)o);0i~ipA3C836h6F2BxmeqV?>u4*?(
zUlFTxf>W_@Di&7hgn{o(L5F!fz~kHaeqdeCn;_9uiri|ypLlMyA6F@$;dvV@OqT++
zXt?p;1GW!;X!-K4zs3EH0G5jz4+4CW?)E`34P6d)Rx0FRXGKgym+tmK`EO%ArlE^>
b@7K#8nG?GOW&Q0?00000NkvXXu0mjfjXuxU

diff --git a/Common/src/main/resources/assets/hexcasting/textures/item/robes/1-leggings.png b/Common/src/main/resources/assets/hexcasting/textures/item/robes/1-leggings.png
index 7c4a6f4090546a123708f3fe9c3a8c8f1a499fbf..1b93352abad98bf765918c03a59396527a978fd3 100644
GIT binary patch
delta 328
zcmaFQ^nq!DVZD~8i(`mIZ*qb}#(@rB0|(=;_GTY>ucs%kNI$sjX5h&V$65Xzj$S@3
zjX?15=4x{ufBU`372hs?|GzSQw&X{t13*yl^rv&1_IY_DkG%q|5+6RA`spW_DqOrK
zy82Pm)o{ZjGcL@PPkzv}=mAiF!LBoQZ3lf$iL2HG@FdhHBqU4_5^l^^VmrX=u<h^5
z<>dve2H&2F`%CEUuQ()-`=a#`mx#DRcFWF3cem#kZ0y$0Tkt_rLPBCj;x=n7Nkan=
z`1kYthYx?F+wA}UgK%D*R%g?569Ws}IFW7qW?ymFLAQe~4}a@_Yg;})-}KO9k!Nc%
zob?^s{(e7ac!0+xP2YBZ@53vb&-SDRb$nsycU!{p=|6~j-p&aqn;d8@!@%(QU0X71
So9+$<An<hcb6Mw<&;$SsF`je)

delta 327
zcmV-N0l5C~0`CHlF@GsZL_t(Ijop$zO9Md=#ee6YN=O?HA&Kb?hy;QJEKDD`4-hbr
z!qQ$)!OwAptsvM~Sy@T0$f>2U7mMU_v4|Il!UeJxa+^D|ik;vzJNtO^=FQH+Ux%Rs
z>sv=shhKHh7WgZ=;#$7KMkY(aGy&-PKHfN>A2y{UY~x1(0DpHNa0i0*APYb*489#f
zD{#1LY03K+?gF;-)qZQUo+5O8U!BL*1Ioo_>U~lI00q-jMZXCpknHY_=QGE7I}o%3
zL8D})T%;T%3u6~A?-PaH4<A!^faSP*Enfk^m`a{rheWdoV=C!QMy$zIqFKaVZkucG
zmTGQ?H<>x<k3c%7YNxTSM#<vl`HomHnV&yg;t1O)7w7*$tugUIq$6yjAASlZa}D=D
Z#0Nd5hl?Kf8w&sc002ovPDHLkV1jQGlB56t

diff --git a/Common/src/main/resources/assets/hexcasting/textures/item/robes/2-boots.png b/Common/src/main/resources/assets/hexcasting/textures/item/robes/2-boots.png
index 51eb230217d93e0cb1179badac62ea0aa84fa56a..39ab875a16989226f26c6dc8a2fd083c26fef5e0 100644
GIT binary patch
delta 275
zcmdnSw3}&yVf|N67sn8b-sA)c)-8;TvsV6RHVOX!_>nTRSV=Dr5Txb_^2F{ATcDv+
z+?@afKh7UGaA3p3Upa0wEQEJ;f~3#K?LGKvlLWIkk0B4U-~FAfp`SO0=S$41t7=!|
z`|dPn`QQJSemSrKL0j!venSzvzhC+et_+*!`1F{0J=?yi-~Nl|+MnPsS8y=?x_^EH
z_u;dh^Cf}0k1r7V)tgwazKYRr>!*O`of3aoHc8lJuKIhwpw>)Tm>CG>AJS#}S`!Dx
zAoFj|H8+R}n7w0OBM>N7EYfVQveRdt&vayUkHK?g?KVq(S%KAg9gGYHGyTJ2&)aS1
PVE_V8S3j3^P6<r_^lNhn

delta 270
zcmV+p0rCF30=5E>F@Nw$L_t(IjqQ)2i^5<WhMx`lFbHb{i|NAZ6-@)vr^RR!=K6tf
z1B(NL#UgU?nsG_6s0ddzYSK$X7LM}|@H5Cn_bFVtaBxriUY_5}`@uiIgRp%mY+pWl
zUz1560tAlB>tuK%2966L0m5ZROL9Hk7&tDwD7w3>@g$T?DSw!5R(FqgQN;GJSMtjj
z>gA$*X+Hxn>#E}Ru&310$*;2*qoRBt&$UZ|uzgv}2|fpBF<;q0|F)pi(wTLSK!IAW
z$G08IaM{sx0K;5hc`=q31Mt@WQWp5l4*;q?6U&P+%mn~iGXGjm=B4?m_s2K^NeNIn
UchSt{00000Ne4wvM6N<$f;tg^EC2ui

diff --git a/Common/src/main/resources/assets/hexcasting/textures/item/robes/2-chestplate.png b/Common/src/main/resources/assets/hexcasting/textures/item/robes/2-chestplate.png
index 474e0b1daf3ec37576c3b1ae0fdb64b306700bcc..d87942f6539c9ffbf86b9236002af23b62909b84 100644
GIT binary patch
delta 363
zcmV-x0hIoV1Cs-gF@H@-L_t(Ijm1+jOT$nQ{vz#~K#`EXY^4+h2dy-F7Yjl_a1opx
z-NYXuZjN2+C=?0?K`^czRB$L+oXl$p<$)QpbcjRqp7#<r2XDG?-+lMpcQ3$yhar=r
z?X#Q~#<QV8zdh#X%yKIAnryy2H~|3gWQoz+<FC^w20%WZ4S$Ud3MdNbx4N1lkNNrO
z-l2w(Q7bnCK(E~?vNcJ+)kUw}sWfW@aVp@N4UNP#8+c!Q!ZjOObDRp5s})3+0RWi2
zsfzo%Ta}4%DscOH5B{~#34$oZ)$>RJd9p<Pc!j}*tr0wZysQTm7f}RLJ~7H(tnTV~
zxK1k4C02PrZ)8sQYo0eT*s;NXgemDVv@@1T<~MVtfD%)p3V}2;PKEM7Hp?1aLnC08
zgCGhOka{4p3_%ovK4*aZ3p70Dt5?V@N6DS?iQzFnrzZY6z5$Neo52?ZPb&Zb002ov
JPDHLkV1g%^pq&5!

delta 354
zcmV-o0iFJn1BwHXF@Ho!L_t(Ijm49(YQj(yhQEk7nohN5v4*a;bO`tWQrv_-K!<?P
z$tNfj!M;G34uV4;ppYpQI(8^H2<>Rmc2R>%D~OOK9qhfFYn;0DpKfyg^X0$i-oSs$
zQj5mvRU!+)uw%(*&-D|>c2f1MYQ8zU1mI&fqx%-@{F?LtNq;cxSQ%;fEl?{}jYOX7
zCl|-(hDRy8-K<nARe=p;vrc;ebb`q;(l5*T0szfQgOmMAs!4h^V6k2qrgFZ(VX>Hk
zPL>h(uMbSWrzRjA^=Uuf8IZl^oO&zP%>YlIF94_$(SX6YXB->ASNDL&+gvKT^k%?3
zbGg5x>m2n~Y+FE8bOW$01$l4BI)MaBPzs=iIax+}2C7*OT5ZDsIJQGL>T9E%!D784
z9QBdc8N|OJ<+;ATg^um$xPx)e@?1aJHSj;{2YbAaEsjnfHvj+t07*qoM6N<$g3sls
AdjJ3c

diff --git a/Common/src/main/resources/assets/hexcasting/textures/item/robes/2-helmet.png b/Common/src/main/resources/assets/hexcasting/textures/item/robes/2-helmet.png
index 915b21c7940a57295e56ac53ae72b47e9d623970..8e8be419cd28ba7807bdf196873b03afe8ec017d 100644
GIT binary patch
delta 390
zcmV;10eSwm1Fi#*F@I=DL_t(IjlGhwO9EjS#(#!12v(#t+#nGlh)W#gDlLM8(a_T3
z=3o#sB#w?je?W`4WGxL6gh^A{;80SdTsXv`N6DRn#$nUf5Q?X#(9&;uzvp}2m*;!=
z983_8hQ+YHC{-M@G+W})uo#$aF)-U=ylIv`)!b~<M6*$|HGj>zcMgk>PaOcS<Rg_y
z1Bl+cAAqIxH&U52Ude~9sUxpt06<r7qbhX(c2^Ez>sN2}Wcr4|%fmfxkH?a1Vf@fH
z3;?vtMWi(^tzL&#uS3T)c|QNLc!pRux)(@@oei1oO+UV)WxSFP09{kbCMp1wlrm4+
z?WoU^0H9-<xPK46QI$HnrlM;qs#0hFG%#tkA28%Nacx^q;<OX{hC!~7q^q|9$Q6=P
zZ=ajs?Bvl_TXnhS54fpk9VMkaN->@Y;Oh0xvcQ>yq?m}vK~XK{MYWh05jiMAQq2Af
k&m$rSMMMt%z42f90rthQ@<FgHzyJUM07*qoM6N<$f>hJE$^ZZW

delta 399
zcmV;A0dW4V1GWQ@F@JDLL_t(IjlGh+OF~f?#(zcx5mJ#tI#{?A+@&rEE)hWpO%YUM
zgU}SwBrZY(EkS=lfrEn35;TZ7Ndzu^L5oNq!X?Cydy|yZ?KIRCuiY!P^qb!EoacRc
z&dagU!`8~8(Cb+0(q^TZvbC}(+Rch+H!GsM$x8px{Q7hwUVoo%OifnzgL+Xas{lCM
z9zy$J0P$X00AO_TiqL)-huec%R61V60DziWLCNO;*mNF)^Gh$({WLU<yG$DU#DpQ)
zK=+}cX#l*P%`)wBQK*+G)XP*`AKadf8$3FOjjql|#PXD%rI|U#wo5qN9sty$!pY7v
z0IA0`*DujdpMN0%K(+OOSbIRp=TM6ZYEePS=h!%~_gc*d=<MxgOzU0-&BTVL5lyU9
zQ!4;O6YJk^ANpN_qe$LVa}JO6A8>JhXiGh&J1M#o0mL584GXly=M9R0EQxF~F0#qE
t2*{G~d4uL(xE}#o5&>EId*i?I33uGHBS^Ov=Kufz00>D%PDHLkV1lnXy<q?V

diff --git a/Common/src/main/resources/assets/hexcasting/textures/item/robes/2-leggings.png b/Common/src/main/resources/assets/hexcasting/textures/item/robes/2-leggings.png
index ba0d088357fbada391711bfbc25e62cd97b1a43a..64677f65ddcb192e706ca8f0827595bea9912fbf 100644
GIT binary patch
delta 218
zcmV<0044v70)qmOF@L>DL_t(IjbmUKXuyar5TKd*AD@N|*Jq>XVL{hi<`#jW>Dj9{
z3{OA3V|e%N8v_GF>VITISTIy0X+j3ld_oZMk1tTfneb`8{Nf42<rhzI*@52$mtQ<#
z*naZ>l;^;pD<MOi0WjOQ-#ox@>e*(PU;pb$#9%c5s~4VrdQ*qOm*SVe5W{N#B(w>O
z;WU60fMLMXPw&wE&#>Y8Y(_+Y;xXXa#}_!AD#b5>RSqK-&}~O{1p@>AWIiwe087hP
UpR^zeJ^%m!07*qoM6N<$f|}7|KmY&$

delta 227
zcmV<90382=0*nHXF@MHML_t(IjbmUKXuyar;BQ#-AD@Pe=UY(ppm6*RYyP*oWuRzy
z@ccOg0|NuY{ZB6$UVs0}aPie;6hl~W*#y%F1B!g&3=9k}8J>N7h9b^{PxGml_ZUvS
zyobvU>@Gmoy#4l0sHi)GnYa>h2Ef4f+dCOf-<t>X>wh!xOkAw$uzKPCr<W*vDSjyo
zF}w!6{{EFHF`NdF0x%4?|LG;V{~0!(Z(&3PC>{fzeSC(~sZ#t>SmiKWfNndoD=xme
djMeag1ptavS>?HDSOfq7002ovPDHLkV1gVsX}ACY

diff --git a/Common/src/main/resources/assets/hexcasting/textures/item/robes/3-boots.png b/Common/src/main/resources/assets/hexcasting/textures/item/robes/3-boots.png
index 5f30152ccf46ca675860506ad19526bedfe24b49..583db2e5b30747d208e2d668f9ed28a8f60dede1 100644
GIT binary patch
delta 265
zcmV+k0rvi^0<i*+F@NhxL_t(IjqQ;!Yr;SnhMyGY2t`D$i@3QJhpbWPs&vb8tA8Os
zqJN>Q?gha~2(B%tTOky;9HB@c`2**4hso*CRr*fHbKm#y!UzBHn&5Rf*XI54{qEgj
zCavbOe0~97aoE(vh6DOi^3ZIMRRyBkajJ@LhpZ|b?g;*xntwo*ImvN%b@1yaB{}X;
zWqw@{h^ZFs9;(byzb8lV<UgXy9MSF(h^ej#E|=p_l2rwMKefw#KP9UQ;!rvg+h8&n
z5r-0h<$g^R&8#4bW-Rw>0OC+G8I0_oJ);=__*5$o#<r$mZ(C~YPI3kY&{qQQ*j7jY
P0000<MNUMnLIPldipPIH

delta 259
zcmV+e0sQ{40;~d%F@NSsL_t(IjqQ=G3c^qrhM$SqMcs-&-Cz(5i)M}Mf?@X{48iIZ
z2nH`eunUHjfkDw^aaxWnZZ|N~Ik+7SR`E@T=X~G83m^Pr6v41F$>e);m>Hj#Ou4u`
zZVv%ioHseK<UsZ+DHR(;X-vbiw5kouB1&V8Yl3f+6Np5xy?lpn2X~hv+k1#e#Ct)v
zHOg$$MkIpU<Dm(fl`0|;*rrXlHOg{=*Ja=Fh|(Cd7N}*j77(Q|zT;^U)u3PR;X57x
ztJ50S9Vmh84p^Pm0Qinazur@S>Wp##V1Hd2FjqAtn?jELNS^MLR+e~lkU0PV002ov
JPDHLkV1lTRbq@dl

diff --git a/Common/src/main/resources/assets/hexcasting/textures/item/robes/3-chestplate.png b/Common/src/main/resources/assets/hexcasting/textures/item/robes/3-chestplate.png
index 5bc6f69e08b37dc16968cdb80f8c413a6c115b4c..3940489bbe91bd18eb88c51fcf383e8e1fe4d314 100644
GIT binary patch
delta 407
zcmV;I0cifK1HJ>0F@JbTL_t(Ijm48cNW)MN#($NpwqT2t6f#)x4-Qhn(oMSv77Mxw
zx)wnY1hJb_H)ppZT`Y)`Ahalg&I;-xA#0$ahBU<%y2iognb$Z9e$&0X@9w_4<H3I;
z;v1XuB`+Ab)~k`=JF6BwHI@v;6+gMWwhe$~J6yco|Jp6c0e`$}y&4${5{3ctQ%jPf
ztXlMTG6jj_Lm5p5Se~94THi(TQ%j_x6N1y~xq>Sc_)c{)0YEA`AxJ^H)pKzNgKz<N
zFrd|QIla4-3I*ZsrfEE4eYWKhn#Lml<(1t~;>LL%fSi@aG<51EP-9830t%k28|iG8
z?QnLpN2RtUe18d53vm?)-&{M0p%EjYYIGeN$1+9ocswqtQy4+6k``ouey2mf)4?=!
zwAuL|g`+zFm|N`8b!;K`<>8jY(iH$ZnF7x|Q-5tpV}uj{n1+sN=+sW$SxhbfP=9T(
zKD#QG_v;Al4~L`uWA0wwBU!a5{f%Kq$@eGt0wY0{uMl3MHzxo9002ovPDHLkV1n1C
Bx8eW*

delta 387
zcmV-}0et?x1FHj&F@I%AL_t(Ijm49(O9EjS#(x*C)?k=8Bnc4>nGJ?RqZCbH(Appb
z6-Yz0MG@KNe-Je|G)3Sfw)h7G3Pl`;lyQT0d53f&j@O`f-RC(5J=6ES@AEw0^WFO$
z{5K?fv9)q)xf{h=PIB)P(To+I3VZrKTYR;?55PyO#q~>Z?0;!)4qz2)IcdU87&b^n
zl0u?HG-K_?wgrw2->BF|Dv|^SCWG}ar(tRi&q?4e&P~oZCd<Jk!MI^+wEI1;LA&1@
zYvSJ9{ZhS5^Sdctp;RveaK3iHDE97F0nnQgsv=X!f;|x@!PEP#Ft&!Nk<N$Mx$rx+
z>F}(FI|1U%8+@il{7fR94><z8sX8Y9KtM?6V+3v?K-Vzn8V0H&3kIHV0I<05Mo0g0
z;#MnVj<OX1>~~Ojz89|HNdTZKGO8kTbJ-ylj1PqmY|d}se$F0)Pfh3e@Px<etCWal
hgnwgrqEP!2`~U*9kuGMf8$SR5002ovPDHLkV1oNevH}1A

diff --git a/Common/src/main/resources/assets/hexcasting/textures/item/robes/3-helmet.png b/Common/src/main/resources/assets/hexcasting/textures/item/robes/3-helmet.png
index ed2b85bb7c0e7083a6caf50cb9e072cc535e8aa9..ec8e33ee88ed9c3962c0c38a161c6af153e225b9 100644
GIT binary patch
delta 421
zcmV;W0b2gf1Iz=EF@J_hL_t(Ijm?s~OT%Ck#eWrXC_X@oLxv)vf&?6bI=BRvKnB4<
z3N9%WIw%MZ{tXI(li(r>qAm_1NEMvap@SBMf|ROLuo+4cp_Qo9=VC$|<74zp_i^sI
z=li$-7`iG9T@`%7&{d%+a#J4e2f3lE;_0yv6#P6a@GZyCRe$m3RfWIx&8s#IH;VYZ
z#<&&0woI1S*T|&O*p>-^rpO}xIsrgu-#tDLV0nElh+{r^`(THJl;ojUpzb(Wdu_q?
zO3h_#zMYPq9tKB7u`QEKD$Uu=U980?Wm4&;VW~GkrRGwpxwxLk^~MWz$Kjz^Ad^Z5
z;<3heP7i0rWPiWH*uW6Ug)S0OGO)gxy#U~}e9o119L%*4g6ny7%)VomOW2l)ZJC(m
z5;H5qVQRF1kHzdkWE@6oRI%<jY#q+=Y*zu;I-H~KIDdDrx^x*?>yF2N7C0(x#!k!U
zfr~~*0Q<KmO&|Cz#-%BtDYD4tc11q7D>OwG<I>cZ>mK|Snj%M@_5Z>L>?7D{oD2s(
P00000NkvXXu0mjfCws~F

delta 423
zcmV;Y0a*Ub1I`1GF@K0jL_t(Ijm?tJD+F;E#y=}5NeIOrkP<Z|2IV#>P0dMLYmc)v
z<s|tBT$Gf9lN+^#+Tx%bBrXnWFBY{WZHui*lU*~^ZhqXpE@s*t<Hyl+dVf6c^FH5i
zF95ox2whVIpU^c$sIpX*`}<z5Yl^tPNqYr1_X~W>(KSW9zke2myY>CGST$TJ;`S=z
zS^(QJSzcSkh{drj6983~M7@Xr(A05?%L7<mTlM0QOHS-=(iZL_mq}B09G-RtyzTi?
zfsvVK8e3cG8yv;9OpI8Z<BO|MjY~3O@v7mT&Q9{B0{K#b$F~>GH(Dq=4!KMkBNq3>
zLzVBG8eR~S-GAdu^bgTI^FUj;%d@^ddker}?ufIygf~}%507szh)4!AdyQ?G*p`Wz
zy=Ho`(N7H)a4|o35*YhY8&oVi4vA!xXS)bMA{nLZI6&Rs9IPy418eQ|4L=L)UoM3X
zb4Q+wN=E=&nZ2qH{1#)qhEQcmqz<-4>R?-_vLwcOjUX@A`72ae3Owuog%1_|+J&JY
RPc;Al002ovPDHLkV1ioez+3<T

diff --git a/Common/src/main/resources/assets/hexcasting/textures/item/robes/3-leggings.png b/Common/src/main/resources/assets/hexcasting/textures/item/robes/3-leggings.png
index 1406c33b03866ebb281c8a09455a4f86d1caf717..e244acbac01f83927e914e11049babdda320a559 100644
GIT binary patch
delta 207
zcmey*_=9nRVf`jg7sn8b-sA*{i~}8d0t;sTl0SB@pw>)z(~Zsj`VxM&w|f?{^F6Y8
z`~UxsZ?FD86~6s%w`Asjb(M1mfS~Ej&o2(WiQb>;*npsoUw?{(gv7c>qUi}h;AGa|
z|4^*?e2hEW*P1vs#?ES%qbnaVtx5dw<ecQ1#0EV(j>8@gj=9>kmAyYIVfIkyxFlQ3
z@@8rApAy?t-ly;Q^N6#JdqZck1jwcfr3IW}*B=VWS1>SWrY`Bxd+N&100f?{elF{r
G5}E*9>|U<`

delta 214
zcmV;{04e|Y0sjGzF@L#9L_t(IjbmUKXuyar;BQ#-AI9EzzJ(E4?Aga>45#nS!_Wf<
zah~@7e|&rO|MH1#|J{tV{}U2tU|?WiLFRmXVau>5;~@hBgDAuM59SOE3|H}rGcYhP
zFd-YjFL9W`WrjS1eAa6QL4lJ5#i`-~tYPrv&Kay>fG&>51y2k(T);r%Ft~nGnV~Ik
zKZZ@X#BqiJ+3Dc=O=X5X84npwz5I;f0&L<K1~4!%Ff<;Sj@5Oz#0MS#02$q?Ub7T-
QeE<Le07*qoM6N<$f=;1e*Z=?k


From 6f657b3cf5b914290b4bd71bb329fc95d49a9947 Mon Sep 17 00:00:00 2001
From: falkory <falkor220@gmail.com>
Date: Sun, 24 Sep 2023 17:55:48 +0100
Subject: [PATCH 4/8] Added Sign Textures but i aint implementing them cause
 theyre evil intelliJ stop warning me about spelling errors in the git push
 message

---
 .../blocks/decoration/BlockHexFence.java      |  30 ++++++++++++++++++
 .../hexcasting/common/lib/HexBlocks.java      |   4 +++
 .../hexcasting/datagen/HexLootTables.java     |   2 +-
 .../datagen/recipe/HexplatRecipes.java        |  10 +++++-
 .../datagen/tag/HexBlockTagProvider.java      |  11 ++++++-
 .../hexcasting/lang/en_us.flatten.json5       |   1 +
 .../models/block/edified_fence_inventory.json |   6 ++++
 .../textures/entity/signs/edified.png         | Bin 0 -> 638 bytes
 .../textures/entity/signs/hanging/edified.png | Bin 0 -> 974 bytes
 .../hexcasting/textures/item/edified_sign.png | Bin 0 -> 325 bytes
 .../textures/item/hanging_edified_sign.png    | Bin 0 -> 364 bytes
 .../hexcasting/fabric/FabricHexInitializer.kt |   2 +-
 .../xplat/HexBlockStatesAndModels.java        |   1 +
 .../forge/datagen/xplat/HexItemModels.java    |   2 ++
 14 files changed, 65 insertions(+), 4 deletions(-)
 create mode 100644 Common/src/main/java/at/petrak/hexcasting/common/blocks/decoration/BlockHexFence.java
 create mode 100644 Common/src/main/resources/assets/hexcasting/models/block/edified_fence_inventory.json
 create mode 100644 Common/src/main/resources/assets/hexcasting/textures/entity/signs/edified.png
 create mode 100644 Common/src/main/resources/assets/hexcasting/textures/entity/signs/hanging/edified.png
 create mode 100644 Common/src/main/resources/assets/hexcasting/textures/item/edified_sign.png
 create mode 100644 Common/src/main/resources/assets/hexcasting/textures/item/hanging_edified_sign.png

diff --git a/Common/src/main/java/at/petrak/hexcasting/common/blocks/decoration/BlockHexFence.java b/Common/src/main/java/at/petrak/hexcasting/common/blocks/decoration/BlockHexFence.java
new file mode 100644
index 0000000000..ec7ac95181
--- /dev/null
+++ b/Common/src/main/java/at/petrak/hexcasting/common/blocks/decoration/BlockHexFence.java
@@ -0,0 +1,30 @@
+package at.petrak.hexcasting.common.blocks.decoration;
+
+import at.petrak.hexcasting.annotations.SoftImplement;
+import net.minecraft.core.BlockPos;
+import net.minecraft.core.Direction;
+import net.minecraft.world.level.BlockGetter;
+import net.minecraft.world.level.block.FenceBlock;
+import net.minecraft.world.level.block.state.BlockState;
+
+public class BlockHexFence extends FenceBlock {
+
+    public BlockHexFence(Properties $$0) {
+        super($$0);
+    }
+
+    @SoftImplement("forge")
+    public boolean isFlammable(BlockState state, BlockGetter level, BlockPos pos, Direction direction) {
+        return true;
+    }
+
+    @SoftImplement("forge")
+    public int getFlammability(BlockState state, BlockGetter level, BlockPos pos, Direction direction) {
+        return 20;
+    }
+
+    @SoftImplement("forge")
+    public int getFireSpreadSpeed(BlockState state, BlockGetter level, BlockPos pos, Direction direction) {
+        return 5;
+    }
+}
diff --git a/Common/src/main/java/at/petrak/hexcasting/common/lib/HexBlocks.java b/Common/src/main/java/at/petrak/hexcasting/common/lib/HexBlocks.java
index 908e3f139a..a0319fc097 100644
--- a/Common/src/main/java/at/petrak/hexcasting/common/lib/HexBlocks.java
+++ b/Common/src/main/java/at/petrak/hexcasting/common/lib/HexBlocks.java
@@ -264,6 +264,10 @@ private static BlockBehaviour.Properties quenched() {
         new BlockHexTrapdoor(edifiedWoody().noOcclusion()));
     public static final StairBlock EDIFIED_STAIRS = blockItem("edified_stairs",
         new BlockHexStairs(EDIFIED_PLANKS.defaultBlockState(), edifiedWoody().noOcclusion()));
+
+    public static final FenceBlock EDIFIED_FENCE = blockItem("edified_fence",
+            new BlockHexFence(edifiedWoody().noOcclusion()));
+
     public static final SlabBlock EDIFIED_SLAB = blockItem("edified_slab",
         new BlockHexSlab(edifiedWoody().noOcclusion()));
     public static final ButtonBlock EDIFIED_BUTTON = blockItem("edified_button",
diff --git a/Common/src/main/java/at/petrak/hexcasting/datagen/HexLootTables.java b/Common/src/main/java/at/petrak/hexcasting/datagen/HexLootTables.java
index b52a65d2fc..42b7ffbdac 100644
--- a/Common/src/main/java/at/petrak/hexcasting/datagen/HexLootTables.java
+++ b/Common/src/main/java/at/petrak/hexcasting/datagen/HexLootTables.java
@@ -58,7 +58,7 @@ protected void makeLootTables(Map<Block, LootTable.Builder> blockTables,
             HexBlocks.EDIFIED_LOG_CITRINE, HexBlocks.EDIFIED_LOG_PURPLE, HexBlocks.STRIPPED_EDIFIED_LOG,
             HexBlocks.EDIFIED_WOOD, HexBlocks.STRIPPED_EDIFIED_WOOD,
             HexBlocks.EDIFIED_PLANKS, HexBlocks.EDIFIED_TILE, HexBlocks.EDIFIED_PANEL,
-            HexBlocks.EDIFIED_TRAPDOOR, HexBlocks.EDIFIED_STAIRS, HexBlocks.EDIFIED_PRESSURE_PLATE,
+            HexBlocks.EDIFIED_TRAPDOOR, HexBlocks.EDIFIED_STAIRS, HexBlocks.EDIFIED_FENCE, HexBlocks.EDIFIED_PRESSURE_PLATE,
             HexBlocks.EDIFIED_BUTTON);
 
         makeSlabTable(blockTables, HexBlocks.EDIFIED_SLAB);
diff --git a/Common/src/main/java/at/petrak/hexcasting/datagen/recipe/HexplatRecipes.java b/Common/src/main/java/at/petrak/hexcasting/datagen/recipe/HexplatRecipes.java
index 1a326ef0e9..24b4f2a4be 100644
--- a/Common/src/main/java/at/petrak/hexcasting/datagen/recipe/HexplatRecipes.java
+++ b/Common/src/main/java/at/petrak/hexcasting/datagen/recipe/HexplatRecipes.java
@@ -341,13 +341,21 @@ public void buildRecipes(Consumer<FinishedRecipe> recipes) {
             .pattern("WWW")
             .unlockedBy("has_item", hasItem(HexTags.Items.EDIFIED_PLANKS)).save(recipes);
 
-        ShapedRecipeBuilder.shaped(RecipeCategory.BUILDING_BLOCKS, HexBlocks.EDIFIED_STAIRS, 4)
+        ShapedRecipeBuilder.shaped(RecipeCategory.BUILDING_BLOCKS, HexBlocks.EDIFIED_STAIRS, 3)
             .define('W', HexTags.Items.EDIFIED_PLANKS)
             .pattern("W  ")
             .pattern("WW ")
             .pattern("WWW")
             .unlockedBy("has_item", hasItem(HexTags.Items.EDIFIED_PLANKS)).save(recipes);
 
+        ShapedRecipeBuilder.shaped(RecipeCategory.BUILDING_BLOCKS, HexBlocks.EDIFIED_FENCE, 3)
+                .define('W', HexTags.Items.EDIFIED_PLANKS)
+                .define('S', Items.STICK)
+                .pattern("WSW")
+                .pattern("WSW")
+                .unlockedBy("has_item", hasItem(HexTags.Items.EDIFIED_PLANKS)).save(recipes);
+
+
         ShapedRecipeBuilder.shaped(RecipeCategory.BUILDING_BLOCKS, HexBlocks.EDIFIED_SLAB, 6)
             .define('W', HexTags.Items.EDIFIED_PLANKS)
             .pattern("WWW")
diff --git a/Common/src/main/java/at/petrak/hexcasting/datagen/tag/HexBlockTagProvider.java b/Common/src/main/java/at/petrak/hexcasting/datagen/tag/HexBlockTagProvider.java
index 6818632f6d..87b476fe05 100644
--- a/Common/src/main/java/at/petrak/hexcasting/datagen/tag/HexBlockTagProvider.java
+++ b/Common/src/main/java/at/petrak/hexcasting/datagen/tag/HexBlockTagProvider.java
@@ -54,7 +54,7 @@ protected void addTags(HolderLookup.Provider provider) {
             HexBlocks.EDIFIED_WOOD, HexBlocks.STRIPPED_EDIFIED_WOOD,
             HexBlocks.EDIFIED_PLANKS, HexBlocks.EDIFIED_PANEL, HexBlocks.EDIFIED_TILE,
             HexBlocks.EDIFIED_DOOR, HexBlocks.EDIFIED_TRAPDOOR, HexBlocks.EDIFIED_SLAB,
-            HexBlocks.EDIFIED_BUTTON, HexBlocks.EDIFIED_STAIRS);
+            HexBlocks.EDIFIED_BUTTON, HexBlocks.EDIFIED_STAIRS, HexBlocks.EDIFIED_FENCE);
 
         add(tag(BlockTags.MINEABLE_WITH_HOE),
             HexBlocks.AMETHYST_EDIFIED_LEAVES, HexBlocks.AVENTURINE_EDIFIED_LEAVES,
@@ -93,6 +93,15 @@ protected void addTags(HolderLookup.Provider provider) {
             HexBlocks.EDIFIED_SLAB);
         add(tag(BlockTags.STAIRS),
             HexBlocks.EDIFIED_STAIRS);
+        add(tag(BlockTags.FENCES),
+                HexBlocks.EDIFIED_FENCE);
+        add(tag(BlockTags.WOODEN_FENCES),
+                HexBlocks.EDIFIED_FENCE);
+
+
+
+        add(tag(BlockTags.WOODEN_FENCES),
+                HexBlocks.EDIFIED_FENCE);
         add(tag(BlockTags.WOODEN_STAIRS),
             HexBlocks.EDIFIED_STAIRS);
         add(tag(BlockTags.DOORS),
diff --git a/Common/src/main/resources/assets/hexcasting/lang/en_us.flatten.json5 b/Common/src/main/resources/assets/hexcasting/lang/en_us.flatten.json5
index 28e3e73335..34aefba1cb 100644
--- a/Common/src/main/resources/assets/hexcasting/lang/en_us.flatten.json5
+++ b/Common/src/main/resources/assets/hexcasting/lang/en_us.flatten.json5
@@ -149,6 +149,7 @@
     "edified_door": "Edified Door",
     "edified_trapdoor": "Edified Trapdoor",
     "edified_stairs": "Edified Stairs",
+    "edified_fence": "Edified Fence",
     "edified_slab": "Edified Slab",
     "edified_button": "Edified Button",
     "edified_pressure_plate": "Edified Pressure Plate",
diff --git a/Common/src/main/resources/assets/hexcasting/models/block/edified_fence_inventory.json b/Common/src/main/resources/assets/hexcasting/models/block/edified_fence_inventory.json
new file mode 100644
index 0000000000..d622472996
--- /dev/null
+++ b/Common/src/main/resources/assets/hexcasting/models/block/edified_fence_inventory.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/fence_inventory",
+  "textures": {
+    "texture": "hexcasting:block/edified_planks"
+  }
+}
diff --git a/Common/src/main/resources/assets/hexcasting/textures/entity/signs/edified.png b/Common/src/main/resources/assets/hexcasting/textures/entity/signs/edified.png
new file mode 100644
index 0000000000000000000000000000000000000000..9da2cde145868595c1f8e5ed2963169340f254b5
GIT binary patch
literal 638
zcmV-^0)hRBP)<h;3K|Lk000e1NJLTq002M$001Be1^@s6qMd$(0006-Nkl<ZXo2mR
zzmC&D5XOIAS+ca2i=1TpqAL(oNdpoEJvGg}#1&UjTuZ|vP*Ly_*U-@L3=zepLFlSW
zauO*lTXGeOWcD26SlKvt!7*PG@1JjWJ+t5JI1VdZzWK0-{2l-&T2qJLS+>@mrE~Vd
zZDQx+_baECumP?-+$B@)k|_ZFAg-J&<F;dhO?GGL{I5OO@SDK-^zQSb*irPXO+>2r
zqsf?8r-LWuzyEq^brM`zP@(|KNc4l)L_^vDk>6W$jG&4y{k!t}LA(>+$^qip6RnN+
z#ke@29EGZAJO*E0%9d{f=X`jvD0fzAt%=5~>=fq~ZP(eT%TY3Ree=am0^4eA5S{_e
zHCjBna+D*#w-tX7o^4!T_IG`=)iw;=CK{FgUHOlZV{GBV;WRGTH{S*>Ja|{Uxd~-2
zOM5gKZ=55j({FiQTN|?f;y$)TZ5?okd%S5Kve!C5`VW;OcI8_+;9sr-Mw2o9Ab$Ef
zpv|zY1I*;IBWw+|73OR3?TgoI1GWW4Tj87!FBU)Nx1@Q-%hMqMNuKd*ev9vEeoVd{
z^+`|wX`b=C_snz#o_#^lR;VOj&z!{~BhBrzYTKY@**yUA+chWv-_xXdMv`ZZJ}lY@
z1rX^F-_y*pdqfg`NAiFYokuz}n&0Nnk7I#?hpaEBpi5Bl5O|tMhi0Joe9TaybxC}Z
z47*YbxWFp$P0dR$Wzdlm0GRCG4`OpAb|n|6vevtzeSr#A5r^gV7kJv#09~mC{-ewI
Y1Lp+LgZ#aV3;+NC07*qoM6N<$f>fw5xBvhE

literal 0
HcmV?d00001

diff --git a/Common/src/main/resources/assets/hexcasting/textures/entity/signs/hanging/edified.png b/Common/src/main/resources/assets/hexcasting/textures/entity/signs/hanging/edified.png
new file mode 100644
index 0000000000000000000000000000000000000000..c8af29fdecdd2a5ab4ae8b9a9aecde3a941bc3d0
GIT binary patch
literal 974
zcmV;<12O!GP)<h;3K|Lk000e1NJLTq001xm001Be1^@s6RMh(%000A(Nkl<ZScUDE
zPiq@j6vcmPG^#ZtQ9O-hDJBp~4JsG{S!7YLz@SA<HwJwMFS1FtT?Fz8vgoRdeg;D}
z*%U(|g;Gj4hL#H2MN2V~Ch4d_ni*R!X1Xx<`OSDFOR`KhIv~)zIq%K6_n!AJM+(n&
zp2x0jb8vcyQ*wFuwvKDt_+bb@(XuF7765)2^8KwJaY`;<s0X_3sN3eZTWxC93huG1
z$1Z<Z0-#iI02qz}etP$d=Iwm)fF~~><<goa;e)KkNGa~#`z-M+q9djB570cbP0;Cj
zT6nFzPO0D|#1Bq~3En)&3_!#NLtj6OIH`begqLnJF*qI48T1&Ag1Lo`!`KS=Z+bd2
zlPVy*bOmbFivBMZ0O$;QbOt@0eUmp2^3Qgj$5{dB!OyN9q*kryAd8m8{c0V~pm^sZ
z=$}7o6AXQJ&OT2h!{qs4$nM^LZ1TSP?(xJqky!yaw}n(-l7()XcNKDtW-ESmc#zxN
z+K&JD^@o{O028}=`>_ZBcy)L%_gFJwb89=^+}e&C%~rxnyL<a_quILDo(17Fnyq+q
zYde;4Z$|Nym{v%m*@}1f_G6PL!N1oaB&(A|2uJLb^=_I9UI#gu^^o*!quGi(U5{F|
zlIdsZ*XeqUn>*8Ru8nCjJx<(J{e*LqRnS>^^zdn1aaQ$<#9E#44B!QQI)fenwemXB
z-wXOc^0<)3i{HOpNJaAUM|MaNQnakh16-t3Lb!>eZaWdoECJ1n+}B@z^In&`Sx=v7
z<lC>0sW__~b=&7h0Km2FOGL5Gn{WVtW3Au?eJakXuE_mroj{!caN8~e*}JJ!Rw{O_
z0Mde8+eU%{w4h)VX^vQJI0~q*ZD@-~Ahq(k<~xO=4p=z#wGAD_LIN=1hoPPWaM}NW
z4laE>7T=qF&3?jJlz4!=x$>A9G(Q+Am8gVMDB@TvdO}v5RUJ&APVj<$X66O*4Y{FR
zD*)3zPNB%BAK%j-PFM?@NGWdH<wQVmZaXh<2-FFVwUX(7xt0d%M1Nxu$iu~?a;%li
zo0VyS^tI6sLtNXYGw5kyayLltA+BxfL_|s@=GEK*_+f|_^mRESrTF_lZ>mWQNoxe7
zh(G`RD`CMbD~+2&a|K{Nh}inthHi7Yu#r?s1f(}JbMu1i<=C}t{&{<T_FBZImX{2c
w3XaZl`}OfmgP6-`R{Ii5EV0BAOWYLx2h0>kRCu(95C8xG07*qoM6N<$g7{9+n*aa+

literal 0
HcmV?d00001

diff --git a/Common/src/main/resources/assets/hexcasting/textures/item/edified_sign.png b/Common/src/main/resources/assets/hexcasting/textures/item/edified_sign.png
new file mode 100644
index 0000000000000000000000000000000000000000..9973e36ed7f4daf79128d3a50f1e3085e06f91a3
GIT binary patch
literal 325
zcmV-L0lNN)P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0003DNkl<ZIE}@S
zu}Z^G6o$VPArQ%+v})<prDSvSC43U!!IyAy@FluB*`ag6sU<=$9V8}Ra)*!$o$4Ux
zCTUAFF8<3o{O9LC|2gpA@T7UTecS=$)&h`~#)&RY&j2_N0&;7~N<&hlOqWmIiHLG*
znQs<M`s0HwuOBOlt!2_56KmDb^rXp3L+A%2MG8Ptq{Lb|Vdw|MS`qp|!`vl^2BXGc
z7+x|AtNy!I^XsdK>9UqUZkMgGR*eL8Ue0PHkjF?wsS<mi|J4cmvFp5?;0#{Y3%Wp_
z?F@>o?PMVE+J<*G_q$jtl-aO0^P}3{F;Wl>Mh8#pWB}FE{%r6QS`Aj8?>xWFS`EGc
X3Z-bqE6#3q00000NkvXXu0mjfQn`^L

literal 0
HcmV?d00001

diff --git a/Common/src/main/resources/assets/hexcasting/textures/item/hanging_edified_sign.png b/Common/src/main/resources/assets/hexcasting/textures/item/hanging_edified_sign.png
new file mode 100644
index 0000000000000000000000000000000000000000..2de0b7173fa2c50e2534b21d7ec2ce2a41241982
GIT binary patch
literal 364
zcmV-y0h9iTP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0003qNkl<ZIE}55
zKWoB37{-4QX=qA@7SmQrp)TTNAzQzKemW-yzl4*kOXq-7Bn5*~@J~V#2ssc6=^%HF
zCW57Xm*?)D<GJ7a9{jO1fI)wlM?#QvR{$hQg5f@Me{&1KE{nN(OO^Ms>N4BR8M`B`
z4lrFfq<evW9b;J*K@hMHzwkm|y`+Eqc%MrLKVDWN^?JSh9B!3YD{gGt&Wn19S3A8p
znM|~E1XZ3o81#oZKqLeJcZN|4h=gF5#jMjUV|Szh)Qjf((xKgG0f))U@<N|>qouU6
zg<Te7>IUm{3&1+vs$Vd5126P3^)i(r=vYrjM$>$tX_nUjua6zZ?g@eHUB2pt{?WRq
zv(3CrAcrF{r54eD-NHf3XT=s&z;xl1($AF~^ie>%7Z(ToYkdRAij^{soVcU_0000<
KMNUMnLSTYPRi1hP

literal 0
HcmV?d00001

diff --git a/Fabric/src/main/java/at/petrak/hexcasting/fabric/FabricHexInitializer.kt b/Fabric/src/main/java/at/petrak/hexcasting/fabric/FabricHexInitializer.kt
index 8cc7a00ff1..1729ab5801 100644
--- a/Fabric/src/main/java/at/petrak/hexcasting/fabric/FabricHexInitializer.kt
+++ b/Fabric/src/main/java/at/petrak/hexcasting/fabric/FabricHexInitializer.kt
@@ -191,7 +191,7 @@ object FabricHexInitializer : ModInitializer {
             HexBlocks.EDIFIED_TRAPDOOR,
             HexBlocks.EDIFIED_STAIRS,
             HexBlocks.EDIFIED_SLAB,
-            HexBlocks.EDIFIED_STAIRS,
+            HexBlocks.EDIFIED_FENCE,
             HexBlocks.EDIFIED_SLAB,
             HexBlocks.EDIFIED_BUTTON,
             HexBlocks.EDIFIED_PRESSURE_PLATE,
diff --git a/Forge/src/main/java/at/petrak/hexcasting/forge/datagen/xplat/HexBlockStatesAndModels.java b/Forge/src/main/java/at/petrak/hexcasting/forge/datagen/xplat/HexBlockStatesAndModels.java
index 0a1fa55b0b..92a5679eb2 100644
--- a/Forge/src/main/java/at/petrak/hexcasting/forge/datagen/xplat/HexBlockStatesAndModels.java
+++ b/Forge/src/main/java/at/petrak/hexcasting/forge/datagen/xplat/HexBlockStatesAndModels.java
@@ -219,6 +219,7 @@ protected void registerStatesAndModels() {
         simpleBlockItem(HexBlocks.EDIFIED_PLANKS, planksModel);
 
         stairsBlock(HexBlocks.EDIFIED_STAIRS, planks1);
+        fenceBlock(HexBlocks.EDIFIED_FENCE, planks1);
         slabBlock(HexBlocks.EDIFIED_SLAB, planks1, planks1);
         buttonBlock(HexBlocks.EDIFIED_BUTTON, planks1);
         pressurePlateBlock(HexBlocks.EDIFIED_PRESSURE_PLATE, planks1);
diff --git a/Forge/src/main/java/at/petrak/hexcasting/forge/datagen/xplat/HexItemModels.java b/Forge/src/main/java/at/petrak/hexcasting/forge/datagen/xplat/HexItemModels.java
index 8ca595eaed..169dcad9cf 100644
--- a/Forge/src/main/java/at/petrak/hexcasting/forge/datagen/xplat/HexItemModels.java
+++ b/Forge/src/main/java/at/petrak/hexcasting/forge/datagen/xplat/HexItemModels.java
@@ -195,6 +195,8 @@ protected void registerModels() {
             new ModelFile.UncheckedModelFile(modLoc("block/stripped_edified_wood")));
         getBuilder(getPath(HexBlocks.EDIFIED_STAIRS)).parent(
             new ModelFile.UncheckedModelFile(modLoc("block/edified_stairs")));
+        getBuilder(getPath(HexBlocks.EDIFIED_FENCE)).parent(
+                new ModelFile.UncheckedModelFile(modLoc("block/edified_fence_inventory")));
         getBuilder(getPath(HexBlocks.EDIFIED_SLAB)).parent(
             new ModelFile.UncheckedModelFile(modLoc("block/edified_slab")));
         getBuilder(getPath(HexBlocks.EDIFIED_BUTTON)).parent(

From 835c0969834de17f08ba04664e21f2c167f70866 Mon Sep 17 00:00:00 2001
From: falkory <falkor220@gmail.com>
Date: Wed, 8 Nov 2023 23:58:54 +0000
Subject: [PATCH 5/8] Gate

---
 .../blockstates/edified_fence_gate.json       | 80 +++++++++++++++++++
 .../models/block/edified_fence_gate.json      |  6 ++
 .../models/block/edified_fence_gate_open.json |  6 ++
 .../models/block/edified_fence_gate_wall.json |  6 ++
 .../block/edified_fence_gate_wall_open.json   |  6 ++
 .../models/item/edified_fence_gate.json       |  3 +
 .../blocks/decoration/BlockHexFenceGate.java  | 32 ++++++++
 .../hexcasting/common/lib/HexBlocks.java      |  2 +
 .../hexcasting/datagen/HexLootTables.java     |  2 +-
 .../datagen/recipe/HexplatRecipes.java        |  7 ++
 .../datagen/tag/HexBlockTagProvider.java      |  6 +-
 .../hexcasting/lang/en_us.flatten.json5       |  1 +
 .../building_blocks/edified_fence_gate.json   | 33 ++++++++
 .../blocks/edified_fence_gate.json            | 15 ++++
 .../recipes/edified_fence_gate.json           | 20 +++++
 .../minecraft/tags/blocks/fence_gates.json    |  6 ++
 .../tags/blocks/unstable_bottom_center.json   |  6 ++
 .../hexcasting/fabric/FabricHexInitializer.kt |  1 +
 .../xplat/HexBlockStatesAndModels.java        |  1 +
 .../forge/datagen/xplat/HexItemModels.java    |  2 +
 20 files changed, 239 insertions(+), 2 deletions(-)
 create mode 100644 Common/src/generated/resources/assets/hexcasting/blockstates/edified_fence_gate.json
 create mode 100644 Common/src/generated/resources/assets/hexcasting/models/block/edified_fence_gate.json
 create mode 100644 Common/src/generated/resources/assets/hexcasting/models/block/edified_fence_gate_open.json
 create mode 100644 Common/src/generated/resources/assets/hexcasting/models/block/edified_fence_gate_wall.json
 create mode 100644 Common/src/generated/resources/assets/hexcasting/models/block/edified_fence_gate_wall_open.json
 create mode 100644 Common/src/generated/resources/assets/hexcasting/models/item/edified_fence_gate.json
 create mode 100644 Common/src/main/java/at/petrak/hexcasting/common/blocks/decoration/BlockHexFenceGate.java
 create mode 100644 Fabric/src/generated/resources/data/hexcasting/advancements/recipes/building_blocks/edified_fence_gate.json
 create mode 100644 Fabric/src/generated/resources/data/hexcasting/loot_tables/blocks/edified_fence_gate.json
 create mode 100644 Fabric/src/generated/resources/data/hexcasting/recipes/edified_fence_gate.json
 create mode 100644 Fabric/src/generated/resources/data/minecraft/tags/blocks/fence_gates.json
 create mode 100644 Fabric/src/generated/resources/data/minecraft/tags/blocks/unstable_bottom_center.json

diff --git a/Common/src/generated/resources/assets/hexcasting/blockstates/edified_fence_gate.json b/Common/src/generated/resources/assets/hexcasting/blockstates/edified_fence_gate.json
new file mode 100644
index 0000000000..f925ddfddd
--- /dev/null
+++ b/Common/src/generated/resources/assets/hexcasting/blockstates/edified_fence_gate.json
@@ -0,0 +1,80 @@
+{
+  "variants": {
+    "facing=east,in_wall=false,open=false": {
+      "model": "hexcasting:block/edified_fence_gate",
+      "uvlock": true,
+      "y": 270
+    },
+    "facing=east,in_wall=false,open=true": {
+      "model": "hexcasting:block/edified_fence_gate_open",
+      "uvlock": true,
+      "y": 270
+    },
+    "facing=east,in_wall=true,open=false": {
+      "model": "hexcasting:block/edified_fence_gate_wall",
+      "uvlock": true,
+      "y": 270
+    },
+    "facing=east,in_wall=true,open=true": {
+      "model": "hexcasting:block/edified_fence_gate_wall_open",
+      "uvlock": true,
+      "y": 270
+    },
+    "facing=north,in_wall=false,open=false": {
+      "model": "hexcasting:block/edified_fence_gate",
+      "uvlock": true,
+      "y": 180
+    },
+    "facing=north,in_wall=false,open=true": {
+      "model": "hexcasting:block/edified_fence_gate_open",
+      "uvlock": true,
+      "y": 180
+    },
+    "facing=north,in_wall=true,open=false": {
+      "model": "hexcasting:block/edified_fence_gate_wall",
+      "uvlock": true,
+      "y": 180
+    },
+    "facing=north,in_wall=true,open=true": {
+      "model": "hexcasting:block/edified_fence_gate_wall_open",
+      "uvlock": true,
+      "y": 180
+    },
+    "facing=south,in_wall=false,open=false": {
+      "model": "hexcasting:block/edified_fence_gate",
+      "uvlock": true
+    },
+    "facing=south,in_wall=false,open=true": {
+      "model": "hexcasting:block/edified_fence_gate_open",
+      "uvlock": true
+    },
+    "facing=south,in_wall=true,open=false": {
+      "model": "hexcasting:block/edified_fence_gate_wall",
+      "uvlock": true
+    },
+    "facing=south,in_wall=true,open=true": {
+      "model": "hexcasting:block/edified_fence_gate_wall_open",
+      "uvlock": true
+    },
+    "facing=west,in_wall=false,open=false": {
+      "model": "hexcasting:block/edified_fence_gate",
+      "uvlock": true,
+      "y": 90
+    },
+    "facing=west,in_wall=false,open=true": {
+      "model": "hexcasting:block/edified_fence_gate_open",
+      "uvlock": true,
+      "y": 90
+    },
+    "facing=west,in_wall=true,open=false": {
+      "model": "hexcasting:block/edified_fence_gate_wall",
+      "uvlock": true,
+      "y": 90
+    },
+    "facing=west,in_wall=true,open=true": {
+      "model": "hexcasting:block/edified_fence_gate_wall_open",
+      "uvlock": true,
+      "y": 90
+    }
+  }
+}
\ No newline at end of file
diff --git a/Common/src/generated/resources/assets/hexcasting/models/block/edified_fence_gate.json b/Common/src/generated/resources/assets/hexcasting/models/block/edified_fence_gate.json
new file mode 100644
index 0000000000..c3015ca6d3
--- /dev/null
+++ b/Common/src/generated/resources/assets/hexcasting/models/block/edified_fence_gate.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/template_fence_gate",
+  "textures": {
+    "texture": "hexcasting:block/edified_planks"
+  }
+}
\ No newline at end of file
diff --git a/Common/src/generated/resources/assets/hexcasting/models/block/edified_fence_gate_open.json b/Common/src/generated/resources/assets/hexcasting/models/block/edified_fence_gate_open.json
new file mode 100644
index 0000000000..ac141eb406
--- /dev/null
+++ b/Common/src/generated/resources/assets/hexcasting/models/block/edified_fence_gate_open.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/template_fence_gate_open",
+  "textures": {
+    "texture": "hexcasting:block/edified_planks"
+  }
+}
\ No newline at end of file
diff --git a/Common/src/generated/resources/assets/hexcasting/models/block/edified_fence_gate_wall.json b/Common/src/generated/resources/assets/hexcasting/models/block/edified_fence_gate_wall.json
new file mode 100644
index 0000000000..ea98b16740
--- /dev/null
+++ b/Common/src/generated/resources/assets/hexcasting/models/block/edified_fence_gate_wall.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/template_fence_gate_wall",
+  "textures": {
+    "texture": "hexcasting:block/edified_planks"
+  }
+}
\ No newline at end of file
diff --git a/Common/src/generated/resources/assets/hexcasting/models/block/edified_fence_gate_wall_open.json b/Common/src/generated/resources/assets/hexcasting/models/block/edified_fence_gate_wall_open.json
new file mode 100644
index 0000000000..86d82ca2fc
--- /dev/null
+++ b/Common/src/generated/resources/assets/hexcasting/models/block/edified_fence_gate_wall_open.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/template_fence_gate_wall_open",
+  "textures": {
+    "texture": "hexcasting:block/edified_planks"
+  }
+}
\ No newline at end of file
diff --git a/Common/src/generated/resources/assets/hexcasting/models/item/edified_fence_gate.json b/Common/src/generated/resources/assets/hexcasting/models/item/edified_fence_gate.json
new file mode 100644
index 0000000000..3dfe521195
--- /dev/null
+++ b/Common/src/generated/resources/assets/hexcasting/models/item/edified_fence_gate.json
@@ -0,0 +1,3 @@
+{
+  "parent": "hexcasting:block/edified_fence_gate"
+}
\ No newline at end of file
diff --git a/Common/src/main/java/at/petrak/hexcasting/common/blocks/decoration/BlockHexFenceGate.java b/Common/src/main/java/at/petrak/hexcasting/common/blocks/decoration/BlockHexFenceGate.java
new file mode 100644
index 0000000000..10fc89230e
--- /dev/null
+++ b/Common/src/main/java/at/petrak/hexcasting/common/blocks/decoration/BlockHexFenceGate.java
@@ -0,0 +1,32 @@
+package at.petrak.hexcasting.common.blocks.decoration;
+
+import at.petrak.hexcasting.annotations.SoftImplement;
+import at.petrak.hexcasting.common.lib.HexBlockSetTypes;
+import net.minecraft.core.BlockPos;
+import net.minecraft.core.Direction;
+import net.minecraft.world.level.BlockGetter;
+import net.minecraft.world.level.block.FenceGateBlock;
+import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.properties.WoodType;
+
+public class BlockHexFenceGate extends FenceGateBlock {
+
+    public BlockHexFenceGate(Properties $$0) {
+        super($$0, WoodType.DARK_OAK);
+    }
+
+    @SoftImplement("forge")
+    public boolean isFlammable(BlockState state, BlockGetter level, BlockPos pos, Direction direction) {
+        return true;
+    }
+
+    @SoftImplement("forge")
+    public int getFlammability(BlockState state, BlockGetter level, BlockPos pos, Direction direction) {
+        return 20;
+    }
+
+    @SoftImplement("forge")
+    public int getFireSpreadSpeed(BlockState state, BlockGetter level, BlockPos pos, Direction direction) {
+        return 5;
+    }
+}
diff --git a/Common/src/main/java/at/petrak/hexcasting/common/lib/HexBlocks.java b/Common/src/main/java/at/petrak/hexcasting/common/lib/HexBlocks.java
index a0319fc097..97e58a75e4 100644
--- a/Common/src/main/java/at/petrak/hexcasting/common/lib/HexBlocks.java
+++ b/Common/src/main/java/at/petrak/hexcasting/common/lib/HexBlocks.java
@@ -267,6 +267,8 @@ private static BlockBehaviour.Properties quenched() {
 
     public static final FenceBlock EDIFIED_FENCE = blockItem("edified_fence",
             new BlockHexFence(edifiedWoody().noOcclusion()));
+    public static final FenceGateBlock EDIFIED_FENCE_GATE = blockItem("edified_fence_gate",
+            new BlockHexFenceGate(edifiedWoody().noOcclusion()));
 
     public static final SlabBlock EDIFIED_SLAB = blockItem("edified_slab",
         new BlockHexSlab(edifiedWoody().noOcclusion()));
diff --git a/Common/src/main/java/at/petrak/hexcasting/datagen/HexLootTables.java b/Common/src/main/java/at/petrak/hexcasting/datagen/HexLootTables.java
index 42b7ffbdac..386320703c 100644
--- a/Common/src/main/java/at/petrak/hexcasting/datagen/HexLootTables.java
+++ b/Common/src/main/java/at/petrak/hexcasting/datagen/HexLootTables.java
@@ -58,7 +58,7 @@ protected void makeLootTables(Map<Block, LootTable.Builder> blockTables,
             HexBlocks.EDIFIED_LOG_CITRINE, HexBlocks.EDIFIED_LOG_PURPLE, HexBlocks.STRIPPED_EDIFIED_LOG,
             HexBlocks.EDIFIED_WOOD, HexBlocks.STRIPPED_EDIFIED_WOOD,
             HexBlocks.EDIFIED_PLANKS, HexBlocks.EDIFIED_TILE, HexBlocks.EDIFIED_PANEL,
-            HexBlocks.EDIFIED_TRAPDOOR, HexBlocks.EDIFIED_STAIRS, HexBlocks.EDIFIED_FENCE, HexBlocks.EDIFIED_PRESSURE_PLATE,
+            HexBlocks.EDIFIED_TRAPDOOR, HexBlocks.EDIFIED_STAIRS, HexBlocks.EDIFIED_FENCE, HexBlocks.EDIFIED_FENCE_GATE, HexBlocks.EDIFIED_PRESSURE_PLATE,
             HexBlocks.EDIFIED_BUTTON);
 
         makeSlabTable(blockTables, HexBlocks.EDIFIED_SLAB);
diff --git a/Common/src/main/java/at/petrak/hexcasting/datagen/recipe/HexplatRecipes.java b/Common/src/main/java/at/petrak/hexcasting/datagen/recipe/HexplatRecipes.java
index 24b4f2a4be..1aa1a0fe9f 100644
--- a/Common/src/main/java/at/petrak/hexcasting/datagen/recipe/HexplatRecipes.java
+++ b/Common/src/main/java/at/petrak/hexcasting/datagen/recipe/HexplatRecipes.java
@@ -355,6 +355,13 @@ public void buildRecipes(Consumer<FinishedRecipe> recipes) {
                 .pattern("WSW")
                 .unlockedBy("has_item", hasItem(HexTags.Items.EDIFIED_PLANKS)).save(recipes);
 
+        ShapedRecipeBuilder.shaped(RecipeCategory.BUILDING_BLOCKS, HexBlocks.EDIFIED_FENCE_GATE, 1)
+                .define('W', HexTags.Items.EDIFIED_PLANKS)
+                .define('S', Items.STICK)
+                .pattern("SWS")
+                .pattern("SWS")
+                .unlockedBy("has_item", hasItem(HexTags.Items.EDIFIED_PLANKS)).save(recipes);
+
 
         ShapedRecipeBuilder.shaped(RecipeCategory.BUILDING_BLOCKS, HexBlocks.EDIFIED_SLAB, 6)
             .define('W', HexTags.Items.EDIFIED_PLANKS)
diff --git a/Common/src/main/java/at/petrak/hexcasting/datagen/tag/HexBlockTagProvider.java b/Common/src/main/java/at/petrak/hexcasting/datagen/tag/HexBlockTagProvider.java
index 87b476fe05..75b0435235 100644
--- a/Common/src/main/java/at/petrak/hexcasting/datagen/tag/HexBlockTagProvider.java
+++ b/Common/src/main/java/at/petrak/hexcasting/datagen/tag/HexBlockTagProvider.java
@@ -54,7 +54,7 @@ protected void addTags(HolderLookup.Provider provider) {
             HexBlocks.EDIFIED_WOOD, HexBlocks.STRIPPED_EDIFIED_WOOD,
             HexBlocks.EDIFIED_PLANKS, HexBlocks.EDIFIED_PANEL, HexBlocks.EDIFIED_TILE,
             HexBlocks.EDIFIED_DOOR, HexBlocks.EDIFIED_TRAPDOOR, HexBlocks.EDIFIED_SLAB,
-            HexBlocks.EDIFIED_BUTTON, HexBlocks.EDIFIED_STAIRS, HexBlocks.EDIFIED_FENCE);
+            HexBlocks.EDIFIED_BUTTON, HexBlocks.EDIFIED_STAIRS, HexBlocks.EDIFIED_FENCE, HexBlocks.EDIFIED_FENCE_GATE);
 
         add(tag(BlockTags.MINEABLE_WITH_HOE),
             HexBlocks.AMETHYST_EDIFIED_LEAVES, HexBlocks.AVENTURINE_EDIFIED_LEAVES,
@@ -97,6 +97,10 @@ protected void addTags(HolderLookup.Provider provider) {
                 HexBlocks.EDIFIED_FENCE);
         add(tag(BlockTags.WOODEN_FENCES),
                 HexBlocks.EDIFIED_FENCE);
+        add(tag(BlockTags.FENCE_GATES),
+                HexBlocks.EDIFIED_FENCE_GATE);
+        add(tag(BlockTags.UNSTABLE_BOTTOM_CENTER),
+                HexBlocks.EDIFIED_FENCE_GATE);
 
 
 
diff --git a/Common/src/main/resources/assets/hexcasting/lang/en_us.flatten.json5 b/Common/src/main/resources/assets/hexcasting/lang/en_us.flatten.json5
index 34aefba1cb..ba7455d9fe 100644
--- a/Common/src/main/resources/assets/hexcasting/lang/en_us.flatten.json5
+++ b/Common/src/main/resources/assets/hexcasting/lang/en_us.flatten.json5
@@ -150,6 +150,7 @@
     "edified_trapdoor": "Edified Trapdoor",
     "edified_stairs": "Edified Stairs",
     "edified_fence": "Edified Fence",
+    "edified_fence_gate": "Edified Fence Gate",
     "edified_slab": "Edified Slab",
     "edified_button": "Edified Button",
     "edified_pressure_plate": "Edified Pressure Plate",
diff --git a/Fabric/src/generated/resources/data/hexcasting/advancements/recipes/building_blocks/edified_fence_gate.json b/Fabric/src/generated/resources/data/hexcasting/advancements/recipes/building_blocks/edified_fence_gate.json
new file mode 100644
index 0000000000..aa49266e09
--- /dev/null
+++ b/Fabric/src/generated/resources/data/hexcasting/advancements/recipes/building_blocks/edified_fence_gate.json
@@ -0,0 +1,33 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_item": {
+      "conditions": {
+        "items": [
+          {
+            "tag": "hexcasting:edified_planks"
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "hexcasting:edified_fence_gate"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_item",
+      "has_the_recipe"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "hexcasting:edified_fence_gate"
+    ]
+  },
+  "sends_telemetry_event": false
+}
\ No newline at end of file
diff --git a/Fabric/src/generated/resources/data/hexcasting/loot_tables/blocks/edified_fence_gate.json b/Fabric/src/generated/resources/data/hexcasting/loot_tables/blocks/edified_fence_gate.json
new file mode 100644
index 0000000000..01cbf2a5e1
--- /dev/null
+++ b/Fabric/src/generated/resources/data/hexcasting/loot_tables/blocks/edified_fence_gate.json
@@ -0,0 +1,15 @@
+{
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "hexcasting:edified_fence_gate"
+        }
+      ],
+      "rolls": 1.0
+    }
+  ],
+  "random_sequence": "hexcasting:blocks/edified_fence_gate"
+}
\ No newline at end of file
diff --git a/Fabric/src/generated/resources/data/hexcasting/recipes/edified_fence_gate.json b/Fabric/src/generated/resources/data/hexcasting/recipes/edified_fence_gate.json
new file mode 100644
index 0000000000..799b582fb9
--- /dev/null
+++ b/Fabric/src/generated/resources/data/hexcasting/recipes/edified_fence_gate.json
@@ -0,0 +1,20 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "category": "building",
+  "key": {
+    "S": {
+      "item": "minecraft:stick"
+    },
+    "W": {
+      "tag": "hexcasting:edified_planks"
+    }
+  },
+  "pattern": [
+    "SWS",
+    "SWS"
+  ],
+  "result": {
+    "item": "hexcasting:edified_fence_gate"
+  },
+  "show_notification": true
+}
\ No newline at end of file
diff --git a/Fabric/src/generated/resources/data/minecraft/tags/blocks/fence_gates.json b/Fabric/src/generated/resources/data/minecraft/tags/blocks/fence_gates.json
new file mode 100644
index 0000000000..4dff358b03
--- /dev/null
+++ b/Fabric/src/generated/resources/data/minecraft/tags/blocks/fence_gates.json
@@ -0,0 +1,6 @@
+{
+  "replace": false,
+  "values": [
+    "hexcasting:edified_fence_gate"
+  ]
+}
\ No newline at end of file
diff --git a/Fabric/src/generated/resources/data/minecraft/tags/blocks/unstable_bottom_center.json b/Fabric/src/generated/resources/data/minecraft/tags/blocks/unstable_bottom_center.json
new file mode 100644
index 0000000000..4dff358b03
--- /dev/null
+++ b/Fabric/src/generated/resources/data/minecraft/tags/blocks/unstable_bottom_center.json
@@ -0,0 +1,6 @@
+{
+  "replace": false,
+  "values": [
+    "hexcasting:edified_fence_gate"
+  ]
+}
\ No newline at end of file
diff --git a/Fabric/src/main/java/at/petrak/hexcasting/fabric/FabricHexInitializer.kt b/Fabric/src/main/java/at/petrak/hexcasting/fabric/FabricHexInitializer.kt
index 1729ab5801..e7d3163458 100644
--- a/Fabric/src/main/java/at/petrak/hexcasting/fabric/FabricHexInitializer.kt
+++ b/Fabric/src/main/java/at/petrak/hexcasting/fabric/FabricHexInitializer.kt
@@ -192,6 +192,7 @@ object FabricHexInitializer : ModInitializer {
             HexBlocks.EDIFIED_STAIRS,
             HexBlocks.EDIFIED_SLAB,
             HexBlocks.EDIFIED_FENCE,
+            HexBlocks.EDIFIED_FENCE_GATE,
             HexBlocks.EDIFIED_SLAB,
             HexBlocks.EDIFIED_BUTTON,
             HexBlocks.EDIFIED_PRESSURE_PLATE,
diff --git a/Forge/src/main/java/at/petrak/hexcasting/forge/datagen/xplat/HexBlockStatesAndModels.java b/Forge/src/main/java/at/petrak/hexcasting/forge/datagen/xplat/HexBlockStatesAndModels.java
index 92a5679eb2..f4e30e8a42 100644
--- a/Forge/src/main/java/at/petrak/hexcasting/forge/datagen/xplat/HexBlockStatesAndModels.java
+++ b/Forge/src/main/java/at/petrak/hexcasting/forge/datagen/xplat/HexBlockStatesAndModels.java
@@ -220,6 +220,7 @@ protected void registerStatesAndModels() {
 
         stairsBlock(HexBlocks.EDIFIED_STAIRS, planks1);
         fenceBlock(HexBlocks.EDIFIED_FENCE, planks1);
+        fenceGateBlock(HexBlocks.EDIFIED_FENCE_GATE, planks1);
         slabBlock(HexBlocks.EDIFIED_SLAB, planks1, planks1);
         buttonBlock(HexBlocks.EDIFIED_BUTTON, planks1);
         pressurePlateBlock(HexBlocks.EDIFIED_PRESSURE_PLATE, planks1);
diff --git a/Forge/src/main/java/at/petrak/hexcasting/forge/datagen/xplat/HexItemModels.java b/Forge/src/main/java/at/petrak/hexcasting/forge/datagen/xplat/HexItemModels.java
index 169dcad9cf..e32f090d02 100644
--- a/Forge/src/main/java/at/petrak/hexcasting/forge/datagen/xplat/HexItemModels.java
+++ b/Forge/src/main/java/at/petrak/hexcasting/forge/datagen/xplat/HexItemModels.java
@@ -197,6 +197,8 @@ protected void registerModels() {
             new ModelFile.UncheckedModelFile(modLoc("block/edified_stairs")));
         getBuilder(getPath(HexBlocks.EDIFIED_FENCE)).parent(
                 new ModelFile.UncheckedModelFile(modLoc("block/edified_fence_inventory")));
+        getBuilder(getPath(HexBlocks.EDIFIED_FENCE_GATE)).parent(
+                new ModelFile.UncheckedModelFile(modLoc("block/edified_fence_gate")));
         getBuilder(getPath(HexBlocks.EDIFIED_SLAB)).parent(
             new ModelFile.UncheckedModelFile(modLoc("block/edified_slab")));
         getBuilder(getPath(HexBlocks.EDIFIED_BUTTON)).parent(

From b61396b21e5e8be5232d8965cb7672427e86ddf6 Mon Sep 17 00:00:00 2001
From: falkory <falkor220@gmail.com>
Date: Thu, 9 Nov 2023 00:23:33 +0000
Subject: [PATCH 6/8] 2 new staffs idk why they dont work propperly yet tho

---
 .../hexcasting/models/item/staff/bamboo.json    |   6 ++++++
 .../hexcasting/models/item/staff/cherry.json    |   6 ++++++
 .../assets/hexcasting/models/staff/bamboo.json  |  16 ++++++++++++++++
 .../assets/hexcasting/models/staff/cherry.json  |  16 ++++++++++++++++
 .../petrak/hexcasting/common/lib/HexItems.java  |   2 ++
 .../datagen/recipe/HexplatRecipes.java          |   2 ++
 .../datagen/tag/HexItemTagProvider.java         |   1 +
 .../assets/hexcasting/lang/en_us.flatten.json5  |   2 ++
 .../hexcasting/textures/item/staff/bamboo.png   | Bin 0 -> 373 bytes
 .../forge/datagen/xplat/HexItemModels.java      |   2 ++
 .../forge/interop/jei/HexJEIPlugin.java         |   2 ++
 11 files changed, 55 insertions(+)
 create mode 100644 Common/src/generated/resources/assets/hexcasting/models/item/staff/bamboo.json
 create mode 100644 Common/src/generated/resources/assets/hexcasting/models/item/staff/cherry.json
 create mode 100644 Common/src/generated/resources/assets/hexcasting/models/staff/bamboo.json
 create mode 100644 Common/src/generated/resources/assets/hexcasting/models/staff/cherry.json
 create mode 100644 Common/src/main/resources/assets/hexcasting/textures/item/staff/bamboo.png

diff --git a/Common/src/generated/resources/assets/hexcasting/models/item/staff/bamboo.json b/Common/src/generated/resources/assets/hexcasting/models/item/staff/bamboo.json
new file mode 100644
index 0000000000..cb00188989
--- /dev/null
+++ b/Common/src/generated/resources/assets/hexcasting/models/item/staff/bamboo.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/handheld_rod",
+  "textures": {
+    "layer0": "hexcasting:item/staff/bamboo"
+  }
+}
\ No newline at end of file
diff --git a/Common/src/generated/resources/assets/hexcasting/models/item/staff/cherry.json b/Common/src/generated/resources/assets/hexcasting/models/item/staff/cherry.json
new file mode 100644
index 0000000000..1fb6398518
--- /dev/null
+++ b/Common/src/generated/resources/assets/hexcasting/models/item/staff/cherry.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/handheld_rod",
+  "textures": {
+    "layer0": "hexcasting:item/staff/cherry"
+  }
+}
\ No newline at end of file
diff --git a/Common/src/generated/resources/assets/hexcasting/models/staff/bamboo.json b/Common/src/generated/resources/assets/hexcasting/models/staff/bamboo.json
new file mode 100644
index 0000000000..c0f063051f
--- /dev/null
+++ b/Common/src/generated/resources/assets/hexcasting/models/staff/bamboo.json
@@ -0,0 +1,16 @@
+{
+  "overrides": [
+    {
+      "model": "hexcasting:item/bamboo_staff",
+      "predicate": {
+        "hexcasting:funny_level": 0.0
+      }
+    },
+    {
+      "model": "hexcasting:item/cherry_staff",
+      "predicate": {
+        "hexcasting:funny_level": 2.0
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Common/src/generated/resources/assets/hexcasting/models/staff/cherry.json b/Common/src/generated/resources/assets/hexcasting/models/staff/cherry.json
new file mode 100644
index 0000000000..9a663a248b
--- /dev/null
+++ b/Common/src/generated/resources/assets/hexcasting/models/staff/cherry.json
@@ -0,0 +1,16 @@
+{
+  "overrides": [
+    {
+      "model": "hexcasting:item/cherry_staff",
+      "predicate": {
+        "hexcasting:funny_level": 0.0
+      }
+    },
+    {
+      "model": "hexcasting:item/cherry_staff",
+      "predicate": {
+        "hexcasting:funny_level": 2.0
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Common/src/main/java/at/petrak/hexcasting/common/lib/HexItems.java b/Common/src/main/java/at/petrak/hexcasting/common/lib/HexItems.java
index d6b90adf3c..a85889e104 100644
--- a/Common/src/main/java/at/petrak/hexcasting/common/lib/HexItems.java
+++ b/Common/src/main/java/at/petrak/hexcasting/common/lib/HexItems.java
@@ -58,6 +58,8 @@ public static void registerItemCreativeTab(CreativeModeTab.Output r, CreativeMod
     public static final ItemStaff STAFF_CRIMSON = make("staff/crimson", new ItemStaff(unstackable()));
     public static final ItemStaff STAFF_WARPED = make("staff/warped", new ItemStaff(unstackable()));
     public static final ItemStaff STAFF_MANGROVE = make("staff/mangrove", new ItemStaff(unstackable()));
+    public static final ItemStaff STAFF_CHERRY = make("staff/cherry", new ItemStaff(unstackable()));
+    public static final ItemStaff STAFF_BAMBOO = make("staff/bamboo", new ItemStaff(unstackable()));
     public static final ItemStaff STAFF_EDIFIED = make("staff/edified", new ItemStaff(unstackable()));
     public static final ItemStaff STAFF_QUENCHED = make("staff/quenched", new ItemStaff(unstackable()));
     // mindsplice staffaratus
diff --git a/Common/src/main/java/at/petrak/hexcasting/datagen/recipe/HexplatRecipes.java b/Common/src/main/java/at/petrak/hexcasting/datagen/recipe/HexplatRecipes.java
index 1aa1a0fe9f..2dbea0523f 100644
--- a/Common/src/main/java/at/petrak/hexcasting/datagen/recipe/HexplatRecipes.java
+++ b/Common/src/main/java/at/petrak/hexcasting/datagen/recipe/HexplatRecipes.java
@@ -71,6 +71,8 @@ public void buildRecipes(Consumer<FinishedRecipe> recipes) {
         staffRecipe(recipes, HexItems.STAFF_CRIMSON, Items.CRIMSON_PLANKS);
         staffRecipe(recipes, HexItems.STAFF_WARPED, Items.WARPED_PLANKS);
         staffRecipe(recipes, HexItems.STAFF_MANGROVE, Items.MANGROVE_PLANKS);
+        staffRecipe(recipes, HexItems.STAFF_CHERRY, Items.CHERRY_PLANKS);
+        staffRecipe(recipes, HexItems.STAFF_BAMBOO, Items.BAMBOO_PLANKS);
         staffRecipe(recipes, HexItems.STAFF_EDIFIED, HexBlocks.EDIFIED_PLANKS.asItem());
         staffRecipe(recipes, HexItems.STAFF_QUENCHED, HexItems.QUENCHED_SHARD);
         staffRecipe(recipes, HexItems.STAFF_MINDSPLICE, Ingredient.of(HexTags.Items.MINDFLAYED_CIRCLE_COMPONENTS));
diff --git a/Common/src/main/java/at/petrak/hexcasting/datagen/tag/HexItemTagProvider.java b/Common/src/main/java/at/petrak/hexcasting/datagen/tag/HexItemTagProvider.java
index cf2877a44d..e6ecbf58db 100644
--- a/Common/src/main/java/at/petrak/hexcasting/datagen/tag/HexItemTagProvider.java
+++ b/Common/src/main/java/at/petrak/hexcasting/datagen/tag/HexItemTagProvider.java
@@ -40,6 +40,7 @@ protected void addTags(HolderLookup.Provider provider) {
             HexItems.STAFF_OAK, HexItems.STAFF_SPRUCE, HexItems.STAFF_BIRCH,
             HexItems.STAFF_JUNGLE, HexItems.STAFF_ACACIA, HexItems.STAFF_DARK_OAK,
             HexItems.STAFF_CRIMSON, HexItems.STAFF_WARPED, HexItems.STAFF_MANGROVE,
+            HexItems.STAFF_CHERRY,HexItems.STAFF_BAMBOO,
             HexItems.STAFF_QUENCHED, HexItems.STAFF_MINDSPLICE);
 
         add(tag(HexTags.Items.PHIAL_BASE),
diff --git a/Common/src/main/resources/assets/hexcasting/lang/en_us.flatten.json5 b/Common/src/main/resources/assets/hexcasting/lang/en_us.flatten.json5
index ba7455d9fe..7c3b965478 100644
--- a/Common/src/main/resources/assets/hexcasting/lang/en_us.flatten.json5
+++ b/Common/src/main/resources/assets/hexcasting/lang/en_us.flatten.json5
@@ -13,6 +13,8 @@
       "crimson": "Crimson Staff",
       "warped": "Warped Staff",
       "mangrove": "Mangrove Staff",
+      "cherry": "Cherry Staff",
+      "bamboo": "Bamboo Staff",
       "edified": "Edified Staff",
       "quenched": "Quenched Shard Staff",
       "mindsplice": "Mindsplice Staff"
diff --git a/Common/src/main/resources/assets/hexcasting/textures/item/staff/bamboo.png b/Common/src/main/resources/assets/hexcasting/textures/item/staff/bamboo.png
new file mode 100644
index 0000000000000000000000000000000000000000..ce48904942497e9fa899d47842bf73c918290d21
GIT binary patch
literal 373
zcmV-*0gC>KP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0003zNkl<ZIE|f=
zze@sP9L7JV($G+b1mWP;648(x6s|S81w{ywOVAdi&T&K(G)A}uf*|M?rT>68)L=s`
zaUG<WQD72+L)6<~Cs+PB&(HL}@I24^e7~>62%PNPh$lnGc-2QUe_uZf@pUKGmXC#J
z7*kvc3ZvR$`emQpEkDxYJLPl$fT02aqI)uM0gVvlbby1@896l}*#^XwpfJy?jYE=!
zF#6>>IW-{-Y+yC|#@zrU3t<4p7S2J%euR~cc>tP~Isits)urhhV2X36w|ISSjH(7e
zCUq}ab*@1Tnw2_UpSyGaZ|>V5t^~zW$WK124a)CLDI$yFLsV>T&k1`q{Haum$YN@8
z0`;**?5ewNFFHH0nw{W+_RO`|jH8!LJkb8Kd{!g#YkvFqbkw4YqtNV73k3K9mC|--
TghS@?00000NkvXXu0mjf%VDJk

literal 0
HcmV?d00001

diff --git a/Forge/src/main/java/at/petrak/hexcasting/forge/datagen/xplat/HexItemModels.java b/Forge/src/main/java/at/petrak/hexcasting/forge/datagen/xplat/HexItemModels.java
index e32f090d02..7def15a4e4 100644
--- a/Forge/src/main/java/at/petrak/hexcasting/forge/datagen/xplat/HexItemModels.java
+++ b/Forge/src/main/java/at/petrak/hexcasting/forge/datagen/xplat/HexItemModels.java
@@ -92,6 +92,8 @@ protected void registerModels() {
         buildStaff(HexItems.STAFF_CRIMSON, "crimson");
         buildStaff(HexItems.STAFF_WARPED, "warped");
         buildStaff(HexItems.STAFF_MANGROVE, "mangrove");
+        buildStaff(HexItems.STAFF_CHERRY, "cherry");
+        buildStaff(HexItems.STAFF_BAMBOO, "bamboo");
         buildStaff(HexItems.STAFF_EDIFIED, "edified");
         buildStaff(HexItems.STAFF_MINDSPLICE, "mindsplice");
 
diff --git a/Forge/src/main/java/at/petrak/hexcasting/forge/interop/jei/HexJEIPlugin.java b/Forge/src/main/java/at/petrak/hexcasting/forge/interop/jei/HexJEIPlugin.java
index aa2f11cc5d..32572ba10c 100644
--- a/Forge/src/main/java/at/petrak/hexcasting/forge/interop/jei/HexJEIPlugin.java
+++ b/Forge/src/main/java/at/petrak/hexcasting/forge/interop/jei/HexJEIPlugin.java
@@ -79,6 +79,8 @@ public void registerRecipeCatalysts(IRecipeCatalystRegistration registration) {
             HexItems.STAFF_CRIMSON,
             HexItems.STAFF_WARPED,
             HexItems.STAFF_MANGROVE,
+            HexItems.STAFF_CHERRY,
+            HexItems.STAFF_BAMBOO,
             HexItems.STAFF_EDIFIED,
         }) {
             registration.addRecipeCatalyst(new ItemStack(staff), BRAINSWEEPING, PHIAL, EDIFY);

From 4fca7ddc790e8d8452a2620fdd6c79e4107b70b6 Mon Sep 17 00:00:00 2001
From: falkory <falkor220@gmail.com>
Date: Thu, 9 Nov 2023 00:40:36 +0000
Subject: [PATCH 7/8] Can now cast

---
 .../building_blocks/edified_fence_gate.json   | 33 +++++++++++++++++
 .../recipes/tools/staff/bamboo.json           | 35 +++++++++++++++++++
 .../recipes/tools/staff/cherry.json           | 35 +++++++++++++++++++
 .../blocks/edified_fence_gate.json            | 15 ++++++++
 .../recipes/edified_fence_gate.json           | 20 +++++++++++
 .../data/hexcasting/recipes/staff/bamboo.json | 24 +++++++++++++
 .../data/hexcasting/recipes/staff/cherry.json | 24 +++++++++++++
 .../data/hexcasting/tags/items/staves.json    | 18 ++++++++++
 .../minecraft/tags/blocks/fence_gates.json    |  5 +++
 .../tags/blocks/unstable_bottom_center.json   |  5 +++
 10 files changed, 214 insertions(+)
 create mode 100644 Forge/src/generated/resources/data/hexcasting/advancements/recipes/building_blocks/edified_fence_gate.json
 create mode 100644 Forge/src/generated/resources/data/hexcasting/advancements/recipes/tools/staff/bamboo.json
 create mode 100644 Forge/src/generated/resources/data/hexcasting/advancements/recipes/tools/staff/cherry.json
 create mode 100644 Forge/src/generated/resources/data/hexcasting/loot_tables/blocks/edified_fence_gate.json
 create mode 100644 Forge/src/generated/resources/data/hexcasting/recipes/edified_fence_gate.json
 create mode 100644 Forge/src/generated/resources/data/hexcasting/recipes/staff/bamboo.json
 create mode 100644 Forge/src/generated/resources/data/hexcasting/recipes/staff/cherry.json
 create mode 100644 Forge/src/generated/resources/data/hexcasting/tags/items/staves.json
 create mode 100644 Forge/src/generated/resources/data/minecraft/tags/blocks/fence_gates.json
 create mode 100644 Forge/src/generated/resources/data/minecraft/tags/blocks/unstable_bottom_center.json

diff --git a/Forge/src/generated/resources/data/hexcasting/advancements/recipes/building_blocks/edified_fence_gate.json b/Forge/src/generated/resources/data/hexcasting/advancements/recipes/building_blocks/edified_fence_gate.json
new file mode 100644
index 0000000000..aa49266e09
--- /dev/null
+++ b/Forge/src/generated/resources/data/hexcasting/advancements/recipes/building_blocks/edified_fence_gate.json
@@ -0,0 +1,33 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_item": {
+      "conditions": {
+        "items": [
+          {
+            "tag": "hexcasting:edified_planks"
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "hexcasting:edified_fence_gate"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_item",
+      "has_the_recipe"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "hexcasting:edified_fence_gate"
+    ]
+  },
+  "sends_telemetry_event": false
+}
\ No newline at end of file
diff --git a/Forge/src/generated/resources/data/hexcasting/advancements/recipes/tools/staff/bamboo.json b/Forge/src/generated/resources/data/hexcasting/advancements/recipes/tools/staff/bamboo.json
new file mode 100644
index 0000000000..a6fa449db3
--- /dev/null
+++ b/Forge/src/generated/resources/data/hexcasting/advancements/recipes/tools/staff/bamboo.json
@@ -0,0 +1,35 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_item": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "hexcasting:charged_amethyst"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "hexcasting:staff/bamboo"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_item",
+      "has_the_recipe"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "hexcasting:staff/bamboo"
+    ]
+  },
+  "sends_telemetry_event": false
+}
\ No newline at end of file
diff --git a/Forge/src/generated/resources/data/hexcasting/advancements/recipes/tools/staff/cherry.json b/Forge/src/generated/resources/data/hexcasting/advancements/recipes/tools/staff/cherry.json
new file mode 100644
index 0000000000..a28e8cbc57
--- /dev/null
+++ b/Forge/src/generated/resources/data/hexcasting/advancements/recipes/tools/staff/cherry.json
@@ -0,0 +1,35 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_item": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "hexcasting:charged_amethyst"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "hexcasting:staff/cherry"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_item",
+      "has_the_recipe"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "hexcasting:staff/cherry"
+    ]
+  },
+  "sends_telemetry_event": false
+}
\ No newline at end of file
diff --git a/Forge/src/generated/resources/data/hexcasting/loot_tables/blocks/edified_fence_gate.json b/Forge/src/generated/resources/data/hexcasting/loot_tables/blocks/edified_fence_gate.json
new file mode 100644
index 0000000000..01cbf2a5e1
--- /dev/null
+++ b/Forge/src/generated/resources/data/hexcasting/loot_tables/blocks/edified_fence_gate.json
@@ -0,0 +1,15 @@
+{
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "hexcasting:edified_fence_gate"
+        }
+      ],
+      "rolls": 1.0
+    }
+  ],
+  "random_sequence": "hexcasting:blocks/edified_fence_gate"
+}
\ No newline at end of file
diff --git a/Forge/src/generated/resources/data/hexcasting/recipes/edified_fence_gate.json b/Forge/src/generated/resources/data/hexcasting/recipes/edified_fence_gate.json
new file mode 100644
index 0000000000..799b582fb9
--- /dev/null
+++ b/Forge/src/generated/resources/data/hexcasting/recipes/edified_fence_gate.json
@@ -0,0 +1,20 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "category": "building",
+  "key": {
+    "S": {
+      "item": "minecraft:stick"
+    },
+    "W": {
+      "tag": "hexcasting:edified_planks"
+    }
+  },
+  "pattern": [
+    "SWS",
+    "SWS"
+  ],
+  "result": {
+    "item": "hexcasting:edified_fence_gate"
+  },
+  "show_notification": true
+}
\ No newline at end of file
diff --git a/Forge/src/generated/resources/data/hexcasting/recipes/staff/bamboo.json b/Forge/src/generated/resources/data/hexcasting/recipes/staff/bamboo.json
new file mode 100644
index 0000000000..2796a8b049
--- /dev/null
+++ b/Forge/src/generated/resources/data/hexcasting/recipes/staff/bamboo.json
@@ -0,0 +1,24 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "category": "equipment",
+  "key": {
+    "A": {
+      "item": "hexcasting:charged_amethyst"
+    },
+    "S": {
+      "item": "minecraft:stick"
+    },
+    "W": {
+      "item": "minecraft:bamboo_planks"
+    }
+  },
+  "pattern": [
+    " SA",
+    " WS",
+    "S  "
+  ],
+  "result": {
+    "item": "hexcasting:staff/bamboo"
+  },
+  "show_notification": true
+}
\ No newline at end of file
diff --git a/Forge/src/generated/resources/data/hexcasting/recipes/staff/cherry.json b/Forge/src/generated/resources/data/hexcasting/recipes/staff/cherry.json
new file mode 100644
index 0000000000..36a96851b0
--- /dev/null
+++ b/Forge/src/generated/resources/data/hexcasting/recipes/staff/cherry.json
@@ -0,0 +1,24 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "category": "equipment",
+  "key": {
+    "A": {
+      "item": "hexcasting:charged_amethyst"
+    },
+    "S": {
+      "item": "minecraft:stick"
+    },
+    "W": {
+      "item": "minecraft:cherry_planks"
+    }
+  },
+  "pattern": [
+    " SA",
+    " WS",
+    "S  "
+  ],
+  "result": {
+    "item": "hexcasting:staff/cherry"
+  },
+  "show_notification": true
+}
\ No newline at end of file
diff --git a/Forge/src/generated/resources/data/hexcasting/tags/items/staves.json b/Forge/src/generated/resources/data/hexcasting/tags/items/staves.json
new file mode 100644
index 0000000000..29f4595c62
--- /dev/null
+++ b/Forge/src/generated/resources/data/hexcasting/tags/items/staves.json
@@ -0,0 +1,18 @@
+{
+  "values": [
+    "hexcasting:staff/edified",
+    "hexcasting:staff/oak",
+    "hexcasting:staff/spruce",
+    "hexcasting:staff/birch",
+    "hexcasting:staff/jungle",
+    "hexcasting:staff/acacia",
+    "hexcasting:staff/dark_oak",
+    "hexcasting:staff/crimson",
+    "hexcasting:staff/warped",
+    "hexcasting:staff/mangrove",
+    "hexcasting:staff/cherry",
+    "hexcasting:staff/bamboo",
+    "hexcasting:staff/quenched",
+    "hexcasting:staff/mindsplice"
+  ]
+}
\ No newline at end of file
diff --git a/Forge/src/generated/resources/data/minecraft/tags/blocks/fence_gates.json b/Forge/src/generated/resources/data/minecraft/tags/blocks/fence_gates.json
new file mode 100644
index 0000000000..f27c95c784
--- /dev/null
+++ b/Forge/src/generated/resources/data/minecraft/tags/blocks/fence_gates.json
@@ -0,0 +1,5 @@
+{
+  "values": [
+    "hexcasting:edified_fence_gate"
+  ]
+}
\ No newline at end of file
diff --git a/Forge/src/generated/resources/data/minecraft/tags/blocks/unstable_bottom_center.json b/Forge/src/generated/resources/data/minecraft/tags/blocks/unstable_bottom_center.json
new file mode 100644
index 0000000000..f27c95c784
--- /dev/null
+++ b/Forge/src/generated/resources/data/minecraft/tags/blocks/unstable_bottom_center.json
@@ -0,0 +1,5 @@
+{
+  "values": [
+    "hexcasting:edified_fence_gate"
+  ]
+}
\ No newline at end of file

From 2b8b73eae851341f29ae0364120fa6e2ef31cbae Mon Sep 17 00:00:00 2001
From: falkory <falkor220@gmail.com>
Date: Wed, 29 Nov 2023 01:09:24 +0000
Subject: [PATCH 8/8] Fix the PR i think?

---
 .../at/petrak/hexcasting/datagen/recipe/HexplatRecipes.java     | 2 +-
 Fabric/src/main/resources/fabric.mod.json                       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Common/src/main/java/at/petrak/hexcasting/datagen/recipe/HexplatRecipes.java b/Common/src/main/java/at/petrak/hexcasting/datagen/recipe/HexplatRecipes.java
index 2dbea0523f..0ce18147f8 100644
--- a/Common/src/main/java/at/petrak/hexcasting/datagen/recipe/HexplatRecipes.java
+++ b/Common/src/main/java/at/petrak/hexcasting/datagen/recipe/HexplatRecipes.java
@@ -343,7 +343,7 @@ public void buildRecipes(Consumer<FinishedRecipe> recipes) {
             .pattern("WWW")
             .unlockedBy("has_item", hasItem(HexTags.Items.EDIFIED_PLANKS)).save(recipes);
 
-        ShapedRecipeBuilder.shaped(RecipeCategory.BUILDING_BLOCKS, HexBlocks.EDIFIED_STAIRS, 3)
+        ShapedRecipeBuilder.shaped(RecipeCategory.BUILDING_BLOCKS, HexBlocks.EDIFIED_STAIRS, 4)
             .define('W', HexTags.Items.EDIFIED_PLANKS)
             .pattern("W  ")
             .pattern("WW ")
diff --git a/Fabric/src/main/resources/fabric.mod.json b/Fabric/src/main/resources/fabric.mod.json
index 1ec8814e3d..5bb5abee10 100644
--- a/Fabric/src/main/resources/fabric.mod.json
+++ b/Fabric/src/main/resources/fabric.mod.json
@@ -55,7 +55,7 @@
     "cardinal-components-entity": "~5.2.1",
     "cardinal-components-item": "~5.2.1",
     "cardinal-components-block": "~5.2.1",
-    "paucal": "*",
+    "paucal": "0.6.x",
     "cloth-config": "11.1.*",
     "patchouli": ">=1.20.1-80"
   },