New art by CyanideX

This commit is contained in:
Raoul Van den Berge
2016-09-27 22:32:26 +02:00
parent 4e3efda847
commit bdb1c64a78
243 changed files with 589 additions and 398 deletions

View File

@@ -356,6 +356,7 @@ public class BlockCable extends BlockCoverable {
@Override @Override
public BlockRenderLayer getBlockLayer() { public BlockRenderLayer getBlockLayer() {
return RefinedStorage.INSTANCE.config.translucentCables ? BlockRenderLayer.TRANSLUCENT : super.getBlockLayer(); // @TODO: Remove config
return BlockRenderLayer.CUTOUT;
} }
} }

View File

@@ -1,5 +1,6 @@
package refinedstorage.block; package refinedstorage.block;
import mcmultipart.block.BlockCoverable;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.block.state.IBlockState; import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
@@ -14,7 +15,6 @@ import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World; import net.minecraft.world.World;
import refinedstorage.RefinedStorage; import refinedstorage.RefinedStorage;
import refinedstorage.RefinedStorageGui; import refinedstorage.RefinedStorageGui;
import refinedstorage.tile.TileCable;
import refinedstorage.tile.TileWirelessTransmitter; import refinedstorage.tile.TileWirelessTransmitter;
public class BlockWirelessTransmitter extends BlockNode { public class BlockWirelessTransmitter extends BlockNode {
@@ -69,7 +69,7 @@ public class BlockWirelessTransmitter extends BlockNode {
@Override @Override
public boolean canPlaceBlockAt(World world, BlockPos pos) { public boolean canPlaceBlockAt(World world, BlockPos pos) {
return world.getTileEntity(pos.offset(EnumFacing.DOWN)) instanceof TileCable; return world.getBlockState(pos.offset(EnumFacing.DOWN)).getBlock() instanceof BlockCoverable;
} }
@Override @Override

View File

@@ -270,7 +270,7 @@ public class ClientProxy extends CommonProxy {
ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.FLUID_INTERFACE), 0, new ModelResourceLocation("refinedstorage:fluid_interface", "inventory")); ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.FLUID_INTERFACE), 0, new ModelResourceLocation("refinedstorage:fluid_interface", "inventory"));
ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.WIRELESS_TRANSMITTER), 0, new ModelResourceLocation("refinedstorage:wireless_transmitter", "inventory")); ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.WIRELESS_TRANSMITTER), 0, new ModelResourceLocation("refinedstorage:wireless_transmitter", "inventory"));
ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.CRAFTING_MONITOR), 0, new ModelResourceLocation("refinedstorage:crafting_monitor", "inventory")); ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.CRAFTING_MONITOR), 0, new ModelResourceLocation("refinedstorage:crafting_monitor", "inventory"));
ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.CRAFTER), 0, new ModelResourceLocation("refinedstorage:crafter", "inventory")); ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.CRAFTER), 0, new ModelResourceLocation("refinedstorage:crafter", "connected=false,direction=north"));
ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.PROCESSING_PATTERN_ENCODER), 0, new ModelResourceLocation("refinedstorage:processing_pattern_encoder", "inventory")); ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.PROCESSING_PATTERN_ENCODER), 0, new ModelResourceLocation("refinedstorage:processing_pattern_encoder", "inventory"));
ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.NETWORK_TRANSMITTER), 0, new ModelResourceLocation("refinedstorage:network_transmitter", "inventory")); ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.NETWORK_TRANSMITTER), 0, new ModelResourceLocation("refinedstorage:network_transmitter", "inventory"));
ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.NETWORK_RECEIVER), 0, new ModelResourceLocation("refinedstorage:network_receiver", "inventory")); ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.NETWORK_RECEIVER), 0, new ModelResourceLocation("refinedstorage:network_receiver", "inventory"));

View File

