From 16edfe03a499ff984cb87cdf07886d8787a99fe0 Mon Sep 17 00:00:00 2001 From: pahimar Date: Tue, 1 Apr 2014 16:11:52 -0400 Subject: [PATCH] Bunch more work on porting Items. More to come tonight --- .../pahimar/ee3/creativetab/CreativeTab.java | 4 +- .../pahimar/ee3/item/ItemAlchemicalDust.java | 4 +- .../pahimar/ee3/item/ItemAlchemicalFuel.java | 64 ++++++++++++ .../item/ItemAlchemicalInventoryUpgrade.java | 96 ++++++++++++++++++ .../java/com/pahimar/ee3/item/ItemChalk.java | 2 +- .../com/pahimar/ee3/item/ItemInertStone.java | 7 ++ .../com/pahimar/ee3/item/ItemMiniumShard.java | 8 ++ .../com/pahimar/ee3/item/ItemMiniumStone.java | 42 ++++++++ .../ee3/item/ItemPhilosophersStone.java | 35 +++++++ .../java/com/pahimar/ee3/item/ModItems.java | 24 +++-- .../com/pahimar/ee3/reference/Messages.java | 6 ++ .../java/com/pahimar/ee3/reference/Names.java | 15 ++- .../ee3/textures/items/stoneEffectFlame.png | Bin 548 -> 0 bytes .../ee3/textures/items/stonePhilosophers.png | Bin 540 -> 514 bytes .../items/stonePhilosophers.png.mcmeta | 7 ++ .../textures/xcf/items/stoneEffectFlame.xcf | Bin 1372 -> 0 bytes .../textures/xcf/items/stonePhilosophers.xcf | Bin 1296 -> 1302 bytes 17 files changed, 299 insertions(+), 15 deletions(-) create mode 100644 src/main/java/com/pahimar/ee3/reference/Messages.java delete mode 100644 src/main/resources/assets/ee3/textures/items/stoneEffectFlame.png create mode 100644 src/main/resources/assets/ee3/textures/items/stonePhilosophers.png.mcmeta delete mode 100644 src/main/resources/assets/ee3/textures/xcf/items/stoneEffectFlame.xcf diff --git a/src/main/java/com/pahimar/ee3/creativetab/CreativeTab.java b/src/main/java/com/pahimar/ee3/creativetab/CreativeTab.java index 0083f4b3..abbc8be6 100644 --- a/src/main/java/com/pahimar/ee3/creativetab/CreativeTab.java +++ b/src/main/java/com/pahimar/ee3/creativetab/CreativeTab.java @@ -1,10 +1,10 @@ package com.pahimar.ee3.creativetab; +import com.pahimar.ee3.item.ModItems; import com.pahimar.ee3.reference.Reference; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.init.Items; import net.minecraft.item.Item; public class CreativeTab @@ -14,7 +14,7 @@ public class CreativeTab @Override public Item getTabIconItem() { - return Items.baked_potato; + return ModItems.philosophersStone; } @Override diff --git a/src/main/java/com/pahimar/ee3/item/ItemAlchemicalDust.java b/src/main/java/com/pahimar/ee3/item/ItemAlchemicalDust.java index 172ac7a2..9bb91f7a 100644 --- a/src/main/java/com/pahimar/ee3/item/ItemAlchemicalDust.java +++ b/src/main/java/com/pahimar/ee3/item/ItemAlchemicalDust.java @@ -18,7 +18,7 @@ public class ItemAlchemicalDust extends ItemEE public ItemAlchemicalDust() { super(); - this.maxStackSize = 64; + this.setMaxStackSize(64); this.setHasSubtypes(true); this.setUnlocalizedName(Names.Items.ALCHEMICAL_DUST); } @@ -29,7 +29,7 @@ public class ItemAlchemicalDust extends ItemEE for (int meta = 0; meta < Names.Items.ALCHEMICAL_DUST_SUBTYPES.length; meta++) { - alchemicalDustStacks.add(new ItemStack(ModItems.itemAlchemicalDust, 1, meta)); + alchemicalDustStacks.add(new ItemStack(ModItems.alchemicalDust, 1, meta)); } return alchemicalDustStacks; diff --git a/src/main/java/com/pahimar/ee3/item/ItemAlchemicalFuel.java b/src/main/java/com/pahimar/ee3/item/ItemAlchemicalFuel.java index e4c2e9e4..8c4edc12 100644 --- a/src/main/java/com/pahimar/ee3/item/ItemAlchemicalFuel.java +++ b/src/main/java/com/pahimar/ee3/item/ItemAlchemicalFuel.java @@ -1,5 +1,69 @@ package com.pahimar.ee3.item; +import com.pahimar.ee3.reference.Names; +import com.pahimar.ee3.reference.Textures; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; +import net.minecraft.util.MathHelper; + +import java.util.List; + public class ItemAlchemicalFuel extends ItemEE { + @SideOnly(Side.CLIENT) + private IIcon[] icons; + + public ItemAlchemicalFuel() + { + super(); + this.setMaxStackSize(64); + this.setHasSubtypes(true); + this.setUnlocalizedName(Names.Items.ALCHEMICAL_FUEL); + } + + @Override + public String getUnlocalizedName() + { + return String.format("item.%s%s", Textures.RESOURCE_PREFIX, Names.Items.ALCHEMICAL_FUEL); + } + + @Override + public String getUnlocalizedName(ItemStack itemStack) + { + return String.format("item.%s%s.%s", Textures.RESOURCE_PREFIX, Names.Items.ALCHEMICAL_FUEL, Names.Items.ALCHEMICAL_FUEL_SUBTYPES[MathHelper.clamp_int(itemStack.getItemDamage(), 0, Names.Items.ALCHEMICAL_FUEL_SUBTYPES.length - 1)]); + } + + @Override + @SideOnly(Side.CLIENT) + public void getSubItems(Item item, CreativeTabs creativeTab, List list) + { + for (int meta = 0; meta < Names.Items.ALCHEMICAL_FUEL_SUBTYPES.length; ++meta) + { + list.add(new ItemStack(this, 1, meta)); + } + } + + @Override + @SideOnly(Side.CLIENT) + public IIcon getIconFromDamage(int meta) + { + return icons[MathHelper.clamp_int(meta, 0, Names.Items.ALCHEMICAL_FUEL_SUBTYPES.length - 1)]; + } + + @Override + @SideOnly(Side.CLIENT) + public void registerIcons(IIconRegister iconRegister) + { + icons = new IIcon[Names.Items.ALCHEMICAL_FUEL_SUBTYPES.length]; + + for (int i = 0; i < Names.Items.ALCHEMICAL_FUEL_SUBTYPES.length; i++) + { + icons[i] = iconRegister.registerIcon(Textures.RESOURCE_PREFIX + Names.Items.ALCHEMICAL_FUEL + "." + Names.Items.ALCHEMICAL_FUEL_SUBTYPES[i]); + } + } } diff --git a/src/main/java/com/pahimar/ee3/item/ItemAlchemicalInventoryUpgrade.java b/src/main/java/com/pahimar/ee3/item/ItemAlchemicalInventoryUpgrade.java index eaca3ade..89a710b8 100644 --- a/src/main/java/com/pahimar/ee3/item/ItemAlchemicalInventoryUpgrade.java +++ b/src/main/java/com/pahimar/ee3/item/ItemAlchemicalInventoryUpgrade.java @@ -1,5 +1,101 @@ package com.pahimar.ee3.item; +import com.pahimar.ee3.reference.Colors; +import com.pahimar.ee3.reference.Messages; +import com.pahimar.ee3.reference.Names; +import com.pahimar.ee3.reference.Textures; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumChatFormatting; +import net.minecraft.util.MathHelper; +import net.minecraft.util.StatCollector; + +import java.util.List; + public class ItemAlchemicalInventoryUpgrade extends ItemEE { + public ItemAlchemicalInventoryUpgrade() + { + super(); + this.setMaxStackSize(64); + this.setUnlocalizedName(Names.Items.ALCHEMICAL_UPGRADE); + this.setHasSubtypes(true); + } + + @Override + public String getUnlocalizedName() + { + return String.format("item.%s%s", Textures.RESOURCE_PREFIX, Names.Items.ALCHEMICAL_UPGRADE); + } + + @Override + public String getUnlocalizedName(ItemStack itemStack) + { + return String.format("item.%s%s.%s", Textures.RESOURCE_PREFIX, Names.Items.ALCHEMICAL_UPGRADE, Names.Items.ALCHEMICAL_UPGRADE_SUBTYPES[MathHelper.clamp_int(itemStack.getItemDamage(), 0, Names.Items.ALCHEMICAL_UPGRADE_SUBTYPES.length - 1)]); + } + + @Override + @SideOnly(Side.CLIENT) + public void getSubItems(Item item, CreativeTabs creativeTab, List list) + { + for (int meta = 0; meta < Names.Items.ALCHEMICAL_UPGRADE_SUBTYPES.length; ++meta) + { + list.add(new ItemStack(this, 1, meta)); + } + } + + @Override + @SideOnly(Side.CLIENT) + public int getColorFromItemStack(ItemStack itemStack, int renderPass) + { + if (itemStack.getItemDamage() == 0) + { + return Integer.parseInt(Colors.DUST_VERDANT, 16); + } + else if (itemStack.getItemDamage() == 1) + { + return Integer.parseInt(Colors.DUST_AZURE, 16); + } + else if (itemStack.getItemDamage() == 2) + { + return Integer.parseInt(Colors.DUST_MINIUM, 16); + } + + return Integer.parseInt(Colors.PURE_WHITE, 16); + } + + @Override + @SideOnly(Side.CLIENT) + public void addInformation(ItemStack itemStack, EntityPlayer entityPlayer, List list, boolean flag) + { + list.add(StatCollector.translateToLocal(Messages.UPGRADES_CHESTS)); + } + + @Override + public String getItemStackDisplayName(ItemStack itemStack) + { + switch (MathHelper.clamp_int(itemStack.getItemDamage(), 0, Names.Items.ALCHEMICAL_UPGRADE_SUBTYPES.length - 1)) + { + case 0: + { + return EnumChatFormatting.GREEN + super.getItemStackDisplayName(itemStack); + } + case 1: + { + return EnumChatFormatting.BLUE + super.getItemStackDisplayName(itemStack); + } + case 2: + { + return EnumChatFormatting.RED + super.getItemStackDisplayName(itemStack); + } + default: + { + return EnumChatFormatting.WHITE + super.getItemStackDisplayName(itemStack); + } + } + } } diff --git a/src/main/java/com/pahimar/ee3/item/ItemChalk.java b/src/main/java/com/pahimar/ee3/item/ItemChalk.java index 29fe211a..65cb0c40 100644 --- a/src/main/java/com/pahimar/ee3/item/ItemChalk.java +++ b/src/main/java/com/pahimar/ee3/item/ItemChalk.java @@ -7,7 +7,7 @@ public class ItemChalk extends ItemEE public ItemChalk() { super(); - this.maxStackSize = 64; + this.setMaxStackSize(64); this.setUnlocalizedName(Names.Items.CHALK); } } \ No newline at end of file diff --git a/src/main/java/com/pahimar/ee3/item/ItemInertStone.java b/src/main/java/com/pahimar/ee3/item/ItemInertStone.java index bd302190..d46570d9 100644 --- a/src/main/java/com/pahimar/ee3/item/ItemInertStone.java +++ b/src/main/java/com/pahimar/ee3/item/ItemInertStone.java @@ -1,5 +1,12 @@ package com.pahimar.ee3.item; +import com.pahimar.ee3.reference.Names; + public class ItemInertStone extends ItemEE { + public ItemInertStone() + { + super(); + this.setUnlocalizedName(Names.Items.INERT_STONE); + } } diff --git a/src/main/java/com/pahimar/ee3/item/ItemMiniumShard.java b/src/main/java/com/pahimar/ee3/item/ItemMiniumShard.java index 6404f2fd..898ae446 100644 --- a/src/main/java/com/pahimar/ee3/item/ItemMiniumShard.java +++ b/src/main/java/com/pahimar/ee3/item/ItemMiniumShard.java @@ -1,5 +1,13 @@ package com.pahimar.ee3.item; +import com.pahimar.ee3.reference.Names; + public class ItemMiniumShard extends ItemEE { + public ItemMiniumShard() + { + super(); + this.setMaxStackSize(64); + this.setUnlocalizedName(Names.Items.MINIUM_SHARD); + } } diff --git a/src/main/java/com/pahimar/ee3/item/ItemMiniumStone.java b/src/main/java/com/pahimar/ee3/item/ItemMiniumStone.java index b4296e0c..4f174f94 100644 --- a/src/main/java/com/pahimar/ee3/item/ItemMiniumStone.java +++ b/src/main/java/com/pahimar/ee3/item/ItemMiniumStone.java @@ -1,5 +1,47 @@ package com.pahimar.ee3.item; +import com.pahimar.ee3.reference.Names; +import com.pahimar.ee3.util.NBTHelper; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.item.ItemStack; + public class ItemMiniumStone extends ItemEE { + public ItemMiniumStone() + { + super(); + this.setUnlocalizedName(Names.Items.MINIUM_STONE); + this.setMaxDamage(1000); // TODO Get this from configs + } + + @Override + public boolean doesContainerItemLeaveCraftingGrid(ItemStack itemStack) + { + return false; + } + + @Override + public boolean getShareTag() + { + return true; + } + + @Override + public ItemStack getContainerItem(ItemStack itemStack) + { + ItemStack copiedStack = itemStack.copy(); + + copiedStack.setItemDamage(copiedStack.getItemDamage() + 1); + copiedStack.stackSize = 1; + + return copiedStack; + } + + @Override + @SideOnly(Side.CLIENT) + public boolean hasEffect(ItemStack itemStack, int renderPass) + { + return NBTHelper.hasTag(itemStack, Names.NBT.CRAFTING_GUI_OPEN) || NBTHelper.hasTag(itemStack, Names.NBT.TRANSMUTATION_GUI_OPEN); + } } diff --git a/src/main/java/com/pahimar/ee3/item/ItemPhilosophersStone.java b/src/main/java/com/pahimar/ee3/item/ItemPhilosophersStone.java index f5f7fd1d..42437667 100644 --- a/src/main/java/com/pahimar/ee3/item/ItemPhilosophersStone.java +++ b/src/main/java/com/pahimar/ee3/item/ItemPhilosophersStone.java @@ -1,5 +1,40 @@ package com.pahimar.ee3.item; +import com.pahimar.ee3.reference.Names; +import net.minecraft.item.ItemStack; + public class ItemPhilosophersStone extends ItemEE { + private int maxChargeLevel; + + public ItemPhilosophersStone() + { + super(); + this.setUnlocalizedName(Names.Items.PHILOSOPHERS_STONE); + this.setMaxDamage(1000); + this.maxChargeLevel = 3; + } + + @Override + public boolean doesContainerItemLeaveCraftingGrid(ItemStack itemStack) + { + return false; + } + + @Override + public boolean getShareTag() + { + return true; + } + + @Override + public ItemStack getContainerItem(ItemStack itemStack) + { + ItemStack copiedStack = itemStack.copy(); + + copiedStack.setItemDamage(copiedStack.getItemDamage() + 1); + copiedStack.stackSize = 1; + + return copiedStack; + } } diff --git a/src/main/java/com/pahimar/ee3/item/ModItems.java b/src/main/java/com/pahimar/ee3/item/ModItems.java index 1a6c156f..3ea1aeed 100644 --- a/src/main/java/com/pahimar/ee3/item/ModItems.java +++ b/src/main/java/com/pahimar/ee3/item/ModItems.java @@ -6,14 +6,26 @@ import net.minecraft.item.Item; public class ModItems { - public static final Item itemAlchemicalBag = new ItemAlchemicalBag(); - public static final Item itemAlchemicalDust = new ItemAlchemicalDust(); - public static final Item itemChalk = new ItemChalk(); + public static final Item alchemicalBag = new ItemAlchemicalBag(); + public static final Item alchemicalDust = new ItemAlchemicalDust(); + public static final Item alchemicalFuel = new ItemAlchemicalFuel(); + public static final Item inertStone = new ItemInertStone(); + public static final Item miniumShard = new ItemMiniumShard(); + public static final Item miniumStone = new ItemMiniumStone(); + public static final Item philosophersStone = new ItemPhilosophersStone(); + public static final Item alchemicalInventoryUpgrade = new ItemAlchemicalInventoryUpgrade(); + public static final Item chalk = new ItemChalk(); public static void init() { - GameRegistry.registerItem(itemAlchemicalBag, "item." + Names.Items.ALCHEMICAL_BAG); - GameRegistry.registerItem(itemAlchemicalDust, "item." + Names.Items.ALCHEMICAL_DUST); - GameRegistry.registerItem(itemChalk, "item." + Names.Items.CHALK); + GameRegistry.registerItem(alchemicalBag, "item." + Names.Items.ALCHEMICAL_BAG); + GameRegistry.registerItem(alchemicalDust, "item." + Names.Items.ALCHEMICAL_DUST); + GameRegistry.registerItem(alchemicalFuel, "item." + Names.Items.ALCHEMICAL_FUEL); + GameRegistry.registerItem(inertStone, "item." + Names.Items.INERT_STONE); + GameRegistry.registerItem(miniumShard, "item." + Names.Items.MINIUM_SHARD); + GameRegistry.registerItem(miniumStone, "item." + Names.Items.MINIUM_STONE); + GameRegistry.registerItem(philosophersStone, "item." + Names.Items.PHILOSOPHERS_STONE); + GameRegistry.registerItem(chalk, "item." + Names.Items.CHALK); + GameRegistry.registerItem(alchemicalInventoryUpgrade, "item." + Names.Items.ALCHEMICAL_UPGRADE); } } diff --git a/src/main/java/com/pahimar/ee3/reference/Messages.java b/src/main/java/com/pahimar/ee3/reference/Messages.java new file mode 100644 index 00000000..fefed9bf --- /dev/null +++ b/src/main/java/com/pahimar/ee3/reference/Messages.java @@ -0,0 +1,6 @@ +package com.pahimar.ee3.reference; + +public class Messages +{ + public static final String UPGRADES_CHESTS = "tooltip.ee3:upgradesPrefix"; +} diff --git a/src/main/java/com/pahimar/ee3/reference/Names.java b/src/main/java/com/pahimar/ee3/reference/Names.java index df7e9016..089e79d6 100644 --- a/src/main/java/com/pahimar/ee3/reference/Names.java +++ b/src/main/java/com/pahimar/ee3/reference/Names.java @@ -7,11 +7,18 @@ public class Names public static final String ALCHEMICAL_BAG = "alchemicalBag"; public static final String ALCHEMICAL_DUST = "alchemicalDust"; public static final String[] ALCHEMICAL_DUST_SUBTYPES = {"ash", "verdant", "azure", "minium"}; - public static final String ALCHEMICAL_COAL_NAME = "alchemicalCoal"; - public static final String MOBIUS_FUEL_NAME = "mobiusFuel"; - public static final String AETERNALIS_FUEL_NAME = "aeternalisFuel"; - public static final String[] ALCHEMICAL_FUEL_SUBTYPES = {ALCHEMICAL_COAL_NAME, MOBIUS_FUEL_NAME, AETERNALIS_FUEL_NAME}; + public static final String ALCHEMICAL_FUEL = "alchemicalFuel"; + public static final String ALCHEMICAL_COAL = "alchemicalCoal"; + public static final String MOBIUS_FUEL = "mobiusFuel"; + public static final String AETERNALIS_FUEL = "aeternalisFuel"; + public static final String[] ALCHEMICAL_FUEL_SUBTYPES = {ALCHEMICAL_COAL, MOBIUS_FUEL, AETERNALIS_FUEL}; public static final String CHALK = "chalk"; + public static final String INERT_STONE = "stoneInert"; + public static final String MINIUM_SHARD = "shardMinium"; + public static final String MINIUM_STONE = "stoneMinium"; + public static final String PHILOSOPHERS_STONE = "stonePhilosophers"; + public static final String ALCHEMICAL_UPGRADE = "alchemicalUpgrade"; + public static final String[] ALCHEMICAL_UPGRADE_SUBTYPES = {"verdant", "azure", "minium"}; } public static class NBT diff --git a/src/main/resources/assets/ee3/textures/items/stoneEffectFlame.png b/src/main/resources/assets/ee3/textures/items/stoneEffectFlame.png deleted file mode 100644 index 6a1ce03aa934d6056194394403ff9163323a924b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 548 zcmV+<0^9wGP)zMRwQCC1QJj7?}5%`Mr7n zfj4x?S52RNJ}d7jUDWiy>%Vt(ya9-$UIb7;a$M?x(o(2@ynQBYAu_p__?b9EAcRQRp_k9op z5Kv&g+y)@$W|`btWpZm3fakE2pvIgL0Cty1yfAUHc8aW+>7nL6haD!|46ezr*d1r> z6q)g70T=<8@n>QCDjMB#_wyiW^h`F&TiCEY05`*4ivtnVH~=Y7?@J%P{dxt&hrqV* zOg0Hu9MC7g64-|b)bl~|N0I;}e<#$rn4?=S|J+0ji~CtrSmWsEL(gLjd+J m@>+8rNypwrUelBQKY9UmhPv~>+u~#Z000036ASSPQV4>0d4m+O4C<12$(l)aEH<-d zlZdT99GF?o`ObgN4*a5fmR0xNVMg(nx|3?oj_UnZ#_ofN-mV#Le?%Eu9VBNXiM!Pp zb6F4b{4r89)J>ms(rh1l>Ht_Xrbt+E09@IikbHttv{C4wjICTU6p~(~FpvbG`t{CR zyT!Hn%31YMXovyel3_0E0g$lbOzf{SvA+&L({F{S5i>B{&d!IsF!Ui`3TzKj({C|u z#juPREA27zC75>7e?L2zcG7VC(6KIgIlKr9Z6n?}H;}&92R80OH4Vg>vfG)r-K}|sb0I`n?{9y%=Auxa40|XKdHsmdb-v9ssnMp)JR5;7c zl08c+K@^6cGwUuJ#OoDBJ5y=nZNvmYu&}dJY{V*9SZZNyBUo%@VSa#E%7rU-b{2vl zD*l2Lu?*@GzY?8f$6`OSOLDRGg#$CgInO!s&cJ_k!(3+XG0C?|C)K@;uCoeGSB>=Q zIK+PqyQ6+Md+k>p1VQBH$< zeEl3HYXlHu@O1+nw0YETTv&C=+cVO2h0T9w06gjU7Sv)(3_id6tPy3Wg${YE;DuJZy&Jn7HT7kN>v{I%Fjy#N3J M07*qoM6N<$f`VY!)c^nh diff --git a/src/main/resources/assets/ee3/textures/items/stonePhilosophers.png.mcmeta b/src/main/resources/assets/ee3/textures/items/stonePhilosophers.png.mcmeta new file mode 100644 index 00000000..e586534f --- /dev/null +++ b/src/main/resources/assets/ee3/textures/items/stonePhilosophers.png.mcmeta @@ -0,0 +1,7 @@ +{ + "animation": { + "frames": [ + + ] + } +} diff --git a/src/main/resources/assets/ee3/textures/xcf/items/stoneEffectFlame.xcf b/src/main/resources/assets/ee3/textures/xcf/items/stoneEffectFlame.xcf deleted file mode 100644 index 846b8b1de5e8997eb7842a1e9b6ef29bbd170c89..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1372 zcmZ`(L2nX46rLF@)@oIPPDt9-H6~4az~~$|=|Q80gbPGWgE5mJE)+w-6inJ)y>Rr> zL(@Ni2kuTZSIkPSZZnMA zp%G5NILDNPEk66g7#YSL*cDg|CPPelcagt}^>!6y)3u#a)lOG;YwtlZ#5r4UwfF0` z*=p8n?>Cm#E7fwd-rP0UgC)INeOEFcKYARDOTd#bv;pb6OQccU{68S+Uh8A2Tx(R# zC(&LY_b($uF8!%dYn!!3dE0K0zFDcX?Dn4nlKNk2&RmqzJ%odQju6)9(u2Ex)owOy z^JTrXW1BB36}#M~OcAEXvC`H1u*DFQ>{^JiFnR*Yp|J#u@bz=}#yPxv4&MT%y3x1_ z5b4i9dl(llLlCuqT=C{2Cq9tBz-BJKfLVvd+0PDRLx$-DwS_x7(LzsM&vnt}_++Sc z&vAO1>p(F*apA|DLHAf|moeAV&iC(5-|2R>M?RwD^ZvMZtcR$q9pQ}nj?;%??)OFi z$2Z669%|g14*_@hw~5n30=AqEb&se?4+%pMTzkj8uITbZ4+12(zSf805d1I@xLW%- z^UTK~AKbfh7S(TZWLKr;6c9If6r44IGv#s*LbJ0Q69k|`-9 zPk6|Wv9p1c36TK3E#YG00iu|=d_b>a(W|V{tE@3*GfZ)M6>An(LQO4YS#@r8dPT_=7-zL*#Mn zSsv#My7Q?!pSq)$r=N|Frq2kWoWB5Dqy!GI#3mH?@dMy~AX{S7K=Jo_lO%y|nNV!L MMX(PhLGDBL8_W-0)c^nh diff --git a/src/main/resources/assets/ee3/textures/xcf/items/stonePhilosophers.xcf b/src/main/resources/assets/ee3/textures/xcf/items/stonePhilosophers.xcf index c4aaf9d3ff2bc1734a0e545cf792b4e53a5eb9cf..0f0b2d3b703498713c153e5e38373d46344a7cf2 100644 GIT binary patch delta 370 zcmYk1F-ikL6o&tq$*v?OMF>8&NfiqVv6ylpiej-~lLbN2OrrrS4`5-PGO)xZ7f2J( z3*-cQg%o>)Af(C8Jl|T$%p2av4ahDA^|U}8P+r)nBvVmUxaoi1EsCr)`w*eMeaLjC#@^m*oM%&_0Tv;WTj-dS`OSIT@`-|F)Ov= z`DwBXNnt}uni@;i?o*^QqVZ%hCPl&SQ>0c{P1Hl3-w~CU$!sbgk-xdmb*@I9iv8ZU sAR6hB=x=mjqC#v#AwB~bf{AT7iYc^XODcimX#Q35r>8R0mf0cv0))?UI{*Lx