diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/DecorativeData.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/DecorativeData.kt index 0a40478ab..36667ac77 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/DecorativeData.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/DecorativeData.kt @@ -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) } diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/blocks/BlockStates.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/blocks/BlockStates.kt index 52135accd..6fb27fc90 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/blocks/BlockStates.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/blocks/BlockStates.kt @@ -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) diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/items/ItemModels.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/items/ItemModels.kt index 8c2d8c79b..b906e6e24 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/items/ItemModels.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/items/ItemModels.kt @@ -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") diff --git a/src/main/java/ru/dbotthepony/mc/otm/shapes/BlockShapes.java b/src/main/java/ru/dbotthepony/mc/otm/shapes/BlockShapes.java index b1f97bd01..d87f1ef00 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/shapes/BlockShapes.java +++ b/src/main/java/ru/dbotthepony/mc/otm/shapes/BlockShapes.java @@ -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) + ); } diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/matter/ItemRepairerBlock.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/matter/MatterReconstructorBlock.kt similarity index 58% rename from src/main/kotlin/ru/dbotthepony/mc/otm/block/matter/ItemRepairerBlock.kt rename to src/main/kotlin/ru/dbotthepony/mc/otm/block/matter/MatterReconstructorBlock.kt index d3fc0928b..d46b0e414 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/matter/ItemRepairerBlock.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/matter/MatterReconstructorBlock.kt @@ -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]!! + } } diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MBlocks.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MBlocks.kt index afe8b208c..90de2a4e3 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MBlocks.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MBlocks.kt @@ -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() } diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MNames.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MNames.kt index 81bdd5794..0347f06dd 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MNames.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MNames.kt @@ -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" diff --git a/src/main/resources/assets/overdrive_that_matters/models/block/android_station_working.json b/src/main/resources/assets/overdrive_that_matters/models/block/android_station_working.json index 7a63ccca3..200020ecc 100644 --- a/src/main/resources/assets/overdrive_that_matters/models/block/android_station_working.json +++ b/src/main/resources/assets/overdrive_that_matters/models/block/android_station_working.json @@ -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 } } diff --git a/src/main/resources/assets/overdrive_that_matters/models/block/engine.json b/src/main/resources/assets/overdrive_that_matters/models/block/engine.json index d3bc265b0..89cb5ee31 100644 --- a/src/main/resources/assets/overdrive_that_matters/models/block/engine.json +++ b/src/main/resources/assets/overdrive_that_matters/models/block/engine.json @@ -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" diff --git a/src/main/resources/assets/overdrive_that_matters/models/block/engine_active.json b/src/main/resources/assets/overdrive_that_matters/models/block/engine_active.json new file mode 100644 index 000000000..23a785b34 --- /dev/null +++ b/src/main/resources/assets/overdrive_that_matters/models/block/engine_active.json @@ -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"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/overdrive_that_matters/models/block/essence_storage.json b/src/main/resources/assets/overdrive_that_matters/models/block/essence_storage.json index 232c1ec45..b8cd1d055 100644 --- a/src/main/resources/assets/overdrive_that_matters/models/block/essence_storage.json +++ b/src/main/resources/assets/overdrive_that_matters/models/block/essence_storage.json @@ -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": { diff --git a/src/main/resources/assets/overdrive_that_matters/models/block/matter_reconstructor.json b/src/main/resources/assets/overdrive_that_matters/models/block/matter_reconstructor.json new file mode 100644 index 000000000..94d03904b --- /dev/null +++ b/src/main/resources/assets/overdrive_that_matters/models/block/matter_reconstructor.json @@ -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] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/overdrive_that_matters/optifine/emissive.properties b/src/main/resources/assets/overdrive_that_matters/optifine/emissive.properties deleted file mode 100644 index 55ac3b130..000000000 --- a/src/main/resources/assets/overdrive_that_matters/optifine/emissive.properties +++ /dev/null @@ -1 +0,0 @@ -suffix.emissive=_em \ No newline at end of file diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/android_station.png b/src/main/resources/assets/overdrive_that_matters/textures/block/android_station.png index eb34ef154..be4d27d19 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/block/android_station.png and b/src/main/resources/assets/overdrive_that_matters/textures/block/android_station.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/android_station_em.png b/src/main/resources/assets/overdrive_that_matters/textures/block/android_station_em.png index 2e734afc4..253476d7d 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/block/android_station_em.png and b/src/main/resources/assets/overdrive_that_matters/textures/block/android_station_em.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/android_station_em.png.mcmeta b/src/main/resources/assets/overdrive_that_matters/textures/block/android_station_em.png.mcmeta new file mode 100644 index 000000000..fa950acdd --- /dev/null +++ b/src/main/resources/assets/overdrive_that_matters/textures/block/android_station_em.png.mcmeta @@ -0,0 +1,7 @@ +{ + "animation": { + "frametime": 16, + "width": 32, + "height": 64 + } +} \ No newline at end of file diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/batterybank_core_em.png b/src/main/resources/assets/overdrive_that_matters/textures/block/batterybank_core_em.png deleted file mode 100644 index 268923c4e..000000000 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/block/batterybank_core_em.png and /dev/null differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/cargo_crates/cargo_crate.png b/src/main/resources/assets/overdrive_that_matters/textures/block/cargo_crates/cargo_crate.png index f55a0c4b7..9c627d98a 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/block/cargo_crates/cargo_crate.png and b/src/main/resources/assets/overdrive_that_matters/textures/block/cargo_crates/cargo_crate.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/cargo_crates/cargo_crate_black.png b/src/main/resources/assets/overdrive_that_matters/textures/block/cargo_crates/cargo_crate_black.png index 062cb6706..351e6d1f9 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/block/cargo_crates/cargo_crate_black.png and b/src/main/resources/assets/overdrive_that_matters/textures/block/cargo_crates/cargo_crate_black.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/cargo_crates/cargo_crate_blue.png b/src/main/resources/assets/overdrive_that_matters/textures/block/cargo_crates/cargo_crate_blue.png index 9b96f96e7..d08bba27e 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/block/cargo_crates/cargo_crate_blue.png and b/src/main/resources/assets/overdrive_that_matters/textures/block/cargo_crates/cargo_crate_blue.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/cargo_crates/cargo_crate_brown.png b/src/main/resources/assets/overdrive_that_matters/textures/block/cargo_crates/cargo_crate_brown.png index 78c9e9e02..8142ac08f 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/block/cargo_crates/cargo_crate_brown.png and b/src/main/resources/assets/overdrive_that_matters/textures/block/cargo_crates/cargo_crate_brown.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/cargo_crates/cargo_crate_cyan.png b/src/main/resources/assets/overdrive_that_matters/textures/block/cargo_crates/cargo_crate_cyan.png index 3b946c37f..7d2724f68 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/block/cargo_crates/cargo_crate_cyan.png and b/src/main/resources/assets/overdrive_that_matters/textures/block/cargo_crates/cargo_crate_cyan.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/cargo_crates/cargo_crate_gray.png b/src/main/resources/assets/overdrive_that_matters/textures/block/cargo_crates/cargo_crate_gray.png index f2f18b4b4..c4fa7b5cf 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/block/cargo_crates/cargo_crate_gray.png and b/src/main/resources/assets/overdrive_that_matters/textures/block/cargo_crates/cargo_crate_gray.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/cargo_crates/cargo_crate_green.png b/src/main/resources/assets/overdrive_that_matters/textures/block/cargo_crates/cargo_crate_green.png index 364f0a668..8392f07d4 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/block/cargo_crates/cargo_crate_green.png and b/src/main/resources/assets/overdrive_that_matters/textures/block/cargo_crates/cargo_crate_green.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/cargo_crates/cargo_crate_light_blue.png b/src/main/resources/assets/overdrive_that_matters/textures/block/cargo_crates/cargo_crate_light_blue.png index d6fbbea41..90cf6bcc9 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/block/cargo_crates/cargo_crate_light_blue.png and b/src/main/resources/assets/overdrive_that_matters/textures/block/cargo_crates/cargo_crate_light_blue.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/cargo_crates/cargo_crate_light_gray.png b/src/main/resources/assets/overdrive_that_matters/textures/block/cargo_crates/cargo_crate_light_gray.png index 9d573a1c2..62e444253 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/block/cargo_crates/cargo_crate_light_gray.png and b/src/main/resources/assets/overdrive_that_matters/textures/block/cargo_crates/cargo_crate_light_gray.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/cargo_crates/cargo_crate_lime.png b/src/main/resources/assets/overdrive_that_matters/textures/block/cargo_crates/cargo_crate_lime.png index 9f70f39c0..1f499d89c 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/block/cargo_crates/cargo_crate_lime.png and b/src/main/resources/assets/overdrive_that_matters/textures/block/cargo_crates/cargo_crate_lime.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/cargo_crates/cargo_crate_magenta.png b/src/main/resources/assets/overdrive_that_matters/textures/block/cargo_crates/cargo_crate_magenta.png index 8f016fc6e..25eb700ca 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/block/cargo_crates/cargo_crate_magenta.png and b/src/main/resources/assets/overdrive_that_matters/textures/block/cargo_crates/cargo_crate_magenta.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/cargo_crates/cargo_crate_orange.png b/src/main/resources/assets/overdrive_that_matters/textures/block/cargo_crates/cargo_crate_orange.png index db25d3c1a..8b47feec8 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/block/cargo_crates/cargo_crate_orange.png and b/src/main/resources/assets/overdrive_that_matters/textures/block/cargo_crates/cargo_crate_orange.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/cargo_crates/cargo_crate_pink.png b/src/main/resources/assets/overdrive_that_matters/textures/block/cargo_crates/cargo_crate_pink.png index c9cb19f6d..712b0e1d9 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/block/cargo_crates/cargo_crate_pink.png and b/src/main/resources/assets/overdrive_that_matters/textures/block/cargo_crates/cargo_crate_pink.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/cargo_crates/cargo_crate_purple.png b/src/main/resources/assets/overdrive_that_matters/textures/block/cargo_crates/cargo_crate_purple.png index b805cbfa5..d19b09ec0 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/block/cargo_crates/cargo_crate_purple.png and b/src/main/resources/assets/overdrive_that_matters/textures/block/cargo_crates/cargo_crate_purple.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/cargo_crates/cargo_crate_red.png b/src/main/resources/assets/overdrive_that_matters/textures/block/cargo_crates/cargo_crate_red.png index 21cc02660..ac61d4fa4 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/block/cargo_crates/cargo_crate_red.png and b/src/main/resources/assets/overdrive_that_matters/textures/block/cargo_crates/cargo_crate_red.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/cargo_crates/cargo_crate_white.png b/src/main/resources/assets/overdrive_that_matters/textures/block/cargo_crates/cargo_crate_white.png index c78517fb8..42c4ce711 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/block/cargo_crates/cargo_crate_white.png and b/src/main/resources/assets/overdrive_that_matters/textures/block/cargo_crates/cargo_crate_white.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/cargo_crates/cargo_crate_yellow.png b/src/main/resources/assets/overdrive_that_matters/textures/block/cargo_crates/cargo_crate_yellow.png index f36b2ef95..869b0ec60 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/block/cargo_crates/cargo_crate_yellow.png and b/src/main/resources/assets/overdrive_that_matters/textures/block/cargo_crates/cargo_crate_yellow.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/chemical_generator_em.png b/src/main/resources/assets/overdrive_that_matters/textures/block/chemical_generator_em.png deleted file mode 100644 index 8079b734d..000000000 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/block/chemical_generator_em.png and /dev/null differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/tritanium_bars.png b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/tritanium_bars.png new file mode 100644 index 000000000..86d2aa5aa Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/tritanium_bars.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/drive_rack_em.png b/src/main/resources/assets/overdrive_that_matters/textures/block/drive_rack_em.png deleted file mode 100644 index b25583f22..000000000 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/block/drive_rack_em.png and /dev/null differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/drive_viewer_em.png b/src/main/resources/assets/overdrive_that_matters/textures/block/drive_viewer_em.png deleted file mode 100644 index 0ea676437..000000000 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/block/drive_viewer_em.png and /dev/null differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/essence_storage.png b/src/main/resources/assets/overdrive_that_matters/textures/block/essence_storage.png index f0136b877..bf0d32920 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/block/essence_storage.png and b/src/main/resources/assets/overdrive_that_matters/textures/block/essence_storage.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/gravitational_stabilizer_em.png b/src/main/resources/assets/overdrive_that_matters/textures/block/gravitational_stabilizer_em.png deleted file mode 100644 index 336799c4d..000000000 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/block/gravitational_stabilizer_em.png and /dev/null differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/gravitational_stabilizer_idle_em.png b/src/main/resources/assets/overdrive_that_matters/textures/block/gravitational_stabilizer_idle_em.png deleted file mode 100644 index 7f7c95c4a..000000000 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/block/gravitational_stabilizer_idle_em.png and /dev/null differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/item_monitor_em.png b/src/main/resources/assets/overdrive_that_matters/textures/block/item_monitor_em.png deleted file mode 100644 index e5c42a6fe..000000000 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/block/item_monitor_em.png and /dev/null differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_bottler_em.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_bottler_em.png deleted file mode 100644 index ab1db4e56..000000000 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_bottler_em.png and /dev/null differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_decomposer_em.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_decomposer_em.png deleted file mode 100644 index 8ad97db8e..000000000 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_decomposer_em.png and /dev/null differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_panel_em.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_panel_em.png deleted file mode 100644 index 28fafef25..000000000 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_panel_em.png and /dev/null differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_reconstructor.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_reconstructor.png new file mode 100644 index 000000000..854ab7991 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_reconstructor.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_recycler_em.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_recycler_em.png deleted file mode 100644 index 6b48c2cb8..000000000 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_recycler_em.png and /dev/null differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_em.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_em.png deleted file mode 100644 index 09c99d763..000000000 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_em.png and /dev/null differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_halted_em.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_halted_em.png deleted file mode 100644 index a83f9bd04..000000000 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_halted_em.png and /dev/null differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_offline_em.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_offline_em.png deleted file mode 100644 index 2b21edc16..000000000 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_offline_em.png and /dev/null differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_scanner_em.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_scanner_em.png deleted file mode 100644 index 0a7494157..000000000 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_scanner_em.png and /dev/null differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/plate_press_em.png b/src/main/resources/assets/overdrive_that_matters/textures/block/plate_press_em.png deleted file mode 100644 index 2340c4106..000000000 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/block/plate_press_em.png and /dev/null differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/storage_power_supplier_em.png b/src/main/resources/assets/overdrive_that_matters/textures/block/storage_power_supplier_em.png deleted file mode 100644 index 6c73a3755..000000000 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/block/storage_power_supplier_em.png and /dev/null differ