From c1d10d12ce72f0bdf16ac0a10f34391103d95e16 Mon Sep 17 00:00:00 2001
From: Mrbysco <Mrbysco@users.noreply.github.com>
Date: Fri, 29 Nov 2024 22:14:07 +0100
Subject: [PATCH 1/3] Add off-hand slot to Energizer/Enervator (See #1456 )

---
 CHANGELOG.md                                  |   1 +
 .../mod/inventory/ContainerEnergizer.java     |  19 ++++++++++++++++--
 .../mod/inventory/ContainerEnervator.java     |  14 +++++++++++++
 .../textures/gui/gui_energizer.png            | Bin 1831 -> 903 bytes
 4 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7305cd1ac..f9483b88a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@
 * Added the ability for fluid collectors to collect water and lava from filled cauldrons.
 * Explicitly made the Drills unbreakable.
 * Fixed worldgenned AA plants breaking on block update.
+* Add off-hand slot to Energizer/Enervator
 
 # 1.3.10+mc1.21.1
 * Fixed Fluid placer not being harvestable.
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerEnergizer.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerEnergizer.java
index dd042f29c..05a98441e 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerEnergizer.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerEnergizer.java
@@ -10,6 +10,7 @@
 
 package de.ellpeck.actuallyadditions.mod.inventory;
 
+import com.mojang.datafixers.util.Pair;
 import de.ellpeck.actuallyadditions.mod.inventory.slot.ArmorSlot;
 import de.ellpeck.actuallyadditions.mod.inventory.slot.SlotItemHandlerUnconditioned;
 import de.ellpeck.actuallyadditions.mod.inventory.slot.SlotOutput;
@@ -25,6 +26,7 @@ import net.minecraft.world.inventory.Slot;
 import net.minecraft.world.item.ItemStack;
 import net.neoforged.neoforge.capabilities.Capabilities;
 
+import java.util.Map;
 import java.util.Objects;
 
 public class ContainerEnergizer extends AbstractContainerMenu {
@@ -59,9 +61,22 @@ public class ContainerEnergizer extends AbstractContainerMenu {
 
         for (int k = 0; k < 4; ++k) {
             EquipmentSlot slot = VALID_EQUIPMENT_SLOTS[k];
-            ResourceLocation resourcelocation = InventoryMenu.TEXTURE_EMPTY_SLOTS.get(slot);
-            this.addSlot(new ArmorSlot(inventory, slot, 36 + 3 - k, 102, 19 + k * 18, resourcelocation));
+            ResourceLocation resourcelocation = InventoryMenu.TEXTURE_EMPTY_SLOTS.getOrDefault(slot, InventoryMenu.EMPTY_ARMOR_SLOT_SHIELD);
+            this.addSlot(new ArmorSlot(inventory, slot, 36 + 3 - k, 102, 19 + k * 18, resourcelocation) {});
         }
+
+        this.addSlot(new Slot(inventory, 40, 120, 19 + 3 * 18) {
+            @Override
+            public void setByPlayer(ItemStack newStack, ItemStack oldStack) {
+                inventory.player.onEquipItem(EquipmentSlot.OFFHAND, oldStack, newStack);
+                super.setByPlayer(newStack, oldStack);
+            }
+
+            @Override
+            public Pair<ResourceLocation, ResourceLocation> getNoItemIcon() {
+                return Pair.of(InventoryMenu.BLOCK_ATLAS, InventoryMenu.EMPTY_ARMOR_SLOT_SHIELD);
+            }
+        });
     }
 
     @Override
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerEnervator.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerEnervator.java
index 8aef02190..81bdd5511 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerEnervator.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerEnervator.java
@@ -10,6 +10,7 @@
 
 package de.ellpeck.actuallyadditions.mod.inventory;
 
+import com.mojang.datafixers.util.Pair;
 import de.ellpeck.actuallyadditions.mod.inventory.slot.ArmorSlot;
 import de.ellpeck.actuallyadditions.mod.inventory.slot.SlotItemHandlerUnconditioned;
 import de.ellpeck.actuallyadditions.mod.inventory.slot.SlotOutput;
@@ -57,6 +58,19 @@ public class ContainerEnervator extends AbstractContainerMenu {
             ResourceLocation resourcelocation = InventoryMenu.TEXTURE_EMPTY_SLOTS.get(slot);
             this.addSlot(new ArmorSlot(inventory, slot, 36 + 3 - k, 102, 19 + k * 18, resourcelocation));
         }
+
+        this.addSlot(new Slot(inventory, 40, 120, 19 + 3 * 18) {
+            @Override
+            public void setByPlayer(ItemStack newStack, ItemStack oldStack) {
+                inventory.player.onEquipItem(EquipmentSlot.OFFHAND, oldStack, newStack);
+                super.setByPlayer(newStack, oldStack);
+            }
+
+            @Override
+            public Pair<ResourceLocation, ResourceLocation> getNoItemIcon() {
+                return Pair.of(InventoryMenu.BLOCK_ATLAS, InventoryMenu.EMPTY_ARMOR_SLOT_SHIELD);
+            }
+        });
     }
 
     @Nonnull
diff --git a/src/main/resources/assets/actuallyadditions/textures/gui/gui_energizer.png b/src/main/resources/assets/actuallyadditions/textures/gui/gui_energizer.png
index 238b0c4af6267d95e8ac1cf1943e221227c54575..59f8bfc550926d31ba45d1e9e330e3472cd81c20 100644
GIT binary patch
literal 903
zcmeAS@N?(olHy`uVBq!ia0y~yU<5K5893O0R7}x|G$6&2?&#~tz_78e=6B#^1_ow3
zPZ!6KiaBrZzRq3jAklWQKcn00iCKn<Q0)$Z%WZEr-H4A&)j!qb!*IU(-2Ve7zS%so
zdb!H>@;&B^nC;&gBK))CpPBeR`(OTQ*Sb}E@B6NqzL$N2(&T#P?YGyS3Jf!j()yXt
zxa0nNYrdti&p+>6wMuWgcWCtf`5wBmjDM0o9k%ghW0>L2pfH2M!GN(Lfr;TD3qunp
z1B);NhZ=)`53)qv8(W5d-~Rpk_rdJfzV(-1ZaI{ZF_S?i<o<X5zkdyQ;<}&hpTk7Z
z6lCMiR57q$`CiL=c*A!C4h05wlfLBM$3HHZt>HK#!&DFu#*)OnjuB>J40FVRqPtt%
z7{rPS`=(j2;&-eKSB(Quzcy0=lnRKmf}7^YC{|F|ca7r!)AGwFD@}b1xi&0%{Wa?P
z>(cj$2XdG;Ogb+d&r%`Aw4tfqw?goNB*%f~eY0LD9k{rY<Hv&Y{<mv=D*PXO)RBR^
z4eqIDW)Hfq?fUzCsq!`@2JW1%?+;#&5`1wnw<hO!G4ETUhSqISE7N=b_B_r=RowSP
z3O$@>WcEfk6qw{OpZoISt%-$_J17d$q}mQX-f7~_khbgo`>(%#?fPzz5Q-L2Z$39W
zT+UluAr!s#%I0fzW)kn?_Rq{){@3jJ<K{WbR`&kP|Je2Z`?qh~UjN&@ZnaQj=$<Jj
z&pTDup93Wm!Pi>5ekn6l*YEsb4@)Ccl|e~&aDxT5_KdQOE8K7J@B0aIsi&)-%Q~lo
FCICyOC}#iw

literal 1831
zcmeAS@N?(olHy`uVBq!ia0y~yU<5K5893O0R7}x|G$6&2?&#~tz_78O`%fY(kk47*
z5n0T@z_$T}8U0TGwF3%Dl(<He1m~xflqVLYG880c=9TE>rIsj|=o#o)<`~!cF)*+#
z^>lFzsfc@fBd|#3BrmJOT`%>ED@*iay^l%caVJeVe01)ylIF>hANP6ic5c^LQ?|d>
zaewMe{g>b0-%obh|6=A;ck{@L*FQ<*dc6>p{k;FrudlDY<r*b&eSqBmA0sM$PL{W?
z`(xcdZ_~Q<ivI%pIrlDlyrqiay&U_4Ul+8k{8qDncvr}<j(@NTPyY1x_xI(WKR-Xe
z-|jNw4!bX1eZjGRIxXcs82`M{%v?|l^xyJbKZGAMyy-SP-V%4Qa8<XxA>V<062%~|
z4@Ift%ynUZeW3AD`ceJaNArgC&lXBwjb$5NJFkCXarNl@8IKw5C->W0FkEjZ&CBV}
zJ{rtF`?zqO-R@^U_N9N?$PTyYywCB&F-IA1h$r`fQb&mR|1%a0--QPYZ_g_Rnfu?@
z{F=#k;OoNhk~yy)&7T?mkN3e%8<gNWf9B(cc_+`kzy7gU1{PfQ#(W3<9+{Es1P(lO
z-tog#*IsSTmT9Opd^Q7=7l2`Y3^^F4TFTvjl|8?cd4v8j8R06|<16+4t^V|paoxUj
zbL5n^{=_RryG_6D&9z|oopi<!;>hy!uRpTF>Yx2b30Z7LY8Tt=yL#PDm^~rB$5IWF
z(8Hfq)T~}#tA=9DnU6oh;(z-fJ2-yk<Bx0ieVd7F^M0e_kE3hf8W%ErI|}oAeQMwF
z?Z0lNKSIeaXesXenaB6foPYLlNBI2M&A*E0pFKYRF++?z#N#t9<*pgu{Q1|at`DC3
z(vLCjm=DizWb>YW)R1lX-3iOa^<iQCZ|0{w|6Yvb0ekJ$?%(`3eg18U6vp$X9)7j4
zR*ir4`Sr-2wKx7Jk0;*or3q|uMdinfdd@D?`v(ew&0+InFMlkylWBPQb3M@O?{w<+
zuV1LQ_s`t*k2bE~xsC6D<fHQ6Qeocu_0P2{&V0Oa`@hcn8Fxbe<ki>2NKD+l^xt!z
vAFn6gwLEY#jQ{OAP|Y%^!H=H&`~O&1EIR#-_lwY7kW)Qf{an^LB{Ts5f^tkU


From 19a060b372013dfce4a7acc654aefde0d89da0c4 Mon Sep 17 00:00:00 2001
From: Mrbysco <Mrbysco@users.noreply.github.com>
Date: Sat, 30 Nov 2024 16:01:59 +0100
Subject: [PATCH 2/3] Update structure

---
 .../20d9b6419a057e67e5bca6ce3a3de93ccc3382bf  |   3 +--
 .../structure/andrew_period_house.nbt         | Bin 6447 -> 6530 bytes
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/generated/resources/.cache/20d9b6419a057e67e5bca6ce3a3de93ccc3382bf b/src/generated/resources/.cache/20d9b6419a057e67e5bca6ce3a3de93ccc3382bf
index 02fadae59..69a7be884 100644
--- a/src/generated/resources/.cache/20d9b6419a057e67e5bca6ce3a3de93ccc3382bf
+++ b/src/generated/resources/.cache/20d9b6419a057e67e5bca6ce3a3de93ccc3382bf
@@ -1,2 +1 @@
-// 1.21.1	2024-11-28T16:44:16.4503165	Update structure files in /structure/
-be1261b16ca6da9123934a123abb191d64ed46b8 data/actuallyadditions/structure/andrew_period_house.nbt
+// 1.21.1	2024-11-30T16:01:44.9441801	Update structure files in /structure/
diff --git a/src/main/resources/data/actuallyadditions/structure/andrew_period_house.nbt b/src/main/resources/data/actuallyadditions/structure/andrew_period_house.nbt
index 48b6a58d923cb739434252a2306b89e9c855da35..6d27ec927c153bdcd4cbcb253449733257ccd574 100644
GIT binary patch
literal 6530
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
LDEkNArcM6?>R|3u

literal 6447
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
PeQj?xO-|x{_0|6XX*Rws


From fc63fa00c807076b742b567fbef5d50034653ddb Mon Sep 17 00:00:00 2001
From: Mrbysco <Mrbysco@users.noreply.github.com>
Date: Sat, 30 Nov 2024 16:06:49 +0100
Subject: [PATCH 3/3] Fix recipe confict (Closes #1465)

---
 .../.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e       | 8 ++++----
 .../data/actuallyadditions/recipe/black_quartz_slab.json  | 2 +-
 .../data/actuallyadditions/recipe/black_quartz_stair.json | 2 +-
 .../data/actuallyadditions/recipe/black_quartz_wall.json  | 2 +-
 .../actuallyadditions/data/BlockRecipeGenerator.java      | 6 +++---
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e b/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e
index 82b74fa91..70d962a9c 100644
--- a/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e
+++ b/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e
@@ -1,4 +1,4 @@
-// 1.21.1	2024-11-17T13:53:47.3759486	Recipes
+// 1.21.1	2024-11-30T16:05:55.0827347	Recipes
 b44fee42c2b2b3f56256fe76b2d9f529dc87350a data/actuallyadditions/recipe/atomic_reconstructor.json
 b1c937b75ba7f8e02dfac4db5253271f2de502e5 data/actuallyadditions/recipe/battery_box.json
 660b96730a8ef88b4b44e4ce67fde0945c13ae7f data/actuallyadditions/recipe/bio_reactor.json
@@ -10,9 +10,9 @@ bc3771d03192825636fb2d1037b902f5c39e97f8 data/actuallyadditions/recipe/black_qua
 3d658c921ea08a80509f5e899c310d84af825854 data/actuallyadditions/recipe/black_quartz_pillar_slab.json
 72316aa353fa29f5d0eb5e74849e94ff68ac3ee8 data/actuallyadditions/recipe/black_quartz_pillar_stair.json
 93052b0c0fdf1aa83a5a0b26037a008aefc3ba80 data/actuallyadditions/recipe/black_quartz_pillar_wall.json
-e9fad26d1fbcb1acf6f5bd711e890787dae636b1 data/actuallyadditions/recipe/black_quartz_slab.json
-393c8837e266d33037e02d6704564e2867e89c5b data/actuallyadditions/recipe/black_quartz_stair.json
-24f80731fdcb2f950f28949e9c3dbfcd1ec83278 data/actuallyadditions/recipe/black_quartz_wall.json
+faee252ef06044ffbef63886eba7bf1f3129cb4a data/actuallyadditions/recipe/black_quartz_slab.json
+7cfdb8371ff8e65b594664d9da40124c5e6ee5e3 data/actuallyadditions/recipe/black_quartz_stair.json
+18fb02ad6a38943b94bca71e9e5e948a80bd1aa3 data/actuallyadditions/recipe/black_quartz_wall.json
 bc5c51e659c0b493098b7919740fc6419efb94d9 data/actuallyadditions/recipe/breaker.json
 48a5893a0109e467dca8343ee6d4334095e6d118 data/actuallyadditions/recipe/canola_press.json
 d46bb9d164ab5fcd00acb4f97f77f18245780243 data/actuallyadditions/recipe/chiseled_black_quartz_block.json
diff --git a/src/generated/resources/data/actuallyadditions/recipe/black_quartz_slab.json b/src/generated/resources/data/actuallyadditions/recipe/black_quartz_slab.json
index 29bd382b1..bbe837779 100644
--- a/src/generated/resources/data/actuallyadditions/recipe/black_quartz_slab.json
+++ b/src/generated/resources/data/actuallyadditions/recipe/black_quartz_slab.json
@@ -3,7 +3,7 @@
   "category": "misc",
   "key": {
     "Q": {
-      "item": "actuallyadditions:black_quartz_pillar_block"
+      "item": "actuallyadditions:black_quartz_block"
     }
   },
   "pattern": [
diff --git a/src/generated/resources/data/actuallyadditions/recipe/black_quartz_stair.json b/src/generated/resources/data/actuallyadditions/recipe/black_quartz_stair.json
index 3895816a8..041b6eaa4 100644
--- a/src/generated/resources/data/actuallyadditions/recipe/black_quartz_stair.json
+++ b/src/generated/resources/data/actuallyadditions/recipe/black_quartz_stair.json
@@ -3,7 +3,7 @@
   "category": "misc",
   "key": {
     "Q": {
-      "item": "actuallyadditions:black_quartz_pillar_block"
+      "item": "actuallyadditions:black_quartz_block"
     }
   },
   "pattern": [
diff --git a/src/generated/resources/data/actuallyadditions/recipe/black_quartz_wall.json b/src/generated/resources/data/actuallyadditions/recipe/black_quartz_wall.json
index 19bce1c4c..1c6da2f13 100644
--- a/src/generated/resources/data/actuallyadditions/recipe/black_quartz_wall.json
+++ b/src/generated/resources/data/actuallyadditions/recipe/black_quartz_wall.json
@@ -3,7 +3,7 @@
   "category": "misc",
   "key": {
     "Q": {
-      "item": "actuallyadditions:black_quartz_pillar_block"
+      "item": "actuallyadditions:black_quartz_block"
     }
   },
   "pattern": [
diff --git a/src/main/java/de/ellpeck/actuallyadditions/data/BlockRecipeGenerator.java b/src/main/java/de/ellpeck/actuallyadditions/data/BlockRecipeGenerator.java
index a63d89dba..8fb76a787 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/data/BlockRecipeGenerator.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/data/BlockRecipeGenerator.java
@@ -101,13 +101,13 @@ public class BlockRecipeGenerator extends RecipeProvider {
             .save(recipeOutput);
 
         //Black Quartz Wall
-        Recipe.wall(ActuallyBlocks.BLACK_QUARTZ_WALL.getItem(), ActuallyBlocks.BLACK_QUARTZ_PILLAR.get(), recipeOutput);
+        Recipe.wall(ActuallyBlocks.BLACK_QUARTZ_WALL.getItem(), ActuallyBlocks.BLACK_QUARTZ.get(), recipeOutput);
 
         //Black Quartz Slab
-        Recipe.slab(ActuallyBlocks.BLACK_QUARTZ_SLAB.getItem(), ActuallyBlocks.BLACK_QUARTZ_PILLAR.get(), recipeOutput);
+        Recipe.slab(ActuallyBlocks.BLACK_QUARTZ_SLAB.getItem(), ActuallyBlocks.BLACK_QUARTZ.get(), recipeOutput);
 
         //Black Quartz Stairs
-        Recipe.stairs(ActuallyBlocks.BLACK_QUARTZ_STAIR.getItem(), ActuallyBlocks.BLACK_QUARTZ_PILLAR.get(), recipeOutput);
+        Recipe.stairs(ActuallyBlocks.BLACK_QUARTZ_STAIR.getItem(), ActuallyBlocks.BLACK_QUARTZ.get(), recipeOutput);
 
         //Smooth Black Quartz Wall
         Recipe.wall(ActuallyBlocks.SMOOTH_BLACK_QUARTZ_WALL.getItem(), ActuallyBlocks.SMOOTH_BLACK_QUARTZ.get(), recipeOutput);