fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Renamed ExtraTextures and added ExtraItemTextures.

Browse Source
This commit is contained in:
AlgorithmX2
2014-05-25 20:58:44 -05:00
parent ef7a1592e7
commit 905832ae85
33 changed files with 300 additions and 247 deletions
Download Patch File Download Diff File Expand all files Collapse all files
block/crafting/BlockCraftingMonitor.java
+2 -2
View File
@@ -6,7 +6,7 @@ import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon;
import appeng.client.texture.ExtraTextures;
import appeng.client.texture.ExtraBlockTextures;
import appeng.tile.crafting.TileCraftingMonitorTile;
public class BlockCraftingMonitor extends BlockCraftingUnit
@@ -26,7 +26,7 @@ public class BlockCraftingMonitor extends BlockCraftingUnit
case 0:
return super.getIcon( 0, 0 );
case 0 | FLAG_FORMED:
return ExtraTextures.BlockCraftingMonitorFit.getIcon();
return ExtraBlockTextures.BlockCraftingMonitorFit.getIcon();
}
}
block/crafting/BlockCraftingStorage.java
+8 -8
View File
@@ -6,7 +6,7 @@ import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon;
import appeng.client.texture.ExtraTextures;
import appeng.client.texture.ExtraBlockTextures;
import appeng.tile.crafting.TileCraftingStorageTile;
public class BlockCraftingStorage extends BlockCraftingUnit
@@ -42,20 +42,20 @@ public class BlockCraftingStorage extends BlockCraftingUnit
case 0:
return super.getIcon( 0, 0 );
case 1:
return ExtraTextures.BlockCraftingStorage4k.getIcon();
return ExtraBlockTextures.BlockCraftingStorage4k.getIcon();
case 2:
return ExtraTextures.BlockCraftingStorage16k.getIcon();
return ExtraBlockTextures.BlockCraftingStorage16k.getIcon();
case 3:
return ExtraTextures.BlockCraftingStorage64k.getIcon();
return ExtraBlockTextures.BlockCraftingStorage64k.getIcon();
case 0 | FLAG_FORMED:
return ExtraTextures.BlockCraftingStorage1kFit.getIcon();
return ExtraBlockTextures.BlockCraftingStorage1kFit.getIcon();
case 1 | FLAG_FORMED:
return ExtraTextures.BlockCraftingStorage4kFit.getIcon();
return ExtraBlockTextures.BlockCraftingStorage4kFit.getIcon();
case 2 | FLAG_FORMED:
return ExtraTextures.BlockCraftingStorage16kFit.getIcon();
return ExtraBlockTextures.BlockCraftingStorage16kFit.getIcon();
case 3 | FLAG_FORMED:
return ExtraTextures.BlockCraftingStorage64kFit.getIcon();
return ExtraBlockTextures.BlockCraftingStorage64kFit.getIcon();
}
}
block/crafting/BlockCraftingUnit.java
+4 -4
View File
@@ -13,7 +13,7 @@ import net.minecraft.world.World;
import appeng.block.AEBaseBlock;
import appeng.client.render.BaseBlockRender;
import appeng.client.render.blocks.RenderBlockCrafting;
import appeng.client.texture.ExtraTextures;
import appeng.client.texture.ExtraBlockTextures;
import appeng.core.features.AEFeature;
import appeng.tile.crafting.TileCraftingTile;
@@ -64,11 +64,11 @@ public class BlockCraftingUnit extends AEBaseBlock
case 0:
return super.getIcon( 0, 0 );
case 1:
return ExtraTextures.BlockCraftingAccelerator.getIcon();
return ExtraBlockTextures.BlockCraftingAccelerator.getIcon();
case 0 | FLAG_FORMED:
return ExtraTextures.BlockCraftingUnitFit.getIcon();
return ExtraBlockTextures.BlockCraftingUnitFit.getIcon();
case 1 | FLAG_FORMED:
return ExtraTextures.BlockCraftingAcceleratorFit.getIcon();
return ExtraBlockTextures.BlockCraftingAcceleratorFit.getIcon();
}
}
block/misc/BlockVibrationChamber.java
+2 -2
View File
@@ -10,7 +10,7 @@ import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import net.minecraftforge.common.util.ForgeDirection;
import appeng.block.AEBaseBlock;
import appeng.client.texture.ExtraTextures;
import appeng.client.texture.ExtraBlockTextures;
import appeng.core.AEConfig;
import appeng.core.features.AEFeature;
import appeng.core.sync.GuiBridge;
@@ -54,7 +54,7 @@ public class BlockVibrationChamber extends AEBaseBlock
if ( tvc != null && tvc.isOn && ico == getRendererInstance().getTexture( ForgeDirection.SOUTH ) )
{
return ExtraTextures.BlockVibrationChamberFrontOn.getIcon();
return ExtraBlockTextures.BlockVibrationChamberFrontOn.getIcon();
}
return ico;
block/networking/BlockCableBus.java
+2 -2
View File
@@ -26,7 +26,7 @@ import appeng.block.AEBaseBlock;
import appeng.client.render.BaseBlockRender;
import appeng.client.render.BusRenderHelper;
import appeng.client.render.blocks.RendererCableBus;
import appeng.client.texture.ExtraTextures;
import appeng.client.texture.ExtraBlockTextures;
import appeng.core.AEConfig;
import appeng.core.Api;
import appeng.core.AppEng;
@@ -175,7 +175,7 @@ public class BlockCableBus extends AEBaseBlock
if ( i != null )
return i;
return ExtraTextures.BlockQuartzGlassB.getIcon();
return ExtraBlockTextures.BlockQuartzGlassB.getIcon();
}
@Override
block/networking/BlockDenseEnergyCell.java
+9 -9
View File
@@ -3,7 +3,7 @@ package appeng.block.networking;
import java.util.EnumSet;
import net.minecraft.util.IIcon;
import appeng.client.texture.ExtraTextures;
import appeng.client.texture.ExtraBlockTextures;
import appeng.core.features.AEFeature;
import appeng.tile.networking.TileDenseEnergyCell;
@@ -28,21 +28,21 @@ public class BlockDenseEnergyCell extends BlockEnergyCell
switch (metadata)
{
case 0:
return ExtraTextures.MEDenseEnergyCell0.getIcon();
return ExtraBlockTextures.MEDenseEnergyCell0.getIcon();
case 1:
return ExtraTextures.MEDenseEnergyCell1.getIcon();
return ExtraBlockTextures.MEDenseEnergyCell1.getIcon();
case 2:
return ExtraTextures.MEDenseEnergyCell2.getIcon();
return ExtraBlockTextures.MEDenseEnergyCell2.getIcon();
case 3:
return ExtraTextures.MEDenseEnergyCell3.getIcon();
return ExtraBlockTextures.MEDenseEnergyCell3.getIcon();
case 4:
return ExtraTextures.MEDenseEnergyCell4.getIcon();
return ExtraBlockTextures.MEDenseEnergyCell4.getIcon();
case 5:
return ExtraTextures.MEDenseEnergyCell5.getIcon();
return ExtraBlockTextures.MEDenseEnergyCell5.getIcon();
case 6:
return ExtraTextures.MEDenseEnergyCell6.getIcon();
return ExtraBlockTextures.MEDenseEnergyCell6.getIcon();
case 7:
return ExtraTextures.MEDenseEnergyCell7.getIcon();
return ExtraBlockTextures.MEDenseEnergyCell7.getIcon();
}
return super.getIcon( direction, metadata );
block/networking/BlockEnergyCell.java
+9 -9
View File
@@ -13,7 +13,7 @@ import appeng.block.AEBaseBlock;
import appeng.block.AEBaseItemBlockChargeable;
import appeng.client.render.BaseBlockRender;
import appeng.client.render.blocks.RenderBlockEnergyCube;
import appeng.client.texture.ExtraTextures;
import appeng.client.texture.ExtraBlockTextures;
import appeng.core.features.AEFeature;
import appeng.tile.networking.TileEnergyCell;
import appeng.util.Platform;
@@ -60,21 +60,21 @@ public class BlockEnergyCell extends AEBaseBlock
switch (metadata)
{
case 0:
return ExtraTextures.MEEnergyCell0.getIcon();
return ExtraBlockTextures.MEEnergyCell0.getIcon();
case 1:
return ExtraTextures.MEEnergyCell1.getIcon();
return ExtraBlockTextures.MEEnergyCell1.getIcon();
case 2:
return ExtraTextures.MEEnergyCell2.getIcon();
return ExtraBlockTextures.MEEnergyCell2.getIcon();
case 3:
return ExtraTextures.MEEnergyCell3.getIcon();
return ExtraBlockTextures.MEEnergyCell3.getIcon();
case 4:
return ExtraTextures.MEEnergyCell4.getIcon();
return ExtraBlockTextures.MEEnergyCell4.getIcon();
case 5:
return ExtraTextures.MEEnergyCell5.getIcon();
return ExtraBlockTextures.MEEnergyCell5.getIcon();
case 6:
return ExtraTextures.MEEnergyCell6.getIcon();
return ExtraBlockTextures.MEEnergyCell6.getIcon();
case 7:
return ExtraTextures.MEEnergyCell7.getIcon();
return ExtraBlockTextures.MEEnergyCell7.getIcon();
}
return super.getIcon( direction, metadata );