Move overlay textures into their own folder, fix model machine overlays

This commit is contained in:
tterrag1098 committed 2015-03-18 14:48:36 -04:00
1 parent 1e085eb35f
commit 31f193be2c
30 files changed
+97 -37

No files matched your search

@@ -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);
@@ -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) };
}
}
@@ -125,16 +125,16 @@ public abstract class AbstractMachineBlock<T extends AbstractMachineEntity> 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;
}
@@ -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<Vertex> 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<AbstractMachineEntity>) par1Block).getOverlayIconForMode(te, face, mode);
if(tex != null) {
ccr.getCustomRenderBlocks().doDefaultRenderFace(face, par1Block, x, y, z, tex);
}
@@ -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;
@@ -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<TileFarmStation> {
@@ -27,6 +30,8 @@ public class BlockFarmStation extends AbstractMachineBlock<TileFarmStation> {
}
public static int renderId;
private IIcon[] overlays;
protected BlockFarmStation() {
super(ModObject.blockFarmStation, TileFarmStation.class);
@@ -55,6 +60,24 @@ public class BlockFarmStation extends AbstractMachineBlock<TileFarmStation> {
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);
@@ -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<TileFarmStation> {
public FarmingStationRenderer() {
super("models/farm", BlockFarmStation.renderId);
super(EnderIO.blockFarmStation, "models/farm");
}
@Override
@@ -24,8 +24,8 @@ import crazypants.util.Util;
public class BlockCombustionGenerator extends AbstractMachineBlock<TileCombustionGenerator> {
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<TileCombustio
public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) {
TileEntity te = world.getTileEntity(x, y, z);
if(te instanceof TileCombustionGenerator) {
return new ContainerCombustionEngine(player.inventory, (TileCombustionGenerator)te);
return new ContainerCombustionEngine(player.inventory, (TileCombustionGenerator) te);
}
return null;
}
@@ -116,20 +116,17 @@ public class BlockCombustionGenerator extends AbstractMachineBlock<TileCombustio
@Override
protected void registerOverlayIcons(IIconRegister iIconRegister) {
super.registerOverlayIcons(iIconRegister);
overlayPullNoCenter = iIconRegister.registerIcon("enderio:machineOverlayPullNoCenter");
overlayDisabledNoCenter = iIconRegister.registerIcon("enderio:machineOverlayDisabledNoCenter");
overlayPullSides = iIconRegister.registerIcon("enderio:overlays/pullSides");
overlayPullTopBottom = iIconRegister.registerIcon("enderio:overlays/pullTopBottom");
overlayDisabledNoCenter = iIconRegister.registerIcon("enderio:overlays/disabledNoCenter");
}
@Override
public IIcon getOverlayIconForMode(ForgeDirection face, IoMode mode) {
if(face.offsetY == 0) {
return super.getOverlayIconForMode(face, mode);
} else {
if (mode == IoMode.NONE) {
return super.getOverlayIconForMode(face, mode);
}
return mode == IoMode.PULL ? overlayPullNoCenter : overlayDisabledNoCenter;
public IIcon getOverlayIconForMode(TileCombustionGenerator tile, ForgeDirection face, IoMode mode) {
if(face.offsetY == 0 || mode == IoMode.NONE) {
return super.getOverlayIconForMode(tile, face, mode);
}
return mode == IoMode.PULL ? face.offsetY == 0 ? overlayPullSides : overlayPullTopBottom : overlayDisabledNoCenter;
}
public IIcon getBackIcon() {
@@ -173,7 +170,7 @@ public class BlockCombustionGenerator extends AbstractMachineBlock<TileCombustio
if(dir.offsetX == 1) {
startX++;
} else if (dir.offsetZ == 1) {
} else if(dir.offsetZ == 1) {
startZ++;
}
@@ -84,12 +84,11 @@ public class BlockTransceiver extends AbstractMachineBlock<TileTransceiver> {
@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
@@ -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);
}
@@ -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<TileVat> {
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<TileVat> {
}
}
@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)