Fixed some issues with cables when using ic2 classic.
This commit is contained in:
parent
a390a37cb1
commit
fd4f52e27e
2 changed files with 11 additions and 0 deletions
|
@ -2,9 +2,12 @@ package techreborn.client.render;
|
||||||
|
|
||||||
import cpw.mods.fml.relauncher.Side;
|
import cpw.mods.fml.relauncher.Side;
|
||||||
import cpw.mods.fml.relauncher.SideOnly;
|
import cpw.mods.fml.relauncher.SideOnly;
|
||||||
|
import ic2.api.info.IC2Classic;
|
||||||
|
import ic2.api.item.IC2Items;
|
||||||
import net.minecraft.block.Block;
|
import net.minecraft.block.Block;
|
||||||
import net.minecraft.client.renderer.RenderBlocks;
|
import net.minecraft.client.renderer.RenderBlocks;
|
||||||
import net.minecraft.client.renderer.Tessellator;
|
import net.minecraft.client.renderer.Tessellator;
|
||||||
|
import net.minecraft.item.ItemBlock;
|
||||||
import net.minecraft.util.IIcon;
|
import net.minecraft.util.IIcon;
|
||||||
import net.minecraftforge.common.util.ForgeDirection;
|
import net.minecraftforge.common.util.ForgeDirection;
|
||||||
import techreborn.client.IconSupplier;
|
import techreborn.client.IconSupplier;
|
||||||
|
@ -56,6 +59,9 @@ public class RenderCablePart {
|
||||||
|
|
||||||
@SideOnly(Side.CLIENT)
|
@SideOnly(Side.CLIENT)
|
||||||
public static IIcon getIconFromType(int cableType) {
|
public static IIcon getIconFromType(int cableType) {
|
||||||
|
if(IC2Classic.getLoadedIC2Type() == IC2Classic.IC2Type.SpeigersClassic){
|
||||||
|
return Block.getBlockFromItem(IC2Items.getItem("copperCableBlock").getItem()).getIcon(0, cableType * 16);
|
||||||
|
}
|
||||||
IIcon p = null;
|
IIcon p = null;
|
||||||
switch (cableType) {
|
switch (cableType) {
|
||||||
case 0:
|
case 0:
|
||||||
|
|
|
@ -7,8 +7,10 @@ import ic2.api.energy.event.EnergyTileLoadEvent;
|
||||||
import ic2.api.energy.event.EnergyTileUnloadEvent;
|
import ic2.api.energy.event.EnergyTileUnloadEvent;
|
||||||
import ic2.api.energy.tile.IEnergyConductor;
|
import ic2.api.energy.tile.IEnergyConductor;
|
||||||
import ic2.api.energy.tile.IEnergyTile;
|
import ic2.api.energy.tile.IEnergyTile;
|
||||||
|
import ic2.api.info.IC2Classic;
|
||||||
import ic2.api.item.IC2Items;
|
import ic2.api.item.IC2Items;
|
||||||
import ic2.api.network.INetworkTileEntityEventListener;
|
import ic2.api.network.INetworkTileEntityEventListener;
|
||||||
|
import net.minecraft.block.Block;
|
||||||
import net.minecraft.entity.Entity;
|
import net.minecraft.entity.Entity;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
import net.minecraft.nbt.NBTTagCompound;
|
import net.minecraft.nbt.NBTTagCompound;
|
||||||
|
@ -149,6 +151,9 @@ public class CablePart extends ModPart implements IEnergyConductor, INetworkTile
|
||||||
@SideOnly(Side.CLIENT)
|
@SideOnly(Side.CLIENT)
|
||||||
@Override
|
@Override
|
||||||
public String getItemTextureName() {
|
public String getItemTextureName() {
|
||||||
|
if(IC2Classic.getLoadedIC2Type() == IC2Classic.IC2Type.SpeigersClassic){
|
||||||
|
return IC2Items.getItem("copperCableBlock").getItem().getIcon(new ItemStack(IC2Items.getItem("copperCableBlock").getItem(), type), 1).getIconName();
|
||||||
|
}
|
||||||
return IC2Items.getItem(getTextureNameFromType(type)).getIconIndex().getIconName();
|
return IC2Items.getItem(getTextureNameFromType(type)).getIconIndex().getIconName();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue