From 9282462a9a854cb4e116e19744fddfaa204f764f Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Mon, 7 Nov 2016 00:00:05 +0100 Subject: [PATCH] Added some more easter egg names to the smiley cloud~ --- .../mod/booklet/InitBooklet.java | 2 +- .../mod/misc/cloud/SmileyCloudEasterEggs.java | 77 +++++++++++++++++++ .../assets/actuallyadditions/lang/en_US.lang | 3 +- 3 files changed, 80 insertions(+), 2 deletions(-) diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/InitBooklet.java b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/InitBooklet.java index 18d4bb7f4..d49ce543b 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/InitBooklet.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/InitBooklet.java @@ -123,7 +123,7 @@ public final class InitBooklet{ new BookletChapter("banners", ActuallyAdditionsAPI.entryMisc, new ItemStack(Items.BANNER, 1, 15), new PageTextOnly(1)); new BookletChapter("miscDecorStuffsAndThings", ActuallyAdditionsAPI.entryMisc, new ItemStack(InitBlocks.blockTestifiBucksGreenWall), new PageTextOnly(1), new PageReconstructor(2, LensRecipeHandler.recipeWhiteWall).setNoText(), new PageReconstructor(3, LensRecipeHandler.recipeGreenWall).setNoText()); chaptersIntroduction[2] = new BookletChapter("quartz", ActuallyAdditionsAPI.entryMisc, new ItemStack(InitItems.itemMisc, 1, TheMiscItems.QUARTZ.ordinal()), new PageTextOnly(1).setStacks(new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.ORE_QUARTZ.ordinal())).addTextReplacement("", OreGen.QUARTZ_MIN).addTextReplacement("", OreGen.QUARTZ_MAX), new PageTextOnly(2).setStacks(new ItemStack(InitItems.itemMisc, 1, TheMiscItems.QUARTZ.ordinal())), new PageCrafting(3, BlockCrafting.recipeQuartzBlock).setNoText(), new PageCrafting(4, BlockCrafting.recipeQuartzPillar).setNoText(), new PageCrafting(5, BlockCrafting.recipeQuartzChiseled).setNoText()); - new BookletChapter("cloud", ActuallyAdditionsAPI.entryMisc, new ItemStack(InitBlocks.blockSmileyCloud), new PageTextOnly(1), new PageCrafting(2, BlockCrafting.recipeSmileyCloud).setNoText().setPageStacksWildcard()).setSpecial(); + new BookletChapter("cloud", ActuallyAdditionsAPI.entryMisc, new ItemStack(InitBlocks.blockSmileyCloud), new PageTextOnly(1), new PageCrafting(2, BlockCrafting.recipeSmileyCloud).setPageStacksWildcard()).setSpecial(); new BookletChapter("coalStuff", ActuallyAdditionsAPI.entryMisc, new ItemStack(InitItems.itemMisc, 1, TheMiscItems.TINY_COAL.ordinal()), new PageTextOnly(1), new PageCrafting(2, ItemCrafting.recipeTinyCoal).setNoText(), new PageCrafting(3, ItemCrafting.recipeTinyChar).setNoText(), new PageCrafting(4, BlockCrafting.recipeBlockChar).setNoText()); ArrayList lampPages = new ArrayList(); lampPages.add(new PageTextOnly(lampPages.size()+1)); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/misc/cloud/SmileyCloudEasterEggs.java b/src/main/java/de/ellpeck/actuallyadditions/mod/misc/cloud/SmileyCloudEasterEggs.java index a227face1..32053ed3a 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/misc/cloud/SmileyCloudEasterEggs.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/misc/cloud/SmileyCloudEasterEggs.java @@ -371,6 +371,83 @@ public final class SmileyCloudEasterEggs{ renderHeadBlock(InitBlocks.blockCoffeeMachine, 0, 35F); } }); + //Etho + register(new ISmileyCloudEasterEgg(){ + @Override + public String[] getTriggerNames(){ + return new String[]{"etho", "ethoslab"}; + } + + @Override + public void renderExtra(float f){ + renderHoldingItem(false, new ItemStack(Items.REDSTONE)); + renderHeadBlock(Blocks.REDSTONE_BLOCK, 0, 48F); + } + }); + //Direwolf20 + register(new ISmileyCloudEasterEgg(){ + @Override + public String[] getTriggerNames(){ + return new String[]{"direwolf", "dire", "direwolf20", "dw20"}; + } + + @Override + public void renderExtra(float f){ + renderHoldingItem(false, new ItemStack(Items.BONE)); + renderHeadBlock(Blocks.field_189880_di, 0, 48F); + } + }); + //Jessassin + register(new ISmileyCloudEasterEgg(){ + @Override + public String[] getTriggerNames(){ + return new String[]{"jessassin", "thejessassin"}; + } + + @Override + public void renderExtra(float f){ + renderHeadBlock(InitBlocks.blockLaserRelayItem, 0, 27F); + renderHoldingItem(false, new ItemStack(InitItems.itemLaserWrench)); + } + }); + //Biffa + register(new ISmileyCloudEasterEgg(){ + @Override + public String[] getTriggerNames(){ + return new String[]{"biffa", "biffatech", "biffaplays", "biffa2001"}; + } + + @Override + public void renderExtra(float f){ + renderHoldingItem(false, new ItemStack(InitItems.itemCoffee)); + } + }); + //Xisuma + register(new ISmileyCloudEasterEgg(){ + @Override + public String[] getTriggerNames(){ + return new String[]{"xisuma", "xisumavoid"}; + } + + @Override + public void renderExtra(float f){ + renderHeadBlock(Blocks.REDSTONE_BLOCK, 0, 93F); + renderHoldingItem(false, new ItemStack(Items.ELYTRA)); + } + }); + //Welsknight + register(new ISmileyCloudEasterEgg(){ + @Override + public String[] getTriggerNames(){ + return new String[]{"welsknight", "wels"}; + } + + @Override + public void renderExtra(float f){ + renderHeadBlock(Blocks.STONE_BRICK_STAIRS, 0, 10F); + renderHoldingItem(false, new ItemStack(Items.DIAMOND_PICKAXE)); + } + }); } private static void register(ISmileyCloudEasterEgg egg){ diff --git a/src/main/resources/assets/actuallyadditions/lang/en_US.lang b/src/main/resources/assets/actuallyadditions/lang/en_US.lang index 88d5a0d97..571e9a6a4 100644 --- a/src/main/resources/assets/actuallyadditions/lang/en_US.lang +++ b/src/main/resources/assets/actuallyadditions/lang/en_US.lang @@ -763,7 +763,8 @@ booklet.actuallyadditions.chapter.quartz.text.1=Black Quartz is an Black Quartz items are used in lots of Crafting Recipes in Actually Additions. They are very important for most of the Items and, thus, should be mined when found in the world. They can be crafted into a couple of different Decorative Blocks shown on the following pages. Every variant can also be crafted into Stairs, Slabs and Walls using the well-known recipes. Nether Quartz, but deadlier booklet.actuallyadditions.chapter.cloud.name=Smiley Cloud -booklet.actuallyadditions.chapter.cloud.text.1=The Smiley Cloud is a magical floating cloud which is getting put to life through the piece of Solidified Experience inside it. It hovers up and down in its place all jolly and fun, and when right-clicking, you can give it a name. When giving it certain special names like "Ellpeck" or "AcidBlues", it will have some special items it carries! +booklet.actuallyadditions.chapter.cloud.text.1=The Smiley Cloud is a magical floating cloud which is getting put to life through the piece of Solidified Experience inside it. It hovers up and down in its place all jolly and fun, and when right-clicking, you can give it a name. When giving it certain special names like "Ellpeck" or "Etho", it will have some special items it carries! +booklet.actuallyadditions.chapter.cloud.text.2=Huge potato booklet.actuallyadditions.chapter.coalStuff.name=Coal Stuff booklet.actuallyadditions.chapter.coalStuff.text.1=Sometimes your Coal just burns for too long or too short. For that, you can craft Tiny Coal, Tiny Charcoal and Blocks of Charcoal for using them in a furnace. While the Block of Charcoal burns for as long as a Block of Coal, the Tiny Coal and Tiny Charcoal will burn for one eighth of a piece of coal, meaning it will smelt one item in a normal furnace.