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

Added model for detector

Browse Source
This commit is contained in:
Raoul Van den Berge
2016-07-09 19:08:33 +02:00
parent a1f212dc4d
commit 63ac5985b8
21 changed files with 221 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/refinedstorage/RefinedStorageBlocks.java
View File

@@ -22,5 +22,4 @@ public final class RefinedStorageBlocks {
public static final BlockWirelessTransmitter WIRELESS_TRANSMITTER = new BlockWirelessTransmitter();
public static final BlockCrafter CRAFTER = new BlockCrafter();
public static final BlockProcessingPatternEncoder PROCESSING_PATTERN_ENCODER = new BlockProcessingPatternEncoder();
public static final BlockQuartzEnrichedIron QUARTZ_ENRICHED_IRON = new BlockQuartzEnrichedIron();
}

20
src/main/java/refinedstorage/block/BlockDetector.java
View File

@@ -42,13 +42,7 @@ public class BlockDetector extends BlockNode {
@Override
public int getWeakPower(IBlockState state, IBlockAccess world, BlockPos pos, EnumFacing side) {
TileDetector detector = (TileDetector) world.getTileEntity(pos);
if (detector.getDirection() == side.getOpposite()) {
return detector.isPowered() ? 15 : 0;
}
return 0;
return ((TileDetector) world.getTileEntity(pos)).isPowered() ? 15 : 0;
}
@Override
@@ -70,8 +64,18 @@ public class BlockDetector extends BlockNode {
return true;
}
@Override
public boolean isOpaqueCube(IBlockState state) {
return false;
}
@Override
public boolean isFullCube(IBlockState state) {
return false;
}
@Override
public EnumPlacementType getPlacementType() {
return EnumPlacementType.ANY;
return null;
}
}

12
src/main/java/refinedstorage/block/BlockQuartzEnrichedIron.java
View File

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

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

@@ -137,6 +137,5 @@ public class ClientProxy extends CommonProxy {
ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.STORAGE), EnumStorageType.TYPE_16K.getId(), new ModelResourceLocation("refinedstorage:storage", "type=16k"));
ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.STORAGE), EnumStorageType.TYPE_64K.getId(), new ModelResourceLocation("refinedstorage:storage", "type=64k"));
ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.STORAGE), EnumStorageType.TYPE_CREATIVE.getId(), new ModelResourceLocation("refinedstorage:storage", "type=creative"));
ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.QUARTZ_ENRICHED_IRON), 0, new ModelResourceLocation("refinedstorage:quartz_enriched_iron_block", "inventory"));
}
}

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

@@ -98,7 +98,6 @@ public class CommonProxy {
registerBlock(RefinedStorageBlocks.INTERFACE);
registerBlock(RefinedStorageBlocks.WIRELESS_TRANSMITTER);
registerBlock(RefinedStorageBlocks.MACHINE_CASING);
registerBlock(RefinedStorageBlocks.QUARTZ_ENRICHED_IRON);
registerItem(RefinedStorageItems.QUARTZ_ENRICHED_IRON);
registerItem(RefinedStorageItems.STORAGE_DISK);
@@ -134,16 +133,6 @@ public class CommonProxy {
'Q', new ItemStack(Items.QUARTZ)
);
GameRegistry.addShapelessRecipe(new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON, 9), new ItemStack(RefinedStorageBlocks.QUARTZ_ENRICHED_IRON));
// Quartz Enriched Iron Block
GameRegistry.addRecipe(new ItemStack(RefinedStorageBlocks.QUARTZ_ENRICHED_IRON),
"EEE",
"EEE",
"EEE",
'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON)
);
// Machine Casing
GameRegistry.addRecipe(new ItemStack(RefinedStorageBlocks.MACHINE_CASING),
"EEE",