dave/refinedstorage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Apply textures

Browse Source
This commit is contained in:
Raoul Van den Berge
2016-08-20 15:58:37 +02:00
parent 5c10bb0d7b
commit 270b3869c8
7 changed files with 96 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/refinedstorage/gui/sidebutton/SideButtonType.java
View File

@@ -6,7 +6,6 @@ import refinedstorage.tile.config.IType;
import refinedstorage.tile.data.TileDataManager;
import refinedstorage.tile.data.TileDataParameter;
// @TODO: Add icons
public class SideButtonType extends SideButton {
private TileDataParameter<Integer> type;
@@ -21,6 +20,9 @@ public class SideButtonType extends SideButton {
@Override
public void draw(GuiBase gui, int x, int y) {
gui.bindTexture("icons.png");
gui.drawTexture(x, y + 1, 16 * type.getValue(), 128, 16, 16);
}
@Override

8
src/main/java/refinedstorage/proxy/ClientProxy.java
View File

@@ -9,7 +9,6 @@ import net.minecraft.client.renderer.Tessellator;
import net.minecraft.client.renderer.VertexBuffer;
import net.minecraft.client.renderer.block.model.ModelBakery;
import net.minecraft.client.renderer.block.model.ModelResourceLocation;
import net.minecraft.client.renderer.block.statemap.StateMap;
import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
@@ -246,16 +245,11 @@ public class ClientProxy extends CommonProxy {
ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.UPGRADE, ItemUpgrade.TYPE_INTERDIMENSIONAL, new ModelResourceLocation("refinedstorage:interdimensional_upgrade", "inventory"));
// Blocks
ModelLoader.setCustomStateMapper(RefinedStorageBlocks.GRID, (new StateMap.Builder())
.ignore(RefinedStorageBlocks.GRID.TYPE)
.build()
);
ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.CABLE), 0, new ModelResourceLocation("refinedstorage:cable", "inventory"));
ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.GRID), EnumGridType.NORMAL.getId(), new ModelResourceLocation("refinedstorage:grid", "inventory"));
ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.GRID), EnumGridType.CRAFTING.getId(), new ModelResourceLocation("refinedstorage:grid", "inventory"));
ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.GRID), EnumGridType.PATTERN.getId(), new ModelResourceLocation("refinedstorage:grid", "inventory"));
ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.GRID), EnumGridType.FLUID.getId(), new ModelResourceLocation("refinedstorage:grid", "inventory"));
ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.GRID), EnumGridType.FLUID.getId(), new ModelResourceLocation("refinedstorage:fluid_grid", "inventory"));
ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.MACHINE_CASING), 0, new ModelResourceLocation("refinedstorage:machine_casing", "inventory"));
ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.EXPORTER), 0, new ModelResourceLocation("refinedstorage:exporter", "inventory"));
ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.IMPORTER), 0, new ModelResourceLocation("refinedstorage:importer", "inventory"));

8
src/main/java/refinedstorage/proxy/CommonProxy.java
View File

@@ -95,6 +95,7 @@ public class CommonProxy {
registerBlock(RefinedStorageBlocks.PROCESSING_PATTERN_ENCODER);
registerBlock(RefinedStorageBlocks.DISK_DRIVE);
registerBlock(RefinedStorageBlocks.STORAGE);
registerBlock(RefinedStorageBlocks.FLUID_STORAGE);
registerBlock(RefinedStorageBlocks.SOLDERER);
registerBlock(RefinedStorageBlocks.CABLE);
registerBlock(RefinedStorageBlocks.IMPORTER);
@@ -105,18 +106,19 @@ public class CommonProxy {
registerBlock(RefinedStorageBlocks.DETECTOR);
registerBlock(RefinedStorageBlocks.RELAY);
registerBlock(RefinedStorageBlocks.INTERFACE);
registerBlock(RefinedStorageBlocks.FLUID_INTERFACE);
registerBlock(RefinedStorageBlocks.WIRELESS_TRANSMITTER);
registerBlock(RefinedStorageBlocks.MACHINE_CASING);
registerBlock(RefinedStorageBlocks.NETWORK_TRANSMITTER);
registerBlock(RefinedStorageBlocks.NETWORK_RECEIVER);
registerBlock(RefinedStorageBlocks.FLUID_INTERFACE);
registerBlock(RefinedStorageBlocks.FLUID_STORAGE);
registerItem(RefinedStorageItems.QUARTZ_ENRICHED_IRON);
registerItem(RefinedStorageItems.STORAGE_DISK);
registerItem(RefinedStorageItems.FLUID_STORAGE_DISK);
registerItem(RefinedStorageItems.STORAGE_HOUSING);
registerItem(RefinedStorageItems.PATTERN);
registerItem(RefinedStorageItems.STORAGE_PART);
registerItem(RefinedStorageItems.FLUID_STORAGE_PART);
registerItem(RefinedStorageItems.WIRELESS_GRID);
registerItem(RefinedStorageItems.PROCESSOR);
registerItem(RefinedStorageItems.CORE);
@@ -124,8 +126,6 @@ public class CommonProxy {
registerItem(RefinedStorageItems.UPGRADE);
registerItem(RefinedStorageItems.GRID_FILTER);
registerItem(RefinedStorageItems.NETWORK_CARD);
registerItem(RefinedStorageItems.FLUID_STORAGE_DISK);
registerItem(RefinedStorageItems.FLUID_STORAGE_PART);
OreDictionary.registerOre("itemSilicon", RefinedStorageItems.SILICON);