DBot/overdrive_that_matters
DBot/overdrive_that_matters
3
1
Fork 0
Code Issues 63 Pull Requests Packages Releases Wiki Activity

Merge branch '1.20.2' into 1.20.1

Browse Source
This commit is contained in:
DBotThePony 2024-01-02 12:00:12 +07:00
commit edea36a8a6
Signed by: DBot
GPG Key ID: DCC23B5715498507
25 changed files with 493 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/data/kotlin/ru/dbotthepony/mc/otm/datagen/blocks/BlockStates.kt
View File

@ -97,8 +97,10 @@ fun addBlockStates(provider: MatteryBlockStateProvider) {
provider.block(MBlocks.TWIN_PLATE_PRESS)
provider.block(MBlocks.GRAVITATION_STABILIZER)
provider.block(MBlocks.GRAVITATION_STABILIZER_LENS)
provider.block(MBlocks.POWERED_BLAST_FURNACE)
provider.block(MBlocks.POWERED_FURNACE)
provider.block(MBlocks.POWERED_SMOKER)
provider.block(MBlocks.STORAGE_POWER_SUPPLIER)
provider.block(MBlocks.MATTER_RECYCLER)

2
src/data/kotlin/ru/dbotthepony/mc/otm/datagen/items/ItemModels.kt
View File

@ -174,8 +174,10 @@ fun addItemModels(provider: MatteryItemModelProvider) {
provider.block(MItems.ENERGY_SERVO, "energy_servo")
provider.block(MItems.ESSENCE_STORAGE, "essence_storage")
provider.block(MItems.MATTER_RECONSTRUCTOR, "matter_reconstructor")
provider.block(MItems.POWERED_BLAST_FURNACE, "powered_blast_furnace_working")
provider.block(MItems.POWERED_FURNACE, "powered_furnace_working")
provider.block(MItems.POWERED_SMOKER, "powered_smoker_working")
provider.block(MItems.PLATE_PRESS, "plate_press_idle")
provider.block(MItems.TWIN_PLATE_PRESS, "twin_plate_press_idle")

12
src/main/java/ru/dbotthepony/mc/otm/shapes/BlockShapes.java
View File

@ -785,4 +785,16 @@ public class BlockShapes {
new SimpleCuboid(0.3125d, 1.000625d, 0.125d, 0.6875d, 1.000625d, 0.1875d)
);
public static final BlockShape POWERED_SMOKER_IDLE = new BlockShape(
new SimpleCuboid(0.0625d, 0d, 0.5d, 0.9375d, 0.25d, 0.9375d),
new SimpleCuboid(0d, 0d, 0d, 1d, 0.25d, 0.5d),
new SimpleCuboid(0d, 0.25d, 0d, 0.3125d, 1d, 1d),
new SimpleCuboid(0.3125d, 0.25d, 0d, 1d, 0.3125d, 1d),
new SimpleCuboid(0.3125d, 0.875d, 0d, 1d, 1d, 1d),
new SimpleCuboid(0.3125d, 0.3125d, 0.9375d, 1d, 0.875d, 1d),
new SimpleCuboid(0.9375d, 0.3125d, 0d, 1d, 0.875d, 0.9375d),
new SimpleCuboid(0.375d, 0.3125d, 0.25d, 0.875d, 0.375d, 0.75d),
new SimpleCuboid(0.3125d, 0.3125d, 0.0625d, 0.9375d, 0.875d, 0.0625d),
new SimpleCuboid(0.3125d, 0.6875d, 0.5d, 0.375d, 0.875d, 0.8125d)
);
}

16
src/main/kotlin/ru/dbotthepony/mc/otm/registry/MBlocks.kt
View File

@ -12,17 +12,7 @@ import net.minecraft.world.item.ItemStack
import net.minecraft.world.item.TooltipFlag
import net.minecraft.world.item.crafting.RecipeType
import net.minecraft.world.level.BlockGetter
import net.minecraft.world.level.block.AnvilBlock
import net.minecraft.world.level.block.Block
import net.minecraft.world.level.block.DoorBlock
import net.minecraft.world.level.block.DropExperienceBlock
import net.minecraft.world.level.block.IronBarsBlock
import net.minecraft.world.level.block.LiquidBlock
import net.minecraft.world.level.block.SlabBlock
import net.minecraft.world.level.block.SoundType
import net.minecraft.world.level.block.StairBlock
import net.minecraft.world.level.block.TrapDoorBlock
import net.minecraft.world.level.block.WallBlock
import net.minecraft.world.level.block.*
import net.minecraft.world.level.block.state.BlockBehaviour
import net.minecraft.world.level.block.state.BlockState
import net.minecraft.world.level.block.state.properties.BlockSetType
@ -108,7 +98,7 @@ object MBlocks {
val TWIN_PLATE_PRESS: Block by registry.register(MNames.TWIN_PLATE_PRESS) { PlatePressBlock(isTwin = true) }
val POWERED_FURNACE: PoweredFurnaceBlock by registry.register(MNames.POWERED_FURNACE) { PoweredFurnaceBlock(MBlockEntities::POWERED_FURNACE, RecipeType.SMELTING, null, MachinesConfig.POWERED_FURNACE, BlockShapes.POWERED_FURNACE) }
val POWERED_BLAST_FURNACE: PoweredFurnaceBlock by registry.register(MNames.POWERED_BLAST_FURNACE) { PoweredFurnaceBlock(MBlockEntities::POWERED_BLAST_FURNACE, RecipeType.BLASTING, null, MachinesConfig.POWERED_BLAST_FURNACE, BlockShapes.POWERED_BLAST_FURNACE) }
val POWERED_SMOKER: PoweredFurnaceBlock by registry.register(MNames.POWERED_SMOKER) { PoweredFurnaceBlock(MBlockEntities::POWERED_SMOKER, RecipeType.SMOKING, MRecipes::MICROWAVE, MachinesConfig.POWERED_SMOKER, null) }
val POWERED_SMOKER: PoweredFurnaceBlock by registry.register(MNames.POWERED_SMOKER) { PoweredFurnaceBlock(MBlockEntities::POWERED_SMOKER, RecipeType.SMOKING, MRecipes::MICROWAVE, MachinesConfig.POWERED_SMOKER, BlockShapes.POWERED_SMOKER_IDLE) }
val MATTER_RECYCLER: Block by registry.register(MNames.MATTER_RECYCLER) { MatterRecyclerBlock() }
val ENERGY_SERVO: Block by registry.register(MNames.ENERGY_SERVO) { EnergyServoBlock() }
val COBBLESTONE_GENERATOR: Block by registry.register(MNames.COBBLESTONE_GENERATOR) { CobblerBlock() }
@ -206,7 +196,7 @@ object MBlocks {
val LABORATORY_LAMP_INVERTED: Block by registry.register(MNames.LABORATORY_LAMP_INVERTED) { LaboratoryLamp(true) }
val LABORATORY_LAMP_LIGHT: Block by registry.register(MNames.LABORATORY_LAMP_LIGHT) { LaboratoryLampLight() }
val DANGER_STRIPE_BLOCK: Block by registry.register(MNames.DANGER_STRIPE_BLOCK) { Block(BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_GRAY).explosionResistance(6f).destroyTime(1.5f).requiresCorrectToolForDrops()) }
val METAL_BEAM: Block by registry.register(MNames.METAL_BEAM) { Block(BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_GRAY).sound(SoundType.METAL).explosionResistance(14f).destroyTime(2.5f).requiresCorrectToolForDrops()) }
val METAL_BEAM: Block by registry.register(MNames.METAL_BEAM) { RotatedPillarBlock(BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_GRAY).sound(SoundType.METAL).explosionResistance(14f).destroyTime(2.5f).requiresCorrectToolForDrops()) }
val ENGINE: Block by registry.register(MNames.ENGINE) { EngineBlock() }
val HOLO_SIGN: Block by registry.register(MNames.HOLO_SIGN) { HoloSignBlock() }

