diff --git a/src/main/java/mekanism/client/render/ctm/CTMData.java b/src/main/java/mekanism/client/render/ctm/CTMData.java index 0333ce1cb..f6cfd7e77 100644 --- a/src/main/java/mekanism/client/render/ctm/CTMData.java +++ b/src/main/java/mekanism/client/render/ctm/CTMData.java @@ -39,9 +39,9 @@ public class CTMData if(state.getBlock() instanceof ICTMBlock) { IStringSerializable serializable = (IStringSerializable)state.getValue(((ICTMBlock)state.getBlock()).getTypeProperty()); - return acceptableBlockStates.contains(serializable.getName()); + return !acceptableBlockStates.contains(serializable.getName()); } - return false; + return true; } } diff --git a/src/main/java/mekanism/client/render/ctm/ModelChiselBlock.java b/src/main/java/mekanism/client/render/ctm/ModelChiselBlock.java index e0267f5b9..2217ab61b 100644 --- a/src/main/java/mekanism/client/render/ctm/ModelChiselBlock.java +++ b/src/main/java/mekanism/client/render/ctm/ModelChiselBlock.java @@ -92,7 +92,7 @@ public class ModelChiselBlock implements ISmartBlockModel, ISmartItemModel, IPer @Override public TextureAtlasSprite getParticleTexture() { - return this.model.getDefaultFace().getParticle(); + return model.getDefaultFace().getParticle(); } @Override @@ -120,7 +120,7 @@ public class ModelChiselBlock implements ISmartBlockModel, ISmartItemModel, IPer @Override public IBakedModel handleItemState(ItemStack stack) { - Block block = ((ItemBlock) stack.getItem()).getBlock(); + Block block = ((ItemBlock)stack.getItem()).getBlock(); return createModel(block.getDefaultState(), model, null); } @@ -179,6 +179,7 @@ public class ModelChiselBlock implements ISmartBlockModel, ISmartItemModel, IPer return thirdPersonTransform; } + return Pair.of(this, null); } } diff --git a/src/main/java/mekanism/common/block/BlockBasic.java b/src/main/java/mekanism/common/block/BlockBasic.java index 2f7bd1fb2..3802fd4ba 100644 --- a/src/main/java/mekanism/common/block/BlockBasic.java +++ b/src/main/java/mekanism/common/block/BlockBasic.java @@ -144,7 +144,7 @@ public abstract class BlockBasic extends Block implements ICTMBlock//TODO? imple { BlockStateBasic.BasicBlockType type = BlockStateBasic.BasicBlockType.get(getBasicBlock(), meta&0xF); - return this.getDefaultState().withProperty(getProperty(), type); + return getDefaultState().withProperty(getProperty(), type); } @Override @@ -296,92 +296,6 @@ public abstract class BlockBasic extends Block implements ICTMBlock//TODO? imple break; } } -/* - @Override - @SideOnly(Side.CLIENT) - public IIcon getIcon(IBlockAccess world, BlockPos pos, int side) - { - int meta = world.getBlockMetadata(pos); - - switch(blockType) - { - case BASIC_BLOCK_1: - switch(meta) - { - case 6: - TileEntityBin tileEntity = (TileEntityBin)world.getTileEntity(pos); - - boolean active = MekanismUtils.isActive(world, pos); - return binIcons[tileEntity.tier.ordinal()][MekanismUtils.getBaseOrientation(side, tileEntity.facing)+(active ? 6 : 0)]; - case 14: - TileEntityThermalEvaporationController tileEntity1 = (TileEntityThermalEvaporationController)world.getTileEntity(pos); - - if(side == tileEntity1.facing) - { - return MekanismUtils.isActive(world, pos) ? icons[meta][1] : icons[meta][0]; - } - else { - return icons[meta][2]; - } - default: - return getIcon(side, meta); - } - case BASIC_BLOCK_2: - switch(meta) - { - case 2: - TileEntityInductionPort tileEntity = (TileEntityInductionPort)world.getTileEntity(pos); - return icons[meta][tileEntity.mode ? 1 : 0]; - case 3: - TileEntityInductionCell tileEntity1 = (TileEntityInductionCell)world.getTileEntity(pos); - return icons[meta][tileEntity1.tier.ordinal()]; - case 4: - TileEntityInductionProvider tileEntity2 = (TileEntityInductionProvider)world.getTileEntity(pos); - return icons[meta][tileEntity2.tier.ordinal()]; - case 5: - TileEntitySuperheatingElement element = (TileEntitySuperheatingElement)world.getTileEntity(x, y, z); - - if(element.multiblockUUID != null && SynchronizedBoilerData.clientHotMap.get(element.multiblockUUID) != null) - { - return icons[meta][SynchronizedBoilerData.clientHotMap.get(element.multiblockUUID) ? 1 : 0]; - } - - return icons[meta][0]; - default: - return getIcon(side, meta); - } - } - - return null; - } - - @Override - @SideOnly(Side.CLIENT) - public IIcon getIcon(int side, int meta) - { - switch(blockType) - { - case BASIC_BLOCK_1: - switch(meta) - { - case 14: - if(side == 2) - { - return icons[meta][0]; - } - else { - return icons[meta][2]; - } - default: - return icons[meta][0]; - } - case BASIC_BLOCK_2: - return icons[meta][0]; - default: - return icons[meta][0]; - } - } -*/ @Override public int damageDropped(IBlockState state) @@ -1037,7 +951,7 @@ public abstract class BlockBasic extends Block implements ICTMBlock//TODO? imple @SideOnly(Side.CLIENT) public boolean shouldSideBeRendered(IBlockAccess world, BlockPos pos, EnumFacing side) { - BlockPos offsetPos = pos.offset(EnumFacing.getFront(side.ordinal()).getOpposite()); + BlockPos offsetPos = pos.offset(side.getOpposite()); if(BasicBlockType.get(world.getBlockState(offsetPos)) == BasicBlockType.STRUCTURAL_GLASS) { @@ -1109,6 +1023,7 @@ public abstract class BlockBasic extends Block implements ICTMBlock//TODO? imple { if(side == state.getValue(BlockStateFacing.facingProperty)) { + System.out.println("Yeet"); return type.getName() + (state.getValue(BlockStateBasic.activeProperty) ? "_on" : ""); } } diff --git a/src/main/java/mekanism/common/block/states/BlockStateBasic.java b/src/main/java/mekanism/common/block/states/BlockStateBasic.java index dbeb545b6..2a61f562c 100644 --- a/src/main/java/mekanism/common/block/states/BlockStateBasic.java +++ b/src/main/java/mekanism/common/block/states/BlockStateBasic.java @@ -90,24 +90,24 @@ public class BlockStateBasic extends ExtendedBlockState REFINED_GLOWSTONE(BasicBlock.BASIC_BLOCK_1, 4, "RefinedGlowstone", null, false, Predicates.alwaysFalse(), false, false), STEEL_BLOCK(BasicBlock.BASIC_BLOCK_1, 5, "SteelBlock", null, false, Predicates.alwaysFalse(), false, false), BIN(BasicBlock.BASIC_BLOCK_1, 6, "Bin", TileEntityBin.class, false, Plane.HORIZONTAL, true, false), - TELEPORTER_FRAME(BasicBlock.BASIC_BLOCK_1, 7, "TeleporterFrame", null, false, Predicates.alwaysFalse(), false, true), + TELEPORTER_FRAME(BasicBlock.BASIC_BLOCK_1, 7, "TeleporterFrame", null, false, Predicates.alwaysFalse(), false, false), STEEL_CASING(BasicBlock.BASIC_BLOCK_1, 8, "SteelCasing", null, false, Predicates.alwaysFalse(), false, false), - DYNAMIC_TANK(BasicBlock.BASIC_BLOCK_1, 9, "DynamicTank", TileEntityDynamicTank.class, false, Predicates.alwaysFalse(), false, true), - STRUCTURAL_GLASS(BasicBlock.BASIC_BLOCK_1, 10, "StructuralGlass", TileEntityStructuralGlass.class, false, Predicates.alwaysFalse(), false, true), - DYNAMIC_VALVE(BasicBlock.BASIC_BLOCK_1, 11, "DynamicValve", TileEntityDynamicValve.class, false, Predicates.alwaysFalse(), false, true), + DYNAMIC_TANK(BasicBlock.BASIC_BLOCK_1, 9, "DynamicTank", TileEntityDynamicTank.class, false, Predicates.alwaysFalse(), false, false), + STRUCTURAL_GLASS(BasicBlock.BASIC_BLOCK_1, 10, "StructuralGlass", TileEntityStructuralGlass.class, false, Predicates.alwaysFalse(), false, false), + DYNAMIC_VALVE(BasicBlock.BASIC_BLOCK_1, 11, "DynamicValve", TileEntityDynamicValve.class, false, Predicates.alwaysFalse(), false, false), COPPER_BLOCK(BasicBlock.BASIC_BLOCK_1, 12, "CopperBlock", null, false, Predicates.alwaysFalse(), false, false), TIN_BLOCK(BasicBlock.BASIC_BLOCK_1, 13, "TinBlock", null, false, Predicates.alwaysFalse(), false, false), - THERMAL_EVAPORATION_CONTROLLER(BasicBlock.BASIC_BLOCK_1, 14, "ThermalEvaporationController", TileEntityThermalEvaporationController.class, false, Plane.HORIZONTAL, true, true), - THERMAL_EVAPORATION_VALVE(BasicBlock.BASIC_BLOCK_1, 15, "ThermalEvaporationValve", TileEntityThermalEvaporationValve.class, false, Predicates.alwaysFalse(), false, true), - THERMAL_EVAPORATION_BLOCK(BasicBlock.BASIC_BLOCK_2, 0, "ThermalEvaporationBlock", TileEntityThermalEvaporationBlock.class, false, Predicates.alwaysFalse(), false, true), - INDUCTION_CASING(BasicBlock.BASIC_BLOCK_2, 1, "InductionCasing", TileEntityInductionCasing.class, false, Predicates.alwaysFalse(), false, true), - INDUCTION_PORT(BasicBlock.BASIC_BLOCK_2, 2, "InductionPort", TileEntityInductionPort.class, false, Predicates.alwaysFalse(), false, true), + THERMAL_EVAPORATION_CONTROLLER(BasicBlock.BASIC_BLOCK_1, 14, "ThermalEvaporationController", TileEntityThermalEvaporationController.class, false, Plane.HORIZONTAL, true, false), + THERMAL_EVAPORATION_VALVE(BasicBlock.BASIC_BLOCK_1, 15, "ThermalEvaporationValve", TileEntityThermalEvaporationValve.class, false, Predicates.alwaysFalse(), false, false), + THERMAL_EVAPORATION_BLOCK(BasicBlock.BASIC_BLOCK_2, 0, "ThermalEvaporationBlock", TileEntityThermalEvaporationBlock.class, false, Predicates.alwaysFalse(), false, false), + INDUCTION_CASING(BasicBlock.BASIC_BLOCK_2, 1, "InductionCasing", TileEntityInductionCasing.class, false, Predicates.alwaysFalse(), false, false), + INDUCTION_PORT(BasicBlock.BASIC_BLOCK_2, 2, "InductionPort", TileEntityInductionPort.class, false, Predicates.alwaysFalse(), false, false), INDUCTION_CELL(BasicBlock.BASIC_BLOCK_2, 3, "InductionCell", TileEntityInductionCell.class, false, Predicates.alwaysFalse(), false, true), INDUCTION_PROVIDER(BasicBlock.BASIC_BLOCK_2, 4, "InductionProvider", TileEntityInductionProvider.class, false, Predicates.alwaysFalse(), false, true), - SUPERHEATING_ELEMENT(BasicBlock.BASIC_BLOCK_2, 5, "SuperheatingElement", TileEntitySuperheatingElement.class, true, Predicates.alwaysFalse(), false, true), + SUPERHEATING_ELEMENT(BasicBlock.BASIC_BLOCK_2, 5, "SuperheatingElement", TileEntitySuperheatingElement.class, true, Predicates.alwaysFalse(), false, false), PRESSURE_DISPERSER(BasicBlock.BASIC_BLOCK_2, 6, "PressureDisperser",TileEntityPressureDisperser.class, true, Predicates.alwaysFalse(), false, false), - BOILER_CASING(BasicBlock.BASIC_BLOCK_2, 7, "BoilerCasing", TileEntityBoilerCasing.class, true, Predicates.alwaysFalse(), false, true), - BOILER_VALVE(BasicBlock.BASIC_BLOCK_2, 8, "BoilerValve", TileEntityBoilerValve.class, true, Predicates.alwaysFalse(), false, true), + BOILER_CASING(BasicBlock.BASIC_BLOCK_2, 7, "BoilerCasing", TileEntityBoilerCasing.class, true, Predicates.alwaysFalse(), false, false), + BOILER_VALVE(BasicBlock.BASIC_BLOCK_2, 8, "BoilerValve", TileEntityBoilerValve.class, true, Predicates.alwaysFalse(), false, false), SECURITY_DESK(BasicBlock.BASIC_BLOCK_2, 9, "SecurityDesk", TileEntitySecurityDesk.class, true, Plane.HORIZONTAL, false, false); public BasicBlock blockType; @@ -118,9 +118,9 @@ public class BlockStateBasic extends ExtendedBlockState public boolean hasDescription; public Predicate facingPredicate; public boolean activable; - public boolean ctm; + public boolean tiers; - private BasicBlockType(BasicBlock block, int metadata, String s, Class tileClass, boolean hasDesc, Predicate facingAllowed, boolean activeState, boolean ctmTex) + private BasicBlockType(BasicBlock block, int metadata, String s, Class tileClass, boolean hasDesc, Predicate facingAllowed, boolean activeState, boolean t) { blockType = block; meta = metadata; @@ -129,7 +129,7 @@ public class BlockStateBasic extends ExtendedBlockState hasDescription = hasDesc; facingPredicate = facingAllowed; activable = activeState; - ctm = ctmTex; + tiers = t; } public static BasicBlockType get(IBlockState state) @@ -138,6 +138,7 @@ public class BlockStateBasic extends ExtendedBlockState { return state.getValue(((BlockBasic)state.getBlock()).getProperty()); } + return null; } @@ -159,13 +160,20 @@ public class BlockStateBasic extends ExtendedBlockState public static BasicBlockType get(BasicBlock blockType, int metadata) { BasicBlockType firstTry = values()[blockType.ordinal() << 4 | metadata]; + if(firstTry.blockType == blockType && firstTry.meta == metadata) + { return firstTry; + } + for(BasicBlockType type : values()) { if(type.blockType == blockType && type.meta == metadata) + { return type; + } } + return null; } @@ -236,6 +244,7 @@ public class BlockStateBasic extends ExtendedBlockState BlockBasic block = (BlockBasic)state.getBlock(); BasicBlockType type = state.getValue(block.getProperty()); StringBuilder builder = new StringBuilder(); + String nameOverride = null; if(type.hasActiveTexture()) { @@ -263,13 +272,20 @@ public class BlockStateBasic extends ExtendedBlockState return new ModelResourceLocation("builtin/missing", "missing"); } } + + if(type.tiers) + { + BaseTier tier = state.getValue(tierProperty); + + nameOverride = type.getName() + "_" + tier.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/content/tank/TankUpdateProtocol.java b/src/main/java/mekanism/common/content/tank/TankUpdateProtocol.java index c952729ef..719899cec 100644 --- a/src/main/java/mekanism/common/content/tank/TankUpdateProtocol.java +++ b/src/main/java/mekanism/common/content/tank/TankUpdateProtocol.java @@ -64,6 +64,8 @@ public class TankUpdateProtocol extends UpdateProtocol ((TankCache)cache).fluid.amount += ((TankCache)merge).fluid.amount; } + ((TankCache)cache).editMode = ((TankCache)merge).editMode; + List rejects = StackUtils.getMergeRejects(((TankCache)cache).inventory, ((TankCache)merge).inventory); if(!rejects.isEmpty()) diff --git a/src/main/java/mekanism/common/item/ItemBlockBasic.java b/src/main/java/mekanism/common/item/ItemBlockBasic.java index d03d89ebd..10897e018 100644 --- a/src/main/java/mekanism/common/item/ItemBlockBasic.java +++ b/src/main/java/mekanism/common/item/ItemBlockBasic.java @@ -28,7 +28,6 @@ import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; -import net.minecraft.client.resources.model.ModelResourceLocation; import net.minecraft.client.settings.GameSettings; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemBlock; @@ -138,12 +137,6 @@ public class ItemBlockBasic extends ItemBlock implements IEnergizedItem, ITierIt return i; } - @Override - public ModelResourceLocation getModel(ItemStack stack, EntityPlayer player, int useRemaining) - { - return null; //TODO: IDONTKNOWHOWTODOTHIS - } - @Override @SideOnly(Side.CLIENT) public void addInformation(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) @@ -199,19 +192,6 @@ public class ItemBlockBasic extends ItemBlock implements IEnergizedItem, ITierIt return BasicBlockType.get(stack) == BasicBlockType.BIN && stack.getTagCompound() != null && stack.getTagCompound().hasKey("newCount"); } -/* - @Override - public boolean doesContainerItemLeaveCraftingGrid(ItemStack stack) - { - if(BasicBlockType.get(stack) != BasicBlockType.BIN) - { - return true; - } - - return false; - } -*/ - @Override public ItemStack getContainerItem(ItemStack stack) { @@ -317,19 +297,6 @@ public class ItemBlockBasic extends ItemBlock implements IEnergizedItem, ITierIt return "null"; } - @Override - public String getItemStackDisplayName(ItemStack itemstack) - { - BasicBlockType type = BasicBlockType.get(itemstack); - - if(type == BasicBlockType.INDUCTION_CELL || type == BasicBlockType.INDUCTION_PROVIDER) - { - return getBaseTier(itemstack).getLocalizedName() + " " + super.getItemStackDisplayName(itemstack); - } - - return super.getItemStackDisplayName(itemstack); - } - @Override public double getEnergy(ItemStack itemStack) { diff --git a/src/main/java/mekanism/common/multiblock/UpdateProtocol.java b/src/main/java/mekanism/common/multiblock/UpdateProtocol.java index 62ed693ac..ce4729f8b 100644 --- a/src/main/java/mekanism/common/multiblock/UpdateProtocol.java +++ b/src/main/java/mekanism/common/multiblock/UpdateProtocol.java @@ -469,9 +469,6 @@ public abstract class UpdateProtocol> { if(!structureFound.locations.contains(coord)) { - System.out.println("No contain " + coord + " " + coord.getTileEntity(pointer.getWorld())); - System.out.println(coord.getBlockState(pointer.getWorld()).getBlock()); - for(Coord4D newCoord : iteratedNodes) { TileEntity tile = newCoord.getTileEntity(pointer.getWorld()); @@ -538,9 +535,8 @@ public abstract class UpdateProtocol> //TODO perhaps drop from pointer? cache.apply((T)structureFound); - structureFound.inventoryID = idToUse; - System.out.println("Success " + structureFound.locations.size()); + onFormed(); List structures = new ArrayList(); @@ -573,7 +569,6 @@ public abstract class UpdateProtocol> } } else { - int killed = 0; for(Coord4D coord : iteratedNodes) { TileEntity tile = coord.getTileEntity(pointer.getWorld()); @@ -589,7 +584,6 @@ public abstract class UpdateProtocol> } tileEntity.structure = null; - killed++; } else if(tile instanceof IStructuralMultiblock) { @@ -597,8 +591,6 @@ public abstract class UpdateProtocol> } } - System.out.println(killed + " KILLED"); - for(Coord4D coord : innerNodes) { killInnerNode(coord); diff --git a/src/main/java/mekanism/common/tile/TileEntityDynamicTank.java b/src/main/java/mekanism/common/tile/TileEntityDynamicTank.java index 12a33f9ec..37026d408 100644 --- a/src/main/java/mekanism/common/tile/TileEntityDynamicTank.java +++ b/src/main/java/mekanism/common/tile/TileEntityDynamicTank.java @@ -9,7 +9,6 @@ import java.util.Set; import mekanism.api.Coord4D; import mekanism.api.Range4D; import mekanism.common.Mekanism; -import mekanism.common.PacketHandler; import mekanism.common.base.IFluidContainerManager; import mekanism.common.block.BlockBasic; import mekanism.common.content.tank.SynchronizedTankData; diff --git a/src/main/java/mekanism/common/tile/TileEntityMultiblock.java b/src/main/java/mekanism/common/tile/TileEntityMultiblock.java index 8c43e6d54..f15b0e97f 100644 --- a/src/main/java/mekanism/common/tile/TileEntityMultiblock.java +++ b/src/main/java/mekanism/common/tile/TileEntityMultiblock.java @@ -23,7 +23,6 @@ import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; -import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -53,9 +52,6 @@ public abstract class TileEntityMultiblock> extend public TileEntityMultiblock(String name) { super(name); - - if(FMLCommonHandler.instance().getEffectiveSide().isServer()) - Thread.dumpStack(); } @Override diff --git a/src/main/resources/assets/mekanism/blockstates/induction_provider.json b/src/main/resources/assets/mekanism/blockstates/boiler_casing.json similarity index 76% rename from src/main/resources/assets/mekanism/blockstates/induction_provider.json rename to src/main/resources/assets/mekanism/blockstates/boiler_casing.json index 8aee4d7ae..7e99ba86a 100644 --- a/src/main/resources/assets/mekanism/blockstates/induction_provider.json +++ b/src/main/resources/assets/mekanism/blockstates/boiler_casing.json @@ -3,7 +3,7 @@ "defaults": { "model": "cube_all", "textures": { - "all": "mekanism:blocks/InductionProvider" + "all": "mekanism:blocks/ctm/boiler_casing" } }, "variants": { diff --git a/src/main/resources/assets/mekanism/blockstates/induction_cell.json b/src/main/resources/assets/mekanism/blockstates/boiler_valve.json similarity index 76% rename from src/main/resources/assets/mekanism/blockstates/induction_cell.json rename to src/main/resources/assets/mekanism/blockstates/boiler_valve.json index a1e478842..f79477340 100644 --- a/src/main/resources/assets/mekanism/blockstates/induction_cell.json +++ b/src/main/resources/assets/mekanism/blockstates/boiler_valve.json @@ -3,7 +3,7 @@ "defaults": { "model": "cube_all", "textures": { - "all": "mekanism:blocks/InductionCell" + "all": "mekanism:blocks/ctm/boiler_valve" } }, "variants": { diff --git a/src/main/resources/assets/mekanism/blockstates/electromagnetic_coil.json b/src/main/resources/assets/mekanism/blockstates/electromagnetic_coil.json new file mode 100644 index 000000000..83f4410f4 --- /dev/null +++ b/src/main/resources/assets/mekanism/blockstates/electromagnetic_coil.json @@ -0,0 +1,14 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "cube_all", + "textures": { + "all": "mekanism:blocks/ctm/electromagnetic_coil" + } + }, + "variants": { + "normal": [{}], + "inventory": [{}] + } +} + diff --git a/src/main/resources/assets/mekanism/blockstates/induction_cell_advanced.json b/src/main/resources/assets/mekanism/blockstates/induction_cell_advanced.json new file mode 100644 index 000000000..d728e406d --- /dev/null +++ b/src/main/resources/assets/mekanism/blockstates/induction_cell_advanced.json @@ -0,0 +1,14 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "cube_all", + "textures": { + "all": "mekanism:blocks/ctm/induction_cell_advanced" + } + }, + "variants": { + "normal": [{}], + "inventory": [{}] + } +} + diff --git a/src/main/resources/assets/mekanism/blockstates/induction_cell_basic.json b/src/main/resources/assets/mekanism/blockstates/induction_cell_basic.json new file mode 100644 index 000000000..7e32ce21a --- /dev/null +++ b/src/main/resources/assets/mekanism/blockstates/induction_cell_basic.json @@ -0,0 +1,14 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "cube_all", + "textures": { + "all": "mekanism:blocks/ctm/induction_cell_basic" + } + }, + "variants": { + "normal": [{}], + "inventory": [{}] + } +} + diff --git a/src/main/resources/assets/mekanism/blockstates/induction_cell_elite.json b/src/main/resources/assets/mekanism/blockstates/induction_cell_elite.json new file mode 100644 index 000000000..a18e0807c --- /dev/null +++ b/src/main/resources/assets/mekanism/blockstates/induction_cell_elite.json @@ -0,0 +1,14 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "cube_all", + "textures": { + "all": "mekanism:blocks/ctm/induction_cell_elite" + } + }, + "variants": { + "normal": [{}], + "inventory": [{}] + } +} + diff --git a/src/main/resources/assets/mekanism/blockstates/induction_cell_ultimate.json b/src/main/resources/assets/mekanism/blockstates/induction_cell_ultimate.json new file mode 100644 index 000000000..2d9450126 --- /dev/null +++ b/src/main/resources/assets/mekanism/blockstates/induction_cell_ultimate.json @@ -0,0 +1,14 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "cube_all", + "textures": { + "all": "mekanism:blocks/ctm/induction_cell_ultimate" + } + }, + "variants": { + "normal": [{}], + "inventory": [{}] + } +} + diff --git a/src/main/resources/assets/mekanism/blockstates/induction_provider_advanced.json b/src/main/resources/assets/mekanism/blockstates/induction_provider_advanced.json new file mode 100644 index 000000000..b3cb0c0d5 --- /dev/null +++ b/src/main/resources/assets/mekanism/blockstates/induction_provider_advanced.json @@ -0,0 +1,14 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "cube_all", + "textures": { + "all": "mekanism:blocks/ctm/induction_provider_advanced" + } + }, + "variants": { + "normal": [{}], + "inventory": [{}] + } +} + diff --git a/src/main/resources/assets/mekanism/blockstates/induction_provider_basic.json b/src/main/resources/assets/mekanism/blockstates/induction_provider_basic.json new file mode 100644 index 000000000..133736265 --- /dev/null +++ b/src/main/resources/assets/mekanism/blockstates/induction_provider_basic.json @@ -0,0 +1,14 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "cube_all", + "textures": { + "all": "mekanism:blocks/ctm/induction_provider_basic" + } + }, + "variants": { + "normal": [{}], + "inventory": [{}] + } +} + diff --git a/src/main/resources/assets/mekanism/blockstates/induction_provider_elite.json b/src/main/resources/assets/mekanism/blockstates/induction_provider_elite.json new file mode 100644 index 000000000..b9228617a --- /dev/null +++ b/src/main/resources/assets/mekanism/blockstates/induction_provider_elite.json @@ -0,0 +1,14 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "cube_all", + "textures": { + "all": "mekanism:blocks/ctm/induction_provider_elite" + } + }, + "variants": { + "normal": [{}], + "inventory": [{}] + } +} + diff --git a/src/main/resources/assets/mekanism/blockstates/induction_provider_ultimate.json b/src/main/resources/assets/mekanism/blockstates/induction_provider_ultimate.json new file mode 100644 index 000000000..db3d05b46 --- /dev/null +++ b/src/main/resources/assets/mekanism/blockstates/induction_provider_ultimate.json @@ -0,0 +1,14 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "cube_all", + "textures": { + "all": "mekanism:blocks/ctm/induction_provider_ultimate" + } + }, + "variants": { + "normal": [{}], + "inventory": [{}] + } +} + diff --git a/src/main/resources/assets/mekanism/blockstates/superheating_element.json b/src/main/resources/assets/mekanism/blockstates/superheating_element.json new file mode 100644 index 000000000..54303a302 --- /dev/null +++ b/src/main/resources/assets/mekanism/blockstates/superheating_element.json @@ -0,0 +1,14 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "cube_all", + "textures": { + "all": "mekanism:blocks/ctm/superheating_element" + } + }, + "variants": { + "normal": [{}], + "inventory": [{}] + } +} +