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 000000000..ef4b1bec3 Binary files /dev/null and b/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampBlack.png differ diff --git a/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampBlackOn.png b/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampBlackOn.png new file mode 100644 index 000000000..fad394f46 Binary files /dev/null and b/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampBlackOn.png differ 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 000000000..dbc5f98ca Binary files /dev/null and b/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampBlue.png differ 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 000000000..a4d7eb831 Binary files /dev/null and b/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampBlueOn.png differ 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 000000000..6ffca11b4 Binary files /dev/null and b/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampBrown.png differ 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 000000000..b9f8e8d87 Binary files /dev/null and b/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampBrownOn.png differ 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 000000000..878f0c77b Binary files /dev/null and b/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampCyan.png differ 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 000000000..9af1d0479 Binary files /dev/null and b/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampCyanOn.png differ 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 000000000..c25d65952 Binary files /dev/null and b/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampGray.png differ 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 000000000..bb1d29c27 Binary files /dev/null and b/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampGrayOn.png differ diff --git a/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampGreen.png b/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampGreen.png new file mode 100644 index 000000000..c750e12ad Binary files /dev/null and b/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampGreen.png differ 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 000000000..082644337 Binary files /dev/null and b/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampGreenOn.png differ diff --git a/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampLightBlue.png b/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampLightBlue.png new file mode 100644 index 000000000..5ae1e56c1 Binary files /dev/null and b/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampLightBlue.png differ 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 000000000..7ebc45f62 Binary files /dev/null and b/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampLightBlueOn.png differ diff --git a/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampLightGray.png b/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampLightGray.png new file mode 100644 index 000000000..6bd5c42c5 Binary files /dev/null and b/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampLightGray.png differ diff --git a/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampLightGrayOn.png b/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampLightGrayOn.png new file mode 100644 index 000000000..6fc66dd6f Binary files /dev/null and b/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampLightGrayOn.png differ diff --git a/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampLime.png b/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampLime.png new file mode 100644 index 000000000..181106df0 Binary files /dev/null and b/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampLime.png differ 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 000000000..8db47f2ac Binary files /dev/null and b/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampLimeOn.png differ 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 000000000..fcb0d50f1 Binary files /dev/null and b/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampMagenta.png differ diff --git a/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampMagentaOn.png b/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampMagentaOn.png new file mode 100644 index 000000000..635dd1a0d Binary files /dev/null and b/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampMagentaOn.png differ diff --git a/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampOrange.png b/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampOrange.png new file mode 100644 index 000000000..975d60c5d Binary files /dev/null and b/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampOrange.png differ 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 000000000..193e7d85e Binary files /dev/null and b/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampOrangeOn.png differ 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 000000000..d125fe3ac Binary files /dev/null and b/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampPink.png differ 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 000000000..6134821a6 Binary files /dev/null and b/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampPinkOn.png differ 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 000000000..ea7500250 Binary files /dev/null and b/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampPurple.png differ diff --git a/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampPurpleOn.png b/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampPurpleOn.png new file mode 100644 index 000000000..34d5e65a6 Binary files /dev/null and b/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampPurpleOn.png differ diff --git a/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampRed.png b/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampRed.png new file mode 100644 index 000000000..aa185ecd3 Binary files /dev/null and b/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampRed.png differ diff --git a/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampRedOn.png b/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampRedOn.png new file mode 100644 index 000000000..69fef9d62 Binary files /dev/null and b/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampRedOn.png differ 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 000000000..5ec34449d Binary files /dev/null and b/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampWhite.png differ 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 000000000..eaf3c0c7b Binary files /dev/null and b/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampWhiteOn.png differ diff --git a/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampYellow.png b/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampYellow.png new file mode 100644 index 000000000..380d3dc2d Binary files /dev/null and b/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampYellow.png differ 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 000000000..d89463658 Binary files /dev/null and b/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampYellowOn.png differ 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 000000000..f3ce925cf Binary files /dev/null and b/src/main/resources/assets/actuallyadditions/textures/blocks/blockEnergizer.png differ 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 000000000..6957ab987 Binary files /dev/null and b/src/main/resources/assets/actuallyadditions/textures/blocks/blockEnergizerSide.png differ diff --git a/src/main/resources/assets/actuallyadditions/textures/blocks/blockEnergizerTop.png b/src/main/resources/assets/actuallyadditions/textures/blocks/blockEnergizerTop.png new file mode 100644 index 000000000..9c2f40d93 Binary files /dev/null and b/src/main/resources/assets/actuallyadditions/textures/blocks/blockEnergizerTop.png differ 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 000000000..f3ce925cf Binary files /dev/null and b/src/main/resources/assets/actuallyadditions/textures/blocks/blockEnervator.png differ 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 000000000..ad28d611e Binary files /dev/null and b/src/main/resources/assets/actuallyadditions/textures/blocks/blockEnervatorSide.png differ 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 000000000..9c2f40d93 Binary files /dev/null and b/src/main/resources/assets/actuallyadditions/textures/blocks/blockEnervatorTop.png differ 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 000000000..529666caa Binary files /dev/null and b/src/main/resources/assets/actuallyadditions/textures/blocks/blockTestifiBucksGreenWall.png differ diff --git a/src/main/resources/assets/actuallyadditions/textures/blocks/blockTestifiBucksWhiteWall.png b/src/main/resources/assets/actuallyadditions/textures/blocks/blockTestifiBucksWhiteWall.png new file mode 100644 index 000000000..fe54ea1cb Binary files /dev/null and b/src/main/resources/assets/actuallyadditions/textures/blocks/blockTestifiBucksWhiteWall.png differ 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 000000000..39f5c51ae Binary files /dev/null and b/src/main/resources/assets/actuallyadditions/textures/gui/guiDrill.png differ diff --git a/src/main/resources/assets/actuallyadditions/textures/gui/guiEnergizer.png b/src/main/resources/assets/actuallyadditions/textures/gui/guiEnergizer.png new file mode 100644 index 000000000..621f107cc Binary files /dev/null and b/src/main/resources/assets/actuallyadditions/textures/gui/guiEnergizer.png differ 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 000000000..e1d792616 Binary files /dev/null and b/src/main/resources/assets/actuallyadditions/textures/gui/guiManualCrafting.png differ diff --git a/src/main/resources/assets/actuallyadditions/textures/items/itemBattery.png b/src/main/resources/assets/actuallyadditions/textures/items/itemBattery.png new file mode 100644 index 000000000..80885c9fb Binary files /dev/null and b/src/main/resources/assets/actuallyadditions/textures/items/itemBattery.png differ 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 000000000..2756c3a14 Binary files /dev/null and b/src/main/resources/assets/actuallyadditions/textures/items/itemDrill.png differ 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 000000000..f8463239b Binary files /dev/null and b/src/main/resources/assets/actuallyadditions/textures/items/itemDrillUpgradeBlockPlacing.png differ diff --git a/src/main/resources/assets/actuallyadditions/textures/items/itemDrillUpgradeFiveByFive.png b/src/main/resources/assets/actuallyadditions/textures/items/itemDrillUpgradeFiveByFive.png new file mode 100644 index 000000000..57d639ed6 Binary files /dev/null and b/src/main/resources/assets/actuallyadditions/textures/items/itemDrillUpgradeFiveByFive.png differ 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 000000000..730c29e3e Binary files /dev/null and b/src/main/resources/assets/actuallyadditions/textures/items/itemDrillUpgradeFortune.png differ diff --git a/src/main/resources/assets/actuallyadditions/textures/items/itemDrillUpgradeFortuneII.png b/src/main/resources/assets/actuallyadditions/textures/items/itemDrillUpgradeFortuneII.png new file mode 100644 index 000000000..9af6ab2f3 Binary files /dev/null and b/src/main/resources/assets/actuallyadditions/textures/items/itemDrillUpgradeFortuneII.png differ diff --git a/src/main/resources/assets/actuallyadditions/textures/items/itemDrillUpgradeSilkTouch.png b/src/main/resources/assets/actuallyadditions/textures/items/itemDrillUpgradeSilkTouch.png new file mode 100644 index 000000000..b51e2fe40 Binary files /dev/null and b/src/main/resources/assets/actuallyadditions/textures/items/itemDrillUpgradeSilkTouch.png differ diff --git a/src/main/resources/assets/actuallyadditions/textures/items/itemDrillUpgradeSpeed.png b/src/main/resources/assets/actuallyadditions/textures/items/itemDrillUpgradeSpeed.png new file mode 100644 index 000000000..bec1aad73 Binary files /dev/null and b/src/main/resources/assets/actuallyadditions/textures/items/itemDrillUpgradeSpeed.png differ 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 000000000..7cb333259 Binary files /dev/null and b/src/main/resources/assets/actuallyadditions/textures/items/itemDrillUpgradeSpeedII.png differ diff --git a/src/main/resources/assets/actuallyadditions/textures/items/itemDrillUpgradeSpeedIII.png b/src/main/resources/assets/actuallyadditions/textures/items/itemDrillUpgradeSpeedIII.png new file mode 100644 index 000000000..75839d23a Binary files /dev/null and b/src/main/resources/assets/actuallyadditions/textures/items/itemDrillUpgradeSpeedIII.png differ 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 000000000..6e2fa2a96 Binary files /dev/null and b/src/main/resources/assets/actuallyadditions/textures/items/itemDrillUpgradeThreeByThree.png differ diff --git a/src/main/resources/assets/actuallyadditions/textures/items/itemManual.png b/src/main/resources/assets/actuallyadditions/textures/items/itemManual.png new file mode 100644 index 000000000..761d22fb1 Binary files /dev/null and b/src/main/resources/assets/actuallyadditions/textures/items/itemManual.png differ