158
src/main/resources/assets/overdrive_that_matters/models/block/powered_smoker_error.json Normal file
View File

@ -0,0 +1,158 @@
{
"credit": "Made with Blockbench",
"render_type": "translucent",
"texture_size": [32, 32],
"textures": {
"0": "overdrive_that_matters:block/powered_smoker_base",
"1": "overdrive_that_matters:block/powered_smoker_interior_2",
"particle": "overdrive_that_matters:block/powered_smoker_base"
},
"elements": [
{
"name": "body2",
"from": [1, 0, 8],
"to": [15, 4, 15],
"faces": {
"east": {"uv": [0, 14, 4, 16], "texture": "#1"},
"south": {"uv": [0, 14, 7, 16], "texture": "#1"},
"west": {"uv": [3, 14, 7, 16], "texture": "#1"},
"down": {"uv": [0.5, 4, 7.5, 7.5], "rotation": 180, "texture": "#0"}
}
},
{
"name": "body",
"from": [0, 0, 0],
"to": [16, 4, 8],
"faces": {
"north": {"uv": [8, 6, 16, 8], "texture": "#0"},
"east": {"uv": [12, 14, 8, 16], "texture": "#0"},
"south": {"uv": [0, 0, 8, 2], "texture": "#0"},
"west": {"uv": [8, 14, 12, 16], "texture": "#0"},
"down": {"uv": [0, 0, 8, 4], "rotation": 180, "texture": "#0"}
}
},
{
"name": "body",
"from": [0, 4, 0],
"to": [5, 16, 16],
"faces": {
"north": {"uv": [13.5, 6, 16, 12], "texture": "#1"},
"east": {"uv": [0, 0, 8, 6], "texture": "#1"},
"south": {"uv": [8, 0, 10.5, 6], "texture": "#1"},
"west": {"uv": [8, 8, 16, 14], "texture": "#0"},
"up": {"uv": [5.5, 8, 8, 16], "rotation": 180, "texture": "#0"},
"down": {"uv": [0, 8, 2.5, 0.5], "texture": "#0"}
}
},
{
"name": "body",
"from": [5, 4, 0],
"to": [16, 5, 16],
"faces": {
"north": {"uv": [8, 5.5, 13.5, 6], "texture": "#0"},
"east": {"uv": [16, 13.5, 8, 14], "texture": "#0"},
"south": {"uv": [10.5, 5.5, 16, 6], "texture": "#1"},
"west": {"uv": [0, 0, 8, 1], "texture": "#missing"},
"up": {"uv": [0, 6, 5.5, 14], "rotation": 180, "texture": "#1"},
"down": {"uv": [2.5, 8, 8, 0.5], "texture": "#0"}
}
},
{
"name": "body",
"from": [5, 14, 0],
"to": [16, 16, 16],
"faces": {
"north": {"uv": [8, 0, 13.5, 1], "texture": "#0"},
"east": {"uv": [16, 8, 8, 9], "texture": "#0"},
"south": {"uv": [10.5, 0, 16, 1], "texture": "#1"},
"up": {"uv": [0, 8, 5.5, 16], "rotation": 180, "texture": "#0"},
"down": {"uv": [0, 14, 5.5, 6], "rotation": 180, "texture": "#1"}
}
},
{
"name": "body",
"from": [5, 5, 15],
"to": [16, 14, 16],
"faces": {
"north": {"uv": [5.5, 6, 11, 10], "texture": "#1"},
"east": {"uv": [16, 9, 15.5, 13.5], "texture": "#0"},
"south": {"uv": [10.5, 1, 16, 5.5], "texture": "#1"},
"up": {"uv": [0, 0, 5.5, 1], "texture": "#missing"}
}
},
{
"name": "body",
"from": [15, 5, 0],
"to": [16, 14, 15],
"faces": {
"north": {"uv": [8, 1, 8.5, 5.5], "texture": "#0"},
"east": {"uv": [15.5, 9, 8, 13.5], "texture": "#0"},
"west": {"uv": [8, 1, 0.5, 5.5], "texture": "#1"},
"up": {"uv": [0.5, 0, 0.5, 15], "texture": "#missing"}
}
},
{
"name": "plate",
"from": [6, 5, 4],
"to": [14, 6, 12],
"faces": {
"north": {"uv": [12, 15.5, 16, 16], "texture": "#1"},
"east": {"uv": [12, 15.5, 16, 16], "texture": "#1"},
"south": {"uv": [12, 15.5, 16, 16], "texture": "#1"},
"west": {"uv": [12, 15.5, 16, 16], "texture": "#1"},
"up": {"uv": [12, 12, 16, 16], "texture": "#1"}
}
},
{
"name": "screen",
"from": [5, 5, 1],
"to": [15, 14, 1],
"faces": {
"north": {"uv": [8.5, 1, 13.5, 5.5], "texture": "#0"},
"south": {"uv": [13.5, 1, 8.5, 5.5], "texture": "#0"}
}
},
{
"name": "heater",
"from": [5, 11, 8],
"to": [6, 14, 13],
"faces": {
"north": {"uv": [9, 11, 9.5, 12.5], "texture": "#1"},
"east": {"uv": [6.5, 11, 9, 12.5], "texture": "#1"},
"south": {"uv": [6, 11, 6.5, 12.5], "texture": "#1"},
"down": {"uv": [6.5, 12.5, 9, 13], "rotation": 90, "texture": "#1"}
}
}
],
"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]
}
}
}

