Minor rendering updates

This commit is contained in:
aidancbrady committed 2016-05-02 16:39:38 -04:00
1 parent d228841fea
commit c7e54f8d28
13 files changed
+73 -28

No files matched your search

@@ -20,7 +20,6 @@ import mekanism.common.tile.TileEntityThermalEvaporationBlock;
import mekanism.common.tile.TileEntityThermalEvaporationController;
import mekanism.common.tile.TileEntityThermalEvaporationValve;
import mekanism.common.util.LangUtils;
import net.minecraft.block.Block;
import net.minecraft.block.properties.PropertyBool;
import net.minecraft.block.properties.PropertyEnum;
@@ -103,7 +102,7 @@ public class BlockStateBasic extends BlockStateFacing
PRESSURE_DISPERSER(BasicBlock.BASIC_BLOCK_2, 6, "PressureDisperser",TileEntityPressureDisperser.class, true, Predicates.<EnumFacing>alwaysFalse(), false),
BOILER_CASING(BasicBlock.BASIC_BLOCK_2, 7, "BoilerCasing", TileEntityBoilerCasing.class, true, Predicates.<EnumFacing>alwaysFalse(), false),
BOILER_VALVE(BasicBlock.BASIC_BLOCK_2, 8, "BoilerValve", TileEntityBoilerValve.class, true, Predicates.<EnumFacing>alwaysFalse(), false),
SECURITY_DESK(BasicBlock.BASIC_BLOCK_2, 9, "SecurityDesk", TileEntitySecurityDesk.class, true, Predicates.alwaysFalse(), false);
SECURITY_DESK(BasicBlock.BASIC_BLOCK_2, 9, "SecurityDesk", TileEntitySecurityDesk.class, true, Plane.HORIZONTAL, false);
public BasicBlock blockType;
@@ -8,7 +8,8 @@
"west": "mekanism:blocks/energized_smelter/EnergizedSmelterRight",
"east": "mekanism:blocks/energized_smelter/EnergizedSmelterLeft",
"south": "mekanism:blocks/energized_smelter/EnergizedSmelterBack",
"up": "mekanism:blocks/energized_smelter/EnergizedSmelterTop"
"up": "mekanism:blocks/energized_smelter/EnergizedSmelterTop",
"down": "mekanism:blocks/energized_smelter/EnergizedSmelterBottom"
}
},
"variants": {
@@ -19,7 +20,16 @@
"west": {"y": -90}
},
"active": {
"true": {"textures": {"front": "mekanism:blocks/energized_smelter/EnergizedSmelterFrontOn"}},
"true": {
"textures": {
"front": "mekanism:blocks/energized_smelter/EnergizedSmelterFrontOn",
"west": "mekanism:blocks/energized_smelter/EnergizedSmelterRightOn",
"east": "mekanism:blocks/energized_smelter/EnergizedSmelterLeftOn",
"south": "mekanism:blocks/energized_smelter/EnergizedSmelterBackOn",
"up": "mekanism:blocks/energized_smelter/EnergizedSmelterTopOn",
"down": "mekanism:blocks/energized_smelter/EnergizedSmelterBottomOn"
}
},
"false": {}
},
"inventory": [{}]
@@ -19,7 +19,7 @@
"west": {"y": -90}
},
"active": {
"true": {"textures": {"front": "mekanism:blocks/formulaic_assemblicator/FormulaicAssemblicatorFrontOn"}},
"true": {},
"false": {}
},
"inventory": [{}]
@@ -19,7 +19,7 @@
"west": {"y": -90}
},
"active": {
"true": {"textures": {"front": "mekanism:blocks/oredictionificator/OredictionificatorFrontOn"}},
"true": {},
"false": {}
},
"inventory": [{}]
@@ -5,10 +5,11 @@
"textures": {
"sides": "mekanism:blocks/SteelCasing",
"front": "mekanism:blocks/osmium_compressor/OsmiumCompressorFront",
"west": "mekanism:blocks/osmium_compressor/OsmiumCompressorRight",
"east": "mekanism:blocks/osmium_compressor/OsmiumCompressorLeft",
"west": "mekanism:blocks/osmium_compressor/OsmiumCompressorLeft",
"east": "mekanism:blocks/osmium_compressor/OsmiumCompressorRight",
"south": "mekanism:blocks/osmium_compressor/OsmiumCompressorBack",
"up": "mekanism:blocks/osmium_compressor/OsmiumCompressorTop"
"up": "mekanism:blocks/osmium_compressor/OsmiumCompressorTop",
"down": "mekanism:blocks/osmium_compressor/OsmiumCompressorBottom"
}
},
"variants": {
@@ -19,7 +20,15 @@
"west": {"y": -90}
},
"active": {
"true": {"textures": {"front": "mekanism:blocks/osmium_compressor/OsmiumCompressorFrontOn"}},
"true": {
"textures": {
"front": "mekanism:blocks/osmium_compressor/OsmiumCompressorFrontOn",
"west": "mekanism:blocks/osmium_compressor/OsmiumCompressorLeftOn",
"east": "mekanism:blocks/osmium_compressor/OsmiumCompressorRightOn",
"south": "mekanism:blocks/osmium_compressor/OsmiumCompressorBackOn",
"up": "mekanism:blocks/osmium_compressor/OsmiumCompressorTopOn"
}
},
"false": {}
},
"inventory": [{}]
@@ -8,7 +8,8 @@
"west": "mekanism:blocks/precision_sawmill/PrecisionSawmillRight",
"east": "mekanism:blocks/precision_sawmill/PrecisionSawmillLeft",
"south": "mekanism:blocks/precision_sawmill/PrecisionSawmillBack",
"up": "mekanism:blocks/precision_sawmill/PrecisionSawmillTop"
"up": "mekanism:blocks/precision_sawmill/PrecisionSawmillTop",
"down": "mekanism:blocks/precision_sawmill/PrecisionSawmillBottom"
}
},
"variants": {
@@ -19,7 +20,15 @@
"west": {"y": -90}
},
"active": {
"true": {"textures": {"front": "mekanism:blocks/precision_sawmill/PrecisionSawmillFrontOn"}},
"true": {
"textures": {
"front": "mekanism:blocks/precision_sawmill/PrecisionSawmillFrontOn",
"west": "mekanism:blocks/precision_sawmill/PrecisionSawmillRightOn",
"east": "mekanism:blocks/precision_sawmill/PrecisionSawmillLeftOn",
"south": "mekanism:blocks/precision_sawmill/PrecisionSawmillBackOn",
"up": "mekanism:blocks/precision_sawmill/PrecisionSawmillTopOn"
}
},
"false": {}
},
"inventory": [{}]
@@ -8,7 +8,8 @@
"west": "mekanism:blocks/purification_chamber/PurificationChamberRight",
"east": "mekanism:blocks/purification_chamber/PurificationChamberLeft",
"south": "mekanism:blocks/purification_chamber/PurificationChamberBack",
"up": "mekanism:blocks/purification_chamber/PurificationChamberTop"
"up": "mekanism:blocks/purification_chamber/PurificationChamberTop",
"down": "mekanism:blocks/purification_chamber/PurificationChamberBottom"
}
},
"variants": {
@@ -18,8 +19,16 @@
"east": {"y": 90},
"west": {"y": -90}
},
"active": {
"true": {"textures": {"front": "mekanism:blocks/purification_chamber/PurificationChamberFrontOn"}},
"active": {
"true": {
"textures": {
"front": "mekanism:blocks/purification_chamber/PurificationChamberFrontOn",
"west": "mekanism:blocks/purification_chamber/PurificationChamberRightOn",
"east": "mekanism:blocks/purification_chamber/PurificationChamberLeftOn",
"south": "mekanism:blocks/purification_chamber/PurificationChamberBackOn",
"up": "mekanism:blocks/purification_chamber/PurificationChamberTopOn"
}
},
"false": {}
},
"inventory": [{}]
@@ -0,0 +1,21 @@
{
"forge_marker": 1,
"defaults": {
"model": "mekanism:security_desk"
},
"variants": {
"normal": [{}],
"facing": {
"north": {},
"south": {"y": 180},
"east": {"y": 90},
"west": {"y": -90}
},
"active": {
"true": {},
"false": {}
},
"inventory": [{}]
}
}
@@ -1,7 +0,0 @@
{
"parent": "block/cube_all",
"textures": {
"front": "mekanism:blocks/enrichment_chamber/EnrichmentChamberFront"
}
}
@@ -197,7 +197,7 @@
}
],
"textures": {
"all": "...",
"all": "mekanism:entities/Robit",
"particle": "..."
}
}
Binary file not shown.

After

Width:  |  Height:  |  Size: 2.9 KiB

@@ -1,5 +0,0 @@
{
"animation": {
"frametime": 1
}
}
Binary file not shown.

After

Width:  |  Height:  |  Size: 4.5 KiB