diff --git a/src/main/java/vazkii/botania/api/state/enums/LuminizerVariant.java b/src/main/java/vazkii/botania/api/state/enums/LuminizerVariant.java index 26b74ee8f..8ade0a003 100644 --- a/src/main/java/vazkii/botania/api/state/enums/LuminizerVariant.java +++ b/src/main/java/vazkii/botania/api/state/enums/LuminizerVariant.java @@ -14,7 +14,9 @@ import java.util.Locale; public enum LuminizerVariant implements IStringSerializable { DEFAULT, - DETECTOR; + DETECTOR, + FORK, + TOGGLE; @Override public String getName() { diff --git a/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java b/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java index de96858f4..524ceaf92 100644 --- a/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java +++ b/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java @@ -49,6 +49,8 @@ public class MiscellaneousIcons { alfPortalTex, lightRelayWorldIcon, lightRelayWorldIconRed, + lightRelayWorldIconGreen, + lightRelayWorldIconPurple, alchemyCatalystOverlay, conjurationCatalystOverlay, enchanterOverlay, @@ -115,6 +117,8 @@ public class MiscellaneousIcons { alfPortalTex = IconHelper.forName(evt.getMap(), "alfheimPortalInside", "blocks"); lightRelayWorldIcon = IconHelper.forName(evt.getMap(), "lightRelay1", "blocks"); lightRelayWorldIconRed = IconHelper.forName(evt.getMap(), "lightRelay3", "blocks"); + lightRelayWorldIconGreen = IconHelper.forName(evt.getMap(), "lightRelay5", "blocks"); + lightRelayWorldIconPurple = IconHelper.forName(evt.getMap(), "lightRelay7", "blocks"); alchemyCatalystOverlay = IconHelper.forName(evt.getMap(), "alchemyCatalyst3", "blocks"); conjurationCatalystOverlay = IconHelper.forName(evt.getMap(), "conjurationCatalyst3", "blocks"); enchanterOverlay = IconHelper.forName(evt.getMap(), "enchanterOverlay", "blocks"); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileLightRelay.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileLightRelay.java index 842cb6609..c052bd440 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileLightRelay.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileLightRelay.java @@ -10,6 +10,13 @@ */ package vazkii.botania.client.render.tile; +import java.util.HashMap; +import java.util.Map; + +import javax.annotation.Nonnull; + +import org.lwjgl.opengl.GL11; + import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; @@ -17,7 +24,6 @@ import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; -import org.lwjgl.opengl.GL11; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.LuminizerVariant; import vazkii.botania.client.core.handler.ClientTickHandler; @@ -26,21 +32,24 @@ import vazkii.botania.client.core.helper.ShaderHelper; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.TileLightRelay; -import javax.annotation.Nonnull; - public class RenderTileLightRelay extends TileEntitySpecialRenderer { + private static Map sprites = new HashMap(); + @Override public void renderTileEntityAt(@Nonnull TileLightRelay tile, double x, double y, double z, float pticks, int digProgress) { - if(!tile.getWorld().isBlockLoaded(tile.getPos(), false) - || tile.getWorld().getBlockState(tile.getPos()).getBlock() != ModBlocks.lightRelay) + if(!tile.getWorld().isBlockLoaded(tile.getPos(), false) || tile.getWorld().getBlockState(tile.getPos()).getBlock() != ModBlocks.lightRelay) return; Minecraft mc = Minecraft.getMinecraft(); - TextureAtlasSprite iicon = tile.getWorld().getBlockState(tile.getPos()) - .getValue(BotaniaStateProps.LUMINIZER_VARIANT) == LuminizerVariant.DEFAULT - ? MiscellaneousIcons.INSTANCE.lightRelayWorldIcon - : MiscellaneousIcons.INSTANCE.lightRelayWorldIconRed; + if(sprites.isEmpty()) { + sprites.put(LuminizerVariant.DEFAULT, MiscellaneousIcons.INSTANCE.lightRelayWorldIcon); + sprites.put(LuminizerVariant.DETECTOR, MiscellaneousIcons.INSTANCE.lightRelayWorldIconRed); + sprites.put(LuminizerVariant.FORK, MiscellaneousIcons.INSTANCE.lightRelayWorldIconGreen); + sprites.put(LuminizerVariant.TOGGLE, MiscellaneousIcons.INSTANCE.lightRelayWorldIconPurple); + } + + TextureAtlasSprite iicon = sprites.get(tile.getWorld().getBlockState(tile.getPos()).getValue(BotaniaStateProps.LUMINIZER_VARIANT)); GlStateManager.pushMatrix(); GlStateManager.translate(x + 0.5, y + 0.3, z + 0.5); diff --git a/src/main/java/vazkii/botania/common/block/BlockLightRelay.java b/src/main/java/vazkii/botania/common/block/BlockLightRelay.java index eb41acdb9..945005b65 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLightRelay.java +++ b/src/main/java/vazkii/botania/common/block/BlockLightRelay.java @@ -70,7 +70,7 @@ public class BlockLightRelay extends BlockMod implements IWandable, ILexiconable @Override public int getMetaFromState(IBlockState state) { - int meta = state.getValue(BotaniaStateProps.LUMINIZER_VARIANT) == LuminizerVariant.DETECTOR ? 1 : 0; + int meta = state.getValue(BotaniaStateProps.LUMINIZER_VARIANT).ordinal(); if (state.getValue(BotaniaStateProps.POWERED)) { meta |= 8; } else { @@ -84,7 +84,7 @@ public class BlockLightRelay extends BlockMod implements IWandable, ILexiconable public IBlockState getStateFromMeta(int meta) { boolean powered = (meta & 8) != 0; meta &= -9; - return getDefaultState().withProperty(BotaniaStateProps.POWERED, powered).withProperty(BotaniaStateProps.LUMINIZER_VARIANT, meta == 1 ? LuminizerVariant.DETECTOR : LuminizerVariant.DEFAULT); + return getDefaultState().withProperty(BotaniaStateProps.POWERED, powered).withProperty(BotaniaStateProps.LUMINIZER_VARIANT, LuminizerVariant.class.getEnumConstants()[meta]); } @Override @@ -95,13 +95,13 @@ public class BlockLightRelay extends BlockMod implements IWandable, ILexiconable @SideOnly(Side.CLIENT) @Override public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, List list) { - for(int i = 0; i < 2; i++) + for(int i = 0; i < 4; i++) list.add(new ItemStack(item, 1, i)); } @Override public int damageDropped(IBlockState state) { - return state.getValue(BotaniaStateProps.LUMINIZER_VARIANT) == LuminizerVariant.DEFAULT ? 0 : 1; + return state.getValue(BotaniaStateProps.LUMINIZER_VARIANT).ordinal(); } @Override diff --git a/src/main/resources/assets/botania/blockstates/lightRelay.json b/src/main/resources/assets/botania/blockstates/lightRelay.json index 6b9542b00..5ad044ac0 100644 --- a/src/main/resources/assets/botania/blockstates/lightRelay.json +++ b/src/main/resources/assets/botania/blockstates/lightRelay.json @@ -21,6 +21,18 @@ "layer0": "botania:blocks/lightRelay2", "particle": "botania:blocks/lightRelay3" } + }, + "fork": { + "textures": { + "layer0": "botania:blocks/lightRelay4", + "particle": "botania:blocks/lightRelay5" + } + }, + "toggle": { + "textures": { + "layer0": "botania:blocks/lightRelay6", + "particle": "botania:blocks/lightRelay7" + } } } } diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index d845a9596..63e7c80fa 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -1068,6 +1068,8 @@ tile.botania:felPumpkin.name=Fel Pumpkin tile.botania:cocoon.name=Cocoon of Caprice tile.botania:lightRelay0.name=Luminizer tile.botania:lightRelay1.name=Detector Luminizer +tile.botania:lightRelay2.name=Fork Luminizer +tile.botania:lightRelay3.name=Toggle Luminizer tile.botania:lightLauncher.name=Luminizer Launcher tile.botania:livingrock0Wall.name=Livingrock Wall tile.botania:livingwood0Wall.name=Livingwood Wall diff --git a/src/main/resources/assets/botania/textures/blocks/lightRelay4.png b/src/main/resources/assets/botania/textures/blocks/lightRelay4.png new file mode 100644 index 000000000..b08342440 Binary files /dev/null and b/src/main/resources/assets/botania/textures/blocks/lightRelay4.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/lightRelay5.png b/src/main/resources/assets/botania/textures/blocks/lightRelay5.png new file mode 100644 index 000000000..cb4b9094d Binary files /dev/null and b/src/main/resources/assets/botania/textures/blocks/lightRelay5.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/lightRelay6.png b/src/main/resources/assets/botania/textures/blocks/lightRelay6.png new file mode 100644 index 000000000..f6ccaac31 Binary files /dev/null and b/src/main/resources/assets/botania/textures/blocks/lightRelay6.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/lightRelay7.png b/src/main/resources/assets/botania/textures/blocks/lightRelay7.png new file mode 100644 index 000000000..2d31c76fb Binary files /dev/null and b/src/main/resources/assets/botania/textures/blocks/lightRelay7.png differ