Updated textures, added block of quartz enriched iron

This commit is contained in:
raoulvdberge
2017-01-23 22:15:06 +01:00
parent d47feef78d
commit 6b995d3d62
43 changed files with 66 additions and 3 deletions

View File

@@ -30,4 +30,5 @@ public final class RSBlocks {
public static final BlockReader READER = new BlockReader();
public static final BlockWriter WRITER = new BlockWriter();
public static final BlockSecurityManager SECURITY_MANAGER = new BlockSecurityManager();
public static final BlockQuartzEnrichedIron QUARTZ_ENRICHED_IRON = new BlockQuartzEnrichedIron();
}

View File

@@ -0,0 +1,12 @@
package com.raoulvdberge.refinedstorage.block;
public class BlockQuartzEnrichedIron extends BlockBase {
public BlockQuartzEnrichedIron() {
super("quartz_enriched_iron_block");
}
@Override
public EnumPlacementType getPlacementType() {
return null;
}
}

View File

@@ -204,6 +204,7 @@ public class ProxyClient extends ProxyCommon {
ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RSBlocks.FLUID_STORAGE), EnumFluidStorageType.TYPE_CREATIVE.getId(), new ModelResourceLocation("refinedstorage:fluid_storage", "type=creative"));
ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RSBlocks.DISK_MANIPULATOR), 0, new ModelResourceLocation("refinedstorage:disk_manipulator", "inventory"));
ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RSBlocks.SECURITY_MANAGER), 0, new ModelResourceLocation("refinedstorage:security_manager", "inventory"));
ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RSBlocks.QUARTZ_ENRICHED_IRON), 0, new ModelResourceLocation("refinedstorage:quartz_enriched_iron_block", "inventory"));
ModelLoaderRegistry.registerLoader(new ICustomModelLoader() {
@Override

View File

@@ -188,6 +188,7 @@ public class ProxyCommon {
registerBlock(RSBlocks.FLUID_INTERFACE);
registerBlock(RSBlocks.WIRELESS_TRANSMITTER);
registerBlock(RSBlocks.MACHINE_CASING);
registerBlock(RSBlocks.QUARTZ_ENRICHED_IRON);
registerBlock(RSBlocks.NETWORK_TRANSMITTER);
registerBlock(RSBlocks.NETWORK_RECEIVER);
registerBlock(RSBlocks.DISK_MANIPULATOR);
@@ -237,6 +238,16 @@ public class ProxyCommon {
'Q', new ItemStack(Items.QUARTZ)
);
GameRegistry.addShapelessRecipe(new ItemStack(RSItems.QUARTZ_ENRICHED_IRON, 9), new ItemStack(RSBlocks.QUARTZ_ENRICHED_IRON));
// Block of Quartz Enriched Iron
GameRegistry.addShapedRecipe(new ItemStack(RSBlocks.QUARTZ_ENRICHED_IRON),
"EEE",
"EEE",
"EEE",
'E', new ItemStack(RSItems.QUARTZ_ENRICHED_IRON)
);
// Machine Casing
GameRegistry.addRecipe(new ItemStack(RSBlocks.MACHINE_CASING),
"EEE",

View File

@@ -0,0 +1,19 @@
{
"forge_marker": 1,
"defaults": {
"model": "cube_all",
"textures": {
"all": "refinedstorage:blocks/quartz_enriched_iron_block"
}
},
"variants": {
"inventory": [
{
"transform": "forge:default-block"
}
],
"normal": {
"model": "cube_all"
}
}
}

View File

@@ -19,6 +19,9 @@
],
"connected": {
"true": {
"textures": {
"front": "refinedstorage:blocks/reader_connected"
}
},
"false": {
}

View File

@@ -1,9 +1,15 @@
{
"forge_marker": 1,
"defaults": {
"model": "cube_all",
"model": "cube",
"textures": {
"all": "refinedstorage:blocks/machine_casing"
"particle": "refinedstorage:blocks/security_manager_front_disconnected",
"down": "refinedstorage:blocks/security_manager_bottom",
"up": "refinedstorage:blocks/security_manager_top_disconnected",
"north": "refinedstorage:blocks/security_manager_front_disconnected",
"east": "refinedstorage:blocks/security_manager_left_disconnected",
"south": "refinedstorage:blocks/security_manager_back_disconnected",
"west": "refinedstorage:blocks/security_manager_right_disconnected"
}
},
"variants": {
@@ -14,6 +20,13 @@
],
"connected": {
"true": {
"textures": {
"up": "refinedstorage:blocks/security_manager_top_connected",
"north": "refinedstorage:blocks/security_manager_front_connected",
"east": "refinedstorage:blocks/security_manager_left_connected",
"south": "refinedstorage:blocks/security_manager_back_connected",
"west": "refinedstorage:blocks/security_manager_right_connected"
}
},
"false": {
}

View File

@@ -19,6 +19,9 @@
],
"connected": {
"true": {
"textures": {
"front": "refinedstorage:blocks/writer_connected"
}
},
"false": {
}

View File

@@ -215,6 +215,7 @@ block.refinedstorage:fluid_storage.4.name=Creative Fluid Storage Block
block.refinedstorage:reader.name=Reader
block.refinedstorage:writer.name=Writer
block.refinedstorage:security_manager.name=Security Manager
block.refinedstorage:quartz_enriched_iron_block.name=Block of Quartz Enriched Iron
item.refinedstorage:storage_disk.0.name=1k Storage Disk
item.refinedstorage:storage_disk.1.name=4k Storage Disk

View File

@@ -1,4 +1,3 @@
{
"parent": "item/generated",
"textures": {

Binary file not shown.

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 202 B

After

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.0 KiB

After

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 212 B

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.6 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.

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 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.

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 203 B

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.0 KiB

After

Width:  |  Height:  |  Size: 5.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 171 KiB

After

Width:  |  Height:  |  Size: 173 KiB