From c494edc88b334b4bf45e5a29a9859b32c43cc0a4 Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Sun, 25 Oct 2015 23:19:01 +0100 Subject: [PATCH] Added SimpleOres AIOTs --- .../config/values/ConfigBoolValues.java | 3 +- .../items/InitForeignPaxels.java | 84 +++++++++++++----- .../actuallyadditions/items/InitItems.java | 16 ++-- .../items/tools/ItemAllToolAA.java | 27 ++++-- .../assets/actuallyadditions/lang/en_US.lang | 5 ++ .../textures/items/diamondPaxel.png | Bin 442 -> 0 bytes .../textures/items/emeraldPaxel.png | Bin 477 -> 0 bytes .../textures/items/goldPaxel.png | Bin 486 -> 0 bytes .../textures/items/ironPaxel.png | Bin 473 -> 0 bytes .../textures/items/obsidianPaxel.png | Bin 456 -> 0 bytes .../textures/items/paxelMTBronze.png | Bin 496 -> 0 bytes .../textures/items/paxelMTGlowstone.png | Bin 492 -> 0 bytes .../textures/items/paxelMTLapisLazuli.png | Bin 501 -> 0 bytes .../textures/items/paxelMTObsidian.png | Bin 456 -> 0 bytes .../textures/items/paxelMTOsmium.png | Bin 497 -> 0 bytes .../textures/items/paxelMTSteel.png | Bin 503 -> 0 bytes .../textures/items/paxelTFBronze.png | Bin 496 -> 0 bytes .../textures/items/paxelTFCopper.png | Bin 495 -> 0 bytes .../textures/items/paxelTFElectrum.png | Bin 495 -> 0 bytes .../textures/items/paxelTFInvar.png | Bin 500 -> 0 bytes .../textures/items/paxelTFLead.png | Bin 501 -> 0 bytes .../textures/items/paxelTFNickel.png | Bin 496 -> 0 bytes .../textures/items/paxelTFPlatinum.png | Bin 507 -> 0 bytes .../textures/items/paxelTFSilver.png | Bin 479 -> 0 bytes .../textures/items/paxelTFTin.png | Bin 503 -> 0 bytes .../textures/items/quartzPaxel.png | Bin 420 -> 0 bytes .../textures/items/stonePaxel.png | Bin 465 -> 0 bytes .../textures/items/woodenPaxel.png | Bin 467 -> 0 bytes 28 files changed, 101 insertions(+), 34 deletions(-) delete mode 100644 src/main/resources/assets/actuallyadditions/textures/items/diamondPaxel.png delete mode 100644 src/main/resources/assets/actuallyadditions/textures/items/emeraldPaxel.png delete mode 100644 src/main/resources/assets/actuallyadditions/textures/items/goldPaxel.png delete mode 100644 src/main/resources/assets/actuallyadditions/textures/items/ironPaxel.png delete mode 100644 src/main/resources/assets/actuallyadditions/textures/items/obsidianPaxel.png delete mode 100644 src/main/resources/assets/actuallyadditions/textures/items/paxelMTBronze.png delete mode 100644 src/main/resources/assets/actuallyadditions/textures/items/paxelMTGlowstone.png delete mode 100644 src/main/resources/assets/actuallyadditions/textures/items/paxelMTLapisLazuli.png delete mode 100644 src/main/resources/assets/actuallyadditions/textures/items/paxelMTObsidian.png delete mode 100644 src/main/resources/assets/actuallyadditions/textures/items/paxelMTOsmium.png delete mode 100644 src/main/resources/assets/actuallyadditions/textures/items/paxelMTSteel.png delete mode 100644 src/main/resources/assets/actuallyadditions/textures/items/paxelTFBronze.png delete mode 100644 src/main/resources/assets/actuallyadditions/textures/items/paxelTFCopper.png delete mode 100644 src/main/resources/assets/actuallyadditions/textures/items/paxelTFElectrum.png delete mode 100644 src/main/resources/assets/actuallyadditions/textures/items/paxelTFInvar.png delete mode 100644 src/main/resources/assets/actuallyadditions/textures/items/paxelTFLead.png delete mode 100644 src/main/resources/assets/actuallyadditions/textures/items/paxelTFNickel.png delete mode 100644 src/main/resources/assets/actuallyadditions/textures/items/paxelTFPlatinum.png delete mode 100644 src/main/resources/assets/actuallyadditions/textures/items/paxelTFSilver.png delete mode 100644 src/main/resources/assets/actuallyadditions/textures/items/paxelTFTin.png delete mode 100644 src/main/resources/assets/actuallyadditions/textures/items/quartzPaxel.png delete mode 100644 src/main/resources/assets/actuallyadditions/textures/items/stonePaxel.png delete mode 100644 src/main/resources/assets/actuallyadditions/textures/items/woodenPaxel.png diff --git a/src/main/java/ellpeck/actuallyadditions/config/values/ConfigBoolValues.java b/src/main/java/ellpeck/actuallyadditions/config/values/ConfigBoolValues.java index 90e927631..0cf99c68c 100644 --- a/src/main/java/ellpeck/actuallyadditions/config/values/ConfigBoolValues.java +++ b/src/main/java/ellpeck/actuallyadditions/config/values/ConfigBoolValues.java @@ -34,7 +34,8 @@ public enum ConfigBoolValues{ TF_PAXELS("Thermal Foundation Paxels", ConfigCategories.OTHER, true, "If Paxels made of Thermal Foundation Materials should exist"), MT_PAXELS("MekanismTools Paxels", ConfigCategories.OTHER, true, "If Paxels made of MekanismTools Materials should exist"), - DUPLICATE_PAXELS("Allow Duplicate Paxels", ConfigCategories.OTHER, true, "If Paxels are allowed to have Duplicates (for Example ActuallyAdditions' Obsidian and MekanismTools' Obsidian)"), + SO_PAXELS("Simpleores Paxels", ConfigCategories.OTHER, true, "If Paxels made of SimpleOres Materials should exist"), + NR_PAXLES("NetherRocks Paxels", ConfigCategories.OTHER, true, "If Paxels made of Netherrock Materials should exist"), DO_RICE_GEN("Rice Gen", ConfigCategories.WORLD_GEN, true, "If Rice should generate in the World"), DO_CANOLA_GEN("Canola Gen", ConfigCategories.WORLD_GEN, true, "If Canola should generate in the World"), diff --git a/src/main/java/ellpeck/actuallyadditions/items/InitForeignPaxels.java b/src/main/java/ellpeck/actuallyadditions/items/InitForeignPaxels.java index f7d97186e..0199ee876 100644 --- a/src/main/java/ellpeck/actuallyadditions/items/InitForeignPaxels.java +++ b/src/main/java/ellpeck/actuallyadditions/items/InitForeignPaxels.java @@ -27,37 +27,76 @@ import net.minecraftforge.oredict.ShapelessOreRecipe; public class InitForeignPaxels{ - public static final String[] MT_NAMES = new String[]{"Obsidian", "LapisLazuli", "Osmium", "Bronze", "Glowstone", "Steel"}; - private static final String THERMAL_FOUNDATION = "ThermalFoundation"; + //MekanismTools private static final String MEKANISM_TOOLS = "MekanismTools"; - private static final String[] TF_NAMES = new String[]{"Copper", "Tin", "Silver", "Lead", "Nickel", "Electrum", "Bronze", "Platinum", "Invar"}; + public static final int[] MT_COLORS = new int[]{4166, 2248890, 8882649, 12410135, 11451392, 3684412}; + public static final String[] MT_NAMES = new String[]{"Obsidian", "LapisLazuli", "Osmium", "Bronze", "Glowstone", "Steel"}; private static final String[] MT_REPAIR_NAMES = new String[]{"ingotRefinedObsidian", "gemLapis", "ingotOsmium", "ingotBronze", "ingotRefinedGlowstone", "ingotSteel"}; - public static Item[] tfPaxels = new Item[9]; private static Item[] mtPaxels = new Item[6]; + //ThermalFoundation + private static final String THERMAL_FOUNDATION = "ThermalFoundation"; + public static final int[] TF_COLORS = new int[]{13332762, 5407943, 5407895, 5394789, 12960613, 12960653, 12410135, 2999795, 10143162}; + private static final String[] TF_NAMES = new String[]{"Copper", "Tin", "Silver", "Lead", "Nickel", "Electrum", "Bronze", "Platinum", "Invar"}; + public static Item[] tfPaxels = new Item[9]; + + //SimpleOres + private static final String SIMPLE_ORES = "simpleores"; + public static final int[] SO_COLORS = new int[]{9409450, 2040021, 5714944, 526344, 545032}; + private static final String[] SO_NAMES = new String[]{"tin", "mythril", "copper", "onyx", "adamantium"}; + private static final String[] SO_REPAIR_NAMES = new String[]{"ingotTin", "ingotMythril", "ingotCopper", "gemOnyx", "ingotAdamantium"}; + public static Item[] soPaxels = new Item[5]; + public static void init(){ + //SimpleOres + if(ConfigBoolValues.SO_PAXELS.isEnabled()){ + if(Loader.isModLoaded(SIMPLE_ORES)){ + ModUtil.LOGGER.info("Initializing "+SIMPLE_ORES+" AIOTs..."); + + for(int i = 0; i < soPaxels.length; i++){ + Item axe = ItemUtil.getItemFromName(SIMPLE_ORES+":"+SO_NAMES[i]+"_axe"); + Item pickaxe = ItemUtil.getItemFromName(SIMPLE_ORES+":"+SO_NAMES[i]+"_pickaxe"); + Item hoe = ItemUtil.getItemFromName(SIMPLE_ORES+":"+SO_NAMES[i]+"_hoe"); + Item sword = ItemUtil.getItemFromName(SIMPLE_ORES+":"+SO_NAMES[i]+"_sword"); + Item shovel = ItemUtil.getItemFromName(SIMPLE_ORES+":"+SO_NAMES[i]+"_shovel"); + + if(axe != null && pickaxe != null && hoe != null && sword != null && shovel != null && axe instanceof ItemTool){ + Item.ToolMaterial material = ((ItemTool)axe).func_150913_i(); + soPaxels[i] = new ItemAllToolAA(material, SO_REPAIR_NAMES[i], "paxelSO"+SO_NAMES[i], EnumRarity.rare, SO_COLORS[i]); + ItemUtil.register(soPaxels[i]); + + if(ConfigCrafting.PAXELS.isEnabled()){ + GameRegistry.addRecipe(new ShapelessOreRecipe(soPaxels[i], axe, pickaxe, hoe, sword, shovel)); + ToolCrafting.recipesPaxels.add(Util.GetRecipes.lastIRecipe()); + } + } + } + } + else{ + ModUtil.LOGGER.info(SIMPLE_ORES+" not loaded, can't initialize Special AIOTs."); + } + } + //MekanismTools if(ConfigBoolValues.MT_PAXELS.isEnabled()){ if(Loader.isModLoaded(MEKANISM_TOOLS)){ ModUtil.LOGGER.info("Initializing "+MEKANISM_TOOLS+" AIOTs..."); for(int i = 0; i < mtPaxels.length; i++){ - if(!(!ConfigBoolValues.DUPLICATE_PAXELS.isEnabled() && (i == 0 || (i == 3 && ConfigBoolValues.TF_PAXELS.isEnabled() && Loader.isModLoaded(THERMAL_FOUNDATION))))){ - Item axe = ItemUtil.getItemFromName(MEKANISM_TOOLS+":"+MT_NAMES[i]+"Axe"); - Item pickaxe = ItemUtil.getItemFromName(MEKANISM_TOOLS+":"+MT_NAMES[i]+"Pickaxe"); - Item hoe = ItemUtil.getItemFromName(MEKANISM_TOOLS+":"+MT_NAMES[i]+"Hoe"); - Item sword = ItemUtil.getItemFromName(MEKANISM_TOOLS+":"+MT_NAMES[i]+"Sword"); - Item shovel = ItemUtil.getItemFromName(MEKANISM_TOOLS+":"+MT_NAMES[i]+"Shovel"); + Item axe = ItemUtil.getItemFromName(MEKANISM_TOOLS+":"+MT_NAMES[i]+"Axe"); + Item pickaxe = ItemUtil.getItemFromName(MEKANISM_TOOLS+":"+MT_NAMES[i]+"Pickaxe"); + Item hoe = ItemUtil.getItemFromName(MEKANISM_TOOLS+":"+MT_NAMES[i]+"Hoe"); + Item sword = ItemUtil.getItemFromName(MEKANISM_TOOLS+":"+MT_NAMES[i]+"Sword"); + Item shovel = ItemUtil.getItemFromName(MEKANISM_TOOLS+":"+MT_NAMES[i]+"Shovel"); - if(axe != null && pickaxe != null && hoe != null && sword != null && shovel != null && axe instanceof ItemTool){ - Item.ToolMaterial material = ((ItemTool)axe).func_150913_i(); - mtPaxels[i] = new ItemAllToolAA(material, MT_REPAIR_NAMES[i], "paxelMT"+MT_NAMES[i], EnumRarity.rare); - ItemUtil.register(mtPaxels[i]); + if(axe != null && pickaxe != null && hoe != null && sword != null && shovel != null && axe instanceof ItemTool){ + Item.ToolMaterial material = ((ItemTool)axe).func_150913_i(); + mtPaxels[i] = new ItemAllToolAA(material, MT_REPAIR_NAMES[i], "paxelMT"+MT_NAMES[i], EnumRarity.rare, MT_COLORS[i]); + ItemUtil.register(mtPaxels[i]); - if(ConfigCrafting.PAXELS.isEnabled()){ - GameRegistry.addRecipe(new ShapelessOreRecipe(mtPaxels[i], axe, pickaxe, hoe, sword, shovel)); - ToolCrafting.recipesPaxels.add(Util.GetRecipes.lastIRecipe()); - } + if(ConfigCrafting.PAXELS.isEnabled()){ + GameRegistry.addRecipe(new ShapelessOreRecipe(mtPaxels[i], axe, pickaxe, hoe, sword, shovel)); + ToolCrafting.recipesPaxels.add(Util.GetRecipes.lastIRecipe()); } } } @@ -67,7 +106,7 @@ public class InitForeignPaxels{ } } - //Thermal Foundation + //ThermalFoundation if(ConfigBoolValues.TF_PAXELS.isEnabled()){ if(Loader.isModLoaded(THERMAL_FOUNDATION)){ ModUtil.LOGGER.info("Initializing "+THERMAL_FOUNDATION+" AIOTs..."); @@ -81,7 +120,7 @@ public class InitForeignPaxels{ if(axe != null && pickaxe != null && hoe != null && sword != null && shovel != null && axe instanceof ItemTool){ Item.ToolMaterial material = ((ItemTool)axe).func_150913_i(); - tfPaxels[i] = new ItemAllToolAA(material, "ingot"+TF_NAMES[i], "paxelTF"+TF_NAMES[i], EnumRarity.rare); + tfPaxels[i] = new ItemAllToolAA(material, "ingot"+TF_NAMES[i], "paxelTF"+TF_NAMES[i], EnumRarity.rare, TF_COLORS[i]); ItemUtil.register(tfPaxels[i]); if(ConfigCrafting.PAXELS.isEnabled()){ @@ -108,5 +147,10 @@ public class InitForeignPaxels{ CreativeTab.instance.add(item); } } + for(Item item : soPaxels){ + if(item != null){ + CreativeTab.instance.add(item); + } + } } } diff --git a/src/main/java/ellpeck/actuallyadditions/items/InitItems.java b/src/main/java/ellpeck/actuallyadditions/items/InitItems.java index d50739037..4614e6b86 100644 --- a/src/main/java/ellpeck/actuallyadditions/items/InitItems.java +++ b/src/main/java/ellpeck/actuallyadditions/items/InitItems.java @@ -291,14 +291,14 @@ public class InitItems{ itemHoeQuartz = new ItemHoeAA(InitToolMaterials.toolMaterialQuartz, "gemQuartzBlack", "itemHoeQuartz", EnumRarity.rare); ItemUtil.registerItems(new Item[]{itemPickaxeQuartz, itemAxeQuartz, itemShovelQuartz, itemSwordQuartz, itemHoeQuartz}); - woodenPaxel = new ItemAllToolAA(Item.ToolMaterial.WOOD, "plankWood", "woodenPaxel", EnumRarity.uncommon); - stonePaxel = new ItemAllToolAA(Item.ToolMaterial.STONE, "stone", "stonePaxel", EnumRarity.uncommon); - ironPaxel = new ItemAllToolAA(Item.ToolMaterial.IRON, "ingotIron", "ironPaxel", EnumRarity.rare); - goldPaxel = new ItemAllToolAA(Item.ToolMaterial.GOLD, "ingotGold", "goldPaxel", EnumRarity.rare); - diamondPaxel = new ItemAllToolAA(Item.ToolMaterial.EMERALD, "gemDiamond", "diamondPaxel", EnumRarity.epic); - emeraldPaxel = new ItemAllToolAA(InitToolMaterials.toolMaterialEmerald, "gemEmerald", "emeraldPaxel", EnumRarity.epic); - obsidianPaxel = new ItemAllToolAA(InitToolMaterials.toolMaterialObsidian, "obsidian", "obsidianPaxel", EnumRarity.epic); - quartzPaxel = new ItemAllToolAA(InitToolMaterials.toolMaterialQuartz, "gemQuartzBlack", "quartzPaxel", EnumRarity.rare); + woodenPaxel = new ItemAllToolAA(Item.ToolMaterial.WOOD, "plankWood", "woodenPaxel", EnumRarity.uncommon, 5192733); + stonePaxel = new ItemAllToolAA(Item.ToolMaterial.STONE, "stone", "stonePaxel", EnumRarity.uncommon, 7040621); + ironPaxel = new ItemAllToolAA(Item.ToolMaterial.IRON, "ingotIron", "ironPaxel", EnumRarity.rare, 10920613); + goldPaxel = new ItemAllToolAA(Item.ToolMaterial.GOLD, "ingotGold", "goldPaxel", EnumRarity.rare, 16770048); + diamondPaxel = new ItemAllToolAA(Item.ToolMaterial.EMERALD, "gemDiamond", "diamondPaxel", EnumRarity.epic, 3250376); + emeraldPaxel = new ItemAllToolAA(InitToolMaterials.toolMaterialEmerald, "gemEmerald", "emeraldPaxel", EnumRarity.epic, 7723338); + obsidianPaxel = new ItemAllToolAA(InitToolMaterials.toolMaterialObsidian, "obsidian", "obsidianPaxel", EnumRarity.epic, 4166); + quartzPaxel = new ItemAllToolAA(InitToolMaterials.toolMaterialQuartz, "gemQuartzBlack", "quartzPaxel", EnumRarity.rare, 1710103); ItemUtil.registerItems(new Item[]{woodenPaxel, stonePaxel, ironPaxel, goldPaxel, diamondPaxel, emeraldPaxel, obsidianPaxel, quartzPaxel}); } } diff --git a/src/main/java/ellpeck/actuallyadditions/items/tools/ItemAllToolAA.java b/src/main/java/ellpeck/actuallyadditions/items/tools/ItemAllToolAA.java index 05fe224f8..4120c08b5 100644 --- a/src/main/java/ellpeck/actuallyadditions/items/tools/ItemAllToolAA.java +++ b/src/main/java/ellpeck/actuallyadditions/items/tools/ItemAllToolAA.java @@ -37,16 +37,20 @@ import java.util.Set; @SuppressWarnings("unchecked") public class ItemAllToolAA extends ItemTool implements IActAddItemOrBlock{ + private IIcon overlayIcon; + private int color; + private String name; private EnumRarity rarity; private String repairItem; - public ItemAllToolAA(ToolMaterial toolMat, String repairItem, String unlocalizedName, EnumRarity rarity){ + public ItemAllToolAA(ToolMaterial toolMat, String repairItem, String unlocalizedName, EnumRarity rarity, int color){ super(4.0F, toolMat, Sets.newHashSet()); this.repairItem = repairItem; this.name = unlocalizedName; this.rarity = rarity; + this.color = color; this.setMaxDamage(this.getMaxDamage()*4); } @@ -91,13 +95,26 @@ public class ItemAllToolAA extends ItemTool implements IActAddItemOrBlock{ @Override @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister iconReg){ - this.itemIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()); + public int getColorFromItemStack(ItemStack stack, int pass){ + return pass > 0 ? this.color : super.getColorFromItemStack(stack, pass); } @Override - public IIcon getIcon(ItemStack stack, int pass){ - return this.itemIcon; + @SideOnly(Side.CLIENT) + public IIcon getIconFromDamageForRenderPass(int damage, int pass){ + return pass > 0 ? this.overlayIcon : super.getIconFromDamageForRenderPass(damage, pass); + } + + @Override + @SideOnly(Side.CLIENT) + public void registerIcons(IIconRegister iconReg){ + this.itemIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":itemPaxel"); + this.overlayIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":itemPaxelOverlay"); + } + + @Override + public boolean requiresMultipleRenderPasses(){ + return true; } @Override diff --git a/src/main/resources/assets/actuallyadditions/lang/en_US.lang b/src/main/resources/assets/actuallyadditions/lang/en_US.lang index 1b1c9cd19..016c6a7b6 100644 --- a/src/main/resources/assets/actuallyadditions/lang/en_US.lang +++ b/src/main/resources/assets/actuallyadditions/lang/en_US.lang @@ -171,6 +171,11 @@ item.actuallyadditions.paxelMTLapisLazuli.name=MT Lapis Lazuli AIOT item.actuallyadditions.paxelMTOsmium.name=MT Osmium AIOT item.actuallyadditions.paxelMTBronze.name=MT Bronze AIOT item.actuallyadditions.paxelMTSteel.name=MT Steel AIOT +item.actuallyadditions.paxelSOadamantium.name=SO Adamantium AIOT +item.actuallyadditions.paxelSOcopper.name=SO Copper AIOT +item.actuallyadditions.paxelSOtin.name=SO Tin AIOT +item.actuallyadditions.paxelSOonyx.name=SO Onyx AIOT +item.actuallyadditions.paxelSOmythril.name=SO Mythril AIOT item.actuallyadditions.itemPhantomConnector.name=Phantom Connector item.actuallyadditions.itemMiscCup.name=Empty Cup item.actuallyadditions.itemCoffee.name=Cup with Coffee diff --git a/src/main/resources/assets/actuallyadditions/textures/items/diamondPaxel.png b/src/main/resources/assets/actuallyadditions/textures/items/diamondPaxel.png deleted file mode 100644 index 6c809a31277dcec74c4846fdb32b12c24fe4a8bd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 442 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)1Ov=?v;?)fqubI14-? ziy0WWg+Z8+Vb&Z8pdfpRr>`sfeKrAZRmNnOm0y8EvY8S|xv6<2KrRD=b5Uwy zNotBhd1gt5g1e`0K#E=}I|BowoTrOph{fr-lQw!Eb`UvMFP`k!wA8C*l49P{*}E)u zTkI(L!e1cZUVfd6ug|Y(#q8$lg$g3>;>KRb7d;B_Ub*Fnh)uikM78VP-)8rHfA@Xg z`wI0LuCGNU<)5cDo$pUr%k;hfMkQZo(>9L>=cIq6He6|tu(549DDX>u)xEdOE8=+G z%R65XQxevdI;;^AkiVd6u>jX+fx1J!pUnjoiWW1!$#Xu~X3%tdH_JJ`3mNIfu4ao= zZ>&BzJ*4@S_=j7f3}JG6qT&|Zs&1UD&AL2g=7Y7psZj^5{pUWsvSi!IpPN3~a84IH zxakaM&pB83+`}Tj7d$(?>V3-ghdU=dn|Y*osoBB#_hL#+T+dIfcvtfLOKk4Phf%L) i{}d8_aQ^v^{(X$S&ZX&=tBntWg3!~|&t;ucLK6T>!m{)L diff --git a/src/main/resources/assets/actuallyadditions/textures/items/emeraldPaxel.png b/src/main/resources/assets/actuallyadditions/textures/items/emeraldPaxel.png deleted file mode 100644 index e184b240074f4eb0072246ca6b1a0f08d2e28fe9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 477 zcmV<30V4j1P){0a5?}010qNS#tmY3ljhU3ljkVnw%H_000McNliru-v$s1Br#lus2BhM03B&m zSad^gZEa<4bN~PV002XBWnpw>WFU8GbZ8()Nlj2>E@cM*00BWsL_t(I%bk+DN&`U@ zhQFD_FhMO;5&}Y2@Y;w78jBR#Ng4%f!B(Ha%2)6O1Pe<`CD_LQG8spVM8jv^-AL=X z^q}uGq@nbfnbp!zIxs;mGta~({6%RfEe-Xj^Y6QX#ntkT4m|8Zq8;=;$A9z%MXHcC TCj4fU00000NkvXXu0mjfIDy8^ diff --git a/src/main/resources/assets/actuallyadditions/textures/items/goldPaxel.png b/src/main/resources/assets/actuallyadditions/textures/items/goldPaxel.png deleted file mode 100644 index c0750f43da2714139c2f6bc3027e791a5b49c86a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 486 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)1Ov=?v;?)fqubI14-? ziy0WWg+Z8+Vb&Z8pdfpRr>`sfeKrAZRo<*mPwxSRWHUn|N}Tg^b5rw5fLsO!=c3fa zlGGH1^30M91$R&1fE2w{b_NDUFHaZ85R21uC)s)&4iITQ?>%|O@&!NGFD>-rd=$oV zJ*Bkp#WIVR3F>#PUnuN2=9n(-IK8YiH(dRA(83P4jYqESKlaa~NcKp8uT=8+PY?F} z-dp^xx<8TOC7U{r*4+mo`7=WH#wpx=pmMBKLp0jQ+(MM=cSWV`!5c568f1SKdfkBYy7r_XiiHcirW>^_DxLTy_Gx1)t-z{nwa3 zpY&&8&^h-sC%3=3xGnAS;foJ9^Rx4DT)y(u=)&mDHhr3 a_P`sfeKrAZRkdS&GV_2!vY8S|xv6<2KrRD=b5Uwy zNotBhd1gt5g1e`0K#E=}I|Bowt*47)h{fr-lMS;EIY_k4@AlG=ZE;%Ad_!1f*R*D< z9VKrsoxQu!UbTDw!p%RJf&5a77YRb@69r^~xb%cvW~~qQUTfI(zT&&>_kH)v%e#zI zdIZl+HFR@vS$27)MDmiVRn1$&B$HEYbG^>#d-@w29{V?)$h29|`K zF_$t-UX<;Q$e#L(+h0w1la8{d&>;gA-{4O+>Zgsewo1)D+xD>F$LtLC#;swcR&x(M z{8D8rb3AeP-FF8VUfsAL_ukfX|Ew>+Yd_f>FO99apT03dgWynPU&+T33=Wju z-7B@6r*6mYM{oa5j@)B6V@uStKc8m3IWX^e;L4Cw!c#1>*RH(&`l+qGz3J0!l{?F& zqp~{}d2G2BG~>aPdG&Gk@12Z#-F)tUHn+H|3zxb71m+7_ThINQdq31?&Z5g_pEZL* N*wfX|Wt~$(699E`!jJ#} diff --git a/src/main/resources/assets/actuallyadditions/textures/items/obsidianPaxel.png b/src/main/resources/assets/actuallyadditions/textures/items/obsidianPaxel.png deleted file mode 100644 index 4915838bb4183a1d347b89c6d854af8da55f58e1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 456 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)1Ov=?v;?)fqubI14-? ziy0WWg+Z8+Vb&Z8pdfpRr>`sfeKrAZ6~Xiu9T$K?vY8S|xv6<2KrRD=b5Uwy zNotBhd1gt5g1e`0K#E=}I|Bowj;D)bh{fr-6VLh`au8|Ve>-zE>s^6PR$-IED-GP}bug|=(xc6tF;X0|u vdZl_<;&O6Z^-3N-l~TQ&FstwBe%?C9Q?Dlb@mVZz2L-67tDnm{r-UW|nuN14 diff --git a/src/main/resources/assets/actuallyadditions/textures/items/paxelMTBronze.png b/src/main/resources/assets/actuallyadditions/textures/items/paxelMTBronze.png deleted file mode 100644 index 26e5bb41b6e06a87be1897b155bfbb2ccc28342a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 496 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 diff --git a/src/main/resources/assets/actuallyadditions/textures/items/paxelTFBronze.png b/src/main/resources/assets/actuallyadditions/textures/items/paxelTFBronze.png deleted file mode 100644 index 5443785130717da2a61d53fb7efaa4fe2259ebb4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 496 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G`DAk4@xYmNj^kiEpy*OmP~JC7)X5oEak-aeD5gz21idM2?>Kj{d!7N!G$83s!cs9N%Hl zt?_8lg9ne4c36Dt7ho?eULUX`_Ri5q545aO1hizmGT*j$g-We`8NP1v(pe_Q=6&4v zyZZT^-*Sfqfl;$!7zeliuv+mk1|Wz9LD$dQX`_vXJBm@$X7fOoyD#Qk`u zzgv4^Rx&cIxN6OCiiN>0@ z;90w^^NQ=z=^P9*WvF)I#blP+Ila}kH;NkPUK2YMQfa(lw_&TF_=7q|_Kz}M z{cOw(5A`e5jJOUP6wWx&{Cn-&CgD96@`t8=Yx;fY_<<#H>dz;CZkI2pIKaVjT4e|PYJ0gTe~DWM4fJB!I( diff --git a/src/main/resources/assets/actuallyadditions/textures/items/paxelTFCopper.png b/src/main/resources/assets/actuallyadditions/textures/items/paxelTFCopper.png deleted file mode 100644 index a17df28de6df4d8b87118d946ab2d464b9cc089a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 495 zcmVWFU8GbZ8()Nlj2>E@cM*00C1;L_t(I%bk)zC`UNb1Swy^kI(TJy#pcyoa_`wXfXf)002ovPDHLkV1oQ{(0%{_ diff --git a/src/main/resources/assets/actuallyadditions/textures/items/paxelTFElectrum.png b/src/main/resources/assets/actuallyadditions/textures/items/paxelTFElectrum.png deleted file mode 100644 index f8fd4936de5a16561840ef84792d57a7523de982..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 495 zcmVWFU8GbZ8()Nlj2>E@cM*00C1;L_t(I%bk)zC`UNb1Swy^kI(TJy#pcyoa_`wXfXf)002ovPDHLkV1mpoqPQgC)skL4mO!=2?Xf9+iz}vmzbpUz zPIV@M2+)Nms5Z?>N}KOTPSk>YmhW*~wjb=ZdYrUZZxwn%((vi*T1>;!tJxC8ReMF1qHsRtDnm{r-UW|4%*7! diff --git a/src/main/resources/assets/actuallyadditions/textures/items/paxelTFLead.png b/src/main/resources/assets/actuallyadditions/textures/items/paxelTFLead.png deleted file mode 100644 index c12a7b28f9c6079c40da1f7dba12aee6fc76c085..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 501 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G`DAk4@xYmNj^kiEpy*OmP~JC7(6m%K~wSD=t=W=KSdbAE1aYF-JD%fR4Vl$uzQ znxasiS(2gP?&%wlqL<3fz`z*k>Eak-aeD5g{oYK8636$yuhbG1l_*b%y>*h;mtEJF zmsQu)WDD!1JO7njyn|g___7>x^*EhOxE@{TKRqGj*FsrV(K4^^CaTxwUVmC%bMN`* zy8Y)r@8hxcm>BA`J}71CC(GVRztxwV(E6As+qIM_IAv9~_G=hKhKz9m>#s2RzTjyinirPAF{^u;`ec30ReZ50xf4T1|Ys>e`R@*;tNRW`5 zSM2xTiH)IVQo)M*mCwFD74U6k(^;>`CA9RBq!4Roj_{6|mWz5KyB8@;)bNO%TmSu* n*k{Y$9RApj(x&_KAKU+8(lMPir!-qc5ES~Ju6{1-oD!M<9xuVn diff --git a/src/main/resources/assets/actuallyadditions/textures/items/paxelTFNickel.png b/src/main/resources/assets/actuallyadditions/textures/items/paxelTFNickel.png deleted file mode 100644 index 9272ffbe431d77b480d5cf3c8ff208d1221a6d79..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 496 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G`DAk4@xYmNj^kiEpy*OmP~JC7)X%Eu*-b^wKBGeaUuobz*YQ}arITm}Z`qSVBa z)D(sC%#sWRcTeAd6une-1_s6uPZ!4!i_>!_?e#t!AaeA)cl7TyOR^R&S+KI3<@gSZ zZjDEa9z1xYw8P?CzW{q-@%n%jv3HI>dZ1;MBA_MfmHD>4D^zOj%kXuRm(DUdHt*xU z-__6W{FXZ`5F|R$U`>eY5+5r!^OLDS-kvGPp1-$EJCGN*N z{oUFVvyzcv#Z_yDQ!EU=ds*aqlB}n-OuH)iy4}CO{6cR1qLtzk^+P^}WFJ&HkTLTE z2hZAVomX6!PUm2lG5cxGT9*UvEGDzm&greTy;0OS_nO$DkV@kXyA50Y#2?f#vVWB6 z>StqSc&J~YX2f;apm4^C=HF}IHVN;skUuo_Ths4D#}6!tQ-41BbGv*&#Ub|o19OBe zEdAY^B*bga8NXlao~dV*R>>RrsAP7OYUHDo*$2*^X`GOxdrC+>@)7gg`tP^Ij9*IJ jl-ninnti|h@%k^UheBouxxUz+1qygiS3j3^P6)xxOIhkxRI?c8@?}jODoYkF*mIOe(6`sasQHr3n|E7XpH+6<|M>S_ z`}^;EkM}QR_w4d|5jts6(AssuZ_IorEfTuF);X-(*fa3uqc0NIPui$8FJ@r4$JHa} z`r*Tmrj&IoN=_?3brv@;D186Zw!q(^qK-3C_uP&6h}~9)-F@Akt?Zfoo2hGQ`HW?q zS$i4P&p-6eR}j1V-}lNCh1ExA8tu;5IcMiqUki)2{KGj-j18qxw~B6fYt}Mpzm7KG zVa}T_+`jvEh3*nbhJv{d4tU7NOtp6TR`#IGGP=sbx+3vdbHt*akbSqzH1nU=6a?io z)!tM5z<18Bac;4O0nhn_{eRC$udd_z$sV;%vBM}<%}AxgC{pc3+OwA*H(pz$a7v}4 vDEj&Tz0;0H#j2k^u6Km7A%5PgpXL7;+&O2T7uYLdk03B&m zSad^gZEa<4bN~PV002XBWnpw>WFU8GbZ8()Nlj2>E@cM*00BcuL_t(I%bk<4OF~f? z#eetm-VnJcgb7cZg4UMi1_^>|{sDJ&=uhzAP52gyiLM- zz0P<%W;7ZhBFyJ=00Edzr{wc_YPA|+7%KHw+-x?9qKL_4!f-fbHk%ZLi~J$%H(*=!cAb$Ws{=R%=CCX-2@`SzwH zXQji$HjFXS@At(RBO4R!GIOz5OmJ%bW1wHR7G{i*_4;C@b1o5WS7?B0wYv9pegiw; Vp^i0@5qtmu002ovPDHLkV1n$<$u9r^ diff --git a/src/main/resources/assets/actuallyadditions/textures/items/paxelTFTin.png b/src/main/resources/assets/actuallyadditions/textures/items/paxelTFTin.png deleted file mode 100644 index 07e82efe6dcba40c209eb8de26a2119e4e2e2a97..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 503 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G`DAk4@xYmNj^kiEpy*OmP~JC7)nbm^D1>_8#e%#er@=ltB<)VvZPmw~~#C^fMp zHASI3vm`^o-P1Q9MK2YokTKfR#WBR<^xVm|-iHGuTF?6itq7HAN)o-is9Q)WDWI^Y zTcDjw@7&!l?i_th`yIO<1PI8)FewSmaam&Fk@+_-*HKqgr0egl+Pgm z^8L;jHvS;q$qzzTB?iqc-sNFCF>8iO>FWtwbeBn~&6Pb`SUSB`ii?RsMg2oTz4*%- z#+P@bJ2+a`3ju?`W`BKxjYUK2(@>S%?v48k9zBs*TExn~-c{w@<`d%f2c=uyXYty3 zy6g-(npyMSJTSOvNv>h7=A(#nkD^2t9SC^5hm(!r+Den+x(P;&k!xJc4@k4@_jk&v z7S=Zh$~dW8$h>iU{85J8I{L%!C~NUM3CV74wXrT*(OI)Yii-OpcdAvmyldC!ddGQZ zj=EdB!gtm?<#GKj8Aexbf0F82cKK;;n~1OaahAJpY((YqWVL4bbuHUo`mg?aVZ`$} lGW@$IFfb%vE}mEaoIfF9&ddgj7Yd;8_jL7hS?83{1OOB0yz~G7 diff --git a/src/main/resources/assets/actuallyadditions/textures/items/quartzPaxel.png b/src/main/resources/assets/actuallyadditions/textures/items/quartzPaxel.png deleted file mode 100644 index 6e5e35defcbf78fee77fe115bc82d438ff393051..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 420 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G`DAk4@xYmNj^kiEpy*OmP~yQHw0(x-{M&w)a+nIRD+&iT2ysd*(pE(3#eQEFmI zYKlU6W=V#EyQgnJie4%^0|O(6r;B5V#p$_$hJHs31m=8|at+fG(urLn{DD6v}*Y~`@fRtaSn76tKC_H%{l8D2tR=Wm$J=0Y8vBxpx(`*G3va~5E_iJv zaM7_pQpx^a=#L+F9==w;aB-`i=Kj6)=T97)QOfRp>dc&8L*@PZVqU*JCY#ed^J?|_ z-|`m41zu^{#+@@GXZ~DKbZhqBoLO$0`_&u1bsD<;dfyO#By!^2h{$=dpuqBU^>bP0 Hl+XkKuWp)1 diff --git a/src/main/resources/assets/actuallyadditions/textures/items/stonePaxel.png b/src/main/resources/assets/actuallyadditions/textures/items/stonePaxel.png deleted file mode 100644 index 449737ee18a65818b9a2d14fe6ef5d2d53918e50..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 465 zcmV;?0WSWDP){0a5?}010qNS#tmY3ljhU3ljkVnw%H_000McNliru-v$s1B{!`8JZt~}03B&m zSad^gZEa<4bN~PV002XBWnpw>WFU8GbZ8()Nlj2>E@cM*00A{gL_t(I%bk%iYr;Sn zhM!A3BrPsI1DVX)#i2_^>Dr~gqm%!@LHrpGf}^Wo*N%cqK`dQU>QGD^ge-^nbxKgw zD8AEichCF2-<{$Hg<&Z9+Pwwt^?LZe&tkElaw#EK9LFk$=kqzuW|PrqbZC%+?RJ|a zNm#8`hzMDh0SHjQolb{1j+NSnyWK99lABpe|Jh zh@uFsHP%{YvsnQj8JyBf$po$S(H*A@ zetvr3<1^*^Cp+7;QkFb;|2=?fwHl7&ls70#uGi~$o_F5hTym~zwMxI=FCOr~;F_6( zAUNJM#)vUS-d-E>*tnOnUopnW$<5(#C?^lEklF|LXS-Jav$>h~a*|6T00000NkvXX Hu0mjfm1e}9 diff --git a/src/main/resources/assets/actuallyadditions/textures/items/woodenPaxel.png b/src/main/resources/assets/actuallyadditions/textures/items/woodenPaxel.png deleted file mode 100644 index d808766612e71481e0b8c145d92eeda433253b68..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 467 zcmV;^0WAKBP){0a5?}010qNS#tmY3ljhU3ljkVnw%H_000McNliru-v$s1DHl5>Q>Xv{03B&m zSad^gZEa<4bN~PV002XBWnpw>WFU8GbZ8()Nlj2>E@cM*00B2iL_t(I%bk(EP69y` zM$esHR!0aD5)4~_jfJ5zCMHG-OKfb^M=lDVX0xm*7ai^&->{U- zc+?{JaHq)4U5|&Sfz0#Siz;7Ux2IseV*TF1qRM$~vzk$hXTCVDn(b< z@dZwGu*}Ts+01NEJIZKB&8?jDrUuU&Rg?O-gd`3Qzasf-f^V8YljmS#CguPD002ov JPDHLkV1hXTx|{$2