diff --git a/resources/assets/enderio/lang/en_US.lang b/resources/assets/enderio/lang/en_US.lang index 192f2914..a50c6b21 100644 --- a/resources/assets/enderio/lang/en_US.lang +++ b/resources/assets/enderio/lang/en_US.lang @@ -938,7 +938,7 @@ enderio.gui.weather.requireditem=Required Item: %s //Enchants enchantment.enderio.soulBound=Soulbound -description.enchantment.enderio.soulBound=This enchantment prevents the item from being lost on death +description.enchantment.enderio.soulBound=Prevents item from being lost on death //Configuration enderio.config.title=Ender IO Configuration diff --git a/resources/assets/enderio/textures/blocks/machineOverlayDisabled.png b/resources/assets/enderio/textures/blocks/overlays/disabled.png similarity index 100% rename from resources/assets/enderio/textures/blocks/machineOverlayDisabled.png rename to resources/assets/enderio/textures/blocks/overlays/disabled.png diff --git a/resources/assets/enderio/textures/blocks/machineOverlayDisabledNoCenter.png b/resources/assets/enderio/textures/blocks/overlays/disabledNoCenter.png similarity index 100% rename from resources/assets/enderio/textures/blocks/machineOverlayDisabledNoCenter.png rename to resources/assets/enderio/textures/blocks/overlays/disabledNoCenter.png diff --git a/resources/assets/enderio/textures/blocks/overlays/disabledSides.png b/resources/assets/enderio/textures/blocks/overlays/disabledSides.png new file mode 100644 index 00000000..f3e612e8 Binary files /dev/null and b/resources/assets/enderio/textures/blocks/overlays/disabledSides.png differ diff --git a/resources/assets/enderio/textures/blocks/machineOverlayNone.png b/resources/assets/enderio/textures/blocks/overlays/none.png similarity index 100% rename from resources/assets/enderio/textures/blocks/machineOverlayNone.png rename to resources/assets/enderio/textures/blocks/overlays/none.png diff --git a/resources/assets/enderio/textures/blocks/machineOverlayPull.png b/resources/assets/enderio/textures/blocks/overlays/pull.png similarity index 100% rename from resources/assets/enderio/textures/blocks/machineOverlayPull.png rename to resources/assets/enderio/textures/blocks/overlays/pull.png diff --git a/resources/assets/enderio/textures/blocks/overlays/pullSides.png b/resources/assets/enderio/textures/blocks/overlays/pullSides.png new file mode 100644 index 00000000..ba83e74c Binary files /dev/null and b/resources/assets/enderio/textures/blocks/overlays/pullSides.png differ diff --git a/resources/assets/enderio/textures/blocks/machineOverlayPullNoCenter.png b/resources/assets/enderio/textures/blocks/overlays/pullTopBottom.png similarity index 94% rename from resources/assets/enderio/textures/blocks/machineOverlayPullNoCenter.png rename to resources/assets/enderio/textures/blocks/overlays/pullTopBottom.png index 04a6d9a5..ea97eec1 100644 Binary files a/resources/assets/enderio/textures/blocks/machineOverlayPullNoCenter.png and b/resources/assets/enderio/textures/blocks/overlays/pullTopBottom.png differ diff --git a/resources/assets/enderio/textures/blocks/machineOverlayPush.png b/resources/assets/enderio/textures/blocks/overlays/push.png similarity index 100% rename from resources/assets/enderio/textures/blocks/machineOverlayPush.png rename to resources/assets/enderio/textures/blocks/overlays/push.png diff --git a/resources/assets/enderio/textures/blocks/machineOverlayPushPull.png b/resources/assets/enderio/textures/blocks/overlays/pushPull.png similarity index 100% rename from resources/assets/enderio/textures/blocks/machineOverlayPushPull.png rename to resources/assets/enderio/textures/blocks/overlays/pushPull.png diff --git a/resources/assets/enderio/textures/blocks/overlays/pushPullSides.png b/resources/assets/enderio/textures/blocks/overlays/pushPullSides.png new file mode 100644 index 00000000..4c63c738 Binary files /dev/null and b/resources/assets/enderio/textures/blocks/overlays/pushPullSides.png differ diff --git a/resources/assets/enderio/textures/blocks/overlays/pushPullTopBottom.png b/resources/assets/enderio/textures/blocks/overlays/pushPullTopBottom.png new file mode 100644 index 00000000..97ffcb1f Binary files /dev/null and b/resources/assets/enderio/textures/blocks/overlays/pushPullTopBottom.png differ diff --git a/resources/assets/enderio/textures/blocks/overlays/pushSides.png b/resources/assets/enderio/textures/blocks/overlays/pushSides.png new file mode 100644 index 00000000..f347d455 Binary files /dev/null and b/resources/assets/enderio/textures/blocks/overlays/pushSides.png differ diff --git a/resources/assets/enderio/textures/blocks/overlays/pushTopBottom.png b/resources/assets/enderio/textures/blocks/overlays/pushTopBottom.png new file mode 100644 index 00000000..b3368f98 Binary files /dev/null and b/resources/assets/enderio/textures/blocks/overlays/pushTopBottom.png differ diff --git a/resources/assets/enderio/textures/blocks/machineOverlaySelectedFace.png b/resources/assets/enderio/textures/blocks/overlays/selectedFace.png similarity index 100% rename from resources/assets/enderio/textures/blocks/machineOverlaySelectedFace.png rename to resources/assets/enderio/textures/blocks/overlays/selectedFace.png diff --git a/resources/assets/enderio/textures/blocks/transcieverOverlayDisabled.png b/resources/assets/enderio/textures/blocks/overlays/transcieverDisabled.png similarity index 100% rename from resources/assets/enderio/textures/blocks/transcieverOverlayDisabled.png rename to resources/assets/enderio/textures/blocks/overlays/transcieverDisabled.png diff --git a/resources/assets/enderio/textures/blocks/transcieverOverlayPull.png b/resources/assets/enderio/textures/blocks/overlays/transcieverPull.png similarity index 100% rename from resources/assets/enderio/textures/blocks/transcieverOverlayPull.png rename to resources/assets/enderio/textures/blocks/overlays/transcieverPull.png diff --git a/resources/assets/enderio/textures/blocks/transcieverOverlayPush.png b/resources/assets/enderio/textures/blocks/overlays/transcieverPush.png similarity index 100% rename from resources/assets/enderio/textures/blocks/transcieverOverlayPush.png rename to resources/assets/enderio/textures/blocks/overlays/transcieverPush.png diff --git a/resources/assets/enderio/textures/blocks/transcieverOverlayPushPull.png b/resources/assets/enderio/textures/blocks/overlays/transcieverPushPull.png similarity index 100% rename from resources/assets/enderio/textures/blocks/transcieverOverlayPushPull.png rename to resources/assets/enderio/textures/blocks/overlays/transcieverPushPull.png diff --git a/src/main/java/crazypants/enderio/TileEntityEio.java b/src/main/java/crazypants/enderio/TileEntityEio.java index 39c01180..1f52ecc7 100644 --- a/src/main/java/crazypants/enderio/TileEntityEio.java +++ b/src/main/java/crazypants/enderio/TileEntityEio.java @@ -15,8 +15,8 @@ public abstract class TileEntityEio extends TileEntity { public final void readFromNBT(NBTTagCompound root) { super.readFromNBT(root); readCustomNBT(root); - } + @Override public final void writeToNBT(NBTTagCompound root) { super.writeToNBT(root); diff --git a/src/main/java/crazypants/enderio/enchantment/EnchantmentSoulBound.java b/src/main/java/crazypants/enderio/enchantment/EnchantmentSoulBound.java index 38603f50..0fe3ebd8 100644 --- a/src/main/java/crazypants/enderio/enchantment/EnchantmentSoulBound.java +++ b/src/main/java/crazypants/enderio/enchantment/EnchantmentSoulBound.java @@ -3,6 +3,7 @@ package crazypants.enderio.enchantment; import java.util.ListIterator; import java.util.Map; +import tterrag.core.api.common.enchant.IAdvancedEnchant; import net.minecraft.enchantment.Enchantment; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.enchantment.EnumEnchantmentType; @@ -15,11 +16,14 @@ import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.util.FakePlayer; import net.minecraftforge.event.entity.player.PlayerDropsEvent; import net.minecraftforge.event.entity.player.PlayerEvent; +import cpw.mods.fml.common.Optional.Interface; import cpw.mods.fml.common.eventhandler.EventPriority; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import crazypants.enderio.config.Config; +import crazypants.util.Lang; -public class EnchantmentSoulBound extends Enchantment { +@Interface(iface = "tterrag.core.api.common.enchant.IAdvancedEnchant", modid = "ttCore") +public class EnchantmentSoulBound extends Enchantment implements IAdvancedEnchant { public static EnchantmentSoulBound create(int id) { EnchantmentSoulBound res = new EnchantmentSoulBound(id); @@ -134,4 +138,8 @@ public class EnchantmentSoulBound extends Enchantment { } + @Override + public String[] getTooltipDetails(ItemStack stack) { + return new String[] { Lang.localize("description.enchantment.enderio.soulBound", false) }; + } } diff --git a/src/main/java/crazypants/enderio/machine/AbstractMachineBlock.java b/src/main/java/crazypants/enderio/machine/AbstractMachineBlock.java index 02568d28..2d314026 100644 --- a/src/main/java/crazypants/enderio/machine/AbstractMachineBlock.java +++ b/src/main/java/crazypants/enderio/machine/AbstractMachineBlock.java @@ -125,16 +125,16 @@ public abstract class AbstractMachineBlock exte @SideOnly(Side.CLIENT) protected void registerOverlayIcons(IIconRegister iIconRegister) { - overlayIconPull = iIconRegister.registerIcon("enderio:machineOverlayPull"); - overlayIconPush = iIconRegister.registerIcon("enderio:machineOverlayPush"); - overlayIconPushPull = iIconRegister.registerIcon("enderio:machineOverlayPushPull"); - overlayIconDisabled = iIconRegister.registerIcon("enderio:machineOverlayDisabled"); - overlayIconNone = iIconRegister.registerIcon("enderio:machineOverlayNone"); - selectedFaceIcon = iIconRegister.registerIcon("enderio:machineOverlaySelectedFace"); + overlayIconPull = iIconRegister.registerIcon("enderio:overlays/pull"); + overlayIconPush = iIconRegister.registerIcon("enderio:overlays/push"); + overlayIconPushPull = iIconRegister.registerIcon("enderio:overlays/pushPull"); + overlayIconDisabled = iIconRegister.registerIcon("enderio:overlays/disabled"); + overlayIconNone = iIconRegister.registerIcon("enderio:overlays/none"); + selectedFaceIcon = iIconRegister.registerIcon("enderio:overlays/selectedFace"); } - + @SideOnly(Side.CLIENT) - public IIcon getOverlayIconForMode(ForgeDirection face, IoMode mode) { + public IIcon getOverlayIconForMode(T tile, ForgeDirection face, IoMode mode) { if(mode == null) { return null; } diff --git a/src/main/java/crazypants/enderio/machine/OverlayRenderer.java b/src/main/java/crazypants/enderio/machine/OverlayRenderer.java index 3fc96058..0bb322da 100644 --- a/src/main/java/crazypants/enderio/machine/OverlayRenderer.java +++ b/src/main/java/crazypants/enderio/machine/OverlayRenderer.java @@ -25,6 +25,7 @@ public class OverlayRenderer implements IRenderFace { this.te = te; } + @SuppressWarnings("unchecked") @Override public void renderFace(CustomRenderBlocks rb, ForgeDirection face, Block par1Block, double x, double y, double z, IIcon texture, List refVertices, boolean translateToXyz) { @@ -39,7 +40,7 @@ public class OverlayRenderer implements IRenderFace { Tessellator.instance.addTranslation((float) offset.x, (float) offset.y, (float) offset.z); IoMode mode = te.getIoMode(face); - IIcon tex = ((AbstractMachineBlock) par1Block).getOverlayIconForMode(face, mode); + IIcon tex = ((AbstractMachineBlock) par1Block).getOverlayIconForMode(te, face, mode); if(tex != null) { ccr.getCustomRenderBlocks().doDefaultRenderFace(face, par1Block, x, y, z, tex); } diff --git a/src/main/java/crazypants/enderio/machine/TechneMachineRenderer.java b/src/main/java/crazypants/enderio/machine/TechneMachineRenderer.java index e01d2a77..36c41f75 100644 --- a/src/main/java/crazypants/enderio/machine/TechneMachineRenderer.java +++ b/src/main/java/crazypants/enderio/machine/TechneMachineRenderer.java @@ -8,7 +8,6 @@ import net.minecraftforge.common.util.ForgeDirection; import com.google.common.collect.ObjectArrays; import crazypants.render.CustomCubeRenderer; -import crazypants.render.RenderUtil; import crazypants.render.TechneModelRenderer; import crazypants.render.VertexRotationFacing; import crazypants.render.VertexTransform; diff --git a/src/main/java/crazypants/enderio/machine/farm/BlockFarmStation.java b/src/main/java/crazypants/enderio/machine/farm/BlockFarmStation.java index c4afe7fd..e8a9ba4e 100644 --- a/src/main/java/crazypants/enderio/machine/farm/BlockFarmStation.java +++ b/src/main/java/crazypants/enderio/machine/farm/BlockFarmStation.java @@ -2,17 +2,20 @@ package crazypants.enderio.machine.farm; import java.util.Random; +import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import net.minecraftforge.common.util.ForgeDirection; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.GuiHandler; import crazypants.enderio.ModObject; import crazypants.enderio.machine.AbstractMachineBlock; +import crazypants.enderio.machine.IoMode; import crazypants.enderio.network.PacketHandler; public class BlockFarmStation extends AbstractMachineBlock { @@ -27,6 +30,8 @@ public class BlockFarmStation extends AbstractMachineBlock { } public static int renderId; + + private IIcon[] overlays; protected BlockFarmStation() { super(ModObject.blockFarmStation, TileFarmStation.class); @@ -55,6 +60,24 @@ public class BlockFarmStation extends AbstractMachineBlock { return GuiHandler.GUI_ID_FARM_STATATION; } + @Override + protected void registerOverlayIcons(IIconRegister iIconRegister) { + super.registerOverlayIcons(iIconRegister); + overlays = new IIcon[IoMode.values().length]; + overlays[IoMode.PULL.ordinal()] = iIconRegister.registerIcon("enderio:overlays/pullSides"); + overlays[IoMode.PUSH.ordinal()] = iIconRegister.registerIcon("enderio:overlays/pushSides"); + overlays[IoMode.PUSH_PULL.ordinal()] = iIconRegister.registerIcon("enderio:overlays/pushPullSides"); + overlays[IoMode.DISABLED.ordinal()] = iIconRegister.registerIcon("enderio:overlays/disabledSides"); + } + + @Override + public IIcon getOverlayIconForMode(TileFarmStation tile, ForgeDirection face, IoMode mode) { + if(face.offsetY != 0 || mode == IoMode.NONE) { + return super.getOverlayIconForMode(tile, face, mode); + } + return overlays[mode.ordinal()]; + } + @Override protected String getMachineFrontIconKey(boolean active) { return getBackIconKey(active); diff --git a/src/main/java/crazypants/enderio/machine/farm/FarmingStationRenderer.java b/src/main/java/crazypants/enderio/machine/farm/FarmingStationRenderer.java index 9ab87f0c..e03f08d1 100644 --- a/src/main/java/crazypants/enderio/machine/farm/FarmingStationRenderer.java +++ b/src/main/java/crazypants/enderio/machine/farm/FarmingStationRenderer.java @@ -7,14 +7,15 @@ import net.minecraft.init.Blocks; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; +import crazypants.enderio.EnderIO; +import crazypants.enderio.machine.TechneMachineRenderer; import crazypants.render.BoundingBox; import crazypants.render.CubeRenderer; -import crazypants.render.TechneModelRenderer; -public class FarmingStationRenderer extends TechneModelRenderer { +public class FarmingStationRenderer extends TechneMachineRenderer { public FarmingStationRenderer() { - super("models/farm", BlockFarmStation.renderId); + super(EnderIO.blockFarmStation, "models/farm"); } @Override diff --git a/src/main/java/crazypants/enderio/machine/generator/combustion/BlockCombustionGenerator.java b/src/main/java/crazypants/enderio/machine/generator/combustion/BlockCombustionGenerator.java index e83284b0..e5320d4b 100644 --- a/src/main/java/crazypants/enderio/machine/generator/combustion/BlockCombustionGenerator.java +++ b/src/main/java/crazypants/enderio/machine/generator/combustion/BlockCombustionGenerator.java @@ -24,8 +24,8 @@ import crazypants.util.Util; public class BlockCombustionGenerator extends AbstractMachineBlock { public static int renderId = -1; - - private IIcon overlayPullNoCenter, overlayDisabledNoCenter; + + private IIcon overlayPullSides, overlayPullTopBottom, overlayDisabledNoCenter; public static BlockCombustionGenerator create() { PacketHandler.INSTANCE.registerMessage(PacketCombustionTank.class, PacketCombustionTank.class, PacketHandler.nextID(), Side.CLIENT); @@ -78,7 +78,7 @@ public class BlockCombustionGenerator extends AbstractMachineBlock { @Override @SideOnly(Side.CLIENT) protected void registerOverlayIcons(IIconRegister iIconRegister) { - overlayIconPull = iIconRegister.registerIcon("enderio:transcieverOverlayPull"); - overlayIconPush = iIconRegister.registerIcon("enderio:transcieverOverlayPush"); - overlayIconPushPull = iIconRegister.registerIcon("enderio:transcieverOverlayPushPull"); - overlayIconDisabled = iIconRegister.registerIcon("enderio:transcieverOverlayDisabled"); - overlayIconNone = iIconRegister.registerIcon("enderio:machineOverlayNone"); - selectedFaceIcon= iIconRegister.registerIcon("enderio:machineOverlaySelectedFace"); + super.registerOverlayIcons(iIconRegister); + overlayIconPull = iIconRegister.registerIcon("enderio:overlays/transcieverPull"); + overlayIconPush = iIconRegister.registerIcon("enderio:overlays/transcieverPush"); + overlayIconPushPull = iIconRegister.registerIcon("enderio:overlays/transcieverPushPull"); + overlayIconDisabled = iIconRegister.registerIcon("enderio:overlays/transcieverDisabled"); } @Override diff --git a/src/main/java/crazypants/enderio/machine/transceiver/render/TransceiverRenderer.java b/src/main/java/crazypants/enderio/machine/transceiver/render/TransceiverRenderer.java index 6ed24098..12a04286 100644 --- a/src/main/java/crazypants/enderio/machine/transceiver/render/TransceiverRenderer.java +++ b/src/main/java/crazypants/enderio/machine/transceiver/render/TransceiverRenderer.java @@ -89,7 +89,7 @@ public class TransceiverRenderer extends TileEntitySpecialRenderer implements II rb.setRenderBounds(pushPullBounds.minX, pushPullBounds.minY, pushPullBounds.minZ, pushPullBounds.maxX, pushPullBounds.maxY, pushPullBounds.maxZ); } - IIcon icon = EnderIO.blockTransceiver.getOverlayIconForMode(dir, mode); + IIcon icon = EnderIO.blockTransceiver.getOverlayIconForMode(trans, dir, mode); if(icon != null) { rb.doDefaultRenderFace(dir, EnderIO.blockTransceiver, 0, 0, 0, icon); } diff --git a/src/main/java/crazypants/enderio/machine/vat/BlockVat.java b/src/main/java/crazypants/enderio/machine/vat/BlockVat.java index 3cc45803..659c0534 100644 --- a/src/main/java/crazypants/enderio/machine/vat/BlockVat.java +++ b/src/main/java/crazypants/enderio/machine/vat/BlockVat.java @@ -2,6 +2,7 @@ package crazypants.enderio.machine.vat; import java.util.Random; +import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; @@ -18,6 +19,7 @@ import crazypants.enderio.GuiHandler; import crazypants.enderio.ModObject; import crazypants.enderio.machine.AbstractMachineBlock; import crazypants.enderio.machine.AbstractMachineEntity; +import crazypants.enderio.machine.IoMode; import crazypants.enderio.network.PacketHandler; import crazypants.render.VertexRotation; import crazypants.util.FluidUtil; @@ -43,6 +45,7 @@ public class BlockVat extends AbstractMachineBlock { protected IIcon topIcon; protected IIcon blockIconSingle; protected IIcon blockIconSingleOn; + protected IIcon[][] overlays; public BlockVat() { super(ModObject.blockVat, TileVat.class); @@ -85,7 +88,36 @@ public class BlockVat extends AbstractMachineBlock { } } + @SideOnly(Side.CLIENT) + @Override + protected void registerOverlayIcons(IIconRegister iIconRegister) { + super.registerOverlayIcons(iIconRegister); + overlays = new IIcon[2][IoMode.values().length]; + + overlays[0][IoMode.PULL.ordinal()] = iIconRegister.registerIcon("enderio:overlays/pullSides"); + overlays[0][IoMode.PUSH.ordinal()] = iIconRegister.registerIcon("enderio:overlays/pushSides"); + overlays[0][IoMode.PUSH_PULL.ordinal()] = iIconRegister.registerIcon("enderio:overlays/pushPullSides"); + overlays[0][IoMode.DISABLED.ordinal()] = iIconRegister.registerIcon("enderio:overlays/disabledNoCenter"); + + overlays[1][IoMode.PULL.ordinal()] = iIconRegister.registerIcon("enderio:overlays/pullTopBottom"); + overlays[1][IoMode.PUSH.ordinal()] = iIconRegister.registerIcon("enderio:overlays/pushTopBottom"); + overlays[1][IoMode.PUSH_PULL.ordinal()] = iIconRegister.registerIcon("enderio:overlays/pushPullTopBottom"); + overlays[1][IoMode.DISABLED.ordinal()] = overlays[0][IoMode.DISABLED.ordinal()]; + } + + @Override + public IIcon getOverlayIconForMode(TileVat tile, ForgeDirection face, IoMode mode) { + ForgeDirection side = tile.getFacingDir().getRotation(ForgeDirection.DOWN); + if(mode == IoMode.DISABLED || face == side || face == side.getOpposite()) { + return super.getOverlayIconForMode(tile, face, mode); + } else { + if(face == ForgeDirection.UP) { + return overlays[1][mode.ordinal()]; + } + return overlays[0][mode.ordinal()]; + } + } @Override @SideOnly(Side.CLIENT)