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

Removed old rendering system

Browse Source 
Removed old rendering system. Some parts may be left over, but they
won't affect testing.
1.10-R todo tag marks things to do with rendering.
This commit is contained in:
elix-x
2016-06-29 12:22:18 +02:00
parent 92753a432a
commit 03aa59521c
146 changed files with 15 additions and 13767 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/core/CommonHelper.java
-3
View File
@@ -72,7 +72,4 @@ public abstract class CommonHelper
public abstract void missingCoreMod();
public abstract void configureIcon( Object item, String name );
public abstract ResourceLocation addIcon( String string );
}
src/main/java/appeng/core/api/ApiPart.java
-13
View File
@@ -40,7 +40,6 @@ import org.objectweb.asm.tree.MethodInsnNode;
import org.objectweb.asm.tree.MethodNode;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.EnumFacing;
@@ -50,7 +49,6 @@ import net.minecraft.world.World;
import appeng.api.parts.CableRenderMode;
import appeng.api.parts.IPartHelper;
import appeng.api.parts.IPartItem;
import appeng.api.parts.LayerBase;
import appeng.core.AELog;
import appeng.core.CommonHelper;
@@ -59,7 +57,6 @@ import appeng.integration.IntegrationType;
import appeng.integration.abstraction.IFMP;
import appeng.parts.PartPlacement;
import appeng.tile.networking.TileCableBus;
import appeng.util.Platform;
public class ApiPart implements IPartHelper
@@ -328,16 +325,6 @@ public class ApiPart implements IPartHelper
return false;
}
@Override
public void setItemBusRenderer( final IPartItem i )
{
if( Platform.isClient() && i instanceof Item )
{
CommonHelper.proxy.configureIcon( i, null );
// MinecraftForgeClient.registerItemRenderer( (Item) i, BusRenderer.INSTANCE );
}
}
@Override
public boolean placeBus( final ItemStack is, final BlockPos pos, final EnumFacing side, final EntityPlayer player, final EnumHand hand, final World w )
{
src/main/java/appeng/core/features/AEBlockFeatureHandler.java
-5
View File
@@ -84,11 +84,6 @@ public final class AEBlockFeatureHandler implements IFeatureHandler
featuredItem.setRegistryName( AppEng.MOD_ID, name );
GameRegistry.register( featuredItem );
}
if( side == Side.CLIENT )
{
CommonHelper.proxy.configureIcon( this.featured, name );
}
}
}
}
src/main/java/appeng/core/features/AECableBusFeatureHandler.java
-5
View File
@@ -94,11 +94,6 @@ public final class AECableBusFeatureHandler implements IFeatureHandler
{
GameData.getBlockItemMap().put( this.featured, this.definition.maybeItem().get() );
}
if( side == Side.CLIENT )
{
CommonHelper.proxy.configureIcon( this.featured, name );
}
}
}
}
src/main/java/appeng/core/features/AETileBlockFeatureHandler.java
-5
View File
@@ -93,11 +93,6 @@ public final class AETileBlockFeatureHandler implements IFeatureHandler
}
GameRegistry.registerTileEntity( this.featured.getTileEntityClass(), this.featured.toString() );
if( side == Side.CLIENT )
{
CommonHelper.proxy.configureIcon( this.featured, name );
}
}
}
}
src/main/java/appeng/core/features/ItemFeatureHandler.java
-5
View File
@@ -94,11 +94,6 @@ public final class ItemFeatureHandler implements IFeatureHandler
// "item." +
GameRegistry.registerItem( this.item, name );
if( side == Side.CLIENT )
{
CommonHelper.proxy.configureIcon( this.item, itemPhysicalName );
}
}
}
src/main/java/appeng/core/features/StairBlockFeatureHandler.java
-6
View File
@@ -73,12 +73,6 @@ public class StairBlockFeatureHandler implements IFeatureHandler
this.stairs.setUnlocalizedName( "appliedenergistics2." + name );
GameRegistry.registerBlock( this.stairs, name );
if( side == Side.CLIENT )
{
final Item item = ItemBlock.getItemFromBlock( this.stairs );
CommonHelper.proxy.configureIcon( item, name );
}
}
}
}
src/main/java/appeng/core/features/registries/entries/BasicCellHandler.java
-20
View File
@@ -32,8 +32,6 @@ import appeng.api.storage.IMEInventoryHandler;
import appeng.api.storage.ISaveProvider;
import appeng.api.storage.StorageChannel;
import appeng.api.util.AEPartLocation;
import appeng.api.util.IAESprite;
import appeng.client.texture.ExtraBlockTextures;
import appeng.core.sync.GuiBridge;
import appeng.me.storage.CellInventory;
import appeng.me.storage.CellInventoryHandler;
@@ -59,24 +57,6 @@ public class BasicCellHandler implements ICellHandler
return null;
}
@Override
public IAESprite getTopTexture_Light()
{
return ExtraBlockTextures.BlockMEChestItems_Light.getIcon();
}
@Override
public IAESprite getTopTexture_Medium()
{
return ExtraBlockTextures.BlockMEChestItems_Medium.getIcon();
}
@Override
public IAESprite getTopTexture_Dark()
{
return ExtraBlockTextures.BlockMEChestItems_Dark.getIcon();
}
@Override
public void openChestGui( final EntityPlayer player, final IChestOrDrive chest, final ICellHandler cellHandler, final IMEInventoryHandler inv, final ItemStack is, final StorageChannel chan )
{
src/main/java/appeng/core/features/registries/entries/CreativeCellHandler.java
-20
View File
@@ -30,8 +30,6 @@ import appeng.api.storage.IMEInventoryHandler;
import appeng.api.storage.ISaveProvider;
import appeng.api.storage.StorageChannel;
import appeng.api.util.AEPartLocation;
import appeng.api.util.IAESprite;
import appeng.client.texture.ExtraBlockTextures;
import appeng.core.sync.GuiBridge;
import appeng.items.storage.ItemCreativeStorageCell;
import appeng.me.storage.CreativeCellInventory;
@@ -57,24 +55,6 @@ public class CreativeCellHandler implements ICellHandler
return null;
}
@Override
public IAESprite getTopTexture_Light()
{
return ExtraBlockTextures.BlockMEChestItems_Light.getIcon();
}
@Override
public IAESprite getTopTexture_Medium()
{
return ExtraBlockTextures.BlockMEChestItems_Medium.getIcon();
}
@Override
public IAESprite getTopTexture_Dark()
{
return ExtraBlockTextures.BlockMEChestItems_Dark.getIcon();
}
@Override
public void openChestGui( final EntityPlayer player, final IChestOrDrive chest, final ICellHandler cellHandler, final IMEInventoryHandler inv, final ItemStack is, final StorageChannel chan )
{