diff --git a/src/main/java/mekanism/client/ClientProxy.java b/src/main/java/mekanism/client/ClientProxy.java index f4912a791..097f9ad24 100644 --- a/src/main/java/mekanism/client/ClientProxy.java +++ b/src/main/java/mekanism/client/ClientProxy.java @@ -1,6 +1,8 @@ package mekanism.client; import java.io.File; +import java.util.HashMap; +import java.util.Map; import mekanism.api.Coord4D; import mekanism.api.MekanismConfig.client; @@ -206,6 +208,8 @@ import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class ClientProxy extends CommonProxy { + public static Map machineResources = new HashMap(); + @Override public void loadConfiguration() { diff --git a/src/main/java/mekanism/common/MekanismBlocks.java b/src/main/java/mekanism/common/MekanismBlocks.java index 30ca22e87..175db6556 100644 --- a/src/main/java/mekanism/common/MekanismBlocks.java +++ b/src/main/java/mekanism/common/MekanismBlocks.java @@ -10,9 +10,11 @@ import java.util.ArrayList; import java.util.List; import mekanism.api.EnumColor; +import mekanism.client.ClientProxy; import mekanism.common.Tier.EnergyCubeTier; import mekanism.common.Tier.GasTankTier; import mekanism.common.base.IEnergyCube; +import mekanism.common.base.IFactory.RecipeType; import mekanism.common.block.BlockBasic; import mekanism.common.block.BlockBounding; import mekanism.common.block.BlockCardboardBox; @@ -123,31 +125,65 @@ public class MekanismBlocks for(MachineType type : MachineType.values()) { - List entries = new ArrayList(); + List modelsToAdd = new ArrayList(); + String resource = "mekanism:" + type.getName(); + RecipeType recipePointer = null; - if(type.hasActiveTexture()) + if(type == MachineType.BASIC_FACTORY || type == MachineType.ADVANCED_FACTORY || type == MachineType.ELITE_FACTORY) { - entries.add("active=false"); + recipePointer = RecipeType.values()[0]; + resource = "mekanism:" + type.getName() + "_" + recipePointer.getName(); } - if(type.hasRotations()) + while(true) { - entries.add("facing=north"); - } - - String properties = new String(); - - for(int i = 0; i < entries.size(); i++) - { - properties += entries.get(i); - - if(i < entries.size()-1) + if(ClientProxy.machineResources.get(resource) == null) { - properties += ","; + List entries = new ArrayList(); + + if(type.hasActiveTexture()) + { + entries.add("active=false"); + } + + if(type.hasRotations()) + { + entries.add("facing=north"); + } + + String properties = new String(); + + for(int i = 0; i < entries.size(); i++) + { + properties += entries.get(i); + + if(i < entries.size()-1) + { + properties += ","; + } + } + + ModelResourceLocation model = new ModelResourceLocation(resource, properties); + + ClientProxy.machineResources.put(resource, model); + modelsToAdd.add(model); + + if(type == MachineType.BASIC_FACTORY || type == MachineType.ADVANCED_FACTORY || type == MachineType.ELITE_FACTORY) + { + if(recipePointer.ordinal() < RecipeType.values().length-1) + { + recipePointer = RecipeType.values()[recipePointer.ordinal()+1]; + resource = "mekanism:" + type.getName() + "_" + recipePointer.getName(); + + continue; + } + } } + + break; } - ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(type.typeBlock.getBlock()), type.meta, new ModelResourceLocation("mekanism:" + type.getName(), properties)); + ModelLoader.registerItemVariants(Item.getItemFromBlock(type.typeBlock.getBlock()), modelsToAdd.toArray(new ModelResourceLocation[] {})); } for(BasicBlockType type : BasicBlockType.values()) @@ -169,7 +205,7 @@ public class MekanismBlocks { ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(MekanismBlocks.OreBlock), ore.ordinal(), new ModelResourceLocation("mekanism:OreBlock", "type=" + ore.getName())); } - + ModelLoader.setCustomMeshDefinition(Item.getItemFromBlock(MekanismBlocks.EnergyCube), new ItemMeshDefinition() { @Override public ModelResourceLocation getModelLocation(ItemStack stack) @@ -191,5 +227,32 @@ public class MekanismBlocks return new ModelResourceLocation(baseLocation, "facing=north,tier="+tier); } }); + + ItemMeshDefinition mesher = new ItemMeshDefinition() { + @Override + public ModelResourceLocation getModelLocation(ItemStack stack) + { + MachineType type = MachineType.get(stack); + + if(type != null) + { + String resource = "mekanism:" + type.getName(); + + if(type == MachineType.BASIC_FACTORY || type == MachineType.ADVANCED_FACTORY || type == MachineType.ELITE_FACTORY) + { + RecipeType recipe = RecipeType.values()[((ItemBlockMachine)stack.getItem()).getRecipeType(stack)]; + resource = "mekanism:" + type.getName() + "_" + recipe.getName(); + } + + return ClientProxy.machineResources.get(resource); + } + + return null; + } + }; + + ModelLoader.setCustomMeshDefinition(Item.getItemFromBlock(MekanismBlocks.MachineBlock), mesher); + ModelLoader.setCustomMeshDefinition(Item.getItemFromBlock(MekanismBlocks.MachineBlock2), mesher); + ModelLoader.setCustomMeshDefinition(Item.getItemFromBlock(MekanismBlocks.MachineBlock3), mesher); } } diff --git a/src/main/java/mekanism/common/base/IFactory.java b/src/main/java/mekanism/common/base/IFactory.java index 88b77665c..2e87ce46d 100644 --- a/src/main/java/mekanism/common/base/IFactory.java +++ b/src/main/java/mekanism/common/base/IFactory.java @@ -6,6 +6,7 @@ import mekanism.api.gas.Gas; import mekanism.api.gas.GasStack; import mekanism.api.util.StackUtils; import mekanism.common.InfuseStorage; +import mekanism.common.block.states.BlockStateMachine.MachineType; import mekanism.common.recipe.RecipeHandler; import mekanism.common.recipe.RecipeHandler.Recipe; import mekanism.common.recipe.inputs.AdvancedMachineInput; @@ -20,10 +21,9 @@ import mekanism.common.util.LangUtils; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; +import net.minecraft.util.IStringSerializable; import net.minecraft.util.ResourceLocation; -import static mekanism.common.block.states.BlockStateMachine.MachineType; - /** * Internal interface for managing various Factory types. * @author AidanBrady @@ -45,20 +45,20 @@ public interface IFactory */ public void setRecipeType(int type, ItemStack itemStack); - public static enum RecipeType + public static enum RecipeType implements IStringSerializable { - SMELTING("Smelting", "smelter", MachineType.ENERGIZED_SMELTER.getStack(), false, false, Recipe.ENERGIZED_SMELTER), - ENRICHING("Enriching", "enrichment", MachineType.ENRICHMENT_CHAMBER.getStack(), false, false, Recipe.ENRICHMENT_CHAMBER), - CRUSHING("Crushing", "crusher", MachineType.CRUSHER.getStack(), false, false, Recipe.CRUSHER), - COMPRESSING("Compressing", "compressor", MachineType.OSMIUM_COMPRESSOR.getStack(), true, false, Recipe.OSMIUM_COMPRESSOR), - COMBINING("Combining", "combiner", MachineType.COMBINER.getStack(), true, false, Recipe.COMBINER), - PURIFYING("Purifying", "purifier", MachineType.PURIFICATION_CHAMBER.getStack(), true, true, Recipe.PURIFICATION_CHAMBER), - INJECTING("Injecting", "injection", MachineType.CHEMICAL_INJECTION_CHAMBER.getStack(), true, true, Recipe.CHEMICAL_INJECTION_CHAMBER), - INFUSING("Infusing", "metalinfuser", MachineType.METALLURGIC_INFUSER.getStack(), false, false, Recipe.METALLURGIC_INFUSER); + SMELTING("Smelting", "smelter", MachineType.ENERGIZED_SMELTER, false, false, Recipe.ENERGIZED_SMELTER), + ENRICHING("Enriching", "enrichment", MachineType.ENRICHMENT_CHAMBER, false, false, Recipe.ENRICHMENT_CHAMBER), + CRUSHING("Crushing", "crusher", MachineType.CRUSHER, false, false, Recipe.CRUSHER), + COMPRESSING("Compressing", "compressor", MachineType.OSMIUM_COMPRESSOR, true, false, Recipe.OSMIUM_COMPRESSOR), + COMBINING("Combining", "combiner", MachineType.COMBINER, true, false, Recipe.COMBINER), + PURIFYING("Purifying", "purifier", MachineType.PURIFICATION_CHAMBER, true, true, Recipe.PURIFICATION_CHAMBER), + INJECTING("Injecting", "injection", MachineType.CHEMICAL_INJECTION_CHAMBER, true, true, Recipe.CHEMICAL_INJECTION_CHAMBER), + INFUSING("Infusing", "metalinfuser", MachineType.METALLURGIC_INFUSER, false, false, Recipe.METALLURGIC_INFUSER); private String name; private ResourceLocation sound; - private ItemStack stack; + private MachineType type; private boolean usesFuel; private boolean fuelSpeed; private Recipe recipe; @@ -170,7 +170,6 @@ public interface IFactory if(((Map.Entry)obj).getKey() instanceof AdvancedMachineInput) { Map.Entry entry = (Map.Entry)obj; - ItemStack stack = ((AdvancedMachineInput)entry.getKey()).itemStack; if(StackUtils.equalsWildcard(stack, itemStack)) @@ -187,7 +186,7 @@ public interface IFactory { if(cacheTile == null) { - MachineType type = MachineType.get(Block.getBlockFromItem(getStack().getItem()), getStack().getItemDamage()); + MachineType type = MachineType.get(getStack()); cacheTile = (TileEntityAdvancedElectricMachine)type.create(); } @@ -201,7 +200,7 @@ public interface IFactory public ItemStack getStack() { - return stack; + return type.getStack(); } public String getUnlocalizedName() @@ -229,14 +228,20 @@ public interface IFactory return fuelSpeed; } - private RecipeType(String s, String s1, ItemStack is, boolean b, boolean b1, Recipe r) + private RecipeType(String s, String s1, MachineType t, boolean b, boolean b1, Recipe r) { name = s; sound = new ResourceLocation("mekanism", "tile.machine." + s1); - stack = is; + type = t; usesFuel = b; fuelSpeed = b1; recipe = r; } + + @Override + public String getName() + { + return name().toLowerCase(); + } } } diff --git a/src/main/java/mekanism/common/block/BlockMachine.java b/src/main/java/mekanism/common/block/BlockMachine.java index e30998b2d..33b3b1395 100644 --- a/src/main/java/mekanism/common/block/BlockMachine.java +++ b/src/main/java/mekanism/common/block/BlockMachine.java @@ -195,11 +195,14 @@ public abstract class BlockMachine extends BlockContainer implements ISpecialBou state = state.withProperty(BlockStateMachine.tierProperty, ((TileEntityFluidTank)tile).tier.getBaseTier()); } + if(tile instanceof TileEntityFactory) + { + state = state.withProperty(BlockStateMachine.recipeProperty, ((TileEntityFactory)tile).recipeType); + } + return state; } - - /* @Override @SideOnly(Side.CLIENT) diff --git a/src/main/java/mekanism/common/block/states/BlockStateFacing.java b/src/main/java/mekanism/common/block/states/BlockStateFacing.java index 23524e58e..94690a946 100644 --- a/src/main/java/mekanism/common/block/states/BlockStateFacing.java +++ b/src/main/java/mekanism/common/block/states/BlockStateFacing.java @@ -1,6 +1,7 @@ package mekanism.common.block.states; import mekanism.common.Tier.BaseTier; +import mekanism.common.base.IFactory.RecipeType; import net.minecraft.block.Block; import net.minecraft.block.properties.PropertyBool; import net.minecraft.block.properties.PropertyDirection; @@ -11,9 +12,9 @@ public class BlockStateFacing extends BlockState { public static final PropertyDirection facingProperty = PropertyDirection.create("facing"); - public BlockStateFacing(Block block, PropertyEnum typeProperty, PropertyBool activeProperty, PropertyEnum tierProperty) + public BlockStateFacing(Block block, PropertyEnum typeProperty, PropertyBool activeProperty, PropertyEnum tierProperty, PropertyEnum recipeProperty) { - super(block, facingProperty, typeProperty, activeProperty, tierProperty); + super(block, facingProperty, typeProperty, activeProperty, tierProperty, recipeProperty); } public BlockStateFacing(Block block, PropertyEnum typeProperty, PropertyBool activeProperty) diff --git a/src/main/java/mekanism/common/block/states/BlockStateMachine.java b/src/main/java/mekanism/common/block/states/BlockStateMachine.java index 694bcb466..825caa203 100644 --- a/src/main/java/mekanism/common/block/states/BlockStateMachine.java +++ b/src/main/java/mekanism/common/block/states/BlockStateMachine.java @@ -11,6 +11,7 @@ import mekanism.api.MekanismConfig.usage; import mekanism.common.Mekanism; import mekanism.common.MekanismBlocks; import mekanism.common.Tier.BaseTier; +import mekanism.common.base.IFactory.RecipeType; import mekanism.common.block.BlockMachine; import mekanism.common.recipe.ShapedMekanismRecipe; import mekanism.common.tile.TileEntityAdvancedFactory; @@ -73,15 +74,13 @@ public class BlockStateMachine extends BlockStateFacing { public static final PropertyBool activeProperty = PropertyBool.create("active"); public static final PropertyEnum tierProperty = PropertyEnum.create("tier", BaseTier.class); + public static final PropertyEnum recipeProperty = PropertyEnum.create("recipe", RecipeType.class); public BlockStateMachine(BlockMachine block, PropertyEnum typeProperty) { - super(block, typeProperty, activeProperty, tierProperty); + super(block, typeProperty, activeProperty, tierProperty, recipeProperty); } - public static final Predicate never = Predicates.alwaysFalse(); - public static final Predicate always = Predicates.alwaysTrue(); - public static enum MachineBlock { MACHINE_BLOCK_1, @@ -129,11 +128,11 @@ public class BlockStateMachine extends BlockStateFacing METALLURGIC_INFUSER(MachineBlock.MACHINE_BLOCK_1, 8, "MetallurgicInfuser", 12, TileEntityMetallurgicInfuser.class, true, true, true, Plane.HORIZONTAL, false), PURIFICATION_CHAMBER(MachineBlock.MACHINE_BLOCK_1, 9, "PurificationChamber", 15, TileEntityPurificationChamber.class, true, false, true, Plane.HORIZONTAL, true), ENERGIZED_SMELTER(MachineBlock.MACHINE_BLOCK_1, 10, "EnergizedSmelter", 16, TileEntityEnergizedSmelter.class, true, false, true, Plane.HORIZONTAL, true), - TELEPORTER(MachineBlock.MACHINE_BLOCK_1, 11, "Teleporter", 13, TileEntityTeleporter.class, true, false, false, never, false), + TELEPORTER(MachineBlock.MACHINE_BLOCK_1, 11, "Teleporter", 13, TileEntityTeleporter.class, true, false, false, Predicates.alwaysFalse(), false), ELECTRIC_PUMP(MachineBlock.MACHINE_BLOCK_1, 12, "ElectricPump", 17, TileEntityElectricPump.class, true, true, false, Plane.HORIZONTAL, false), PERSONAL_CHEST(MachineBlock.MACHINE_BLOCK_1, 13, "PersonalChest", -1, TileEntityPersonalChest.class, true, true, false, Plane.HORIZONTAL, false), CHARGEPAD(MachineBlock.MACHINE_BLOCK_1, 14, "Chargepad", -1, TileEntityChargepad.class, true, true, false, Plane.HORIZONTAL, false), - LOGISTICAL_SORTER(MachineBlock.MACHINE_BLOCK_1, 15, "LogisticalSorter", -1, TileEntityLogisticalSorter.class, false, true, false, always, true), + LOGISTICAL_SORTER(MachineBlock.MACHINE_BLOCK_1, 15, "LogisticalSorter", -1, TileEntityLogisticalSorter.class, false, true, false, Predicates.alwaysTrue(), true), ROTARY_CONDENSENTRATOR(MachineBlock.MACHINE_BLOCK_2, 0, "RotaryCondensentrator", 7, TileEntityRotaryCondensentrator.class, true, true, false, Plane.HORIZONTAL, false), CHEMICAL_OXIDIZER(MachineBlock.MACHINE_BLOCK_2, 1, "ChemicalOxidizer", 29, TileEntityChemicalOxidizer.class, true, true, true, Plane.HORIZONTAL, true), CHEMICAL_INFUSER(MachineBlock.MACHINE_BLOCK_2, 2, "ChemicalInfuser", 30, TileEntityChemicalInfuser.class, true, true, false, Plane.HORIZONTAL, true), @@ -145,18 +144,18 @@ public class BlockStateMachine extends BlockStateFacing CHEMICAL_CRYSTALLIZER(MachineBlock.MACHINE_BLOCK_2, 8, "ChemicalCrystallizer", 37, TileEntityChemicalCrystallizer.class, true, true, true, Plane.HORIZONTAL, true), SEISMIC_VIBRATOR(MachineBlock.MACHINE_BLOCK_2, 9, "SeismicVibrator", 39, TileEntitySeismicVibrator.class, true, true, false, Plane.HORIZONTAL, true), PRESSURIZED_REACTION_CHAMBER(MachineBlock.MACHINE_BLOCK_2, 10, "PressurizedReactionChamber", 40, TileEntityPRC.class, true, true, false, Plane.HORIZONTAL, true), - FLUID_TANK(MachineBlock.MACHINE_BLOCK_2, 11, "FluidTank", 41, TileEntityFluidTank.class, false, true, false, never, true), + FLUID_TANK(MachineBlock.MACHINE_BLOCK_2, 11, "FluidTank", 41, TileEntityFluidTank.class, false, true, false, Predicates.alwaysFalse(), true), FLUIDIC_PLENISHER(MachineBlock.MACHINE_BLOCK_2, 12, "FluidicPlenisher", 42, TileEntityFluidicPlenisher.class, true, true, false, Plane.HORIZONTAL, true), - LASER(MachineBlock.MACHINE_BLOCK_2, 13, "Laser", -1, TileEntityLaser.class, true, true, false, always, false), - LASER_AMPLIFIER(MachineBlock.MACHINE_BLOCK_2, 14, "LaserAmplifier", 44, TileEntityLaserAmplifier.class, false, true, false, always, true), - LASER_TRACTOR_BEAM(MachineBlock.MACHINE_BLOCK_2, 15, "LaserTractorBeam", 45, TileEntityLaserTractorBeam.class, false, true, false, always, true), + LASER(MachineBlock.MACHINE_BLOCK_2, 13, "Laser", -1, TileEntityLaser.class, true, true, false, Predicates.alwaysTrue(), false), + LASER_AMPLIFIER(MachineBlock.MACHINE_BLOCK_2, 14, "LaserAmplifier", 44, TileEntityLaserAmplifier.class, false, true, false, Predicates.alwaysTrue(), true), + LASER_TRACTOR_BEAM(MachineBlock.MACHINE_BLOCK_2, 15, "LaserTractorBeam", 45, TileEntityLaserTractorBeam.class, false, true, false, Predicates.alwaysTrue(), true), QUANTUM_ENTANGLOPORTER(MachineBlock.MACHINE_BLOCK_3, 0, "QuantumEntangloporter", 46, TileEntityQuantumEntangloporter.class, true, false, false, Plane.HORIZONTAL, true), SOLAR_NEUTRON_ACTIVATOR(MachineBlock.MACHINE_BLOCK_3, 1, "SolarNeutronActivator", 47, TileEntitySolarNeutronActivator.class, false, true, false, Plane.HORIZONTAL, true), - AMBIENT_ACCUMULATOR(MachineBlock.MACHINE_BLOCK_3, 2, "AmbientAccumulator", 48, TileEntityAmbientAccumulator.class, true, false, false, never, true), + AMBIENT_ACCUMULATOR(MachineBlock.MACHINE_BLOCK_3, 2, "AmbientAccumulator", 48, TileEntityAmbientAccumulator.class, true, false, false, Predicates.alwaysFalse(), true), OREDICTIONIFICATOR(MachineBlock.MACHINE_BLOCK_3, 3, "Oredictionificator", 52, TileEntityOredictionificator.class, false, false, false, Plane.HORIZONTAL, true), - RESISTIVE_HEATER(MachineBlock.MACHINE_BLOCK_3, 4, "ResistiveHeater", 53, TileEntityResistiveHeater.class, true, false, false, always, true), - FORMULAIC_ASSEMBLICATOR(MachineBlock.MACHINE_BLOCK_3, 5, "FormulaicAssemblicator", 56, TileEntityFormulaicAssemblicator.class, true, false, true, always, true), - FUELWOOD_HEATER(MachineBlock.MACHINE_BLOCK_3, 6, "FuelwoodHeater", 58, TileEntityFuelwoodHeater.class, false, false, false, always, true); + RESISTIVE_HEATER(MachineBlock.MACHINE_BLOCK_3, 4, "ResistiveHeater", 53, TileEntityResistiveHeater.class, true, false, false, Predicates.alwaysTrue(), true), + FORMULAIC_ASSEMBLICATOR(MachineBlock.MACHINE_BLOCK_3, 5, "FormulaicAssemblicator", 56, TileEntityFormulaicAssemblicator.class, true, false, true, Predicates.alwaysTrue(), true), + FUELWOOD_HEATER(MachineBlock.MACHINE_BLOCK_3, 6, "FuelwoodHeater", 58, TileEntityFuelwoodHeater.class, false, false, false, Predicates.alwaysTrue(), true); public MachineBlock typeBlock; public int meta; @@ -413,6 +412,7 @@ public class BlockStateMachine extends BlockStateFacing BlockMachine block = (BlockMachine)state.getBlock(); MachineType type = state.getValue(block.getProperty()); StringBuilder builder = new StringBuilder(); + String nameOverride = null; if(type.hasActiveTexture()) { @@ -440,13 +440,20 @@ public class BlockStateMachine extends BlockStateFacing return new ModelResourceLocation("builtin/missing", "missing"); } } + + if(type == MachineType.BASIC_FACTORY || type == MachineType.ADVANCED_FACTORY || type == MachineType.ELITE_FACTORY) + { + RecipeType recipe = state.getValue(recipeProperty); + + nameOverride = type.getName() + "_" + recipe.getName(); + } if(builder.length() == 0) { builder.append("normal"); } - ResourceLocation baseLocation = new ResourceLocation("mekanism", type.getName()); + ResourceLocation baseLocation = new ResourceLocation("mekanism", nameOverride != null ? nameOverride : type.getName()); return new ModelResourceLocation(baseLocation, builder.toString()); } diff --git a/src/main/java/mekanism/common/item/ItemBlockMachine.java b/src/main/java/mekanism/common/item/ItemBlockMachine.java index cf591eef7..84867b777 100644 --- a/src/main/java/mekanism/common/item/ItemBlockMachine.java +++ b/src/main/java/mekanism/common/item/ItemBlockMachine.java @@ -3,17 +3,20 @@ package mekanism.common.item; import ic2.api.item.IElectricItemManager; import ic2.api.item.ISpecialElectricItem; +import java.util.ArrayList; import java.util.List; import java.util.Map; import mekanism.api.Coord4D; import mekanism.api.EnumColor; +import mekanism.api.Range4D; import mekanism.api.MekanismConfig.general; import mekanism.api.energy.IEnergizedItem; import mekanism.client.MekKeyHandler; import mekanism.client.MekanismKeyHandler; import mekanism.common.Tier.BaseTier; import mekanism.common.Tier.FluidTankTier; +import mekanism.common.Mekanism; import mekanism.common.Upgrade; import mekanism.common.base.IFactory; import mekanism.common.base.IRedstoneControl; @@ -28,6 +31,7 @@ import mekanism.common.block.states.BlockStateMachine; import mekanism.common.block.states.BlockStateMachine.MachineType; import mekanism.common.integration.IC2ItemManager; import mekanism.common.inventory.InventoryPersonalChest; +import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.security.ISecurityItem; import mekanism.common.security.ISecurityTile; import mekanism.common.security.ISecurityTile.SecurityMode; @@ -363,6 +367,8 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec factory.upgradeComponent.setSupported(Upgrade.GAS, recipeType.fuelEnergyUpgrades()); factory.secondaryEnergyPerTick = factory.getSecondaryEnergyPerTick(recipeType); world.notifyNeighborsOfStateChange(pos, tileEntity.getBlockType()); + + Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(tileEntity), tileEntity.getNetworkedData(new ArrayList())), new Range4D(Coord4D.get(tileEntity))); } if(tileEntity instanceof ISustainedTank) diff --git a/src/main/java/mekanism/common/tile/TileEntityFactory.java b/src/main/java/mekanism/common/tile/TileEntityFactory.java index f4344afa9..645911f83 100644 --- a/src/main/java/mekanism/common/tile/TileEntityFactory.java +++ b/src/main/java/mekanism/common/tile/TileEntityFactory.java @@ -769,13 +769,7 @@ public class TileEntityFactory extends TileEntityNoisyElectricBlock implements I clientActive = dataStream.readBoolean(); RecipeType oldRecipe = recipeType; recipeType = RecipeType.values()[dataStream.readInt()]; - upgradeComponent.setSupported(Upgrade.GAS, recipeType.fuelEnergyUpgrades()); - - if(recipeType != oldRecipe) - { - secondaryEnergyPerTick = getSecondaryEnergyPerTick(recipeType); - } - + upgradeComponent.setSupported(Upgrade.GAS, recipeType.fuelEnergyUpgrades()); recipeTicks = dataStream.readInt(); controlType = RedstoneControl.values()[dataStream.readInt()]; sorting = dataStream.readBoolean(); @@ -783,6 +777,16 @@ public class TileEntityFactory extends TileEntityNoisyElectricBlock implements I lastUsage = dataStream.readDouble(); infuseStored.amount = dataStream.readInt(); infuseStored.type = InfuseRegistry.get(PacketHandler.readString(dataStream)); + + if(recipeType != oldRecipe) + { + secondaryEnergyPerTick = getSecondaryEnergyPerTick(recipeType); + + if(!upgraded) + { + MekanismUtils.updateBlock(worldObj, getPos()); + } + } for(int i = 0; i < tier.processes; i++) { diff --git a/src/main/resources/assets/mekanism/blockstates/advanced_factory_combining.json b/src/main/resources/assets/mekanism/blockstates/advanced_factory_combining.json new file mode 100644 index 000000000..2f6e11b6e --- /dev/null +++ b/src/main/resources/assets/mekanism/blockstates/advanced_factory_combining.json @@ -0,0 +1,36 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "mekanism:machine", + "textures": { + "front": "mekanism:blocks/factory/advanced/combining/AdvancedCombiningFactoryFront", + "south": "mekanism:blocks/factory/advanced/combining/AdvancedCombiningFactoryBack", + "west": "mekanism:blocks/factory/advanced/combining/AdvancedCombiningFactoryRight", + "east": "mekanism:blocks/factory/advanced/combining/AdvancedCombiningFactoryLeft", + "up": "mekanism:blocks/factory/advanced/combining/AdvancedCombiningFactoryTop", + "down": "mekanism:blocks/factory/advanced/AdvancedFactoryBottom" + } + }, + "variants": { + "facing": { + "north": {}, + "south": {"y": 180}, + "east": {"y": 90}, + "west": {"y": -90} + }, + "active": { + "true": { + "textures": { + "front": "mekanism:blocks/factory/advanced/combining/AdvancedCombiningFactoryFrontOn", + "south": "mekanism:blocks/factory/advanced/combining/AdvancedCombiningFactoryBackOn", + "west": "mekanism:blocks/factory/advanced/combining/AdvancedCombiningFactoryRightOn", + "east": "mekanism:blocks/factory/advanced/combining/AdvancedCombiningFactoryLeftOn", + "up": "mekanism:blocks/factory/advanced/combining/AdvancedCombiningFactoryTopOn" + } + }, + "false": {} + }, + "inventory": [{}] + } +} + diff --git a/src/main/resources/assets/mekanism/blockstates/advanced_factory_compressing.json b/src/main/resources/assets/mekanism/blockstates/advanced_factory_compressing.json new file mode 100644 index 000000000..6a827787e --- /dev/null +++ b/src/main/resources/assets/mekanism/blockstates/advanced_factory_compressing.json @@ -0,0 +1,36 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "mekanism:machine", + "textures": { + "front": "mekanism:blocks/factory/advanced/compressing/AdvancedCompressingFactoryFront", + "south": "mekanism:blocks/factory/advanced/compressing/AdvancedCompressingFactoryBack", + "west": "mekanism:blocks/factory/advanced/compressing/AdvancedCompressingFactoryRight", + "east": "mekanism:blocks/factory/advanced/compressing/AdvancedCompressingFactoryLeft", + "up": "mekanism:blocks/factory/advanced/compressing/AdvancedCompressingFactoryTop", + "down": "mekanism:blocks/factory/advanced/AdvancedFactoryBottom" + } + }, + "variants": { + "facing": { + "north": {}, + "south": {"y": 180}, + "east": {"y": 90}, + "west": {"y": -90} + }, + "active": { + "true": { + "textures": { + "front": "mekanism:blocks/factory/advanced/compressing/AdvancedCompressingFactoryFrontOn", + "south": "mekanism:blocks/factory/advanced/compressing/AdvancedCompressingFactoryBackOn", + "west": "mekanism:blocks/factory/advanced/compressing/AdvancedCompressingFactoryRightOn", + "east": "mekanism:blocks/factory/advanced/compressing/AdvancedCompressingFactoryLeftOn", + "up": "mekanism:blocks/factory/advanced/compressing/AdvancedCompressingFactoryTopOn" + } + }, + "false": {} + }, + "inventory": [{}] + } +} + diff --git a/src/main/resources/assets/mekanism/blockstates/advanced_factory_crushing.json b/src/main/resources/assets/mekanism/blockstates/advanced_factory_crushing.json new file mode 100644 index 000000000..f0e4cfd6a --- /dev/null +++ b/src/main/resources/assets/mekanism/blockstates/advanced_factory_crushing.json @@ -0,0 +1,36 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "mekanism:machine", + "textures": { + "front": "mekanism:blocks/factory/advanced/crushing/AdvancedCrushingFactoryFront", + "south": "mekanism:blocks/factory/advanced/crushing/AdvancedCrushingFactoryBack", + "west": "mekanism:blocks/factory/advanced/crushing/AdvancedCrushingFactoryRight", + "east": "mekanism:blocks/factory/advanced/crushing/AdvancedCrushingFactoryLeft", + "up": "mekanism:blocks/factory/advanced/crushing/AdvancedCrushingFactoryTop", + "down": "mekanism:blocks/factory/advanced/AdvancedFactoryBottom" + } + }, + "variants": { + "facing": { + "north": {}, + "south": {"y": 180}, + "east": {"y": 90}, + "west": {"y": -90} + }, + "active": { + "true": { + "textures": { + "front": "mekanism:blocks/factory/advanced/crushing/AdvancedCrushingFactoryFrontOn", + "south": "mekanism:blocks/factory/advanced/crushing/AdvancedCrushingFactoryBackOn", + "west": "mekanism:blocks/factory/advanced/crushing/AdvancedCrushingFactoryRightOn", + "east": "mekanism:blocks/factory/advanced/crushing/AdvancedCrushingFactoryLeftOn", + "up": "mekanism:blocks/factory/advanced/crushing/AdvancedCrushingFactoryTopOn" + } + }, + "false": {} + }, + "inventory": [{}] + } +} + diff --git a/src/main/resources/assets/mekanism/blockstates/advanced_factory_enriching.json b/src/main/resources/assets/mekanism/blockstates/advanced_factory_enriching.json new file mode 100644 index 000000000..60158ff1c --- /dev/null +++ b/src/main/resources/assets/mekanism/blockstates/advanced_factory_enriching.json @@ -0,0 +1,36 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "mekanism:machine", + "textures": { + "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": { + "facing": { + "north": {}, + "south": {"y": 180}, + "east": {"y": 90}, + "west": {"y": -90} + }, + "active": { + "true": { + "textures": { + "front": "mekanism:blocks/factory/advanced/enriching/AdvancedEnrichingFactoryFrontOn", + "south": "mekanism:blocks/factory/advanced/enriching/AdvancedEnrichingFactoryBackOn", + "west": "mekanism:blocks/factory/advanced/enriching/AdvancedEnrichingFactoryRightOn", + "east": "mekanism:blocks/factory/advanced/enriching/AdvancedEnrichingFactoryLeftOn", + "up": "mekanism:blocks/factory/advanced/enriching/AdvancedEnrichingFactoryTopOn" + } + }, + "false": {} + }, + "inventory": [{}] + } +} + diff --git a/src/main/resources/assets/mekanism/blockstates/advanced_factory_infusing.json b/src/main/resources/assets/mekanism/blockstates/advanced_factory_infusing.json new file mode 100644 index 000000000..35c95dfc2 --- /dev/null +++ b/src/main/resources/assets/mekanism/blockstates/advanced_factory_infusing.json @@ -0,0 +1,36 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "mekanism:machine", + "textures": { + "front": "mekanism:blocks/factory/advanced/infusing/AdvancedInfusingFactoryFront", + "south": "mekanism:blocks/factory/advanced/infusing/AdvancedInfusingFactoryBack", + "west": "mekanism:blocks/factory/advanced/infusing/AdvancedInfusingFactoryRight", + "east": "mekanism:blocks/factory/advanced/infusing/AdvancedInfusingFactoryLeft", + "up": "mekanism:blocks/factory/advanced/infusing/AdvancedInfusingFactoryTop", + "down": "mekanism:blocks/factory/advanced/AdvancedFactoryBottom" + } + }, + "variants": { + "facing": { + "north": {}, + "south": {"y": 180}, + "east": {"y": 90}, + "west": {"y": -90} + }, + "active": { + "true": { + "textures": { + "front": "mekanism:blocks/factory/advanced/infusing/AdvancedInfusingFactoryFrontOn", + "south": "mekanism:blocks/factory/advanced/infusing/AdvancedInfusingFactoryBackOn", + "west": "mekanism:blocks/factory/advanced/infusing/AdvancedInfusingFactoryRightOn", + "east": "mekanism:blocks/factory/advanced/infusing/AdvancedInfusingFactoryLeftOn", + "up": "mekanism:blocks/factory/advanced/infusing/AdvancedInfusingFactoryTopOn" + } + }, + "false": {} + }, + "inventory": [{}] + } +} + diff --git a/src/main/resources/assets/mekanism/blockstates/advanced_factory_injecting.json b/src/main/resources/assets/mekanism/blockstates/advanced_factory_injecting.json new file mode 100644 index 000000000..1365c8c22 --- /dev/null +++ b/src/main/resources/assets/mekanism/blockstates/advanced_factory_injecting.json @@ -0,0 +1,36 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "mekanism:machine", + "textures": { + "front": "mekanism:blocks/factory/advanced/injecting/AdvancedInjectingFactoryFront", + "south": "mekanism:blocks/factory/advanced/injecting/AdvancedInjectingFactoryBack", + "west": "mekanism:blocks/factory/advanced/injecting/AdvancedInjectingFactoryRight", + "east": "mekanism:blocks/factory/advanced/injecting/AdvancedInjectingFactoryLeft", + "up": "mekanism:blocks/factory/advanced/injecting/AdvancedInjectingFactoryTop", + "down": "mekanism:blocks/factory/advanced/AdvancedFactoryBottom" + } + }, + "variants": { + "facing": { + "north": {}, + "south": {"y": 180}, + "east": {"y": 90}, + "west": {"y": -90} + }, + "active": { + "true": { + "textures": { + "front": "mekanism:blocks/factory/advanced/injecting/AdvancedInjectingFactoryFrontOn", + "south": "mekanism:blocks/factory/advanced/injecting/AdvancedInjectingFactoryBackOn", + "west": "mekanism:blocks/factory/advanced/injecting/AdvancedInjectingFactoryRightOn", + "east": "mekanism:blocks/factory/advanced/injecting/AdvancedInjectingFactoryLeftOn", + "up": "mekanism:blocks/factory/advanced/injecting/AdvancedInjectingFactoryTopOn" + } + }, + "false": {} + }, + "inventory": [{}] + } +} + diff --git a/src/main/resources/assets/mekanism/blockstates/advanced_factory.json b/src/main/resources/assets/mekanism/blockstates/advanced_factory_purifying.json similarity index 100% rename from src/main/resources/assets/mekanism/blockstates/advanced_factory.json rename to src/main/resources/assets/mekanism/blockstates/advanced_factory_purifying.json diff --git a/src/main/resources/assets/mekanism/blockstates/advanced_factory_smelting.json b/src/main/resources/assets/mekanism/blockstates/advanced_factory_smelting.json new file mode 100644 index 000000000..8e099df7d --- /dev/null +++ b/src/main/resources/assets/mekanism/blockstates/advanced_factory_smelting.json @@ -0,0 +1,36 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "mekanism:machine", + "textures": { + "front": "mekanism:blocks/factory/advanced/smelting/AdvancedSmeltingFactoryFront", + "south": "mekanism:blocks/factory/advanced/smelting/AdvancedSmeltingFactoryBack", + "west": "mekanism:blocks/factory/advanced/smelting/AdvancedSmeltingFactoryRight", + "east": "mekanism:blocks/factory/advanced/smelting/AdvancedSmeltingFactoryLeft", + "up": "mekanism:blocks/factory/advanced/smelting/AdvancedSmeltingFactoryTop", + "down": "mekanism:blocks/factory/advanced/AdvancedFactoryBottom" + } + }, + "variants": { + "facing": { + "north": {}, + "south": {"y": 180}, + "east": {"y": 90}, + "west": {"y": -90} + }, + "active": { + "true": { + "textures": { + "front": "mekanism:blocks/factory/advanced/smelting/AdvancedSmeltingFactoryFrontOn", + "south": "mekanism:blocks/factory/advanced/smelting/AdvancedSmeltingFactoryBackOn", + "west": "mekanism:blocks/factory/advanced/smelting/AdvancedSmeltingFactoryRightOn", + "east": "mekanism:blocks/factory/advanced/smelting/AdvancedSmeltingFactoryLeftOn", + "up": "mekanism:blocks/factory/advanced/smelting/AdvancedSmeltingFactoryTopOn" + } + }, + "false": {} + }, + "inventory": [{}] + } +} + diff --git a/src/main/resources/assets/mekanism/blockstates/basic_factory_combining.json b/src/main/resources/assets/mekanism/blockstates/basic_factory_combining.json new file mode 100644 index 000000000..48b0c4816 --- /dev/null +++ b/src/main/resources/assets/mekanism/blockstates/basic_factory_combining.json @@ -0,0 +1,36 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "mekanism:machine", + "textures": { + "front": "mekanism:blocks/factory/basic/combining/BasicCombiningFactoryFront", + "south": "mekanism:blocks/factory/basic/combining/BasicCombiningFactoryBack", + "west": "mekanism:blocks/factory/basic/combining/BasicCombiningFactoryRight", + "east": "mekanism:blocks/factory/basic/combining/BasicCombiningFactoryLeft", + "up": "mekanism:blocks/factory/basic/combining/BasicCombiningFactoryTop", + "down": "mekanism:blocks/factory/basic/BasicFactoryBottom" + } + }, + "variants": { + "facing": { + "north": {}, + "south": {"y": 180}, + "east": {"y": 90}, + "west": {"y": -90} + }, + "active": { + "true": { + "textures": { + "front": "mekanism:blocks/factory/basic/combining/BasicCombiningFactoryFrontOn", + "south": "mekanism:blocks/factory/basic/combining/BasicCombiningFactoryBackOn", + "west": "mekanism:blocks/factory/basic/combining/BasicCombiningFactoryRightOn", + "east": "mekanism:blocks/factory/basic/combining/BasicCombiningFactoryLeftOn", + "up": "mekanism:blocks/factory/basic/combining/BasicCombiningFactoryTopOn" + } + }, + "false": {} + }, + "inventory": [{}] + } +} + diff --git a/src/main/resources/assets/mekanism/blockstates/basic_factory_compressing.json b/src/main/resources/assets/mekanism/blockstates/basic_factory_compressing.json new file mode 100644 index 000000000..c0f1d624b --- /dev/null +++ b/src/main/resources/assets/mekanism/blockstates/basic_factory_compressing.json @@ -0,0 +1,36 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "mekanism:machine", + "textures": { + "front": "mekanism:blocks/factory/basic/compressing/BasicCompressingFactoryFront", + "south": "mekanism:blocks/factory/basic/compressing/BasicCompressingFactoryBack", + "west": "mekanism:blocks/factory/basic/compressing/BasicCompressingFactoryRight", + "east": "mekanism:blocks/factory/basic/compressing/BasicCompressingFactoryLeft", + "up": "mekanism:blocks/factory/basic/compressing/BasicCompressingFactoryTop", + "down": "mekanism:blocks/factory/basic/BasicFactoryBottom" + } + }, + "variants": { + "facing": { + "north": {}, + "south": {"y": 180}, + "east": {"y": 90}, + "west": {"y": -90} + }, + "active": { + "true": { + "textures": { + "front": "mekanism:blocks/factory/basic/compressing/BasicCompressingFactoryFrontOn", + "south": "mekanism:blocks/factory/basic/compressing/BasicCompressingFactoryBackOn", + "west": "mekanism:blocks/factory/basic/compressing/BasicCompressingFactoryRightOn", + "east": "mekanism:blocks/factory/basic/compressing/BasicCompressingFactoryLeftOn", + "up": "mekanism:blocks/factory/basic/compressing/BasicCompressingFactoryTopOn" + } + }, + "false": {} + }, + "inventory": [{}] + } +} + diff --git a/src/main/resources/assets/mekanism/blockstates/basic_factory_crushing.json b/src/main/resources/assets/mekanism/blockstates/basic_factory_crushing.json new file mode 100644 index 000000000..7d840023b --- /dev/null +++ b/src/main/resources/assets/mekanism/blockstates/basic_factory_crushing.json @@ -0,0 +1,36 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "mekanism:machine", + "textures": { + "front": "mekanism:blocks/factory/basic/crushing/BasicCrushingFactoryFront", + "south": "mekanism:blocks/factory/basic/crushing/BasicCrushingFactoryBack", + "west": "mekanism:blocks/factory/basic/crushing/BasicCrushingFactoryRight", + "east": "mekanism:blocks/factory/basic/crushing/BasicCrushingFactoryLeft", + "up": "mekanism:blocks/factory/basic/crushing/BasicCrushingFactoryTop", + "down": "mekanism:blocks/factory/basic/BasicFactoryBottom" + } + }, + "variants": { + "facing": { + "north": {}, + "south": {"y": 180}, + "east": {"y": 90}, + "west": {"y": -90} + }, + "active": { + "true": { + "textures": { + "front": "mekanism:blocks/factory/basic/crushing/BasicCrushingFactoryFrontOn", + "south": "mekanism:blocks/factory/basic/crushing/BasicCrushingFactoryBackOn", + "west": "mekanism:blocks/factory/basic/crushing/BasicCrushingFactoryRightOn", + "east": "mekanism:blocks/factory/basic/crushing/BasicCrushingFactoryLeftOn", + "up": "mekanism:blocks/factory/basic/crushing/BasicCrushingFactoryTopOn" + } + }, + "false": {} + }, + "inventory": [{}] + } +} + diff --git a/src/main/resources/assets/mekanism/blockstates/basic_factory.json b/src/main/resources/assets/mekanism/blockstates/basic_factory_enriching.json similarity index 61% rename from src/main/resources/assets/mekanism/blockstates/basic_factory.json rename to src/main/resources/assets/mekanism/blockstates/basic_factory_enriching.json index 531b00c98..f07ba429c 100644 --- a/src/main/resources/assets/mekanism/blockstates/basic_factory.json +++ b/src/main/resources/assets/mekanism/blockstates/basic_factory_enriching.json @@ -19,7 +19,15 @@ "west": {"y": -90} }, "active": { - "true": {}, + "true": { + "textures": { + "front": "mekanism:blocks/factory/basic/enriching/BasicEnrichingFactoryFrontOn", + "south": "mekanism:blocks/factory/basic/enriching/BasicEnrichingFactoryBackOn", + "west": "mekanism:blocks/factory/basic/enriching/BasicEnrichingFactoryRightOn", + "east": "mekanism:blocks/factory/basic/enriching/BasicEnrichingFactoryLeftOn", + "up": "mekanism:blocks/factory/basic/enriching/BasicEnrichingFactoryTopOn" + } + }, "false": {} }, "inventory": [{}] diff --git a/src/main/resources/assets/mekanism/blockstates/basic_factory_infusing.json b/src/main/resources/assets/mekanism/blockstates/basic_factory_infusing.json new file mode 100644 index 000000000..d0fd2b903 --- /dev/null +++ b/src/main/resources/assets/mekanism/blockstates/basic_factory_infusing.json @@ -0,0 +1,36 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "mekanism:machine", + "textures": { + "front": "mekanism:blocks/factory/basic/infusing/BasicInfusingFactoryFront", + "south": "mekanism:blocks/factory/basic/infusing/BasicInfusingFactoryBack", + "west": "mekanism:blocks/factory/basic/infusing/BasicInfusingFactoryRight", + "east": "mekanism:blocks/factory/basic/infusing/BasicInfusingFactoryLeft", + "up": "mekanism:blocks/factory/basic/infusing/BasicInfusingFactoryTop", + "down": "mekanism:blocks/factory/basic/BasicFactoryBottom" + } + }, + "variants": { + "facing": { + "north": {}, + "south": {"y": 180}, + "east": {"y": 90}, + "west": {"y": -90} + }, + "active": { + "true": { + "textures": { + "front": "mekanism:blocks/factory/basic/infusing/BasicInfusingFactoryFrontOn", + "south": "mekanism:blocks/factory/basic/infusing/BasicInfusingFactoryBackOn", + "west": "mekanism:blocks/factory/basic/infusing/BasicInfusingFactoryRightOn", + "east": "mekanism:blocks/factory/basic/infusing/BasicInfusingFactoryLeftOn", + "up": "mekanism:blocks/factory/basic/infusing/BasicInfusingFactoryTopOn" + } + }, + "false": {} + }, + "inventory": [{}] + } +} + diff --git a/src/main/resources/assets/mekanism/blockstates/basic_factory_injecting.json b/src/main/resources/assets/mekanism/blockstates/basic_factory_injecting.json new file mode 100644 index 000000000..5d96be893 --- /dev/null +++ b/src/main/resources/assets/mekanism/blockstates/basic_factory_injecting.json @@ -0,0 +1,36 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "mekanism:machine", + "textures": { + "front": "mekanism:blocks/factory/basic/injecting/BasicInjectingFactoryFront", + "south": "mekanism:blocks/factory/basic/injecting/BasicInjectingFactoryBack", + "west": "mekanism:blocks/factory/basic/injecting/BasicInjectingFactoryRight", + "east": "mekanism:blocks/factory/basic/injecting/BasicInjectingFactoryLeft", + "up": "mekanism:blocks/factory/basic/injecting/BasicInjectingFactoryTop", + "down": "mekanism:blocks/factory/basic/BasicFactoryBottom" + } + }, + "variants": { + "facing": { + "north": {}, + "south": {"y": 180}, + "east": {"y": 90}, + "west": {"y": -90} + }, + "active": { + "true": { + "textures": { + "front": "mekanism:blocks/factory/basic/injecting/BasicInjectingFactoryFrontOn", + "south": "mekanism:blocks/factory/basic/injecting/BasicInjectingFactoryBackOn", + "west": "mekanism:blocks/factory/basic/injecting/BasicInjectingFactoryRightOn", + "east": "mekanism:blocks/factory/basic/injecting/BasicInjectingFactoryLeftOn", + "up": "mekanism:blocks/factory/basic/injecting/BasicInjectingFactoryTopOn" + } + }, + "false": {} + }, + "inventory": [{}] + } +} + diff --git a/src/main/resources/assets/mekanism/blockstates/basic_factory_purifying.json b/src/main/resources/assets/mekanism/blockstates/basic_factory_purifying.json new file mode 100644 index 000000000..6329b4a23 --- /dev/null +++ b/src/main/resources/assets/mekanism/blockstates/basic_factory_purifying.json @@ -0,0 +1,36 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "mekanism:machine", + "textures": { + "front": "mekanism:blocks/factory/basic/purifying/BasicPurifyingFactoryFront", + "south": "mekanism:blocks/factory/basic/purifying/BasicPurifyingFactoryBack", + "west": "mekanism:blocks/factory/basic/purifying/BasicPurifyingFactoryRight", + "east": "mekanism:blocks/factory/basic/purifying/BasicPurifyingFactoryLeft", + "up": "mekanism:blocks/factory/basic/purifying/BasicPurifyingFactoryTop", + "down": "mekanism:blocks/factory/basic/BasicFactoryBottom" + } + }, + "variants": { + "facing": { + "north": {}, + "south": {"y": 180}, + "east": {"y": 90}, + "west": {"y": -90} + }, + "active": { + "true": { + "textures": { + "front": "mekanism:blocks/factory/basic/purifying/BasicPurifyingFactoryFrontOn", + "south": "mekanism:blocks/factory/basic/purifying/BasicPurifyingFactoryBackOn", + "west": "mekanism:blocks/factory/basic/purifying/BasicPurifyingFactoryRightOn", + "east": "mekanism:blocks/factory/basic/purifying/BasicPurifyingFactoryLeftOn", + "up": "mekanism:blocks/factory/basic/purifying/BasicPurifyingFactoryTopOn" + } + }, + "false": {} + }, + "inventory": [{}] + } +} + diff --git a/src/main/resources/assets/mekanism/blockstates/basic_factory_smelting.json b/src/main/resources/assets/mekanism/blockstates/basic_factory_smelting.json new file mode 100644 index 000000000..57b435359 --- /dev/null +++ b/src/main/resources/assets/mekanism/blockstates/basic_factory_smelting.json @@ -0,0 +1,36 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "mekanism:machine", + "textures": { + "front": "mekanism:blocks/factory/basic/smelting/BasicSmeltingFactoryFront", + "south": "mekanism:blocks/factory/basic/smelting/BasicSmeltingFactoryBack", + "west": "mekanism:blocks/factory/basic/smelting/BasicSmeltingFactoryRight", + "east": "mekanism:blocks/factory/basic/smelting/BasicSmeltingFactoryLeft", + "up": "mekanism:blocks/factory/basic/smelting/BasicSmeltingFactoryTop", + "down": "mekanism:blocks/factory/basic/BasicFactoryBottom" + } + }, + "variants": { + "facing": { + "north": {}, + "south": {"y": 180}, + "east": {"y": 90}, + "west": {"y": -90} + }, + "active": { + "true": { + "textures": { + "front": "mekanism:blocks/factory/basic/smelting/BasicSmeltingFactoryFrontOn", + "south": "mekanism:blocks/factory/basic/smelting/BasicSmeltingFactoryBackOn", + "west": "mekanism:blocks/factory/basic/smelting/BasicSmeltingFactoryRightOn", + "east": "mekanism:blocks/factory/basic/smelting/BasicSmeltingFactoryLeftOn", + "up": "mekanism:blocks/factory/basic/smelting/BasicSmeltingFactoryTopOn" + } + }, + "false": {} + }, + "inventory": [{}] + } +} + diff --git a/src/main/resources/assets/mekanism/blockstates/elite_factory_combining.json b/src/main/resources/assets/mekanism/blockstates/elite_factory_combining.json new file mode 100644 index 000000000..2beb0730b --- /dev/null +++ b/src/main/resources/assets/mekanism/blockstates/elite_factory_combining.json @@ -0,0 +1,36 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "mekanism:machine", + "textures": { + "front": "mekanism:blocks/factory/elite/combining/EliteCombiningFactoryFront", + "south": "mekanism:blocks/factory/elite/combining/EliteCombiningFactoryBack", + "west": "mekanism:blocks/factory/elite/combining/EliteCombiningFactoryRight", + "east": "mekanism:blocks/factory/elite/combining/EliteCombiningFactoryLeft", + "up": "mekanism:blocks/factory/elite/combining/EliteCombiningFactoryTop", + "down": "mekanism:blocks/factory/elite/EliteFactoryBottom" + } + }, + "variants": { + "facing": { + "north": {}, + "south": {"y": 180}, + "east": {"y": 90}, + "west": {"y": -90} + }, + "active": { + "true": { + "textures": { + "front": "mekanism:blocks/factory/elite/combining/EliteCombiningFactoryFrontOn", + "south": "mekanism:blocks/factory/elite/combining/EliteCombiningFactoryBackOn", + "west": "mekanism:blocks/factory/elite/combining/EliteCombiningFactoryRightOn", + "east": "mekanism:blocks/factory/elite/combining/EliteCombiningFactoryLeftOn", + "up": "mekanism:blocks/factory/elite/combining/EliteCombiningFactoryTopOn" + } + }, + "false": {} + }, + "inventory": [{}] + } +} + diff --git a/src/main/resources/assets/mekanism/blockstates/elite_factory_compressing.json b/src/main/resources/assets/mekanism/blockstates/elite_factory_compressing.json new file mode 100644 index 000000000..697a54223 --- /dev/null +++ b/src/main/resources/assets/mekanism/blockstates/elite_factory_compressing.json @@ -0,0 +1,36 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "mekanism:machine", + "textures": { + "front": "mekanism:blocks/factory/elite/compressing/EliteCompressingFactoryFront", + "south": "mekanism:blocks/factory/elite/compressing/EliteCompressingFactoryBack", + "west": "mekanism:blocks/factory/elite/compressing/EliteCompressingFactoryRight", + "east": "mekanism:blocks/factory/elite/compressing/EliteCompressingFactoryLeft", + "up": "mekanism:blocks/factory/elite/compressing/EliteCompressingFactoryTop", + "down": "mekanism:blocks/factory/elite/EliteFactoryBottom" + } + }, + "variants": { + "facing": { + "north": {}, + "south": {"y": 180}, + "east": {"y": 90}, + "west": {"y": -90} + }, + "active": { + "true": { + "textures": { + "front": "mekanism:blocks/factory/elite/compressing/EliteCompressingFactoryFrontOn", + "south": "mekanism:blocks/factory/elite/compressing/EliteCompressingFactoryBackOn", + "west": "mekanism:blocks/factory/elite/compressing/EliteCompressingFactoryRightOn", + "east": "mekanism:blocks/factory/elite/compressing/EliteCompressingFactoryLeftOn", + "up": "mekanism:blocks/factory/elite/compressing/EliteCompressingFactoryTopOn" + } + }, + "false": {} + }, + "inventory": [{}] + } +} + diff --git a/src/main/resources/assets/mekanism/blockstates/elite_factory_crushing.json b/src/main/resources/assets/mekanism/blockstates/elite_factory_crushing.json new file mode 100644 index 000000000..d2e64ae36 --- /dev/null +++ b/src/main/resources/assets/mekanism/blockstates/elite_factory_crushing.json @@ -0,0 +1,36 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "mekanism:machine", + "textures": { + "front": "mekanism:blocks/factory/elite/crushing/EliteCrushingFactoryFront", + "south": "mekanism:blocks/factory/elite/crushing/EliteCrushingFactoryBack", + "west": "mekanism:blocks/factory/elite/crushing/EliteCrushingFactoryRight", + "east": "mekanism:blocks/factory/elite/crushing/EliteCrushingFactoryLeft", + "up": "mekanism:blocks/factory/elite/crushing/EliteCrushingFactoryTop", + "down": "mekanism:blocks/factory/elite/EliteFactoryBottom" + } + }, + "variants": { + "facing": { + "north": {}, + "south": {"y": 180}, + "east": {"y": 90}, + "west": {"y": -90} + }, + "active": { + "true": { + "textures": { + "front": "mekanism:blocks/factory/elite/crushing/EliteCrushingFactoryFrontOn", + "south": "mekanism:blocks/factory/elite/crushing/EliteCrushingFactoryBackOn", + "west": "mekanism:blocks/factory/elite/crushing/EliteCrushingFactoryRightOn", + "east": "mekanism:blocks/factory/elite/crushing/EliteCrushingFactoryLeftOn", + "up": "mekanism:blocks/factory/elite/crushing/EliteCrushingFactoryTopOn" + } + }, + "false": {} + }, + "inventory": [{}] + } +} + diff --git a/src/main/resources/assets/mekanism/blockstates/elite_factory.json b/src/main/resources/assets/mekanism/blockstates/elite_factory_enriching.json similarity index 61% rename from src/main/resources/assets/mekanism/blockstates/elite_factory.json rename to src/main/resources/assets/mekanism/blockstates/elite_factory_enriching.json index 74ec1d7be..5f62dd7be 100644 --- a/src/main/resources/assets/mekanism/blockstates/elite_factory.json +++ b/src/main/resources/assets/mekanism/blockstates/elite_factory_enriching.json @@ -19,7 +19,15 @@ "west": {"y": -90} }, "active": { - "true": {}, + "true": { + "textures": { + "front": "mekanism:blocks/factory/elite/enriching/EliteEnrichingFactoryFrontOn", + "south": "mekanism:blocks/factory/elite/enriching/EliteEnrichingFactoryBackOn", + "west": "mekanism:blocks/factory/elite/enriching/EliteEnrichingFactoryRightOn", + "east": "mekanism:blocks/factory/elite/enriching/EliteEnrichingFactoryLeftOn", + "up": "mekanism:blocks/factory/elite/enriching/EliteEnrichingFactoryTopOn" + } + }, "false": {} }, "inventory": [{}] diff --git a/src/main/resources/assets/mekanism/blockstates/elite_factory_infusing.json b/src/main/resources/assets/mekanism/blockstates/elite_factory_infusing.json new file mode 100644 index 000000000..c6564d32b --- /dev/null +++ b/src/main/resources/assets/mekanism/blockstates/elite_factory_infusing.json @@ -0,0 +1,36 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "mekanism:machine", + "textures": { + "front": "mekanism:blocks/factory/elite/infusing/EliteInfusingFactoryFront", + "south": "mekanism:blocks/factory/elite/infusing/EliteInfusingFactoryBack", + "west": "mekanism:blocks/factory/elite/infusing/EliteInfusingFactoryRight", + "east": "mekanism:blocks/factory/elite/infusing/EliteInfusingFactoryLeft", + "up": "mekanism:blocks/factory/elite/infusing/EliteInfusingFactoryTop", + "down": "mekanism:blocks/factory/elite/EliteFactoryBottom" + } + }, + "variants": { + "facing": { + "north": {}, + "south": {"y": 180}, + "east": {"y": 90}, + "west": {"y": -90} + }, + "active": { + "true": { + "textures": { + "front": "mekanism:blocks/factory/elite/infusing/EliteInfusingFactoryFrontOn", + "south": "mekanism:blocks/factory/elite/infusing/EliteInfusingFactoryBackOn", + "west": "mekanism:blocks/factory/elite/infusing/EliteInfusingFactoryRightOn", + "east": "mekanism:blocks/factory/elite/infusing/EliteInfusingFactoryLeftOn", + "up": "mekanism:blocks/factory/elite/infusing/EliteInfusingFactoryTopOn" + } + }, + "false": {} + }, + "inventory": [{}] + } +} + diff --git a/src/main/resources/assets/mekanism/blockstates/elite_factory_injecting.json b/src/main/resources/assets/mekanism/blockstates/elite_factory_injecting.json new file mode 100644 index 000000000..4d0648c93 --- /dev/null +++ b/src/main/resources/assets/mekanism/blockstates/elite_factory_injecting.json @@ -0,0 +1,36 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "mekanism:machine", + "textures": { + "front": "mekanism:blocks/factory/elite/injecting/EliteInjectingFactoryFront", + "south": "mekanism:blocks/factory/elite/injecting/EliteInjectingFactoryBack", + "west": "mekanism:blocks/factory/elite/injecting/EliteInjectingFactoryRight", + "east": "mekanism:blocks/factory/elite/injecting/EliteInjectingFactoryLeft", + "up": "mekanism:blocks/factory/elite/injecting/EliteInjectingFactoryTop", + "down": "mekanism:blocks/factory/elite/EliteFactoryBottom" + } + }, + "variants": { + "facing": { + "north": {}, + "south": {"y": 180}, + "east": {"y": 90}, + "west": {"y": -90} + }, + "active": { + "true": { + "textures": { + "front": "mekanism:blocks/factory/elite/injecting/EliteInjectingFactoryFrontOn", + "south": "mekanism:blocks/factory/elite/injecting/EliteInjectingFactoryBackOn", + "west": "mekanism:blocks/factory/elite/injecting/EliteInjectingFactoryRightOn", + "east": "mekanism:blocks/factory/elite/injecting/EliteInjectingFactoryLeftOn", + "up": "mekanism:blocks/factory/elite/injecting/EliteInjectingFactoryTopOn" + } + }, + "false": {} + }, + "inventory": [{}] + } +} + diff --git a/src/main/resources/assets/mekanism/blockstates/elite_factory_purifying.json b/src/main/resources/assets/mekanism/blockstates/elite_factory_purifying.json new file mode 100644 index 000000000..5a8d804e1 --- /dev/null +++ b/src/main/resources/assets/mekanism/blockstates/elite_factory_purifying.json @@ -0,0 +1,36 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "mekanism:machine", + "textures": { + "front": "mekanism:blocks/factory/elite/purifying/ElitePurifyingFactoryFront", + "south": "mekanism:blocks/factory/elite/purifying/ElitePurifyingFactoryBack", + "west": "mekanism:blocks/factory/elite/purifying/ElitePurifyingFactoryRight", + "east": "mekanism:blocks/factory/elite/purifying/ElitePurifyingFactoryLeft", + "up": "mekanism:blocks/factory/elite/purifying/ElitePurifyingFactoryTop", + "down": "mekanism:blocks/factory/elite/EliteFactoryBottom" + } + }, + "variants": { + "facing": { + "north": {}, + "south": {"y": 180}, + "east": {"y": 90}, + "west": {"y": -90} + }, + "active": { + "true": { + "textures": { + "front": "mekanism:blocks/factory/elite/purifying/ElitePurifyingFactoryFrontOn", + "south": "mekanism:blocks/factory/elite/purifying/ElitePurifyingFactoryBackOn", + "west": "mekanism:blocks/factory/elite/purifying/ElitePurifyingFactoryRightOn", + "east": "mekanism:blocks/factory/elite/purifying/ElitePurifyingFactoryLeftOn", + "up": "mekanism:blocks/factory/elite/purifying/ElitePurifyingFactoryTopOn" + } + }, + "false": {} + }, + "inventory": [{}] + } +} + diff --git a/src/main/resources/assets/mekanism/blockstates/elite_factory_smelting.json b/src/main/resources/assets/mekanism/blockstates/elite_factory_smelting.json new file mode 100644 index 000000000..b6117575e --- /dev/null +++ b/src/main/resources/assets/mekanism/blockstates/elite_factory_smelting.json @@ -0,0 +1,36 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "mekanism:machine", + "textures": { + "front": "mekanism:blocks/factory/elite/smelting/EliteSmeltingFactoryFront", + "south": "mekanism:blocks/factory/elite/smelting/EliteSmeltingFactoryBack", + "west": "mekanism:blocks/factory/elite/smelting/EliteSmeltingFactoryRight", + "east": "mekanism:blocks/factory/elite/smelting/EliteSmeltingFactoryLeft", + "up": "mekanism:blocks/factory/elite/smelting/EliteSmeltingFactoryTop", + "down": "mekanism:blocks/factory/elite/EliteFactoryBottom" + } + }, + "variants": { + "facing": { + "north": {}, + "south": {"y": 180}, + "east": {"y": 90}, + "west": {"y": -90} + }, + "active": { + "true": { + "textures": { + "front": "mekanism:blocks/factory/elite/smelting/EliteSmeltingFactoryFrontOn", + "south": "mekanism:blocks/factory/elite/smelting/EliteSmeltingFactoryBackOn", + "west": "mekanism:blocks/factory/elite/smelting/EliteSmeltingFactoryRightOn", + "east": "mekanism:blocks/factory/elite/smelting/EliteSmeltingFactoryLeftOn", + "up": "mekanism:blocks/factory/elite/smelting/EliteSmeltingFactoryTopOn" + } + }, + "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 35508f9a1..6650c300e 100644 --- a/src/main/resources/assets/mekanism/blockstates/purification_chamber.json +++ b/src/main/resources/assets/mekanism/blockstates/purification_chamber.json @@ -19,7 +19,7 @@ "east": {"y": 90}, "west": {"y": -90} }, - "active": { + "active": { "true": { "textures": { "front": "mekanism:blocks/purification_chamber/PurificationChamberFrontOn", diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedFactoryFront.png deleted file mode 100644 index 7407ed96b..000000000 Binary files a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedFactoryFront.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedFactorySide.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedFactorySide.png deleted file mode 100644 index b1eb966e7..000000000 Binary files a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedFactorySide.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedFactoryTop.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedFactoryTop.png deleted file mode 100644 index 18e2eb83d..000000000 Binary files a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedFactoryTop.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/infusing/AdvancedInfusingFactoryBottom.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/infusing/AdvancedInfusingFactoryBottom.png deleted file mode 100644 index 5b83ac09f..000000000 Binary files a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/infusing/AdvancedInfusingFactoryBottom.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicFactoryFront.png deleted file mode 100644 index 3c4dbe028..000000000 Binary files a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicFactoryFront.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicFactorySide.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicFactorySide.png deleted file mode 100644 index ea7b16ef4..000000000 Binary files a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicFactorySide.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicFactoryTop.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicFactoryTop.png deleted file mode 100644 index cdf498a6d..000000000 Binary files a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicFactoryTop.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/infusing/BasicInfusingFactoryBottom.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/infusing/BasicInfusingFactoryBottom.png deleted file mode 100644 index 90b8520fc..000000000 Binary files a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/infusing/BasicInfusingFactoryBottom.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/injecting/BasicInjectingFactoryBottom.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/injecting/BasicInjectingFactoryBottom.png deleted file mode 100644 index 4a1079806..000000000 Binary files a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/injecting/BasicInjectingFactoryBottom.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteFactoryFront.png deleted file mode 100644 index fcce7ffd4..000000000 Binary files a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteFactoryFront.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteFactorySide.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteFactorySide.png deleted file mode 100644 index 92cdb2c9d..000000000 Binary files a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteFactorySide.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteFactoryTop.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteFactoryTop.png deleted file mode 100644 index 491eda5ec..000000000 Binary files a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteFactoryTop.png and /dev/null differ