From 4cc08f43fe45f85c2e04b7cde438740918de19a0 Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Sun, 15 Nov 2015 19:02:18 +0100 Subject: [PATCH] Manual description & Purple Drill (/cc xdjackiexd) --- .../actuallyadditions/booklet/InitBooklet.java | 2 +- .../booklet/page/BookletPage.java | 7 ++++--- .../actuallyadditions/crafting/ItemCrafting.java | 10 ++++++++++ .../actuallyadditions/items/ItemBooklet.java | 9 +++++++++ .../actuallyadditions/items/ItemDrill.java | 14 +++++++++++--- .../assets/actuallyadditions/lang/en_US.lang | 5 +++-- .../textures/gui/guiNEIAtomicReconstructor.png | Bin 0 -> 1349 bytes .../textures/items/itemCrystalWhite.png | Bin 0 -> 392 bytes .../textures/items/itemDrillPurple.png | Bin 0 -> 524 bytes 9 files changed, 38 insertions(+), 9 deletions(-) create mode 100644 src/main/resources/assets/actuallyadditions/textures/gui/guiNEIAtomicReconstructor.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/items/itemCrystalWhite.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/items/itemDrillPurple.png diff --git a/src/main/java/ellpeck/actuallyadditions/booklet/InitBooklet.java b/src/main/java/ellpeck/actuallyadditions/booklet/InitBooklet.java index c264fc30b..ddd55f575 100644 --- a/src/main/java/ellpeck/actuallyadditions/booklet/InitBooklet.java +++ b/src/main/java/ellpeck/actuallyadditions/booklet/InitBooklet.java @@ -125,7 +125,7 @@ public class InitBooklet{ new BookletChapter("potionRings", entryItemsNonRF, new ItemStack(InitItems.itemPotionRing), potionRingPages.toArray(new BookletPage[potionRingPages.size()])); //RF Using Items - new BookletChapter("drill", entryItemsRF, new ItemStack(InitItems.itemDrill), new PageTextOnly(1), new PageCrafting(2, ItemCrafting.recipeDrill, ItemCrafting.recipeDrillEmerald).setPageStacksWildcard(), new PageCrafting(3, ItemCrafting.recipeDrillCore).setNoText(), new PageCrafting(4, ItemCrafting.recipeDrillSpeedI).setNoText(), new PageCrafting(5, ItemCrafting.recipeDrillSpeedII).setNoText(), new PageCrafting(6, ItemCrafting.recipeDrillSpeedIII).setNoText(), new PageCrafting(7, ItemCrafting.recipeDrillFortuneI).setNoText(), new PageCrafting(8, ItemCrafting.recipeDrillFortuneII).setNoText(), new PageCrafting(9, ItemCrafting.recipeDrillSilk).setNoText(), new PageCrafting(10, ItemCrafting.recipeDrillThree).setNoText(), new PageCrafting(11, ItemCrafting.recipeDrillFive).setNoText(), new PageCrafting(12, ItemCrafting.recipeDrillPlacing).setNoText()).setSpecial(); + new BookletChapter("drill", entryItemsRF, new ItemStack(InitItems.itemDrill), new PageTextOnly(1), new PageCrafting(2, ItemCrafting.recipeDrill, ItemCrafting.recipeDrillEmerald, ItemCrafting.recipeDrillPurple).setPageStacksWildcard(), new PageCrafting(3, ItemCrafting.recipeDrillCore).setNoText(), new PageCrafting(4, ItemCrafting.recipeDrillSpeedI).setNoText(), new PageCrafting(5, ItemCrafting.recipeDrillSpeedII).setNoText(), new PageCrafting(6, ItemCrafting.recipeDrillSpeedIII).setNoText(), new PageCrafting(7, ItemCrafting.recipeDrillFortuneI).setNoText(), new PageCrafting(8, ItemCrafting.recipeDrillFortuneII).setNoText(), new PageCrafting(9, ItemCrafting.recipeDrillSilk).setNoText(), new PageCrafting(10, ItemCrafting.recipeDrillThree).setNoText(), new PageCrafting(11, ItemCrafting.recipeDrillFive).setNoText(), new PageCrafting(12, ItemCrafting.recipeDrillPlacing).setNoText()).setSpecial(); new BookletChapter("staff", entryItemsRF, new ItemStack(InitItems.itemTeleStaff), new PageTextOnly(1), new PageCrafting(2, ItemCrafting.recipeStaff).setNoText()).setImportant(); new BookletChapter("magnetRing", entryItemsRF, new ItemStack(InitItems.itemMagnetRing), new PageCrafting(1, ItemCrafting.recipeMagnetRing)); new BookletChapter("growthRing", entryItemsRF, new ItemStack(InitItems.itemGrowthRing), new PageCrafting(1, ItemCrafting.recipeGrowthRing)); diff --git a/src/main/java/ellpeck/actuallyadditions/booklet/page/BookletPage.java b/src/main/java/ellpeck/actuallyadditions/booklet/page/BookletPage.java index 94024e48a..083f9d402 100644 --- a/src/main/java/ellpeck/actuallyadditions/booklet/page/BookletPage.java +++ b/src/main/java/ellpeck/actuallyadditions/booklet/page/BookletPage.java @@ -66,7 +66,6 @@ public class BookletPage{ RenderHelper.enableGUIStandardItemLighting(); GL11.glEnable(GL11.GL_DEPTH_TEST); GL11.glEnable(GL12.GL_RESCALE_NORMAL); - GL11.glPushMatrix(); GL11.glTranslated(x, y, 0); GL11.glScalef(scale, scale, scale); @@ -76,8 +75,10 @@ public class BookletPage{ RenderItem.getInstance().renderItemOverlayIntoGUI(gui.mc.fontRenderer, gui.mc.getTextureManager(), stack, 0, 0); gui.mc.fontRenderer.setUnicodeFlag(flagBefore); - GL11.glPopMatrix(); - //RenderHelper.disableStandardItemLighting(); + //GL+MC+NEI suck + if(gui instanceof GuiBooklet){ + RenderHelper.disableStandardItemLighting(); + } GL11.glPopMatrix(); } diff --git a/src/main/java/ellpeck/actuallyadditions/crafting/ItemCrafting.java b/src/main/java/ellpeck/actuallyadditions/crafting/ItemCrafting.java index 515454761..b2d5639c1 100644 --- a/src/main/java/ellpeck/actuallyadditions/crafting/ItemCrafting.java +++ b/src/main/java/ellpeck/actuallyadditions/crafting/ItemCrafting.java @@ -43,6 +43,7 @@ public class ItemCrafting{ public static ArrayList recipesMashedFood = new ArrayList(); public static IRecipe recipeDrill; public static IRecipe recipeDrillEmerald; + public static IRecipe recipeDrillPurple; public static IRecipe recipeDrillSpeedI; public static IRecipe recipeDrillSpeedII; public static IRecipe recipeDrillSpeedIII; @@ -152,6 +153,15 @@ public class ItemCrafting{ 'R', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.DRILL_CORE.ordinal()), 'I', "blockCrystalWhite")); recipeDrillEmerald = Util.GetRecipes.lastIRecipe(); + + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemDrill, 1, 2), + "DFD", "CRC", "III", + 'F', "blockCrystalRed", + 'D', "crystalLightBlue", + 'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()), + 'R', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.DRILL_CORE.ordinal()), + 'I', "blockCrystalWhite")); + recipeDrillPurple = Util.GetRecipes.lastIRecipe(); } //Drill Core diff --git a/src/main/java/ellpeck/actuallyadditions/items/ItemBooklet.java b/src/main/java/ellpeck/actuallyadditions/items/ItemBooklet.java index b5750bec9..50d9b6ea6 100644 --- a/src/main/java/ellpeck/actuallyadditions/items/ItemBooklet.java +++ b/src/main/java/ellpeck/actuallyadditions/items/ItemBooklet.java @@ -17,6 +17,7 @@ import ellpeck.actuallyadditions.achievement.TheAchievements; import ellpeck.actuallyadditions.inventory.GuiHandler; import ellpeck.actuallyadditions.util.IActAddItemOrBlock; import ellpeck.actuallyadditions.util.ModUtil; +import ellpeck.actuallyadditions.util.StringUtil; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumRarity; @@ -25,6 +26,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.world.World; +import java.util.List; + public class ItemBooklet extends Item implements IActAddItemOrBlock{ public ItemBooklet(){ @@ -53,6 +56,12 @@ public class ItemBooklet extends Item implements IActAddItemOrBlock{ this.itemIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()); } + @SuppressWarnings("unchecked") + @Override + public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean bool){ + list.add(StringUtil.localize("tooltip."+ModUtil.MOD_ID_LOWER+"."+this.getName()+".desc")); + } + @Override @SideOnly(Side.CLIENT) public IIcon getIcon(ItemStack stack, int pass){ diff --git a/src/main/java/ellpeck/actuallyadditions/items/ItemDrill.java b/src/main/java/ellpeck/actuallyadditions/items/ItemDrill.java index bd2ed66d3..8aab95559 100644 --- a/src/main/java/ellpeck/actuallyadditions/items/ItemDrill.java +++ b/src/main/java/ellpeck/actuallyadditions/items/ItemDrill.java @@ -53,6 +53,8 @@ public class ItemDrill extends ItemEnergy{ @SideOnly(Side.CLIENT) private IIcon emeraldIcon; + @SideOnly(Side.CLIENT) + private IIcon purpleIcon; public ItemDrill(){ super(500000, 5000); @@ -62,7 +64,7 @@ public class ItemDrill extends ItemEnergy{ @Override @SideOnly(Side.CLIENT) public IIcon getIconFromDamage(int par1){ - return par1 == 0 ? this.itemIcon : this.emeraldIcon; + return par1 == 0 ? this.itemIcon : (par1 == 2 ? this.purpleIcon : this.emeraldIcon); } @Override @@ -76,11 +78,16 @@ public class ItemDrill extends ItemEnergy{ public void getSubItems(Item item, CreativeTabs tabs, List list){ super.getSubItems(item, tabs, list); - ItemStack stackFull = new ItemStack(this, 1, 1); + this.addDrillStack(list, 1); + this.addDrillStack(list, 2); + } + + private void addDrillStack(List list, int meta){ + ItemStack stackFull = new ItemStack(this, 1, meta); this.setEnergy(stackFull, this.getMaxEnergyStored(stackFull)); list.add(stackFull); - ItemStack stackEmpty = new ItemStack(this, 1, 1); + ItemStack stackEmpty = new ItemStack(this, 1, meta); this.setEnergy(stackEmpty, 0); list.add(stackEmpty); } @@ -226,6 +233,7 @@ public class ItemDrill extends ItemEnergy{ public void registerIcons(IIconRegister iconReg){ this.itemIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()); this.emeraldIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()+"Emerald"); + this.purpleIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()+"Purple"); } @Override diff --git a/src/main/resources/assets/actuallyadditions/lang/en_US.lang b/src/main/resources/assets/actuallyadditions/lang/en_US.lang index 03a577313..1d9c59cd4 100644 --- a/src/main/resources/assets/actuallyadditions/lang/en_US.lang +++ b/src/main/resources/assets/actuallyadditions/lang/en_US.lang @@ -19,6 +19,7 @@ container.nei.actuallyadditions.coffee.special=Special Feature container.nei.actuallyadditions.coffee.maxAmount=Max Amount container.nei.actuallyadditions.coffee.shift=[SHIFT]! container.nei.actuallyadditions.coffee.extra.milk=+01:00, -1 Level +container.nei.actuallyadditions.reconstructor.name=Atomic Reconstructor container.nei.actuallyadditions.booklet.name=ActAdd Manual container.nei.actuallyadditions.booklet.header=The Actually Additions Manual reads: @@ -329,7 +330,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! +tooltip.actuallyadditions.itemBooklet.desc=Or "Manual", if you will #Gui Information info.actuallyadditions.gui.animals=Animals @@ -551,7 +552,7 @@ booklet.actuallyadditions.chapter.potionRings.text.1=The Potion Rings h booklet.actuallyadditions.chapter.drill.name=Drills booklet.actuallyadditions.chapter.drill.text.1=The Drill works like a Pickaxe and a Shovel. It uses RF per block. It can be charged in an Energizer and upgraded by right-clicking with it in your hand. There is a lot of upgrades, but here is an explanation of some of them: The Mining Uprgades enlarge the hole which the Drill digs. The Placement Upgrade, after you right-click it in any slot of your hotbar, will make the Drill able to place a block from that slot by right-clicking. You can also put a Battery inside the Drill to give it more charge. -booklet.actuallyadditions.chapter.drill.text.2=The Drill can be crafted from either Diamond or Emerald. Its color will change accordingly. +booklet.actuallyadditions.chapter.drill.text.2=The Drill can be crafted from either Diamond, Emerald or Redstone and Diamond. Its color will change accordingly. booklet.actuallyadditions.chapter.staff.name=Staff booklet.actuallyadditions.chapter.staff.text.1=The Teleport Staff, when charged in an Energizer, can be right-clicked to teleport you to where you're looking. When you are looking at a block, it will teleport you there, however, when you aren't looking at a block, you can only be looking upwards up to 5 degrees, otherwise the teleport will fail. diff --git a/src/main/resources/assets/actuallyadditions/textures/gui/guiNEIAtomicReconstructor.png b/src/main/resources/assets/actuallyadditions/textures/gui/guiNEIAtomicReconstructor.png new file mode 100644 index 0000000000000000000000000000000000000000..1eb1eeea0de267a28754825d6ffc32e20ffd714c GIT binary patch literal 1349 zcmeAS@N?(olHy`uVBq!ia0y~yU<5K5893O0R7}x|G$6&2?&#~tz_78O`%fY(kk47* z5n0T@z_$~G8F#RW?*|G>l(rIsj|=o#pl{pm@*4>aen zr;B4qMcmuF(RsH$1Xu&!pX&aS?OT_Z?ItV2xHPy&a^=dblg}Bxr(amsv94Y8O#AzN z`}X~tyz7qR(lwe-i#m-Qde>-P|McNQz`Qqm*I5R#t(a)~G-^}ho{~-9cRh2FT;O(X zO7=;%PnS;Kdp%1ywLvN}c%7>B32*i4_1S(?7_(A*cTV%>fBgLU^P~2kFF}pl^xUAX zrsj{-54-BRXFM>$>jv8#>w&_Le@0)bTc=w6&Q#?TgXyMaG2ZqyH)jS<{=4n|tZ#1> ztDhmnD{js#E;=Q&8{X@ zsYuF`%F;rvO*^2=Tkj21CIM7-S-)}O;rjae{ngv<1VSYqC*HYqM|qP@g9+?;vwrqLhobFm23de+89xj*jTzyJToo&8I78^0Cb{Jakm z&6dHx5>KD&Ii-1c|C66Te=bo41$$)hxhZuQHW@G8^fmi`R9sx#ze-L>5;tBdzv<1H z7h4qV{Qj?9pxgQF{=Iwm>Q29Yy_)qv=}Dj;WccH}%hKL&$!9zM{(_jpewAq{_W!p- zH9xKR5Vgs;Iz5*$CH=oC)H9ZHd#1fPbMK^>L)p72s0xoWJxELSwG8fK&!4vC|NHrS zUu#0rS-O{5!_|!pJ0w9a&0$!b%vfN&Y1tgjn+#zfJt@AL(;?mi)4(EPh=YdwyLbQc XNA2wI5EMLp0^}J_S3j3^P6 zLV0FMhJw4NZ$OG(Dmzg8ji-xah{frxlQ;S?8w$7_XXNCx(wKN@$+xLBEdTC37JiZ8 z^Y4I&qg4xY%#=Hdwp_^*ouBy$JUsSkU0GUsneN~3AMY7Yo9`>yF7PFt!E@K9>#JVR zif68Pzww%%*Bseb6MvpuapsF;3h6^ynR~C3W9#-kbR4p11n) z&Xu>9{djw~cTVxL719gdCw%5AWc6)$F1khVmu!!u6+@=-9@~Sz1mmO{iar){rfl~6 ze)H#b>*H!SZ_l`4{J73NS7u^>mfp!snR&t;ucLK6TyyPkRg literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/items/itemDrillPurple.png b/src/main/resources/assets/actuallyadditions/textures/items/itemDrillPurple.png new file mode 100644 index 0000000000000000000000000000000000000000..c9719f257133862e2d78da4e51b10c602731479d GIT binary patch literal 524 zcmV+n0`vWeP)|Cb zaBHq|Q~kdUVL9?%f4|Ib?>hBR4BfZM#m>M-u8 z%d?R9f3w^Y)exvl>a}|QFJ|2h4ucqmEbIn&d3*f7kfZE%^>p~df&Jcv%fUq!x$uL81fn9gwPMZEdXng8~*5J5V9wKy+;6e>*!H(ln6|7#IL?8T~Cj+HQyd O0000