158
src/main/resources/assets/overdrive_that_matters/models/block/powered_smoker_idle.json Normal file
View File

@ -0,0 +1,158 @@
{
"credit": "Made with Blockbench",
"render_type": "translucent",
"texture_size": [32, 32],
"textures": {
"0": "overdrive_that_matters:block/powered_smoker_base",
"1": "overdrive_that_matters:block/powered_smoker_interior_0",
"particle": "overdrive_that_matters:block/powered_smoker_base"
},
"elements": [
{
"name": "body2",
"from": [1, 0, 8],
"to": [15, 4, 15],
"faces": {
"east": {"uv": [0, 14, 4, 16], "texture": "#1"},
"south": {"uv": [0, 14, 7, 16], "texture": "#1"},
"west": {"uv": [3, 14, 7, 16], "texture": "#1"},
"down": {"uv": [0.5, 4, 7.5, 7.5], "rotation": 180, "texture": "#0"}
}
},
{
"name": "body",
"from": [0, 0, 0],
"to": [16, 4, 8],
"faces": {
"north": {"uv": [8, 6, 16, 8], "texture": "#0"},
"east": {"uv": [12, 14, 8, 16], "texture": "#0"},
"south": {"uv": [0, 0, 8, 2], "texture": "#0"},
"west": {"uv": [8, 14, 12, 16], "texture": "#0"},
"down": {"uv": [0, 0, 8, 4], "rotation": 180, "texture": "#0"}
}
},
{
"name": "body",
"from": [0, 4, 0],
"to": [5, 16, 16],
"faces": {
"north": {"uv": [13.5, 6, 16, 12], "texture": "#1"},
"east": {"uv": [0, 0, 8, 6], "texture": "#1"},
"south": {"uv": [8, 0, 10.5, 6], "texture": "#1"},
"west": {"uv": [8, 8, 16, 14], "texture": "#0"},
"up": {"uv": [5.5, 8, 8, 16], "rotation": 180, "texture": "#0"},
"down": {"uv": [0, 8, 2.5, 0.5], "texture": "#0"}
}
},
{
"name": "body",
"from": [5, 4, 0],
"to": [16, 5, 16],
"faces": {
"north": {"uv": [8, 5.5, 13.5, 6], "texture": "#0"},
"east": {"uv": [16, 13.5, 8, 14], "texture": "#0"},
"south": {"uv": [10.5, 5.5, 16, 6], "texture": "#1"},
"west": {"uv": [0, 0, 8, 1], "texture": "#missing"},
"up": {"uv": [0, 6, 5.5, 14], "rotation": 180, "texture": "#1"},
"down": {"uv": [2.5, 8, 8, 0.5], "texture": "#0"}
}
},
{
"name": "body",
"from": [5, 14, 0],
"to": [16, 16, 16],
"faces": {
"north": {"uv": [8, 0, 13.5, 1], "texture": "#0"},
"east": {"uv": [16, 8, 8, 9], "texture": "#0"},
"south": {"uv": [10.5, 0, 16, 1], "texture": "#1"},
"up": {"uv": [0, 8, 5.5, 16], "rotation": 180, "texture": "#0"},
"down": {"uv": [0, 14, 5.5, 6], "rotation": 180, "texture": "#1"}
}
},
{
"name": "body",
"from": [5, 5, 15],
"to": [16, 14, 16],
"faces": {
"north": {"uv": [5.5, 6, 11, 10], "texture": "#1"},
"east": {"uv": [16, 9, 15.5, 13.5], "texture": "#0"},
"south": {"uv": [10.5, 1, 16, 5.5], "texture": "#1"},
"up": {"uv": [0, 0, 5.5, 1], "texture": "#missing"}
}
},
{
"name": "body",
"from": [15, 5, 0],
"to": [16, 14, 15],
"faces": {
"north": {"uv": [8, 1, 8.5, 5.5], "texture": "#0"},
"east": {"uv": [15.5, 9, 8, 13.5], "texture": "#0"},
"west": {"uv": [8, 1, 0.5, 5.5], "texture": "#1"},
"up": {"uv": [0.5, 0, 0.5, 15], "texture": "#missing"}
}
},
{
"name": "plate",
"from": [6, 5, 4],
"to": [14, 6, 12],
"faces": {
"north": {"uv": [12, 15.5, 16, 16], "texture": "#1"},
"east": {"uv": [12, 15.5, 16, 16], "texture": "#1"},
"south": {"uv": [12, 15.5, 16, 16], "texture": "#1"},
"west": {"uv": [12, 15.5, 16, 16], "texture": "#1"},
"up": {"uv": [12, 12, 16, 16], "texture": "#1"}
}
},
{
"name": "screen",
"from": [5, 5, 1],
"to": [15, 14, 1],
"faces": {
"north": {"uv": [8.5, 1, 13.5, 5.5], "texture": "#0"},
"south": {"uv": [13.5, 1, 8.5, 5.5], "texture": "#0"}
}
},
{
"name": "heater",
"from": [5, 11, 8],
"to": [6, 14, 13],
"faces": {
"north": {"uv": [9, 11, 9.5, 12.5], "texture": "#1"},
"east": {"uv": [6.5, 11, 9, 12.5], "texture": "#1"},
"south": {"uv": [6, 11, 6.5, 12.5], "texture": "#1"},
"down": {"uv": [6.5, 12.5, 9, 13], "rotation": 90, "texture": "#1"}
}
}
],
"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]
}
}
}

