From d5930da5e33c196e3cad693043437a61b4d350b1 Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Sun, 28 Jun 2015 21:28:58 +0200 Subject: [PATCH] -Added colored Lamps --- .../blocks/BlockColoredLamp.java | 169 ++++++++++++++++++ .../actuallyadditions/blocks/BlockPlant.java | 7 + .../actuallyadditions/blocks/InitBlocks.java | 14 +- .../metalists/TheColoredLampColors.java | 47 +++++ .../creative/CreativeTab.java | 3 +- .../actuallyadditions/event/PickupEvent.java | 3 +- .../inventory/gui/GuiInputter.java | 3 +- .../nei/NEIActuallyAdditionsConfig.java | 1 + .../actuallyadditions/util/BlockUtil.java | 2 +- .../actuallyadditions/util/ItemUtil.java | 2 +- .../assets/actuallyadditions/lang/en_US.lang | 36 ++++ .../textures/blocks/blockColoredLampBlack.png | Bin 0 -> 306 bytes .../blocks/blockColoredLampBlackOn.png | Bin 0 -> 361 bytes .../textures/blocks/blockColoredLampBlue.png | Bin 0 -> 533 bytes .../blocks/blockColoredLampBlueOn.png | Bin 0 -> 623 bytes .../textures/blocks/blockColoredLampBrown.png | Bin 0 -> 445 bytes .../blocks/blockColoredLampBrownOn.png | Bin 0 -> 481 bytes .../textures/blocks/blockColoredLampCyan.png | Bin 0 -> 477 bytes .../blocks/blockColoredLampCyanOn.png | Bin 0 -> 554 bytes .../textures/blocks/blockColoredLampGray.png | Bin 0 -> 372 bytes .../blocks/blockColoredLampGrayOn.png | Bin 0 -> 459 bytes .../textures/blocks/blockColoredLampGreen.png | Bin 0 -> 422 bytes .../blocks/blockColoredLampGreenOn.png | Bin 0 -> 464 bytes .../blocks/blockColoredLampLightBlue.png | Bin 0 -> 436 bytes .../blocks/blockColoredLampLightBlueOn.png | Bin 0 -> 492 bytes .../blocks/blockColoredLampLightGray.png | Bin 0 -> 404 bytes .../blocks/blockColoredLampLightGrayOn.png | Bin 0 -> 507 bytes .../textures/blocks/blockColoredLampLime.png | Bin 0 -> 558 bytes .../blocks/blockColoredLampLimeOn.png | Bin 0 -> 635 bytes .../blocks/blockColoredLampMagenta.png | Bin 0 -> 540 bytes .../blocks/blockColoredLampMagentaOn.png | Bin 0 -> 625 bytes .../blocks/blockColoredLampOrange.png | Bin 0 -> 484 bytes .../blocks/blockColoredLampOrangeOn.png | Bin 0 -> 567 bytes .../textures/blocks/blockColoredLampPink.png | Bin 0 -> 402 bytes .../blocks/blockColoredLampPinkOn.png | Bin 0 -> 478 bytes .../blocks/blockColoredLampPurple.png | Bin 0 -> 544 bytes .../blocks/blockColoredLampPurpleOn.png | Bin 0 -> 615 bytes .../textures/blocks/blockColoredLampRed.png | Bin 0 -> 380 bytes .../textures/blocks/blockColoredLampRedOn.png | Bin 0 -> 453 bytes .../textures/blocks/blockColoredLampWhite.png | Bin 0 -> 439 bytes .../blocks/blockColoredLampWhiteOn.png | Bin 0 -> 569 bytes .../blocks/blockColoredLampYellow.png | Bin 0 -> 527 bytes .../blocks/blockColoredLampYellowOn.png | Bin 0 -> 595 bytes .../textures/blocks/blockEnergizer.png | Bin 0 -> 701 bytes .../textures/blocks/blockEnergizerSide.png | Bin 0 -> 772 bytes .../textures/blocks/blockEnergizerTop.png | Bin 0 -> 794 bytes .../textures/blocks/blockEnervator.png | Bin 0 -> 701 bytes .../textures/blocks/blockEnervatorSide.png | Bin 0 -> 756 bytes .../textures/blocks/blockEnervatorTop.png | Bin 0 -> 794 bytes .../textures/blocks/blockGrinderOn.png.mcmeta | 11 ++ .../blocks/blockTestifiBucksGreenWall.png | Bin 0 -> 515 bytes .../blocks/blockTestifiBucksWhiteWall.png | Bin 0 -> 413 bytes .../textures/gui/guiDrill.png | Bin 0 -> 1754 bytes .../textures/gui/guiEnergizer.png | Bin 0 -> 1923 bytes .../textures/gui/guiManualCrafting.png | Bin 0 -> 1771 bytes .../textures/items/itemBattery.png | Bin 0 -> 443 bytes .../textures/items/itemDrill.png | Bin 0 -> 683 bytes .../items/itemDrillUpgradeBlockPlacing.png | Bin 0 -> 449 bytes .../items/itemDrillUpgradeFiveByFive.png | Bin 0 -> 337 bytes .../items/itemDrillUpgradeFortune.png | Bin 0 -> 527 bytes .../items/itemDrillUpgradeFortuneII.png | Bin 0 -> 564 bytes .../items/itemDrillUpgradeSilkTouch.png | Bin 0 -> 416 bytes .../textures/items/itemDrillUpgradeSpeed.png | Bin 0 -> 361 bytes .../items/itemDrillUpgradeSpeedII.png | Bin 0 -> 463 bytes .../items/itemDrillUpgradeSpeedIII.png | Bin 0 -> 438 bytes .../items/itemDrillUpgradeThreeByThree.png | Bin 0 -> 407 bytes .../textures/items/itemManual.png | Bin 0 -> 286 bytes 67 files changed, 288 insertions(+), 10 deletions(-) create mode 100644 src/main/java/ellpeck/actuallyadditions/blocks/BlockColoredLamp.java create mode 100644 src/main/java/ellpeck/actuallyadditions/blocks/metalists/TheColoredLampColors.java create mode 100644 src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampBlack.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampBlackOn.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampBlue.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampBlueOn.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampBrown.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampBrownOn.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampCyan.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampCyanOn.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampGray.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampGrayOn.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampGreen.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampGreenOn.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampLightBlue.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampLightBlueOn.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampLightGray.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampLightGrayOn.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampLime.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampLimeOn.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampMagenta.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampMagentaOn.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampOrange.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampOrangeOn.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampPink.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampPinkOn.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampPurple.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampPurpleOn.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampRed.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampRedOn.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampWhite.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampWhiteOn.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampYellow.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampYellowOn.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/blocks/blockEnergizer.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/blocks/blockEnergizerSide.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/blocks/blockEnergizerTop.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/blocks/blockEnervator.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/blocks/blockEnervatorSide.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/blocks/blockEnervatorTop.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/blocks/blockGrinderOn.png.mcmeta create mode 100644 src/main/resources/assets/actuallyadditions/textures/blocks/blockTestifiBucksGreenWall.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/blocks/blockTestifiBucksWhiteWall.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/gui/guiDrill.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/gui/guiEnergizer.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/gui/guiManualCrafting.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/items/itemBattery.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/items/itemDrill.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/items/itemDrillUpgradeBlockPlacing.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/items/itemDrillUpgradeFiveByFive.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/items/itemDrillUpgradeFortune.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/items/itemDrillUpgradeFortuneII.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/items/itemDrillUpgradeSilkTouch.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/items/itemDrillUpgradeSpeed.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/items/itemDrillUpgradeSpeedII.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/items/itemDrillUpgradeSpeedIII.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/items/itemDrillUpgradeThreeByThree.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/items/itemManual.png diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockColoredLamp.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockColoredLamp.java new file mode 100644 index 000000000..0c124e3a2 --- /dev/null +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockColoredLamp.java @@ -0,0 +1,169 @@ +package ellpeck.actuallyadditions.blocks; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import ellpeck.actuallyadditions.blocks.metalists.TheColoredLampColors; +import ellpeck.actuallyadditions.util.BlockUtil; +import ellpeck.actuallyadditions.util.INameableItem; +import ellpeck.actuallyadditions.util.ModUtil; +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.EnumRarity; +import net.minecraft.item.Item; +import net.minecraft.item.ItemBlock; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; +import net.minecraft.util.StatCollector; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.World; +import net.minecraftforge.oredict.OreDictionary; + +import java.util.List; +import java.util.Random; + +public class BlockColoredLamp extends Block implements INameableItem{ + + public static TheColoredLampColors[] allLampTypes = TheColoredLampColors.values(); + + private IIcon[] textures = new IIcon[allLampTypes.length]; + + private boolean isOn; + + public BlockColoredLamp(boolean isOn){ + super(Material.redstoneLight); + this.setHarvestLevel("pickaxe", 0); + this.setHardness(0.5F); + this.isOn = isOn; + } + + @Override + public int getLightValue(IBlockAccess world, int x, int y, int z){ + return this.isOn ? 15 : 0; + } + + @Override + public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ){ + //Turning On + if(player.isSneaking()){ + if(!world.isRemote){ + world.setBlock(x, y, z, this.isOn ? InitBlocks.blockColoredLamp : InitBlocks.blockColoredLampOn, world.getBlockMetadata(x, y, z), 2); + } + return true; + } + + //Changing Colors + int[] oreIDs = OreDictionary.getOreIDs(player.getCurrentEquippedItem()); + if(oreIDs.length > 0){ + for(int oreID : oreIDs){ + String name = OreDictionary.getOreName(oreID); + TheColoredLampColors color = TheColoredLampColors.getColorFromDyeName(name); + if(color != null){ + if(world.getBlockMetadata(x, y, z) != color.ordinal()){ + if(!world.isRemote){ + world.setBlockMetadataWithNotify(x, y, z, color.ordinal(), 2); + if(!player.capabilities.isCreativeMode) player.inventory.decrStackSize(player.inventory.currentItem, 1); + } + return true; + } + } + } + } + + return false; + } + + @Override + public String getName(){ + return this.isOn ? "blockColoredLampOn" : "blockColoredLamp"; + } + + @Override + public String getOredictName(){ + return ""; + } + + @Override + public IIcon getIcon(int side, int meta){ + return meta >= allLampTypes.length ? null : textures[meta]; + } + + @SuppressWarnings("all") + @SideOnly(Side.CLIENT) + public void getSubBlocks(Item item, CreativeTabs tab, List list){ + for (int j = 0; j < allLampTypes.length; j++){ + list.add(new ItemStack(item, 1, j)); + } + } + + @Override + public Item getItemDropped(int par1, Random rand, int par3){ + return Item.getItemFromBlock(InitBlocks.blockColoredLamp); + } + + @Override + @SideOnly(Side.CLIENT) + public Item getItem(World world, int x, int y, int z){ + return Item.getItemFromBlock(InitBlocks.blockColoredLamp); + } + + @Override + public ItemStack createStackedBlock(int meta){ + return new ItemStack(InitBlocks.blockColoredLamp, 1, meta); + } + + @Override + public int damageDropped(int meta){ + return meta; + } + + @Override + @SideOnly(Side.CLIENT) + public void registerBlockIcons(IIconRegister iconReg){ + for(int i = 0; i < allLampTypes.length; i++){ + this.textures[i] = iconReg.registerIcon(ModUtil.MOD_ID_LOWER + ":" + ((INameableItem)InitBlocks.blockColoredLamp).getName() + allLampTypes[i].name + (isOn ? "On" : "")); + } + } + + public static class TheItemBlock extends ItemBlock{ + + private Block theBlock; + + public TheItemBlock(Block block){ + super(block); + this.theBlock = block; + this.setHasSubtypes(true); + this.setMaxDamage(0); + } + + @Override + public EnumRarity getRarity(ItemStack stack){ + return EnumRarity.rare; + } + + @Override + public String getUnlocalizedName(ItemStack stack){ + return InitBlocks.blockColoredLamp.getUnlocalizedName() + allLampTypes[stack.getItemDamage()].getName(); + } + + @Override + @SuppressWarnings("unchecked") + @SideOnly(Side.CLIENT) + public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean isHeld) { + BlockUtil.addInformation(InitBlocks.blockColoredLamp, list, 2, ""); + } + + @Override + public int getMetadata(int damage){ + return damage; + } + + @Override + public String getItemStackDisplayName(ItemStack stack){ + if(stack.getItemDamage() >= allLampTypes.length) return null; + return StatCollector.translateToLocal(this.getUnlocalizedName(stack) + ".name") + (((BlockColoredLamp)this.theBlock).isOn ? " (" + StatCollector.translateToLocal("tooltip." + ModUtil.MOD_ID_LOWER + ".onSuffix.desc") + ")" : ""); + } + } +} \ No newline at end of file diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockPlant.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockPlant.java index f48af25a9..122d52ea3 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockPlant.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockPlant.java @@ -14,7 +14,9 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; +import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import net.minecraftforge.common.EnumPlantType; import java.util.List; import java.util.Random; @@ -36,6 +38,11 @@ public class BlockPlant extends BlockCrops implements INameableItem{ this.addDropAmount = addDropAmount; } + @Override + public EnumPlantType getPlantType(IBlockAccess world, int x, int y, int z){ + return EnumPlantType.Crop; + } + @Override public int quantityDropped(int meta, int fortune, Random random){ return meta >= 7 ? random.nextInt(addDropAmount)+minDropAmount : super.quantityDropped(meta, fortune, random); diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/InitBlocks.java b/src/main/java/ellpeck/actuallyadditions/blocks/InitBlocks.java index 53f03e35b..5fbe527de 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/InitBlocks.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/InitBlocks.java @@ -73,7 +73,10 @@ public class InitBlocks{ public static Block blockTestifiBucksGreenStairs; public static Block blockTestifiBucksWhiteStairs; public static Block blockTestifiBucksGreenSlab; - public static Block blockTestifibucksWhiteSlab; + public static Block blockTestifiBucksWhiteSlab; + + public static Block blockColoredLamp; + public static Block blockColoredLampOn; public static void init(){ Util.logInfo("Initializing Blocks..."); @@ -88,8 +91,13 @@ public class InitBlocks{ BlockUtil.register(blockTestifiBucksWhiteStairs, BlockStair.TheItemBlock.class); blockTestifiBucksGreenSlab = new BlockSlabs("blockTestifiBucksGreenSlab", blockTestifiBucksGreenWall); BlockUtil.register(blockTestifiBucksGreenSlab, BlockSlabs.TheItemBlock.class); - blockTestifibucksWhiteSlab = new BlockSlabs("blockTestifibucksWhiteSlab", blockTestifiBucksWhiteWall); - BlockUtil.register(blockTestifibucksWhiteSlab, BlockSlabs.TheItemBlock.class); + blockTestifiBucksWhiteSlab = new BlockSlabs("blockTestifiBucksWhiteSlab", blockTestifiBucksWhiteWall); + BlockUtil.register(blockTestifiBucksWhiteSlab, BlockSlabs.TheItemBlock.class); + + blockColoredLamp = new BlockColoredLamp(false); + BlockUtil.register(blockColoredLamp, BlockColoredLamp.TheItemBlock.class, BlockColoredLamp.allLampTypes); + blockColoredLampOn = new BlockColoredLamp(true); + BlockUtil.register(blockColoredLampOn, BlockColoredLamp.TheItemBlock.class, false, BlockColoredLamp.allLampTypes); blockEnergizer = new BlockEnergizer(true); BlockUtil.register(blockEnergizer, BlockEnergizer.TheItemBlock.class); diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/metalists/TheColoredLampColors.java b/src/main/java/ellpeck/actuallyadditions/blocks/metalists/TheColoredLampColors.java new file mode 100644 index 000000000..303c692e8 --- /dev/null +++ b/src/main/java/ellpeck/actuallyadditions/blocks/metalists/TheColoredLampColors.java @@ -0,0 +1,47 @@ +package ellpeck.actuallyadditions.blocks.metalists; + +import ellpeck.actuallyadditions.util.INameableItem; + +public enum TheColoredLampColors implements INameableItem{ + + WHITE("White"), + ORANGE("Orange"), + MAGENTA("Magenta"), + LIGHT_BLUE("LightBlue"), + YELLOW("Yellow"), + LIME("Lime"), + PINK("Pink"), + GRAY("Gray"), + LIGHT_GRAY("LightGray"), + CYAN("Cyan"), + PURPLE("Purple"), + BLUE("Blue"), + BROWN("Brown"), + GREEN("Green"), + RED("Red"), + BLACK("Black"); + + public String name; + + TheColoredLampColors(String name){ + this.name = name; + } + + @Override + public String getName(){ + return name; + } + + @Override + public String getOredictName(){ + return "blockColoredLamp" + this.getName(); + } + + public static TheColoredLampColors getColorFromDyeName(String color){ + String actualName = color.substring(3); + for(int i = 0; i < values().length; i++){ + if(values()[i].getName().equals(actualName)) return values()[i]; + } + return null; + } +} diff --git a/src/main/java/ellpeck/actuallyadditions/creative/CreativeTab.java b/src/main/java/ellpeck/actuallyadditions/creative/CreativeTab.java index 541f64054..e30573928 100644 --- a/src/main/java/ellpeck/actuallyadditions/creative/CreativeTab.java +++ b/src/main/java/ellpeck/actuallyadditions/creative/CreativeTab.java @@ -69,7 +69,8 @@ public class CreativeTab extends CreativeTabs{ add(InitBlocks.blockTestifiBucksGreenStairs); add(InitBlocks.blockTestifiBucksWhiteStairs); add(InitBlocks.blockTestifiBucksGreenSlab); - add(InitBlocks.blockTestifibucksWhiteSlab); + add(InitBlocks.blockTestifiBucksWhiteSlab); + add(InitBlocks.blockColoredLamp); add(InitItems.itemDrill); add(InitItems.itemDrillUpgradeSpeed); diff --git a/src/main/java/ellpeck/actuallyadditions/event/PickupEvent.java b/src/main/java/ellpeck/actuallyadditions/event/PickupEvent.java index 1eea58cf6..4ae6bf878 100644 --- a/src/main/java/ellpeck/actuallyadditions/event/PickupEvent.java +++ b/src/main/java/ellpeck/actuallyadditions/event/PickupEvent.java @@ -7,8 +7,7 @@ import ellpeck.actuallyadditions.achievement.InitAchievements; public class PickupEvent{ @SubscribeEvent - public void onCraftedEvent(PlayerEvent.ItemPickupEvent event){ + public void onPickupEvent(PlayerEvent.ItemPickupEvent event){ CraftEvent.checkAchievements(event.pickedUp.getEntityItem(), event, InitAchievements.PICKUP_ACH); } - } diff --git a/src/main/java/ellpeck/actuallyadditions/inventory/gui/GuiInputter.java b/src/main/java/ellpeck/actuallyadditions/inventory/gui/GuiInputter.java index 846ee6806..664d853a9 100644 --- a/src/main/java/ellpeck/actuallyadditions/inventory/gui/GuiInputter.java +++ b/src/main/java/ellpeck/actuallyadditions/inventory/gui/GuiInputter.java @@ -232,8 +232,7 @@ public class GuiInputter extends GuiContainer{ this.setVariable(this.fieldPullStart, 2); this.setVariable(this.fieldPullEnd, 3); } - else - PacketHandler.theNetwork.sendToServer(new PacketGuiButton(x, y, z, world, button.id, Minecraft.getMinecraft().thePlayer)); + else PacketHandler.theNetwork.sendToServer(new PacketGuiButton(x, y, z, world, button.id, Minecraft.getMinecraft().thePlayer)); } public static class SmallerButton extends GuiButton{ diff --git a/src/main/java/ellpeck/actuallyadditions/nei/NEIActuallyAdditionsConfig.java b/src/main/java/ellpeck/actuallyadditions/nei/NEIActuallyAdditionsConfig.java index d27279f5c..6bb8921e3 100644 --- a/src/main/java/ellpeck/actuallyadditions/nei/NEIActuallyAdditionsConfig.java +++ b/src/main/java/ellpeck/actuallyadditions/nei/NEIActuallyAdditionsConfig.java @@ -39,6 +39,7 @@ public class NEIActuallyAdditionsConfig implements IConfigureNEI{ API.hideItem(new ItemStack(InitBlocks.blockFlax)); API.hideItem(new ItemStack(InitBlocks.blockCoffee)); API.hideItem(new ItemStack(InitBlocks.blockWildPlant, 1, Util.WILDCARD)); + API.hideItem(new ItemStack(InitBlocks.blockColoredLampOn, 1, Util.WILDCARD)); } @Override diff --git a/src/main/java/ellpeck/actuallyadditions/util/BlockUtil.java b/src/main/java/ellpeck/actuallyadditions/util/BlockUtil.java index b3fac963e..695f51e0b 100644 --- a/src/main/java/ellpeck/actuallyadditions/util/BlockUtil.java +++ b/src/main/java/ellpeck/actuallyadditions/util/BlockUtil.java @@ -44,7 +44,7 @@ public class BlockUtil{ public static final ArrayList wailaRegisterList = new ArrayList(); public static void register(Block block, Class itemBlock, boolean addTab, Enum[] list){ - if(addTab) block.setCreativeTab(CreativeTab.instance); + block.setCreativeTab(addTab ? CreativeTab.instance : null); block.setBlockName(createUnlocalizedName(block)); GameRegistry.registerBlock(block, itemBlock, ((INameableItem)block).getName()); if(list != null){ diff --git a/src/main/java/ellpeck/actuallyadditions/util/ItemUtil.java b/src/main/java/ellpeck/actuallyadditions/util/ItemUtil.java index df6eecfff..bb639c60f 100644 --- a/src/main/java/ellpeck/actuallyadditions/util/ItemUtil.java +++ b/src/main/java/ellpeck/actuallyadditions/util/ItemUtil.java @@ -40,7 +40,7 @@ public class ItemUtil{ } public static void register(Item item, boolean addTab, Enum[] list){ - if(addTab) item.setCreativeTab(CreativeTab.instance); + item.setCreativeTab(addTab ? CreativeTab.instance : null); item.setUnlocalizedName(createUnlocalizedName(item)); GameRegistry.registerItem(item, ((INameableItem)item).getName()); if(list != null){ diff --git a/src/main/resources/assets/actuallyadditions/lang/en_US.lang b/src/main/resources/assets/actuallyadditions/lang/en_US.lang index e2594c3db..8da251d0d 100644 --- a/src/main/resources/assets/actuallyadditions/lang/en_US.lang +++ b/src/main/resources/assets/actuallyadditions/lang/en_US.lang @@ -61,6 +61,26 @@ tooltip.actuallyadditions.itemBattery.desc=Stores RF! Charge in an Energizer! Di tile.actuallyadditions.blockCoalGenerator.name=Coal Generator tooltip.actuallyadditions.blockCoalGenerator.desc=Produces Energy from Coal and other flammable Materials +tooltip.actuallyadditions.blockColoredLamp.desc.1=Sneak-Right-Click to turn me on! +tooltip.actuallyadditions.blockColoredLamp.desc.2=Right-Click me with a Dye to dye me! + +tile.actuallyadditions.blockColoredLampWhite.name=White Lamp +tile.actuallyadditions.blockColoredLampOrange.name=Orange Lamp +tile.actuallyadditions.blockColoredLampMagenta.name=Magenta Lamp +tile.actuallyadditions.blockColoredLampYellow.name=Yellow Lamp +tile.actuallyadditions.blockColoredLampLightBlue.name=Light Blue Lamp +tile.actuallyadditions.blockColoredLampBlue.name=Blue Lamp +tile.actuallyadditions.blockColoredLampGray.name=Gray Lamp +tile.actuallyadditions.blockColoredLampLightGray.name=Light Gray Lamp +tile.actuallyadditions.blockColoredLampGreen.name=Green Lamp +tile.actuallyadditions.blockColoredLampBlack.name=Black Lamp +tile.actuallyadditions.blockColoredLampBrown.name=Brown Lamp +tile.actuallyadditions.blockColoredLampRed.name=Red Lamp +tile.actuallyadditions.blockColoredLampLime.name=Lime Lamp +tile.actuallyadditions.blockColoredLampPink.name=Pink Lamp +tile.actuallyadditions.blockColoredLampCyan.name=Cyan Lamp +tile.actuallyadditions.blockColoredLampPurple.name=Purple Lamp + item.actuallyadditions.itemBucketCanolaOil.name=Canola Oil Bucket tooltip.actuallyadditions.itemBucketCanolaOil.desc=A Bucket filled with Canola Oil item.actuallyadditions.itemBucketOil.name=Oil Bucket @@ -144,6 +164,20 @@ tooltip.actuallyadditions.blockWildRice.desc=Grows in the Wild... Gets you Rice tooltip.actuallyadditions.blockWildCoffee.desc=Grows in the Wild... Gets you Coffee Seeds! tooltip.actuallyadditions.blockWildFlax.desc=Grows in the Wild... Gets you Flax Seeds! +tile.actuallyadditions.blockTestifiBucksGreenWall.name=Green TestifiBucks Wall +tile.actuallyadditions.blockTestifiBucksWhiteWall.name=White TestifiBucks Wall +tile.actuallyadditions.blockTestifiBucksGreenStairs.name=Green TestifiBucks Stairs +tile.actuallyadditions.blockTestifiBucksWhiteStairs.name=White TestifiBucks Stairs +tile.actuallyadditions.blockTestifiBucksGreenSlab.name=Green TestifiBucks Slab +tile.actuallyadditions.blockTestifiBucksWhiteSlab.name=White TestifiBucks Slab + +tooltip.actuallyadditions.blockTestifiBucksGreenWall.desc=A Green Wall used in a TestifiBucks +tooltip.actuallyadditions.blockTestifiBucksWhiteWall.desc=A White Wall used in a TestifiBucks +tooltip.actuallyadditions.blockTestifiBucksGreenStairs.desc=A Green Stair used in a TestifiBucks +tooltip.actuallyadditions.blockTestifiBucksWhiteStairs.desc=A White Stair used in a TestifiBucks +tooltip.actuallyadditions.blockTestifiBucksGreenSlab.desc=A Green Slab used in a TestifiBucks +tooltip.actuallyadditions.blockTestifiBucksWhiteSlab.desc=A White Slab used in a TestifiBucks + item.actuallyadditions.itemCanolaSeed.name=Canola Seeds tooltip.actuallyadditions.itemCanolaSeed.desc=Grows on Farmland! Makes Canola! item.actuallyadditions.itemMiscCanola.name=Canola @@ -219,6 +253,8 @@ tooltip.actuallyadditions.itemDrillUpgrade.desc=Sneak-Right-Click the Drill to a tile.actuallyadditions.blockMiscEnderCasing.name=Ender Casing tooltip.actuallyadditions.blockMiscEnderCasing.desc=Extremely sturdy casing, used for crafting +tooltip.actuallyadditions.onSuffix.desc=On + tooltip.actuallyadditions.phantom.connected.desc= tooltip.actuallyadditions.phantom.stored.desc= tooltip.actuallyadditions.phantom.unbound.desc=The Connection was cleared! diff --git a/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampBlack.png b/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampBlack.png new file mode 100644 index 0000000000000000000000000000000000000000..ef4b1bec3e42cd46cf257138318f5c57443ed928 GIT binary patch literal 306 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4fTQ1jQ^bwCl$0*}aI z1_o|n5N2eUHAey{$X?><>&kwgO-7iN-*fg`1)z{@W=KSdbAE1aYF-JD%fR4Vl$uzQ znxasiS(2gP?&%wlqL<1J6rbkl;uvCadTH=Ou44)uUydyJUVoS6`)RxMZMt@eXO39= z>wdY{`_Euz-wDBh(0UfWZ}tpEn~(M<2r7oEeoM$+yCx-#C1D=pog(|!eJU4scy&$M z%ldzt^O*%Q)pwn){x0Me-4P_1{KrJ+`~0X!<})p)T|Z@AxiL#Lnq!sMRh^=HDiX;$ rpUQH7TF=PtDgXVtcaQC|GgV3A8#@zq7d<>&kwgO-9JtVxyvEDo{u^GbEzKIX^cyHLnE7WngeFN=+oui1d7Sjn%&_^mzI4b* z<2jbKM(^%>sJOFUefXv-&qyZw??$#2-~UZ+zxTVAZ_}R0z_W**9xRl(d^*HkKyb^o xV+vcZC8Qm0zxnam-MfFKRVIlSmM?w(ga2s3N^|Qs9gjdh_H^}gS?83{1OStChq?d& literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampBlue.png b/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampBlue.png new file mode 100644 index 0000000000000000000000000000000000000000..dbc5f98ca8a9a944fbc31cd07481d289d1c90416 GIT binary patch literal 533 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4fTQ1jQ^bwCl$0*}aI z1_o|n5N2eUHAey{$X?><>&kwgO-7i_*!Sk46rhl7W=KSdbAE1aYF-JD%fR4Vl$uzQ znxasiS(2gP?&%wlqL<3fz`$7P>Eak-aXNJJ!8|cTo|gTEVN8Ck+b-2RigvI&?)h)5 zpcufv_Sg5Q(7P!XH*UuAt+t3vx0zR1QvCaJLPCPHCPQ-bk$s1HvYQ(YGRfYq`BSp6 zHQ<26OreRdB?MU0jP}LJZ#c{J=yO#fPx1Gsv9UoLEgx~Re0ctEYU$pBy>>$16qxqa z|D7PpvzC){8*h&A#4XXM>+iq27p}d?!^!&M+q?g_COEfrT;Q{7W89p=*0X9(tXhMK ztMT6F`?gLp`1DAL^{{YZm-$q?b83@UHlLW&$~8$${ddfj)2)l@^;iTpdvV6r%Io@= zr}3=3$iii9o-AW4@1tfd`j@3!EBkkWV(uloQX!r02_cVEJ>F+#hir5WiaZjR%4OO1 z@~-*?o9b%gnPJ5Og%{?W+&eq>vmN*CGKTl(6T5cgKD+*Yx{&|xrNz;ovwi>Ut-tFY zXTIG&XLjk{C(fP88%)@bZ3unu9r^Rimj)3X0gvYA&yR09`FoChv&x%|^Zl(4{$chN Vy(fIeMkERpJD#q7F6*2UngHHL)!6_5 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampBlueOn.png b/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampBlueOn.png new file mode 100644 index 0000000000000000000000000000000000000000..a4d7eb831fc53c2298a0e1b2facb59132ac2d09c GIT binary patch literal 623 zcmV-#0+9WQP)WFU8GbZ8()Nlj2>E@cM*00GlUL_t(I%T<%RZq+~# zhQFEh`WQ+CuK)-M5+MpgO@$~B4Ub1dLr0Y+JqQ{SUIQr&C^_fYJ3qx7FNq~<*WpWN9Hz~B1(A~4SBzAkTELq@EV_w9(Wa4@bLL7MJ8Ug!#P>L~>94NK_E*(YuX`Pn#(p3C`P&YM%M(GZ)?vDX zB6(h2M`{weUmaSh0XPI#*TLs6zx&0hHH&W2T7{e@=k)CIaO4a2@cBncjicieA`(pm z{VuG?w!64x<@wLAxQ`6x6#{-;{2(oj! literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampBrown.png b/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampBrown.png new file mode 100644 index 0000000000000000000000000000000000000000..6ffca11b4a6acebe54992abac33180ac9965b9bf GIT binary patch literal 445 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4fTQ1jQ^bwCl$0*}aI z1_o|n5N2eUHAey{$X?><>&kwgO-7haJ8o-~5l~1rGbEzKIX^cyHLnE7WngeFN=+}Aba4!^I9)s0JMXXokBfXHW9w#*yK)P@?~k3V^GGkm zSNzv)Hy(*;s*?^&_PzQ2I+lU6k>T;vE-N~(t3H^fyhJEu(b9PlhI!E}jtoC` zu&C_N%U@c?x27ZOM`h{#e-YCU{2!j(@B?(CwB91(VtEfy9SwcU;TaQF_(CZX%kvzC6?x9s(XRAE+LwiVgD zHhZ_PZ=BUvVj8?k(=IW*)q7R-|G7S?wfEO{rcEwLo4}%#eDy-?SNFviw6eZA>80te zYA>Tz_lc`Htk9?3{)7 jlgj73)xY?&&glgTe~DWM4fk|waa literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampBrownOn.png b/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampBrownOn.png new file mode 100644 index 0000000000000000000000000000000000000000..b9f8e8d873df68772dff7b8f03d069d7c5ab3845 GIT binary patch literal 481 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4fTQ1jQ^bwCl$0*}aI z1_o|n5N2eUHAey{$X?><>&kwgO-7i(Ec@leT%eF_W=KSdbAE1aYF-JD%fR4Vl$uzQ znxasiS(2gP?&%wlqL<3fz`*G0>Eak-ak@6x(eH=>&m7N9LVJ}IPlI&Hs^zPQgU8|PVPG;Xxa9eEK@zM{IAEo6@ zQdnzpaOy7OH^+9Z_1KjCQ2+K;ri9=X8QekH+xKl#Jw?~_4m%_F{)2xS zyF28raEUV)>XxbZx-Gc7K62~aCy%pNZr|-7G)eX70lyOmmbT8<*)#XquIKZvY`dEG z=%Z11JyXNu)MF-m7B#n;^~0jyM7`P99rot$m(_`=!z%y) literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampCyan.png b/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampCyan.png new file mode 100644 index 0000000000000000000000000000000000000000..878f0c77be34735a107928c9f2dba968fdfdda6e GIT binary patch literal 477 zcmV<30V4j1P)WFU8GbZ8()Nlj2>E@cM*00BWsL_t(I%Vm>MPUJug zL|^qpg#F+G5H086{wG07<_N0^%eeT6-83OTZMn;KRkfq1w>M*hjcp_W^!Qhxx=qqBRu3?Rv!#-zMg2kFqLXIBdQEd(gm2 T9!u4B00000NkvXXu0mjfrv%E# literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampCyanOn.png b/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampCyanOn.png new file mode 100644 index 0000000000000000000000000000000000000000..9af1d047929beed11c7985c36959c1367284797c GIT binary patch literal 554 zcmV+_0@eMAP)WFU8GbZ8()Nlj2>E@cM*00E9kL_t(I%UzRAZrm^o zg+Ef(#ESwcGH4Ibn{<&0P@reaVY+H2$$1J4f_PJ48ku4jq7-MeF(LEu{Ya8;_xJAZ zu&%fnk`e&!j);u!*o*(D!n!hfDYzM*4+nOtC{Wx1$N?6h_^_0ME<9m)l!T$0O=yWD$Pu_f(()S0X5Iu9f0Glw=WRRes#uG)2>d z5-V>c{=2Y14Be@6wdrGBn}r%aXI0F7NEH#X2{DKbY+oq3X!T0?+3TMfYF+71U$ zrYVZ|hOVeL*Rb>Hf*oL@*3m?yzGc}eTQ_!lkGk0h-+41&n?Ar>t)w_1bH~j-s2Kru zf3xZU_gv1kvQs6AAStyF`{mh&nM3|LSo_{vt^5tuExTIDaa=u2k3k*mQ3Hd$zXv5` z{d##B_q>C;4GG`f%JZ@`Le+MWmd8iF9uE9|eIw s^n{y1t?kLG(vKK;f9k5O4`5yS4>ZpFr)*xQ#Q*>R07*qoM6N<$f~b<{-2eap literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampGray.png b/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampGray.png new file mode 100644 index 0000000000000000000000000000000000000000..c25d65952193d8d9bd1f09906d10314ca89a7b79 GIT binary patch literal 372 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4fTQ1jQ^bwCl$0*}aI z1_o|n5N2eUHAey{$X?><>&kwgO-7hq+kIU&P@X|HGbEzKIX^cyHLnE7WngeFN=+i7TuFRIYB&aqfp^0%8ytFg}V+Mwk57XU>ex$V(#fmd5xMn5yJgKg)E}NGjz$58?Im3Z%x!g`B`gf|2 z7s>>Lc7(6l+UFn`DU|kW`;8m3XCAzLYSP{v(KBDV{tDc{<70I7|4W18)72Lmg((#= zYwv$1Gt;Gn;k{mdK II;Vst00hvEZvX%Q literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampGrayOn.png b/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampGrayOn.png new file mode 100644 index 0000000000000000000000000000000000000000..bb1d29c27fd0c76f40b6af1127ef48c868722126 GIT binary patch literal 459 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4fTQ1jQ^bwCl$0*}aI z1_o|n5N2eUHAey{$X?><>&kwgO-7i}ob~I3T|gn(%#er@=ltB<)VvZPmw~~#C^fMp zHASI3vm`^o-P1Q9MK6_|fq_xq)5S5w;&f@S_ol-J9KuR_UD7{Udc3diQ_IW?e4uL; zFzZ`oGXFGFj}t|^?{%bcAzHR(+?atrBHj{S5 z=q<>&kwgO-7haNj>w?G@y`dW=KSdbAE1aYF-JD%fR4Vl$uzQ znxasiS(2gP?&%wlqL<3fz`)4m>Eak-ak@6xG4HSek8&!rHGlN}4gdeIe*25@_??5( z4yW8?k|@*(RMKq!Qzgu>fSJi5Dd%5R#(TaitbbM{oLS&^a@URf(ku&_n0Xj$^d}!; zJz@6iUPCmiJnzDpC(iGBK4r;@k8{s>G|2E;7A0kJzupw<(Xn&Wj$^9|$~^DOo?dKs z|L7s6S4DfH75>e1vftEwIAT+d*p$AuFrBy6`g7+#3vB8SIp!4S5Y~8Yrh0)n+j7RY zY!@dSWk?mfsn)f!i>=65*X6`IGpBlN}1b@d7}8V&j1^LFSkF!XPm^RzNY=2HD!?jMYtH?y1+zD7<21(&C* KpUXO@geCxhTB2A0 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampGreenOn.png b/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampGreenOn.png new file mode 100644 index 0000000000000000000000000000000000000000..08264433780ec45a6ab6ea7afa48238ddb8939bb GIT binary patch literal 464 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4fTQ1jQ^bwCl$0*}aI z1_o|n5N2eUHAey{$X?><>&kwgO-7hOXIgiLI8aD7GbEzKIX^cyHLnE7WngeFN=+*0;~FF_%8SNMaYI@b$m zZK<$$v+nxBld9j2&6Dgm-}JLenPGu|ih?xb9=Wx4T5n^k*O7`AKs6 z3XIKMUmlAVINXnKV93<5^*d0v&xz0afr)eF`i@^aWsgq2@=QAWo}({=@Qb?W{n`nJ zvpEAIBJ(7Q%hD!iIAyxbV>AjjThlz{+36`+b2b$0Re8>wkt)4+9b>dX#`L2T#4qh$ zI635J<>&kwgO-7hQ{$W!yCs0T>GbEzKIX^cyHLnE7WngeFN=+;m2PE zvkR*{1o`H?{e1I9-T&f-YYYxd<#l?QZ`K|Z>-!xy;TUT}m1*AgLxmw{_NL$ZJ}F^y!lR$}Gr2vvqq}dUDW6_*T*hSIg_E+| z7)nn4nxfO}av>;e<8}k44V!+(8SA;m+QEp3?`)SYwPbN{tMzJ%skVusEh<^HE+Utf9UJl*m#PuAM>*Ew^p z*|cX~JE`=#@XE`B8m2F6!?P0E-j|P a^8H_XX2p#=x(5S5f#>P!=d#Wzp$P!@qqBPe literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampLightBlueOn.png b/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampLightBlueOn.png new file mode 100644 index 0000000000000000000000000000000000000000..7ebc45f62a3f2bf5cf8c65515630b9ce10d7de00 GIT binary patch literal 492 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4fTQ1jQ^bwCl$0*}aI z1_o|n5N2eUHAey{$X?><>&kwgO-7hW^UC#qQa~Zu%#er@=ltB<)VvZPmw~~#C^fMp zHASI3vm`^o-P1Q9MK6_|fq^l=)5S5w;&f?HbRLr-kBl|H1(#6N4#RM#4IF(J@9WLJ z@t31)Q|RpZ5$BG`^|$Ly*Jo`AVhDBRU=jRNJ>z#Qm%!V{CT|6peljy0x$!ROm-|Gq z`+3|Uq7x-89(NFMxjrj~nYiA}V6bxK?L&$H+L7;Jhv z(eGSr=Ix$ZkChuM_ivZ(6qC4nv31q2NJ++k^zAx#Gjb9Zr*58hX_w%|<>&kwgO-7hq;X=)(-#{VR%#er@=ltB<)VvZPmw~~#C^fMp zHASI3vm`^o-P1Q9MK6^dDE`CK#WBR-hiR?b`a-G2Ht>5y;9>UvN2 zesy=`n6M)D`csAn?+VIiNT$rb87|*Y8$P9Cp1Q|72iB)9bB{~xXJ81(Zr%OZf^Wu6 zxBjV0ALa;e4eK#@B?C+Bo7x%F!A`<4^V*XF7`n`6C>;Xv*EjI|HHn<>&kwgO-7heEA8{2WT232W=KSdbAE1aYF-JD%fR4Vl$uzQ znxasiS(2gP?&%wlqL<3fz`z*q>Eak-aXNK!;H6gv9Ig8W9%a=Otgh6_>5 z3AfEY*-37_22?D#@Y<>A;tN(SKD8~kT}+87)HO77ZJ^h|yZfb58fIRMI((P^%Vt(% z>7;2vZR>wG*v@9T8|}jLfpLP#cSg=xbuK;s>K#o5FK4Z-SDP^9Y)^-RJAcjc4et#n z*G*Rw7S1uSxe(~;;&$O>iPUqM-1oIdI!}Zjne#GkN0j#7@@=`+1~2!1uG{~A`vfM{ zvm(Zmg@1hhDHHKbMa4XC-t&dOWFU8GbZ8()Nlj2>E@cM*00ELoL_t(I%T<%HauzWR zgg;5XhR{R9kYOMcG|cci6udBHiliZV2*QxFwG^_QpYz<t@_1h5#0ipBWV{iXtT5@hSO9`2Aya9C2e)9O825!*rL-pbvE#fvMbe-Ju6Oq_V$1G}_jk8AB!K2-73HIhYlHmI4X8$OwBiE$`;uZu4V({zt w9p0c>13EnZxkp*R=0$IkD4X+Te_KD`A52BqJK)M<1^@s607*qoM6N<$g3#;X0{{R3 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampLimeOn.png b/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampLimeOn.png new file mode 100644 index 0000000000000000000000000000000000000000..8db47f2ac87d6dee11bddc58f132b0321c0d3e49 GIT binary patch literal 635 zcmV->0)+jEP)WFU8GbZ8()Nlj2>E@cM*00G}gL_t(I%T?1cjwD48 z1<)7S*)`ow3l{@Uvf2Y+VBoDVK;jMv|M(H{`h(QzXR;9!I@yWxax&sFjX3Jasr`8*e)+{4yEq7;xqxa5nu}^HrK_ge zdiUr30DSdce)ZY6E;)PS2i0VwYG$FVFFk9!TH$N!O)rA4j1$#Xp+a zWCtcYdq>~ok3vx<7Ip06u%evu5p44gblqJX?BZY_M@7+H^_hArFz4Cc(N%NRz(!R~ zu9`W|iZa+m5rR&QX*6kezSVLU2bq1>v098&s=hLS$?brde>FcG7pokJLj`a)Rk4X|F{7A zINC%V7AZc7PgT>}ywsiY(Jl_Et*A>6wlUe}9o`IHZ~CaHV!FdT9i1&tjkI;VW{tDo1d*ClC{rLK+K$I002ovPDHLkV1l3l99aMW literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampMagenta.png b/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampMagenta.png new file mode 100644 index 0000000000000000000000000000000000000000..fcb0d50f150011d3466b824870c52e0f61959300 GIT binary patch literal 540 zcmV+%0^|LOP)WFU8GbZ8()Nlj2>E@cM*00DqWL_t(I%YBn;irg>| zgul|mY+%VP@)#I~-2WJ1*~vLVLN>Og+8-@j*#u$`jk~2%b(LCQ>dgS14mL>q?@JtY z(dm@q;K%xbMHL}-?*J4P0Cw+WWdNERS(&Hp4mJhgQa{n?ET11BLro9R3<8p<&2edu z@az7QYrXKa-AULK6&`QzqiRqk4sQ;iGH7R@ig&k1B#}s@qqo5pI(R!8)(J`#RGr|q zLxZRrx3Q@^RwxE}WFU8GbZ8()Nlj2>E@cM*00GrWL_t(I%YBnSkJLa6 z#eeq9Cfa0|EolG=@wF(RI;v~#Dn0|%6`+;)YBWexCjoc+Pm^TE6wc0aLL$w0tUUX@ zXODbb-x$Eah*?2I`QH}_04U19NIV1I_iuToYk~xhJg^ie!mSJF?~aXo3W? zWgg3pRvNmdCyx_%`z;L%--CgX&-<@T<>&kwgO-7i*z$pK&k*im)UcP7V`#X(R&DJa0jxgTzaJsHo%Gq<4Q|7oki+6ypx^Dt& zkouR)m4{?~SdRS__B;BLf*6)dmA_w zz2-i#VN=CPqwDDs4AD)G`@%Cq9u!*y?EVtXdDD0M1fjjgp;iIOpU=6acVArb!j}Dg zQx(h9Sf*4*iF*_8%x%ay_R`^;+y$#<{hUiz_q?@p@QiJc>MlQ>H(Ny2dY$>=UWG() z#>)$Pz5n|k$YxRza{ByVd__mYuI*E=uA6CG;JaJBV76*D!}mj5YjU=&YmB&bH!oB3 zzN1zp_w&mW3vB{UrQ7_dGI^^sS7>RPzTa`qtuafuV(OMzyqq@6Dc4VPjkl3T#hTKbLh*2~7YWdA)4_ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampOrangeOn.png b/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampOrangeOn.png new file mode 100644 index 0000000000000000000000000000000000000000..193e7d85e75af71167e73820d08e99ea3c1f105e GIT binary patch literal 567 zcmV-70?7S|P)WFU8GbZ8()Nlj2>E@cM*00EmxL_t(I%UzRAZrm^o zg+FREo*#EnH226N&8myur9f9bP_K|v6a|c|gCI8v(6MWoBX&XhXDUDtC5n%HkCJrH zcUH}q3aCQUK&?JgT32wpY220sQ-M5=hAMo1d_*`SBA88nN%jD-&mM^anb+42Rgho5 zKiU2L7mPxC`W8VMvk4JdY##-Hes}^hZ*Lu`6wmbG`~#?%86qb{gj)Lm+DAnPL|WSO zcSLsVG6Xw!&RNWc8w#uch{!2uUAbxyGc(LaMB3n}5tai)F}t$nOHmYK+Ud*97yS71TM_UR$->$qq(8rAZgRiirE;H@Gcl7GABg# z%f(gwS`E&G0W@}w#Lf+{>bd<8Vhv<;XzcY1^d zkruO&mzR#i5u|&*vuQF?f>Qj;=Im3Wo3n2|FD06s;UACO;*-wJiwOV#002ovPDHLk FV1jT_<1PRI literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampPink.png b/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampPink.png new file mode 100644 index 0000000000000000000000000000000000000000..d125fe3ac5c28a49c13fa8f567fb865e95b9c46c GIT binary patch literal 402 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4fTQ1jQ^bwCl$0*}aI z1_o|n5N2eUHAey{$X?><>&kwgO-7jAOl1Z8Dxi>TW=KSdbAE1aYF-JD%fR4Vl$uzQ znxasiS(2gP?&%wlqL<1J6#wSw;uvCax;NNSh)I#h`>@?X$*=PJPOd-wLVAJRu1KzT zj%gBHTQY@L*vj*_TlZzQ?QfHO(8s&i{lQnR357SS*HrGmwe=l?0}Jzkr$W=y9%h*3 zCFSL^ZR;g13WXYso+$?OO>lHUA#t^o?af z#oO%J`!5-@uAF;RxiQz8F~C93`u0wvn=gANvuV};WseF^DF5L8(x-in;}<8P>pFXz znu@;NYrK|r;9AnVx<4mXcvTjCTYI!tGkE`p6Thl@(}H&XWKNwm|Gbmp-?x|9PF?Zp o+FVdQ&MBb@0Ia~8m;e9( literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampPinkOn.png b/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampPinkOn.png new file mode 100644 index 0000000000000000000000000000000000000000..6134821a6ab8ed74e6020e69ed9ab543f92eda94 GIT binary patch literal 478 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4fTQ1jQ^bwCl$0*}aI z1_o|n5N2eUHAey{$X?><>&kwgO-7iBWg^F-e4vnQW=KSdbAE1aYF-JD%fR4Vl$uzQ znxasiS(2gP?&%wlqL<3fz`*F_>Eak-ak@0fvG0%p&zxO(6D#<|RRsDUrz)&qv0vnQ z*Vae<uA?Rlj+8?RBXu%LHQq#vPykyfN*mn=TQJeHd;Jq>C;HnH>bnUwNhcV1f0 z=iVWjmu1-0sT+UsWi^wA9#fp&X{YDUG#I3^tZ%Gatk1+(uGYPL)!NthqkmLwkIxP? zf9-Xktm55)y7RAM!x{E$xwh@@t=x3Y&=0!Dxa?JTUSCr7>r%rHeQtq^IgWQk846Z- zU29NXwU7Obnc~av>Q%FZ!nGXA@7c?j1(X=@Y@L)g!I-gRx|zzRO|2YC_wsmh%Jn~l z1w7{1bN}gFktJ`RPv+yyejK@DHsfyD#&_ihYK4Q&9Wc3?o1u39^`E-_1N?jacTKpm S@U0psm_1$nT-G@yGywp#Bfw+; literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampPurple.png b/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampPurple.png new file mode 100644 index 0000000000000000000000000000000000000000..ea75002506f4c36db7c25be0052b5f1a9a5c774d GIT binary patch literal 544 zcmV+*0^j|KP)WFU8GbZ8()Nlj2>E@cM*00D$aL_t(I%T<$4j}tKr z#edI9#R&;mKx|KY;DW?=L40?Pdj^&+njg7keI|Y0%Hsa z*2;`yere|PF%$PM@1O@rkXacKwPsdq*BimlFy)A5-Y6uLj}Cj+Pl2z1IyZYA42@UG!c_w^r`8i5vz#pjC!ZRT4*iv>@M9e6^=rk@L=6g|cB7T|m<%|3$B&YGu(E z#|+%!)|dU#JMK&fw~wxbZj}$@BiTYjs%jYE7}XfCvK7 z13}X!{o=a`k3^?|L*+1p&Iy0dkcrS#5V6S==)!awxCJuk-`JXID?MQhr-8nGF9i~A zDv)W*p;burK#vEA8Y_L_!HKzl{dNt?8ldYdJB@1T-XP77WFU8GbZ8()Nlj2>E@cM*00GNML_t(I%T<$2j?_R5 zg+IHTq^E}kXJCg|jKmJ15gY-{84x>8!xfl&AR$1YhRqy=#r&qaVzY2{dWaM`aaBFP z_w14#7vTgIr{RngoWKbbStEcG7z%(PR2+L?q2auFb_OQ~R-iTj7%gLMnRf>du)?>i z-!vTg&bxT^{0!y=-oGX$0~Kfss2;xonKN?v6Rhy#>JM63U^L?6+eCLqwj-z_H*+5D zOyXo9PDkRyITXc^E(l;VtX1N!W^O1MJ#u|x9b91FXau%ysEs%sJB!GQgLdr!cNJ8K z1AwL3Hd2!2!MFn(4|tS17V17oc1EqY2vzV%qnbl)$lMXS5At*irup{A8qv``X;0;U z32jNrDnwgy?O_l51lNYcykzCBP3E@tJIi#?ht?V7f5RVj0bo0VDN(YbJehK{O1kf! zW^Que48;tEsU-ET{V;`58**ETK~ty|X*zonr9<>&kwgO-7j2N?t>g87L&184^+AoS&PUnpXnkGB7w7r6!i7 zrYMwWmSiZnd-?{X=%um)#UFUOIEGl9?wx!wm)VfVS^nzn1)f&U-{!BHzD4@Vo8vbd z7je0=$ef#?I%|n;tTNAopPkp8HrGY>s&~$iP8K`*r+;VMR>n8q7#Rwt8GO)N$g+rO z$D_RBi8peS6zg6nyuV~2Bz*R3>NTymwwdLVyIJPg-YyEhHdDG-kL$;@l|fx`odM3} zmhTU}TgzN<>&kwgO-7i3&-u0HXP}U5W=KSdbAE1aYF-JD%fR4Vl$uzQ znxasiS(2gP?&%wlqL<3fz`&^K>Eak-ak_MJpx+S#9+&x(b1eDfIo4VTy1Qz(2pnH{ zMb_?`-aUqitJM15&fF+l9Vf=P;|L#5!t?)EALXa*ICA1Z`#s5r8(J@S{0|dSKXLT$ zu6)5g%-@42nW_4uy?-~S`uWwl({9eMvY)d{k~f08$|$O#`27sYw6Z%F&ni6GQL6e^m-Pm%i|M?p&>6%UX20s%ODY-;Az?%B6RkE^ctry{NkJXr1QN_i6j1 zY>bkZ#(tj~>05UtbACy`{j-EAR-u1?hrF20^t5t{-rEDyUHGd{JD$>i8LF1O$mMj{ z1LHqNeSsNjdvz~-+H>r$(Z#&VpF*4OE@Lm%niO=Z-C8-yGV08?=Iow7UQ s_tC#m+{TMN_pmnaWjXhD&f7^p*pyP|1?<*Ro&pL@Pgg&ebxsLQ0C4-eA^-pY literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampWhite.png b/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampWhite.png new file mode 100644 index 0000000000000000000000000000000000000000..5ec34449d52841c6e6e81f027394e44b864a0bd5 GIT binary patch literal 439 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4fTQ1jQ^bwCl$0*}aI z1_o|n5N2eUHAey{$X?><>&kwgO-7i*YE@gfA5cg(GbEzKIX^cyHLnE7WngeFN=+GRI=yz5Jp*r4Mrv@>9; zi;?8&obvPTsT2Q9ThN^-5!5=(;fnamz?qA){!G2Ho=fjhNC0z7-1kZMnfw2`=1*S| z-qf+<*OCXXYE$1oU%36|>it<0ZoG~>b?)Wm92dLvxNKKXCME| d|25lRNIol-q0->d%?F_H^K|udS?83{1OOnMu^IpX literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampWhiteOn.png b/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampWhiteOn.png new file mode 100644 index 0000000000000000000000000000000000000000..eaf3c0c7bec19f1688b5bb27219a45e4e2d99862 GIT binary patch literal 569 zcmV-90>=G`P)WFU8GbZ8()Nlj2>E@cM*00EszL_t(I%UzPuPNXpi zMh}!WK9UzEV|*|lO{3B16PbTH1@>Z=I=kG^HUU0PKY4zB&dkK!i3nP2WG0!3i0llI znY7jb5E0xRTWjI&JUl$mdq-7SYat?-8JWpi>z~G|%G=u;5rK&ar_%{{=l=d4Gebm( z2t;I00(SoT`r>pt@&5jfx;tjZ)6)}~NklNlKtwo>gNUH_j)>5EXNh?(Xi02qFRiRmIGR2ricks=6DfDw&D3)^K;$ zT2z#p|05zcU{$@UtV6+acT{z&>b>t==i9KFRQYy#sZ-VcGnvVpb1T*|&|2$C^{)@g zR3frHP#juoo0Z;9A7kvI0#^6lI}yS8e5UulztLK2wAME5l4fSOJLmKH7nm7yPJVuV zaQEw=%*4#Ltn&YyljAtH7mnlDjEc!_Fz4juWFU8GbZ8()Nlj2>E@cM*00DDJL_t(I%Vm>IZWTcc zguimnNG$S_DrJ+P{!?YiUavGp%a|-d)~<8ekB;yvjQ|$bf-tyk4Jihe?9F%Ll+|e1@5DWFkFgP3XD1BMwG+nV+)v6kKT>zL9=cW zx&>B;iS+!Lw=nsS=fko7l-O8;Bw1WP!6{+RWA#L-J0I|?{C>@I9f3&nw={$lOQq984 z^%u97kM#In15|H7It) literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampYellowOn.png b/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampYellowOn.png new file mode 100644 index 0000000000000000000000000000000000000000..d89463658011dfd3791cc6efbe899f9bb8cff051 GIT binary patch literal 595 zcmV-Z0<8UsP)E?TNMBR03B&m zSad^gZEa<4bN~PV002XBWnpw>WFU8GbZ8()Nlj2>E@cM*00Fm2L_t(I%T<$2juSx) zg+Es+)%hC^z-Ex(LaY$iV8MzdXMhvrNGzk#2-uB~fJ~-Ssnla(cfv#}#d7=Sy=U8Y z52$w-M`#U7f!_V4bo~dnOL04A&&h{_C%$?07PAGALDi!yqE*2%&_Nw6bN78qYhd4g zpxc-45S4{}02MD{N6_qQ18@T1s4rld`=47AIvV9a<29gD6!@x%% zQwjt-Fjki?(ms4afsSd7vGU?1pi(R3DL{;%4bb8N%s>OskUaqj(+x%fGQC4C1yBQf z;(|tNM8Ar8`E|tPbMSc@3z~tQfHR_naA#0!M0qYb&16Ylj4}oq7_y>#(nu9v6{Wk^Ye&Yd{3uZ4OIXQegBm3(UvrNvRfsbn* z+(S$)ov-bI84|z%c0l$E)JO?Z@3FE0)3;AxkH~(9CIb5tg;%Z(Tnk8hMm~plIo4Sh zTAq+DRE~TFE94xv&>FnHeIJKX0!ah&g@KNAz$lol5l43STUINu-2)m&hf}McY|j3s h5l`PHf34S({s)ox(?lkfN<#nu002ovPDHLkV1o79>uCT0 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/blocks/blockEnergizer.png b/src/main/resources/assets/actuallyadditions/textures/blocks/blockEnergizer.png new file mode 100644 index 0000000000000000000000000000000000000000..f3ce925cf0231d5862aec0d10eed2e217ac741be GIT binary patch literal 701 zcmV;u0z&WFU8GbZ8()Nlj2>E@cM*00JRNL_t(I%UzSpj@(8J zMGvc3rB-X=zzgRmGV%X^PT~YvPrIdQJ^1iKoe5wriU2{}I=lqs_4W76ga{`yi45GG z|HA!Q4<{n|IaEsF>mRRV=0~HMKeKTh2LPGLe(Z#wbr0vCzyC#>D!q3y6EmZTP)j8< z@#gg2ad+Ge5dqGR_WhvNik4ECrU|!TKQ_XHB(dY5)IzO#in-C6Kh1I@BblyOBF>HM#|D`kPb%%bGvDu+Cw*v4*DJLuQG%+C z_9V0CHl{Y=5!B;pqJ^=n3z7vPxSO#b&dbY{@iLxb;b?6{1Rh2nMsG@M9etnQxxL*` zRVWjAfR@Jkc(AP-+kWu*^RM*YsXz@y^`t5V)ZCcA-;q*T9~;_~%Q$ek3}gsh8}G}) zGA}&VmEXR6LEHa+X?PHsNEnaRkyTjcg>k%4YvuYfqS3&Gp?8+~jt3wK2udb)I0BR^ zlv+rV$NUaenCFG-b)?k7FP~lzD`W`cFtBeM3IdrV;Fg3Z2$Wio5JZIA+Z(M9%=5xD zT@ewAeqy%+ZA}^afVtuBL?$F;o>U-IEkqcI@cnk9*2cc=Z0mXw{Q2##kBiF;+ygjI j_nefEx70Huf+YL^ewu*4{EfT800000NkvXXu0mjfpO-mm literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/blocks/blockEnergizerSide.png b/src/main/resources/assets/actuallyadditions/textures/blocks/blockEnergizerSide.png new file mode 100644 index 0000000000000000000000000000000000000000..6957ab987b0659b6d8b0f755cab625dba89cc96a GIT binary patch literal 772 zcmV+f1N;1mP)WFU8GbZ8()Nlj2>E@cM*00L-9L_t(I%UzQ(i)2+0 zg}=I0_rCYK#}UC@0}&M?nQ;;Sg4v3RxPgJc%}fl93^g|sBQsY;g=KMireF8#cW>P? z=y3v1PzMf0)j0(v*Vk7O0lhmBL645R^B>&r_3rc@{2wMM@#KSRBI2R3HNWRZtrdWX zV67|N&$@T#kKg~qvKgfmB7)W$Nd!$wL~#1>GqeZ%^fm4c5dqGN*0rLlSW1cQc8j;p zT2FNE1i}2?rzAim;G-|eKYv5cj=R&mA(F^Blgu)f5+aRZC~UV|>ieIgYN#rziii+T zzF-_irfI`8PHd(Pszy>(@-VX5Trv(Lx9>hBa4Z`+7qaDtLG|hxs!AyX!#I-7NW0w* z0?aZu?|g!qF_aNgCCNEL$(d}KoD1#h8ABHots}s`8>b7Z)3nBoN4Xz%=v5U*F@s zQKeJvBidnqV0W{_%ph%v3YId<@yN0)H1E9HoKgx3XgACXy*nv^HE-;1?~tS{#}k%~ zaT*xMf!ZpXl*2qT?`Mw7!sADeu$+l7R1NFi=@Ce892Z9xVcyS7(@1*jL@vf*J%9^C zDa`vjyaN(|U_{WWBS2CiX(9-Y`vbPFoYs}~WFU8GbZ8()Nlj2>E@cM*00MqVL_t(I%UzSpPF!aU z$AA7V=L~ZKX$x7jBuI@&H>G`}lw~UM46|U7hG$@rJ{1d;pkA3oN-AcU3p3~YY)D?x-9BJPf6rD+;e71fG}0GmR6Ux+c1LI`wShgPF6YfKHt zxq5#EIOc#m-|T-)&Wfs1wIUM8Ig?V#q!2LaY1@V%k$3OjGnq{2x(;`k&*y{~dG>T4 zbEnpVsS#r$#Td!$fRr1|l*`LYrqc;$XJ>$5W~f%)ygB3g`U6j&?Gr-4-N`8trqd}n zq?Eb3`i=4UBd4dQyn6LBA|T?NoSZNkjkvkFVSGKNZ5m>Xgb+wg(=eaSsOqfNYlg!i zAw)!kloIY6I|y`LN87dxwuZ!Vzr<>l#cF|gKuf{QST654KR-t#AOdgS{tE6JhGHOy z(d0zV4PiN7GM!ABFJ=@g%x1T^8?_XUkB@oz@+Zs;34y!Sij*>2TaOqF27~~iYGr;q zV>-Fz(Qun#*YWz7*HqgaiwKlb7>!2k>^$bh;di8z$+;!Qgd7|k`19xAA_9mY2%kUy z!)mo+dwZJ@1IxvNy}c*AI6Nf9h#DZy#l-~)cWO}t2vG{AgyP;~p=5-w&5^+D~#udcj YU$&KQT#YBj=>Px#07*qoM6N<$f-??X-v9sr literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/blocks/blockEnervator.png b/src/main/resources/assets/actuallyadditions/textures/blocks/blockEnervator.png new file mode 100644 index 0000000000000000000000000000000000000000..f3ce925cf0231d5862aec0d10eed2e217ac741be GIT binary patch literal 701 zcmV;u0z&WFU8GbZ8()Nlj2>E@cM*00JRNL_t(I%UzSpj@(8J zMGvc3rB-X=zzgRmGV%X^PT~YvPrIdQJ^1iKoe5wriU2{}I=lqs_4W76ga{`yi45GG z|HA!Q4<{n|IaEsF>mRRV=0~HMKeKTh2LPGLe(Z#wbr0vCzyC#>D!q3y6EmZTP)j8< z@#gg2ad+Ge5dqGR_WhvNik4ECrU|!TKQ_XHB(dY5)IzO#in-C6Kh1I@BblyOBF>HM#|D`kPb%%bGvDu+Cw*v4*DJLuQG%+C z_9V0CHl{Y=5!B;pqJ^=n3z7vPxSO#b&dbY{@iLxb;b?6{1Rh2nMsG@M9etnQxxL*` zRVWjAfR@Jkc(AP-+kWu*^RM*YsXz@y^`t5V)ZCcA-;q*T9~;_~%Q$ek3}gsh8}G}) zGA}&VmEXR6LEHa+X?PHsNEnaRkyTjcg>k%4YvuYfqS3&Gp?8+~jt3wK2udb)I0BR^ zlv+rV$NUaenCFG-b)?k7FP~lzD`W`cFtBeM3IdrV;Fg3Z2$Wio5JZIA+Z(M9%=5xD zT@ewAeqy%+ZA}^afVtuBL?$F;o>U-IEkqcI@cnk9*2cc=Z0mXw{Q2##kBiF;+ygjI j_nefEx70Huf+YL^ewu*4{EfT800000NkvXXu0mjfpO-mm literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/blocks/blockEnervatorSide.png b/src/main/resources/assets/actuallyadditions/textures/blocks/blockEnervatorSide.png new file mode 100644 index 0000000000000000000000000000000000000000..ad28d611e61d2ef783595d366bfd6ccad804689e GIT binary patch literal 756 zcmVWFU8GbZ8()Nlj2>E@cM*00LM^L_t(I%UzQ@i)B?1 zg}+_9_PO1C8w4{koore&e}NcHZ0yf6kYO}8(ZIk=a01a-Fc5W=5i#l0_jS(R^)R^C zMy#L;ih`=OR;_Y(_cSvh!pTe`19#`&aKH4!iAeq*T10sFojWq~anQ^!)fi&{keT$+ z2|xEeoIieljW$)LX(BT*Go%!%R5BB9&NNN9JMKm)1voG2eNbyfMTG5ki(AmgN_dbY zHU{JAhmgtDkDudiwC1=w=0+((YYkOxs0dLyo6Urjikq_*Vbt>_wN^xgrb%RCHV6-D zRkYSh+gzb-BEoSqMs}{Rujp+eBmM)?DH(_enMqSc=Xr(%)kdaLtJ0>4a7PM6NwzmP zM4T1rV}(qH86tvC)5Lza!#tTbjqS}1wJIS&RYkJWnqn6fr5~U4ad3@=41x_`%f8t zu=dV=e`Gl>^dCNB87B_wk<)sDO!~TVX6fPsx4^n%-B`YRLFV}@=Wjk{zdP{f>%W-q zXLh@p)fc)Av^8ZjZ7?_7oydfQOy~6SIZ&u7L>QF9!#q=KqpzKHSx_ka`s%kw$7KfY m0i3OSM#^KBdajg0N%#kq@~4Te2Son>0000qtrf literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/blocks/blockEnervatorTop.png b/src/main/resources/assets/actuallyadditions/textures/blocks/blockEnervatorTop.png new file mode 100644 index 0000000000000000000000000000000000000000..9c2f40d9329819bab49729c0d51f95253990f562 GIT binary patch literal 794 zcmV+#1LgdQP)WFU8GbZ8()Nlj2>E@cM*00MqVL_t(I%UzSpPF!aU z$AA7V=L~ZKX$x7jBuI@&H>G`}lw~UM46|U7hG$@rJ{1d;pkA3oN-AcU3p3~YY)D?x-9BJPf6rD+;e71fG}0GmR6Ux+c1LI`wShgPF6YfKHt zxq5#EIOc#m-|T-)&Wfs1wIUM8Ig?V#q!2LaY1@V%k$3OjGnq{2x(;`k&*y{~dG>T4 zbEnpVsS#r$#Td!$fRr1|l*`LYrqc;$XJ>$5W~f%)ygB3g`U6j&?Gr-4-N`8trqd}n zq?Eb3`i=4UBd4dQyn6LBA|T?NoSZNkjkvkFVSGKNZ5m>Xgb+wg(=eaSsOqfNYlg!i zAw)!kloIY6I|y`LN87dxwuZ!Vzr<>l#cF|gKuf{QST654KR-t#AOdgS{tE6JhGHOy z(d0zV4PiN7GM!ABFJ=@g%x1T^8?_XUkB@oz@+Zs;34y!Sij*>2TaOqF27~~iYGr;q zV>-Fz(Qun#*YWz7*HqgaiwKlb7>!2k>^$bh;di8z$+;!Qgd7|k`19xAA_9mY2%kUy z!)mo+dwZJ@1IxvNy}c*AI6Nf9h#DZy#l-~)cWO}t2vG{AgyP;~p=5-w&5^+D~#udcj YU$&KQT#YBj=>Px#07*qoM6N<$f-??X-v9sr literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/blocks/blockGrinderOn.png.mcmeta b/src/main/resources/assets/actuallyadditions/textures/blocks/blockGrinderOn.png.mcmeta new file mode 100644 index 000000000..4786bb0fe --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/textures/blocks/blockGrinderOn.png.mcmeta @@ -0,0 +1,11 @@ +{ + "animation": { + "frametime": 1, + "frames": [ + 0, + 1, + 2, + + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/textures/blocks/blockTestifiBucksGreenWall.png b/src/main/resources/assets/actuallyadditions/textures/blocks/blockTestifiBucksGreenWall.png new file mode 100644 index 0000000000000000000000000000000000000000..529666caa9111f6280ef03ab19f283744b8a239d GIT binary patch literal 515 zcmV+e0{s1nP)O#&t)>1B!?1HJzN`c_Um zqYr_!tJTUbW`D_T4f0sRym!|U&bd{xg_zsZav&~CLoNVu+k4_(`fKS2A=@!GarFSE zHJlTzYJ=2G&+wVr+C<^BG*)h}%qPotIWXogkhV-T;WbEpr0dtuNk)ugMF|HDm*rg<9XIFVB zWZfG{uc7ruXsG5Sf8XD~WTnoJIrV%XT^(IH#J%^xw7NZ(kF3L!NcNB3r4!CHO!g#g z)awGe3|GR#?9VnF)Ajf?n&uW?ZeAf+OIhGPYc_WM*YOJ#EI^%mj5hE3iCh7?s;N0*Qy2>3=E#GelF{r5}E*% Cx0ufW literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/gui/guiDrill.png b/src/main/resources/assets/actuallyadditions/textures/gui/guiDrill.png new file mode 100644 index 0000000000000000000000000000000000000000..39f5c51ae9c98d32995b9b704c8f9fbd4d1df8fb GIT binary patch literal 1754 zcmeAS@N?(olHy`uVBq!ia0y~yU<5K58911MRQ8&P5Fo{p?&#~tz_78O`%fY(0|PTd zfKP}kP~62^QA&dRf`N&DBm;)v@9e6; zXy+{Oh%9Dc;9Cd6jEln-f=U&M64!{5;QX|b^2DN4hJwV*yb`^<)Di^~Jp(<{)K;TZ z1_mYvPZ!6KinzD8&-xuokYG)G^8BB^WV7Guh0|IeW-A(Rwruf@mtUl98FStGjp+IN zOW66XW4>j1H-1fj`~7qLIcY8%HjDR{Kkk@&z?tFQ%{>fE91Y6H#2I$$G%zqdn0J<2 zp@G37sfKaGX{HE6#eGE5J8Ce7vzURa-02K>9=5C06 z#`qvxs=JK!hjm|FTKjGFy+Y652(ar&DHQx(5dLUJ?4y?7Y&BD#a5pU9SI7L%qUXof zs?|&hTUifeaW`BQV_2=r5Ejj_W*b99F5`w3li)?|7RUPr@)6wlzR-%_vK&km45K;&GYlI zX}li_f4|l=$ZRP6H;?HaGZvrx^K0;X#(iM+qxo;*IfdCC%s+7KpKBtT!ynvd%+s%y z-o#|^C7fr2Use0dcZ}1yi_H%){h2@e!9@uMaiE)cHptX3V)%2e&|aRg?%z#=Pv0s; z`D#^`-)4?#<&gTe~DWM4firZA} literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/gui/guiManualCrafting.png b/src/main/resources/assets/actuallyadditions/textures/gui/guiManualCrafting.png new file mode 100644 index 0000000000000000000000000000000000000000..e1d7926165ed2cb18845204c0e5c2e1b127a2165 GIT binary patch literal 1771 zcmeAS@N?(olHy`uVBq!ia0y~yU<5K58911MRQ8&P5Fo{p?&#~tz_78O`%fY(0|PTd zfKP}kP~6Kav4M@OO4qV9awC zctjR6Fz{^wVaAPSRXRXHi4xa{lHmNblJdl&REC1Y%)Ao4ywnl}6Fmbx)6`a@R0am7 zKu;IPkczmsH=_NR92r;x9lq^Ptr68d!=boX#dp=K=i4%jzIDzzk+=WNfq!34YvZX0!xIiFvFs2tV2a_? zVANxs!ywKS)F98u%pf0k{P`Y+bVgl<`LFXEL>fN3`!V#**JQM)O=WrTVXi=fs{DaP z;*2k37pCr2{&GV5&c{4Ppk+D?ulLJ52fEQ#@Ie{KVvYvuULbK8>@ubYYSNEy28%c_ z+{qMa;CWE_p5ty`y8p$#t6~hRbs55<8P;rLh{$E!aEmEnE9-$Q?uJnb0zp#LaQUTd X=cHH86Lin#gUTaMS3j3^P6QK$!8;-MT+OLG}_)Usv|~Y{J5l(r-gc!hk{&C9V-A!TD(= z<%vb93~dIox?sjWt-Kzk%TT^vI!{F4`OUnmy+&!1}K;?j2LrVHbQ zwCOf8|BL0kccZ7=JSlWhyz4wzJnY5s}7ru^l;q0{UCPftJpzrX(fzxu>N z#X9E$vx=Ag*MBF%ko|9e$HV_!b`$@bDX#j@?ah%T)|}0j*^>E9JN)na&^15qUvcN# z&bTXMR`{1rC6nnIf6KKe{C+=2`Kx>iX9zdbi(MUm%h|HNG5or@-A8ndV9JS2a)}$# z${(4WW;R{@hkw;ImfL)nc#Kj4+3iD&mAoD@tlKFNYJBE@!dZvPHM0^AoDpASDd72e zlAhxulfw>z&!zaFo&C-&y j5*_9XojtOD^{d7tAUW=)~fMoD=^>bP0l+XkK>wvJX literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/items/itemDrill.png b/src/main/resources/assets/actuallyadditions/textures/items/itemDrill.png new file mode 100644 index 0000000000000000000000000000000000000000..2756c3a140a06b5c14d999a81e60b06a855499d3 GIT binary patch literal 683 zcmV;c0#yBpP)WFU8GbZ8()Nlj2>E@cM*00Iw5L_t(I%e|9LNYil` z$3Oqq{pU29>D;*mMz;2E-;<35py%u!hBU~jvZ&(W_uzW0EUvlk`xcR**SS0v}=*>$iTtEMv< zouyDWu$0=F|1<-@FA3^9_6SLlY4&;f@GXK>(<#yo3{^u$qW{_eZ!TSzfczPp-nmZn zm=hSKB^2ofjgB=;MrTnZ8CQ8F&!*pzUPxs7a};#AYeaX;T9U~$jE`{VWi=bOyU}F@ zO;PxsOpr*MnDL(k%2LwpsS+)J37D z{n_DXEu@ku8p;*w>;~tDrqDH&*7X%MKfO%w{v+aMis{%K88e+@Ijf+|)pTZuEyC(z z3mIev!x6SFDG3cTs;uPsK!EU-K+fuAfVQ^X;#Oc#GE*iCu^0_@m0G)je`pGeuF_gp z!TwNyOeT}JF&V&SvjNc9H|y2LrZUjle>%qdh& z#ad9n=xmw`!S~!9pZ@dJ_V)IQrM$Umn>guqh;C1nSk|)~KH?J|Pm|z(#Sho8w>PTU RCL;g<002ovPDHLkV1hC3FHisg literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/items/itemDrillUpgradeBlockPlacing.png b/src/main/resources/assets/actuallyadditions/textures/items/itemDrillUpgradeBlockPlacing.png new file mode 100644 index 0000000000000000000000000000000000000000..f8463239b8cf86394a41742f68d90a980d6d2754 GIT binary patch literal 449 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85p>QK$!8;-MT+OLG}_)Usv|~Y(gSBY!fH0z6lhPC~=J_3C>R| zDNig)Whh9@%q!8$OD$0_(KFC9O>H$w1==I;>Eak-;Xk$ibXK#2L~E_*^h@73k37)r zFbVaz{lY7wB`tAQZ`#cxO%;j{-fs1qYuMJ2Yr@WV_|J3u`vzyG7PPY;vQ_$>yY_0O zO>AlGcZKJL+CoClEA0xVZ`ASj-DT^rUBFeaVqW{IRRJQbn`bigJr+3r(V}6B@8KiA zU-9mHugp<%=DC*Ke7TG=VW5iIz`&Ffn^*!x6gil5s#!h7mNVwu&O0ZwJh<)fL+RIF z+0ADA>xiAd%y9a;YTt2z)X1O{Wv>rz(#e=*#+x9af8*^wfj0Xu`|h((P!U{~8T3NK z;riES(qb~l8=qGe#BOht@|e^zEuYC_Myli`learpt@5rEF?hDFhF3wVCD^Abckk8t n-v4L5*}iq(u7oaW!!!Ex4yL?b%vt;x7@Q2Au6{1-oD!MQK$!8;-MT+OLG}_)Usv|~Y(gSzj0y8TflQSsag8Vm&QB{T zPb^AhC`ioAE78kKEm1JhGte_lZ8b^-s#)*p;uvD#pX|W&-}8XP1A9$|C31^+nHC&6 z(wuy}Z=nQ}XdA->6-5~-DXwD*do|b+f_r#{Qx7~@wd%iUW243l6=nyinjb&^zrVXv zxbLLVf$skI`-S!2|7ZUFZDJaO(YXy9f4*lk;W(y#s=-xQ{m{+1H*fyG>uGwxKjO!J z^8jIv-`yR5;1>&>y8t1fKF%dboFyt=akR{0Qeep-2eap literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/items/itemDrillUpgradeFortune.png b/src/main/resources/assets/actuallyadditions/textures/items/itemDrillUpgradeFortune.png new file mode 100644 index 0000000000000000000000000000000000000000..730c29e3e851decf59690ea0a885c5549ab59c4c GIT binary patch literal 527 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;>1s;*b3=G^tAk28_ZrvZCAbW|YuPgg~HX#ui$;0<2+y@Ftl(rIsj|=o#plrnVZT0`1B5ba4!ca6dc6){Dhap!GG2+p=e~r6gxc zN?TSiD=RA}7xS_x2OiO`V3jm5FcDzs5Bk(=QzesKKjYoac}@IpUcIVYzbbvJLXDDH z--`myYi{8dp)cxMrn#CjPv+9Twe9T$xkFu*(iaZK%v$!dx#W4a!Y-Dwva{dCo^>~~ zWPb|Wd%{fN;a}y?kBdKFJ`EID-IF5uAjrzr#?XGZ+5QTH{Z*bD)Xv+LPVCfSE>SCF z$&Wkx{+{rflc!m}{{3uli{Y+8T<86LGw;{``SfGvKQ(>fEBwnr!XJ+H%=8ni{`HH$ z^4rSAbr!7`*(!qVOm-#TG5YXl?gU1l;Jo6=5(#f6GJc9S-0+n%%+GMD#5#c>&SK{{xsSG=&oRiScKhv%jF*)5{s6B_-$?ZkR8X>WxJUvTiH7?vR zV=ANT^oa5eBA1*a0`E2~y4}Gy)#1DH7M)en0bjbkHx;_Hdtcz*EN?T9ReOb2|5sq- OFnGH9xvXPx#1ZP1_K>z@;j|==^1poj532;bRa{vGf5&!@T5&_cPe*6Fc00(qQO+^Ra1`-q; zG=>1ossI207<5HgbW?9;ba!ELWdLwtX>N2bZe?^JG%heMHD!e|WdHyHl1W5CR9HvN zlp#w6K@^4O2Uu)ojV6OhtOmjMHd!bh;mxnnECx87Os`&CU(lQ) zJ##X1j}>dP7~pX38!@sD$CN7Q8nPHDUV-900EQK$!8;-MT+OLG}_)Usv|~Y(gUHN`7h64g-ZGN?apKg7ec# z$`gxH8440J^GfvcQcDy}^bGV&Q(KKvfolGFx;Tbd_$NCs{r5Z|@xWe_VTs%#UZw?y zjx;A9?^`IrB-+L>K}AtUN{Z{4!d?wF1?^AkH~rTaKK?1*YSz>J`AhHq|7raD|NEO; zr&cgO%69tKUAgIx_~(S5>usmLtxsxu@_*&zU7h9(ZPn3U|94k$|Ghru%?=%>=Znyi*I#zK~eX7;TpKL;jh<$9gA!?yz2ip34o*?0kRjZ%pM5^EKeP z+>^t=k>DZJ?D$LJmLkJyr5Fj2_e2kQK$!8;-MT+OLG}_)Usv|~Y(m1O3U@D0+zAwtC~=J_3C>R| zDNig)Whh9@%q!8$OD$0_(KFC9O>H$w1*$pj>Eak-;XikhBiA7V0oUT)O01ekWe)bv z&ii7}<;uTcTh}6Pb6ts`yOj$KFJ~Go6kGoHgV@}e|7WU*_AOx7b(DW-bJN3jrvB0? z;+Lj)-uTl#WfR-pxCZMIOYIZiriO3c!1U}SuiC=4++UwwacDDi9_CrJpy_g8b!nMH zpiP3=-dO^?FJJBEv_4?OS5!R5T&C>&ui3Hz)6TJ-W|VgM#`lS_e1pe3fqs*mYs~Qr zU)yg;GiSJ(RpcOl)6>3v*MZ7SKR5C6xjEG^#9b?GFuvGm3G@mdKI;Vst0LR{g AL;wH) literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/items/itemDrillUpgradeSpeedII.png b/src/main/resources/assets/actuallyadditions/textures/items/itemDrillUpgradeSpeedII.png new file mode 100644 index 0000000000000000000000000000000000000000..7cb333259815dd1e129685ce5a5f64056960a783 GIT binary patch literal 463 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85p>QK$!8;-MT+OLG}_)Usv|~Y(m1OW}56OFMvW4C9V-A!TD(= z<%vb93~dIox?sjWt-KznpOT^vI!{HF%^dLMQWIg|f+_O<+3li6)U z-l&Q=Rtp@IbJ1^FprNI-Xv&PP{8U({5w0PXUh*Q(THX3t(xM$ciU!u z*~4(O(`;3A?N+9ZHfwIrm|s#D(!X?{MfLMvyj!z+{M;8heE9XLxn1Us#FtGs3j!ZZ zmzZ4=nb-Kz_bpjBB|2gbUqQLB z=iJB#7L2D}uh$T@`&c2b$RUw++e|;%!hUJ}r+mlDNfA%e_t{)Nz3=!28|j4~9jvx1 zWS)9tFh@r~B63y06Aix~m#4TsTpl5HxRuM&gTe~DWM4f D!4QK$!8;-MT+OLG}_)Usv|~Y(m0jd|Ddkw*rMEN?apKg7ec# z$`gxH8440J^GfvcQcDy}^bGV&Q(KKvf%b@ax;Tbd_)qN%^ga|IbM*VgRqeXMk&&m{ zU8*>l4qvDdbo}5b|4Q)#Ge?tz;1sVc9hRB9Ohr}qU$|JkUOMj1p3es=E&mtS{aLE} zkl{T?d&ifXJ(>sqMZ;D@75xt{VH&e6D^k{VLp;RY_ z-KGtzN(L zx~vv0w2V8oZ8j&P|4KQ%^Ex4M?HscI6(+~*xcR(&ue?CNY2msXueZB*oUoF;AG7&Q z`1XwB;sLAq3K#l(xVJ&j?xphlxrH-7KfK59Qg-Y%!=ky#0+VHD8&^*I literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/items/itemDrillUpgradeThreeByThree.png b/src/main/resources/assets/actuallyadditions/textures/items/itemDrillUpgradeThreeByThree.png new file mode 100644 index 0000000000000000000000000000000000000000..6e2fa2a96d39346e7d256283bcf9ef2c57c08b1c GIT binary patch literal 407 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85p>QK$!8;-MT+OLG}_)Usv|~Y(gR|n(49@T0kL*64!{5;QX|b z^2DN4hJwV*yb`^<)Di^~Jp(<{)K;TZpqj6qE{-7<{!=Gz%Z<^UVS!KV0rzg=g;O9|66aleU_5QhxPy$ z6aD0%_eSxBGS3y>ZxS*6f3x)Nktt^xuPi)V*1h-n!w0`_bOyiu%PP~%FfH+b*3^Wl zr%zgz%h)N{%-tZ-zqxut)Iwc_=>|_2gY4gz$1LVhzI^1&w#`=38)o`l6x7~w!lvI6;>1s;*b z3=DjGL736~_k^`TL5ULAh?3y^w370~qEv>0#LT=By}Z;C1rt33J=4@yqg0@pIi4<# zAr}5y`!DjgCfsimh4AaGoK;t5CISahu`l{S6gD+(OS}dN>5M6XhLcbst{S3uvE|7|?#f dz+#>NpZ4M(pQbv8d