mirror of
https://github.com/Creators-of-Create/Create.git
synced 2024-11-10 20:11:35 +01:00
Spiffy creative motor
- Motors can now face any direction - Reworked motor model - Ported motor to registrate
This commit is contained in:
parent
c698aec5d4
commit
ff1f7bd207
22 changed files with 587 additions and 183 deletions
|
@ -24,6 +24,7 @@ cbcdab42d01f8085db9e5f8db884f8adf7f17625 assets\create\blockstates\chiseled_scor
|
||||||
f8eff64c75fc599e9a44a003f54ae9931cd8ce7c assets\create\blockstates\copper_block.json
|
f8eff64c75fc599e9a44a003f54ae9931cd8ce7c assets\create\blockstates\copper_block.json
|
||||||
3355a852cdc717e257ca19b3db836068964733e3 assets\create\blockstates\copper_ore.json
|
3355a852cdc717e257ca19b3db836068964733e3 assets\create\blockstates\copper_ore.json
|
||||||
dc76bca1fdd41c8e6ada27fd59a2b73d7adc9596 assets\create\blockstates\copper_shingles.json
|
dc76bca1fdd41c8e6ada27fd59a2b73d7adc9596 assets\create\blockstates\copper_shingles.json
|
||||||
|
03349490d40b9e354c71f9c8b2f8c2873ddea01f assets\create\blockstates\creative_motor.json
|
||||||
1726b1b9e04a0634e7e1fdcf1cf4cc898efc5c2f assets\create\blockstates\dark_oak_window.json
|
1726b1b9e04a0634e7e1fdcf1cf4cc898efc5c2f assets\create\blockstates\dark_oak_window.json
|
||||||
50d4627d8e8b5adade12de764ab528ddacfa9ea5 assets\create\blockstates\dark_oak_window_pane.json
|
50d4627d8e8b5adade12de764ab528ddacfa9ea5 assets\create\blockstates\dark_oak_window_pane.json
|
||||||
21e435ad3baf69970446b0acd3db0d6d02dc9fcb assets\create\blockstates\dark_scoria.json
|
21e435ad3baf69970446b0acd3db0d6d02dc9fcb assets\create\blockstates\dark_scoria.json
|
||||||
|
@ -255,8 +256,8 @@ c60c3115fd6eeaa3a696428a87a74d184ab7d62d assets\create\blockstates\weathered_lim
|
||||||
7e2476ffff93d0eedee5314e5692fcbf5692bffc assets\create\blockstates\weathered_limestone_pillar.json
|
7e2476ffff93d0eedee5314e5692fcbf5692bffc assets\create\blockstates\weathered_limestone_pillar.json
|
||||||
7f39521b211441f5c3e06d60c5978cebe16cacfb assets\create\blockstates\zinc_block.json
|
7f39521b211441f5c3e06d60c5978cebe16cacfb assets\create\blockstates\zinc_block.json
|
||||||
b7181bcd8182b2f17088e5aa881f374c9c65470c assets\create\blockstates\zinc_ore.json
|
b7181bcd8182b2f17088e5aa881f374c9c65470c assets\create\blockstates\zinc_ore.json
|
||||||
5987ff1a91023708bca1878a8a576f2f1b6a53f0 assets\create\lang\en_ud.json
|
8ae19fa33cb60bde40f4d00e77c15fcc4fab72ea assets\create\lang\en_ud.json
|
||||||
b511c344b44c62444a9c096b30bcac77fe5b8382 assets\create\lang\en_us.json
|
b152dfe5a4402988dc53481e0b867ba108630856 assets\create\lang\en_us.json
|
||||||
846200eb548d3bfa2e77b41039de159b4b6cfb45 assets\create\models\block\acacia_window.json
|
846200eb548d3bfa2e77b41039de159b4b6cfb45 assets\create\models\block\acacia_window.json
|
||||||
1930fa3a3c98d53dd19e4ee7f55bc27fd47aa281 assets\create\models\block\acacia_window_pane_noside.json
|
1930fa3a3c98d53dd19e4ee7f55bc27fd47aa281 assets\create\models\block\acacia_window_pane_noside.json
|
||||||
1763ea2c9b981d187f5031ba608f3d5d3be3986a assets\create\models\block\acacia_window_pane_noside_alt.json
|
1763ea2c9b981d187f5031ba608f3d5d3be3986a assets\create\models\block\acacia_window_pane_noside_alt.json
|
||||||
|
@ -787,6 +788,7 @@ dcb09deae110077bcddf090996b51cc66e9a7de3 assets\create\models\item\cogwheel.json
|
||||||
965a90a882d85dba93b30af9bce7ecf8e68ce747 assets\create\models\item\copper_block.json
|
965a90a882d85dba93b30af9bce7ecf8e68ce747 assets\create\models\item\copper_block.json
|
||||||
51be7da59368681522de870f1e09036dac55aa77 assets\create\models\item\copper_ore.json
|
51be7da59368681522de870f1e09036dac55aa77 assets\create\models\item\copper_ore.json
|
||||||
d7cb2f7bac8fae893fc5179af8140786a908f3f5 assets\create\models\item\copper_shingles.json
|
d7cb2f7bac8fae893fc5179af8140786a908f3f5 assets\create\models\item\copper_shingles.json
|
||||||
|
5b39403f6c81f05e566b621b62e267267de47c41 assets\create\models\item\creative_motor.json
|
||||||
f786a43e296d9f10d7c302fe3ae9cddf4ba9984e assets\create\models\item\dark_oak_window.json
|
f786a43e296d9f10d7c302fe3ae9cddf4ba9984e assets\create\models\item\dark_oak_window.json
|
||||||
e3e9ebbc694edad1f473e5c3a897d95cc87528ae assets\create\models\item\dark_oak_window_pane.json
|
e3e9ebbc694edad1f473e5c3a897d95cc87528ae assets\create\models\item\dark_oak_window_pane.json
|
||||||
f0e98871e4bb68c29954f2de24566a6404f21d9c assets\create\models\item\dark_scoria.json
|
f0e98871e4bb68c29954f2de24566a6404f21d9c assets\create\models\item\dark_scoria.json
|
||||||
|
|
|
@ -0,0 +1,28 @@
|
||||||
|
{
|
||||||
|
"variants": {
|
||||||
|
"facing=down": {
|
||||||
|
"model": "create:block/creative_motor/block_vertical",
|
||||||
|
"x": 180,
|
||||||
|
"y": 270
|
||||||
|
},
|
||||||
|
"facing=up": {
|
||||||
|
"model": "create:block/creative_motor/block_vertical",
|
||||||
|
"y": 270
|
||||||
|
},
|
||||||
|
"facing=north": {
|
||||||
|
"model": "create:block/creative_motor/block",
|
||||||
|
"y": 180
|
||||||
|
},
|
||||||
|
"facing=south": {
|
||||||
|
"model": "create:block/creative_motor/block"
|
||||||
|
},
|
||||||
|
"facing=west": {
|
||||||
|
"model": "create:block/creative_motor/block",
|
||||||
|
"y": 90
|
||||||
|
},
|
||||||
|
"facing=east": {
|
||||||
|
"model": "create:block/creative_motor/block",
|
||||||
|
"y": 270
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
|
@ -25,6 +25,7 @@
|
||||||
"block.create.copper_block": "\u029E\u0254o\u05DF\u15FA \u0279\u01DDddo\u0186",
|
"block.create.copper_block": "\u029E\u0254o\u05DF\u15FA \u0279\u01DDddo\u0186",
|
||||||
"block.create.copper_ore": "\u01DD\u0279O \u0279\u01DDddo\u0186",
|
"block.create.copper_ore": "\u01DD\u0279O \u0279\u01DDddo\u0186",
|
||||||
"block.create.copper_shingles": "s\u01DD\u05DFbu\u0131\u0265S \u0279\u01DDddo\u0186",
|
"block.create.copper_shingles": "s\u01DD\u05DFbu\u0131\u0265S \u0279\u01DDddo\u0186",
|
||||||
|
"block.create.creative_motor": "\u0279o\u0287oW \u01DD\u028C\u0131\u0287\u0250\u01DD\u0279\u0186",
|
||||||
"block.create.dark_oak_window": "\u028Dopu\u0131M \u029E\u0250O \u029E\u0279\u0250\u15E1",
|
"block.create.dark_oak_window": "\u028Dopu\u0131M \u029E\u0250O \u029E\u0279\u0250\u15E1",
|
||||||
"block.create.dark_oak_window_pane": "\u01DDu\u0250\u0500 \u028Dopu\u0131M \u029E\u0250O \u029E\u0279\u0250\u15E1",
|
"block.create.dark_oak_window_pane": "\u01DDu\u0250\u0500 \u028Dopu\u0131M \u029E\u0250O \u029E\u0279\u0250\u15E1",
|
||||||
"block.create.dark_scoria": "\u0250\u0131\u0279o\u0254S \u029E\u0279\u0250\u15E1",
|
"block.create.dark_scoria": "\u0250\u0131\u0279o\u0254S \u029E\u0279\u0250\u15E1",
|
||||||
|
|
|
@ -25,6 +25,7 @@
|
||||||
"block.create.copper_block": "Copper Block",
|
"block.create.copper_block": "Copper Block",
|
||||||
"block.create.copper_ore": "Copper Ore",
|
"block.create.copper_ore": "Copper Ore",
|
||||||
"block.create.copper_shingles": "Copper Shingles",
|
"block.create.copper_shingles": "Copper Shingles",
|
||||||
|
"block.create.creative_motor": "Creative Motor",
|
||||||
"block.create.dark_oak_window": "Dark Oak Window",
|
"block.create.dark_oak_window": "Dark Oak Window",
|
||||||
"block.create.dark_oak_window_pane": "Dark Oak Window Pane",
|
"block.create.dark_oak_window_pane": "Dark Oak Window Pane",
|
||||||
"block.create.dark_scoria": "Dark Scoria",
|
"block.create.dark_scoria": "Dark Scoria",
|
||||||
|
|
|
@ -0,0 +1,3 @@
|
||||||
|
{
|
||||||
|
"parent": "create:block/creative_motor/item"
|
||||||
|
}
|
|
@ -38,7 +38,6 @@ import com.simibubi.create.modules.contraptions.components.flywheel.engine.Furna
|
||||||
import com.simibubi.create.modules.contraptions.components.millstone.MillstoneBlock;
|
import com.simibubi.create.modules.contraptions.components.millstone.MillstoneBlock;
|
||||||
import com.simibubi.create.modules.contraptions.components.mixer.BasinOperatorBlockItem;
|
import com.simibubi.create.modules.contraptions.components.mixer.BasinOperatorBlockItem;
|
||||||
import com.simibubi.create.modules.contraptions.components.mixer.MechanicalMixerBlock;
|
import com.simibubi.create.modules.contraptions.components.mixer.MechanicalMixerBlock;
|
||||||
import com.simibubi.create.modules.contraptions.components.motor.MotorBlock;
|
|
||||||
import com.simibubi.create.modules.contraptions.components.press.MechanicalPressBlock;
|
import com.simibubi.create.modules.contraptions.components.press.MechanicalPressBlock;
|
||||||
import com.simibubi.create.modules.contraptions.components.saw.SawBlock;
|
import com.simibubi.create.modules.contraptions.components.saw.SawBlock;
|
||||||
import com.simibubi.create.modules.contraptions.components.turntable.TurntableBlock;
|
import com.simibubi.create.modules.contraptions.components.turntable.TurntableBlock;
|
||||||
|
@ -108,7 +107,7 @@ public enum AllBlocks implements NonNullSupplier<Block> {
|
||||||
// ENCASED_BELT(EncasedBeltBlock::new),
|
// ENCASED_BELT(EncasedBeltBlock::new),
|
||||||
// ADJUSTABLE_PULLEY(AdjustablePulleyBlock::new),
|
// ADJUSTABLE_PULLEY(AdjustablePulleyBlock::new),
|
||||||
BELT(BeltBlock::new, ComesWith.NO_BLOCKITEM),
|
BELT(BeltBlock::new, ComesWith.NO_BLOCKITEM),
|
||||||
CREATIVE_MOTOR(MotorBlock::new),
|
// CREATIVE_MOTOR(MotorBlock::new),
|
||||||
WATER_WHEEL(WaterWheelBlock::new),
|
WATER_WHEEL(WaterWheelBlock::new),
|
||||||
ENCASED_FAN(EncasedFanBlock::new),
|
ENCASED_FAN(EncasedFanBlock::new),
|
||||||
NOZZLE(NozzleBlock::new),
|
NOZZLE(NozzleBlock::new),
|
||||||
|
|
|
@ -9,6 +9,8 @@ import com.simibubi.create.foundation.utility.data.AssetLookup;
|
||||||
import com.simibubi.create.foundation.utility.data.BlockStateGen;
|
import com.simibubi.create.foundation.utility.data.BlockStateGen;
|
||||||
import com.simibubi.create.foundation.world.OxidizingBlock;
|
import com.simibubi.create.foundation.world.OxidizingBlock;
|
||||||
import com.simibubi.create.modules.Sections;
|
import com.simibubi.create.modules.Sections;
|
||||||
|
import com.simibubi.create.modules.contraptions.components.motor.MotorBlock;
|
||||||
|
import com.simibubi.create.modules.contraptions.components.motor.MotorGenerator;
|
||||||
import com.simibubi.create.modules.contraptions.relays.elementary.CogWheelBlock;
|
import com.simibubi.create.modules.contraptions.relays.elementary.CogWheelBlock;
|
||||||
import com.simibubi.create.modules.contraptions.relays.elementary.CogwheelBlockItem;
|
import com.simibubi.create.modules.contraptions.relays.elementary.CogwheelBlockItem;
|
||||||
import com.simibubi.create.modules.contraptions.relays.elementary.ShaftBlock;
|
import com.simibubi.create.modules.contraptions.relays.elementary.ShaftBlock;
|
||||||
|
@ -154,6 +156,14 @@ public class AllBlocksNew {
|
||||||
.build()
|
.build()
|
||||||
.register();
|
.register();
|
||||||
|
|
||||||
|
public static final BlockEntry<MotorBlock> CREATIVE_MOTOR = REGISTRATE.block("creative_motor", MotorBlock::new)
|
||||||
|
.initialProperties(SharedProperties::kinetic)
|
||||||
|
.blockstate(new MotorGenerator()::generate)
|
||||||
|
.item()
|
||||||
|
.model(AssetLookup::customItemModel)
|
||||||
|
.build()
|
||||||
|
.register();
|
||||||
|
|
||||||
// Materials
|
// Materials
|
||||||
|
|
||||||
static {
|
static {
|
||||||
|
|
|
@ -109,7 +109,7 @@ public enum AllTileEntities {
|
||||||
|
|
||||||
// Kinetics
|
// Kinetics
|
||||||
SHAFT(ShaftTileEntity::new, AllBlocksNew.SHAFT, AllBlocksNew.COGWHEEL, AllBlocksNew.LARGE_COGWHEEL, AllBlocksNew.ENCASED_SHAFT),
|
SHAFT(ShaftTileEntity::new, AllBlocksNew.SHAFT, AllBlocksNew.COGWHEEL, AllBlocksNew.LARGE_COGWHEEL, AllBlocksNew.ENCASED_SHAFT),
|
||||||
MOTOR(MotorTileEntity::new, AllBlocks.CREATIVE_MOTOR),
|
MOTOR(MotorTileEntity::new, AllBlocksNew.CREATIVE_MOTOR),
|
||||||
GEARBOX(GearboxTileEntity::new, AllBlocksNew.GEARBOX),
|
GEARBOX(GearboxTileEntity::new, AllBlocksNew.GEARBOX),
|
||||||
TURNTABLE(TurntableTileEntity::new, AllBlocks.TURNTABLE),
|
TURNTABLE(TurntableTileEntity::new, AllBlocks.TURNTABLE),
|
||||||
ENCASED_SHAFT(EncasedShaftTileEntity::new, AllBlocksNew.ENCASED_SHAFT, AllBlocksNew.ENCASED_BELT),
|
ENCASED_SHAFT(EncasedShaftTileEntity::new, AllBlocksNew.ENCASED_SHAFT, AllBlocksNew.ENCASED_BELT),
|
||||||
|
|
|
@ -13,8 +13,8 @@ public class StressConfigDefaults {
|
||||||
public static double getDefaultStressCapacity(AllBlocks block) {
|
public static double getDefaultStressCapacity(AllBlocks block) {
|
||||||
|
|
||||||
switch (block) {
|
switch (block) {
|
||||||
case CREATIVE_MOTOR:
|
// case CREATIVE_MOTOR: TODO add a builder transform to register default capacities
|
||||||
return 2048;
|
// return 2048;
|
||||||
case FURNACE_ENGINE:
|
case FURNACE_ENGINE:
|
||||||
return 1024;
|
return 1024;
|
||||||
case MECHANICAL_BEARING:
|
case MECHANICAL_BEARING:
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
package com.simibubi.create.foundation.utility;
|
package com.simibubi.create.foundation.utility;
|
||||||
|
|
||||||
import static net.minecraft.util.Direction.EAST;
|
|
||||||
import static net.minecraft.util.Direction.SOUTH;
|
import static net.minecraft.util.Direction.SOUTH;
|
||||||
import static net.minecraft.util.Direction.UP;
|
import static net.minecraft.util.Direction.UP;
|
||||||
|
|
||||||
|
@ -24,7 +23,7 @@ public class AllShapes {
|
||||||
CASING_14PX = shape(0, 0, 0, 16, 14, 16).forDirectional(),
|
CASING_14PX = shape(0, 0, 0, 16, 14, 16).forDirectional(),
|
||||||
CASING_12PX = shape(0, 0, 0, 16, 12, 16).forDirectional(),
|
CASING_12PX = shape(0, 0, 0, 16, 12, 16).forDirectional(),
|
||||||
CASING_11PX = shape(0, 0, 0, 16, 11, 16).forDirectional(),
|
CASING_11PX = shape(0, 0, 0, 16, 11, 16).forDirectional(),
|
||||||
MOTOR_BLOCK = shape(0, 3, 3, 16, 13, 13).forHorizontal(EAST),
|
MOTOR_BLOCK = shape(3, 0, 3, 13, 14, 13).forDirectional(),
|
||||||
FOUR_VOXEL_POLE = shape(6, 0, 6, 10, 16, 10).forAxis(),
|
FOUR_VOXEL_POLE = shape(6, 0, 6, 10, 16, 10).forAxis(),
|
||||||
SIX_VOXEL_POLE = shape(5, 0, 5, 11, 16, 11).forAxis(),
|
SIX_VOXEL_POLE = shape(5, 0, 5, 11, 16, 11).forAxis(),
|
||||||
BELT_FUNNEL = shape(3, -4, 11, 13, 8, 17).forHorizontal(SOUTH),
|
BELT_FUNNEL = shape(3, -4, 11, 13, 8, 17).forHorizontal(SOUTH),
|
||||||
|
|
|
@ -1,10 +1,9 @@
|
||||||
package com.simibubi.create.modules.contraptions.components.motor;
|
package com.simibubi.create.modules.contraptions.components.motor;
|
||||||
|
|
||||||
import com.simibubi.create.foundation.utility.AllShapes;
|
import com.simibubi.create.foundation.utility.AllShapes;
|
||||||
import com.simibubi.create.modules.contraptions.base.HorizontalKineticBlock;
|
import com.simibubi.create.modules.contraptions.base.DirectionalKineticBlock;
|
||||||
|
|
||||||
import net.minecraft.block.BlockState;
|
import net.minecraft.block.BlockState;
|
||||||
import net.minecraft.block.Blocks;
|
|
||||||
import net.minecraft.item.BlockItemUseContext;
|
import net.minecraft.item.BlockItemUseContext;
|
||||||
import net.minecraft.tileentity.TileEntity;
|
import net.minecraft.tileentity.TileEntity;
|
||||||
import net.minecraft.util.Direction;
|
import net.minecraft.util.Direction;
|
||||||
|
@ -15,15 +14,15 @@ import net.minecraft.util.math.shapes.VoxelShape;
|
||||||
import net.minecraft.world.IBlockReader;
|
import net.minecraft.world.IBlockReader;
|
||||||
import net.minecraft.world.IWorldReader;
|
import net.minecraft.world.IWorldReader;
|
||||||
|
|
||||||
public class MotorBlock extends HorizontalKineticBlock {
|
public class MotorBlock extends DirectionalKineticBlock {
|
||||||
|
|
||||||
public MotorBlock() {
|
public MotorBlock(Properties properties) {
|
||||||
super(Properties.from(Blocks.IRON_BLOCK));
|
super(properties);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public VoxelShape getShape(BlockState state, IBlockReader worldIn, BlockPos pos, ISelectionContext context) {
|
public VoxelShape getShape(BlockState state, IBlockReader worldIn, BlockPos pos, ISelectionContext context) {
|
||||||
return AllShapes.MOTOR_BLOCK.get(state.get(HORIZONTAL_FACING));
|
return AllShapes.MOTOR_BLOCK.get(state.get(FACING));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -33,22 +32,22 @@ public class MotorBlock extends HorizontalKineticBlock {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public BlockState getStateForPlacement(BlockItemUseContext context) {
|
public BlockState getStateForPlacement(BlockItemUseContext context) {
|
||||||
Direction preferred = getPreferredHorizontalFacing(context);
|
Direction preferred = getPreferredFacing(context);
|
||||||
if (context.getPlayer().isSneaking() || preferred == null)
|
if (context.getPlayer().isSneaking() || preferred == null)
|
||||||
return super.getStateForPlacement(context);
|
return super.getStateForPlacement(context);
|
||||||
return getDefaultState().with(HORIZONTAL_FACING, preferred);
|
return getDefaultState().with(FACING, preferred);
|
||||||
}
|
}
|
||||||
|
|
||||||
// IRotate:
|
// IRotate:
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean hasShaftTowards(IWorldReader world, BlockPos pos, BlockState state, Direction face) {
|
public boolean hasShaftTowards(IWorldReader world, BlockPos pos, BlockState state, Direction face) {
|
||||||
return face == state.get(HORIZONTAL_FACING);
|
return face == state.get(FACING);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Axis getRotationAxis(BlockState state) {
|
public Axis getRotationAxis(BlockState state) {
|
||||||
return state.get(HORIZONTAL_FACING).getAxis();
|
return state.get(FACING).getAxis();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -0,0 +1,38 @@
|
||||||
|
package com.simibubi.create.modules.contraptions.components.motor;
|
||||||
|
|
||||||
|
import com.simibubi.create.foundation.utility.data.AssetLookup;
|
||||||
|
import com.simibubi.create.foundation.utility.data.SpecialBlockStateGen;
|
||||||
|
import com.tterrag.registrate.providers.DataGenContext;
|
||||||
|
import com.tterrag.registrate.providers.RegistrateBlockstateProvider;
|
||||||
|
|
||||||
|
import net.minecraft.block.Block;
|
||||||
|
import net.minecraft.block.BlockState;
|
||||||
|
import net.minecraft.util.Direction;
|
||||||
|
import net.minecraftforge.client.model.generators.ModelFile;
|
||||||
|
|
||||||
|
public class MotorGenerator extends SpecialBlockStateGen {
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected int getXRotation(BlockState state) {
|
||||||
|
return state.get(MotorBlock.FACING) == Direction.DOWN ? 180 : 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected int getYRotation(BlockState state) {
|
||||||
|
return state.get(MotorBlock.FACING)
|
||||||
|
.getAxis()
|
||||||
|
.isVertical() ? 0
|
||||||
|
: (int) state.get(MotorBlock.FACING)
|
||||||
|
.getHorizontalAngle();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public <T extends Block> ModelFile getModel(DataGenContext<Block, T> ctx, RegistrateBlockstateProvider prov,
|
||||||
|
BlockState state) {
|
||||||
|
return state.get(MotorBlock.FACING)
|
||||||
|
.getAxis()
|
||||||
|
.isVertical() ? AssetLookup.partialBaseModel(ctx, prov, "vertical")
|
||||||
|
: AssetLookup.partialBaseModel(ctx, prov);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
|
@ -25,9 +25,8 @@ public class MotorTileEntity extends GeneratingKineticTileEntity {
|
||||||
super.addBehaviours(behaviours);
|
super.addBehaviours(behaviours);
|
||||||
Integer max = AllConfigs.SERVER.kinetics.maxMotorSpeed.get();
|
Integer max = AllConfigs.SERVER.kinetics.maxMotorSpeed.get();
|
||||||
|
|
||||||
CenteredSideValueBoxTransform slot = new CenteredSideValueBoxTransform((motor, side) -> {
|
CenteredSideValueBoxTransform slot =
|
||||||
return motor.get(MotorBlock.HORIZONTAL_FACING) == side.getOpposite();
|
new CenteredSideValueBoxTransform((motor, side) -> motor.get(MotorBlock.FACING) == side.getOpposite());
|
||||||
});
|
|
||||||
|
|
||||||
generatedSpeed = new ScrollValueBehaviour(Lang.translate("generic.speed"), this, slot);
|
generatedSpeed = new ScrollValueBehaviour(Lang.translate("generic.speed"), this, slot);
|
||||||
generatedSpeed.between(-max, max);
|
generatedSpeed.between(-max, max);
|
||||||
|
|
|
@ -15,7 +15,7 @@ public class MotorTileEntityRenderer extends KineticTileEntityRenderer {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected SuperByteBuffer getRotatedModel(KineticTileEntity te) {
|
protected SuperByteBuffer getRotatedModel(KineticTileEntity te) {
|
||||||
return AllBlockPartials.SHAFT_HALF.renderOnHorizontal(te.getBlockState());
|
return AllBlockPartials.SHAFT_HALF.renderOnDirectional(te.getBlockState());
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,8 +0,0 @@
|
||||||
{
|
|
||||||
"variants": {
|
|
||||||
"facing=north": { "model": "create:block/motor", "y": 180 },
|
|
||||||
"facing=south": { "model": "create:block/motor" },
|
|
||||||
"facing=east": { "model": "create:block/motor", "y": 270 },
|
|
||||||
"facing=west": { "model": "create:block/motor", "y": 90 }
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -0,0 +1,144 @@
|
||||||
|
{
|
||||||
|
"credit": "Made with Blockbench",
|
||||||
|
"parent": "block/block",
|
||||||
|
"textures": {
|
||||||
|
"5": "create:block/creative_casing",
|
||||||
|
"6": "create:block/creative_motor",
|
||||||
|
"7": "create:block/gearbox",
|
||||||
|
"8": "block/polished_andesite",
|
||||||
|
"9": "create:block/andesite_bricks",
|
||||||
|
"particle": "#5"
|
||||||
|
},
|
||||||
|
"elements": [
|
||||||
|
{
|
||||||
|
"name": "Back",
|
||||||
|
"from": [3, 3, 0.1],
|
||||||
|
"to": [13, 13, 2.1],
|
||||||
|
"faces": {
|
||||||
|
"north": {"uv": [0, 0, 10, 10], "texture": "#6"},
|
||||||
|
"east": {"uv": [3, 0, 13, 2], "rotation": 90, "texture": "#5"},
|
||||||
|
"south": {"uv": [0, 0, 10, 10], "texture": "#6"},
|
||||||
|
"west": {"uv": [3, 0, 13, 2], "rotation": 270, "texture": "#5"},
|
||||||
|
"up": {"uv": [3, 0, 13, 2], "texture": "#5"},
|
||||||
|
"down": {"uv": [3, 0, 13, 2], "rotation": 180, "texture": "#5"}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "Back",
|
||||||
|
"from": [3, 3, 12],
|
||||||
|
"to": [13, 13, 14],
|
||||||
|
"faces": {
|
||||||
|
"north": {"uv": [10, 0, 0, 10], "texture": "#6"},
|
||||||
|
"east": {"uv": [3, 2, 13, 0], "rotation": 90, "texture": "#5"},
|
||||||
|
"south": {"uv": [10, 0, 0, 10], "texture": "#6"},
|
||||||
|
"west": {"uv": [3, 2, 13, 0], "rotation": 270, "texture": "#5"},
|
||||||
|
"up": {"uv": [3, 2, 13, 0], "texture": "#5"},
|
||||||
|
"down": {"uv": [3, 2, 13, 0], "rotation": 180, "texture": "#5"}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "Between Rims",
|
||||||
|
"from": [5, 5, 9],
|
||||||
|
"to": [11, 11, 13],
|
||||||
|
"faces": {
|
||||||
|
"north": {"uv": [14, 4, 20, 10], "texture": "#6"},
|
||||||
|
"east": {"uv": [10, 6, 16, 10], "rotation": 90, "texture": "#6"},
|
||||||
|
"south": {"uv": [10, 0, 16, 6], "texture": "#6"},
|
||||||
|
"west": {"uv": [10, 6, 16, 10], "rotation": 270, "texture": "#6"},
|
||||||
|
"up": {"uv": [10, 6, 16, 10], "texture": "#6"},
|
||||||
|
"down": {"uv": [10, 6, 16, 10], "rotation": 180, "texture": "#6"}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "Between Rims",
|
||||||
|
"from": [3.5, 3.5, 3],
|
||||||
|
"to": [12.5, 12.5, 6],
|
||||||
|
"faces": {
|
||||||
|
"east": {"uv": [3, 10, 12, 13], "rotation": 270, "texture": "#6"},
|
||||||
|
"west": {"uv": [3, 10, 12, 13], "rotation": 90, "texture": "#6"},
|
||||||
|
"up": {"uv": [3, 10, 12, 13], "rotation": 180, "texture": "#6"},
|
||||||
|
"down": {"uv": [3, 10, 12, 13], "texture": "#6"}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "Body",
|
||||||
|
"from": [4, 4, 2],
|
||||||
|
"to": [12, 12, 10],
|
||||||
|
"faces": {
|
||||||
|
"north": {"uv": [0, 4, 8, 14], "rotation": 180, "texture": "#5"},
|
||||||
|
"east": {"uv": [4, 3, 12, 13], "rotation": 180, "texture": "#5"},
|
||||||
|
"south": {"uv": [3, 3, 11, 11], "rotation": 180, "texture": "#5"},
|
||||||
|
"west": {"uv": [4, 3, 12, 13], "rotation": 180, "texture": "#5"},
|
||||||
|
"up": {"uv": [4, 3, 12, 13], "rotation": 180, "texture": "#5"},
|
||||||
|
"down": {"uv": [4, 3, 12, 13], "rotation": 180, "texture": "#5"}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"from": [2, 12, 0],
|
||||||
|
"to": [4, 14, 15],
|
||||||
|
"faces": {
|
||||||
|
"north": {"uv": [14, 10, 16, 12], "texture": "#6"},
|
||||||
|
"east": {"uv": [14, 0, 16, 15], "rotation": 270, "texture": "#7"},
|
||||||
|
"south": {"uv": [14, 10, 16, 12], "rotation": 90, "texture": "#6"},
|
||||||
|
"west": {"uv": [0, 1, 2, 16], "rotation": 270, "texture": "#7"},
|
||||||
|
"up": {"uv": [1, 0, 16, 2], "rotation": 90, "texture": "#7"},
|
||||||
|
"down": {"uv": [0, 14, 15, 16], "rotation": 90, "texture": "#7"}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"from": [2, 2, 0],
|
||||||
|
"to": [4, 4, 15],
|
||||||
|
"faces": {
|
||||||
|
"north": {"uv": [14, 12, 16, 10], "texture": "#6"},
|
||||||
|
"east": {"uv": [16, 0, 14, 15], "rotation": 270, "texture": "#7"},
|
||||||
|
"south": {"uv": [16, 10, 14, 12], "rotation": 90, "texture": "#6"},
|
||||||
|
"west": {"uv": [2, 1, 0, 16], "rotation": 270, "texture": "#7"},
|
||||||
|
"up": {"uv": [15, 14, 0, 16], "rotation": 90, "texture": "#7"},
|
||||||
|
"down": {"uv": [16, 0, 1, 2], "rotation": 90, "texture": "#7"}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"from": [12, 12, 0],
|
||||||
|
"to": [14, 14, 15],
|
||||||
|
"faces": {
|
||||||
|
"north": {"uv": [16, 10, 14, 12], "texture": "#6"},
|
||||||
|
"east": {"uv": [0, 16, 2, 1], "rotation": 270, "texture": "#7"},
|
||||||
|
"south": {"uv": [14, 12, 16, 10], "rotation": 90, "texture": "#6"},
|
||||||
|
"west": {"uv": [14, 15, 16, 0], "rotation": 270, "texture": "#7"},
|
||||||
|
"up": {"uv": [1, 2, 16, 0], "rotation": 90, "texture": "#7"},
|
||||||
|
"down": {"uv": [0, 16, 15, 14], "rotation": 90, "texture": "#7"}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"from": [12, 2, 0],
|
||||||
|
"to": [14, 4, 15],
|
||||||
|
"faces": {
|
||||||
|
"north": {"uv": [16, 12, 14, 10], "texture": "#6"},
|
||||||
|
"east": {"uv": [2, 16, 0, 1], "rotation": 270, "texture": "#7"},
|
||||||
|
"south": {"uv": [16, 12, 14, 10], "rotation": 90, "texture": "#6"},
|
||||||
|
"west": {"uv": [16, 15, 14, 0], "rotation": 270, "texture": "#7"},
|
||||||
|
"up": {"uv": [15, 16, 0, 14], "rotation": 90, "texture": "#7"},
|
||||||
|
"down": {"uv": [16, 2, 1, 0], "rotation": 90, "texture": "#7"}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"from": [1, 0, 3],
|
||||||
|
"to": [15, 3, 10],
|
||||||
|
"faces": {
|
||||||
|
"north": {"uv": [0, 0, 14, 3], "texture": "#9"},
|
||||||
|
"east": {"uv": [8, 0, 15, 3], "texture": "#9"},
|
||||||
|
"south": {"uv": [1, 0, 15, 3], "texture": "#9"},
|
||||||
|
"west": {"uv": [8, 0, 15, 3], "texture": "#9"},
|
||||||
|
"up": {"uv": [1, 4, 15, 11], "texture": "#8"},
|
||||||
|
"down": {"uv": [1, 4, 15, 11], "texture": "#8"}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"groups": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9,
|
||||||
|
{
|
||||||
|
"name": "shaft",
|
||||||
|
"origin": [8, 8, 8],
|
||||||
|
"children": []
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
|
@ -0,0 +1,173 @@
|
||||||
|
{
|
||||||
|
"credit": "Made with Blockbench",
|
||||||
|
"parent": "block/block",
|
||||||
|
"textures": {
|
||||||
|
"5": "create:block/creative_casing",
|
||||||
|
"6": "create:block/creative_motor",
|
||||||
|
"7": "create:block/gearbox",
|
||||||
|
"8": "block/polished_andesite",
|
||||||
|
"9": "create:block/andesite_bricks",
|
||||||
|
"particle": "#5"
|
||||||
|
},
|
||||||
|
"elements": [
|
||||||
|
{
|
||||||
|
"name": "Back",
|
||||||
|
"from": [3, 0.1, 3],
|
||||||
|
"to": [13, 2.1, 13],
|
||||||
|
"faces": {
|
||||||
|
"north": {"uv": [3, 0, 13, 2], "rotation": 180, "texture": "#5"},
|
||||||
|
"east": {"uv": [3, 0, 13, 2], "rotation": 180, "texture": "#5"},
|
||||||
|
"south": {"uv": [3, 0, 13, 2], "rotation": 180, "texture": "#5"},
|
||||||
|
"west": {"uv": [3, 0, 13, 2], "rotation": 180, "texture": "#5"},
|
||||||
|
"up": {"uv": [0, 0, 10, 10], "texture": "#6"},
|
||||||
|
"down": {"uv": [0, 0, 10, 10], "rotation": 180, "texture": "#6"}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "Back",
|
||||||
|
"from": [3, 12, 3],
|
||||||
|
"to": [13, 14, 13],
|
||||||
|
"faces": {
|
||||||
|
"north": {"uv": [3, 2, 13, 0], "rotation": 180, "texture": "#5"},
|
||||||
|
"east": {"uv": [3, 2, 13, 0], "rotation": 180, "texture": "#5"},
|
||||||
|
"south": {"uv": [3, 2, 13, 0], "rotation": 180, "texture": "#5"},
|
||||||
|
"west": {"uv": [3, 2, 13, 0], "rotation": 180, "texture": "#5"},
|
||||||
|
"up": {"uv": [10, 0, 0, 10], "texture": "#6"},
|
||||||
|
"down": {"uv": [10, 0, 0, 10], "rotation": 180, "texture": "#6"}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "Between Rims",
|
||||||
|
"from": [5, 9, 5],
|
||||||
|
"to": [11, 13, 11],
|
||||||
|
"faces": {
|
||||||
|
"north": {"uv": [10, 6, 16, 10], "rotation": 180, "texture": "#6"},
|
||||||
|
"east": {"uv": [10, 6, 16, 10], "rotation": 180, "texture": "#6"},
|
||||||
|
"south": {"uv": [10, 6, 16, 10], "rotation": 180, "texture": "#6"},
|
||||||
|
"west": {"uv": [10, 6, 16, 10], "rotation": 180, "texture": "#6"},
|
||||||
|
"up": {"uv": [10, 0, 16, 6], "texture": "#6"},
|
||||||
|
"down": {"uv": [14, 4, 20, 10], "rotation": 180, "texture": "#6"}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "Between Rims",
|
||||||
|
"from": [3.5, 3, 3.5],
|
||||||
|
"to": [12.5, 6, 12.5],
|
||||||
|
"faces": {
|
||||||
|
"north": {"uv": [3, 10, 12, 13], "texture": "#6"},
|
||||||
|
"east": {"uv": [3, 10, 12, 13], "texture": "#6"},
|
||||||
|
"south": {"uv": [3, 10, 12, 13], "texture": "#6"},
|
||||||
|
"west": {"uv": [3, 10, 12, 13], "texture": "#6"}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "Body",
|
||||||
|
"from": [4, 2, 4],
|
||||||
|
"to": [12, 10, 12],
|
||||||
|
"faces": {
|
||||||
|
"north": {"uv": [4, 3, 12, 13], "texture": "#5"},
|
||||||
|
"east": {"uv": [4, 3, 12, 13], "rotation": 270, "texture": "#5"},
|
||||||
|
"south": {"uv": [4, 3, 12, 13], "rotation": 180, "texture": "#5"},
|
||||||
|
"west": {"uv": [4, 3, 12, 13], "rotation": 90, "texture": "#5"},
|
||||||
|
"up": {"uv": [3, 3, 11, 11], "rotation": 180, "texture": "#5"},
|
||||||
|
"down": {"uv": [0, 4, 8, 14], "texture": "#5"}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"from": [12, 1, 2],
|
||||||
|
"to": [14, 15, 4],
|
||||||
|
"faces": {
|
||||||
|
"north": {"uv": [1, 0, 15, 2], "rotation": 270, "texture": "#7"},
|
||||||
|
"east": {"uv": [14, 1, 16, 15], "texture": "#7"},
|
||||||
|
"south": {"uv": [1, 14, 15, 16], "rotation": 90, "texture": "#7"},
|
||||||
|
"west": {"uv": [0, 1, 2, 15], "rotation": 180, "texture": "#7"},
|
||||||
|
"up": {"uv": [14, 10, 16, 12], "texture": "#6"},
|
||||||
|
"down": {"uv": [14, 10, 16, 12], "rotation": 270, "texture": "#6"}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"from": [12, 1, 12],
|
||||||
|
"to": [14, 15, 14],
|
||||||
|
"faces": {
|
||||||
|
"north": {"uv": [1, 16, 15, 14], "rotation": 90, "texture": "#7"},
|
||||||
|
"east": {"uv": [16, 1, 14, 15], "texture": "#7"},
|
||||||
|
"south": {"uv": [1, 2, 15, 0], "rotation": 270, "texture": "#7"},
|
||||||
|
"west": {"uv": [2, 1, 0, 15], "rotation": 180, "texture": "#7"},
|
||||||
|
"up": {"uv": [14, 12, 16, 10], "texture": "#6"},
|
||||||
|
"down": {"uv": [16, 10, 14, 12], "rotation": 270, "texture": "#6"}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"from": [2, 1, 2],
|
||||||
|
"to": [4, 15, 4],
|
||||||
|
"faces": {
|
||||||
|
"north": {"uv": [1, 2, 15, 0], "rotation": 270, "texture": "#7"},
|
||||||
|
"east": {"uv": [2, 1, 0, 15], "rotation": 180, "texture": "#7"},
|
||||||
|
"south": {"uv": [1, 16, 15, 14], "rotation": 90, "texture": "#7"},
|
||||||
|
"west": {"uv": [16, 1, 14, 15], "texture": "#7"},
|
||||||
|
"up": {"uv": [16, 10, 14, 12], "texture": "#6"},
|
||||||
|
"down": {"uv": [14, 12, 16, 10], "rotation": 270, "texture": "#6"}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"from": [2, 1, 12],
|
||||||
|
"to": [4, 15, 14],
|
||||||
|
"faces": {
|
||||||
|
"north": {"uv": [1, 14, 15, 16], "rotation": 90, "texture": "#7"},
|
||||||
|
"east": {"uv": [0, 1, 2, 15], "rotation": 180, "texture": "#7"},
|
||||||
|
"south": {"uv": [1, 0, 15, 2], "rotation": 270, "texture": "#7"},
|
||||||
|
"west": {"uv": [14, 1, 16, 15], "texture": "#7"},
|
||||||
|
"up": {"uv": [16, 12, 14, 10], "texture": "#6"},
|
||||||
|
"down": {"uv": [16, 12, 14, 10], "rotation": 270, "texture": "#6"}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"from": [11, 0, 11],
|
||||||
|
"to": [15, 4, 15],
|
||||||
|
"faces": {
|
||||||
|
"north": {"uv": [8, 0, 12, 4], "texture": "#9"},
|
||||||
|
"east": {"uv": [0, 0, 4, 4], "texture": "#9"},
|
||||||
|
"south": {"uv": [8, 0, 12, 4], "texture": "#9"},
|
||||||
|
"west": {"uv": [1, 0, 5, 4], "texture": "#9"},
|
||||||
|
"up": {"uv": [1, 4, 5, 8], "rotation": 90, "texture": "#8"},
|
||||||
|
"down": {"uv": [3, 3, 7, 7], "rotation": 180, "texture": "#8"}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"from": [11, 0, 1],
|
||||||
|
"to": [15, 4, 5],
|
||||||
|
"faces": {
|
||||||
|
"north": {"uv": [12, 0, 8, 4], "texture": "#9"},
|
||||||
|
"east": {"uv": [4, 0, 0, 4], "texture": "#9"},
|
||||||
|
"south": {"uv": [12, 0, 8, 4], "texture": "#9"},
|
||||||
|
"west": {"uv": [5, 0, 1, 4], "texture": "#9"},
|
||||||
|
"up": {"uv": [5, 4, 1, 8], "rotation": 90, "texture": "#8"},
|
||||||
|
"down": {"uv": [3, 7, 7, 3], "rotation": 180, "texture": "#8"}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"from": [1, 0, 11],
|
||||||
|
"to": [5, 4, 15],
|
||||||
|
"faces": {
|
||||||
|
"north": {"uv": [12, 0, 8, 4], "texture": "#9"},
|
||||||
|
"east": {"uv": [5, 0, 1, 4], "texture": "#9"},
|
||||||
|
"south": {"uv": [12, 0, 8, 4], "texture": "#9"},
|
||||||
|
"west": {"uv": [4, 0, 0, 4], "texture": "#9"},
|
||||||
|
"up": {"uv": [1, 8, 5, 4], "rotation": 90, "texture": "#8"},
|
||||||
|
"down": {"uv": [7, 3, 3, 7], "rotation": 180, "texture": "#8"}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"from": [1, 0, 1],
|
||||||
|
"to": [5, 4, 5],
|
||||||
|
"faces": {
|
||||||
|
"north": {"uv": [8, 0, 12, 4], "texture": "#9"},
|
||||||
|
"east": {"uv": [1, 0, 5, 4], "texture": "#9"},
|
||||||
|
"south": {"uv": [8, 0, 12, 4], "texture": "#9"},
|
||||||
|
"west": {"uv": [0, 0, 4, 4], "texture": "#9"},
|
||||||
|
"up": {"uv": [5, 8, 1, 4], "rotation": 90, "texture": "#8"},
|
||||||
|
"down": {"uv": [7, 7, 3, 3], "rotation": 180, "texture": "#8"}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
|
@ -0,0 +1,168 @@
|
||||||
|
{
|
||||||
|
"credit": "Made with Blockbench",
|
||||||
|
"parent": "block/block",
|
||||||
|
"textures": {
|
||||||
|
"5": "create:block/creative_casing",
|
||||||
|
"6": "create:block/creative_motor",
|
||||||
|
"7": "create:block/gearbox",
|
||||||
|
"8": "block/polished_andesite",
|
||||||
|
"9": "create:block/andesite_bricks",
|
||||||
|
"1_0": "create:block/axis",
|
||||||
|
"1_1": "create:block/axis_top",
|
||||||
|
"particle": "#5"
|
||||||
|
},
|
||||||
|
"elements": [
|
||||||
|
{
|
||||||
|
"name": "Back",
|
||||||
|
"from": [3, 3, 0.1],
|
||||||
|
"to": [13, 13, 2.1],
|
||||||
|
"faces": {
|
||||||
|
"north": {"uv": [0, 0, 10, 10], "texture": "#6"},
|
||||||
|
"east": {"uv": [3, 0, 13, 2], "rotation": 90, "texture": "#5"},
|
||||||
|
"south": {"uv": [0, 0, 10, 10], "texture": "#6"},
|
||||||
|
"west": {"uv": [3, 0, 13, 2], "rotation": 270, "texture": "#5"},
|
||||||
|
"up": {"uv": [3, 0, 13, 2], "texture": "#5"},
|
||||||
|
"down": {"uv": [3, 0, 13, 2], "rotation": 180, "texture": "#5"}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "Back",
|
||||||
|
"from": [3, 3, 12],
|
||||||
|
"to": [13, 13, 14],
|
||||||
|
"faces": {
|
||||||
|
"north": {"uv": [10, 0, 0, 10], "texture": "#6"},
|
||||||
|
"east": {"uv": [3, 2, 13, 0], "rotation": 90, "texture": "#5"},
|
||||||
|
"south": {"uv": [10, 0, 0, 10], "texture": "#6"},
|
||||||
|
"west": {"uv": [3, 2, 13, 0], "rotation": 270, "texture": "#5"},
|
||||||
|
"up": {"uv": [3, 2, 13, 0], "texture": "#5"},
|
||||||
|
"down": {"uv": [3, 2, 13, 0], "rotation": 180, "texture": "#5"}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "Between Rims",
|
||||||
|
"from": [5, 5, 9],
|
||||||
|
"to": [11, 11, 13],
|
||||||
|
"faces": {
|
||||||
|
"north": {"uv": [14, 4, 20, 10], "texture": "#6"},
|
||||||
|
"east": {"uv": [10, 6, 16, 10], "rotation": 90, "texture": "#6"},
|
||||||
|
"south": {"uv": [10, 0, 16, 6], "texture": "#6"},
|
||||||
|
"west": {"uv": [10, 6, 16, 10], "rotation": 270, "texture": "#6"},
|
||||||
|
"up": {"uv": [10, 6, 16, 10], "texture": "#6"},
|
||||||
|
"down": {"uv": [10, 6, 16, 10], "rotation": 180, "texture": "#6"}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "Between Rims",
|
||||||
|
"from": [3.5, 3.5, 3],
|
||||||
|
"to": [12.5, 12.5, 6],
|
||||||
|
"faces": {
|
||||||
|
"east": {"uv": [3, 10, 12, 13], "rotation": 270, "texture": "#6"},
|
||||||
|
"west": {"uv": [3, 10, 12, 13], "rotation": 90, "texture": "#6"},
|
||||||
|
"up": {"uv": [3, 10, 12, 13], "rotation": 180, "texture": "#6"},
|
||||||
|
"down": {"uv": [3, 10, 12, 13], "texture": "#6"}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "Body",
|
||||||
|
"from": [4, 4, 2],
|
||||||
|
"to": [12, 12, 10],
|
||||||
|
"faces": {
|
||||||
|
"north": {"uv": [0, 4, 8, 14], "rotation": 180, "texture": "#5"},
|
||||||
|
"east": {"uv": [4, 3, 12, 13], "rotation": 180, "texture": "#5"},
|
||||||
|
"south": {"uv": [3, 3, 11, 11], "rotation": 180, "texture": "#5"},
|
||||||
|
"west": {"uv": [4, 3, 12, 13], "rotation": 180, "texture": "#5"},
|
||||||
|
"up": {"uv": [4, 3, 12, 13], "rotation": 180, "texture": "#5"},
|
||||||
|
"down": {"uv": [4, 3, 12, 13], "rotation": 180, "texture": "#5"}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"from": [2, 12, 0],
|
||||||
|
"to": [4, 14, 15],
|
||||||
|
"faces": {
|
||||||
|
"north": {"uv": [14, 10, 16, 12], "texture": "#6"},
|
||||||
|
"east": {"uv": [14, 1, 16, 16], "rotation": 270, "texture": "#7"},
|
||||||
|
"south": {"uv": [14, 10, 16, 12], "rotation": 90, "texture": "#6"},
|
||||||
|
"west": {"uv": [0, 0, 2, 15], "rotation": 270, "texture": "#7"},
|
||||||
|
"up": {"uv": [0, 0, 15, 2], "rotation": 90, "texture": "#7"},
|
||||||
|
"down": {"uv": [1, 14, 16, 16], "rotation": 90, "texture": "#7"}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"from": [2, 2, 0],
|
||||||
|
"to": [4, 4, 15],
|
||||||
|
"faces": {
|
||||||
|
"north": {"uv": [14, 12, 16, 10], "texture": "#6"},
|
||||||
|
"east": {"uv": [16, 1, 14, 16], "rotation": 270, "texture": "#7"},
|
||||||
|
"south": {"uv": [16, 10, 14, 12], "rotation": 90, "texture": "#6"},
|
||||||
|
"west": {"uv": [2, 0, 0, 15], "rotation": 270, "texture": "#7"},
|
||||||
|
"up": {"uv": [16, 14, 1, 16], "rotation": 90, "texture": "#7"},
|
||||||
|
"down": {"uv": [15, 0, 0, 2], "rotation": 90, "texture": "#7"}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"from": [12, 12, 0],
|
||||||
|
"to": [14, 14, 15],
|
||||||
|
"faces": {
|
||||||
|
"north": {"uv": [16, 10, 14, 12], "texture": "#6"},
|
||||||
|
"east": {"uv": [0, 15, 2, 0], "rotation": 270, "texture": "#7"},
|
||||||
|
"south": {"uv": [14, 12, 16, 10], "rotation": 90, "texture": "#6"},
|
||||||
|
"west": {"uv": [14, 16, 16, 1], "rotation": 270, "texture": "#7"},
|
||||||
|
"up": {"uv": [0, 2, 15, 0], "rotation": 90, "texture": "#7"},
|
||||||
|
"down": {"uv": [1, 16, 16, 14], "rotation": 90, "texture": "#7"}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"from": [12, 2, 0],
|
||||||
|
"to": [14, 4, 15],
|
||||||
|
"faces": {
|
||||||
|
"north": {"uv": [16, 12, 14, 10], "texture": "#6"},
|
||||||
|
"east": {"uv": [2, 15, 0, 0], "rotation": 270, "texture": "#7"},
|
||||||
|
"south": {"uv": [16, 12, 14, 10], "rotation": 90, "texture": "#6"},
|
||||||
|
"west": {"uv": [16, 16, 14, 1], "rotation": 270, "texture": "#7"},
|
||||||
|
"up": {"uv": [16, 16, 1, 14], "rotation": 90, "texture": "#7"},
|
||||||
|
"down": {"uv": [15, 2, 0, 0], "rotation": 90, "texture": "#7"}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"from": [1, 0, 3],
|
||||||
|
"to": [15, 3, 10],
|
||||||
|
"faces": {
|
||||||
|
"north": {"uv": [0, 0, 14, 3], "texture": "#9"},
|
||||||
|
"east": {"uv": [8, 0, 15, 3], "texture": "#9"},
|
||||||
|
"south": {"uv": [1, 0, 15, 3], "texture": "#9"},
|
||||||
|
"west": {"uv": [8, 0, 15, 3], "texture": "#9"},
|
||||||
|
"up": {"uv": [1, 4, 15, 11], "texture": "#8"},
|
||||||
|
"down": {"uv": [1, 4, 15, 11], "texture": "#8"}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "Axis",
|
||||||
|
"from": [6, 6, 6],
|
||||||
|
"to": [10, 10, 16],
|
||||||
|
"shade": false,
|
||||||
|
"rotation": {"angle": 22.5, "axis": "z", "origin": [8, 8, 8]},
|
||||||
|
"faces": {
|
||||||
|
"north": {"uv": [6, 6, 10, 10], "rotation": 180, "texture": "#1_1"},
|
||||||
|
"east": {"uv": [6, 0, 10, 10], "rotation": 270, "texture": "#1_0"},
|
||||||
|
"south": {"uv": [6, 6, 10, 10], "texture": "#1_1"},
|
||||||
|
"west": {"uv": [6, 0, 10, 10], "rotation": 90, "texture": "#1_0"},
|
||||||
|
"up": {"uv": [6, 0, 10, 10], "rotation": 180, "texture": "#1_0"},
|
||||||
|
"down": {"uv": [6, 0, 10, 10], "texture": "#1_0"}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"groups": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9,
|
||||||
|
{
|
||||||
|
"name": "shaft",
|
||||||
|
"origin": [8, 8, 8],
|
||||||
|
"children": [10]
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"display": {
|
||||||
|
"gui": {
|
||||||
|
"rotation": [ 30, 45, 0 ],
|
||||||
|
"translation": [ 0, 0, 0],
|
||||||
|
"scale":[ 0.625, 0.625, 0.625 ]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
|
@ -1,142 +0,0 @@
|
||||||
{
|
|
||||||
"__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)",
|
|
||||||
"parent": "block/block",
|
|
||||||
"textures": {
|
|
||||||
"particle": "block/iron_block",
|
|
||||||
"0": "block/chiseled_stone_bricks",
|
|
||||||
"1": "block/stone_bricks",
|
|
||||||
"2": "block/anvil",
|
|
||||||
"3": "block/iron_block",
|
|
||||||
"4": "block/stone"
|
|
||||||
},
|
|
||||||
"elements": [
|
|
||||||
{
|
|
||||||
"name": "Base",
|
|
||||||
"from": [ 1.0, 0.0, 2.0 ],
|
|
||||||
"to": [ 15.0, 1.0, 10.0 ],
|
|
||||||
"faces": {
|
|
||||||
"north": { "texture": "#0", "uv": [ 0.0, 4.0, 14.0, 5.0 ] },
|
|
||||||
"east": { "texture": "#0", "uv": [ 4.0, 12.0, 12.0, 13.0 ] },
|
|
||||||
"south": { "texture": "#0", "uv": [ 1.0, 10.0, 15.0, 11.0 ] },
|
|
||||||
"west": { "texture": "#0", "uv": [ 3.0, 15.0, 11.0, 16.0 ] },
|
|
||||||
"up": { "texture": "#0", "uv": [ 1.0, 3.0, 15.0, 11.0 ] },
|
|
||||||
"down": { "texture": "#1", "uv": [ 1.0, 0.0, 15.0, 8.0 ], "rotation": 180 }
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "BaseTop",
|
|
||||||
"from": [ 4.0, 1.0, 2.0 ],
|
|
||||||
"to": [ 12.0, 4.0, 10.0 ],
|
|
||||||
"faces": {
|
|
||||||
"north": { "texture": "#0", "uv": [ 4.0, 0.0, 12.0, 3.0 ] },
|
|
||||||
"east": { "texture": "#0", "uv": [ 4.0, 0.0, 12.0, 3.0 ] },
|
|
||||||
"south": { "texture": "#0", "uv": [ 4.0, 0.0, 12.0, 3.0 ] },
|
|
||||||
"west": { "texture": "#0", "uv": [ 4.0, 0.0, 12.0, 3.0 ] }
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "Back",
|
|
||||||
"from": [ 3.0, 3.0, 0.0 ],
|
|
||||||
"to": [ 13.0, 13.0, 2.0 ],
|
|
||||||
"faces": {
|
|
||||||
"north": { "texture": "#2", "uv": [ 3.0, 3.0, 13.0, 13.0 ] },
|
|
||||||
"east": { "texture": "#2", "uv": [ 1.0, 3.0, 3.0, 13.0 ] },
|
|
||||||
"south": { "texture": "#2", "uv": [ 3.0, 3.0, 13.0, 13.0 ] },
|
|
||||||
"west": { "texture": "#2", "uv": [ 13.0, 3.0, 15.0, 13.0 ] },
|
|
||||||
"up": { "texture": "#2", "uv": [ 3.0, 1.0, 13.0, 3.0 ] },
|
|
||||||
"down": { "texture": "#2", "uv": [ 3.0, 13.0, 13.0, 15.0 ] }
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "Front Rim",
|
|
||||||
"from": [ 3.0, 3.0, 13.0 ],
|
|
||||||
"to": [ 13.0, 13.0, 14.0 ],
|
|
||||||
"faces": {
|
|
||||||
"north": { "texture": "#0", "uv": [ 3.0, 3.0, 13.0, 13.0 ] },
|
|
||||||
"east": { "texture": "#0", "uv": [ 12.0, 3.0, 13.0, 13.0 ] },
|
|
||||||
"south": { "texture": "#0", "uv": [ 3.0, 3.0, 13.0, 13.0 ] },
|
|
||||||
"west": { "texture": "#0", "uv": [ 3.0, 3.0, 4.0, 13.0 ] },
|
|
||||||
"up": { "texture": "#0", "uv": [ 3.0, 3.0, 13.0, 4.0 ] },
|
|
||||||
"down": { "texture": "#0", "uv": [ 3.0, 12.0, 13.0, 13.0 ] }
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "Back Rim",
|
|
||||||
"from": [ 3.0, 3.0, 10.0 ],
|
|
||||||
"to": [ 13.0, 13.0, 11.0 ],
|
|
||||||
"faces": {
|
|
||||||
"north": { "texture": "#0", "uv": [ 3.0, 3.0, 13.0, 13.0 ] },
|
|
||||||
"east": { "texture": "#0", "uv": [ 12.0, 3.0, 13.0, 13.0 ] },
|
|
||||||
"south": { "texture": "#0", "uv": [ 3.0, 3.0, 13.0, 13.0 ] },
|
|
||||||
"west": { "texture": "#0", "uv": [ 3.0, 3.0, 4.0, 13.0 ] },
|
|
||||||
"up": { "texture": "#0", "uv": [ 3.0, 3.0, 13.0, 4.0 ] },
|
|
||||||
"down": { "texture": "#0", "uv": [ 3.0, 12.0, 13.0, 13.0 ] }
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "Between Rims",
|
|
||||||
"from": [ 5.0, 5.0, 11.0 ],
|
|
||||||
"to": [ 11.0, 11.0, 13.0 ],
|
|
||||||
"faces": {
|
|
||||||
"east": { "texture": "#2", "uv": [ 0.0, 4.0, 2.0, 10.0 ] },
|
|
||||||
"west": { "texture": "#2", "uv": [ 14.0, 4.0, 16.0, 10.0 ] },
|
|
||||||
"up": { "texture": "#2", "uv": [ 4.0, 0.0, 10.0, 2.0 ] },
|
|
||||||
"down": { "texture": "#2", "uv": [ 4.0, 14.0, 10.0, 16.0 ] }
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "Body",
|
|
||||||
"from": [ 4.0, 4.0, 2.0 ],
|
|
||||||
"to": [ 12.0, 12.0, 10.0 ],
|
|
||||||
"faces": {
|
|
||||||
"east": { "texture": "#3", "uv": [ 0.0, 4.0, 8.0, 12.0 ] },
|
|
||||||
"west": { "texture": "#3", "uv": [ 0.0, 4.0, 8.0, 12.0 ], "rotation": 180 },
|
|
||||||
"up": { "texture": "#3", "uv": [ 0.0, 4.0, 8.0, 12.0 ], "rotation": 270 }
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "Corner Top Left",
|
|
||||||
"from": [ 3.5, 11.5, 2.0 ],
|
|
||||||
"to": [ 4.5, 12.5, 13.0 ],
|
|
||||||
"rotation": { "origin": [ 4.0, 12.0, 8.0 ], "axis": "z", "angle": 45.0 },
|
|
||||||
"faces": {
|
|
||||||
"east": { "texture": "#4", "uv": [ 2.0, 3.0, 13.0, 4.0 ] },
|
|
||||||
"west": { "texture": "#4", "uv": [ 2.0, 2.0, 9.0, 1.0 ] },
|
|
||||||
"up": { "texture": "#4", "uv": [ 2.0, 8.0, 13.0, 9.0 ], "rotation": 90 }
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "Corner Top Right",
|
|
||||||
"from": [ 11.5, 11.5, 2.0 ],
|
|
||||||
"to": [ 12.5, 12.5, 13.0 ],
|
|
||||||
"rotation": { "origin": [ 12.0, 12.0, 8.0 ], "axis": "z", "angle": 45.0 },
|
|
||||||
"faces": {
|
|
||||||
"east": { "texture": "#4", "uv": [ 2.0, 8.0, 13.0, 9.0 ] },
|
|
||||||
"up": { "texture": "#4", "uv": [ 3.0, 3.0, 14.0, 4.0 ], "rotation": 90 },
|
|
||||||
"down": { "texture": "#4", "uv": [ 3.0, 6.0, 14.0, 7.0 ], "rotation": 90 }
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "Corner Bottom Right",
|
|
||||||
"from": [ 11.5, 3.5, 2.0 ],
|
|
||||||
"to": [ 12.5, 4.5, 13.0 ],
|
|
||||||
"rotation": { "origin": [ 12.0, 4.0, 8.0 ], "axis": "z", "angle": 45.0 },
|
|
||||||
"faces": {
|
|
||||||
"east": { "texture": "#4", "uv": [ 3.0, 6.0, 14.0, 7.0 ] },
|
|
||||||
"west": { "texture": "#4", "uv": [ 3.0, 4.0, 14.0, 5.0 ] },
|
|
||||||
"down": { "texture": "#4", "uv": [ 3.0, 5.0, 14.0, 6.0 ], "rotation": 90 }
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "Corner Bottom Left",
|
|
||||||
"from": [ 3.5, 3.5, 2.0 ],
|
|
||||||
"to": [ 4.5, 4.5, 13.0 ],
|
|
||||||
"rotation": { "origin": [ 4.0, 4.0, 8.0 ], "axis": "z", "angle": 45.0 },
|
|
||||||
"faces": {
|
|
||||||
"west": { "texture": "#4", "uv": [ 2.0, 5.0, 13.0, 6.0 ] },
|
|
||||||
"up": { "texture": "#4", "uv": [ 2.0, 3.0, 13.0, 4.0 ], "rotation": 90 },
|
|
||||||
"down": { "texture": "#4", "uv": [ 2.0, 7.0, 13.0, 8.0 ], "rotation": 90 }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
|
@ -1,10 +0,0 @@
|
||||||
{
|
|
||||||
"parent": "create:block/motor",
|
|
||||||
"display": {
|
|
||||||
"fixed": {
|
|
||||||
"rotation": [ 0, 90, 0 ],
|
|
||||||
"translation": [ 0, 0, 0],
|
|
||||||
"scale":[ 0.5, 0.5, 0.5 ]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
Binary file not shown.
After Width: | Height: | Size: 437 B |
Binary file not shown.
After Width: | Height: | Size: 583 B |
Loading…
Reference in a new issue