@@ -2,8 +2,8 @@
"forge_marker": 1, "forge_marker": 1,
"defaults": { "defaults": {
"textures": { "textures": {
"all": "refinedstorage:blocks/cable", "all": "refinedstorage:blocks/cable_new",
"particle": "refinedstorage:blocks/cable" "particle": "refinedstorage:blocks/cable_new"
}, },
"model": "refinedstorage:cable_core", "model": "refinedstorage:cable_core",
"uvlock": true "uvlock": true

View File

@@ -4,8 +4,8 @@
"textures": { "textures": {
"all": "refinedstorage:blocks/cable", "all": "refinedstorage:blocks/cable",
"particle": "refinedstorage:blocks/cable", "particle": "refinedstorage:blocks/cable",
"front": "refinedstorage:blocks/constructor", "front": "refinedstorage:blocks/constructor_on",
"line": "refinedstorage:blocks/cable_part" "line": "refinedstorage:blocks/importer_exporter_external_storage"
}, },
"model": "refinedstorage:cable_core", "model": "refinedstorage:cable_core",
"uvlock": true "uvlock": true
@@ -17,12 +17,6 @@
"transform": "forge:default-block" "transform": "forge:default-block"
} }
], ],
"connected": {
"true": {
},
"false": {
}
},
"direction": { "direction": {
"north": { "north": {
"submodel": "refinedstorage:constructor_destructor_north" "submodel": "refinedstorage:constructor_destructor_north"

View File

@@ -3,8 +3,9 @@
"defaults": { "defaults": {
"model": "orientable", "model": "orientable",
"textures": { "textures": {
"side": "refinedstorage:blocks/side", "particle": "refinedstorage:blocks/controller_0",
"top": "refinedstorage:blocks/side", "side": "refinedstorage:blocks/controller_0",
"top": "refinedstorage:blocks/controller_0",
"front": "refinedstorage:blocks/controller_0" "front": "refinedstorage:blocks/controller_0"
} }
}, },
@@ -17,37 +18,51 @@
}, },
"1": { "1": {
"textures": { "textures": {
"side": "refinedstorage:blocks/controller_1",
"top": "refinedstorage:blocks/controller_1",
"front": "refinedstorage:blocks/controller_1" "front": "refinedstorage:blocks/controller_1"
} }
}, },
"2": { "2": {
"textures": { "textures": {
"side": "refinedstorage:blocks/controller_2",
"top": "refinedstorage:blocks/controller_2",
"front": "refinedstorage:blocks/controller_2" "front": "refinedstorage:blocks/controller_2"
} }
}, },
"3": { "3": {
"textures": { "textures": {
"front": "refinedstorage:blocks/controller_3" "side": "refinedstorage:blocks/controller_on",
"top": "refinedstorage:blocks/controller_on",
"front": "refinedstorage:blocks/controller_on"
} }
}, },
"4": { "4": {
"textures": { "textures": {
"front": "refinedstorage:blocks/controller_4" "side": "refinedstorage:blocks/controller_on",
"top": "refinedstorage:blocks/controller_on",
"front": "refinedstorage:blocks/controller_on"
} }
}, },
"5": { "5": {
"textures": { "textures": {
"front": "refinedstorage:blocks/controller_5" "side": "refinedstorage:blocks/controller_on",
"top": "refinedstorage:blocks/controller_on",
"front": "refinedstorage:blocks/controller_on"
} }
}, },
"6": { "6": {
"textures": { "textures": {
"front": "refinedstorage:blocks/controller_6" "side": "refinedstorage:blocks/controller_on",
"top": "refinedstorage:blocks/controller_on",
"front": "refinedstorage:blocks/controller_on"
} }
}, },
"7": { "7": {
"textures": { "textures": {
"front": "refinedstorage:blocks/controller_7" "side": "refinedstorage:blocks/controller_on",
"top": "refinedstorage:blocks/controller_on",
"front": "refinedstorage:blocks/controller_on"
} }
} }
}, },

View File

