From 9456d40197f0f3e3acb95a0adaeeb271bca1bf5b Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Tue, 3 Nov 2015 16:30:13 +0100 Subject: [PATCH] Black Lotus --- .../blocks/BlockBlackLotus.java | 50 ++++++++++++++++++ .../actuallyadditions/blocks/InitBlocks.java | 5 ++ .../booklet/InitBooklet.java | 1 + .../crafting/ItemCrafting.java | 5 ++ .../items/metalists/TheMiscItems.java | 3 +- .../actuallyadditions/ore/InitOreDict.java | 2 + .../assets/actuallyadditions/lang/en_US.lang | 9 +++- .../textures/items/itemMiscBlackDye.png | Bin 0 -> 256 bytes 8 files changed, 73 insertions(+), 2 deletions(-) create mode 100644 src/main/java/ellpeck/actuallyadditions/blocks/BlockBlackLotus.java create mode 100644 src/main/resources/assets/actuallyadditions/textures/items/itemMiscBlackDye.png diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockBlackLotus.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockBlackLotus.java new file mode 100644 index 000000000..0918b8d8a --- /dev/null +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockBlackLotus.java @@ -0,0 +1,50 @@ +/* + * This file ("BlockFlower.java") is part of the Actually Additions Mod for Minecraft. + * It is created and owned by Ellpeck and distributed + * under the Actually Additions License to be found at + * http://github.com/Ellpeck/ActuallyAdditions/blob/master/README.md + * View the source code at https://github.com/Ellpeck/ActuallyAdditions + * + * © 2015 Ellpeck + */ + +package ellpeck.actuallyadditions.blocks; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import ellpeck.actuallyadditions.util.IActAddItemOrBlock; +import ellpeck.actuallyadditions.util.ModUtil; +import net.minecraft.block.BlockBush; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.item.EnumRarity; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; + +public class BlockBlackLotus extends BlockBush implements IActAddItemOrBlock{ + + public BlockBlackLotus(){ + this.setStepSound(soundTypeGrass); + } + + @Override + public String getName(){ + return "blockBlackLotus"; + } + + @Override + public EnumRarity getRarity(ItemStack stack){ + return EnumRarity.epic; + } + + @Override + @SideOnly(Side.CLIENT) + public IIcon getIcon(int side, int meta){ + return this.blockIcon; + } + + @Override + @SideOnly(Side.CLIENT) + public void registerBlockIcons(IIconRegister iconReg){ + this.blockIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()); + } +} diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/InitBlocks.java b/src/main/java/ellpeck/actuallyadditions/blocks/InitBlocks.java index 7b99a2cef..1585b1549 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/InitBlocks.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/InitBlocks.java @@ -98,9 +98,14 @@ public class InitBlocks{ public static Block blockLaserRelay; + public static Block blockBlackLotus; + public static void init(){ ModUtil.LOGGER.info("Initializing Blocks..."); + blockBlackLotus = new BlockBlackLotus(); + BlockUtil.register(blockBlackLotus); + blockLaserRelay = new BlockLaserRelay(); BlockUtil.register(blockLaserRelay); diff --git a/src/main/java/ellpeck/actuallyadditions/booklet/InitBooklet.java b/src/main/java/ellpeck/actuallyadditions/booklet/InitBooklet.java index bcc5be2d3..deba0f12a 100644 --- a/src/main/java/ellpeck/actuallyadditions/booklet/InitBooklet.java +++ b/src/main/java/ellpeck/actuallyadditions/booklet/InitBooklet.java @@ -59,6 +59,7 @@ public class InitBooklet{ new BookletChapter("treasureChest", entryMisc, new ItemStack(InitBlocks.blockTreasureChest), new PagePicture(1, "pageTreasureChest", 150).setStack(new ItemStack(InitBlocks.blockTreasureChest)), new PageTextOnly(2)).setSpecial(); new BookletChapter("hairBalls", entryMisc, new ItemStack(InitItems.itemHairyBall), new PagePicture(1, "pageFurBalls", 110).setStack(new ItemStack(InitItems.itemHairyBall)), new PageTextOnly(2)).setSpecial(); + new BookletChapter("blackLotus", entryMisc, new ItemStack(InitBlocks.blockBlackLotus), new PageTextOnly(1).setStack(new ItemStack(InitBlocks.blockBlackLotus)), new PageCrafting(2, ItemCrafting.recipeBlackDye)); //No RF Using Blocks new BookletChapter("breaker", entryFunctionalNonRF, new ItemStack(InitBlocks.blockBreaker), new PageCrafting(1, BlockCrafting.recipeBreaker), new PageCrafting(2, BlockCrafting.recipePlacer), new PageCrafting(3, BlockCrafting.recipeLiquidPlacer), new PageCrafting(4, BlockCrafting.recipeLiquidCollector)); diff --git a/src/main/java/ellpeck/actuallyadditions/crafting/ItemCrafting.java b/src/main/java/ellpeck/actuallyadditions/crafting/ItemCrafting.java index 9b1c483dd..1278dc71c 100644 --- a/src/main/java/ellpeck/actuallyadditions/crafting/ItemCrafting.java +++ b/src/main/java/ellpeck/actuallyadditions/crafting/ItemCrafting.java @@ -74,9 +74,14 @@ public class ItemCrafting{ public static IRecipe recipeChestToCrateUpgrade; public static IRecipe recipeLaserWrench; public static IRecipe recipeDrillCore; + public static IRecipe recipeBlackDye; public static void init(){ + //Black Dye + GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(InitItems.itemMisc, 1, TheMiscItems.BLACK_DYE.ordinal()), new ItemStack(InitBlocks.blockBlackLotus))); + recipeBlackDye = Util.GetRecipes.lastIRecipe(); + //Booklet GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(InitItems.itemLexicon), new ItemStack(InitItems.itemCanolaSeed), new ItemStack(Items.paper))); recipeBook = Util.GetRecipes.lastIRecipe(); diff --git a/src/main/java/ellpeck/actuallyadditions/items/metalists/TheMiscItems.java b/src/main/java/ellpeck/actuallyadditions/items/metalists/TheMiscItems.java index 1ed222a19..ae7263c3e 100644 --- a/src/main/java/ellpeck/actuallyadditions/items/metalists/TheMiscItems.java +++ b/src/main/java/ellpeck/actuallyadditions/items/metalists/TheMiscItems.java @@ -30,7 +30,8 @@ public enum TheMiscItems{ CANOLA("Canola", EnumRarity.uncommon), CUP("Cup", EnumRarity.uncommon), BAT_WING("BatWing", EnumRarity.rare), - DRILL_CORE("DrillCore", EnumRarity.uncommon); + DRILL_CORE("DrillCore", EnumRarity.uncommon), + BLACK_DYE("BlackDye", EnumRarity.epic); public final String name; public final EnumRarity rarity; diff --git a/src/main/java/ellpeck/actuallyadditions/ore/InitOreDict.java b/src/main/java/ellpeck/actuallyadditions/ore/InitOreDict.java index 7acd2f3a7..dddcd055e 100644 --- a/src/main/java/ellpeck/actuallyadditions/ore/InitOreDict.java +++ b/src/main/java/ellpeck/actuallyadditions/ore/InitOreDict.java @@ -71,6 +71,8 @@ public class InitOreDict{ addOre(InitItems.itemSpecialDrop, TheSpecialDrops.PEARL_SHARD.ordinal(), "nuggetEnderpearl"); addOre(InitItems.itemMisc, TheMiscItems.QUARTZ.ordinal(), "gemQuartzBlack"); + + addOre(InitItems.itemMisc, TheMiscItems.BLACK_DYE.ordinal(), "dyeBlack"); } private static void addOre(ItemStack stack, String name){ diff --git a/src/main/resources/assets/actuallyadditions/lang/en_US.lang b/src/main/resources/assets/actuallyadditions/lang/en_US.lang index 48da8570a..310ccdeab 100644 --- a/src/main/resources/assets/actuallyadditions/lang/en_US.lang +++ b/src/main/resources/assets/actuallyadditions/lang/en_US.lang @@ -106,6 +106,7 @@ tile.actuallyadditions.blockDirectionalBreaker.name=Long-Range Breaker tile.actuallyadditions.blockRangedCollector.name=Ranged Collector tile.actuallyadditions.blockLaserRelay.name=Laser Relay tile.actuallyadditions.blockMiscIronCasing.name=Iron Casing +tile.actuallyadditions.blockBlackLotus.name=Black Lotus #ESD tile.actuallyadditions.blockInputter.name=ESD @@ -280,6 +281,7 @@ item.actuallyadditions.itemBooklet.name=Actually Additions Manual item.actuallyadditions.itemLaserWrench.name=Laser Wrench item.actuallyadditions.itemChestToCrateUpgrade.name=Chest To Storage Crate Upgrade item.actuallyadditions.itemMiscDrillCore.name=Drill Core +item.actuallyadditions.itemMiscBlackDye.name=Black Dye #Tooltips tooltip.actuallyadditions.onSuffix.desc=On @@ -307,6 +309,7 @@ tooltip.actuallyadditions.blockPhantomRange.desc=Range tooltip.actuallyadditions.laser.stored.desc= tooltip.actuallyadditions.laser.connected.desc= tooltip.actuallyadditions.laser.cantConnect.desc=Can't connect: The relays are either part of the same network, the stored relay doesn't exist anymore or it is too far away! +tooltip.actuallyadditions.blockBlackLotus.desc=No, not that one, Vaz! #Gui Information info.actuallyadditions.gui.animals=Animals @@ -577,4 +580,8 @@ booklet.actuallyadditions.chapter.hairBalls.text.1=Balls of Fur dropped booklet.actuallyadditions.chapter.hairBalls.text.2=Balls of Fur are an item rarely dropped by cats which have been tamed by the player. Cats are very mysterious creatures as they appear to get everything stuck in their fur. Balls of Fur may seem disgusting at first, but when removing all of the hair by right-clicking, they will reveal some valuable items. Or just some String. FUURRRRRR!! booklet.actuallyadditions.chapter.laserRelays.name=Laser Relays -booklet.actuallyadditions.chapter.laserRelays.text.1=The Laser Relay is a block that can wirelessly transfer RF just by being connected with a Laser Wrench, generating a network. When placing a Power Generator or Receiver next to the relay, it can receive Power from any other relay in the network. Two relays can be at most blocks apart. During an energy transfer, they have an Energy Loss of %. \ No newline at end of file +booklet.actuallyadditions.chapter.laserRelays.text.1=The Laser Relay is a block that can wirelessly transfer RF just by being connected with a Laser Wrench, generating a network. When placing a Power Generator or Receiver next to the relay, it can receive Power from any other relay in the network. Two relays can be at most blocks apart. During an energy transfer, they have an Energy Loss of %. + +booklet.actuallyadditions.chapter.blackLotus.name=Black Lotus +booklet.actuallyadditions.chapter.blackLotus.text.1=Think of this: You need to craft black wool, black clay or anything else that needs black dye but you are just guilty about killing so many innocent squids? Well, the Black Lotus is exactly the thing you need! Just look around in the wild a bit, and you will find one, then being able to craft some Black Dye that can be used instead of Ink Sacs so that you don't need to kill poor squids and L any longer. +booklet.actuallyadditions.chapter.blackLotus.text.2=No, not that one, Vaz \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/textures/items/itemMiscBlackDye.png b/src/main/resources/assets/actuallyadditions/textures/items/itemMiscBlackDye.png new file mode 100644 index 0000000000000000000000000000000000000000..a4cd0e1f373d6e37233b42a73d70593bca05b561 GIT binary patch literal 256 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucL5ULAh?3y^w370~qEv>0#LT=By}Z;C1rt33 zJ+nVO$@hV33O!vMLoEE?_Ih(2P~dUdT%ziB;%|S}%mW7$>RxQR(6}(`bKINrR!gTG zd}UjIujyci#NO|L*}ekLuic70l-R)V;pp5$i(SmM-@J?5v(cM#`}q$#uG^a=-8c(> xhcyH=y-I6xpK-9EOJvU>DW>%Y*B^bunD;t%NALO0g+R+0JYD@<);T3K0RX2cVebF{ literal 0 HcmV?d00001