From 193717bf34e2acfdf8ba9baffa76145c3fc378c8 Mon Sep 17 00:00:00 2001 From: Aleksey Date: Fri, 2 Oct 2020 10:23:51 +0300 Subject: [PATCH] Aeternium tools --- psd/tool_items.psd | Bin 0 -> 33718 bytes .../ru/betterend/registry/ItemRegistry.java | 40 ++++++++++-------- .../java/ru/betterend/tab/CreativeTab.java | 1 - .../betterend/models/item/aeternium_axe.json | 6 +++ .../betterend/models/item/aeternium_hoe.json | 6 +++ .../models/item/aeternium_pickaxe.json | 6 +++ .../models/item/aeternium_shovel.json | 6 +++ .../models/item/aeternium_sword.json | 6 +++ .../betterend/models/item/terminite_axe.json | 2 +- .../betterend/models/item/terminite_hoe.json | 2 +- .../models/item/terminite_pickaxe.json | 2 +- .../models/item/terminite_shovel.json | 2 +- .../models/item/terminite_sword.json | 2 +- .../betterend/textures/item/aeternium_axe.png | Bin 0 -> 435 bytes .../betterend/textures/item/aeternium_hoe.png | Bin 0 -> 360 bytes .../textures/item/aeternium_pickaxe.png | Bin 0 -> 494 bytes .../textures/item/aeternium_shovel.png | Bin 0 -> 314 bytes .../textures/item/aeternium_sword.png | Bin 0 -> 581 bytes .../betterend/textures/item/terminite_axe.png | Bin 2078 -> 358 bytes .../betterend/textures/item/terminite_hoe.png | Bin 289 -> 234 bytes .../textures/item/terminite_pickaxe.png | Bin 2016 -> 445 bytes .../textures/item/terminite_shovel.png | Bin 1824 -> 337 bytes .../textures/item/terminite_sword.png | Bin 2116 -> 455 bytes 23 files changed, 58 insertions(+), 23 deletions(-) create mode 100644 psd/tool_items.psd create mode 100644 src/main/resources/assets/betterend/models/item/aeternium_axe.json create mode 100644 src/main/resources/assets/betterend/models/item/aeternium_hoe.json create mode 100644 src/main/resources/assets/betterend/models/item/aeternium_pickaxe.json create mode 100644 src/main/resources/assets/betterend/models/item/aeternium_shovel.json create mode 100644 src/main/resources/assets/betterend/models/item/aeternium_sword.json create mode 100644 src/main/resources/assets/betterend/textures/item/aeternium_axe.png create mode 100644 src/main/resources/assets/betterend/textures/item/aeternium_hoe.png create mode 100644 src/main/resources/assets/betterend/textures/item/aeternium_pickaxe.png create mode 100644 src/main/resources/assets/betterend/textures/item/aeternium_shovel.png create mode 100644 src/main/resources/assets/betterend/textures/item/aeternium_sword.png diff --git a/psd/tool_items.psd b/psd/tool_items.psd new file mode 100644 index 0000000000000000000000000000000000000000..5566d8ab6a6dd23ee3c8f035f8c2d5c45609084b GIT binary patch literal 33718 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 Rx^NE)(K%J3AGM(L{{svruGs(p literal 0 HcmV?d00001 diff --git a/src/main/java/ru/betterend/registry/ItemRegistry.java b/src/main/java/ru/betterend/registry/ItemRegistry.java index 308591c1..0e39096e 100644 --- a/src/main/java/ru/betterend/registry/ItemRegistry.java +++ b/src/main/java/ru/betterend/registry/ItemRegistry.java @@ -8,44 +8,50 @@ import net.minecraft.entity.EquipmentSlot; import net.minecraft.item.ArmorItem; import net.minecraft.item.BlockItem; import net.minecraft.item.Item; -import net.minecraft.item.ItemGroup; import net.minecraft.item.Items; import net.minecraft.item.ShovelItem; import net.minecraft.item.SwordItem; import net.minecraft.item.ToolItem; import net.minecraft.util.registry.Registry; + import ru.betterend.BetterEnd; import ru.betterend.item.EndArmorMaterial; import ru.betterend.item.EndAxe; import ru.betterend.item.EndHoe; import ru.betterend.item.EndPickaxe; import ru.betterend.item.EndToolMaterial; +import ru.betterend.tab.CreativeTab; public class ItemRegistry { private static final List MOD_BLOCKS = Lists.newArrayList(); private static final List MOD_ITEMS = Lists.newArrayList(); //Materials - public final static Item ENDER_DUST = registerItem("ender_dust", new Item((new Item.Settings()).group(ItemGroup.MATERIALS))); - public final static Item TERMINITE_INGOT = registerItem("terminite_ingot", new Item((new Item.Settings()).group(ItemGroup.MATERIALS))); - public final static Item AETERNIUM_INGOT = registerItem("aeternium_ingot", new Item((new Item.Settings()).group(ItemGroup.MATERIALS))); + public final static Item ENDER_DUST = registerItem("ender_dust", new Item(new Item.Settings().group(CreativeTab.END_TAB))); + public final static Item TERMINITE_INGOT = registerItem("terminite_ingot", new Item(new Item.Settings().group(CreativeTab.END_TAB))); + public final static Item AETERNIUM_INGOT = registerItem("aeternium_ingot", new Item(new Item.Settings().group(CreativeTab.END_TAB))); //Armor - public static final Item TERMINITE_HELMET = registerItem("terminite_helmet", new ArmorItem(EndArmorMaterial.TERMINITE, EquipmentSlot.HEAD,new Item.Settings().group(ItemGroup.COMBAT))); - public static final Item TERMINITE_CHESTPLATE = registerItem("terminite_chestplate", new ArmorItem(EndArmorMaterial.TERMINITE, EquipmentSlot.CHEST, new Item.Settings().group(ItemGroup.COMBAT))); - public static final Item TERMINITE_LEGGINGS = registerItem("terminite_leggings", new ArmorItem(EndArmorMaterial.TERMINITE, EquipmentSlot.LEGS, new Item.Settings().group(ItemGroup.COMBAT))); - public static final Item TERMINITE_BOOTS = registerItem("terminite_boots", new ArmorItem(EndArmorMaterial.TERMINITE, EquipmentSlot.FEET, new Item.Settings().group(ItemGroup.COMBAT))); - public static final Item AETERNIUM_HELMET = registerItem("aeternium_helmet", new ArmorItem(EndArmorMaterial.AETERNIUM, EquipmentSlot.HEAD,new Item.Settings().group(ItemGroup.COMBAT))); - public static final Item AETERNIUM_CHESTPLATE = registerItem("aeternium_chestplate", new ArmorItem(EndArmorMaterial.AETERNIUM, EquipmentSlot.CHEST, new Item.Settings().group(ItemGroup.COMBAT))); - public static final Item AETERNIUM_LEGGINGS = registerItem("aeternium_leggings", new ArmorItem(EndArmorMaterial.AETERNIUM, EquipmentSlot.LEGS, new Item.Settings().group(ItemGroup.COMBAT))); - public static final Item AETERNIUM_BOOTS = registerItem("aeternium_boots", new ArmorItem(EndArmorMaterial.AETERNIUM, EquipmentSlot.FEET, new Item.Settings().group(ItemGroup.COMBAT))); + public static final Item TERMINITE_HELMET = registerItem("terminite_helmet", new ArmorItem(EndArmorMaterial.TERMINITE, EquipmentSlot.HEAD,new Item.Settings().group(CreativeTab.END_TAB))); + public static final Item TERMINITE_CHESTPLATE = registerItem("terminite_chestplate", new ArmorItem(EndArmorMaterial.TERMINITE, EquipmentSlot.CHEST, new Item.Settings().group(CreativeTab.END_TAB))); + public static final Item TERMINITE_LEGGINGS = registerItem("terminite_leggings", new ArmorItem(EndArmorMaterial.TERMINITE, EquipmentSlot.LEGS, new Item.Settings().group(CreativeTab.END_TAB))); + public static final Item TERMINITE_BOOTS = registerItem("terminite_boots", new ArmorItem(EndArmorMaterial.TERMINITE, EquipmentSlot.FEET, new Item.Settings().group(CreativeTab.END_TAB))); + public static final Item AETERNIUM_HELMET = registerItem("aeternium_helmet", new ArmorItem(EndArmorMaterial.AETERNIUM, EquipmentSlot.HEAD,new Item.Settings().group(CreativeTab.END_TAB))); + public static final Item AETERNIUM_CHESTPLATE = registerItem("aeternium_chestplate", new ArmorItem(EndArmorMaterial.AETERNIUM, EquipmentSlot.CHEST, new Item.Settings().group(CreativeTab.END_TAB))); + public static final Item AETERNIUM_LEGGINGS = registerItem("aeternium_leggings", new ArmorItem(EndArmorMaterial.AETERNIUM, EquipmentSlot.LEGS, new Item.Settings().group(CreativeTab.END_TAB))); + public static final Item AETERNIUM_BOOTS = registerItem("aeternium_boots", new ArmorItem(EndArmorMaterial.AETERNIUM, EquipmentSlot.FEET, new Item.Settings().group(CreativeTab.END_TAB))); //Tools - public static ToolItem TERMINITE_SHOVEL = registerTool("terminite_shovel", new ShovelItem(EndToolMaterial.TERMINITE, 1.5F, -3.0F, new Item.Settings().group(ItemGroup.TOOLS))); - public static ToolItem TERMINITE_SWORD = registerTool("terminite_sword", new SwordItem(EndToolMaterial.TERMINITE, 3, -2.4F, new Item.Settings().group(ItemGroup.COMBAT))); - public static ToolItem TERMINITE_PICKAXE = registerTool("terminite_pickaxe", new EndPickaxe(EndToolMaterial.TERMINITE, 1, -2.8F, new Item.Settings().group(ItemGroup.TOOLS))); - public static ToolItem TERMINITE_AXE = registerTool("terminite_axe", new EndAxe(EndToolMaterial.TERMINITE, 5.0F, -3.0F, new Item.Settings().group(ItemGroup.TOOLS))); - public static ToolItem TERMINITE_HOE = registerTool("terminite_hoe", new EndHoe(EndToolMaterial.TERMINITE, -3, 0.0F, new Item.Settings().group(ItemGroup.TOOLS))); + public static ToolItem TERMINITE_SHOVEL = registerTool("terminite_shovel", new ShovelItem(EndToolMaterial.TERMINITE, 1.5F, -3.0F, new Item.Settings().group(CreativeTab.END_TAB))); + public static ToolItem TERMINITE_SWORD = registerTool("terminite_sword", new SwordItem(EndToolMaterial.TERMINITE, 3, -2.4F, new Item.Settings().group(CreativeTab.END_TAB))); + public static ToolItem TERMINITE_PICKAXE = registerTool("terminite_pickaxe", new EndPickaxe(EndToolMaterial.TERMINITE, 1, -2.8F, new Item.Settings().group(CreativeTab.END_TAB))); + public static ToolItem TERMINITE_AXE = registerTool("terminite_axe", new EndAxe(EndToolMaterial.TERMINITE, 5.0F, -3.0F, new Item.Settings().group(CreativeTab.END_TAB))); + public static ToolItem TERMINITE_HOE = registerTool("terminite_hoe", new EndHoe(EndToolMaterial.TERMINITE, -3, 0.0F, new Item.Settings().group(CreativeTab.END_TAB))); + public static ToolItem AETERNIUM_SHOVEL = registerTool("aeternium_shovel", new ShovelItem(EndToolMaterial.AETERNIUM, 1.5F, -3.0F, new Item.Settings().group(CreativeTab.END_TAB))); + public static ToolItem AETERNIUM_SWORD = registerTool("aeternium_sword", new SwordItem(EndToolMaterial.AETERNIUM, 3, -2.4F, new Item.Settings().group(CreativeTab.END_TAB))); + public static ToolItem AETERNIUM_PICKAXE = registerTool("aeternium_pickaxe", new EndPickaxe(EndToolMaterial.AETERNIUM, 1, -2.8F, new Item.Settings().group(CreativeTab.END_TAB))); + public static ToolItem AETERNIUM_AXE = registerTool("aeternium_axe", new EndAxe(EndToolMaterial.AETERNIUM, 5.0F, -3.0F, new Item.Settings().group(CreativeTab.END_TAB))); + public static ToolItem AETERNIUM_HOE = registerTool("aeternium_hoe", new EndHoe(EndToolMaterial.AETERNIUM, -3, 0.0F, new Item.Settings().group(CreativeTab.END_TAB))); protected static Item registerItem(String name, Item item) { if (item != Items.AIR) { diff --git a/src/main/java/ru/betterend/tab/CreativeTab.java b/src/main/java/ru/betterend/tab/CreativeTab.java index d1504c06..88b206d8 100644 --- a/src/main/java/ru/betterend/tab/CreativeTab.java +++ b/src/main/java/ru/betterend/tab/CreativeTab.java @@ -14,7 +14,6 @@ public class CreativeTab { for (Item i : ItemRegistry.getModBlocks()) { stacks.add(new ItemStack(i)); } - for (Item i : ItemRegistry.getModItems()) { stacks.add(new ItemStack(i)); } diff --git a/src/main/resources/assets/betterend/models/item/aeternium_axe.json b/src/main/resources/assets/betterend/models/item/aeternium_axe.json new file mode 100644 index 00000000..a342fbc8 --- /dev/null +++ b/src/main/resources/assets/betterend/models/item/aeternium_axe.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "betterend:item/aeternium_axe" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/item/aeternium_hoe.json b/src/main/resources/assets/betterend/models/item/aeternium_hoe.json new file mode 100644 index 00000000..3e640fad --- /dev/null +++ b/src/main/resources/assets/betterend/models/item/aeternium_hoe.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "betterend:item/aeternium_hoe" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/item/aeternium_pickaxe.json b/src/main/resources/assets/betterend/models/item/aeternium_pickaxe.json new file mode 100644 index 00000000..b2ed173f --- /dev/null +++ b/src/main/resources/assets/betterend/models/item/aeternium_pickaxe.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "betterend:item/aeternium_pickaxe" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/item/aeternium_shovel.json b/src/main/resources/assets/betterend/models/item/aeternium_shovel.json new file mode 100644 index 00000000..858475de --- /dev/null +++ b/src/main/resources/assets/betterend/models/item/aeternium_shovel.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "betterend:item/aeternium_shovel" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/item/aeternium_sword.json b/src/main/resources/assets/betterend/models/item/aeternium_sword.json new file mode 100644 index 00000000..978f4238 --- /dev/null +++ b/src/main/resources/assets/betterend/models/item/aeternium_sword.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "betterend:item/aeternium_sword" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/item/terminite_axe.json b/src/main/resources/assets/betterend/models/item/terminite_axe.json index f9f00a57..8f305558 100644 --- a/src/main/resources/assets/betterend/models/item/terminite_axe.json +++ b/src/main/resources/assets/betterend/models/item/terminite_axe.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:item/generated", + "parent": "minecraft:item/handheld", "textures": { "layer0": "betterend:item/terminite_axe" } diff --git a/src/main/resources/assets/betterend/models/item/terminite_hoe.json b/src/main/resources/assets/betterend/models/item/terminite_hoe.json index 819b7864..5ed37b45 100644 --- a/src/main/resources/assets/betterend/models/item/terminite_hoe.json +++ b/src/main/resources/assets/betterend/models/item/terminite_hoe.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:item/generated", + "parent": "minecraft:item/handheld", "textures": { "layer0": "betterend:item/terminite_hoe" } diff --git a/src/main/resources/assets/betterend/models/item/terminite_pickaxe.json b/src/main/resources/assets/betterend/models/item/terminite_pickaxe.json index c994eb9e..4ac934c9 100644 --- a/src/main/resources/assets/betterend/models/item/terminite_pickaxe.json +++ b/src/main/resources/assets/betterend/models/item/terminite_pickaxe.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:item/generated", + "parent": "minecraft:item/handheld", "textures": { "layer0": "betterend:item/terminite_pickaxe" } diff --git a/src/main/resources/assets/betterend/models/item/terminite_shovel.json b/src/main/resources/assets/betterend/models/item/terminite_shovel.json index ebc6e16d..b784dbfb 100644 --- a/src/main/resources/assets/betterend/models/item/terminite_shovel.json +++ b/src/main/resources/assets/betterend/models/item/terminite_shovel.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:item/generated", + "parent": "minecraft:item/handheld", "textures": { "layer0": "betterend:item/terminite_shovel" } diff --git a/src/main/resources/assets/betterend/models/item/terminite_sword.json b/src/main/resources/assets/betterend/models/item/terminite_sword.json index 9e065aae..fac5e3ed 100644 --- a/src/main/resources/assets/betterend/models/item/terminite_sword.json +++ b/src/main/resources/assets/betterend/models/item/terminite_sword.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:item/generated", + "parent": "minecraft:item/handheld", "textures": { "layer0": "betterend:item/terminite_sword" } diff --git a/src/main/resources/assets/betterend/textures/item/aeternium_axe.png b/src/main/resources/assets/betterend/textures/item/aeternium_axe.png new file mode 100644 index 0000000000000000000000000000000000000000..ce7eb4e84dab4eec73be510c7b3ea1ca77be8ffb GIT binary patch literal 435 zcmV;k0ZjghP)sC16zee1dG9dQG|g={1aj@keEbRMCry##3W4< zKN>0|66s?x^=l{%>3gMvZ*rG=zn^oyx#s}?Esx*N>Og=bZQpeT_7@%b6s@i>OZN6}qz z&)KMl#R~))c^Ql2)yg25y2Z%g5PBk=NIyKm7oA7!EK@vzk$!+Eg+%%elcQr;+uBg4 z>vM>N!ZP$GahtdCvnKgkFNSlJqO?EI^AT^;@X{S>V!+9;U^yw!vV dRqm98egG!olQ8f?ADRFF002ovPDHLkV1iWp!FvDz literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/betterend/textures/item/aeternium_hoe.png b/src/main/resources/assets/betterend/textures/item/aeternium_hoe.png new file mode 100644 index 0000000000000000000000000000000000000000..4de7d08a20bfc74a350bce126f4e6f8d67a20e96 GIT binary patch literal 360 zcmV-u0hj)XP)s#95MVMAB$!G^>@QOKVUNHiC_*;(`GS3z2k^eStJV#0Rjou+|4iZPaM2 zQdBzrI0AiP3Nc=N(wYK5 z@AgKFo_(xWD%@!7V5Lw*zTZac`~|-63jmN|egOyx2$EPWm$C1)1iELq8$9C4Zep!g zgHS4ZC1qKVSqsY20Dxd@V+}P6Q++#{$wMM*`9&M*@s7sm-B)zv=^iA(6g343w(?0000cZBpJBk55_MWf}k;hvsD zDJ2KB+AR&z30BuPaCCHtdhG|k*Y@!7!+TiT;P=k1uii(HgrpM$0bT!z@zOJ#wH+iM z#jv&c4o|FKh!01wy4{f89VACkUEe^f(Lnw0A1p1D*>)U^O-~{>n!?!rD=cmPN3+=! z05Cp-GY3y+OXwHC)gerjX2k9vMC;2Mznue4@;UyUtn}PR7tvG_4<4tw|6;~sxp1Gh zZ8MXfG$W k(wZQz?po-&H>j`U0!r7ia#C%BVgLXD07*qoM6N<$fV!Z literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/betterend/textures/item/aeternium_shovel.png b/src/main/resources/assets/betterend/textures/item/aeternium_shovel.png new file mode 100644 index 0000000000000000000000000000000000000000..6cef36560041fabeef77cd1cbd845fd8b5ef35a6 GIT binary patch literal 314 zcmV-A0mc4_P)mCk|@3+f~CE++9Yj$g8_q(A`ntonhnAA5+7Ko zo#4;e9Ghgz<2I0C)EiWs{!TT!*FGJo`YlLkR04x*P&joBZ z?=bxO#O*^D`+Mc2HgkZV3)s1D;rr(oPj4Sk{yIiNK#c2Rsy(K%y}&qs0lBt{-9izS zqeF!KzBnkA%;d&pmNH{8)SAL^cwMif7e(ph;Pe<1In>%rzB*Z=%vj0E9-|1MeomJ> zyW1ey47Eu|$@!BP)fRWo&j`<>@H}HL`2&)$U6%j>LX6@#^%8UO2X#PYg#&GHqW}N^ M07*qoM6N<$g4584Z2$lO literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/betterend/textures/item/aeternium_sword.png b/src/main/resources/assets/betterend/textures/item/aeternium_sword.png new file mode 100644 index 0000000000000000000000000000000000000000..83015413221cadf8b03157d2bad2389889fbc73b GIT binary patch literal 581 zcmV-L0=oT)P)uJZCL0QC6BKQWhWE6Xj7FuoBRvd(r9^aJ9oVbx?sq~gGhR>H@qt-zzO7tc+ zkfQ@>F3ip0{^Lj3KQx3?UkYQF$3^}&5blif$mvr=yo(Kct0E*39Z0kMag|fK+gx~& zr#cR=WV2W*7HfYAwzsi=_y9Y)y67f*5l$r;NqSsZ%=7x48RiQGY9PQ%larfgY;135 z|L{So<527C5J`GGeqoFgw{G&u%SEc=aQxcT2A-@HB+=?6*cOXo<>@mVJAV#+-931< zyo`I((;y-AeXvs5Tp&I;fQCRF(b|lq!$ZKAuQ>YtJ7#k;5LFNmY$EVy3*Y<-N`6H? zuYLl`AAomd%;s`9bn=A2r@;4t|LuKrFv!eEh~hZxOsCnI?xPw*v6f;CMgMVkqk}jZYVE^#$Ov9>m#F@P$d3JtZuhFXB;CP1a8O~hJ~tPaTcYf%+|sABRPS~tjFo`u{K Tx9CjD00000NkvXXu0mjfNc<1A literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/betterend/textures/item/terminite_axe.png b/src/main/resources/assets/betterend/textures/item/terminite_axe.png index 48935983f4fdb59f37f43cdacc3b3cf9fe903911..1ef17aaf5318f345d9a37880104ed04a4bfbd09b 100644 GIT binary patch delta 332 zcmV-S0ki&|5at4qBYy!cNklf{7eMx23M9AF+Mp$RjuRpsSixD5|{>H>Tn&& z(}QIyOJlj?0YwF!DCorAR`wRIBiXDKsVpsa07*BI%bW?Aj-Aw#2*{e83dl1#6`(9F empKveSA78jPm#=>uOp5C0000_I|F`^it?TV-T727LilUl&x>J4R+8iA>){*nd=^02a4PN)gfTC`?H9BgjiG3?5 zs_w9z=@0wU59`Ry$DrvNI9AMi1Wi$G?L`lwAso^M&e~3bId}LdL)&J8*$_{Iw3oz# zcK4`{*N^sQ(C84-Os0J`-B#2IK^}*YF6MJipcfNNiB~7<=rPC8B}h1wU^*g$bbops zopgOn$73>!cuAlYEyl}06Ql=d0q_b36pj~J!0SNPMUAff7-G#gExj+bwqlFiC78i5 z^mL9Z6bi9|7<2tB$7`C#0f7?)mLS+*#0g=Mb%NGeh7=BvZ+oHbI&{Pc4R<(9FhptD zg}hg#b%IKmNWi!v^f*2SB9}@)6IF5Eu%9a#HxY+(IFFq$AXvVN^#ovzxLS4%!$H4%iJTZkK#fXs^yG9w=5`f%V5`v`Y#Au?MdZ#+HeV;H)A#&vVE ziCQ-+nNB97#HjSW8*ImP3&DMJ_TUr@ae@(m09c@~f{@|kI{8cT{Xox*O{80{pNGU}I}fv%^PDV0S0kw>-JI(a!$h4}Qjt#U zJx&lp2jQMnf+23lY}?easF^&1fYmI3SVfRj)&Q!^VpHU0h%K3~ctQ53Tr?adH`-sW zbJInHKjT1s{)Y(#uP;h#zh=g;jEfRe4Dfy%*|zuRGEZP(?mn# zWra0y++sCJ5?D=DEEZ~(id3i}EDBLUU$H#P(n0(SNG^j)!>obX$|`5Co?kRCNk~yG zjYTrgvj9n$H7t@)4I7fCD4L;ad>a?_3ZW>s;WfETEQulp8jBS*&RVKuu_^+XRYYW9 zORy|MGv;uWSj!T*g?%Y?gWhdNzKv8=tjC+HdgxLE=nzGXonTN@(b!}vkL`Ife_b)I z>@N&rLb^bim#qh`6&9e6JF=uouBVf@Yv~W*mW9<{U)`2v%~3yp=lxIhmEfR3=wvaO z6&w@!Q_5*MHQc|mR(dz*3p@)apY>>2ohRg`I+3tLsC_bTmY;PK6jjsElj_K*&!EdQ zGwrpj#%{5w*4EaiZg}hX(=XJ`oca0L$LUkl?jH|6`ud9Bj%@$flM}U*&F|OIL)-rT zzGm|6KW_e^Y2e`JU0+;2d#O-2eZ;RDY3LpQ>GqYvQapD4(-!a4xdV^Ef#Ss-9q7-s zr^WGK-#gIQ_~p{Zeay>^r}w-$K#e}}+)Fj|@|~|<{HtEObnMA@ z8kan@X@&aX2QA;F_jXTFyASPocWQfm^3L%K-|Pq9dcSAQL!-;y=zopge?DJiwsFOY zT_^J67hW9l>!%jcV_#9ZiOn^QwGU3f&+dMuWs>U4eFUgg$L`pQ?~hv04zbR_W%F@ diff --git a/src/main/resources/assets/betterend/textures/item/terminite_hoe.png b/src/main/resources/assets/betterend/textures/item/terminite_hoe.png index 897311498f75edaf2040e07994322703d63df434..606bef882c878f330c2adc010bdbd25f92a44981 100644 GIT binary patch delta 206 zcmV;<05Sie0_p*fB!96JkZeAb0v!8&Bv4ceZIEmX9Gm&GHq)$07*qo IM6N<$g6Vl%$p8QV delta 261 zcmV+g0s8*x0ignrB!B2hL_t(IjlGdQY64Ldg}>M3VU>U~L~u$6rkH?WCQFzsAOts% zQg@;5z#UkdQVFEf(&>_RAR_rGLpo0yf6*C5!LNJwzI)EO@4<D&7ko_d20h-A-)w>T8*G&DeJDE6e}PfFUtq!gZ9%SM>3m);N`_IK8h(SQnpgX& zEU%Q)u72iUMAf`p$MQP00000 LNkvXXu0mjf^W%QK diff --git a/src/main/resources/assets/betterend/textures/item/terminite_pickaxe.png b/src/main/resources/assets/betterend/textures/item/terminite_pickaxe.png index 25ab365811a3fb3e51ce91a878faf085b915c9ab..9a8754f4ff87cc6e1c62ecab4d9ee5c3c6afb69d 100644 GIT binary patch delta 420 zcmV;V0bBmy54{7BBYy#eNklK{k{57LrxE&4joHy)m4`cEgdQ(+CZuVJRM#lNs|`^4_v<7 zbMHCdANRsNVYOw)qG~2&addJ=gR!XcxsUw1IOliy4?ix7?0;ml?%DB4%l#HY64rQB z2sr&td^rP%a4^JnHcQg{B+~C^{h(;IuVC~sZUrUI%4HU&X9N&mN;4P?@#Juk`Og(f zrIMGykQ=Yv5P$U&fWU{eDlgs=c0z2=y@tQl_VWW^WC%tc-E5PwfZjY0$#EP#TYIlm zZcFqSc^fn!8Gj3CV|Jh}2HWWA>N{cI!Jsj-RJ(5*O|4{<+THAI(wMoCmjt#^djFHK zjk>(Vk$!*EwEsu%gNGn!F-XP&N=!KH733*K&=+(%_w3o5&$w;)jJCdhp&NkVhyW53 zmmSNl!?Jzk3*RiL=NTT<n%tckL%OKOKj~RrPk08vX%=8l2{W8746R O000035C=v}r%?mFK7G0Cwb^Zs-R7nq%y9`Ajp6Cjr+0u zMsRNM0Wh%4#9%V{;wKY74E$u2@FEyvVn8Fl1!G`|iUt#d1T+YoPw$Ok#W`(=uuSj(%=YDlLsE6 zsIXyXHu@XW&#TBTM4@hLI9e(=1Wi$G9VG{%E!d|uoHeZ^^T*+13~lO3W`!Ph#)eUtZ)l<_VcS$Da z`;N+S#bPm96r;AA<#z!C)O4O>1ev6k0bXGmcWxu)ZrwnYbwP_qa9Btx85 zLnt^6TFa}Yi6o3GL5Jg`APA`f)KLTH47&M>xQ;lS#|3Qp9>MYrtdp~S+soN^pl-ar zO@O2}oo;B%>ZMRr+=e49qeCCgjnt89*lq!mXw3r5V$QL$4Bg0~+GXc$mq-#{VnsilR{Jc^ zhZe$psU$-Jj+&;fA|L@plQlM$5P243$zU}sE3B*_pdj zgyWW~jwMmVKw+_*h_Ob3uq6<{tSll88-ihIidJV^=bB`Z!Te0tz?DuI4I?hdm~^gz zf}HY_&L)EFLI{DZ@HnBMSkTJ1l=BtDN+(W@<$H85Kn<<0ilP4kk37NK^@r=fen zOV3hNi0(^uW)h#H>*aDs)8nIWYz_lKIB`#>ws(KH{Qi3#BV&g`k!9D)`?9Au{e9`m zs+0eGcd%t-dwKD)5g9T&FC5E8{(Rs-|f0CuXU-?;lYfm@W{@UfqvFYEM!~1?* z(K6L>eaAU!qIuK#n^!JIetGrh@&^|`5L#PuZ}g_EsyN~ z8aS`-*?FW%8eQ^k2%N{!tLHxM-wkhGeIg>ie50jh>XjQ@W@6oe5Pb@~Jv|csbbP>D zdh*Cw^?I28A#x@nK7IJ$Thp6g;H{>%Qz<^*6Q>?Lo;@QTT0woa_muHi)A8}Um!By0 zd~sK7*+k*!rC(RIzN1IR*`KJLyW&eG`N)@VUI>Z1zu60^4=HNb!{1J?o?3Y=_y+fN LuT4#@*|g(d7!aOL diff --git a/src/main/resources/assets/betterend/textures/item/terminite_shovel.png b/src/main/resources/assets/betterend/textures/item/terminite_shovel.png index 02ef83ed5bb50254af04e9d37e5855bfde0f9ffe..8ca8a192ba297e85db42fdbe2fe248bcba709532 100644 GIT binary patch delta 311 zcmV-70m%NK4$%UTBYy!HNkl`2YWZtQZdT)c!9zcJTk=qX+++bv6EH;AH#Hz`(%3M3g)A)c!A;F`MDk{ksg4 zkM3v4wX$bmV1O7-*Z@7%|BI*3W;k{K4#SBjj~Gm)Wl^Nz27fRzGGfIHmu@qz&hunA z_4qM^xr_{hxx5lXtg9=-qTRa~F)YId{EWH&PfeHpuP(v#f6|1UbcpJCDA z{iJC&X|HF%rWvO*{EWH&D@$=OY&-pd;pU5fj0_BzQH>JCxNJri#}>sHMqslU*#LAG zupnz>U|?WyH!u-on6&XZhGtvzLF3bhJ`jLEdio51uPC8dSE|*`D z&+qg3eE;No)BSyCjvj75Oc2D;-h?)Q&(8$MlOg>3(t{m?%0`jv$}ZQP#9#)W(+!6loeUYABLqlTIAv z%*2F?1}FMbaAE{12G#W%*;!ICK>_)IEEV#Wrc-=T z1aNAT$%e+BUJ8YVgy;8+;V^0m*%R%h#vQ~AAkQ9kA?g{!Hjf3-IBMKQz_;C$ZRhKS z>aSZS~o9v9c7|$fO##^R|nHu{)vSBAHZs zEzbuQM7>&!!eNI^(@-Ihc_>8tKdPK4LOGgIXee3mGThqP>1sMYHT!mm<#~N*aph8a&uH=DoTeJ*tTt;x%i^P^gO`jedt*S?ruzxCti={u+1RFAx0 zE+5H$C%h*S+IH6QPOqL!U0L~4>YR1jO6BS8BHOB;SXf#l+~%cU$$RO+=7ZGP2V1|L zYqJv9rdqcS{jg&M;Y zH*PgufByb~d?@|>%%Q7oKcjFclb-)*xGAwZv)0n?{*->|eCSFG@v=F;zOmMEJNOUl M?dj7#JC(lpHzb`~TmS$7 diff --git a/src/main/resources/assets/betterend/textures/item/terminite_sword.png b/src/main/resources/assets/betterend/textures/item/terminite_sword.png index 857c6b3119641e13ab52ea66e748878f40c4e638..6e9b72f6b1f3dd0ac00071256e298475cf974e66 100644 GIT binary patch delta 430 zcmV;f0a5F-u!f7>1uK-g|R1I;E{G*mz?rBrUkLnYy@G z1^++{2py_}n{@72uuzhAuu6x{Njh{$7guv*(AgxH*r7kbDF*U795p7Uf%w6Jb2#7g zp7;GY7Wb)_a{{2N`@uojP!Kjm)X~Iva6&=hH@Sm9fM6^Gsegomu&%ZJZwkV?@EiqU zeO&mfe$^_%bClW3Q*90kL>&=z24MdR&Z}6f2+!8q_dM0+>D_!RzY(c~NF^ZUi=?k& zt)k3cUZo=gXLoab*yPQw3#iNO;S_)Tq;Oni^~C}!>DOexe75%2-w%%|36j3}uqiyp z*xlYx>F7{+wtq4MFJG5+vrGB_VrkJhI60y8@e?br(!JhxXOzI~wRQ3M0kr->qXq4b zg=?FhkpjT-LR9gG5q8Sw5PxFk(fB*kK_8rZ_egWG3FE`Hg=>rFPt7vtA>{n5n2&4g z?NkrGDoH(|XEWg36_^CUbc~(y8MM27k*tVgtj|n?h9`e~3)k-5v^#wQxV9PW#s9Nk Y0vAKI^{lFIKL7v#07*qoM6N<$f(c>S$p8QV literal 2116 zcmbVNTWB0r7@jntX=?(OwDbbD)2T>HJv(Ra7qd;%-Do1+7}CY2BG@x$&g>4|of&5) z*-c-%C!*mY~W=HAu!Q@!AlAgEzK8xsObuf4^VweYdlB10|`Nl?u z>Fjj#WARvSpNai)3faCzQq^)m(G1huR}Bz8Ok&m|1=mY+ccwq)Sl3Q-2b3Jl1sPIw z2akkg|B>N5K5`fvHrKbC?X8-WpiE-KR?8(XGOKB>&TG{xDu z&G;c>P9ml3!`!@X=ePAA5z0qom5wm%b7!7 z6eAClp=_F?Zl_$=Hf>9Sl7eO6sEQ0EA`8IMp$Y_BF=Pj0)e`Nw{aGK6C&^9rH|pH> zG3B^tRS+D@B9x6_%K(BVivY_vs4NWsF-4J^Dq*o|KqYW43(j;O*6)8Y~Ds6BiTR?}@1<{ry2PqO!bhKP9 zo5+$xpaF=cE5OlZ2k00Qph?&wj_5d+Va?;JD{Q#SFCCY9XPJX;5~s+9 z{qlOCA#0xcg}eBFs&57d7m-&Wbnft6;!i!Njnwe}&RYH5ys!BjoQ{ZO*_uuCrZwG& zN2x<3{cP>}x6HX?ujbqLoSb?3UF%l#+m4y()jdNJ zbMV4jryrU5{*SJoy04tx^zgpd+AhgG>sQ{DPi?HN`{4NOE6=e{N`nu*-R6DO)iwR+ zr|Z^!cl`E>^ZJV)s_ip3-|70Sc(q)+*wH?7V?)=~$;(v*cW_hNR^2&t^Ej%#e)-nX z$<@PCo8If#bY-f>eDl~BZ7<(oPB@*JZBu{!@Fx86#AsV5H@0Huq4z(keX@7!mSFSO zx8bu#@4mG5*Y%gKT|c$qX6=_Vv*-7;?>c#5ozXkO^lxC?OKru3h8Z|>@tJ*JraF>2 OKQu6$J-7GJ3;zHb2dy{&