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 5cdd81c78..eebe6afe4 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/InitBooklet.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/InitBooklet.java @@ -12,6 +12,7 @@ package de.ellpeck.actuallyadditions.mod.booklet; import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI; import de.ellpeck.actuallyadditions.api.booklet.BookletPage; +import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; import de.ellpeck.actuallyadditions.mod.blocks.InitBlocks; import de.ellpeck.actuallyadditions.mod.blocks.metalists.TheColoredLampColors; import de.ellpeck.actuallyadditions.mod.blocks.metalists.TheMiscBlocks; @@ -77,6 +78,7 @@ public class InitBooklet{ lampPages.add(new PageCrafting(lampPages.size()+1, recipe).setNoText()); } new BookletChapter("lamps", ActuallyAdditionsAPI.entryMisc, new ItemStack(InitBlocks.blockColoredLampOn, 1, TheColoredLampColors.GREEN.ordinal()), lampPages.toArray(new BookletPage[lampPages.size()])); + new BookletChapter("enderStar", ActuallyAdditionsAPI.entryMisc, new ItemStack(InitItems.itemMisc, 1, TheMiscItems.ENDER_STAR.ordinal()), new PageCrafting(1, ItemCrafting.recipeEnderStar)); new BookletChapter("treasureChest", ActuallyAdditionsAPI.entryMisc, new ItemStack(InitBlocks.blockTreasureChest), new PagePicture(1, "pageTreasureChest", 150).setStack(new ItemStack(InitBlocks.blockTreasureChest)), new PageTextOnly(2)).setSpecial(); new BookletChapter("hairBalls", ActuallyAdditionsAPI.entryMisc, new ItemStack(InitItems.itemHairyBall), new PagePicture(1, "pageFurBalls", 110).setStack(new ItemStack(InitItems.itemHairyBall)), new PageTextOnly(2)).setSpecial(); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/config/values/ConfigCrafting.java b/src/main/java/de/ellpeck/actuallyadditions/mod/config/values/ConfigCrafting.java index 8c6e3cf21..ba9e0f094 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/config/values/ConfigCrafting.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/config/values/ConfigCrafting.java @@ -153,7 +153,8 @@ public enum ConfigCrafting{ DRILL_CORE("Drill Core", ConfigCategories.ITEMS_CRAFTING), ATOMIC_RECONSTRUCTOR("Atomic Reconstructor", ConfigCategories.BLOCKS_CRAFTING), MINER("Miner", ConfigCategories.BLOCKS_CRAFTING), - FIREWORK_BOX("Firework Box", ConfigCategories.BLOCKS_CRAFTING); + FIREWORK_BOX("Firework Box", ConfigCategories.BLOCKS_CRAFTING), + ENDER_STAR("Ender Star", ConfigCategories.ITEMS_CRAFTING); public final String name; public final String category; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/ItemCrafting.java b/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/ItemCrafting.java index 56734059b..d4837ab80 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/ItemCrafting.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/ItemCrafting.java @@ -80,6 +80,7 @@ public class ItemCrafting{ public static IRecipe recipeBlackDye; public static IRecipe recipeLens; public static IRecipe recipeCrateKeeper; + public static IRecipe recipeEnderStar; public static void init(){ @@ -362,7 +363,7 @@ public class ItemCrafting{ "WNW", "WDW", "WNW", 'W', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.BAT_WING.ordinal()), 'N', new ItemStack(InitBlocks.blockCrystal, 1, TheCrystals.DIAMOND.ordinal()), - 'D', new ItemStack(Items.NETHER_STAR))); + 'D', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.ENDER_STAR.ordinal()))); recipeWings = RecipeUtil.lastIRecipe(); } @@ -528,7 +529,7 @@ public class ItemCrafting{ public static void addRingRecipeWithStack(ItemStack mainStack, int meta){ GameRegistry.addShapelessRecipe(new ItemStack(InitItems.itemPotionRing, 1, meta), mainStack, mainStack, mainStack, mainStack, new ItemStack(InitBlocks.blockCrystal, 1, TheCrystals.DIAMOND.ordinal()), new ItemStack(Items.NETHER_WART), new ItemStack(Items.POTIONITEM), new ItemStack(InitItems.itemMisc, 1, TheMiscItems.RING.ordinal())); recipesPotionRings.add(RecipeUtil.lastIRecipe()); - GameRegistry.addShapelessRecipe(new ItemStack(InitItems.itemPotionRingAdvanced, 1, meta), new ItemStack(InitItems.itemPotionRing, 1, meta), new ItemStack(Items.NETHER_STAR), new ItemStack(Items.NETHER_STAR)); + GameRegistry.addShapelessRecipe(new ItemStack(InitItems.itemPotionRingAdvanced, 1, meta), new ItemStack(InitItems.itemPotionRing, 1, meta), new ItemStack(InitItems.itemMisc, 1, TheMiscItems.ENDER_STAR.ordinal())); recipesPotionRings.add(RecipeUtil.lastIRecipe()); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/MiscCrafting.java b/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/MiscCrafting.java index c3c351e14..fb86597fd 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/MiscCrafting.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/MiscCrafting.java @@ -78,6 +78,15 @@ public class MiscCrafting{ 'F', new ItemStack(Items.FLINT))); ItemCrafting.recipeKnifeBlade = RecipeUtil.lastIRecipe(); } + + //Ender Star + if(ConfigCrafting.ENDER_STAR.isEnabled()){ + GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(InitItems.itemMisc, 1, TheMiscItems.ENDER_STAR.ordinal()), + new ItemStack(Items.NETHER_STAR), + new ItemStack(Items.DRAGON_BREATH), + new ItemStack(InitItems.itemMisc, 1, TheMiscItems.QUARTZ.ordinal()))); + ItemCrafting.recipeEnderStar = RecipeUtil.lastIRecipe(); + } } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/metalists/TheMiscItems.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/metalists/TheMiscItems.java index 609effc57..4f7e5317d 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/metalists/TheMiscItems.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/metalists/TheMiscItems.java @@ -32,7 +32,8 @@ public enum TheMiscItems{ BAT_WING("BatWing", EnumRarity.RARE), DRILL_CORE("DrillCore", EnumRarity.UNCOMMON), BLACK_DYE("BlackDye", EnumRarity.EPIC), - LENS("Lens", EnumRarity.UNCOMMON); + LENS("Lens", EnumRarity.UNCOMMON), + ENDER_STAR("EnderStar", EnumRarity.EPIC); public final String name; public final EnumRarity rarity; diff --git a/src/main/resources/assets/actuallyadditions/lang/en_US.lang b/src/main/resources/assets/actuallyadditions/lang/en_US.lang index d8eb4d172..125725104 100644 --- a/src/main/resources/assets/actuallyadditions/lang/en_US.lang +++ b/src/main/resources/assets/actuallyadditions/lang/en_US.lang @@ -407,6 +407,7 @@ item.actuallyadditions.itemPaxelCrystalBlack.name=Void Crystal AIOT item.actuallyadditions.itemPaxelCrystalWhite.name=Enori Crystal AIOT item.actuallyadditions.itemPaxelCrystalGreen.name=Emeradic Crystal AIOT item.actuallyadditions.itemFoodBacon.name=Bacon +item.actuallyadditions.itemMiscEnderStar.name=Ender Star #Tooltips tooltip.actuallyadditions.onSuffix.desc=On @@ -767,4 +768,7 @@ booklet.actuallyadditions.chapter.fireworkBox.text.1=The Firework Box i booklet.actuallyadditions.chapter.fireworkBox.text.2=When right-clicking it with a Redstone Torch in hand, it will change between a mode where it gets deactivated by Redstone and a mode where it responds to pulses. booklet.actuallyadditions.chapter.rf.name=RF (Redstone Flux) -booklet.actuallyadditions.chapter.rf.text.1=For anyone who hasn't used much of a mod that uses RF yet, here's a quick explanation. Redstone Flux, or RF for short, is a power system used by many mods. The basic concept is is that lots of machines generate or use it every game tick. That's what RF/t means. To connect a power generating (thus, outputting) machine to one that needs (thus, receives) power, just place it next to it. What's a fourth wall? \ No newline at end of file +booklet.actuallyadditions.chapter.rf.text.1=For anyone who hasn't used much of a mod that uses RF yet, here's a quick explanation. Redstone Flux, or RF for short, is a power system used by many mods. The basic concept is is that lots of machines generate or use it every game tick. That's what RF/t means. To connect a power generating (thus, outputting) machine to one that needs (thus, receives) power, just place it next to it. What's a fourth wall? + +booklet.actuallyadditions.chapter.enderStar.name=Ender Star +booklet.actuallyadditions.chapter.enderStar.text.1=The Ender Star can be obtained by both killing a wither and going to the end to collect Dragon's Breath. The latter is obtained by using a bottle on the purple particles that the dragon spits out. The Ender Star is used for multiple crafting recipes. \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/item/itemMiscEnderStar.json b/src/main/resources/assets/actuallyadditions/models/item/itemMiscEnderStar.json new file mode 100644 index 000000000..5f7b02daa --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/item/itemMiscEnderStar.json @@ -0,0 +1,6 @@ +{ + "parent": "actuallyadditions:item/standardItem", + "textures": { + "layer0": "actuallyadditions:items/itemMiscEnderStar" + } +} diff --git a/src/main/resources/assets/actuallyadditions/textures/items/itemMiscEnderStar.png b/src/main/resources/assets/actuallyadditions/textures/items/itemMiscEnderStar.png new file mode 100644 index 000000000..7da40518b Binary files /dev/null and b/src/main/resources/assets/actuallyadditions/textures/items/itemMiscEnderStar.png differ