From e90db17672ee17ed70439cfabfa83697866edc59 Mon Sep 17 00:00:00 2001
From: M-W-K <mwk001@icloud.com>
Date: Sun, 4 Aug 2024 20:41:15 -0600
Subject: [PATCH] Textures

---
 .../minecraft/client/player/LocalPlayer.class | Bin 50002 -> 50002 bytes
 .../world/entity/ExperienceOrb.class          | Bin 16113 -> 16113 bytes
 .../minecraft/world/entity/LivingEntity.class | Bin 129249 -> 129249 bytes
 .../world/entity/player/Player.class          | Bin 91154 -> 91154 bytes
 .../944642d621b104f4abc8ca05481729c651f4458b  |  12 ++++++------
 .../models/entity/auric_crystal.json          |   2 +-
 .../models/entity/energetic_crystal.json      |   2 +-
 .../models/entity/hardened_crystal.json       |   2 +-
 .../models/entity/resonant_crystal.json       |   2 +-
 .../models/entity/shaped_crystal.json         |   2 +-
 .../renderer/WingsItemStackRenderer.java      |   4 +---
 .../datagen/AmethystWingsModelProvider.java   |  14 +++++---------
 .../amethystwings/mixin/PlayerMixin.java      |  17 ++++++++++++++---
 .../models/item/wings_controller.json         |   3 ++-
 .../{entity => block}/auric_crystal.png       | Bin
 .../auric_crystal.png.mcmeta                  |   0
 .../{entity => block}/energetic_crystal.png   | Bin
 .../energetic_crystal.png.mcmeta              |   0
 .../{entity => block}/hardened_crystal.png    | Bin
 .../{entity => block}/resonant_crystal.png    | Bin
 .../resonant_crystal.png.mcmeta               |   0
 .../{entity => block}/shaped_crystal.png      | Bin
 .../{entity => block}/wings_controller.png    | Bin
 .../textures/item/wings_controller.png        | Bin 507 -> 411 bytes
 .../assets/minecraft/atlases/blocks.json      |  10 ----------
 25 files changed, 33 insertions(+), 37 deletions(-)
 rename src/main/resources/assets/amethystwings/textures/{entity => block}/auric_crystal.png (100%)
 rename src/main/resources/assets/amethystwings/textures/{entity => block}/auric_crystal.png.mcmeta (100%)
 rename src/main/resources/assets/amethystwings/textures/{entity => block}/energetic_crystal.png (100%)
 rename src/main/resources/assets/amethystwings/textures/{entity => block}/energetic_crystal.png.mcmeta (100%)
 rename src/main/resources/assets/amethystwings/textures/{entity => block}/hardened_crystal.png (100%)
 rename src/main/resources/assets/amethystwings/textures/{entity => block}/resonant_crystal.png (100%)
 rename src/main/resources/assets/amethystwings/textures/{entity => block}/resonant_crystal.png.mcmeta (100%)
 rename src/main/resources/assets/amethystwings/textures/{entity => block}/shaped_crystal.png (100%)
 rename src/main/resources/assets/amethystwings/textures/{entity => block}/wings_controller.png (100%)
 delete mode 100644 src/main/resources/assets/minecraft/atlases/blocks.json

diff --git a/run-data/.mixin.out/class/net/minecraft/client/player/LocalPlayer.class b/run-data/.mixin.out/class/net/minecraft/client/player/LocalPlayer.class
index cc4949c3b5e195180f0ed3b2b1736a4da7b1ea36..f1e309e6c6ad75bad5aa21530b78c644897b8379 100644
GIT binary patch
delta 51
zcmccA#(b%bc|&fQilwDxvXM!Osjj)PVVbUqX-cYYQkr3^u9<<Ek#VAhv1MYS;pT~D
G2Ympsw-A5;

delta 51
zcmccA#(b%bc|&fQig}V*Qi_>zvaXRuN}8^TnYp2^WtwTCZgPr|iK(ecVxqZ8;^v8E
G2Ymp&DG=TO

