Merge remote-tracking branch 'origin/master' into master

This commit is contained in:
DBotThePony 2023-03-28 09:06:19 +07:00
commit 6c4c40073e
Signed by: DBot
GPG Key ID: DCC23B5715498507
53 changed files with 659 additions and 20 deletions

View File

@ -276,6 +276,8 @@ fun addDecorativeData(blockStateProvider: MatteryBlockStateProvider, itemModelPr
DataGen.pane(glass, textureSide, textureRailing)
}
DataGen.pane(MBlocks.TRITANIUM_BARS, ResourceLocation(DataGen.MOD_ID,"block/decorative/tritanium_bars"), ResourceLocation(DataGen.MOD_ID,"block/decorative/tritanium_bars"))
blockStateProvider.block(MBlocks.ENGINE)
itemModelProvider.block(MItems.ENGINE)
}

View File

@ -87,6 +87,7 @@ fun addBlockStates(provider: MatteryBlockStateProvider) {
provider.block(MBlocks.STORAGE_POWER_SUPPLIER)
provider.block(MBlocks.MATTER_RECYCLER)
provider.block(MBlocks.MATTER_RECONSTRUCTOR)
provider.block(MBlocks.ENERGY_SERVO)
provider.block(MBlocks.COBBLESTONE_GENERATOR)
provider.block(MBlocks.ESSENCE_STORAGE)

View File

@ -25,6 +25,7 @@ fun addItemModels(provider: MatteryItemModelProvider) {
provider.block(MItems.CARBON_FIBRE_BLOCK)
provider.block(MItems.METAL_JUNK)
provider.block(MItems.METAL_MESH)
provider.generatedTranslucent(MItems.TRITANIUM_BARS, ResourceLocation(DataGen.MOD_ID, "block/decorative/tritanium_bars"))
provider.block(MItems.DEEPSLATE_TRITANIUM_ORE)
provider.block(MItems.TRITANIUM_ORE)
provider.block(MItems.TRITANIUM_STRIPED_BLOCK)
@ -125,6 +126,7 @@ fun addItemModels(provider: MatteryItemModelProvider) {
provider.block(MItems.MATTER_DECOMPOSER, "matter_decomposer_working")
provider.block(MItems.ENERGY_SERVO, "energy_servo")
provider.block(MItems.ESSENCE_STORAGE, "essence_storage")
provider.block(MItems.MATTER_RECONSTRUCTOR, "matter_reconstructor")
provider.block(MItems.PLATE_PRESS, "plate_press_idle")
provider.block(MItems.STORAGE_POWER_SUPPLIER, "storage_power_supplier")

View File

@ -633,4 +633,20 @@ public class BlockShapes {
new SimpleCuboid(0.0625d, 0.3125d, 0.875d, 0.9375d, 0.625d, 0.9375d),
new SimpleCuboid(0.0625d, 0.3125d, 0.0625d, 0.5625d, 0.9375d, 0.5625d)
);
public static final BlockShape MATTER_RECONSTRUCTOR = new BlockShape(
new SimpleCuboid(0d, 0.25d, 0d, 1d, 0.5d, 1d),
new SimpleCuboid(0d, 0d, 0d, 1d, 0.25d, 0.6875d),
new SimpleCuboid(0.8125d, 0.5d, 0d, 1d, 1d, 1d),
new SimpleCuboid(0d, 0.5d, 0d, 0.1875d, 1d, 1d),
new SimpleCuboid(0.1875d, 0.5d, 0.0625d, 0.8125d, 0.9375d, 0.9375d),
new SimpleCuboid(-0.0625d, 0.5d, 0.0625d, 0d, 0.9375d, 0.9375d),
new SimpleCuboid(1d, 0.5d, 0.0625d, 1.0625d, 0.9375d, 0.9375d),
new SimpleCuboid(0.25d, 0.5d, 0.25d, 0.75d, 0.5625d, 0.75d),
new SimpleCuboid(0.875d, 0d, 0.6875d, 0.9375d, 0.25d, 0.9375d),
new SimpleCuboid(0.0625d, 0d, 0.6875d, 0.1875d, 0.25d, 0.9375d),
new SimpleCuboid(0.1875d, 0d, 0.6875d, 0.875d, 0.25d, 0.9375d),
new SimpleCuboid(0.36875d, 0.65625d, 0.5875d, 0.44375d, 0.78125d, 0.9d),
new SimpleCuboid(0.4375d, 0.5d, 0.1875d, 0.5625d, 0.625d, 0.3125d)
);
}

View File

@ -1,16 +1,22 @@
package ru.dbotthepony.mc.otm.block.matter
import net.minecraft.core.BlockPos
import net.minecraft.world.level.BlockGetter
import net.minecraft.world.level.Level
import net.minecraft.world.level.block.EntityBlock
import net.minecraft.world.level.block.entity.BlockEntity
import net.minecraft.world.level.block.entity.BlockEntityTicker
import net.minecraft.world.level.block.entity.BlockEntityType
import net.minecraft.world.level.block.state.BlockState
import net.minecraft.world.phys.shapes.CollisionContext
import net.minecraft.world.phys.shapes.VoxelShape
import ru.dbotthepony.mc.otm.block.RotatableMatteryBlock
import ru.dbotthepony.mc.otm.block.entity.matter.MatterReconstructorBlockEntity
import ru.dbotthepony.mc.otm.block.getShapeForEachState
import ru.dbotthepony.mc.otm.core.get
import ru.dbotthepony.mc.otm.shapes.BlockShapes
class ItemRepairerBlock : RotatableMatteryBlock(), EntityBlock {
class MatterReconstructorBlock : RotatableMatteryBlock(), EntityBlock {
override fun newBlockEntity(pPos: BlockPos, pState: BlockState): BlockEntity {
return MatterReconstructorBlockEntity(pPos, pState)
}
@ -21,4 +27,16 @@ class ItemRepairerBlock : RotatableMatteryBlock(), EntityBlock {
return BlockEntityTicker { _, _, _, pBlockEntity -> if (pBlockEntity is MatterReconstructorBlockEntity) pBlockEntity.tick() }
}
private val shapes = getShapeForEachState(rotationProperty) { BlockShapes.MATTER_RECONSTRUCTOR.rotateFromNorth(it[rotationProperty]).computeShape() }
@Suppress("override_deprecation")
override fun getShape(
state: BlockState,
blockGetter: BlockGetter,
pos: BlockPos,
context: CollisionContext
): VoxelShape {
return shapes[state]!!
}
}

View File

@ -47,7 +47,7 @@ import ru.dbotthepony.mc.otm.block.tech.PlatePressBlock
import ru.dbotthepony.mc.otm.block.StorageCableBlock
import ru.dbotthepony.mc.otm.block.decorative.EngineBlock
import ru.dbotthepony.mc.otm.block.decorative.HoloSignBlock
import ru.dbotthepony.mc.otm.block.matter.ItemRepairerBlock
import ru.dbotthepony.mc.otm.block.matter.MatterReconstructorBlock
import ru.dbotthepony.mc.otm.block.matter.MatterBottlerBlock
import ru.dbotthepony.mc.otm.block.matter.MatterCapacitorBankBlock
import ru.dbotthepony.mc.otm.block.matter.MatterDecomposerBlock
@ -92,7 +92,7 @@ object MBlocks {
val ENERGY_SERVO: Block by registry.register(MNames.ENERGY_SERVO) { EnergyServoBlock() }
val COBBLESTONE_GENERATOR: Block by registry.register(MNames.COBBLESTONE_GENERATOR) { CobblerBlock() }
val ESSENCE_STORAGE: EssenceStorageBlock by registry.register(MNames.ESSENCE_STORAGE) { EssenceStorageBlock() }
val MATTER_RECONSTRUCTOR: ItemRepairerBlock by registry.register(MNames.MATTER_RECONSTRUCTOR) { ItemRepairerBlock() }
val MATTER_RECONSTRUCTOR: MatterReconstructorBlock by registry.register(MNames.MATTER_RECONSTRUCTOR) { MatterReconstructorBlock() }
val STORAGE_BUS: Block by registry.register(MNames.STORAGE_BUS) { StorageBusBlock() }
val STORAGE_IMPORTER: Block by registry.register(MNames.STORAGE_IMPORTER) { StorageImporterBlock() }

View File

@ -23,7 +23,7 @@ object MNames {
const val MATTER_PANEL = "matter_panel"
const val MATTER_REPLICATOR = "matter_replicator"
const val MATTER_BOTTLER = "matter_bottler"
const val MATTER_RECONSTRUCTOR = "item_repairer"
const val MATTER_RECONSTRUCTOR = "matter_reconstructor"
const val DRIVE_VIEWER = "drive_viewer"
const val DRIVE_RACK = "drive_rack"
const val ITEM_MONITOR = "item_monitor"

View File

@ -1,6 +1,8 @@
{
{
"credit": "Made with Blockbench",
"parent": "block/cube_all",
"render_type": "translucent",
"render_type": "translucent",
"texture_size": [16, 32],
"textures": {
"0": "overdrive_that_matters:block/android_station",
"1": "overdrive_that_matters:block/android_station_em",
@ -127,11 +129,44 @@
}
},
{
"name": "hologram",
"from": [-1, 10, -1],
"to": [17, 10, 17],
"faces": {
"up": {"uv": [0, 9.5, 8, 13.5], "texture": "#0"},
"down": {"uv": [0, 9.5, 8, 13.5], "texture": "#0"}
"up": {"uv": [0, 9.5, 8, 13.5], "texture": "#1"},
"down": {"uv": [0, 9.5, 8, 13.5], "texture": "#1"}
},
"forge_data": { "block_light": 15, "sky_light": 15 }
},
{
"name": "hologram",
"from": [6, 9.5, 6],
"to": [10, 9.5, 10],
"faces": {
"up": {"uv": [11, 11, 13, 12], "texture": "#1"},
"down": {"uv": [11, 11, 13, 12], "texture": "#1"}
},
"forge_data": { "block_light": 15, "sky_light": 15 }
},
{
"name": "holotext",
"from": [1, 10.5, 3],
"to": [8, 14.5, 3],
"rotation": {"angle": 22.5, "axis": "x", "origin": [5.5, 13.5, 1]},
"faces": {
"north": {"uv": [2.5, 7.25, 5.5, 8.25], "texture": "#1"},
"south": {"uv": [5.5, 7.25, 2.5, 8.25], "texture": "#1"}
},
"forge_data": { "block_light": 15, "sky_light": 15 }
},
{
"name": "holotext",
"from": [8, 5.1, 12],
"to": [15, 9.1, 12],
"rotation": {"angle": -22.5, "axis": "x", "origin": [5.5, 13.5, 1]},
"faces": {
"north": {"uv": [5.5, 7.25, 2.5, 8.25], "texture": "#1"},
"south": {"uv": [2.5, 7.25, 5.5, 8.25], "texture": "#1"}
},
"forge_data": { "block_light": 15, "sky_light": 15 }
}

View File

@ -1,5 +1,8 @@
{
"parent": "minecraft:block/cube_all",
"credit": "Made with Blockbench",
"parent": "minecraft:block/cube_all",
"render_type": "cutout",
"texture_size": [16, 32],
"textures": {
"0": "overdrive_that_matters:block/ship_engine",
"particle": "overdrive_that_matters:block/ship_engine"

View File

@ -0,0 +1,303 @@
{
"credit": "Made with Blockbench",
"parent": "minecraft:block/cube_all",
"render_type": "cutout",
"texture_size": [16, 32],
"textures": {
"0": "overdrive_that_matters:block/ship_engine",
"particle": "overdrive_that_matters:block/ship_engine"
},
"elements": [
{
"name": "frame",
"from": [0, 0, 14],
"to": [16, 16, 16],
"rotation": {"angle": 0, "axis": "y", "origin": [0, 16, 0]},
"faces": {
"north": {"uv": [0, 0, 8, 4], "rotation": 180, "texture": "#0"},
"east": {"uv": [0, 4, 8, 4.5], "rotation": 270, "texture": "#0"},
"south": {"uv": [0, 0, 8, 4], "texture": "#0"},
"west": {"uv": [0, 4, 8, 4.5], "rotation": 90, "texture": "#0"},
"up": {"uv": [0, 4, 8, 4.5], "rotation": 180, "texture": "#0"},
"down": {"uv": [0, 4, 8, 4.5], "texture": "#0"}
}
},
{
"name": "frame",
"from": [1, 1, 10],
"to": [15, 15, 14],
"rotation": {"angle": 0, "axis": "y", "origin": [0, 16, 0]},
"faces": {
"north": {"uv": [0, 5.5, 7, 9], "rotation": 180, "texture": "#0"},
"east": {"uv": [0, 4.5, 7, 5.5], "rotation": 270, "texture": "#0"},
"south": {"uv": [0, 0, 7, 7], "texture": "#missing"},
"west": {"uv": [0, 4.5, 7, 5.5], "rotation": 90, "texture": "#0"},
"up": {"uv": [0, 4.5, 7, 5.5], "rotation": 180, "texture": "#0"},
"down": {"uv": [0, 4.5, 7, 5.5], "texture": "#0"}
}
},
{
"name": "funnycone",
"from": [4, 4, 7],
"to": [12, 12, 10],
"rotation": {"angle": 0, "axis": "y", "origin": [0, 16, 0]},
"faces": {
"north": {"uv": [0, 0, 4, 4], "rotation": 180, "texture": "#missing"},
"east": {"uv": [2, 1.75, 6, 3.25], "rotation": 270, "texture": "#0"},
"south": {"uv": [0, 0, 4, 4], "texture": "#missing"},
"west": {"uv": [2, 1.75, 6, 3.25], "rotation": 90, "texture": "#0"},
"up": {"uv": [2, 1.75, 6, 3.25], "rotation": 180, "texture": "#0"},
"down": {"uv": [2, 1.75, 6, 3.25], "texture": "#0"}
}
},
{
"name": "funnycone",
"from": [3, 3, 4],
"to": [13, 13, 7],
"rotation": {"angle": 0, "axis": "y", "origin": [0, 16, 0]},
"faces": {
"north": {"uv": [0, 0, 5, 5], "rotation": 180, "texture": "#missing"},
"east": {"uv": [1.5, 2.25, 6.5, 3.75], "rotation": 270, "texture": "#0"},
"south": {"uv": [1.5, 0.75, 6.5, 3.25], "texture": "#0"},
"west": {"uv": [1.5, 2.25, 6.5, 3.75], "rotation": 90, "texture": "#0"},
"up": {"uv": [1.5, 2.25, 6.5, 3.75], "rotation": 180, "texture": "#0"},
"down": {"uv": [1.5, 2.25, 6.5, 3.75], "texture": "#0"}
}
},
{
"name": "funnycone",
"from": [2, 2, 0],
"to": [14, 14, 4],
"rotation": {"angle": 0, "axis": "y", "origin": [0, 16, 0]},
"faces": {
"north": {"uv": [6, 9, 12, 12], "rotation": 180, "texture": "#0"},
"east": {"uv": [1, 2, 7, 4], "rotation": 270, "texture": "#0"},
"south": {"uv": [1, 0.5, 7, 3.5], "texture": "#0"},
"west": {"uv": [1, 2, 7, 4], "rotation": 90, "texture": "#0"},
"up": {"uv": [1, 2, 7, 4], "rotation": 180, "texture": "#0"},
"down": {"uv": [1, 2, 7, 4], "texture": "#0"}
}
},
{
"name": "funnycone",
"from": [10, 7, 1],
"to": [13, 9, 10],
"rotation": {"angle": -22.5, "axis": "y", "origin": [12, 8, 9.5]},
"faces": {
"north": {"uv": [12.5, 2.25, 13.5, 3], "rotation": 270, "texture": "#0"},
"east": {"uv": [12.5, 0, 13.5, 2.25], "rotation": 270, "texture": "#0"},
"south": {"uv": [0, 0, 1.5, 1], "texture": "#missing"},
"west": {"uv": [0, 0, 1, 4.5], "rotation": 90, "texture": "#missing"},
"up": {"uv": [13.5, 0, 15, 2.25], "rotation": 180, "texture": "#0"},
"down": {"uv": [11, 0, 12.5, 2.25], "texture": "#0"}
}
},
{
"name": "funnycone",
"from": [7, 10, 1],
"to": [9, 13, 10],
"rotation": {"angle": 22.5, "axis": "x", "origin": [8, 12, 9.5]},
"faces": {
"north": {"uv": [12.5, 2.25, 13.5, 3], "rotation": 180, "texture": "#0"},
"east": {"uv": [11, 0, 12.5, 2.25], "rotation": 270, "texture": "#0"},
"south": {"uv": [0, 0, 1, 1.5], "texture": "#missing"},
"west": {"uv": [13.5, 0, 15, 2.25], "rotation": 90, "texture": "#0"},
"up": {"uv": [12.5, 0, 13.5, 2.25], "rotation": 180, "texture": "#0"},
"down": {"uv": [0, 0, 1, 4.5], "texture": "#missing"}
}
},
{
"name": "funnycone",
"from": [7, 3, 1],
"to": [9, 6, 10],
"rotation": {"angle": -22.5, "axis": "x", "origin": [8, 4, 9.5]},
"faces": {
"north": {"uv": [12.5, 2.25, 13.5, 3], "rotation": 180, "texture": "#0"},
"east": {"uv": [13.5, 0, 15, 2.25], "rotation": 270, "texture": "#0"},
"south": {"uv": [0, 0, 1, 1.5], "texture": "#missing"},
"west": {"uv": [11, 0, 12.5, 2.25], "rotation": 90, "texture": "#0"},
"up": {"uv": [0, 0, 1, 4.5], "rotation": 180, "texture": "#missing"},
"down": {"uv": [12.5, 0, 13.5, 2.25], "texture": "#0"}
}
},
{
"name": "funnycone",
"from": [3, 7, 1],
"to": [6, 9, 10],
"rotation": {"angle": 22.5, "axis": "y", "origin": [4, 8, 9.5]},
"faces": {
"north": {"uv": [12.5, 2.25, 13.5, 3], "rotation": 270, "texture": "#0"},
"east": {"uv": [0, 0, 1, 4.5], "rotation": 270, "texture": "#missing"},
"south": {"uv": [0, 0, 1.5, 1], "texture": "#missing"},
"west": {"uv": [12.5, 0, 13.5, 2.25], "rotation": 90, "texture": "#0"},
"up": {"uv": [11, 0, 12.5, 2.25], "rotation": 180, "texture": "#0"},
"down": {"uv": [13.5, 0, 15, 2.25], "texture": "#0"}
}
},
{
"name": "frame",
"from": [0, 14, 9],
"to": [2, 16, 14],
"rotation": {"angle": 0, "axis": "y", "origin": [0, 16, 0]},
"faces": {
"north": {"uv": [8, 1.75, 9, 2.25], "texture": "#0"},
"east": {"uv": [9, 0.5, 8, 1.75], "rotation": 270, "texture": "#0"},
"south": {"uv": [0, 0, 1, 1], "texture": "#missing"},
"west": {"uv": [9, 0.5, 8, 1.75], "rotation": 90, "texture": "#0"},
"up": {"uv": [8, 0.5, 9, 1.75], "rotation": 180, "texture": "#0"},
"down": {"uv": [8, 0.5, 9, 1.75], "texture": "#0"}
}
},
{
"name": "frame",
"from": [1, 14, 4],
"to": [2, 15, 9],
"rotation": {"angle": 0, "axis": "y", "origin": [0, 16, 0]},
"faces": {
"north": {"uv": [9, 1.5, 9.5, 1.75], "rotation": 180, "texture": "#0"},
"east": {"uv": [9, 0.25, 9.5, 1.5], "rotation": 270, "texture": "#0"},
"south": {"uv": [0, 0, 0.5, 0.25], "texture": "#missing"},
"west": {"uv": [9, 0.25, 9.5, 1.5], "rotation": 90, "texture": "#0"},
"up": {"uv": [9, 0.25, 9.5, 1.5], "rotation": 180, "texture": "#0"},
"down": {"uv": [9, 0.25, 9.5, 1.5], "texture": "#0"}
}
},
{
"name": "frame",
"from": [1, 1, 4],
"to": [2, 2, 9],
"rotation": {"angle": 0, "axis": "y", "origin": [0, 16, 0]},
"faces": {
"north": {"uv": [9, 1.5, 9.5, 1.75], "rotation": 180, "texture": "#0"},
"east": {"uv": [9, 0.25, 9.5, 1.5], "rotation": 270, "texture": "#0"},
"south": {"uv": [0, 0, 0.5, 0.25], "texture": "#missing"},
"west": {"uv": [9, 0.25, 9.5, 1.5], "rotation": 90, "texture": "#0"},
"up": {"uv": [9, 0.25, 9.5, 1.5], "rotation": 180, "texture": "#0"},
"down": {"uv": [9, 0.25, 9.5, 1.5], "texture": "#0"}
}
},
{
"name": "frame",
"from": [14, 1, 4],
"to": [15, 2, 9],
"rotation": {"angle": 0, "axis": "y", "origin": [0, 16, 0]},
"faces": {
"north": {"uv": [9, 1.5, 9.5, 1.75], "rotation": 180, "texture": "#0"},
"east": {"uv": [9, 0.25, 9.5, 1.5], "rotation": 270, "texture": "#0"},
"south": {"uv": [0, 0, 0.5, 0.25], "texture": "#missing"},
"west": {"uv": [9, 0.25, 9.5, 1.5], "rotation": 90, "texture": "#0"},
"up": {"uv": [9, 0.25, 9.5, 1.5], "rotation": 180, "texture": "#0"},
"down": {"uv": [9, 0.25, 9.5, 1.5], "texture": "#0"}
}
},
{
"name": "frame",
"from": [14, 14, 4],
"to": [15, 15, 9],
"rotation": {"angle": 0, "axis": "y", "origin": [0, 16, 0]},
"faces": {
"north": {"uv": [9, 1.5, 9.5, 1.75], "rotation": 180, "texture": "#0"},
"east": {"uv": [9, 0.25, 9.5, 1.5], "rotation": 270, "texture": "#0"},
"south": {"uv": [0, 0, 0.5, 0.25], "texture": "#missing"},
"west": {"uv": [9, 0.25, 9.5, 1.5], "rotation": 90, "texture": "#0"},
"up": {"uv": [9, 0.25, 9.5, 1.5], "rotation": 180, "texture": "#0"},
"down": {"uv": [9, 0.25, 9.5, 1.5], "texture": "#0"}
}
},
{
"from": [14, 2, 7],
"to": [15, 14, 9],
"rotation": {"angle": 0, "axis": "y", "origin": [0, 16, 0]},
"faces": {
"north": {"uv": [10.5, 0.25, 11, 3.25], "rotation": 180, "texture": "#0"},
"east": {"uv": [9.5, 0.25, 10.5, 3.25], "texture": "#0"},
"south": {"uv": [10.5, 0.25, 11, 3.25], "texture": "#0"},
"west": {"uv": [9.5, 0.25, 10.5, 3.25], "rotation": 180, "texture": "#0"},
"up": {"uv": [0, 0, 0.5, 1], "rotation": 180, "texture": "#missing"},
"down": {"uv": [0, 0, 0.5, 1], "texture": "#missing"}
}
},
{
"name": "frame",
"from": [1, 2, 7],
"to": [2, 14, 9],
"rotation": {"angle": 0, "axis": "y", "origin": [0, 16, 0]},
"faces": {
"north": {"uv": [10.5, 0.25, 11, 3.25], "rotation": 180, "texture": "#0"},
"east": {"uv": [9.5, 0.25, 10.5, 3.25], "texture": "#0"},
"south": {"uv": [10.5, 0.25, 11, 3.25], "texture": "#0"},
"west": {"uv": [9.5, 0.25, 10.5, 3.25], "rotation": 180, "texture": "#0"},
"up": {"uv": [0, 0, 0.5, 1], "rotation": 180, "texture": "#missing"},
"down": {"uv": [0, 0, 0.5, 1], "texture": "#missing"}
}
},
{
"name": "frame",
"from": [2, 14, 7],
"to": [14, 15, 9],
"rotation": {"angle": 0, "axis": "y", "origin": [0, 16, 0]},
"faces": {
"north": {"uv": [10.5, 0.25, 11, 3.25], "rotation": 270, "texture": "#0"},
"east": {"uv": [0, 0, 0.5, 1], "rotation": 270, "texture": "#missing"},
"south": {"uv": [10.5, 0.25, 11, 3.25], "rotation": 90, "texture": "#0"},
"west": {"uv": [0, 0, 0.5, 1], "rotation": 90, "texture": "#missing"},
"up": {"uv": [9.5, 0.25, 10.5, 3.25], "rotation": 270, "texture": "#0"},
"down": {"uv": [9.5, 0.25, 10.5, 3.25], "rotation": 90, "texture": "#0"}
}
},
{
"from": [2, 1, 7],
"to": [14, 2, 9],
"rotation": {"angle": 0, "axis": "y", "origin": [0, 16, 0]},
"faces": {
"north": {"uv": [10.5, 0.25, 11, 3.25], "rotation": 270, "texture": "#0"},
"east": {"uv": [0, 0, 0.5, 1], "rotation": 270, "texture": "#missing"},
"south": {"uv": [10.5, 0.25, 11, 3.25], "rotation": 90, "texture": "#0"},
"west": {"uv": [0, 0, 0.5, 1], "rotation": 90, "texture": "#missing"},
"up": {"uv": [9.5, 0.25, 10.5, 3.25], "rotation": 270, "texture": "#0"},
"down": {"uv": [9.5, 0.25, 10.5, 3.25], "rotation": 90, "texture": "#0"}
}
},
{
"name": "frame",
"from": [14, 14, 9],
"to": [16, 16, 14],
"rotation": {"angle": 0, "axis": "y", "origin": [0, 16, 0]},
"faces": {
"north": {"uv": [8, 1.75, 9, 2.25], "rotation": 270, "texture": "#0"},
"east": {"uv": [8, 0.5, 9, 1.75], "rotation": 270, "texture": "#0"},
"south": {"uv": [0, 0, 1, 1], "texture": "#missing"},
"west": {"uv": [8, 0.5, 9, 1.75], "rotation": 90, "texture": "#0"},
"up": {"uv": [9, 0.5, 8, 1.75], "rotation": 180, "texture": "#0"},
"down": {"uv": [9, 0.5, 8, 1.75], "texture": "#0"}
}
},
{
"name": "frame",
"from": [14, 0, 9],
"to": [16, 2, 14],
"rotation": {"angle": 0, "axis": "y", "origin": [0, 16, 0]},
"faces": {
"north": {"uv": [8, 1.75, 9, 2.25], "rotation": 180, "texture": "#0"},
"east": {"uv": [9, 0.5, 8, 1.75], "rotation": 270, "texture": "#0"},
"south": {"uv": [0, 0, 1, 1], "texture": "#missing"},
"west": {"uv": [9, 0.5, 8, 1.75], "rotation": 90, "texture": "#0"},
"up": {"uv": [8, 0.5, 9, 1.75], "rotation": 180, "texture": "#0"},
"down": {"uv": [8, 0.5, 9, 1.75], "texture": "#0"}
}
},
{
"from": [0, 0, 9],
"to": [2, 2, 14],
"rotation": {"angle": 0, "axis": "y", "origin": [0, 16, 0]},
"faces": {
"north": {"uv": [8, 1.75, 9, 2.25], "rotation": 90, "texture": "#0"},
"east": {"uv": [8, 0.5, 9, 1.75], "rotation": 270, "texture": "#0"},
"south": {"uv": [0, 0, 1, 1], "texture": "#missing"},
"west": {"uv": [8, 0.5, 9, 1.75], "rotation": 90, "texture": "#0"},
"up": {"uv": [9, 0.5, 8, 1.75], "rotation": 180, "texture": "#0"},
"down": {"uv": [9, 0.5, 8, 1.75], "texture": "#0"}
}
}
]
}

View File

@ -1,4 +1,5 @@
{
"credit": "Made with Blockbench",
"render_type": "cutout",
"texture_size": [32, 64],
"textures": {
@ -88,16 +89,6 @@
"west": {"uv": [8, 10.5, 8.5, 11.75], "texture": "#0"}
}
},
{
"name": "container",
"from": [1, 5, 1],
"to": [9, 15, 9],
"faces": {
"north": {"uv": [8, 2, 12, 4.5], "texture": "#0"},
"west": {"uv": [8, 2, 12, 4.5], "texture": "#0"},
"up": {"uv": [8, 0, 12, 2], "texture": "#0"}
}
},
{
"name": "experience",
"from": [1.5, 5, 1.5],
@ -110,6 +101,36 @@
"up": {"uv": [9.5, 12.5, 13, 14.25], "texture": "#0"}
},
"forge_data": { "block_light": 15, "sky_light": 15 }
},
{
"name": "bottle",
"from": [1, 13, 1],
"to": [9, 15, 9],
"faces": {
"north": {"uv": [8, 2, 12, 2.5], "texture": "#0"},
"west": {"uv": [8, 2, 12, 2.5], "texture": "#0"},
"up": {"uv": [8, 0, 12, 2], "texture": "#0"},
"down": {"uv": [8, 0, 12, 2], "texture": "#0"}
}
},
{
"name": "bottle",
"from": [1, 5, 1],
"to": [9, 6, 9],
"faces": {
"north": {"uv": [8, 4.25, 12, 4.5], "texture": "#0"},
"west": {"uv": [8, 4.25, 12, 4.5], "texture": "#0"},
"up": {"uv": [8, 0, 12, 2], "texture": "#0"}
}
},
{
"name": "bottle",
"from": [1, 6, 1],
"to": [9, 13, 9],
"faces": {
"north": {"uv": [8, 2.5, 12, 4.25], "texture": "#0"},
"west": {"uv": [8, 2.5, 12, 4.25], "texture": "#0"}
}
}
],
"display": {

View File

@ -0,0 +1,232 @@
{
"credit": "Made with Blockbench",
"render_type": "cutout",
"textures": {
"0": "overdrive_that_matters:block/matter_reconstructor",
"particle": "overdrive_that_matters:block/matter_reconstructor"
},
"elements": [
{
"name": "body",
"from": [0, 4, 0],
"to": [16, 8, 16],
"faces": {
"north": {"uv": [0, 0, 4, 2], "texture": "#0"},
"east": {"uv": [8, 0, 4, 2], "texture": "#0"},
"south": {"uv": [8, 0, 12, 2], "texture": "#0"},
"west": {"uv": [4, 0, 8, 2], "texture": "#0"},
"up": {"uv": [4, 4, 8, 12], "texture": "#0"},
"down": {"uv": [4, 4, 8, 12], "rotation": 90, "texture": "#0"}
}
},
{
"name": "body",
"from": [0, 0, 0],
"to": [16, 4, 11],
"faces": {
"north": {"uv": [0, 2, 4, 4], "texture": "#0"},
"east": {"uv": [6.75, 2, 4, 4], "texture": "#0"},
"south": {"uv": [0, 2, 4, 4], "texture": "#0"},
"west": {"uv": [4, 2, 6.75, 4], "texture": "#0"},
"down": {"uv": [0, 4, 4, 9.5], "rotation": 180, "texture": "#0"}
}
},
{
"name": "body",
"from": [13, 8, 0],
"to": [16, 16, 16],
"faces": {
"north": {"uv": [0, 12, 0.75, 16], "rotation": 180, "texture": "#0"},
"east": {"uv": [0.75, 12, 4.75, 16], "texture": "#0"},
"south": {"uv": [0, 12, 0.75, 16], "texture": "#0"},
"west": {"uv": [4.75, 12, 8.75, 16], "texture": "#0"},
"up": {"uv": [0, 10.5, 4, 12], "rotation": 90, "texture": "#0"}
}
},
{
"name": "body",
"from": [0, 8, 0],
"to": [3, 16, 16],
"faces": {
"north": {"uv": [0, 12, 0.75, 16], "texture": "#0"},
"east": {"uv": [4.75, 12, 8.75, 16], "texture": "#0"},
"south": {"uv": [0, 12, 0.75, 16], "rotation": 180, "texture": "#0"},
"west": {"uv": [0.75, 12, 4.75, 16], "texture": "#0"},
"up": {"uv": [0, 10.5, 4, 12], "rotation": 270, "texture": "#0"}
}
},
{
"name": "chamber glass",
"from": [3, 8, 1],
"to": [13, 15, 15],
"faces": {
"north": {"uv": [8.75, 5.5, 11.25, 9], "texture": "#0"},
"south": {"uv": [8.75, 5.5, 11.25, 9], "texture": "#0"},
"up": {"uv": [8.75, 9, 11.25, 16], "texture": "#0"}
}
},
{
"name": "shields",
"from": [-1, 8, 1],
"to": [0, 15, 15],
"faces": {
"north": {"uv": [11.25, 4, 13, 4.5], "rotation": 90, "texture": "#0"},
"east": {"uv": [0, 0, 3.5, 3.5], "texture": "#missing"},
"south": {"uv": [11.25, 4, 13, 4.5], "rotation": 90, "texture": "#0"},
"west": {"uv": [11.25, 4.5, 13, 11.5], "rotation": 270, "texture": "#0"},
"up": {"uv": [13, 4.5, 13.25, 11.5], "texture": "#0"},
"down": {"uv": [13, 4.5, 13.25, 11.5], "texture": "#0"}
}
},
{
"name": "shields",
"from": [16, 8, 1],
"to": [17, 15, 15],
"faces": {
"north": {"uv": [11.25, 4, 13, 4.5], "rotation": 90, "texture": "#0"},
"east": {"uv": [11.25, 4.5, 13, 11.5], "rotation": 270, "texture": "#0"},
"south": {"uv": [11.25, 4, 13, 4.5], "rotation": 90, "texture": "#0"},
"west": {"uv": [0, 0, 3.5, 3.5], "texture": "#missing"},
"up": {"uv": [13, 4.5, 13.25, 11.5], "texture": "#0"},
"down": {"uv": [13, 4.5, 13.25, 11.5], "texture": "#0"}
}
},
{
"name": "item platform",
"from": [4, 8, 4],
"to": [12, 9, 12],
"faces": {
"north": {"uv": [11.25, 11.5, 13.25, 12], "texture": "#0"},
"east": {"uv": [11.25, 11.5, 13.25, 12], "texture": "#0"},
"south": {"uv": [11.25, 11.5, 13.25, 12], "texture": "#0"},
"west": {"uv": [11.25, 11.5, 13.25, 12], "texture": "#0"},
"up": {"uv": [11.25, 12, 13.25, 16], "texture": "#0"}
}
},
{
"name": "matter storage",
"from": [14, 0, 11],
"to": [15, 4, 15],
"faces": {
"east": {"uv": [6.75, 2, 7.75, 4], "texture": "#0"},
"south": {"uv": [11, 2, 11.25, 4], "texture": "#0"},
"down": {"uv": [11, 2, 11.25, 4], "texture": "#0"}
}
},
{
"name": "matter storage",
"from": [1, 0, 11],
"to": [3, 4, 15],
"faces": {
"south": {"uv": [7.75, 2, 8.25, 4], "texture": "#0"},
"west": {"uv": [6.75, 2, 7.75, 4], "texture": "#0"},
"down": {"uv": [7.75, 2, 8.25, 4], "texture": "#0"}
}
},
{
"name": "matter glow",
"from": [3, 0, 11],
"to": [14, 4, 15],
"faces": {
"south": {"uv": [8.25, 2, 11, 4], "texture": "#0"},
"down": {"uv": [8.25, 2, 11, 4], "texture": "#0"}
},
"forge_data": { "block_light": 15, "sky_light": 15 }
},
{
"name": "manipulator",
"from": [6, 6, 10.9],
"to": [7, 11, 11.9],
"rotation": {"angle": 45, "axis": "x", "origin": [6.5, 8.5, 12.4]},
"faces": {
"north": {"uv": [8, 4.5, 9.25, 5], "rotation": 90, "texture": "#0"},
"east": {"uv": [8, 4, 9.25, 4.5], "rotation": 90, "texture": "#0"},
"south": {"uv": [8, 4.5, 9.25, 5], "rotation": 90, "texture": "#0"},
"west": {"uv": [8, 4, 9.25, 4.5], "rotation": 90, "texture": "#0"}
}
},
{
"name": "manipulator",
"from": [6, 10, 8.1],
"to": [7, 11, 9.1],
"rotation": {"angle": 45, "axis": "x", "origin": [6.5, 10, 10.4]},
"faces": {
"north": {"uv": [9.25, 4, 9.5, 4.5], "texture": "#0"},
"east": {"uv": [9.25, 4, 9.5, 4.5], "texture": "#0"},
"south": {"uv": [9.25, 4, 9.5, 4.5], "texture": "#0"},
"west": {"uv": [9.25, 4, 9.5, 4.5], "texture": "#0"}
}
},
{
"name": "manipulator tip",
"from": [6, 9, 8.1],
"to": [7, 10, 9.1],
"rotation": {"angle": 45, "axis": "x", "origin": [6.5, 10, 10.4]},
"faces": {
"north": {"uv": [9.25, 4.5, 9.5, 5], "texture": "#0"},
"east": {"uv": [9.25, 4.5, 9.5, 5], "texture": "#0"},
"south": {"uv": [9.25, 4.5, 9.5, 5], "texture": "#0"},
"west": {"uv": [9.25, 4.5, 9.5, 5], "texture": "#0"},
"down": {"uv": [9.5, 4.5, 9.75, 5], "texture": "#0"}
},
"forge_data": { "block_light": 15, "sky_light": 15 }
},
{
"name": "manipulator",
"from": [5.9, 10.5, 9.4],
"to": [7.1, 12.5, 14.4],
"rotation": {"angle": 0, "axis": "x", "origin": [6.5, 12.5, 13.9]},
"faces": {
"north": {"uv": [8, 5.5, 8.5, 6.1], "rotation": 90, "texture": "#0"},
"east": {"uv": [8, 6, 8.5, 8.5], "rotation": 270, "texture": "#0"},
"south": {"uv": [8, 5.5, 8.5, 6.1], "rotation": 90, "texture": "#0"},
"west": {"uv": [8, 6, 8.5, 8.5], "rotation": 270, "texture": "#0"},
"up": {"uv": [8.5, 6, 8.75, 8.5], "texture": "#0"},
"down": {"uv": [8, 6, 8.25, 8.5], "rotation": 180, "texture": "#0"}
}
},
{
"name": "emerald lens",
"from": [7, 8, 3],
"to": [9, 10, 5],
"faces": {
"north": {"uv": [8, 10.5, 8.5, 11.5], "texture": "#0"},
"east": {"uv": [8, 10.5, 8.5, 11.5], "texture": "#0"},
"south": {"uv": [8, 10.5, 8.5, 11.5], "texture": "#0"},
"west": {"uv": [8, 10.5, 8.5, 11.5], "texture": "#0"},
"up": {"uv": [8, 9.5, 8.5, 10.5], "texture": "#0"}
}
}
],
"display": {
"thirdperson_righthand": {
"rotation": [75, 45, 0],
"translation": [0, 2.5, 0],
"scale": [0.375, 0.375, 0.375]
},
"thirdperson_lefthand": {
"rotation": [75, 45, 0],
"translation": [0, 2.5, 0],
"scale": [0.375, 0.375, 0.375]
},
"firstperson_righthand": {
"rotation": [0, 45, 0],
"scale": [0.4, 0.4, 0.4]
},
"firstperson_lefthand": {
"rotation": [0, 225, 0],
"scale": [0.4, 0.4, 0.4]
},
"ground": {
"translation": [0, 3, 0],
"scale": [0.25, 0.25, 0.25]
},
"gui": {
"rotation": [30, 225, 0],
"scale": [0.625, 0.625, 0.625]
},
"fixed": {
"scale": [0.5, 0.5, 0.5]
}
}
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 544 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 487 B

After

Width:  |  Height:  |  Size: 1.0 KiB

View File

@ -0,0 +1,7 @@
{
"animation": {
"frametime": 16,
"width": 32,
"height": 64
}
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 166 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 417 B

After

Width:  |  Height:  |  Size: 559 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 417 B

After

Width:  |  Height:  |  Size: 559 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 416 B

After

Width:  |  Height:  |  Size: 559 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 417 B

After

Width:  |  Height:  |  Size: 559 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 417 B

After

Width:  |  Height:  |  Size: 559 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 417 B

After

Width:  |  Height:  |  Size: 559 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 417 B

After

Width:  |  Height:  |  Size: 559 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 417 B

After

Width:  |  Height:  |  Size: 559 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 417 B

After

Width:  |  Height:  |  Size: 559 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 417 B

After

Width:  |  Height:  |  Size: 559 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 417 B

After

Width:  |  Height:  |  Size: 559 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 417 B

After

Width:  |  Height:  |  Size: 559 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 417 B

After

Width:  |  Height:  |  Size: 559 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 417 B

After

Width:  |  Height:  |  Size: 559 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 417 B

After

Width:  |  Height:  |  Size: 559 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 417 B

After

Width:  |  Height:  |  Size: 559 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 417 B

After

Width:  |  Height:  |  Size: 559 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 200 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 254 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 195 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 209 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 216 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 227 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 221 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 216 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 750 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 242 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 227 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 246 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 195 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 197 B