diff --git a/colorize-cables.sh b/colorize-cables.sh new file mode 100755 index 0000000..8ba42cc --- /dev/null +++ b/colorize-cables.sh @@ -0,0 +1,35 @@ +#!/usr/bin/env bash + +base_color=blue + +modulate() { + echo $1, $2 + mkdir -p src/main/resources/assets/phycon/textures/block/cable/$1 + for f in src/main/resources/assets/phycon/textures/block/cable/$base_color/*; do + echo $f + convert $f -modulate $2 src/main/resources/assets/phycon/textures/block/cable/$1/$(basename $f) + done + echo "---" +} + +# modulate ,, +# brightness: 100 is initial, +/- 100 +# saturnation: 100 is initial, +/- 100 +# hue: ( / 180) * 100 + 100 + +modulate white 200,0,100 +modulate orange 100,120,200 +modulate magenta 100,100,146 +modulate light_blue 140,65,100 +modulate yellow 100,109,8 +modulate lime 100,100,53 +modulate pink 172,50,172 +modulate gray 60,10,100 +modulate light_gray 105,3,39 +modulate cyan 112,65,84 +modulate purple 109,76,133 +modulate brown 60,45,190 +modulate green 60,50,30 +modulate red 100,100,176 +modulate black 30,0,100 + diff --git a/src/main/kotlin/net/shadowfacts/phycon/block/cable/CableBlock.kt b/src/main/kotlin/net/shadowfacts/phycon/block/cable/CableBlock.kt index 66b1a72..222bfe8 100644 --- a/src/main/kotlin/net/shadowfacts/phycon/block/cable/CableBlock.kt +++ b/src/main/kotlin/net/shadowfacts/phycon/block/cable/CableBlock.kt @@ -8,6 +8,7 @@ import net.minecraft.item.ItemPlacementContext import net.minecraft.state.StateManager import net.minecraft.state.property.EnumProperty import net.minecraft.util.ActionResult +import net.minecraft.util.DyeColor import net.minecraft.util.Hand import net.minecraft.util.Identifier import net.minecraft.util.hit.BlockHitResult @@ -32,7 +33,9 @@ import java.util.* /** * @author shadowfacts */ -class CableBlock: Block( +class CableBlock( + val color: DyeColor, +): Block( FabricBlockSettings.of(CABLE_MATERIAL) .strength(0.3f) .nonOpaque() @@ -112,22 +115,20 @@ class CableBlock: Block( val offsetPos = pos.offset(direction) val state = world.getBlockState(offsetPos) val block = state.block - return when (block) { - this -> { - val prop = CONNECTIONS[direction.opposite] - when (state[prop]) { - CableConnection.DISABLED -> CableConnection.DISABLED - else -> CableConnection.ON - } + return if (block == this) { + val prop = CONNECTIONS[direction.opposite] + when (state[prop]) { + CableConnection.DISABLED -> CableConnection.DISABLED + else -> CableConnection.ON } - is NetworkComponentBlock -> { - if (block.getNetworkConnectedSides(state, world, offsetPos).contains(direction.opposite)) { - CableConnection.ON - } else { - CableConnection.OFF - } + } else if (block is NetworkComponentBlock && block !is CableBlock) { + if (block.getNetworkConnectedSides(state, world, offsetPos).contains(direction.opposite)) { + CableConnection.ON + } else { + CableConnection.OFF } - else -> CableConnection.OFF + } else { + CableConnection.OFF } } diff --git a/src/main/kotlin/net/shadowfacts/phycon/client/PhyModelProvider.kt b/src/main/kotlin/net/shadowfacts/phycon/client/PhyModelProvider.kt index 375400f..00345ba 100644 --- a/src/main/kotlin/net/shadowfacts/phycon/client/PhyModelProvider.kt +++ b/src/main/kotlin/net/shadowfacts/phycon/client/PhyModelProvider.kt @@ -25,7 +25,10 @@ class PhyModelProvider(resourceManager: ResourceManager) : ModelResourceProvider val EXTRACTOR_SIDE = Identifier(PhysicalConnectivity.MODID, "block/extractor_side") val INSERTER = Identifier(PhysicalConnectivity.MODID, "block/inserter") val INSERTER_SIDE = Identifier(PhysicalConnectivity.MODID, "block/inserter_side") - val CABLE_BLUE = Identifier(PhysicalConnectivity.MODID, "block/cable/blue") + + val CABLES = DyeColor.values().map { + Identifier(PhysicalConnectivity.MODID, "block/cable/${it.getName()}") to it + }.toMap() } override fun loadModelResource(resourceId: Identifier, context: ModelProviderContext): UnbakedModel? { @@ -35,7 +38,7 @@ class PhyModelProvider(resourceManager: ResourceManager) : ModelResourceProvider REDSTONE_EMITTER -> SimpleFaceDeviceModel(REDSTONE_EMITTER_SIDE) EXTRACTOR -> SimpleFaceDeviceModel(EXTRACTOR_SIDE) INSERTER -> SimpleFaceDeviceModel(INSERTER_SIDE) - CABLE_BLUE -> ColoredCableModel(DyeColor.BLUE) + in CABLES -> ColoredCableModel(CABLES[resourceId]!!) else -> null } } diff --git a/src/main/kotlin/net/shadowfacts/phycon/init/PhyBlocks.kt b/src/main/kotlin/net/shadowfacts/phycon/init/PhyBlocks.kt index 3664759..c59d5d4 100644 --- a/src/main/kotlin/net/shadowfacts/phycon/init/PhyBlocks.kt +++ b/src/main/kotlin/net/shadowfacts/phycon/init/PhyBlocks.kt @@ -1,8 +1,10 @@ package net.shadowfacts.phycon.init import net.minecraft.block.Block +import net.minecraft.util.DyeColor import net.minecraft.util.Identifier import net.minecraft.util.registry.Registry +import net.shadowfacts.phycon.PhysicalConnectivity import net.shadowfacts.phycon.block.cable.CableBlock import net.shadowfacts.phycon.block.extractor.ExtractorBlock import net.shadowfacts.phycon.block.inserter.InserterBlock @@ -18,10 +20,11 @@ import net.shadowfacts.phycon.block.terminal.TerminalBlock */ object PhyBlocks { + val CABLES = DyeColor.values().map { it to CableBlock(it) }.toMap() + val INTERFACE = InterfaceBlock() val TERMINAL = TerminalBlock() val SWITCH = SwitchBlock() - val CABLE = CableBlock() val EXTRACTOR = ExtractorBlock() val INSERTER = InserterBlock() val MINER = MinerBlock() @@ -29,10 +32,13 @@ object PhyBlocks { val REDSTONE_EMITTER = RedstoneEmitterBlock() fun init() { + for ((color, block) in CABLES) { + register(Identifier(PhysicalConnectivity.MODID, "cable_${color.getName()}"), block) + } + register(InterfaceBlock.ID, INTERFACE) register(TerminalBlock.ID, TERMINAL) register(SwitchBlock.ID, SWITCH) - register(CableBlock.ID, CABLE) register(ExtractorBlock.ID, EXTRACTOR) register(InserterBlock.ID, INSERTER) register(MinerBlock.ID, MINER) diff --git a/src/main/kotlin/net/shadowfacts/phycon/init/PhyItems.kt b/src/main/kotlin/net/shadowfacts/phycon/init/PhyItems.kt index aa2810e..bd28f67 100644 --- a/src/main/kotlin/net/shadowfacts/phycon/init/PhyItems.kt +++ b/src/main/kotlin/net/shadowfacts/phycon/init/PhyItems.kt @@ -24,10 +24,13 @@ import net.shadowfacts.phycon.item.FaceDeviceBlockItem */ object PhyItems { + val CABLES = PhyBlocks.CABLES.map { (color, block) -> + color to BlockItem(block, Item.Settings()) + }.toMap() + val INTERFACE = FaceDeviceBlockItem(PhyBlocks.INTERFACE, Item.Settings()) val TERMINAL = DeviceBlockItem(PhyBlocks.TERMINAL, Item.Settings()) val SWITCH = BlockItem(PhyBlocks.SWITCH, Item.Settings()) - val CABLE = BlockItem(PhyBlocks.CABLE, Item.Settings()) val EXTRACTOR = FaceDeviceBlockItem(PhyBlocks.EXTRACTOR, Item.Settings()) val INSERTER = FaceDeviceBlockItem(PhyBlocks.INSERTER, Item.Settings()) val MINER = DeviceBlockItem(PhyBlocks.MINER, Item.Settings()) @@ -44,10 +47,13 @@ object PhyItems { val REDSTONE_PROCESSOR = Item(Item.Settings()) fun init() { + for ((color, item) in CABLES) { + register(Identifier(PhysicalConnectivity.MODID, "cable_${color.getName()}"), item) + } + register(InterfaceBlock.ID, INTERFACE) register(TerminalBlock.ID, TERMINAL) register(SwitchBlock.ID, SWITCH) - register(CableBlock.ID, CABLE) register(ExtractorBlock.ID, EXTRACTOR) register(InserterBlock.ID, INSERTER) register(MinerBlock.ID, MINER) diff --git a/src/main/kotlin/net/shadowfacts/phycon/item/FaceDeviceBlockItem.kt b/src/main/kotlin/net/shadowfacts/phycon/item/FaceDeviceBlockItem.kt index f93e99b..3ce9800 100644 --- a/src/main/kotlin/net/shadowfacts/phycon/item/FaceDeviceBlockItem.kt +++ b/src/main/kotlin/net/shadowfacts/phycon/item/FaceDeviceBlockItem.kt @@ -15,7 +15,7 @@ class FaceDeviceBlockItem(block: FaceDeviceBlock<*>, settings: Settings = Settin override fun getPlacementState(context: ItemPlacementContext): BlockState? { val hitState = context.world.getBlockState(context.blockPos) - if (hitState.block == PhyBlocks.CABLE) { + if (hitState.block is CableBlock) { val hitBlockEdge = context.hitPos.getComponentAlongAxis(context.side.axis) % 1 == 0.0 val placementSide = if (hitBlockEdge) context.side.opposite else context.side diff --git a/src/main/kotlin/net/shadowfacts/phycon/item/ScrewdriverItem.kt b/src/main/kotlin/net/shadowfacts/phycon/item/ScrewdriverItem.kt index a6331f3..a3dbe00 100644 --- a/src/main/kotlin/net/shadowfacts/phycon/item/ScrewdriverItem.kt +++ b/src/main/kotlin/net/shadowfacts/phycon/item/ScrewdriverItem.kt @@ -14,6 +14,7 @@ import net.minecraft.util.math.Vec3d import net.shadowfacts.phycon.PhysicalConnectivity import net.shadowfacts.phycon.block.DeviceBlock import net.shadowfacts.phycon.block.FaceDeviceBlock +import net.shadowfacts.phycon.block.cable.CableBlock import net.shadowfacts.phycon.init.PhyBlocks import net.shadowfacts.phycon.util.containsInclusive @@ -34,7 +35,7 @@ class ScrewdriverItem: Item(Settings().maxCount(1)) { val newState = when (block) { is DeviceBlock<*> -> screwdriverDeviceBlock(context, state, block) - PhyBlocks.CABLE -> screwdriverCableBlock(context) + is CableBlock -> screwdriverCableBlock(context, state) PhyBlocks.SWITCH -> screwdriverSwitchBlock(context) else -> null } @@ -81,19 +82,19 @@ class ScrewdriverItem: Item(Settings().maxCount(1)) { val faceShape = block.faceShapes[state[FaceDeviceBlock.FACING]]!! // if we hit the face part of block, leave the cable behind if (faceShape.boundingBox.containsInclusive(hitInsideBlock)) { - return PhyBlocks.CABLE.getInitialState(context.world, context.blockPos) + return (state.block as CableBlock).getInitialState(context.world, context.blockPos) } else { if (!context.world.isClient) { - val cable = ItemEntity(context.world, context.blockPos.x.toDouble(), context.blockPos.y.toDouble(), context.blockPos.z.toDouble(), ItemStack(PhyBlocks.CABLE)) + val cable = ItemEntity(context.world, context.blockPos.x.toDouble(), context.blockPos.y.toDouble(), context.blockPos.z.toDouble(), ItemStack(state.block)) context.world.spawnEntity(cable) } return Blocks.AIR.defaultState } } - private fun screwdriverCableBlock(context: ItemUsageContext): BlockState? { + private fun screwdriverCableBlock(context: ItemUsageContext, state: BlockState): BlockState? { if (!context.world.isClient) { - val entity = ItemEntity(context.world, context.blockPos.x.toDouble(), context.blockPos.y.toDouble(), context.blockPos.z.toDouble(), ItemStack(PhyBlocks.CABLE)) + val entity = ItemEntity(context.world, context.blockPos.x.toDouble(), context.blockPos.y.toDouble(), context.blockPos.z.toDouble(), ItemStack(state.block)) context.world.spawnEntity(entity) } return Blocks.AIR.defaultState diff --git a/src/main/resources/assets/phycon/blockstates/cable_black.json b/src/main/resources/assets/phycon/blockstates/cable_black.json new file mode 100644 index 0000000..4d87b79 --- /dev/null +++ b/src/main/resources/assets/phycon/blockstates/cable_black.json @@ -0,0 +1,7 @@ +{ + "multipart": [ + { + "apply": { "model": "phycon:block/cable/black" } + } + ] +} diff --git a/src/main/resources/assets/phycon/blockstates/cable.json b/src/main/resources/assets/phycon/blockstates/cable_blue.json similarity index 100% rename from src/main/resources/assets/phycon/blockstates/cable.json rename to src/main/resources/assets/phycon/blockstates/cable_blue.json diff --git a/src/main/resources/assets/phycon/blockstates/cable_brown.json b/src/main/resources/assets/phycon/blockstates/cable_brown.json new file mode 100644 index 0000000..90a37c5 --- /dev/null +++ b/src/main/resources/assets/phycon/blockstates/cable_brown.json @@ -0,0 +1,7 @@ +{ + "multipart": [ + { + "apply": { "model": "phycon:block/cable/brown" } + } + ] +} diff --git a/src/main/resources/assets/phycon/blockstates/cable_cyan.json b/src/main/resources/assets/phycon/blockstates/cable_cyan.json new file mode 100644 index 0000000..f577384 --- /dev/null +++ b/src/main/resources/assets/phycon/blockstates/cable_cyan.json @@ -0,0 +1,7 @@ +{ + "multipart": [ + { + "apply": { "model": "phycon:block/cable/cyan" } + } + ] +} diff --git a/src/main/resources/assets/phycon/blockstates/cable_gray.json b/src/main/resources/assets/phycon/blockstates/cable_gray.json new file mode 100644 index 0000000..2207d52 --- /dev/null +++ b/src/main/resources/assets/phycon/blockstates/cable_gray.json @@ -0,0 +1,7 @@ +{ + "multipart": [ + { + "apply": { "model": "phycon:block/cable/gray" } + } + ] +} diff --git a/src/main/resources/assets/phycon/blockstates/cable_green.json b/src/main/resources/assets/phycon/blockstates/cable_green.json new file mode 100644 index 0000000..177c4af --- /dev/null +++ b/src/main/resources/assets/phycon/blockstates/cable_green.json @@ -0,0 +1,7 @@ +{ + "multipart": [ + { + "apply": { "model": "phycon:block/cable/green" } + } + ] +} diff --git a/src/main/resources/assets/phycon/blockstates/cable_light_blue.json b/src/main/resources/assets/phycon/blockstates/cable_light_blue.json new file mode 100644 index 0000000..84efde9 --- /dev/null +++ b/src/main/resources/assets/phycon/blockstates/cable_light_blue.json @@ -0,0 +1,7 @@ +{ + "multipart": [ + { + "apply": { "model": "phycon:block/cable/light_blue" } + } + ] +} diff --git a/src/main/resources/assets/phycon/blockstates/cable_light_gray.json b/src/main/resources/assets/phycon/blockstates/cable_light_gray.json new file mode 100644 index 0000000..179b5df --- /dev/null +++ b/src/main/resources/assets/phycon/blockstates/cable_light_gray.json @@ -0,0 +1,7 @@ +{ + "multipart": [ + { + "apply": { "model": "phycon:block/cable/light_gray" } + } + ] +} diff --git a/src/main/resources/assets/phycon/blockstates/cable_lime.json b/src/main/resources/assets/phycon/blockstates/cable_lime.json new file mode 100644 index 0000000..82c8685 --- /dev/null +++ b/src/main/resources/assets/phycon/blockstates/cable_lime.json @@ -0,0 +1,7 @@ +{ + "multipart": [ + { + "apply": { "model": "phycon:block/cable/lime" } + } + ] +} diff --git a/src/main/resources/assets/phycon/blockstates/cable_magenta.json b/src/main/resources/assets/phycon/blockstates/cable_magenta.json new file mode 100644 index 0000000..21f5a73 --- /dev/null +++ b/src/main/resources/assets/phycon/blockstates/cable_magenta.json @@ -0,0 +1,7 @@ +{ + "multipart": [ + { + "apply": { "model": "phycon:block/cable/magenta" } + } + ] +} diff --git a/src/main/resources/assets/phycon/blockstates/cable_orange.json b/src/main/resources/assets/phycon/blockstates/cable_orange.json new file mode 100644 index 0000000..8b24c82 --- /dev/null +++ b/src/main/resources/assets/phycon/blockstates/cable_orange.json @@ -0,0 +1,7 @@ +{ + "multipart": [ + { + "apply": { "model": "phycon:block/cable/orange" } + } + ] +} diff --git a/src/main/resources/assets/phycon/blockstates/cable_pink.json b/src/main/resources/assets/phycon/blockstates/cable_pink.json new file mode 100644 index 0000000..0a15251 --- /dev/null +++ b/src/main/resources/assets/phycon/blockstates/cable_pink.json @@ -0,0 +1,7 @@ +{ + "multipart": [ + { + "apply": { "model": "phycon:block/cable/pink" } + } + ] +} diff --git a/src/main/resources/assets/phycon/blockstates/cable_purple.json b/src/main/resources/assets/phycon/blockstates/cable_purple.json new file mode 100644 index 0000000..e94b387 --- /dev/null +++ b/src/main/resources/assets/phycon/blockstates/cable_purple.json @@ -0,0 +1,7 @@ +{ + "multipart": [ + { + "apply": { "model": "phycon:block/cable/purple" } + } + ] +} diff --git a/src/main/resources/assets/phycon/blockstates/cable_red.json b/src/main/resources/assets/phycon/blockstates/cable_red.json new file mode 100644 index 0000000..afc719f --- /dev/null +++ b/src/main/resources/assets/phycon/blockstates/cable_red.json @@ -0,0 +1,7 @@ +{ + "multipart": [ + { + "apply": { "model": "phycon:block/cable/red" } + } + ] +} diff --git a/src/main/resources/assets/phycon/blockstates/cable_white.json b/src/main/resources/assets/phycon/blockstates/cable_white.json new file mode 100644 index 0000000..aaac109 --- /dev/null +++ b/src/main/resources/assets/phycon/blockstates/cable_white.json @@ -0,0 +1,7 @@ +{ + "multipart": [ + { + "apply": { "model": "phycon:block/cable/white" } + } + ] +} diff --git a/src/main/resources/assets/phycon/blockstates/cable_yellow.json b/src/main/resources/assets/phycon/blockstates/cable_yellow.json new file mode 100644 index 0000000..6e7034d --- /dev/null +++ b/src/main/resources/assets/phycon/blockstates/cable_yellow.json @@ -0,0 +1,7 @@ +{ + "multipart": [ + { + "apply": { "model": "phycon:block/cable/yellow" } + } + ] +} diff --git a/src/main/resources/assets/phycon/lang/en_us.json b/src/main/resources/assets/phycon/lang/en_us.json index 319ca23..0494f5e 100644 --- a/src/main/resources/assets/phycon/lang/en_us.json +++ b/src/main/resources/assets/phycon/lang/en_us.json @@ -2,7 +2,22 @@ "block.phycon.switch": "Network Switch", "block.phycon.network_interface": "Inventory Interface", "block.phycon.terminal": "Terminal", - "block.phycon.cable": "Cable", + "block.phycon.cable_white": "White Cable", + "block.phycon.cable_orange": "Orange Cable", + "block.phycon.cable_magenta": "Magenta Cable", + "block.phycon.cable_light_blue": "Light Blue Cable", + "block.phycon.cable_yellow": "Yellow Cable", + "block.phycon.cable_lime": "Lime Cable", + "block.phycon.cable_pink": "Pink Cable", + "block.phycon.cable_gray": "Gray Cable", + "block.phycon.cable_light_gray": "Light Gray Cable", + "block.phycon.cable_cyan": "Cyan Cable", + "block.phycon.cable_purple": "Purple Cable", + "block.phycon.cable_blue": "Blue Cable", + "block.phycon.cable_brown": "Brown Cable", + "block.phycon.cable_green": "Green Cable", + "block.phycon.cable_red": "Red Cable", + "block.phycon.cable_black": "Black Cable", "block.phycon.extractor": "Inventory Extractor", "block.phycon.inserter": "Inventory Inserter", "block.phycon.miner": "Block Miner", diff --git a/src/main/resources/assets/phycon/models/item/cable_black.json b/src/main/resources/assets/phycon/models/item/cable_black.json new file mode 100644 index 0000000..923b285 --- /dev/null +++ b/src/main/resources/assets/phycon/models/item/cable_black.json @@ -0,0 +1,20 @@ +{ + "parent": "minecraft:block/block", + "textures": { + "center": "phycon:block/cable/black/cap_end" + }, + "elements": [ + { + "from": [6, 6, 6], + "to": [10, 10, 10], + "faces": { + "down": {"texture": "#center"}, + "up": {"texture": "#center"}, + "north": {"texture": "#center"}, + "south": {"texture": "#center"}, + "west": {"texture": "#center"}, + "east": {"texture": "#center"} + } + } + ] +} diff --git a/src/main/resources/assets/phycon/models/item/cable.json b/src/main/resources/assets/phycon/models/item/cable_blue.json similarity index 100% rename from src/main/resources/assets/phycon/models/item/cable.json rename to src/main/resources/assets/phycon/models/item/cable_blue.json diff --git a/src/main/resources/assets/phycon/models/item/cable_brown.json b/src/main/resources/assets/phycon/models/item/cable_brown.json new file mode 100644 index 0000000..79a9426 --- /dev/null +++ b/src/main/resources/assets/phycon/models/item/cable_brown.json @@ -0,0 +1,20 @@ +{ + "parent": "minecraft:block/block", + "textures": { + "center": "phycon:block/cable/brown/cap_end" + }, + "elements": [ + { + "from": [6, 6, 6], + "to": [10, 10, 10], + "faces": { + "down": {"texture": "#center"}, + "up": {"texture": "#center"}, + "north": {"texture": "#center"}, + "south": {"texture": "#center"}, + "west": {"texture": "#center"}, + "east": {"texture": "#center"} + } + } + ] +} diff --git a/src/main/resources/assets/phycon/models/item/cable_cyan.json b/src/main/resources/assets/phycon/models/item/cable_cyan.json new file mode 100644 index 0000000..d1761d5 --- /dev/null +++ b/src/main/resources/assets/phycon/models/item/cable_cyan.json @@ -0,0 +1,20 @@ +{ + "parent": "minecraft:block/block", + "textures": { + "center": "phycon:block/cable/cyan/cap_end" + }, + "elements": [ + { + "from": [6, 6, 6], + "to": [10, 10, 10], + "faces": { + "down": {"texture": "#center"}, + "up": {"texture": "#center"}, + "north": {"texture": "#center"}, + "south": {"texture": "#center"}, + "west": {"texture": "#center"}, + "east": {"texture": "#center"} + } + } + ] +} diff --git a/src/main/resources/assets/phycon/models/item/cable_gray.json b/src/main/resources/assets/phycon/models/item/cable_gray.json new file mode 100644 index 0000000..34533da --- /dev/null +++ b/src/main/resources/assets/phycon/models/item/cable_gray.json @@ -0,0 +1,20 @@ +{ + "parent": "minecraft:block/block", + "textures": { + "center": "phycon:block/cable/gray/cap_end" + }, + "elements": [ + { + "from": [6, 6, 6], + "to": [10, 10, 10], + "faces": { + "down": {"texture": "#center"}, + "up": {"texture": "#center"}, + "north": {"texture": "#center"}, + "south": {"texture": "#center"}, + "west": {"texture": "#center"}, + "east": {"texture": "#center"} + } + } + ] +} diff --git a/src/main/resources/assets/phycon/models/item/cable_green.json b/src/main/resources/assets/phycon/models/item/cable_green.json new file mode 100644 index 0000000..4ca6090 --- /dev/null +++ b/src/main/resources/assets/phycon/models/item/cable_green.json @@ -0,0 +1,20 @@ +{ + "parent": "minecraft:block/block", + "textures": { + "center": "phycon:block/cable/green/cap_end" + }, + "elements": [ + { + "from": [6, 6, 6], + "to": [10, 10, 10], + "faces": { + "down": {"texture": "#center"}, + "up": {"texture": "#center"}, + "north": {"texture": "#center"}, + "south": {"texture": "#center"}, + "west": {"texture": "#center"}, + "east": {"texture": "#center"} + } + } + ] +} diff --git a/src/main/resources/assets/phycon/models/item/cable_light_blue.json b/src/main/resources/assets/phycon/models/item/cable_light_blue.json new file mode 100644 index 0000000..4c577d0 --- /dev/null +++ b/src/main/resources/assets/phycon/models/item/cable_light_blue.json @@ -0,0 +1,20 @@ +{ + "parent": "minecraft:block/block", + "textures": { + "center": "phycon:block/cable/light_blue/cap_end" + }, + "elements": [ + { + "from": [6, 6, 6], + "to": [10, 10, 10], + "faces": { + "down": {"texture": "#center"}, + "up": {"texture": "#center"}, + "north": {"texture": "#center"}, + "south": {"texture": "#center"}, + "west": {"texture": "#center"}, + "east": {"texture": "#center"} + } + } + ] +} diff --git a/src/main/resources/assets/phycon/models/item/cable_light_gray.json b/src/main/resources/assets/phycon/models/item/cable_light_gray.json new file mode 100644 index 0000000..e079710 --- /dev/null +++ b/src/main/resources/assets/phycon/models/item/cable_light_gray.json @@ -0,0 +1,20 @@ +{ + "parent": "minecraft:block/block", + "textures": { + "center": "phycon:block/cable/light_gray/cap_end" + }, + "elements": [ + { + "from": [6, 6, 6], + "to": [10, 10, 10], + "faces": { + "down": {"texture": "#center"}, + "up": {"texture": "#center"}, + "north": {"texture": "#center"}, + "south": {"texture": "#center"}, + "west": {"texture": "#center"}, + "east": {"texture": "#center"} + } + } + ] +} diff --git a/src/main/resources/assets/phycon/models/item/cable_lime.json b/src/main/resources/assets/phycon/models/item/cable_lime.json new file mode 100644 index 0000000..0adee68 --- /dev/null +++ b/src/main/resources/assets/phycon/models/item/cable_lime.json @@ -0,0 +1,20 @@ +{ + "parent": "minecraft:block/block", + "textures": { + "center": "phycon:block/cable/lime/cap_end" + }, + "elements": [ + { + "from": [6, 6, 6], + "to": [10, 10, 10], + "faces": { + "down": {"texture": "#center"}, + "up": {"texture": "#center"}, + "north": {"texture": "#center"}, + "south": {"texture": "#center"}, + "west": {"texture": "#center"}, + "east": {"texture": "#center"} + } + } + ] +} diff --git a/src/main/resources/assets/phycon/models/item/cable_magenta.json b/src/main/resources/assets/phycon/models/item/cable_magenta.json new file mode 100644 index 0000000..3102d7e --- /dev/null +++ b/src/main/resources/assets/phycon/models/item/cable_magenta.json @@ -0,0 +1,20 @@ +{ + "parent": "minecraft:block/block", + "textures": { + "center": "phycon:block/cable/magenta/cap_end" + }, + "elements": [ + { + "from": [6, 6, 6], + "to": [10, 10, 10], + "faces": { + "down": {"texture": "#center"}, + "up": {"texture": "#center"}, + "north": {"texture": "#center"}, + "south": {"texture": "#center"}, + "west": {"texture": "#center"}, + "east": {"texture": "#center"} + } + } + ] +} diff --git a/src/main/resources/assets/phycon/models/item/cable_orange.json b/src/main/resources/assets/phycon/models/item/cable_orange.json new file mode 100644 index 0000000..300cff0 --- /dev/null +++ b/src/main/resources/assets/phycon/models/item/cable_orange.json @@ -0,0 +1,20 @@ +{ + "parent": "minecraft:block/block", + "textures": { + "center": "phycon:block/cable/orange/cap_end" + }, + "elements": [ + { + "from": [6, 6, 6], + "to": [10, 10, 10], + "faces": { + "down": {"texture": "#center"}, + "up": {"texture": "#center"}, + "north": {"texture": "#center"}, + "south": {"texture": "#center"}, + "west": {"texture": "#center"}, + "east": {"texture": "#center"} + } + } + ] +} diff --git a/src/main/resources/assets/phycon/models/item/cable_pink.json b/src/main/resources/assets/phycon/models/item/cable_pink.json new file mode 100644 index 0000000..c5735a9 --- /dev/null +++ b/src/main/resources/assets/phycon/models/item/cable_pink.json @@ -0,0 +1,20 @@ +{ + "parent": "minecraft:block/block", + "textures": { + "center": "phycon:block/cable/pink/cap_end" + }, + "elements": [ + { + "from": [6, 6, 6], + "to": [10, 10, 10], + "faces": { + "down": {"texture": "#center"}, + "up": {"texture": "#center"}, + "north": {"texture": "#center"}, + "south": {"texture": "#center"}, + "west": {"texture": "#center"}, + "east": {"texture": "#center"} + } + } + ] +} diff --git a/src/main/resources/assets/phycon/models/item/cable_purple.json b/src/main/resources/assets/phycon/models/item/cable_purple.json new file mode 100644 index 0000000..12f8e82 --- /dev/null +++ b/src/main/resources/assets/phycon/models/item/cable_purple.json @@ -0,0 +1,20 @@ +{ + "parent": "minecraft:block/block", + "textures": { + "center": "phycon:block/cable/purple/cap_end" + }, + "elements": [ + { + "from": [6, 6, 6], + "to": [10, 10, 10], + "faces": { + "down": {"texture": "#center"}, + "up": {"texture": "#center"}, + "north": {"texture": "#center"}, + "south": {"texture": "#center"}, + "west": {"texture": "#center"}, + "east": {"texture": "#center"} + } + } + ] +} diff --git a/src/main/resources/assets/phycon/models/item/cable_red.json b/src/main/resources/assets/phycon/models/item/cable_red.json new file mode 100644 index 0000000..99373a3 --- /dev/null +++ b/src/main/resources/assets/phycon/models/item/cable_red.json @@ -0,0 +1,20 @@ +{ + "parent": "minecraft:block/block", + "textures": { + "center": "phycon:block/cable/red/cap_end" + }, + "elements": [ + { + "from": [6, 6, 6], + "to": [10, 10, 10], + "faces": { + "down": {"texture": "#center"}, + "up": {"texture": "#center"}, + "north": {"texture": "#center"}, + "south": {"texture": "#center"}, + "west": {"texture": "#center"}, + "east": {"texture": "#center"} + } + } + ] +} diff --git a/src/main/resources/assets/phycon/models/item/cable_white.json b/src/main/resources/assets/phycon/models/item/cable_white.json new file mode 100644 index 0000000..493680e --- /dev/null +++ b/src/main/resources/assets/phycon/models/item/cable_white.json @@ -0,0 +1,20 @@ +{ + "parent": "minecraft:block/block", + "textures": { + "center": "phycon:block/cable/white/cap_end" + }, + "elements": [ + { + "from": [6, 6, 6], + "to": [10, 10, 10], + "faces": { + "down": {"texture": "#center"}, + "up": {"texture": "#center"}, + "north": {"texture": "#center"}, + "south": {"texture": "#center"}, + "west": {"texture": "#center"}, + "east": {"texture": "#center"} + } + } + ] +} diff --git a/src/main/resources/assets/phycon/models/item/cable_yellow.json b/src/main/resources/assets/phycon/models/item/cable_yellow.json new file mode 100644 index 0000000..e425474 --- /dev/null +++ b/src/main/resources/assets/phycon/models/item/cable_yellow.json @@ -0,0 +1,20 @@ +{ + "parent": "minecraft:block/block", + "textures": { + "center": "phycon:block/cable/yellow/cap_end" + }, + "elements": [ + { + "from": [6, 6, 6], + "to": [10, 10, 10], + "faces": { + "down": {"texture": "#center"}, + "up": {"texture": "#center"}, + "north": {"texture": "#center"}, + "south": {"texture": "#center"}, + "west": {"texture": "#center"}, + "east": {"texture": "#center"} + } + } + ] +} diff --git a/src/main/resources/assets/phycon/textures/block/cable/black/cap_end.png b/src/main/resources/assets/phycon/textures/block/cable/black/cap_end.png new file mode 100644 index 0000000..0394e7c Binary files /dev/null and b/src/main/resources/assets/phycon/textures/block/cable/black/cap_end.png differ diff --git a/src/main/resources/assets/phycon/textures/block/cable/black/straight.png b/src/main/resources/assets/phycon/textures/block/cable/black/straight.png new file mode 100644 index 0000000..59de76f Binary files /dev/null and b/src/main/resources/assets/phycon/textures/block/cable/black/straight.png differ diff --git a/src/main/resources/assets/phycon/textures/block/cable/black/straight_rotated.png b/src/main/resources/assets/phycon/textures/block/cable/black/straight_rotated.png new file mode 100644 index 0000000..9cbe4f5 Binary files /dev/null and b/src/main/resources/assets/phycon/textures/block/cable/black/straight_rotated.png differ diff --git a/src/main/resources/assets/phycon/textures/block/cable/brown/cap_end.png b/src/main/resources/assets/phycon/textures/block/cable/brown/cap_end.png new file mode 100644 index 0000000..7743173 Binary files /dev/null and b/src/main/resources/assets/phycon/textures/block/cable/brown/cap_end.png differ diff --git a/src/main/resources/assets/phycon/textures/block/cable/brown/straight.png b/src/main/resources/assets/phycon/textures/block/cable/brown/straight.png new file mode 100644 index 0000000..c6139ff Binary files /dev/null and b/src/main/resources/assets/phycon/textures/block/cable/brown/straight.png differ diff --git a/src/main/resources/assets/phycon/textures/block/cable/brown/straight_rotated.png b/src/main/resources/assets/phycon/textures/block/cable/brown/straight_rotated.png new file mode 100644 index 0000000..304705a Binary files /dev/null and b/src/main/resources/assets/phycon/textures/block/cable/brown/straight_rotated.png differ diff --git a/src/main/resources/assets/phycon/textures/block/cable/cyan/cap_end.png b/src/main/resources/assets/phycon/textures/block/cable/cyan/cap_end.png new file mode 100644 index 0000000..faa9c31 Binary files /dev/null and b/src/main/resources/assets/phycon/textures/block/cable/cyan/cap_end.png differ diff --git a/src/main/resources/assets/phycon/textures/block/cable/cyan/straight.png b/src/main/resources/assets/phycon/textures/block/cable/cyan/straight.png new file mode 100644 index 0000000..b9d1176 Binary files /dev/null and b/src/main/resources/assets/phycon/textures/block/cable/cyan/straight.png differ diff --git a/src/main/resources/assets/phycon/textures/block/cable/cyan/straight_rotated.png b/src/main/resources/assets/phycon/textures/block/cable/cyan/straight_rotated.png new file mode 100644 index 0000000..31d341c Binary files /dev/null and b/src/main/resources/assets/phycon/textures/block/cable/cyan/straight_rotated.png differ diff --git a/src/main/resources/assets/phycon/textures/block/cable/gray/cap_end.png b/src/main/resources/assets/phycon/textures/block/cable/gray/cap_end.png new file mode 100644 index 0000000..ad5366d Binary files /dev/null and b/src/main/resources/assets/phycon/textures/block/cable/gray/cap_end.png differ diff --git a/src/main/resources/assets/phycon/textures/block/cable/gray/straight.png b/src/main/resources/assets/phycon/textures/block/cable/gray/straight.png new file mode 100644 index 0000000..b108cdb Binary files /dev/null and b/src/main/resources/assets/phycon/textures/block/cable/gray/straight.png differ diff --git a/src/main/resources/assets/phycon/textures/block/cable/gray/straight_rotated.png b/src/main/resources/assets/phycon/textures/block/cable/gray/straight_rotated.png new file mode 100644 index 0000000..6e03057 Binary files /dev/null and b/src/main/resources/assets/phycon/textures/block/cable/gray/straight_rotated.png differ diff --git a/src/main/resources/assets/phycon/textures/block/cable/green/cap_end.png b/src/main/resources/assets/phycon/textures/block/cable/green/cap_end.png new file mode 100644 index 0000000..97b0844 Binary files /dev/null and b/src/main/resources/assets/phycon/textures/block/cable/green/cap_end.png differ diff --git a/src/main/resources/assets/phycon/textures/block/cable/green/straight.png b/src/main/resources/assets/phycon/textures/block/cable/green/straight.png new file mode 100644 index 0000000..76733aa Binary files /dev/null and b/src/main/resources/assets/phycon/textures/block/cable/green/straight.png differ diff --git a/src/main/resources/assets/phycon/textures/block/cable/green/straight_rotated.png b/src/main/resources/assets/phycon/textures/block/cable/green/straight_rotated.png new file mode 100644 index 0000000..9de7fd6 Binary files /dev/null and b/src/main/resources/assets/phycon/textures/block/cable/green/straight_rotated.png differ diff --git a/src/main/resources/assets/phycon/textures/block/cable/light_blue/cap_end.png b/src/main/resources/assets/phycon/textures/block/cable/light_blue/cap_end.png new file mode 100644 index 0000000..cc3f170 Binary files /dev/null and b/src/main/resources/assets/phycon/textures/block/cable/light_blue/cap_end.png differ diff --git a/src/main/resources/assets/phycon/textures/block/cable/light_blue/straight.png b/src/main/resources/assets/phycon/textures/block/cable/light_blue/straight.png new file mode 100644 index 0000000..6d47561 Binary files /dev/null and b/src/main/resources/assets/phycon/textures/block/cable/light_blue/straight.png differ diff --git a/src/main/resources/assets/phycon/textures/block/cable/light_blue/straight_rotated.png b/src/main/resources/assets/phycon/textures/block/cable/light_blue/straight_rotated.png new file mode 100644 index 0000000..c49c0c9 Binary files /dev/null and b/src/main/resources/assets/phycon/textures/block/cable/light_blue/straight_rotated.png differ diff --git a/src/main/resources/assets/phycon/textures/block/cable/light_gray/cap_end.png b/src/main/resources/assets/phycon/textures/block/cable/light_gray/cap_end.png new file mode 100644 index 0000000..1402bbd Binary files /dev/null and b/src/main/resources/assets/phycon/textures/block/cable/light_gray/cap_end.png differ diff --git a/src/main/resources/assets/phycon/textures/block/cable/light_gray/straight.png b/src/main/resources/assets/phycon/textures/block/cable/light_gray/straight.png new file mode 100644 index 0000000..55b65ba Binary files /dev/null and b/src/main/resources/assets/phycon/textures/block/cable/light_gray/straight.png differ diff --git a/src/main/resources/assets/phycon/textures/block/cable/light_gray/straight_rotated.png b/src/main/resources/assets/phycon/textures/block/cable/light_gray/straight_rotated.png new file mode 100644 index 0000000..8a3edab Binary files /dev/null and b/src/main/resources/assets/phycon/textures/block/cable/light_gray/straight_rotated.png differ diff --git a/src/main/resources/assets/phycon/textures/block/cable/lime/cap_end.png b/src/main/resources/assets/phycon/textures/block/cable/lime/cap_end.png new file mode 100644 index 0000000..bb1f8dc Binary files /dev/null and b/src/main/resources/assets/phycon/textures/block/cable/lime/cap_end.png differ diff --git a/src/main/resources/assets/phycon/textures/block/cable/lime/straight.png b/src/main/resources/assets/phycon/textures/block/cable/lime/straight.png new file mode 100644 index 0000000..bfaa1bf Binary files /dev/null and b/src/main/resources/assets/phycon/textures/block/cable/lime/straight.png differ diff --git a/src/main/resources/assets/phycon/textures/block/cable/lime/straight_rotated.png b/src/main/resources/assets/phycon/textures/block/cable/lime/straight_rotated.png new file mode 100644 index 0000000..7bdfc79 Binary files /dev/null and b/src/main/resources/assets/phycon/textures/block/cable/lime/straight_rotated.png differ diff --git a/src/main/resources/assets/phycon/textures/block/cable/magenta/cap_end.png b/src/main/resources/assets/phycon/textures/block/cable/magenta/cap_end.png new file mode 100644 index 0000000..8f5183d Binary files /dev/null and b/src/main/resources/assets/phycon/textures/block/cable/magenta/cap_end.png differ diff --git a/src/main/resources/assets/phycon/textures/block/cable/magenta/straight.png b/src/main/resources/assets/phycon/textures/block/cable/magenta/straight.png new file mode 100644 index 0000000..dae81c6 Binary files /dev/null and b/src/main/resources/assets/phycon/textures/block/cable/magenta/straight.png differ diff --git a/src/main/resources/assets/phycon/textures/block/cable/magenta/straight_rotated.png b/src/main/resources/assets/phycon/textures/block/cable/magenta/straight_rotated.png new file mode 100644 index 0000000..a96fe5a Binary files /dev/null and b/src/main/resources/assets/phycon/textures/block/cable/magenta/straight_rotated.png differ diff --git a/src/main/resources/assets/phycon/textures/block/cable/orange/cap_end.png b/src/main/resources/assets/phycon/textures/block/cable/orange/cap_end.png new file mode 100644 index 0000000..498676b Binary files /dev/null and b/src/main/resources/assets/phycon/textures/block/cable/orange/cap_end.png differ diff --git a/src/main/resources/assets/phycon/textures/block/cable/orange/straight.png b/src/main/resources/assets/phycon/textures/block/cable/orange/straight.png new file mode 100644 index 0000000..261ba49 Binary files /dev/null and b/src/main/resources/assets/phycon/textures/block/cable/orange/straight.png differ diff --git a/src/main/resources/assets/phycon/textures/block/cable/orange/straight_rotated.png b/src/main/resources/assets/phycon/textures/block/cable/orange/straight_rotated.png new file mode 100644 index 0000000..547515b Binary files /dev/null and b/src/main/resources/assets/phycon/textures/block/cable/orange/straight_rotated.png differ diff --git a/src/main/resources/assets/phycon/textures/block/cable/pink/cap_end.png b/src/main/resources/assets/phycon/textures/block/cable/pink/cap_end.png new file mode 100644 index 0000000..a51d0ce Binary files /dev/null and b/src/main/resources/assets/phycon/textures/block/cable/pink/cap_end.png differ diff --git a/src/main/resources/assets/phycon/textures/block/cable/pink/straight.png b/src/main/resources/assets/phycon/textures/block/cable/pink/straight.png new file mode 100644 index 0000000..c2ee33d Binary files /dev/null and b/src/main/resources/assets/phycon/textures/block/cable/pink/straight.png differ diff --git a/src/main/resources/assets/phycon/textures/block/cable/pink/straight_rotated.png b/src/main/resources/assets/phycon/textures/block/cable/pink/straight_rotated.png new file mode 100644 index 0000000..f832011 Binary files /dev/null and b/src/main/resources/assets/phycon/textures/block/cable/pink/straight_rotated.png differ diff --git a/src/main/resources/assets/phycon/textures/block/cable/purple/cap_end.png b/src/main/resources/assets/phycon/textures/block/cable/purple/cap_end.png new file mode 100644 index 0000000..1a89abf Binary files /dev/null and b/src/main/resources/assets/phycon/textures/block/cable/purple/cap_end.png differ diff --git a/src/main/resources/assets/phycon/textures/block/cable/purple/straight.png b/src/main/resources/assets/phycon/textures/block/cable/purple/straight.png new file mode 100644 index 0000000..3b277a7 Binary files /dev/null and b/src/main/resources/assets/phycon/textures/block/cable/purple/straight.png differ diff --git a/src/main/resources/assets/phycon/textures/block/cable/purple/straight_rotated.png b/src/main/resources/assets/phycon/textures/block/cable/purple/straight_rotated.png new file mode 100644 index 0000000..d892832 Binary files /dev/null and b/src/main/resources/assets/phycon/textures/block/cable/purple/straight_rotated.png differ diff --git a/src/main/resources/assets/phycon/textures/block/cable/red/cap_end.png b/src/main/resources/assets/phycon/textures/block/cable/red/cap_end.png new file mode 100644 index 0000000..c352786 Binary files /dev/null and b/src/main/resources/assets/phycon/textures/block/cable/red/cap_end.png differ diff --git a/src/main/resources/assets/phycon/textures/block/cable/red/straight.png b/src/main/resources/assets/phycon/textures/block/cable/red/straight.png new file mode 100644 index 0000000..57faad6 Binary files /dev/null and b/src/main/resources/assets/phycon/textures/block/cable/red/straight.png differ diff --git a/src/main/resources/assets/phycon/textures/block/cable/red/straight_rotated.png b/src/main/resources/assets/phycon/textures/block/cable/red/straight_rotated.png new file mode 100644 index 0000000..c4f3849 Binary files /dev/null and b/src/main/resources/assets/phycon/textures/block/cable/red/straight_rotated.png differ diff --git a/src/main/resources/assets/phycon/textures/block/cable/white/cap_end.png b/src/main/resources/assets/phycon/textures/block/cable/white/cap_end.png new file mode 100644 index 0000000..b51f995 Binary files /dev/null and b/src/main/resources/assets/phycon/textures/block/cable/white/cap_end.png differ diff --git a/src/main/resources/assets/phycon/textures/block/cable/white/straight.png b/src/main/resources/assets/phycon/textures/block/cable/white/straight.png new file mode 100644 index 0000000..d1828cf Binary files /dev/null and b/src/main/resources/assets/phycon/textures/block/cable/white/straight.png differ diff --git a/src/main/resources/assets/phycon/textures/block/cable/white/straight_rotated.png b/src/main/resources/assets/phycon/textures/block/cable/white/straight_rotated.png new file mode 100644 index 0000000..450aaa0 Binary files /dev/null and b/src/main/resources/assets/phycon/textures/block/cable/white/straight_rotated.png differ diff --git a/src/main/resources/assets/phycon/textures/block/cable/yellow/cap_end.png b/src/main/resources/assets/phycon/textures/block/cable/yellow/cap_end.png new file mode 100644 index 0000000..9d6af14 Binary files /dev/null and b/src/main/resources/assets/phycon/textures/block/cable/yellow/cap_end.png differ diff --git a/src/main/resources/assets/phycon/textures/block/cable/yellow/straight.png b/src/main/resources/assets/phycon/textures/block/cable/yellow/straight.png new file mode 100644 index 0000000..07bf511 Binary files /dev/null and b/src/main/resources/assets/phycon/textures/block/cable/yellow/straight.png differ diff --git a/src/main/resources/assets/phycon/textures/block/cable/yellow/straight_rotated.png b/src/main/resources/assets/phycon/textures/block/cable/yellow/straight_rotated.png new file mode 100644 index 0000000..174b1ac Binary files /dev/null and b/src/main/resources/assets/phycon/textures/block/cable/yellow/straight_rotated.png differ