@@ -1,51 +1,93 @@
{ {
"forge_marker": 1, "forge_marker": 1,
"defaults": { "defaults": {
"model": "orientable", "model": "cube",
"textures": { "textures": {
"side": "refinedstorage:blocks/side", "particle": "refinedstorage:blocks/crafter_side",
"top": "refinedstorage:blocks/side" "crafter_side": "refinedstorage:blocks/crafter_side",
} "crafter_side_90": "refinedstorage:blocks/crafter_side_90",
"crafter_side_180": "refinedstorage:blocks/crafter_side_180",
"crafter_side_270": "refinedstorage:blocks/crafter_side_270",
"crafter_front": "refinedstorage:blocks/crafter_front"
},
"uvlock": true
}, },
"variants": { "variants": {
"inventory": [
{
"textures": {
"front": "refinedstorage:blocks/crafter_disconnected"
},
"y": 0
}
],
"connected": { "connected": {
"true": { "true": {
"textures": { "textures": {
"front": "refinedstorage:blocks/crafter_connected" "crafter_side": "refinedstorage:blocks/crafter_side_connected",
"crafter_side_90": "refinedstorage:blocks/crafter_side_connected_90",
"crafter_side_180": "refinedstorage:blocks/crafter_side_connected_180",
"crafter_side_270": "refinedstorage:blocks/crafter_side_connected_270",
"crafter_front": "refinedstorage:blocks/crafter_front_connected"
} }
}, },
"false": { "false": {
"textures": { "textures": {
"front": "refinedstorage:blocks/crafter_disconnected"
} }
} }
}, },
"direction": { "direction": {
"north": { "north": {
"y": 0 "textures": {
"down": "#crafter_side",
"up": "#crafter_side",
"north": "#crafter_front",
"east": "#crafter_side_90",
"south": "refinedstorage:blocks/crafter_bottom",
"west": "#crafter_side_270"
}
}, },
"east": { "east": {
"y": 90 "textures": {
"down": "refinedstorage:blocks/crafter_bottom",
"up": "#crafter_side_90",
"north": "#crafter_side_270",
"east": "#crafter_front",
"south": "#crafter_side_90",
"west": "refinedstorage:blocks/crafter_bottom"
}
}, },
"south": { "south": {
"y": 180 "textures": {
"down": "refinedstorage:blocks/crafter_bottom",
"up": "#crafter_side_180",
"north": "refinedstorage:blocks/crafter_bottom",
"east": "#crafter_side_270",
"south": "#crafter_front",
"west": "#crafter_side_90"
}
}, },
"west": { "west": {
"y": 270 "textures": {
"down": "refinedstorage:blocks/crafter_bottom",
"up": "#crafter_side_270",
"north": "#crafter_side_90",
"east": "refinedstorage:blocks/crafter_bottom",
"south": "#crafter_side_270",
"west": "#crafter_front"
}
}, },
"up": { "up": {
"x": 270 "textures": {
"down": "refinedstorage:blocks/crafter_bottom",
"up": "#crafter_front",
"north": "#crafter_side",
"east": "#crafter_side",
"south": "#crafter_side",
"west": "#crafter_side"
}
}, },
"down": { "down": {
"x": 90 "textures": {
"down": "#crafter_front",
"up": "refinedstorage:blocks/crafter_bottom",
"north": "#crafter_side_180",
"east": "#crafter_side_180",
"south": "#crafter_side_180",
"west": "#crafter_side_180"
}
} }
} }
} }

View File

@@ -1,23 +1,28 @@
{ {
"forge_marker": 1, "forge_marker": 1,
"defaults": { "defaults": {
"model": "orientable", "model": "cube",
"textures": { "textures": {
"side": "refinedstorage:blocks/side", "particle": "refinedstorage:blocks/crafting_monitor_front",
"top": "refinedstorage:blocks/side", "north": "refinedstorage:blocks/crafting_monitor_front",
"front": "refinedstorage:blocks/crafting_monitor_disconnected" "east": "refinedstorage:blocks/crafting_monitor_left",
"south": "refinedstorage:blocks/crafting_monitor_back",
"west": "refinedstorage:blocks/crafting_monitor_right",
"up": "refinedstorage:blocks/crafting_monitor_top",
"down": "refinedstorage:blocks/bottom"
} }
}, },
"variants": { "variants": {
"inventory": [ "inventory": [
{ {
"transform": "forge:default-block",
"y": 0 "y": 0
} }
], ],
"connected": { "connected": {
"true": { "true": {
"textures": { "textures": {
"front": "refinedstorage:blocks/crafting_monitor_connected" "north": "refinedstorage:blocks/crafting_monitor_connected_front"
} }
}, },
"false": { "false": {

View File

@@ -4,8 +4,8 @@
"textures": { "textures": {
"all": "refinedstorage:blocks/cable", "all": "refinedstorage:blocks/cable",
"particle": "refinedstorage:blocks/cable", "particle": "refinedstorage:blocks/cable",
"front": "refinedstorage:blocks/destructor", "front": "refinedstorage:blocks/destructor_on",
"line": "refinedstorage:blocks/cable_part" "line": "refinedstorage:blocks/importer_exporter_external_storage"
}, },
"model": "refinedstorage:cable_core", "model": "refinedstorage:cable_core",
"uvlock": true "uvlock": true
@@ -17,12 +17,6 @@
"transform": "forge:default-block" "transform": "forge:default-block"
} }
], ],
"connected": {
"true": {
},
"false": {
}
},
"direction": { "direction": {
"north": { "north": {
"submodel": "refinedstorage:constructor_destructor_north" "submodel": "refinedstorage:constructor_destructor_north"

View File

@@ -1,11 +1,15 @@
{ {
"forge_marker": 1, "forge_marker": 1,
"defaults": { "defaults": {
"model": "orientable", "model": "cube",
"textures": { "textures": {
"side": "refinedstorage:blocks/side", "particle": "refinedstorage:blocks/disk_drive_0",
"top": "refinedstorage:blocks/side", "down": "refinedstorage:blocks/disk_drive_bottom",
"front": "refinedstorage:blocks/disk_drive_0" "up": "refinedstorage:blocks/disk_drive_top",
"north": "refinedstorage:blocks/disk_drive_0",
"east": "refinedstorage:blocks/disk_drive_side",
"south": "refinedstorage:blocks/disk_drive_side",
"west": "refinedstorage:blocks/disk_drive_side"
} }
}, },
"variants": { "variants": {
@@ -65,42 +69,42 @@
"stored": { "stored": {
"0": { "0": {
"textures": { "textures": {
"front": "refinedstorage:blocks/disk_drive_0" "north": "refinedstorage:blocks/disk_drive_0"
} }
}, },
"1": { "1": {
"textures": { "textures": {
"front": "refinedstorage:blocks/disk_drive_1" "north": "refinedstorage:blocks/disk_drive_0"
} }
}, },
"2": { "2": {
"textures": { "textures": {
"front": "refinedstorage:blocks/disk_drive_2" "north": "refinedstorage:blocks/disk_drive_0"
} }
}, },
"3": { "3": {
"textures": { "textures": {
"front": "refinedstorage:blocks/disk_drive_3" "north": "refinedstorage:blocks/disk_drive_0"
} }
}, },
"4": { "4": {
"textures": { "textures": {
"front": "refinedstorage:blocks/disk_drive_4" "north": "refinedstorage:blocks/disk_drive_0"
} }
}, },
"5": { "5": {
"textures": { "textures": {
"front": "refinedstorage:blocks/disk_drive_5" "north": "refinedstorage:blocks/disk_drive_0"
} }
}, },
"6": { "6": {
"textures": { "textures": {
"front": "refinedstorage:blocks/disk_drive_6" "north": "refinedstorage:blocks/disk_drive_0"
} }
}, },
"7": { "7": {
"textures": { "textures": {
"front": "refinedstorage:blocks/disk_drive_7" "north": "refinedstorage:blocks/disk_drive_0"
} }
} }
}, },

View File

@@ -5,7 +5,7 @@
"textures": { "textures": {
"side": "refinedstorage:blocks/side", "side": "refinedstorage:blocks/side",
"top": "refinedstorage:blocks/side", "top": "refinedstorage:blocks/side",
"front": "refinedstorage:blocks/disk_manipulator" "front": "refinedstorage:blocks/disk_manipulator_disconnected"
} }
}, },
"variants": { "variants": {
@@ -16,6 +16,9 @@
], ],
"connected": { "connected": {
"true": { "true": {
"textures": {
"front": "refinedstorage:blocks/disk_manipulator"
}
}, },
"false": { "false": {
} }

View File

@@ -4,7 +4,7 @@
"textures": { "textures": {
"all": "refinedstorage:blocks/cable", "all": "refinedstorage:blocks/cable",
"particle": "refinedstorage:blocks/cable", "particle": "refinedstorage:blocks/cable",
"line": "refinedstorage:blocks/cable_part" "line": "refinedstorage:blocks/importer_exporter_external_storage"
}, },
"model": "refinedstorage:cable_core", "model": "refinedstorage:cable_core",
"uvlock": true "uvlock": true

View File

@@ -4,7 +4,7 @@
"textures": { "textures": {
"all": "refinedstorage:blocks/cable", "all": "refinedstorage:blocks/cable",
"particle": "refinedstorage:blocks/cable", "particle": "refinedstorage:blocks/cable",
"line": "refinedstorage:blocks/cable_part" "line": "refinedstorage:blocks/importer_exporter_external_storage"
}, },
"model": "refinedstorage:cable_core", "model": "refinedstorage:cable_core",
"uvlock": true "uvlock": true

View File

@@ -1,49 +1,60 @@
{ {
"forge_marker": 1, "forge_marker": 1,
"defaults": { "defaults": {
"model": "orientable", "model": "cube",
"textures": { "textures": {
"side": "refinedstorage:blocks/side", "particle": "refinedstorage:blocks/side",
"top": "refinedstorage:blocks/side", "north": "refinedstorage:blocks/grid_disconnected",
"front": "refinedstorage:blocks/grid_disconnected" "east": "refinedstorage:blocks/grid_left",
"south": "refinedstorage:blocks/grid_back",
"west": "refinedstorage:blocks/grid_right",
"up": "refinedstorage:blocks/grid_top",
"down": "refinedstorage:blocks/bottom"
} }
}, },
"variants": { "variants": {
"connected": { "connected": {
"true": { "true": {
"textures": { "textures": {
"front_fluid_grid": "refinedstorage:blocks/fluid_grid_connected", "north_normal": "refinedstorage:blocks/grid_front_connected",
"front_other": "refinedstorage:blocks/grid_connected" "north_crafting": "refinedstorage:blocks/grid_crafting_front_connected",
"north_pattern": "refinedstorage:blocks/grid_pattern_front_connected",
"north_fluid": "refinedstorage:blocks/grid_fluid_front_connected"
} }
}, },
"false": { "false": {
"textures": { "textures": {
"front_fluid_grid": "refinedstorage:blocks/fluid_grid_disconnected", "north_normal": "refinedstorage:blocks/grid_front",
"front_other": "refinedstorage:blocks/grid_disconnected" "north_crafting": "refinedstorage:blocks/grid_crafting_front",
"north_pattern": "refinedstorage:blocks/grid_pattern_front",
"north_fluid": "refinedstorage:blocks/grid_fluid_front"
} }
} }
}, },
"type": { "type": {
"normal": { "normal": {
"textures": { "textures": {
"front": "#front_other" "north": "#north_normal"
} }
}, },
"crafting": { "crafting": {
"textures": { "textures": {
"front": "#front_other" "north": "#north_crafting"
} }
}, },
"pattern": { "pattern": {
"textures": { "textures": {
"front": "#front_other" "north": "#north_pattern"
} }
}, },
"fluid": { "fluid": {
"textures": { "textures": {
"front": "#front_fluid_grid", "north": "#north_fluid",
"side": "refinedstorage:blocks/fluid_grid_side", "east": "refinedstorage:blocks/grid_fluid_left",
"top": "refinedstorage:blocks/fluid_grid_side" "south": "refinedstorage:blocks/grid_fluid_back",
"west": "refinedstorage:blocks/grid_fluid_right",
"up": "refinedstorage:blocks/grid_fluid_top",
"down": "refinedstorage:blocks/bottom"
} }
} }
}, },

View File

@@ -4,7 +4,7 @@
"textures": { "textures": {
"all": "refinedstorage:blocks/cable", "all": "refinedstorage:blocks/cable",
"particle": "refinedstorage:blocks/cable", "particle": "refinedstorage:blocks/cable",
"line": "refinedstorage:blocks/cable_part" "line": "refinedstorage:blocks/importer_exporter_external_storage"
}, },
"model": "refinedstorage:cable_core", "model": "refinedstorage:cable_core",
"uvlock": true "uvlock": true

View File

@@ -3,7 +3,7 @@
"defaults": { "defaults": {
"model": "cube_all", "model": "cube_all",
"textures": { "textures": {
"all": "refinedstorage:blocks/side" "all": "refinedstorage:blocks/casing"
} }
}, },
"variants": { "variants": {

View File

@@ -15,7 +15,8 @@
"variants": { "variants": {
"inventory": [ "inventory": [
{ {
"transform": "forge:default-block" "transform": "forge:default-block",
"y": 0
} }
], ],
"normal": { "normal": {

View File

@@ -1,5 +1,8 @@
{ {
"__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)",
"textures": {
"0": "refinedstorage:blocks/cable_new"
},
"elements": [ "elements": [
{ {
"name": "Core", "name": "Core",
@@ -15,57 +18,57 @@
], ],
"faces": { "faces": {
"north": { "north": {
"texture": "#all", "texture": "#0",
"uv": [ "uv": [
4.0, 6.0,
4.0, 6.0,
8.0, 10.0,
8.0 10.0
] ]
}, },
"east": { "east": {
"texture": "#all", "texture": "#0",
"uv": [ "uv": [
0.0, 6.0,
4.0, 6.0,
4.0, 10.0,
8.0 10.0
] ]
}, },
"south": { "south": {
"texture": "#all", "texture": "#0",
"uv": [ "uv": [
12.0, 6.0,
4.0, 6.0,
16.0, 10.0,
8.0 10.0
] ]
}, },
"west": { "west": {
"texture": "#all", "texture": "#0",
"uv": [ "uv": [
8.0, 6.0,
4.0, 6.0,
12.0, 10.0,
8.0 10.0
] ]
}, },
"up": { "up": {
"texture": "#all", "texture": "#0",
"uv": [ "uv": [
8.0, 6.0,
4.0, 6.0,
4.0, 10.0,
0.0 10.0
] ]
}, },
"down": { "down": {
"texture": "#all", "texture": "#0",
"uv": [ "uv": [
12.0, 6.0,
0.0, 6.0,
8.0, 10.0,
4.0 10.0
] ]
} }
} }
@@ -84,58 +87,60 @@
], ],
"faces": { "faces": {
"north": { "north": {
"texture": "#all", "texture": "#0",
"uv": [ "uv": [
4.0, 0.0,
4.0, 6.0,
8.0, 6.0,
8.0 10.0
] ]
}, },
"east": { "east": {
"texture": "#all", "texture": "#0",
"uv": [ "uv": [
0.0, 6.0,
4.0, 6.0,
4.0, 10.0,
8.0 10.0
] ]
}, },
"south": { "south": {
"texture": "#all", "texture": "#0",
"uv": [ "uv": [
12.0, 10.0,
4.0, 6.0,
16.0, 16.0,
8.0 10.0
] ]
}, },
"west": { "west": {
"texture": "#all", "texture": "#0",
"uv": [ "uv": [
8.0, 6.0,
4.0, 6.0,
12.0, 10.0,
8.0 10.0
] ]
}, },
"up": { "up": {
"texture": "#all", "texture": "#0",
"uv": [ "uv": [
8.0, 6.0,
4.0, 6.0,
4.0, 10.0,
0.0 0.0
] ],
"rotation": 270
}, },
"down": { "down": {
"texture": "#all", "texture": "#0",
"uv": [ "uv": [
12.0, 6.0,
0.0, 10.0,
8.0, 10.0,
4.0 16.0
] ],
"rotation": 270
} }
} }
}, },
@@ -153,58 +158,60 @@
], ],
"faces": { "faces": {
"north": { "north": {
"texture": "#all", "texture": "#0",
"uv": [ "uv": [
4.0, 10.0,
4.0, 6.0,
8.0, 16.0,
8.0 10.0
] ]
}, },
"east": { "east": {
"texture": "#all", "texture": "#0",
"uv": [ "uv": [
0.0, 6.0,
4.0, 6.0,
4.0, 10.0,
8.0 10.0
] ]
}, },
"south": { "south": {
"texture": "#all", "texture": "#0",
"uv": [ "uv": [
12.0, 0.0,
4.0, 6.0,
16.0, 6.0,
8.0 10.0
] ]
}, },
"west": { "west": {
"texture": "#all", "texture": "#0",
"uv": [ "uv": [
8.0, 6.0,
4.0, 6.0,
12.0, 10.0,
8.0 10.0
] ]
}, },
"up": { "up": {
"texture": "#all", "texture": "#0",
"uv": [ "uv": [
8.0, 10.0,
4.0, 6.0,
4.0, 6.0,
0.0 0.0
] ],
"rotation": 90
}, },
"down": { "down": {
"texture": "#all", "texture": "#0",
"uv": [ "uv": [
12.0, 6.0,
0.0, 10.0,
8.0, 10.0,
4.0 16.0
] ],
"rotation": 90
} }
} }
} }

View File

@@ -1,5 +1,8 @@
{ {
"__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)",
"textures": {
"0": "refinedstorage:blocks/cable_new"
},
"elements": [ "elements": [
{ {
"name": "Core", "name": "Core",
@@ -15,57 +18,57 @@
], ],
"faces": { "faces": {
"north": { "north": {
"texture": "#all", "texture": "#0",
"uv": [ "uv": [
4.0, 6.0,
4.0, 6.0,
8.0, 10.0,
8.0 10.0
] ]
}, },
"east": { "east": {
"texture": "#all", "texture": "#0",
"uv": [ "uv": [
0.0, 6.0,
4.0, 6.0,
4.0, 10.0,
8.0 10.0
] ]
}, },
"south": { "south": {
"texture": "#all", "texture": "#0",
"uv": [ "uv": [
12.0, 6.0,
4.0, 6.0,
16.0, 10.0,
8.0 10.0
] ]
}, },
"west": { "west": {
"texture": "#all", "texture": "#0",
"uv": [ "uv": [
8.0, 6.0,
4.0, 6.0,
12.0, 10.0,
8.0 10.0
] ]
}, },
"up": { "up": {
"texture": "#all", "texture": "#0",
"uv": [ "uv": [
8.0, 6.0,
4.0, 6.0,
4.0, 10.0,
0.0 10.0
] ]
}, },
"down": { "down": {
"texture": "#all", "texture": "#0",
"uv": [ "uv": [
12.0, 6.0,
0.0, 6.0,
8.0, 10.0,
4.0 10.0
] ]
} }
} }

View File

@@ -1,5 +1,8 @@
{ {
"__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)",
"textures": {
"0": "refinedstorage:blocks/cable_new"
},
"elements": [ "elements": [
{ {
"name": "Down", "name": "Down",
@@ -15,57 +18,57 @@
], ],
"faces": { "faces": {
"north": { "north": {
"texture": "#all", "texture": "#0",
"uv": [ "uv": [
4.0, 6.0,
4.0, 10.0,
8.0, 10.0,
8.0 16.0
] ]
}, },
"east": { "east": {
"texture": "#all", "texture": "#0",
"uv": [ "uv": [
0.0, 6.0,
4.0, 10.0,
4.0, 10.0,
8.0 16.0
] ]
}, },
"south": { "south": {
"texture": "#all", "texture": "#0",
"uv": [ "uv": [
12.0, 6.0,
4.0, 10.0,
16.0, 10.0,
8.0 16.0
] ]
}, },
"west": { "west": {
"texture": "#all", "texture": "#0",
"uv": [ "uv": [
8.0, 6.0,
4.0, 10.0,
12.0, 10.0,
8.0 16.0
] ]
}, },
"up": { "up": {
"texture": "#all", "texture": "#0",
"uv": [ "uv": [
8.0, 6.0,
4.0, 6.0,
4.0, 10.0,
0.0 10.0
] ]
}, },
"down": { "down": {
"texture": "#all", "texture": "#0",
"uv": [ "uv": [
12.0, 6.0,
0.0, 6.0,
8.0, 10.0,
4.0 10.0
] ]
} }
} }

View File

@@ -1,5 +1,8 @@
{ {
"__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)",
"textures": {
"0": "refinedstorage:blocks/cable_new"
},
"elements": [ "elements": [
{ {
"name": "East", "name": "East",
@@ -15,57 +18,57 @@
], ],
"faces": { "faces": {
"north": { "north": {
"texture": "#all", "texture": "#0",
"uv": [ "uv": [
4.0, 0.0,
4.0, 6.0,
8.0, 6.0,
8.0 10.0
] ]
}, },
"east": { "east": {
"texture": "#all", "texture": "#0",
"uv": [ "uv": [
0.0, 6.0,
4.0, 6.0,
4.0, 10.0,
8.0 10.0
] ]
}, },
"south": { "south": {
"texture": "#all", "texture": "#0",
"uv": [ "uv": [
12.0, 10.0,
4.0, 6.0,
16.0, 16.0,
8.0 10.0
] ]
}, },
"west": { "west": {
"texture": "#all", "texture": "#0",
"uv": [ "uv": [
8.0, 6.0,
4.0, 6.0,
12.0, 10.0,
8.0 10.0
] ]
}, },
"up": { "up": {
"texture": "#all", "texture": "#0",
"uv": [ "uv": [
8.0, 10.0,
4.0, 6.0,
4.0, 16.0,
0.0 10.0
] ]
}, },
"down": { "down": {
"texture": "#all", "texture": "#0",
"uv": [ "uv": [
12.0, 10.0,
0.0, 6.0,
8.0, 16.0,
4.0 10.0
] ]
} }
} }

View File

@@ -1,5 +1,8 @@
{ {
"__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)",
"textures": {
"0": "refinedstorage:blocks/cable_new"
},
"elements": [ "elements": [
{ {
"name": "North", "name": "North",
@@ -15,57 +18,57 @@
], ],
"faces": { "faces": {
"north": { "north": {
"texture": "#all", "texture": "#0",
"uv": [ "uv": [
4.0, 6.0,
4.0, 6.0,
8.0, 10.0,
8.0 10.0
] ]
}, },
"east": { "east": {
"texture": "#all", "texture": "#0",
"uv": [ "uv": [
0.0, 10.0,
4.0, 6.0,
4.0, 16.0,
8.0 10.0
] ]
}, },
"south": { "south": {
"texture": "#all", "texture": "#0",
"uv": [ "uv": [
12.0, 6.0,
4.0, 6.0,
16.0, 10.0,
8.0 10.0
] ]
}, },
"west": { "west": {
"texture": "#all", "texture": "#0",
"uv": [ "uv": [
8.0, 0.0,
4.0, 6.0,
12.0, 6.0,
8.0 10.0
] ]
}, },
"up": { "up": {
"texture": "#all", "texture": "#0",
"uv": [ "uv": [
8.0, 6.0,
4.0, 0.0,
4.0, 10.0,
0.0 6.0
] ]
}, },
"down": { "down": {
"texture": "#all", "texture": "#0",
"uv": [ "uv": [
12.0, 6.0,
0.0, 10.0,
8.0, 10.0,
4.0 16.0
] ]
} }
} }

View File

@@ -1,5 +1,8 @@
{ {
"__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)",
"textures": {
"0": "refinedstorage:blocks/cable_new"
},
"elements": [ "elements": [
{ {
"name": "South", "name": "South",
@@ -15,57 +18,57 @@
], ],
"faces": { "faces": {
"north": { "north": {
"texture": "#all", "texture": "#0",
"uv": [ "uv": [
4.0, 6.0,
4.0, 6.0,
8.0, 10.0,
8.0 10.0
] ]
}, },
"east": { "east": {
"texture": "#all", "texture": "#0",
"uv": [ "uv": [
0.0, 0.0,
4.0, 6.0,
4.0, 6.0,
8.0 10.0
] ]
}, },
"south": { "south": {
"texture": "#all", "texture": "#0",
"uv": [ "uv": [
12.0, 6.0,
4.0, 6.0,
16.0, 10.0,
8.0 10.0
] ]
}, },
"west": { "west": {
"texture": "#all", "texture": "#0",
"uv": [ "uv": [
8.0, 10.0,
4.0, 6.0,
12.0, 16.0,
8.0 10.0
] ]
}, },
"up": { "up": {
"texture": "#all", "texture": "#0",
"uv": [ "uv": [
8.0, 6.0,
4.0, 10.0,
4.0, 10.0,
0.0 16.0
] ]
}, },
"down": { "down": {
"texture": "#all", "texture": "#0",
"uv": [ "uv": [
12.0, 6.0,
0.0, 0.0,
8.0, 10.0,
4.0 6.0
] ]
} }
} }

View File

@@ -1,5 +1,8 @@
{ {
"__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)",
"textures": {
"0": "refinedstorage:blocks/cable_new"
},
"elements": [ "elements": [
{ {
"name": "Up", "name": "Up",
@@ -15,57 +18,57 @@
], ],
"faces": { "faces": {
"north": { "north": {
"texture": "#all", "texture": "#0",
"uv": [ "uv": [
4.0, 6.0,
4.0, 0.0,
8.0, 10.0,
8.0 6.0
] ]
}, },
"east": { "east": {
"texture": "#all", "texture": "#0",
"uv": [ "uv": [
0.0, 6.0,
4.0, 16.0,
4.0, 10.0,
8.0 10.0
] ]
}, },
"south": { "south": {
"texture": "#all", "texture": "#0",
"uv": [ "uv": [
12.0, 6.0,
4.0, 0.0,
16.0, 10.0,
8.0 6.0
] ]
}, },
"west": { "west": {
"texture": "#all", "texture": "#0",
"uv": [ "uv": [
8.0, 6.0,
4.0, 16.0,
12.0, 10.0,
8.0 10.0
] ]
}, },
"up": { "up": {
"texture": "#all", "texture": "#0",
"uv": [ "uv": [
8.0, 6.0,
4.0, 6.0,
4.0, 10.0,
0.0 10.0
] ]
}, },
"down": { "down": {
"texture": "#all", "texture": "#0",
"uv": [ "uv": [
12.0, 6.0,
0.0, 6.0,
8.0, 10.0,
4.0 10.0
] ]
} }
} }

View File

@@ -1,5 +1,8 @@
{ {
"__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)",
"textures": {
"0": "refinedstorage:blocks/cable_new"
},
"elements": [ "elements": [
{ {
"name": "West", "name": "West",
@@ -15,58 +18,60 @@
], ],
"faces": { "faces": {
"north": { "north": {
"texture": "#all", "texture": "#0",
"uv": [ "uv": [
4.0, 10.0,
4.0, 6.0,
8.0, 16.0,
8.0 10.0
] ]
}, },
"east": { "east": {
"texture": "#all", "texture": "#0",
"uv": [ "uv": [
0.0, 6.0,
4.0, 6.0,
4.0, 10.0,
8.0 10.0
] ]
}, },
"south": { "south": {
"texture": "#all", "texture": "#0",
"uv": [ "uv": [
12.0, 0.0,
4.0, 6.0,
16.0, 6.0,
8.0 10.0
] ]
}, },
"west": { "west": {
"texture": "#all", "texture": "#0",
"uv": [ "uv": [
8.0, 6.0,
4.0, 6.0,
12.0, 10.0,
8.0 10.0
] ]
}, },
"up": { "up": {
"texture": "#all", "texture": "#0",
"uv": [ "uv": [
8.0, 10.0,
4.0, 6.0,
4.0, 6.0,
0.0 0.0
] ],
"rotation": 90
}, },
"down": { "down": {
"texture": "#all", "texture": "#0",
"uv": [ "uv": [
12.0, 10.0,
0.0, 10.0,
8.0, 6.0,
4.0 16.0
] ],
"rotation": 90
} }
} }
} }

View File

@@ -1,7 +1,5 @@
{ {
"__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)",
"textures": {
},
"elements": [ "elements": [
{ {
"name": "Line1", "name": "Line1",

View File

@@ -1,7 +1,5 @@
{ {
"__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)",
"textures": {
},
"elements": [ "elements": [
{ {
"name": "Line1", "name": "Line1",

View File

@@ -1,7 +1,5 @@
{ {
"__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)",
"textures": {
},
"elements": [ "elements": [
{ {
"name": "Line1", "name": "Line1",

View File

@@ -1,7 +1,5 @@
{ {
"__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)",
"textures": {
},
"elements": [ "elements": [
{ {
"name": "Line1", "name": "Line1",

View File

@@ -1,7 +1,5 @@
{ {
"__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)",
"textures": {
},
"elements": [ "elements": [
{ {
"name": "Line1", "name": "Line1",

View File

@@ -1,7 +1,5 @@
{ {
"__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)",
"textures": {
},
"elements": [ "elements": [
{ {
"name": "Line1", "name": "Line1",

Binary file not shown.

Before

Width:  |  Height:  |  Size: 799 B

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 795 B

After

Width:  |  Height:  |  Size: 17 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 784 B

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 806 B

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 803 B

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 813 B

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 805 B

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 769 B

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 648 B

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 202 B

After

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 736 B

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.4 KiB

View File

@@ -0,0 +1,19 @@
{
"animation": {
"frametime": 2,
"frames": [
0,
1,
2,
3,
4,
5,
6,
7,
8,
9,
10,
11
]
}
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 780 B

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 815 B

After

Width:  |  Height:  |  Size: 3.4 KiB

View File

@@ -0,0 +1,19 @@
{
"animation": {
"frametime": 1,
"frames": [
0,
1,
2,
3,
4,
5,
6,
7,
8,
9,
10,
11
]
}
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 817 B

After

Width:  |  Height:  |  Size: 3.4 KiB

View File

@@ -0,0 +1,19 @@
{
"animation": {
"frametime": 2,
"frames": [
0,
1,
2,
3,
4,
5,
6,
7,
8,
9,
10,
11
]
}
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 805 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 802 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 798 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 798 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 799 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.6 KiB

View File

@@ -0,0 +1,19 @@
{
"animation": {
"frametime": 2,
"frames": [
0,
1,
2,
3,
4,
5,
6,
7,
8,
9,
10,
11
]
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 766 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 775 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 735 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 714 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 735 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 717 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 758 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 767 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 761 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 777 B

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 738 B

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 818 B

After

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 809 B

After

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 664 B

After

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.8 KiB

View File

@@ -0,0 +1,27 @@
{
"animation": {
"frametime": 1,
"frames": [
0,
1,
2,
3,
4,
5,
6,
7,
8,
9,
10,
11,
12,
13,
14,
15,
16,
17,
18,
19
]
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

Some files were not shown because too many files have changed in this diff Show More