diff --git a/src/main/java/vazkii/botania/common/block/BlockLightRelay.java b/src/main/java/vazkii/botania/common/block/BlockLightRelay.java index c82fc7e7e..a853432d7 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLightRelay.java +++ b/src/main/java/vazkii/botania/common/block/BlockLightRelay.java @@ -130,7 +130,7 @@ public class BlockLightRelay extends BlockMod implements IWandable, ILexiconable @Override public void neighborChanged(IBlockState state, World worldIn, BlockPos pos, Block blockIn) { - if(!worldIn.isRemote) { + if(!worldIn.isRemote && state.getValue(BotaniaStateProps.LUMINIZER_VARIANT) == LuminizerVariant.TOGGLE) { if(state.getValue(BotaniaStateProps.POWERED) && !worldIn.isBlockPowered(pos)) worldIn.setBlockState(pos, state.withProperty(BotaniaStateProps.POWERED, false)); else if(!state.getValue(BotaniaStateProps.POWERED) && worldIn.isBlockPowered(pos)) diff --git a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java index c182035d7..2d515cfa1 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java @@ -295,7 +295,9 @@ public final class ModCraftingRecipes { public static IRecipe recipeBaubleCase; public static IRecipe recipeDodgeRing; public static IRecipe recipeAnimatedTorch; - + public static IRecipe recipeForkLuminizer; + public static IRecipe recipeToggleLuminizer; + // Garden of Glass public static IRecipe recipeRootToSapling; public static IRecipe recipeRootToFertilizer; @@ -1998,6 +2000,14 @@ public final class ModCraftingRecipes { 'T', new ItemStack(Blocks.REDSTONE_TORCH)); recipeAnimatedTorch = BotaniaAPI.getLatestAddedRecipe(); + // Fork Luminizer Recipe + addShapelessOreDictRecipe(new ItemStack(ModBlocks.lightRelay, 1, 2), new ItemStack(ModBlocks.lightRelay), new ItemStack(Blocks.REDSTONE_TORCH)); + recipeForkLuminizer = BotaniaAPI.getLatestAddedRecipe(); + + // TOGGLE Luminizer Recipe + addShapelessOreDictRecipe(new ItemStack(ModBlocks.lightRelay, 1, 3), new ItemStack(ModBlocks.lightRelay), new ItemStack(Blocks.LEVER)); + recipeToggleLuminizer = BotaniaAPI.getLatestAddedRecipe(); + /////////////////////////////////////////////////////////////////////////////////////////////////////////// // Storage Block/Nugget Recipes diff --git a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java index 9e503d5a8..48bb94cea 100644 --- a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java +++ b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java @@ -1107,7 +1107,9 @@ public final class LexiconData { luminizerTransport = new AlfheimLexiconEntry(LibLexicon.ENDER_LUMINIZER_TRANSPORT, categoryEnder); luminizerTransport.setLexiconPages(new PageText("0"), new PageText("1"), new PageCraftingRecipe("2", ModCraftingRecipes.recipeLuminizer), new PageText("3"), - new PageCraftingRecipe("4", ModCraftingRecipes.recipeDetectorLuminizer), new PageText("5"), + new PageCraftingRecipe("4", ModCraftingRecipes.recipeDetectorLuminizer), new PageText("7"), + new PageCraftingRecipe("8", ModCraftingRecipes.recipeToggleLuminizer), new PageText("9"), new PageText("10"), + new PageCraftingRecipe("11", ModCraftingRecipes.recipeForkLuminizer), new PageText("5"), new PageCraftingRecipe("6", ModCraftingRecipes.recipeLuminizerLauncher)); starSword = new AlfheimLexiconEntry(LibLexicon.ENDER_STAR_SWORD, categoryEnder); diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index 63e7c80fa..a1a594671 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -3294,10 +3294,15 @@ botania.tagline.luminizerTransport=Fly through the skies botania.page.luminizerTransport0=&1Luminizers&0 serve as a simple way to transport players and other living things of the sort by having them ride on trails of light.
&1Luminizers&0 can be placed in the world as blocks. A &1Luminizer&0, in order to work properly needs to be bound to another one. This can be done with the &1Wand of the Forest&0 in bind mode. Right clicking a &1Luminizer&0 will transport the clicker into the &1Luminizer&0 it's bound to. botania.page.luminizerTransport1=&1Luminizers&0 have a range of twenty blocks each, but can be chained to create longer and more complex paths.
The connection between two &1Luminizers&0 goes only one way, unless the binding is explicitly done both ways. If the connection does go both ways, an endless loop is created, though.
Furthermore, multiple &1Luminizers&0 can target the same one as an endpoint. botania.page.luminizerTransport2=Luminize to the future -botania.page.luminizerTransport3=Adding some redstone to a &1Luminizer&0 creates a &1Detector Luminizer&0. For all intents and purposes, it functions just like a regular &1Luminizer&0, however, it sends out a &4redstone pulse&0 every time something passes through it or reaches it as an endpoint. -botania.page.luminizerTransport4=Are you ready to draw? +botania.page.luminizerTransport3=Adding some &1Redstone&0 to a &1Luminizer&0 creates a &1Detector Luminizer&0.
For all intents and purposes, it functions just like a regular &1Luminizer&0, however, it sends out a &4redstone pulse&0 every time something passes through it or reaches it as an endpoint. +botania.page.luminizerTransport4=Send a signal +botania.page.luminizerTransport7=Adding a &1Lever&0 will instead turn the &1Luminizer&0 into a &1Toggle Luminizer&0.
This one is the opposite of the &1Detector Luminizer&0, it accepts a &4redstone signal&0, and will drop anything that comes through it right there if it's powered. Otherwise, it'll just carry on like usual. +botania.page.luminizerTransport8=Get a signal +botania.page.luminizerTransport9=Combining a &1Luminizer&0 with a &1Redstone Torch&0 forms a &1Fork Luminizer&0.
It reacts to an &1Animated Torch&0 placed up to two blocks above or below it, and will redirect any incoming entities through the network to a &1Luminizer&0 placed in the direction that the torch is pointing towards. +botania.page.luminizerTransport10=The &1Fork Luminizer&0 can still be bound like any other style of luminizer, but its conventional binding will only be put in play if there is no &1Animated Torch&0 available to tell it where to go.
In the case that there is not a &1Luminizer&0 where a present &1Animated Torch&0 is pointing, it'll default to the binding as well. +botania.page.luminizerTransport11=One way or another botania.page.luminizerTransport5=While players can just right click the &1Luminizers&0, in order to get animals, dropped items, or other beings into the trails, a &1Luminizer Launcher&0 is required. This block needs to be placed down adjacent to &1Luminizers&0, and when it receives a &4redstone pulse&0, it'll randomly distribute all living beings and dropped items on top of it into all of the adjacent &1Luminizers&0, causing them to go on their merry way. -botania.page.luminizerTransport6=Let's believe it, open the flag +botania.page.luminizerTransport6=Compulsory Evacuation Device # -- STARCALLER botania.entry.starSword=Starcaller