158
src/main/resources/assets/overdrive_that_matters/models/block/powered_smoker_working.json Normal file
View File

@ -0,0 +1,158 @@
{
"credit": "Made with Blockbench",
"render_type": "translucent",
"texture_size": [32, 32],
"textures": {
"0": "overdrive_that_matters:block/powered_smoker_base",
"1": "overdrive_that_matters:block/powered_smoker_interior_1",
"particle": "overdrive_that_matters:block/powered_smoker_base"
},
"elements": [
{
"name": "body2",
"from": [1, 0, 8],
"to": [15, 4, 15],
"faces": {
"east": {"uv": [0, 14, 4, 16], "texture": "#1"},
"south": {"uv": [0, 14, 7, 16], "texture": "#1"},
"west": {"uv": [3, 14, 7, 16], "texture": "#1"},
"down": {"uv": [0.5, 4, 7.5, 7.5], "rotation": 180, "texture": "#0"}
}
},
{
"name": "body",
"from": [0, 0, 0],
"to": [16, 4, 8],
"faces": {
"north": {"uv": [8, 6, 16, 8], "texture": "#0"},
"east": {"uv": [12, 14, 8, 16], "texture": "#0"},
"south": {"uv": [0, 0, 8, 2], "texture": "#0"},
"west": {"uv": [8, 14, 12, 16], "texture": "#0"},
"down": {"uv": [0, 0, 8, 4], "rotation": 180, "texture": "#0"}
}
},
{
"name": "body",
"from": [0, 4, 0],
"to": [5, 16, 16],
"faces": {
"north": {"uv": [13.5, 6, 16, 12], "texture": "#1"},
"east": {"uv": [0, 0, 8, 6], "texture": "#1"},
"south": {"uv": [8, 0, 10.5, 6], "texture": "#1"},
"west": {"uv": [8, 8, 16, 14], "texture": "#0"},
"up": {"uv": [5.5, 8, 8, 16], "rotation": 180, "texture": "#0"},
"down": {"uv": [0, 8, 2.5, 0.5], "texture": "#0"}
}
},
{
"name": "body",
"from": [5, 4, 0],
"to": [16, 5, 16],
"faces": {
"north": {"uv": [8, 5.5, 13.5, 6], "texture": "#0"},
"east": {"uv": [16, 13.5, 8, 14], "texture": "#0"},
"south": {"uv": [10.5, 5.5, 16, 6], "texture": "#1"},
"west": {"uv": [0, 0, 8, 1], "texture": "#missing"},
"up": {"uv": [0, 6, 5.5, 14], "rotation": 180, "texture": "#1"},
"down": {"uv": [2.5, 8, 8, 0.5], "texture": "#0"}
}
},
{
"name": "body",
"from": [5, 14, 0],
"to": [16, 16, 16],
"faces": {
"north": {"uv": [8, 0, 13.5, 1], "texture": "#0"},
"east": {"uv": [16, 8, 8, 9], "texture": "#0"},
"south": {"uv": [10.5, 0, 16, 1], "texture": "#1"},
"up": {"uv": [0, 8, 5.5, 16], "rotation": 180, "texture": "#0"},
"down": {"uv": [0, 14, 5.5, 6], "rotation": 180, "texture": "#1"}
}
},
{
"name": "body",
"from": [5, 5, 15],
"to": [16, 14, 16],
"faces": {
"north": {"uv": [5.5, 6, 11, 10], "texture": "#1"},
"east": {"uv": [16, 9, 15.5, 13.5], "texture": "#0"},
"south": {"uv": [10.5, 1, 16, 5.5], "texture": "#1"},
"up": {"uv": [0, 0, 5.5, 1], "texture": "#missing"}
}
},
{
"name": "body",
"from": [15, 5, 0],
"to": [16, 14, 15],
"faces": {
"north": {"uv": [8, 1, 8.5, 5.5], "texture": "#0"},
"east": {"uv": [15.5, 9, 8, 13.5], "texture": "#0"},
"west": {"uv": [8, 1, 0.5, 5.5], "texture": "#1"},
"up": {"uv": [0.5, 0, 0.5, 15], "texture": "#missing"}
}
},
{
"name": "plate",
"from": [6, 5, 4],
"to": [14, 6, 12],
"faces": {
"north": {"uv": [12, 15.5, 16, 16], "texture": "#1"},
"east": {"uv": [12, 15.5, 16, 16], "texture": "#1"},
"south": {"uv": [12, 15.5, 16, 16], "texture": "#1"},
"west": {"uv": [12, 15.5, 16, 16], "texture": "#1"},
"up": {"uv": [12, 12, 16, 16], "texture": "#1"}
}
},
{
"name": "screen",
"from": [5, 5, 1],
"to": [15, 14, 1],
"faces": {
"north": {"uv": [8.5, 1, 13.5, 5.5], "texture": "#0"},
"south": {"uv": [13.5, 1, 8.5, 5.5], "texture": "#0"}
}
},
{
"name": "heater",
"from": [5, 11, 8],
"to": [6, 14, 13],
"faces": {
"north": {"uv": [9, 11, 9.5, 12.5], "texture": "#1"},
"east": {"uv": [6.5, 11, 9, 12.5], "texture": "#1"},
"south": {"uv": [6, 11, 6.5, 12.5], "texture": "#1"},
"down": {"uv": [6.5, 12.5, 9, 13], "rotation": 90, "texture": "#1"}
}
}
],
"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]
}
}
}