diff --git a/run-data/.mixin.out/class/net/minecraft/world/entity/ExperienceOrb.class b/run-data/.mixin.out/class/net/minecraft/world/entity/ExperienceOrb.class
index bd09add49b1365e96ea4be1b40db7b35e5b22203..c9439b6277fbef6d4231ae3412f3496c1ffce227 100644
GIT binary patch
delta 49
zcmexZ`>}SzQdJd8OUq;<lN3{3b7R9aT@%xkRNbUB!&F@}12ZGzL<?if#6-i*Csj2h
E0k3Zlr~m)}

delta 49
zcmexZ`>}SzQdJf6B(tOxGvj1kBa4(YT@y2NLtV=>(?s3m6eAN;Q<KC*bCbl)Csj2h
E0lMK31^@s6

diff --git a/run-data/.mixin.out/class/net/minecraft/world/entity/LivingEntity.class b/run-data/.mixin.out/class/net/minecraft/world/entity/LivingEntity.class
index 7754ace4758ad3eeb2c894b2762ac1ababee65eb..d1a37f72e930b7064ece39596a34b3a92d4d4d99 100644
GIT binary patch
delta 54
zcmaF(k^SLE_J%EtJ&G!pmX^szCMl-6=EjC;x+bP6sk%vNhN-${24+Uai5A9|iHU~W
KHz+b1UIzdOtr3*~

delta 54
zcmaF(k^SLE_J%EtJ&G#kNoGkYX2!|7Miwb)x+Z4khPsw%rir@ADMluyrY4Dr<|c{T
KHz+b1UIzdaeG&5j

diff --git a/run-data/.mixin.out/class/net/minecraft/world/entity/player/Player.class b/run-data/.mixin.out/class/net/minecraft/world/entity/player/Player.class
index f362fb772e04a997b63a40fe053f5a2870c3f3c8..f946ec2ce960ac8fddf15042ddb4e7048b2bfed9 100644
GIT binary patch
delta 62
zcmbPqf_2gf)(s-})GaM7lZ{MLOm)qT4byZ@OjA;IlhO=Rb<GUSjEoa4j4cxr4H+5K
SCimTwn0)R&-{!=78(RT-*A<5V

delta 62
zcmbPqf_2gf)(s-})XkI3l2Xi!lXZ<OQqpuy%*+jSEz?XBb(2$!OiWEp5);i$5*ZoP
SCimTwn0)R&-{!=78(RU2Qx)X^

diff --git a/src/generated/resources/.cache/944642d621b104f4abc8ca05481729c651f4458b b/src/generated/resources/.cache/944642d621b104f4abc8ca05481729c651f4458b
index 2561c02..d352d8f 100644
--- a/src/generated/resources/.cache/944642d621b104f4abc8ca05481729c651f4458b
+++ b/src/generated/resources/.cache/944642d621b104f4abc8ca05481729c651f4458b
@@ -1,6 +1,6 @@
-// 1.20.1	2024-05-01T23:25:16.515952	Item Models: amethystwings
-13f817085430cbe2fd48d2729bd6198b5ba65ee0 assets/amethystwings/models/entity/auric_crystal.json
-fc48959c4c50c9da4834ea7265cc5e8d269be340 assets/amethystwings/models/entity/energetic_crystal.json
-76982afddfe3d384d03932aaffcd8bc8b39dd485 assets/amethystwings/models/entity/hardened_crystal.json
-f134a090f95d540dcbdbd773822261b0c2ab0080 assets/amethystwings/models/entity/resonant_crystal.json
-b2c8a3e2731c0daec863c6c8ed972fbac2efb32a assets/amethystwings/models/entity/shaped_crystal.json
+// 1.20.1	2024-08-04T19:47:48.592347	Item Models: amethystwings
+afe33470394890069fac34519a737d27ed03c6d4 assets/amethystwings/models/entity/auric_crystal.json
+c83ef7b5c603249b7dacbbe18e513f0c9b792851 assets/amethystwings/models/entity/energetic_crystal.json
+abf1f5de82c467c06bd25ef521aa4b7c4e1d1f53 assets/amethystwings/models/entity/hardened_crystal.json
+cb223eb758d9a44ea0fed00cdd64652c17b2c0e4 assets/amethystwings/models/entity/resonant_crystal.json
+7c5216474e90349e5f63945bf5060b30f3e1e224 assets/amethystwings/models/entity/shaped_crystal.json
diff --git a/src/generated/resources/assets/amethystwings/models/entity/auric_crystal.json b/src/generated/resources/assets/amethystwings/models/entity/auric_crystal.json
index 4d1cba6..82fff4a 100644
--- a/src/generated/resources/assets/amethystwings/models/entity/auric_crystal.json
+++ b/src/generated/resources/assets/amethystwings/models/entity/auric_crystal.json
@@ -1,6 +1,6 @@
 {
   "parent": "amethystwings:entity/crystal",
   "textures": {
-    "layer0": "amethystwings:entity/auric_crystal"
+    "layer0": "amethystwings:block/auric_crystal"
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/amethystwings/models/entity/energetic_crystal.json b/src/generated/resources/assets/amethystwings/models/entity/energetic_crystal.json
index cb9d193..43b7fec 100644
--- a/src/generated/resources/assets/amethystwings/models/entity/energetic_crystal.json
+++ b/src/generated/resources/assets/amethystwings/models/entity/energetic_crystal.json
@@ -1,6 +1,6 @@
 {
   "parent": "amethystwings:entity/crystal",
   "textures": {
-    "layer0": "amethystwings:entity/energetic_crystal"
+    "layer0": "amethystwings:block/energetic_crystal"
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/amethystwings/models/entity/hardened_crystal.json b/src/generated/resources/assets/amethystwings/models/entity/hardened_crystal.json
index 320bd34..4a779a4 100644
--- a/src/generated/resources/assets/amethystwings/models/entity/hardened_crystal.json
+++ b/src/generated/resources/assets/amethystwings/models/entity/hardened_crystal.json
@@ -1,6 +1,6 @@
 {
   "parent": "amethystwings:entity/crystal",
   "textures": {
-    "layer0": "amethystwings:entity/hardened_crystal"
+    "layer0": "amethystwings:block/hardened_crystal"
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/amethystwings/models/entity/resonant_crystal.json b/src/generated/resources/assets/amethystwings/models/entity/resonant_crystal.json
index 82238d7..74a42d3 100644
--- a/src/generated/resources/assets/amethystwings/models/entity/resonant_crystal.json
+++ b/src/generated/resources/assets/amethystwings/models/entity/resonant_crystal.json
@@ -1,6 +1,6 @@
 {
   "parent": "amethystwings:entity/crystal",
   "textures": {
-    "layer0": "amethystwings:entity/resonant_crystal"
+    "layer0": "amethystwings:block/resonant_crystal"
   }
 }
\ No newline at end of file
diff --git a/src/generated/resources/assets/amethystwings/models/entity/shaped_crystal.json b/src/generated/resources/assets/amethystwings/models/entity/shaped_crystal.json
index c2f7902..94354ca 100644
--- a/src/generated/resources/assets/amethystwings/models/entity/shaped_crystal.json
+++ b/src/generated/resources/assets/amethystwings/models/entity/shaped_crystal.json
@@ -1,6 +1,6 @@
 {
   "parent": "amethystwings:entity/crystal",
   "textures": {
-    "layer0": "amethystwings:entity/shaped_crystal"
+    "layer0": "amethystwings:block/shaped_crystal"
   }
 }
\ No newline at end of file
diff --git a/src/main/java/com/m_w_k/amethystwings/client/renderer/WingsItemStackRenderer.java b/src/main/java/com/m_w_k/amethystwings/client/renderer/WingsItemStackRenderer.java
index d813b8e..3afeb5d 100644
--- a/src/main/java/com/m_w_k/amethystwings/client/renderer/WingsItemStackRenderer.java
+++ b/src/main/java/com/m_w_k/amethystwings/client/renderer/WingsItemStackRenderer.java
@@ -14,9 +14,7 @@
 import net.minecraft.client.resources.model.BakedModel;
 import net.minecraft.client.resources.model.ModelResourceLocation;
 import net.minecraft.resources.ResourceLocation;
-import net.minecraft.util.Mth;
 import net.minecraft.world.entity.LivingEntity;
-import net.minecraft.world.entity.Pose;
 import net.minecraft.world.item.ItemDisplayContext;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.phys.Vec3;
@@ -33,7 +31,7 @@
 public class WingsItemStackRenderer extends BlockEntityWithoutLevelRenderer {
     public static final WingsModel WINGS_MODEL = new WingsModel(WingsModel.createLayer().bakeRoot());
     public static final ModelResourceLocation WINGS_INVENTORY_MODEL = new ModelResourceLocation(MODID, "wings_controller_inventory", "inventory");
-    public static final ResourceLocation WINGS_TEXTURE = new ResourceLocation(MODID, "textures/entity/wings_controller.png");
+    public static final ResourceLocation WINGS_TEXTURE = new ResourceLocation(MODID, "textures/block/wings_controller.png");
 
     private final static PoseStack ELYTRA_HELPER = new PoseStack();
     private final static ModelPart RIGHT_FAKE_WING = new ModelPart(null, null);
diff --git a/src/main/java/com/m_w_k/amethystwings/datagen/AmethystWingsModelProvider.java b/src/main/java/com/m_w_k/amethystwings/datagen/AmethystWingsModelProvider.java
index 42694d7..038aac6 100644
--- a/src/main/java/com/m_w_k/amethystwings/datagen/AmethystWingsModelProvider.java
+++ b/src/main/java/com/m_w_k/amethystwings/datagen/AmethystWingsModelProvider.java
@@ -26,15 +26,11 @@ protected static ResourceLocation rl(String loc) {
 
     @Override
     protected void registerModels() {
-        crystalModel(RESONANT);
-        crystalModel(HARDENED);
-        crystalModel(ENERGETIC);
-        crystalModel(SHAPED);
-        crystalModel(AURIC);
-    }
-
-    protected void crystalModel(ResourceLocation loc) {
-        crystalModel(loc, loc);
+        crystalModel(RESONANT, rl("block/resonant_crystal"));
+        crystalModel(HARDENED, rl("block/hardened_crystal"));
+        crystalModel(ENERGETIC, rl("block/energetic_crystal"));
+        crystalModel(SHAPED, rl("block/shaped_crystal"));
+        crystalModel(AURIC, rl("block/auric_crystal"));
     }
 
     protected void crystalModel(ResourceLocation destLoc, ResourceLocation texLoc) {
diff --git a/src/main/java/com/m_w_k/amethystwings/mixin/PlayerMixin.java b/src/main/java/com/m_w_k/amethystwings/mixin/PlayerMixin.java
index 3f28efe..05dc86c 100644
--- a/src/main/java/com/m_w_k/amethystwings/mixin/PlayerMixin.java
+++ b/src/main/java/com/m_w_k/amethystwings/mixin/PlayerMixin.java
@@ -8,9 +8,11 @@
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.Level;
+import org.jetbrains.annotations.NotNull;
 import org.objectweb.asm.Opcodes;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
@@ -22,19 +24,28 @@ private PlayerMixin(EntityType<? extends LivingEntity> p_20966_, Level p_20967_)
         super(p_20966_, p_20967_);
     }
 
-    @Shadow public abstract ItemStack getItemBySlot(EquipmentSlot p_36257_);
+    @Shadow public abstract @NotNull ItemStack getItemBySlot(@NotNull EquipmentSlot p_36257_);
 
     @Shadow public abstract void startFallFlying();
 
     @Inject(method = "tryToStartFallFlying", at = @At(value = "JUMP", opcode = Opcodes.IFEQ), cancellable = true)
     private void extendedElytraCheck(CallbackInfoReturnable<Boolean> cir) {
-        ItemStack itemStack = this.getItemBySlot(EquipmentSlot.OFFHAND);
+        if (amethystWings$tryFlyWithStack(EquipmentSlot.MAINHAND) ||
+                amethystWings$tryFlyWithStack(EquipmentSlot.OFFHAND)) {
+            cir.setReturnValue(true);
+        }
+    }
+
+    @Unique
+    private boolean amethystWings$tryFlyWithStack(EquipmentSlot slot) {
+        ItemStack itemStack = this.getItemBySlot(slot);
         if (itemStack.getItem() instanceof WingsItem item) {
             WingsCapability cap = item.getCapability(itemStack);
             if (cap.canElytra()) {
                 this.startFallFlying();
-                cir.setReturnValue(true);
+                return true;
             }
         }
+        return false;
     }
 }
diff --git a/src/main/resources/assets/amethystwings/models/item/wings_controller.json b/src/main/resources/assets/amethystwings/models/item/wings_controller.json
index 7960c6d..5fb5e81 100644
--- a/src/main/resources/assets/amethystwings/models/item/wings_controller.json
+++ b/src/main/resources/assets/amethystwings/models/item/wings_controller.json
@@ -1,3 +1,4 @@
 {
-  "parent": "builtin/entity"
+  "parent": "builtin/entity",
+  "gui_light": "front"
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/amethystwings/textures/entity/auric_crystal.png b/src/main/resources/assets/amethystwings/textures/block/auric_crystal.png
similarity index 100%
rename from src/main/resources/assets/amethystwings/textures/entity/auric_crystal.png
rename to src/main/resources/assets/amethystwings/textures/block/auric_crystal.png
diff --git a/src/main/resources/assets/amethystwings/textures/entity/auric_crystal.png.mcmeta b/src/main/resources/assets/amethystwings/textures/block/auric_crystal.png.mcmeta
similarity index 100%
rename from src/main/resources/assets/amethystwings/textures/entity/auric_crystal.png.mcmeta
rename to src/main/resources/assets/amethystwings/textures/block/auric_crystal.png.mcmeta
diff --git a/src/main/resources/assets/amethystwings/textures/entity/energetic_crystal.png b/src/main/resources/assets/amethystwings/textures/block/energetic_crystal.png
similarity index 100%
rename from src/main/resources/assets/amethystwings/textures/entity/energetic_crystal.png
rename to src/main/resources/assets/amethystwings/textures/block/energetic_crystal.png
diff --git a/src/main/resources/assets/amethystwings/textures/entity/energetic_crystal.png.mcmeta b/src/main/resources/assets/amethystwings/textures/block/energetic_crystal.png.mcmeta
similarity index 100%
rename from src/main/resources/assets/amethystwings/textures/entity/energetic_crystal.png.mcmeta
rename to src/main/resources/assets/amethystwings/textures/block/energetic_crystal.png.mcmeta
diff --git a/src/main/resources/assets/amethystwings/textures/entity/hardened_crystal.png b/src/main/resources/assets/amethystwings/textures/block/hardened_crystal.png
similarity index 100%
rename from src/main/resources/assets/amethystwings/textures/entity/hardened_crystal.png
rename to src/main/resources/assets/amethystwings/textures/block/hardened_crystal.png
diff --git a/src/main/resources/assets/amethystwings/textures/entity/resonant_crystal.png b/src/main/resources/assets/amethystwings/textures/block/resonant_crystal.png
similarity index 100%
rename from src/main/resources/assets/amethystwings/textures/entity/resonant_crystal.png
rename to src/main/resources/assets/amethystwings/textures/block/resonant_crystal.png
diff --git a/src/main/resources/assets/amethystwings/textures/entity/resonant_crystal.png.mcmeta b/src/main/resources/assets/amethystwings/textures/block/resonant_crystal.png.mcmeta
similarity index 100%
rename from src/main/resources/assets/amethystwings/textures/entity/resonant_crystal.png.mcmeta
rename to src/main/resources/assets/amethystwings/textures/block/resonant_crystal.png.mcmeta
diff --git a/src/main/resources/assets/amethystwings/textures/entity/shaped_crystal.png b/src/main/resources/assets/amethystwings/textures/block/shaped_crystal.png
similarity index 100%
rename from src/main/resources/assets/amethystwings/textures/entity/shaped_crystal.png
rename to src/main/resources/assets/amethystwings/textures/block/shaped_crystal.png
diff --git a/src/main/resources/assets/amethystwings/textures/entity/wings_controller.png b/src/main/resources/assets/amethystwings/textures/block/wings_controller.png
similarity index 100%
rename from src/main/resources/assets/amethystwings/textures/entity/wings_controller.png
rename to src/main/resources/assets/amethystwings/textures/block/wings_controller.png
diff --git a/src/main/resources/assets/amethystwings/textures/item/wings_controller.png b/src/main/resources/assets/amethystwings/textures/item/wings_controller.png
index 83a619774068d00878145ace650480eddb986f77..392819fcd50b5ee8c3c8329f71b95081d7eb05f1 100644
GIT binary patch
delta 371
zcmV-(0gV3p1DgYoF@IG_L_t(IPnDC)PQp+ShNm2{7aJt-0s;!L5@MpM2@75Ls&4cp
z+;!2FF-S;ESa=~SVp?d@76`}8F{f!chpMw{JO4NTT&lny!nV5<(_Gh4*3*R-JmLJ}
zl8JakVVDo#RWw~sM4#hvrl4t>0)#m@IX$DKKv;4R1VU3N#DCbU)#2v)D&sl<D4>An
zc@RY*luEnM@84%Yw%yGKEanRcqY&t71(iybiCx!8APA5Rk~wI%kLhx`fC3>fkK<gx
zdK<zPtfLOqG#$1G$vD75vNoguOg49Z2KQSV{|4Ze((9BSQnPtTb=?3}Rha|J>SQ)j
zE?2>EZkbjJz-&28eV?r}9kbaKYV`)-Rq~Ap0De@X(JKS^z6Xu{1L3${o}XYid{j09
zP?0`seExWUgTdfIyu>sf9mG)#hG8(k*JJ{{-rdHZPWqwMvS_imoh#%;zX2iRkr6+r
RQr-Xn002ovPDHLkV1lazsLKEV

delta 468
zcmV;_0W1ES1N#GzF@Lp5L_t(IPo+~$t3go|UDszAGc=K06WxJ<A`EcDz;8703&=o7
zi40{RDWw?s7$^zhy!Nhhy7yu5dS`NLpS{;vYwdM4{PSpXUe|S@X&M5703MGArqijq
zOD2=zd_LoTzr*cz!|U~8Hk<LiYDy#$A{-85KA&@w&*#JSdVhrkJsb{jI2=f)(-@D(
zSglrefJh`Fve_&qlL-oi0t2{QE+#01;Md#jHbS8gPN$P%s2CWAA!vZ;=W;nbpHFx^
z9%euQ^zHR}3`ooti-nzm^n#>hG8t}`GU)Y6rGjp^s|IDiVjv47rCctf)9GNjTyi-c
zkArIce&1%U&3{A*KvIguB8I~u`$5Mr4Ag2h)a!Mu*K6COZwzRirBVrl!GKo90J^Tj
zG)=TxE#>}K3B(|u&!gFFQnO+}H3GHf<D-OFEGDYeD(k)7ZX7Ji0GUWN>HZr78YI^*
zmkZOSLy2=bo$&kp*zI;0jYgaeYf_a5sZ>e?gF)=~dreTFD0MVQ0JQhl>xD+6!9hA6
zkMBv8QQmI1in=xbG855g6r0WFa}uqZf3J(omG=bvHHm-yyMF*-N9Ykf<{XIt0000<
KMNUMnLSTaXE84FB

diff --git a/src/main/resources/assets/minecraft/atlases/blocks.json b/src/main/resources/assets/minecraft/atlases/blocks.json
deleted file mode 100644
index 1d6cbfe..0000000
--- a/src/main/resources/assets/minecraft/atlases/blocks.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    "sources": [
-        {
-            "type": "directory",
-            "namespace": "amethystwings",
-            "source": "entity",
-            "prefix": "entity/"
-        }
-    ]
-}