From 680678b5b2745ae8f0be7c1c6ea45e148d283074 Mon Sep 17 00:00:00 2001 From: Boblet Date: Mon, 19 Aug 2024 16:38:29 +0200 Subject: [PATCH] :b:attery --- changelog | 17 ++------------ .../java/com/hbm/handler/ArmorModHandler.java | 7 ++++-- .../container/ContainerArmorTable.java | 21 +++++++++--------- .../com/hbm/inventory/gui/GUIArmorTable.java | 11 ++++----- .../com/hbm/items/armor/ItemArmorMod.java | 1 + .../com/hbm/items/armor/ItemModBattery.java | 13 +++++++++++ .../java/com/hbm/main/CraftingManager.java | 4 ++-- .../gui/machine/gui_armor_modifier.png | Bin 3019 -> 3083 bytes .../textures/items/arc_electrode_burnt.png | Bin 447 -> 0 bytes .../hbm/textures/items/arc_electrode_desh.png | Bin 537 -> 0 bytes .../textures/items/ingot_beskar_double.png | Bin 0 -> 276 bytes .../textures/items/ingot_beskar_single.png | Bin 0 -> 231 bytes 12 files changed, 40 insertions(+), 34 deletions(-) create mode 100644 src/main/java/com/hbm/items/armor/ItemModBattery.java delete mode 100644 src/main/resources/assets/hbm/textures/items/arc_electrode_burnt.png delete mode 100644 src/main/resources/assets/hbm/textures/items/arc_electrode_desh.png create mode 100644 src/main/resources/assets/hbm/textures/items/ingot_beskar_double.png create mode 100644 src/main/resources/assets/hbm/textures/items/ingot_beskar_single.png diff --git a/changelog b/changelog index b99450d57..a3f93e205 100644 --- a/changelog +++ b/changelog @@ -1,16 +1,3 @@ -## Changed -* To address certain balancing concerns, the RF to HE conversion rate is now 2:5. The HE to RF rate however is still 5:1 - * Because of this, using chains of converters as batteries becomes exponentially lossy with size, therefore the input decay has been removed - * Input decay can still be configured if desired - * No input decay also means that converters are no longer infinite energy sinks -* Power converter recipes have been updated -* Soldering stations will no longer work if the recipe requires no input fluid while fluid is present - * While this does complicate using the soldering station manually, as switching from milgrade to standard ICs requires emptying the solderer with a siphon, it does make automating easier, since soldering stations will no longer treat incomplete milgrade circuits as ICs -* Cement is now edible -* Derricks have been remodeled, the port configuration has changed so existing derricks need to be replaced -* Derricks no longer spawn oil spills -* Metal deco blocks are now crafted in batches of 4, as well as recycled in batches of 4. Each block is therefore still worth 25% of an ingot, but recycling your own deco blocks is no longer lossy - ## Fixed -* Fixed some machines not sending fluid gauge syncs properly -* Fixed refinery GUI crashing when invalid input is used \ No newline at end of file +* Fixed pumpjack gauges not syncing properly +* Fixed some concrete variants not being revertable into uncolored concrete \ No newline at end of file diff --git a/src/main/java/com/hbm/handler/ArmorModHandler.java b/src/main/java/com/hbm/handler/ArmorModHandler.java index 9beabfb46..f7b8780ca 100644 --- a/src/main/java/com/hbm/handler/ArmorModHandler.java +++ b/src/main/java/com/hbm/handler/ArmorModHandler.java @@ -18,6 +18,9 @@ public class ArmorModHandler { public static final int cladding = 5; public static final int kevlar = 6; public static final int extra = 7; + public static final int battery = 8; + + public static final int MOD_SLOTS = 9; public static final UUID[] UUIDs = new UUID[] { UUID.fromString("8d6e5c77-133e-4056-9c80-a9e42a1a0b65"), @@ -146,7 +149,7 @@ public class ArmorModHandler { public static ItemStack[] pryMods(ItemStack armor) { - ItemStack[] slots = new ItemStack[8]; + ItemStack[] slots = new ItemStack[MOD_SLOTS]; if(!hasMods(armor)) return slots; @@ -154,7 +157,7 @@ public class ArmorModHandler { NBTTagCompound nbt = armor.getTagCompound(); NBTTagCompound mods = nbt.getCompoundTag(MOD_COMPOUND_KEY); - for(int i = 0; i < 8; i++) { + for(int i = 0; i < MOD_SLOTS; i++) { NBTTagCompound cmp = mods.getCompoundTag(MOD_SLOT_KEY + i); diff --git a/src/main/java/com/hbm/inventory/container/ContainerArmorTable.java b/src/main/java/com/hbm/inventory/container/ContainerArmorTable.java index f8da90d3d..d63fcad3b 100644 --- a/src/main/java/com/hbm/inventory/container/ContainerArmorTable.java +++ b/src/main/java/com/hbm/inventory/container/ContainerArmorTable.java @@ -19,20 +19,21 @@ import net.minecraft.util.IIcon; public class ContainerArmorTable extends Container { - public InventoryBasic upgrades = new InventoryBasic("Upgrades", false, 8); + public InventoryBasic upgrades = new InventoryBasic("Upgrades", false, ArmorModHandler.MOD_SLOTS); public IInventory armor = new InventoryCraftResult(); public ContainerArmorTable(InventoryPlayer inventory) { EntityPlayer player = inventory.player; this.addSlotToContainer(new UpgradeSlot(upgrades, ArmorModHandler.helmet_only, 26 + 22, 27)); // helmet only - this.addSlotToContainer(new UpgradeSlot(upgrades, ArmorModHandler.plate_only, 62 + 22, 27)); // chestplate only + this.addSlotToContainer(new UpgradeSlot(upgrades, ArmorModHandler.plate_only, 62 + 22, 27)); // chestplate only this.addSlotToContainer(new UpgradeSlot(upgrades, ArmorModHandler.legs_only, 98 + 22, 27)); // leggins only this.addSlotToContainer(new UpgradeSlot(upgrades, ArmorModHandler.boots_only, 134 + 22, 45)); // boots only this.addSlotToContainer(new UpgradeSlot(upgrades, ArmorModHandler.servos, 134 + 22, 81)); //servos/frame this.addSlotToContainer(new UpgradeSlot(upgrades, ArmorModHandler.cladding, 98 + 22, 99)); //radiation cladding - this.addSlotToContainer(new UpgradeSlot(upgrades, ArmorModHandler.kevlar, 62 + 22, 99)); //kevlar/sapi/(ERA? :) ) + this.addSlotToContainer(new UpgradeSlot(upgrades, ArmorModHandler.kevlar, 62 + 22, 99)); //kevlar/sapi/(ERA? :) ) this.addSlotToContainer(new UpgradeSlot(upgrades, ArmorModHandler.extra, 26 + 22, 99)); //special parts + this.addSlotToContainer(new UpgradeSlot(upgrades, ArmorModHandler.battery, 8 + 22, 63)); //special parts this.addSlotToContainer(new Slot(armor, 0, 44 + 22, 63) { @@ -48,7 +49,7 @@ public class ContainerArmorTable extends Container { if(stack != null) { ItemStack[] mods = ArmorModHandler.pryMods(stack); - for(int i = 0; i < 8; i++) { + for(int i = 0; i < ArmorModHandler.MOD_SLOTS; i++) { if(mods != null) upgrades.setInventorySlotContents(i, mods[i]); @@ -65,7 +66,7 @@ public class ContainerArmorTable extends Container { //if the armor piece is taken, absorb all armor pieces - for(int i = 0; i < 8; i++) { + for(int i = 0; i < ArmorModHandler.MOD_SLOTS; i++) { ItemStack mod = upgrades.getStackInSlot(i); @@ -126,19 +127,19 @@ public class ContainerArmorTable extends Container { ItemStack var5 = var4.getStack(); var3 = var5.copy(); - if(par2 <= 8) { - if(par2 != 8 || !InventoryUtil.mergeItemStack(this.inventorySlots, var5, 9, 13, false)) - if(!this.mergeItemStack(var5, 13, this.inventorySlots.size(), true)) + if(par2 <= ArmorModHandler.MOD_SLOTS) { + if(par2 != ArmorModHandler.MOD_SLOTS || !InventoryUtil.mergeItemStack(this.inventorySlots, var5, ArmorModHandler.MOD_SLOTS + 1, ArmorModHandler.MOD_SLOTS + 5, false)) + if(!this.mergeItemStack(var5, ArmorModHandler.MOD_SLOTS + 5, this.inventorySlots.size(), true)) return null; var4.onPickupFromSlot(p_82846_1_, var5); } else { if(var5.getItem() instanceof ItemArmor) { - if(!this.mergeItemStack(var5, 8, 9, false)) + if(!this.mergeItemStack(var5, ArmorModHandler.MOD_SLOTS, ArmorModHandler.MOD_SLOTS + 1, false)) return null; - } else if(this.inventorySlots.get(8) != null && var5.getItem() instanceof ItemArmorMod) { + } else if(this.inventorySlots.get(ArmorModHandler.MOD_SLOTS) != null && var5.getItem() instanceof ItemArmorMod) { ItemArmorMod mod = (ItemArmorMod)var5.getItem(); int slot = mod.type; diff --git a/src/main/java/com/hbm/inventory/gui/GUIArmorTable.java b/src/main/java/com/hbm/inventory/gui/GUIArmorTable.java index e255586cf..250b9711f 100644 --- a/src/main/java/com/hbm/inventory/gui/GUIArmorTable.java +++ b/src/main/java/com/hbm/inventory/gui/GUIArmorTable.java @@ -46,15 +46,16 @@ public class GUIArmorTable extends GuiInfoContainer { "armorMod.type.cladding", "armorMod.type.insert", "armorMod.type.special", + "armorMod.type.battery", "armorMod.insertHere" }; - for(int i = 0; i < 9; ++i) { + for(int i = 0; i < ArmorModHandler.MOD_SLOTS + 1; ++i) { Slot slot = (Slot) this.inventorySlots.inventorySlots.get(i); if(this.isMouseOverSlot(slot, x, y) && !slot.getHasStack()) { - this.drawCreativeTabHoveringText((i < 8 ? EnumChatFormatting.LIGHT_PURPLE : EnumChatFormatting.YELLOW) + I18nUtil.resolveKey(unloc[i]), x, y); + this.drawCreativeTabHoveringText((i < ArmorModHandler.MOD_SLOTS ? EnumChatFormatting.LIGHT_PURPLE : EnumChatFormatting.YELLOW) + I18nUtil.resolveKey(unloc[i]), x, y); } } } @@ -75,7 +76,7 @@ public class GUIArmorTable extends GuiInfoContainer { this.drawTexturedModalRect(guiLeft + 22, guiTop, 0, 0, this.xSize - 22, this.ySize); this.drawTexturedModalRect(guiLeft, guiTop + 31, 176, 96, 22, 100); - ItemStack armor = this.inventorySlots.getSlot(8).getStack(); + ItemStack armor = this.inventorySlots.getSlot(ArmorModHandler.MOD_SLOTS).getStack(); if(armor != null) { @@ -89,7 +90,7 @@ public class GUIArmorTable extends GuiInfoContainer { this.drawTexturedModalRect(guiLeft + 41 + 22, guiTop + 60, 176, 52, 22, 22); } - for(int i = 0; i < 8; i++) { + for(int i = 0; i < ArmorModHandler.MOD_SLOTS; i++) { Slot slot = this.inventorySlots.getSlot(i); drawIndicator(i, slot.xDisplayPosition - 1, slot.yDisplayPosition - 1); } @@ -98,7 +99,7 @@ public class GUIArmorTable extends GuiInfoContainer { private void drawIndicator(int index, int x, int y) { ItemStack mod = this.inventorySlots.getSlot(index).getStack(); - ItemStack armor = this.inventorySlots.getSlot(8).getStack(); + ItemStack armor = this.inventorySlots.getSlot(ArmorModHandler.MOD_SLOTS).getStack(); if(mod == null) return; diff --git a/src/main/java/com/hbm/items/armor/ItemArmorMod.java b/src/main/java/com/hbm/items/armor/ItemArmorMod.java index 505028648..cc6666e4f 100644 --- a/src/main/java/com/hbm/items/armor/ItemArmorMod.java +++ b/src/main/java/com/hbm/items/armor/ItemArmorMod.java @@ -64,6 +64,7 @@ public class ItemArmorMod extends Item { case ArmorModHandler.cladding: list.add(" " + I18nUtil.resolveKey("armorMod.type.cladding")); break; case ArmorModHandler.kevlar: list.add(" " + I18nUtil.resolveKey("armorMod.type.insert")); break; case ArmorModHandler.extra: list.add(" " + I18nUtil.resolveKey("armorMod.type.special")); break; + case ArmorModHandler.battery: list.add(" " + I18nUtil.resolveKey("armorMod.type.battery")); break; } } diff --git a/src/main/java/com/hbm/items/armor/ItemModBattery.java b/src/main/java/com/hbm/items/armor/ItemModBattery.java new file mode 100644 index 000000000..22193e17b --- /dev/null +++ b/src/main/java/com/hbm/items/armor/ItemModBattery.java @@ -0,0 +1,13 @@ +package com.hbm.items.armor; + +import com.hbm.handler.ArmorModHandler; + +public class ItemModBattery extends ItemArmorMod { + + public double mod; + + public ItemModBattery(double mod) { + super(ArmorModHandler.battery, true, true, true, true); + this.mod = mod; + } +} diff --git a/src/main/java/com/hbm/main/CraftingManager.java b/src/main/java/com/hbm/main/CraftingManager.java index f3ba05a9c..ae3372886 100644 --- a/src/main/java/com/hbm/main/CraftingManager.java +++ b/src/main/java/com/hbm/main/CraftingManager.java @@ -408,8 +408,8 @@ public class CraftingManager { String dyeName = "dye" + dyes[15 - i]; addRecipeAuto(new ItemStack(ModBlocks.concrete_colored, 8, i), new Object[] { "CCC", "CDC", "CCC", 'C', ModBlocks.concrete_smooth, 'D', dyeName }); } - addShapelessAuto(new ItemStack(ModBlocks.concrete_smooth, 1), new Object[] { ModBlocks.concrete_colored }); - addShapelessAuto(new ItemStack(ModBlocks.concrete_smooth, 1), new Object[] { ModBlocks.concrete_colored_ext }); + addShapelessAuto(new ItemStack(ModBlocks.concrete_smooth, 1), new Object[] { new ItemStack(ModBlocks.concrete_colored, 1, OreDictionary.WILDCARD_VALUE) }); + addShapelessAuto(new ItemStack(ModBlocks.concrete_smooth, 1), new Object[] { new ItemStack(ModBlocks.concrete_colored_ext, 1, OreDictionary.WILDCARD_VALUE) }); addRecipeAuto(new ItemStack(ModBlocks.concrete_colored_ext, 6, EnumConcreteType.MACHINE.ordinal()), new Object[] { "CCC", "1 2", "CCC", 'C', ModBlocks.concrete_smooth, '1', KEY_BROWN, '2', KEY_GRAY }); addRecipeAuto(new ItemStack(ModBlocks.concrete_colored_ext, 6, EnumConcreteType.MACHINE_STRIPE.ordinal()), new Object[] { "CCC", "1 2", "CCC", 'C', ModBlocks.concrete_smooth, '1', KEY_BROWN, '2', KEY_BLACK }); diff --git a/src/main/resources/assets/hbm/textures/gui/machine/gui_armor_modifier.png b/src/main/resources/assets/hbm/textures/gui/machine/gui_armor_modifier.png index 2834d35692c00f5e8c4c9b7a9743de6cbf4eeebe..b1c313de45bab564e34038ad667a6b3c2b1aea6b 100644 GIT binary patch delta 2797 zcmXYzc{CL28^_-nlQql;Stf%@mXZ*Ln6XB(Bvj~!NH;rU%QmB%JzJx4Wh+W{Wv7@> zqsB6wl-*b+BV$~24Knym=ic|6_dMr3=lh;#`Tp^KD2LOfvbFKuR%XVIQ3b3iOz6Ch zEO{+i?y=E3IS-naWji)MY+UK<1RWH8)|seowra>Fwv*7hdfjw-*|1w5_ngOuvB=rphbc7#x4@4Fg!=thQ z_FKLPt6>nc5P2aS)d3-iyPGeunE1H(Ax>ejKys2#f?L3PvivAy0w+G3ZNhj z0SGr>L;^$tuS2mYA(P1;$ye(}Uc1yl8KgOE`{-1;At(m~UpJvu z-!58u--hlh76aEr_E}+)bQJXC``GXEll$H|(_;-W z7HwHmYZJ78j8N+pN1kmrqoR?tOU5Z8eou&`vHi}pl#6N$Yas^P@UaVlV%ehT*xfyi z8bvA}`lIM`0sCIf8J~u==)J&}4$eOH5-Hasv}wp+RHIxGitP;&Ir>4lv@Y&`G~7BD z;5BY-cj!!06$p3CWFe#adPh)sq9f3h7#ifLSZ-w=no#k}MBakY(scYAuS#wz&?s9! zHS`0qplJ=NNBo!$d2O(Tj)KT^c5k*zObPiUq~4{bn&QFw$wWsev71gL4Ud~9DjMn? zz@AVQ|3Oj(B~lQe{6Piqo_UO#aKb<6FIG5xAIuD29F7QIUtlcT^&R30oR?Kdr_^`{ zDso3c)KD!9=JpxeR}guJ!8^BA>gFZ)YR&pXjmSO5awyd4zpphQ+pem|pz6L)bj;;F zv^+bcmQu9{2qNSj&vjfs`AIz$YYuW>4@A_Ccm@v1MISE=p79>LH;(S;OtRwe|~)VkO3^;>47^G>9@HmA9J%x9R{jngPutCd=IJ{S@G;5 zuf^|i(A!thGvdJhWI7%}qEILu_=#Grpdv=}WH^#udQDm&Bq(v<$FbK_X(@dSP@0PL z=62MhU&TZ(%(FB|PYP7U&sHh2o_AJ|zdX|g4pj%e{DuNsn1v~tsB(u4S6_*=Und_? zW*XT3FwHW1=?}~GUP3<2E%8vxWpUDm&9qd9^hXgMTq4bYyinO7REtZr z?>I)=JDZOUxu~TK{9D#^zK6Ycu?;ZC{LVzdsF9|2Ico_sTJ!w@jS2M@h0ud-GhU14 z3PxIk3hLS)Z{88=sTcK-sY4Jdn6fmaLRswKfGQR}%BL}~=tStm_Ibw7eE**KkO1Y% z^6{S`)FRQ~3^>7c{L{n+rz1I;GNfD1j83Q}pOuyX3vI2;H|OZ+$UZA<=Pu<&CX{V4 zfEf#{OWNQH{s5{^oGa*s z`+Ie={i;$%4pSz+oEzHMN=(Zq@$leFs+O$#Y;*mR&15=}Q$#{7BQInaom_Y0^Nnj7rI#Adqlf*OfRe(FIaJT)qdD{S~%>0#$6pM8>RtQQ_FM^9eV6J8W1IO0`%vleM^}kxwD$7$eBs)=KcXgxhp(M zAF5{$S1KznJG_J?PEZs{J{IDxI^_gyQ@iWWLA3?j&*%>HfxoEx6ZX&+y5*; zo0dr5l?T(k)IF#cI;XknPf% zO}T!hi9TWaajs|inE;aOg&iQXpgc3Q%gxj1?Mrpc5F37Q^?SW2mcE-k6`@Z(N8V`F zfpOz!_4-X1{jGds1@gW z-P9SMXH_$2V_YdphHfVQqqi)!3_$ne! zEm*J+Z^vv*Oz>RXTbum zf46$A#@WqqF#%v#Dl03OdS-(w4iRSmeK82WhPG8>;(lq9X{v$}33|5c~NSW`&WRlTu(`;qMD1?9c=E#35;ny>l&m?j}f(_nEBoM?m9AS4)a7TR4 z53pyr{8b$(mR(6go=BW;tb!gzRzh(F^sFBGKdfLuB0}gSv0hNf-0{GI-bWN)i>Z@` zcXB0ZHdqiSTY%pv)ptRQb6#pw(ZR{d2_?ce?S}o!2WEfjG3BK&Bvu0=Ww9e%UD^m; mJs&^;ZR%hosp(WMQOG5S zblgUN9s<1eG>FLU2Heb%()jqQ|I zv~2y=g^4i;bo(j$N{4dKnka!_ddCi0FRQ`3robEX)v3Wjy5HU=L}R^8mkWB#C`XDV zo4+<^Nv{38*I8#?IKa7a5(D(`}|)Bs{(JW=*kZQ-flWkfQ|3yNzYPu8zaN z(J6PwGT~_l05YU%)+|=*)Q{D<{E^rKs<|wv^lce+gbhfwOD?lP1Z|QAggWM2Fry>; zMhWQW3akj)b6X(P`-|w$0e9DPr7e2TpaFLo`#v;D!kH4V+CI^SjkSQ=6LI(m*NkLA zOISns2f*76=)N1#l*3z~)>c-mu;NfJ&p(etmQvRsaqo^p8$$830`@HV?c+%vl4$^n zP$KAR-B6hQ#43GYNqj!FQd(47MX$hr<3`M+c9vrV51WOkGcqiDuR! z!V0Gts&L};aOtwYkB43m=cA=;>rDw``s>@#y-w@g?| zBGh2t##?s9mTq+G*gG2cbSZ9ie0+Smtt<=5m8A!-v(_Mfl~`c6TJ2k+elC;0y%gHXr%K+EltFDJ%ho^I z%Ur`T!JO9X=Y8E()TD(@^`FU8uPGLEu~luIHK3t3e;Dr z1^Be-Hm?M~V3b_B24oah-C!)fYZ(68 z^0zZFUb>^Iz^#g=#H94}^yC$WitdQ6MTN%JUyfWb)zNPC@=dg$g_vWp^9Ibo`?B`3 z)ULWWGjW-WMD-09j=87YPda|qqW_mh>)ja}fs**~Kxb#?JB7pC7{mUi$>a9|S$>R7 zN&RAPF>#Fy zglE+NHiDbOXsO0j$=psO1FGLEM__Zr#g-eVaA)}WUa6{g5iC1drZo3udQ#&aA$;y) zT_9n#foUm3a#KgX^(>%151Cj@l5~p2eFAoxFfO^8pR1|_8gKsek5kXb8`7vxgdtyLQ26g7(uVAX>_lQ>`D!VAmNN(QFZo9niz+ zBfP0!v$J;|b%KK1}t6Tfz@x`azi|o3~Z!>+`sG{Y}n!redKKpBcS$*TZfn z!+FpUp28p6f(;36HeKP5m6ZP8Ap54NRkxht#8Uj~s6j#7Sk^3w>&oOHpe+BE%X;mJ z4TT$hv=z0MTvz!q!JFki?#f94)J9+R65fK8lA}E+X_YblkaL2^_N{JaEvghs`If`L z^*Z^WE`wUt8XdA8WqUi0dND(Pm38H2>W9-LjhV3% z8Ejup>_^Clvd@5MQ6*Ep6#^dK_y|cDcrx6(E*KB)9}&$8<5#^oX4+tMcNrO2N2$(D zE!EEm!Xr;Dvg^H7py0S}m5ky={Mp6=#KN_RP?wwu3R^9Ks6{D%g_~xuvk}DSFEzX*=N;zHea~AJopbgGs$&~f}VhNR*-pv zi_M_kKA=6Au8CjwtEDw$bX#5UmT!KYKUryl%j%VUakQ`x%&4m3pLZT74m?p2LihAb-!X2NOGQA#U{~6`eW^)oO&B@{lA|T@d-uxLpDq z^PxqCnGaSKLHR+NLQ`(_Q>h0-s3kubpM3_Q`@px;NpPfe!uH33a=2RZkI4U-|3;xe z(ZE-j)(ekRPU~z|Okh9|{$YPm48DnV5w7TGp*GgS4|EL2Cj>m_li>7W_%5$S;HG8> zUD5v6pbeqUzo5Xq)FXBK@m)uBu-=1xX_N?ctwc^P#qC4*Q;PsC?s5dA0bhApYI-p6Lcek4!CW2P1i zaiPEdKmRt1f2xx3#cIh^&8tUcFX_2JKnDyEO`yOnWC5#nEcv`%T1@J(WF^E8R~*x1 zk%-TS(!asc^f@@n{vVNqKPu-CQ4ZHclu562Sx}@d{WC4JQ+|)o!%Fuz6xKNYS}teW z5xkCMI5q1~kwzfZBtfQSM?7S?SSUk(r=UY0RY0gyx2+)eoXa~^dg$32kd6cPE_T)X Hd@lV5vY8Wv diff --git a/src/main/resources/assets/hbm/textures/items/arc_electrode_burnt.png b/src/main/resources/assets/hbm/textures/items/arc_electrode_burnt.png deleted file mode 100644 index 5d278eded669175dc1744e7343df8d69b1570121..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 447 zcmV;w0YLtVP)@7kwJ=Ds0ls1J>L)rTF<$=o$tHn+{3vS7_oSs zr*Jq-KA(?zn2kaXg+dez20=uqR4Rx>A{f(34*31F8VJBTHHB`s3yZ~qcDoI|7P2tI zk>K^f?Qq~M8bvyrg(!-M$K!uH*m60^#2Ea7fV<=ku969mf=i_mBuQew3LH=C$;-J> zXx357J;G!#pxkW1Q+>mEBB|y#R6v?F)5`uKKh%jgk`)|zN`QM002ovPDHLkV1f@g!MFeb diff --git a/src/main/resources/assets/hbm/textures/items/arc_electrode_desh.png b/src/main/resources/assets/hbm/textures/items/arc_electrode_desh.png deleted file mode 100644 index 007f2a98eaeb55118735cdc9d8ee950ec7c50913..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 537 zcmV+!0_OdRP)z_r3RgGcSLK(kF%pvv83HZd`;CCWJAB zn|3XV+C;dBNLnU{E~21~=)!OzYGkMsu5{5R$dsTK{YeT%PLMh-CUoY_obGGYB4*x& z3m+f%+;h(5ULazeQ3_*PW5z$huXhJ{r^%-)|5nrn&0&-J<2*HfA1o3>i3Hllr)Z)! zcwAe_=JP#pTa!@6z^bc7Qzio)1^m!xwwyZ)ucr&y*Bf9V0L0S7=5~1tleR@CD4?qU z07izIPqIY)!J=wo5ZlRM^Z8 z4RWp8V1Fm znqR4FLCdanll$|}S&Fi5YEG2cG(l$hjm9&J`HuJmekx@TD!R((Y;<$~fyXh9^=GBk X&t>oUbcpL9&|3_iu6{1-oD!Mv7C&dPn?Am8Hnui8NAL;o)A zHLrJ_mT{8!HN8pB=-7cMZU&8|JVK@HbBm{GG^Sth`82`%{oil{28-tc$#?jf(%1xj z9oLpxPhzduyH28$<4jG1%I$5umt5PXOk%pAvh^C{Da*%K>ba{p1x-J2y(<36pEB3~ bLjF_E%fc>l&OS>)-eB-_^>bP0l+XkK^7U0Y literal 0 HcmV?d00001