BIN
src/main/resources/assets/overdrive_that_matters/textures/block/decorative/laboratory_lamp_front.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 307 B

After

Width:  |  Height:  |  Size: 220 B

BIN
src/main/resources/assets/overdrive_that_matters/textures/block/decorative/laboratory_lamp_front_off.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 303 B

After

Width:  |  Height:  |  Size: 220 B

BIN
src/main/resources/assets/overdrive_that_matters/textures/block/decorative/metal_beam_side.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 225 B

After

Width:  |  Height:  |  Size: 231 B

BIN
src/main/resources/assets/overdrive_that_matters/textures/block/decorative/metal_beam_top.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 229 B

After

Width:  |  Height:  |  Size: 241 B

BIN
src/main/resources/assets/overdrive_that_matters/textures/block/power_cable_0.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 208 B

BIN
src/main/resources/assets/overdrive_that_matters/textures/block/power_cable_1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 217 B

BIN
src/main/resources/assets/overdrive_that_matters/textures/block/power_cable_2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 217 B

BIN
src/main/resources/assets/overdrive_that_matters/textures/block/power_cable_3.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 212 B

BIN
src/main/resources/assets/overdrive_that_matters/textures/block/powered_smoker_base.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 463 B

BIN
src/main/resources/assets/overdrive_that_matters/textures/block/powered_smoker_interior_0.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 441 B

BIN
src/main/resources/assets/overdrive_that_matters/textures/block/powered_smoker_interior_1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 452 B

BIN
src/main/resources/assets/overdrive_that_matters/textures/block/powered_smoker_interior_2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 446 B

BIN
src/main/resources/assets/overdrive_that_matters/textures/item/component/energy_bus.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 306 B

After

Width:  |  Height:  |  Size: 281 B

BIN
src/main/resources/assets/overdrive_that_matters/textures/item/component/gravitation_field_limiter.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 259 B

After

Width:  |  Height:  |  Size: 315 B

BIN
src/main/resources/assets/overdrive_that_matters/textures/item/component/gravitation_field_sensor.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 277 B

After

Width:  |  Height:  |  Size: 297 B

BIN
src/main/resources/assets/overdrive_that_matters/textures/item/component/matter_capacitor_parts.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 282 B

After

Width:  |  Height:  |  Size: 274 B

BIN
src/main/resources/assets/overdrive_that_matters/textures/item/component/mirror.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 246 B

After

Width:  |  Height:  |  Size: 220 B

BIN
src/main/resources/assets/overdrive_that_matters/textures/item/component/mirror_compound.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 245 B

After

Width:  |  Height:  |  Size: 227 B