Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ Atlas has three core systems that chain together to enable full automation.
| **Lava Generator** | Burns lava for serious output. Feed it from your fluid pipeline |
| **Small Battery** | Buffers power between generators and machines. Glowing charge indicator |
| **Power Cable** | Moves power in one direction, block by block |
| **Multi Power Cable** | Transfers power across multiple directions at once |
| **Power Splitter** | Transfers power across multiple directions at once |
| **Power Merger** | Funnels power from several sources into one output |

<details>
Expand Down
2 changes: 1 addition & 1 deletion src/main/kotlin/com/coderjoe/atlas/Atlas.kt
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ class Atlas : JavaPlugin() {
com.coderjoe.atlas.power.block.PowerCable.descriptor,
com.coderjoe.atlas.power.block.LavaGenerator.descriptor,
com.coderjoe.atlas.utility.block.AutoSmelter.descriptor,
com.coderjoe.atlas.power.block.MultiPowerCable.descriptor,
com.coderjoe.atlas.power.block.PowerSplitter.descriptor,
com.coderjoe.atlas.utility.block.CobblestoneFactory.descriptor,
com.coderjoe.atlas.utility.block.ObsidianFactory.descriptor,
com.coderjoe.atlas.power.block.PowerMerger.descriptor,
Expand Down
6 changes: 3 additions & 3 deletions src/main/kotlin/com/coderjoe/atlas/power/PowerBlockDialog.kt
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ package com.coderjoe.atlas.power
import com.coderjoe.atlas.core.AtlasBlockDialog
import com.coderjoe.atlas.core.BlockRegistry
import com.coderjoe.atlas.power.block.LavaGenerator
import com.coderjoe.atlas.power.block.MultiPowerCable
import com.coderjoe.atlas.power.block.PowerCable
import com.coderjoe.atlas.power.block.PowerMerger
import com.coderjoe.atlas.power.block.PowerSplitter
import com.coderjoe.atlas.power.block.SmallBattery
import com.coderjoe.atlas.power.block.SmallSolarPanel
import com.coderjoe.atlas.utility.block.AutoSmelter
Expand Down Expand Up @@ -155,7 +155,7 @@ object PowerBlockDialog {
is PowerCable -> "Power Cable (${powerBlock.facing.name.lowercase().replaceFirstChar { it.uppercase() }})"
is LavaGenerator -> "Lava Generator"
is AutoSmelter -> "Auto Smelter (${powerBlock.facing.name.lowercase().replaceFirstChar { it.uppercase() }})"
is MultiPowerCable -> "Multi Power Cable (${powerBlock.facing.name.lowercase().replaceFirstChar { it.uppercase() }})"
is PowerSplitter -> "Power Splitter (${powerBlock.facing.name.lowercase().replaceFirstChar { it.uppercase() }})"
is CobblestoneFactory -> "Cobblestone Factory"
is ObsidianFactory -> "Obsidian Factory"
is PowerMerger -> "Power Merger (${powerBlock.facing.name.lowercase().replaceFirstChar { it.uppercase() }})"
Expand Down Expand Up @@ -217,7 +217,7 @@ object PowerBlockDialog {
is AutoSmelter ->
Component.text("Machine - smelts items passing through, consumes ${AutoSmelter.POWER_PER_SMELT} power/item")
.color(NamedTextColor.GRAY)
is MultiPowerCable ->
is PowerSplitter ->
Component.text("Cable - distributes power to all adjacent faces")
.color(NamedTextColor.GRAY)
is CobblestoneFactory ->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,17 @@ import com.coderjoe.atlas.power.PowerBlockRegistry
import org.bukkit.Location
import org.bukkit.block.BlockFace

class MultiPowerCable(location: Location, override val facing: BlockFace) : PowerBlock(location, maxStorage = 10) {
class PowerSplitter(location: Location, override val facing: BlockFace) : PowerBlock(location, maxStorage = 10) {
companion object {
const val BLOCK_ID = "atlas:multi_power_cable"
const val BLOCK_ID = "atlas:power_splitter"

val descriptor =
BlockDescriptor(
baseBlockId = BLOCK_ID,
displayName = "Multi Power Cable",
displayName = "Power Splitter",
description = "Cable - distributes power to all adjacent faces",
placementType = PlacementType.DIRECTIONAL,
constructor = { loc, facing -> MultiPowerCable(loc, facing) },
constructor = { loc, facing -> PowerSplitter(loc, facing) },
)
}

Expand All @@ -40,7 +40,7 @@ class MultiPowerCable(location: Location, override val facing: BlockFace) : Powe
if (pulled > 0) {
addPower(pulled)
plugin.logger.atlasInfo(
"MultiPowerCable at ${location.blockX},${location.blockY},${location.blockZ} " +
"PowerSplitter at ${location.blockX},${location.blockY},${location.blockZ} " +
"pulled $pulled power (now $currentPower/$maxStorage)",
)
}
Expand All @@ -59,7 +59,7 @@ class MultiPowerCable(location: Location, override val facing: BlockFace) : Powe
if (pushed > 0) {
target.addPower(pushed)
plugin.logger.atlasInfo(
"MultiPowerCable at ${location.blockX},${location.blockY},${location.blockZ} " +
"PowerSplitter at ${location.blockX},${location.blockY},${location.blockZ} " +
"pushed $pushed power to ${target::class.simpleName} at ${face.name}",
)
}
Expand Down
180 changes: 0 additions & 180 deletions src/main/resources/atlas/configuration/multi_power_cable.yml

This file was deleted.

Loading
Loading