From 8e3d08dfd347066b279acffdfb3ad29a282a3eec Mon Sep 17 00:00:00 2001 From: Ben Spiers Date: Fri, 29 Apr 2016 00:36:29 +0100 Subject: [PATCH] Some rough model improvements (tiers not done) --- .../tileentity/RenderPersonalChest.java | 2 +- .../mekanism/common/block/BlockBasic.java | 8 ++ .../mekanism/common/block/BlockMachine.java | 117 ++++++++++-------- .../common/block/states/BlockStateBasic.java | 59 +++++---- .../blockstates/advanced_factory.json | 10 +- .../mekanism/blockstates/basic_factory.json | 10 +- .../assets/mekanism/blockstates/bin.json | 37 ++++++ .../chemical_injection_chamber.json | 8 +- .../blockstates/chemical_oxidizer.json | 8 +- .../assets/mekanism/blockstates/combiner.json | 8 +- .../assets/mekanism/blockstates/crusher.json | 8 +- .../blockstates/electrolytic_separator.json | 8 +- .../mekanism/blockstates/elite_factory.json | 10 +- .../blockstates/energized_smelter.json | 8 +- .../blockstates/enrichment_chamber.json | 14 +-- .../blockstates/formulaic_assemblicator.json | 28 +++++ .../mekanism/blockstates/fuelwood_heater.json | 37 ++++++ .../blockstates/oredictionificator.json | 28 +++++ .../blockstates/osmium_compressor.json | 8 +- .../mekanism/blockstates/personal_chest.json | 24 ++++ .../blockstates/precision_sawmill.json | 8 +- .../blockstates/purification_chamber.json | 8 +- ...ctric_chest.json => resistive_heater.json} | 9 +- .../assets/mekanism/models/block/machine.json | 18 ++- .../assets/mekanism/models/block/nothing.json | 10 +- .../models/block/resistive_heater.json | 2 +- .../blocks/models/laser_amplifier.png | Bin 2624 -> 1861 bytes .../blocks/models/laser_tractor_beam.png | Bin 2982 -> 2236 bytes .../blocks/models/resistive_heater.png | Bin 0 -> 4380 bytes 29 files changed, 369 insertions(+), 126 deletions(-) create mode 100644 src/main/resources/assets/mekanism/blockstates/bin.json create mode 100644 src/main/resources/assets/mekanism/blockstates/formulaic_assemblicator.json create mode 100644 src/main/resources/assets/mekanism/blockstates/fuelwood_heater.json create mode 100644 src/main/resources/assets/mekanism/blockstates/oredictionificator.json create mode 100644 src/main/resources/assets/mekanism/blockstates/personal_chest.json rename src/main/resources/assets/mekanism/blockstates/{electric_chest.json => resistive_heater.json} (51%) create mode 100644 src/main/resources/assets/mekanism/textures/blocks/models/resistive_heater.png diff --git a/src/main/java/mekanism/client/render/tileentity/RenderPersonalChest.java b/src/main/java/mekanism/client/render/tileentity/RenderPersonalChest.java index 38f53bd65..6e754e3cc 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderPersonalChest.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderPersonalChest.java @@ -21,7 +21,7 @@ public class RenderPersonalChest extends TileEntitySpecialRenderer= 65) { change = 1; - } - else if(height <= -65) + } else if(height <= -65) { change = 0; } @@ -338,10 +339,18 @@ public abstract class BlockMachine extends BlockContainer implements ISpecialBou { switch(side) { - case 0: change = 2; break; - case 1: change = 5; break; - case 2: change = 3; break; - case 3: change = 4; break; + case 0: + change = 2; + break; + case 1: + change = 5; + break; + case 2: + change = 3; + break; + case 3: + change = 4; + break; } } @@ -435,7 +444,7 @@ public abstract class BlockMachine extends BlockContainer implements ISpecialBou if(client.enableAmbientLighting) { TileEntity tileEntity = world.getTileEntity(pos); - + if(tileEntity instanceof IActiveState) { if(((IActiveState)tileEntity).getActive() && ((IActiveState)tileEntity).lightUpdate()) @@ -574,11 +583,11 @@ public abstract class BlockMachine extends BlockContainer implements ISpecialBou ((IFactory)stack.getItem()).setRecipeType(recipe.ordinal(), stack); list.add(stack); } - + break; case FLUID_TANK: ItemBlockMachine itemMachine = (ItemBlockMachine)item; - + for(FluidTankTier tier : FluidTankTier.values()) { ItemStack stack = new ItemStack(item, 1, type.meta); @@ -590,15 +599,18 @@ public abstract class BlockMachine extends BlockContainer implements ISpecialBou { for(Fluid f : FluidRegistry.getRegisteredFluids().values()) { - try { //Prevent bad IDs + try + { //Prevent bad IDs ItemStack filled = new ItemStack(item, 1, type.meta); itemMachine.setBaseTier(filled, BaseTier.ULTIMATE); itemMachine.setFluidStack(new FluidStack(f, itemMachine.getCapacity(filled)), filled); list.add(filled); - } catch(Exception e) {} + } catch(Exception e) + { + } } } - + break; default: list.add(new ItemStack(item, 1, type.meta)); @@ -629,17 +641,17 @@ public abstract class BlockMachine extends BlockContainer implements ISpecialBou if(entityplayer.isSneaking()) { dismantleBlock(world, pos, false); - + return true; } - + if(MekanismUtils.isBCWrench(tool)) { ((IToolWrench)tool).wrenchUsed(entityplayer, pos); } - + int change = tileEntity.facing.rotateY().ordinal(); - + if(tileEntity instanceof TileEntityLogisticalSorter) { if(!((TileEntityLogisticalSorter)tileEntity).hasInventory()) @@ -647,7 +659,7 @@ public abstract class BlockMachine extends BlockContainer implements ISpecialBou for(EnumFacing dir : EnumFacing.VALUES) { TileEntity tile = Coord4D.get(tileEntity).offset(dir).getTileEntity(world); - + if(tile instanceof IInventory) { change = dir.getOpposite().ordinal(); @@ -656,14 +668,14 @@ public abstract class BlockMachine extends BlockContainer implements ISpecialBou } } } - + tileEntity.setFacing((short)change); world.notifyNeighborsOfStateChange(pos, this); - } - else { + } else + { SecurityUtils.displayNoAccess(entityplayer); } - + return true; } } @@ -678,18 +690,18 @@ public abstract class BlockMachine extends BlockContainer implements ISpecialBou if(!entityplayer.isSneaking() && !world.isSideSolid(pos.up(), EnumFacing.DOWN)) { TileEntityPersonalChest chest = (TileEntityPersonalChest)tileEntity; - + if(SecurityUtils.canAccess(entityplayer, tileEntity)) { MekanismUtils.openPersonalChestGui((EntityPlayerMP)entityplayer, chest, null, true); - } - else { + } else + { SecurityUtils.displayNoAccess(entityplayer); } - + return true; } - + break; case FLUID_TANK: if(!entityplayer.isSneaking()) @@ -703,18 +715,18 @@ public abstract class BlockMachine extends BlockContainer implements ISpecialBou entityplayer.inventory.markDirty(); return true; } - } - else { + } else + { entityplayer.openGui(Mekanism.instance, type.guiId, world, pos.getX(), pos.getY(), pos.getZ()); } - } - else { + } else + { SecurityUtils.displayNoAccess(entityplayer); } - + return true; } - + break; case LOGISTICAL_SORTER: if(!entityplayer.isSneaking()) @@ -722,32 +734,32 @@ public abstract class BlockMachine extends BlockContainer implements ISpecialBou if(SecurityUtils.canAccess(entityplayer, tileEntity)) { LogisticalSorterGuiMessage.openServerGui(SorterGuiPacket.SERVER, 0, world, (EntityPlayerMP)entityplayer, Coord4D.get(tileEntity), -1); - } - else { + } else + { SecurityUtils.displayNoAccess(entityplayer); } - + return true; } - + break; case TELEPORTER: case QUANTUM_ENTANGLOPORTER: if(!entityplayer.isSneaking()) { String owner = ((ISecurityTile)tileEntity).getSecurity().getOwner(); - + if(owner == null || entityplayer.getName().equals(owner)) { entityplayer.openGui(Mekanism.instance, type.guiId, world, pos.getX(), pos.getY(), pos.getZ()); - } - else { + } else + { SecurityUtils.displayNoAccess(entityplayer); } - + return true; } - + break; default: if(!entityplayer.isSneaking() && type.guiId != -1) @@ -755,18 +767,18 @@ public abstract class BlockMachine extends BlockContainer implements ISpecialBou if(SecurityUtils.canAccess(entityplayer, tileEntity)) { entityplayer.openGui(Mekanism.instance, type.guiId, world, pos.getX(), pos.getY(), pos.getZ()); - } - else { + } else + { SecurityUtils.displayNoAccess(entityplayer); } - + return true; } - + break; } } - + return false; } @@ -793,7 +805,7 @@ public abstract class BlockMachine extends BlockContainer implements ISpecialBou { return false; } - + @Override public Item getItemDropped(IBlockState state, Random random, int fortune) { @@ -806,6 +818,13 @@ public abstract class BlockMachine extends BlockContainer implements ISpecialBou return 3; } + @SideOnly(Side.CLIENT) + @Override + public EnumWorldBlockLayer getBlockLayer() + { + return EnumWorldBlockLayer.CUTOUT; + } + @Override public float getPlayerRelativeBlockHardness(EntityPlayer player, World world, BlockPos pos) { diff --git a/src/main/java/mekanism/common/block/states/BlockStateBasic.java b/src/main/java/mekanism/common/block/states/BlockStateBasic.java index cbdd280ce..57edb1520 100644 --- a/src/main/java/mekanism/common/block/states/BlockStateBasic.java +++ b/src/main/java/mekanism/common/block/states/BlockStateBasic.java @@ -3,10 +3,22 @@ package mekanism.common.block.states; import mekanism.common.Mekanism; import mekanism.common.MekanismBlocks; import mekanism.common.block.BlockBasic; +import mekanism.common.tile.TileEntityBin; import mekanism.common.tile.TileEntityBoilerCasing; import mekanism.common.tile.TileEntityBoilerValve; +import mekanism.common.tile.TileEntityDynamicTank; +import mekanism.common.tile.TileEntityDynamicValve; +import mekanism.common.tile.TileEntityInductionCasing; +import mekanism.common.tile.TileEntityInductionCell; +import mekanism.common.tile.TileEntityInductionPort; +import mekanism.common.tile.TileEntityInductionProvider; import mekanism.common.tile.TileEntityPressureDisperser; import mekanism.common.tile.TileEntitySecurityDesk; +import mekanism.common.tile.TileEntityStructuralGlass; +import mekanism.common.tile.TileEntitySuperheatingElement; +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; @@ -29,9 +41,9 @@ public class BlockStateBasic extends BlockStateFacing { public static final PropertyBool activeProperty = PropertyBool.create("active"); - public BlockStateBasic(BlockBasic block, PropertyEnum typeProperty) + public BlockStateBasic(BlockBasic block, PropertyEnum typeProperty) { - super(block, typeProperty); + super(block, typeProperty, activeProperty); } public static enum BasicBlock @@ -72,22 +84,22 @@ public class BlockStateBasic extends BlockStateFacing COAL_BLOCK(BasicBlock.BASIC_BLOCK_1, 3, "CharcoalBlock", null, false, Predicates.alwaysFalse(), false), REFINED_GLOWSTONE(BasicBlock.BASIC_BLOCK_1, 4, "RefinedGlowstone", null, false, Predicates.alwaysFalse(), false), STEEL_BLOCK(BasicBlock.BASIC_BLOCK_1, 5, "SteelBlock", null, false, Predicates.alwaysFalse(), false), - BIN(BasicBlock.BASIC_BLOCK_1, 6, "Bin", null, false, Plane.HORIZONTAL, false), + BIN(BasicBlock.BASIC_BLOCK_1, 6, "Bin", TileEntityBin.class, false, Plane.HORIZONTAL, true), TELEPORTER_FRAME(BasicBlock.BASIC_BLOCK_1, 7, "TeleporterFrame", null, false, Predicates.alwaysFalse(), false), STEEL_CASING(BasicBlock.BASIC_BLOCK_1, 8, "SteelCasing", null, false, Predicates.alwaysFalse(), false), - DYNAMIC_TANK(BasicBlock.BASIC_BLOCK_1, 9, "DynamicTank", null, false, Predicates.alwaysFalse(), false), - STRUCTURAL_GLASS(BasicBlock.BASIC_BLOCK_1, 10, "StructuralGlass", null, false, Predicates.alwaysFalse(), false), - DYNAMIC_VALVE(BasicBlock.BASIC_BLOCK_1, 11, "DynamicValve", null, false, Predicates.alwaysFalse(), false), + DYNAMIC_TANK(BasicBlock.BASIC_BLOCK_1, 9, "DynamicTank", TileEntityDynamicTank.class, false, Predicates.alwaysFalse(), false), + STRUCTURAL_GLASS(BasicBlock.BASIC_BLOCK_1, 10, "StructuralGlass", TileEntityStructuralGlass.class, false, Predicates.alwaysFalse(), false), + DYNAMIC_VALVE(BasicBlock.BASIC_BLOCK_1, 11, "DynamicValve", TileEntityDynamicValve.class, false, Predicates.alwaysFalse(), false), COPPER_BLOCK(BasicBlock.BASIC_BLOCK_1, 12, "CopperBlock", null, false, Predicates.alwaysFalse(), false), TIN_BLOCK(BasicBlock.BASIC_BLOCK_1, 13, "TinBlock", null, false, Predicates.alwaysFalse(), false), - SOLAR_EVAPORATION_CONTROLLER(BasicBlock.BASIC_BLOCK_1, 14, "SolarEvaporationController", null, false, Plane.HORIZONTAL, false), - SOLAR_EVAPORATION_VALVE(BasicBlock.BASIC_BLOCK_1, 15, "SolarEvaporationValve", null, false, Predicates.alwaysFalse(), false), - SOLAR_EVAPORATION_BLOCK(BasicBlock.BASIC_BLOCK_2, 0, "SolarEvaporationBlock", null, false, Predicates.alwaysFalse(), false), - INDUCTION_CASING(BasicBlock.BASIC_BLOCK_2, 1, "InductionCasing", null, false, Predicates.alwaysFalse(), false), - INDUCTION_PORT(BasicBlock.BASIC_BLOCK_2, 2, "InductionPort", null, false, Predicates.alwaysFalse(), false), - INDUCTION_CELL(BasicBlock.BASIC_BLOCK_2, 3, "InductionCell", null, false, Predicates.alwaysFalse(), false), - INDUCTION_PROVIDER(BasicBlock.BASIC_BLOCK_2, 4, "InductionProvider", null, false, Predicates.alwaysFalse(), false), - SUPERHEATING_ELEMENT(BasicBlock.BASIC_BLOCK_2, 5, "SuperheatingElement", null, true, Predicates.alwaysFalse(), false), + THERMAL_EVAPORATION_CONTROLLER(BasicBlock.BASIC_BLOCK_1, 14, "ThermalEvaporationController", TileEntityThermalEvaporationController.class, false, Plane.HORIZONTAL, false), + THERMAL_EVAPORATION_VALVE(BasicBlock.BASIC_BLOCK_1, 15, "ThermalEvaporationValve", TileEntityThermalEvaporationValve.class, false, Predicates.alwaysFalse(), false), + THERMAL_EVAPORATION_BLOCK(BasicBlock.BASIC_BLOCK_2, 0, "ThermalEvaporationBlock", TileEntityThermalEvaporationBlock.class, false, Predicates.alwaysFalse(), false), + INDUCTION_CASING(BasicBlock.BASIC_BLOCK_2, 1, "InductionCasing", TileEntityInductionCasing.class, false, Predicates.alwaysFalse(), false), + INDUCTION_PORT(BasicBlock.BASIC_BLOCK_2, 2, "InductionPort", TileEntityInductionPort.class, false, Predicates.alwaysFalse(), false), + INDUCTION_CELL(BasicBlock.BASIC_BLOCK_2, 3, "InductionCell", TileEntityInductionCell.class, false, Predicates.alwaysFalse(), false), + INDUCTION_PROVIDER(BasicBlock.BASIC_BLOCK_2, 4, "InductionProvider", TileEntityInductionProvider.class, false, Predicates.alwaysFalse(), false), + SUPERHEATING_ELEMENT(BasicBlock.BASIC_BLOCK_2, 5, "SuperheatingElement", TileEntitySuperheatingElement.class, true, Predicates.alwaysFalse(), false), PRESSURE_DISPERSER(BasicBlock.BASIC_BLOCK_2, 6, "PressureDisperser",TileEntityPressureDisperser.class, true, Predicates.alwaysFalse(), false), BOILER_CASING(BasicBlock.BASIC_BLOCK_2, 7, "BoilerCasing", TileEntityBoilerCasing.class, true, Predicates.alwaysFalse(), false), BOILER_VALVE(BasicBlock.BASIC_BLOCK_2, 8, "BoilerValve", TileEntityBoilerValve.class, true, Predicates.alwaysFalse(), false), @@ -218,11 +230,21 @@ public class BlockStateBasic extends BlockStateFacing BlockBasic block = (BlockBasic)state.getBlock(); BasicBlockType type = state.getValue(block.getProperty()); StringBuilder builder = new StringBuilder(); + if(type.hasActiveTexture()) + { + builder.append(activeProperty.getName()); + builder.append("="); + builder.append(state.getValue(activeProperty)); + } if(type.hasRotations()) { EnumFacing facing = state.getValue(facingProperty); if(type.canRotateTo(facing)) { + if(builder.length() > 0) + { + builder.append(","); + } builder.append(facingProperty.getName()); builder.append("="); builder.append(facing.getName()); @@ -232,15 +254,6 @@ public class BlockStateBasic extends BlockStateFacing return new ModelResourceLocation("builtin/missing", "missing"); } } - if(type.hasActiveTexture()) - { - String active = state.getValue(activeProperty) ? "active" : "inactive"; - if(builder.length() > 0) - { - builder.append(","); - } - builder.append(active); - } if(builder.length() == 0) { diff --git a/src/main/resources/assets/mekanism/blockstates/advanced_factory.json b/src/main/resources/assets/mekanism/blockstates/advanced_factory.json index 19ea140c4..b021f2846 100644 --- a/src/main/resources/assets/mekanism/blockstates/advanced_factory.json +++ b/src/main/resources/assets/mekanism/blockstates/advanced_factory.json @@ -3,10 +3,12 @@ "defaults": { "model": "mekanism:machine", "textures": { - "sides": "mekanism:blocks/AdvancedFactorySide", - "top": "mekanism:blocks/AdvancedFactoryTop", - "bottom": "mekanism:blocks/AdvancedFactoryBottom", - "front": "mekanism:blocks/AdvancedFactoryFront" + "front": "mekanism:blocks/factory/advanced/enriching/AdvancedEnrichingFactoryFront", + "south": "mekanism:blocks/factory/advanced/enriching/AdvancedEnrichingFactoryBack", + "west": "mekanism:blocks/factory/advanced/enriching/AdvancedEnrichingFactoryRight", + "east": "mekanism:blocks/factory/advanced/enriching/AdvancedEnrichingFactoryLeft", + "up": "mekanism:blocks/factory/advanced/enriching/AdvancedEnrichingFactoryTop", + "down": "mekanism:blocks/factory/advanced/AdvancedFactoryBottom" } }, "variants": { diff --git a/src/main/resources/assets/mekanism/blockstates/basic_factory.json b/src/main/resources/assets/mekanism/blockstates/basic_factory.json index 2a306a7a5..531b00c98 100644 --- a/src/main/resources/assets/mekanism/blockstates/basic_factory.json +++ b/src/main/resources/assets/mekanism/blockstates/basic_factory.json @@ -3,10 +3,12 @@ "defaults": { "model": "mekanism:machine", "textures": { - "sides": "mekanism:blocks/BasicFactorySide", - "top": "mekanism:blocks/BasicFactoryTop", - "bottom": "mekanism:blocks/BasicFactoryBottom", - "front": "mekanism:blocks/BasicFactoryFront" + "front": "mekanism:blocks/factory/basic/enriching/BasicEnrichingFactoryFront", + "south": "mekanism:blocks/factory/basic/enriching/BasicEnrichingFactoryBack", + "west": "mekanism:blocks/factory/basic/enriching/BasicEnrichingFactoryRight", + "east": "mekanism:blocks/factory/basic/enriching/BasicEnrichingFactoryLeft", + "up": "mekanism:blocks/factory/basic/enriching/BasicEnrichingFactoryTop", + "down": "mekanism:blocks/factory/basic/BasicFactoryBottom" } }, "variants": { diff --git a/src/main/resources/assets/mekanism/blockstates/bin.json b/src/main/resources/assets/mekanism/blockstates/bin.json new file mode 100644 index 000000000..d7bf345b5 --- /dev/null +++ b/src/main/resources/assets/mekanism/blockstates/bin.json @@ -0,0 +1,37 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "mekanism:machine", + "textures": { + "front": "mekanism:blocks/bin/BinBasicFront", + "west": "mekanism:blocks/bin/BinBasicRight", + "east": "mekanism:blocks/bin/BinBasicLeft", + "south": "mekanism:blocks/bin/BinBasicBack", + "up": "mekanism:blocks/bin/BinBasicTop", + "down": "mekanism:blocks/bin/BinBasicBottom" + } + }, + "variants": { + "facing": { + "north": {}, + "south": {"y": 180}, + "east": {"y": 90}, + "west": {"y": -90} + }, + "active": { + "true": { + "textures": { + "front": "mekanism:blocks/bin/BinBasicFrontOn", + "west": "mekanism:blocks/bin/BinBasicRightOn", + "east": "mekanism:blocks/bin/BinBasicLeftOn", + "south": "mekanism:blocks/bin/BinBasicBackOn", + "up": "mekanism:blocks/bin/BinBasicTopOn", + "down": "mekanism:blocks/bin/BinBasicBottomOn" + } + }, + "false": {} + }, + "inventory": [{}] + } +} + diff --git a/src/main/resources/assets/mekanism/blockstates/chemical_injection_chamber.json b/src/main/resources/assets/mekanism/blockstates/chemical_injection_chamber.json index c1f26dadb..ca4713261 100644 --- a/src/main/resources/assets/mekanism/blockstates/chemical_injection_chamber.json +++ b/src/main/resources/assets/mekanism/blockstates/chemical_injection_chamber.json @@ -4,7 +4,11 @@ "model": "mekanism:machine", "textures": { "sides": "mekanism:blocks/SteelCasing", - "front": "mekanism:blocks/ChemicalInjectionChamberFront" + "front": "mekanism:blocks/chemical_injection_chamber/ChemicalInjectionChamberFront", + "west": "mekanism:blocks/chemical_injection_chamber/ChemicalInjectionChamberRight", + "east": "mekanism:blocks/chemical_injection_chamber/ChemicalInjectionChamberLeft", + "south": "mekanism:blocks/chemical_injection_chamber/ChemicalInjectionChamberBack", + "up": "mekanism:blocks/chemical_injection_chamber/ChemicalInjectionChamberTop" } }, "variants": { @@ -15,7 +19,7 @@ "west": {"y": -90} }, "active": { - "true": {"textures": {"front": "mekanism:blocks/ChemicalInjectionChamberFrontOn"}}, + "true": {"textures": {"front": "mekanism:blocks/chemical_injection_chamber/ChemicalInjectionChamberFrontOn"}}, "false": {} }, "inventory": [{}] diff --git a/src/main/resources/assets/mekanism/blockstates/chemical_oxidizer.json b/src/main/resources/assets/mekanism/blockstates/chemical_oxidizer.json index e22190c30..e9685b98b 100644 --- a/src/main/resources/assets/mekanism/blockstates/chemical_oxidizer.json +++ b/src/main/resources/assets/mekanism/blockstates/chemical_oxidizer.json @@ -6,10 +6,10 @@ "variants": { "normal": [{}], "facing": { - "north": {"y": 180}, - "south": {}, - "east": {"y": -90}, - "west": {"y": 90} + "north": {}, + "south": {"y": 180}, + "east": {"y": 90}, + "west": {"y": -90} }, "active": { "true": {}, diff --git a/src/main/resources/assets/mekanism/blockstates/combiner.json b/src/main/resources/assets/mekanism/blockstates/combiner.json index f1c22049c..ac80ccb08 100644 --- a/src/main/resources/assets/mekanism/blockstates/combiner.json +++ b/src/main/resources/assets/mekanism/blockstates/combiner.json @@ -4,7 +4,11 @@ "model": "mekanism:machine", "textures": { "sides": "mekanism:blocks/SteelCasing", - "front": "mekanism:blocks/CombinerFront" + "front": "mekanism:blocks/combiner/CombinerFront", + "west": "mekanism:blocks/combiner/CombinerRight", + "east": "mekanism:blocks/combiner/CombinerLeft", + "south": "mekanism:blocks/combiner/CombinerBack", + "up": "mekanism:blocks/combiner/CombinerTop" } }, "variants": { @@ -15,7 +19,7 @@ "west": {"y": -90} }, "active": { - "true": {"textures": {"front": "mekanism:blocks/CombinerFrontOn"}}, + "true": {"textures": {"front": "mekanism:blocks/combiner/CombinerFrontOn"}}, "false": {} }, "inventory": [{}] diff --git a/src/main/resources/assets/mekanism/blockstates/crusher.json b/src/main/resources/assets/mekanism/blockstates/crusher.json index e0690c401..a05b0ff6e 100644 --- a/src/main/resources/assets/mekanism/blockstates/crusher.json +++ b/src/main/resources/assets/mekanism/blockstates/crusher.json @@ -4,7 +4,11 @@ "model": "mekanism:machine", "textures": { "sides": "mekanism:blocks/SteelCasing", - "front": "mekanism:blocks/CrusherFront" + "front": "mekanism:blocks/crusher/CrusherFront", + "west": "mekanism:blocks/crusher/CrusherRight", + "east": "mekanism:blocks/crusher/CrusherLeft", + "south": "mekanism:blocks/crusher/CrusherBack", + "up": "mekanism:blocks/crusher/CrusherTop" } }, "variants": { @@ -15,7 +19,7 @@ "west": {"y": -90} }, "active": { - "true": {"textures": {"front": "mekanism:blocks/CrusherFrontOn"}}, + "true": {"textures": {"front": "mekanism:blocks/crusher/CrusherFrontOn"}}, "false": {} }, "inventory": [{}] diff --git a/src/main/resources/assets/mekanism/blockstates/electrolytic_separator.json b/src/main/resources/assets/mekanism/blockstates/electrolytic_separator.json index dafbc952a..163f37ab5 100644 --- a/src/main/resources/assets/mekanism/blockstates/electrolytic_separator.json +++ b/src/main/resources/assets/mekanism/blockstates/electrolytic_separator.json @@ -6,10 +6,10 @@ "variants": { "normal": [{}], "facing": { - "north": {}, - "south": {"y": 180}, - "east": {"y": 90}, - "west": {"y": -90} + "north": {"y": 90}, + "south": {"y": -90}, + "east": {"y": 180}, + "west": {} }, "active": { "true": {}, diff --git a/src/main/resources/assets/mekanism/blockstates/elite_factory.json b/src/main/resources/assets/mekanism/blockstates/elite_factory.json index 4f6e1ec4a..74ec1d7be 100644 --- a/src/main/resources/assets/mekanism/blockstates/elite_factory.json +++ b/src/main/resources/assets/mekanism/blockstates/elite_factory.json @@ -3,10 +3,12 @@ "defaults": { "model": "mekanism:machine", "textures": { - "sides": "mekanism:blocks/EliteFactorySide", - "top": "mekanism:blocks/EliteFactoryTop", - "bottom": "mekanism:blocks/EliteFactoryBottom", - "front": "mekanism:blocks/EliteFactoryFront" + "front": "mekanism:blocks/factory/elite/enriching/EliteEnrichingFactoryFront", + "south": "mekanism:blocks/factory/elite/enriching/EliteEnrichingFactoryBack", + "west": "mekanism:blocks/factory/elite/enriching/EliteEnrichingFactoryRight", + "east": "mekanism:blocks/factory/elite/enriching/EliteEnrichingFactoryLeft", + "up": "mekanism:blocks/factory/elite/enriching/EliteEnrichingFactoryTop", + "down": "mekanism:blocks/factory/elite/EliteFactoryBottom" } }, "variants": { diff --git a/src/main/resources/assets/mekanism/blockstates/energized_smelter.json b/src/main/resources/assets/mekanism/blockstates/energized_smelter.json index c80aebbbb..f45e8deea 100644 --- a/src/main/resources/assets/mekanism/blockstates/energized_smelter.json +++ b/src/main/resources/assets/mekanism/blockstates/energized_smelter.json @@ -4,7 +4,11 @@ "model": "mekanism:machine", "textures": { "sides": "mekanism:blocks/SteelCasing", - "front": "mekanism:blocks/EnergizedSmelterFront" + "front": "mekanism:blocks/energized_smelter/EnergizedSmelterFront", + "west": "mekanism:blocks/energized_smelter/EnergizedSmelterRight", + "east": "mekanism:blocks/energized_smelter/EnergizedSmelterLeft", + "south": "mekanism:blocks/energized_smelter/EnergizedSmelterBack", + "up": "mekanism:blocks/energized_smelter/EnergizedSmelterTop" } }, "variants": { @@ -15,7 +19,7 @@ "west": {"y": -90} }, "active": { - "true": {"textures": {"front": "mekanism:blocks/EnergizedSmelterFrontOn"}}, + "true": {"textures": {"front": "mekanism:blocks/energized_smelter/EnergizedSmelterFrontOn"}}, "false": {} }, "inventory": [{}] diff --git a/src/main/resources/assets/mekanism/blockstates/enrichment_chamber.json b/src/main/resources/assets/mekanism/blockstates/enrichment_chamber.json index c5c6829c5..c242ed0cc 100644 --- a/src/main/resources/assets/mekanism/blockstates/enrichment_chamber.json +++ b/src/main/resources/assets/mekanism/blockstates/enrichment_chamber.json @@ -5,18 +5,18 @@ "textures": { "sides": "mekanism:blocks/SteelCasing", "front": "mekanism:blocks/enrichment_chamber/EnrichmentChamberFront", - "east": "mekanism:blocks/enrichment_chamber/EnrichmentChamberRight", - "west": "mekanism:blocks/enrichment_chamber/EnrichmentChamberLeft", - "north": "mekanism:blocks/enrichment_chamber/EnrichmentChamberBack", + "west": "mekanism:blocks/enrichment_chamber/EnrichmentChamberRight", + "east": "mekanism:blocks/enrichment_chamber/EnrichmentChamberLeft", + "south": "mekanism:blocks/enrichment_chamber/EnrichmentChamberBack", "up": "mekanism:blocks/enrichment_chamber/EnrichmentChamberTop" } }, "variants": { "facing": { - "north": {"y": 180}, - "south": {}, - "east": {"y": -90}, - "west": {"y": 90} + "north": {}, + "south": {"y": 180}, + "east": {"y": 90}, + "west": {"y": -90} }, "active": { "true": {"textures": {"front": "mekanism:blocks/enrichment_chamber/EnrichmentChamberFrontOn"}}, diff --git a/src/main/resources/assets/mekanism/blockstates/formulaic_assemblicator.json b/src/main/resources/assets/mekanism/blockstates/formulaic_assemblicator.json new file mode 100644 index 000000000..00c1bd913 --- /dev/null +++ b/src/main/resources/assets/mekanism/blockstates/formulaic_assemblicator.json @@ -0,0 +1,28 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "mekanism:machine", + "textures": { + "front": "mekanism:blocks/formulaic_assemblicator/FormulaicAssemblicatorFront", + "west": "mekanism:blocks/formulaic_assemblicator/FormulaicAssemblicatorRight", + "east": "mekanism:blocks/formulaic_assemblicator/FormulaicAssemblicatorLeft", + "south": "mekanism:blocks/formulaic_assemblicator/FormulaicAssemblicatorBack", + "up": "mekanism:blocks/formulaic_assemblicator/FormulaicAssemblicatorTop", + "down": "mekanism:blocks/formulaic_assemblicator/FormulaicAssemblicatorBottom" + } + }, + "variants": { + "facing": { + "north": {}, + "south": {"y": 180}, + "east": {"y": 90}, + "west": {"y": -90} + }, + "active": { + "true": {"textures": {"front": "mekanism:blocks/formulaic_assemblicator/FormulaicAssemblicatorFrontOn"}}, + "false": {} + }, + "inventory": [{}] + } +} + diff --git a/src/main/resources/assets/mekanism/blockstates/fuelwood_heater.json b/src/main/resources/assets/mekanism/blockstates/fuelwood_heater.json new file mode 100644 index 000000000..2dfa0648a --- /dev/null +++ b/src/main/resources/assets/mekanism/blockstates/fuelwood_heater.json @@ -0,0 +1,37 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "mekanism:machine", + "textures": { + "front": "mekanism:blocks/fuelwood_heater/FuelwoodHeaterFront", + "west": "mekanism:blocks/fuelwood_heater/FuelwoodHeaterRight", + "east": "mekanism:blocks/fuelwood_heater/FuelwoodHeaterLeft", + "south": "mekanism:blocks/fuelwood_heater/FuelwoodHeaterBack", + "up": "mekanism:blocks/fuelwood_heater/FuelwoodHeaterTop", + "down": "mekanism:blocks/fuelwood_heater/FuelwoodHeaterBottom" + } + }, + "variants": { + "facing": { + "north": {}, + "south": {"y": 180}, + "east": {"y": 90}, + "west": {"y": -90} + }, + "active": { + "true": { + "textures": { + "front": "mekanism:blocks/fuelwood_heater/FuelwoodHeaterFrontOn", + "west": "mekanism:blocks/fuelwood_heater/FuelwoodHeaterRightOn", + "east": "mekanism:blocks/fuelwood_heater/FuelwoodHeaterLeftOn", + "south": "mekanism:blocks/fuelwood_heater/FuelwoodHeaterBackOn", + "up": "mekanism:blocks/fuelwood_heater/FuelwoodHeaterTopOn", + "down": "mekanism:blocks/fuelwood_heater/FuelwoodHeaterBottomOn" + } + }, + "false": {} + }, + "inventory": [{}] + } +} + diff --git a/src/main/resources/assets/mekanism/blockstates/oredictionificator.json b/src/main/resources/assets/mekanism/blockstates/oredictionificator.json new file mode 100644 index 000000000..2269cf91a --- /dev/null +++ b/src/main/resources/assets/mekanism/blockstates/oredictionificator.json @@ -0,0 +1,28 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "mekanism:machine", + "textures": { + "front": "mekanism:blocks/oredictionificator/OredictionificatorFront", + "west": "mekanism:blocks/oredictionificator/OredictionificatorRight", + "east": "mekanism:blocks/oredictionificator/OredictionificatorLeft", + "south": "mekanism:blocks/oredictionificator/OredictionificatorBack", + "up": "mekanism:blocks/oredictionificator/OredictionificatorTop", + "down": "mekanism:blocks/oredictionificator/OredictionificatorBottom" + } + }, + "variants": { + "facing": { + "north": {}, + "south": {"y": 180}, + "east": {"y": 90}, + "west": {"y": -90} + }, + "active": { + "true": {"textures": {"front": "mekanism:blocks/oredictionificator/OredictionificatorFrontOn"}}, + "false": {} + }, + "inventory": [{}] + } +} + diff --git a/src/main/resources/assets/mekanism/blockstates/osmium_compressor.json b/src/main/resources/assets/mekanism/blockstates/osmium_compressor.json index 911a5e6f2..524629634 100644 --- a/src/main/resources/assets/mekanism/blockstates/osmium_compressor.json +++ b/src/main/resources/assets/mekanism/blockstates/osmium_compressor.json @@ -4,7 +4,11 @@ "model": "mekanism:machine", "textures": { "sides": "mekanism:blocks/SteelCasing", - "front": "mekanism:blocks/OsmiumCompressorFront" + "front": "mekanism:blocks/osmium_compressor/OsmiumCompressorFront", + "west": "mekanism:blocks/osmium_compressor/OsmiumCompressorRight", + "east": "mekanism:blocks/osmium_compressor/OsmiumCompressorLeft", + "south": "mekanism:blocks/osmium_compressor/OsmiumCompressorBack", + "up": "mekanism:blocks/osmium_compressor/OsmiumCompressorTop" } }, "variants": { @@ -15,7 +19,7 @@ "west": {"y": -90} }, "active": { - "true": {"textures": {"front": "mekanism:blocks/OsmiumCompressorFrontOn"}}, + "true": {"textures": {"front": "mekanism:blocks/osmium_compressor/OsmiumCompressorFrontOn"}}, "false": {} }, "inventory": [{}] diff --git a/src/main/resources/assets/mekanism/blockstates/personal_chest.json b/src/main/resources/assets/mekanism/blockstates/personal_chest.json new file mode 100644 index 000000000..60646b0da --- /dev/null +++ b/src/main/resources/assets/mekanism/blockstates/personal_chest.json @@ -0,0 +1,24 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "mekanism:nothing", + "textures": { + "front": "mekanism:blocks/fuelwood_heater/FuelwoodHeaterFront", + "west": "mekanism:blocks/fuelwood_heater/FuelwoodHeaterRight", + "east": "mekanism:blocks/fuelwood_heater/FuelwoodHeaterLeft", + "south": "mekanism:blocks/fuelwood_heater/FuelwoodHeaterBack", + "up": "mekanism:blocks/fuelwood_heater/FuelwoodHeaterTop", + "down": "mekanism:blocks/fuelwood_heater/FuelwoodHeaterBottom" + } + }, + "variants": { + "facing": { + "north": {}, + "south": {"y": 180}, + "east": {"y": 90}, + "west": {"y": -90} + }, + "inventory": [{}] + } +} + diff --git a/src/main/resources/assets/mekanism/blockstates/precision_sawmill.json b/src/main/resources/assets/mekanism/blockstates/precision_sawmill.json index 67dfb77fe..f6750867b 100644 --- a/src/main/resources/assets/mekanism/blockstates/precision_sawmill.json +++ b/src/main/resources/assets/mekanism/blockstates/precision_sawmill.json @@ -4,7 +4,11 @@ "model": "mekanism:machine", "textures": { "sides": "mekanism:blocks/SteelCasing", - "front": "mekanism:blocks/PrecisionSawmillFront" + "front": "mekanism:blocks/precision_sawmill/PrecisionSawmillFront", + "west": "mekanism:blocks/precision_sawmill/PrecisionSawmillRight", + "east": "mekanism:blocks/precision_sawmill/PrecisionSawmillLeft", + "south": "mekanism:blocks/precision_sawmill/PrecisionSawmillBack", + "up": "mekanism:blocks/precision_sawmill/PrecisionSawmillTop" } }, "variants": { @@ -15,7 +19,7 @@ "west": {"y": -90} }, "active": { - "true": {"textures": {"front": "mekanism:blocks/PrecisionSawmillFrontOn"}}, + "true": {"textures": {"front": "mekanism:blocks/precision_sawmill/PrecisionSawmillFrontOn"}}, "false": {} }, "inventory": [{}] diff --git a/src/main/resources/assets/mekanism/blockstates/purification_chamber.json b/src/main/resources/assets/mekanism/blockstates/purification_chamber.json index b2542681d..650ec38b4 100644 --- a/src/main/resources/assets/mekanism/blockstates/purification_chamber.json +++ b/src/main/resources/assets/mekanism/blockstates/purification_chamber.json @@ -4,7 +4,11 @@ "model": "mekanism:machine", "textures": { "sides": "mekanism:blocks/SteelCasing", - "front": "mekanism:blocks/PurificationChamberFront" + "front": "mekanism:blocks/purification_chamber/PurificationChamberFront", + "west": "mekanism:blocks/purification_chamber/PurificationChamberRight", + "east": "mekanism:blocks/purification_chamber/PurificationChamberLeft", + "south": "mekanism:blocks/purification_chamber/PurificationChamberBack", + "up": "mekanism:blocks/purification_chamber/PurificationChamberTop" } }, "variants": { @@ -15,7 +19,7 @@ "west": {"y": -90} }, "active": { - "true": {"textures": {"front": "mekanism:blocks/PurificationChamberFrontOn"}}, + "true": {"textures": {"front": "mekanism:blocks/purification_chamber/PurificationChamberFrontOn"}}, "false": {} }, "inventory": [{}] diff --git a/src/main/resources/assets/mekanism/blockstates/electric_chest.json b/src/main/resources/assets/mekanism/blockstates/resistive_heater.json similarity index 51% rename from src/main/resources/assets/mekanism/blockstates/electric_chest.json rename to src/main/resources/assets/mekanism/blockstates/resistive_heater.json index 6a5f14b82..e9c3b22fa 100644 --- a/src/main/resources/assets/mekanism/blockstates/electric_chest.json +++ b/src/main/resources/assets/mekanism/blockstates/resistive_heater.json @@ -1,16 +1,19 @@ { "forge_marker": 1, "defaults": { - "model": "mekanism:nothing" + "model": "mekanism:resistive_heater" }, "variants": { - "normal": [{}], "facing": { "north": {}, "south": {"y": 180}, "east": {"y": 90}, "west": {"y": -90} - }, + }, + "active": { + "true": {"textures": {"front": "mekanism:blocks/oredictionificator/OredictionificatorFrontOn"}}, + "false": {} + }, "inventory": [{}] } } diff --git a/src/main/resources/assets/mekanism/models/block/machine.json b/src/main/resources/assets/mekanism/models/block/machine.json index 635c3be56..fb77712c9 100644 --- a/src/main/resources/assets/mekanism/models/block/machine.json +++ b/src/main/resources/assets/mekanism/models/block/machine.json @@ -1,12 +1,24 @@ { - "parent": "block/cube", + "elements": [ + { "from": [ 0, 0, 0 ], + "to": [ 16, 16, 16 ], + "faces": { + "down": { "texture": "#down", "cullface": "down" }, + "up": { "texture": "#up", "cullface": "up", "rotation": 180 }, + "north": { "texture": "#north", "cullface": "north" }, + "south": { "texture": "#south", "cullface": "south" }, + "west": { "texture": "#west", "cullface": "west" }, + "east": { "texture": "#east", "cullface": "east" } + } + } + ], "textures": { "particle": "#sides", "down": "#sides", "up": "#sides", - "north": "#sides", + "north": "#front", "east": "#sides", - "south": "#front", + "south": "#sides", "west": "#sides" } } diff --git a/src/main/resources/assets/mekanism/models/block/nothing.json b/src/main/resources/assets/mekanism/models/block/nothing.json index 9d63879e3..3d0af08a1 100644 --- a/src/main/resources/assets/mekanism/models/block/nothing.json +++ b/src/main/resources/assets/mekanism/models/block/nothing.json @@ -1,10 +1,10 @@ { "elements": [ - { - "__comment": "nothing", - "from": [0, 0, 0], - "to": [0, 0, 0], - "faces": {} + { "from": [ 0, 0, 0 ], + "to": [ 0, 0, 0 ], + "faces": { + "down": { "texture": "#down", "cullface": "down" } + } } ] } diff --git a/src/main/resources/assets/mekanism/models/block/resistive_heater.json b/src/main/resources/assets/mekanism/models/block/resistive_heater.json index f59e980c4..1dc658063 100644 --- a/src/main/resources/assets/mekanism/models/block/resistive_heater.json +++ b/src/main/resources/assets/mekanism/models/block/resistive_heater.json @@ -262,7 +262,7 @@ } ], "textures": { - "all": "...", + "all": "mekanism:blocks/models/resistive_heater", "particle": "..." } } diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/laser_amplifier.png b/src/main/resources/assets/mekanism/textures/blocks/models/laser_amplifier.png index 5be9e22b2fa9fc437ef8d977131663086e4b8e82..4af9f53936f6e1f6e7ed6709ef1d61c0820bb10b 100644 GIT binary patch literal 1861 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 diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/resistive_heater.png b/src/main/resources/assets/mekanism/textures/blocks/models/resistive_heater.png new file mode 100644 index 0000000000000000000000000000000000000000..e74b2a83df9521f0c36a6a45b0c1a7b230a6c9be GIT binary patch literal 4380 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 BspJ3v literal 0 HcmV?d00001